X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=2d132a5d84d50922843a6acdeea10afb7cda3259;hb=94f7c2707bcd11de4e0174abe0c2634980dc283e;hp=a1cf245e34e4006d4194cb346f4f35876599bda6;hpb=c0705eeb65733e8c5091e47d5bdc701a0779a949;p=dwm.git diff --git a/main.c b/main.c index a1cf245..2d132a5 100644 --- a/main.c +++ b/main.c @@ -3,37 +3,23 @@ * See LICENSE file for license details. */ +#include "dwm.h" + #include -#include #include #include #include #include - #include #include #include -#include "dwm.h" - -/********** CUSTOMIZE **********/ - -char *tags[TLast] = { - [Tscratch] = "scratch", - [Tdev] = "dev", - [Twww] = "www", - [Twork] = "work", -}; - -/********** CUSTOMIZE **********/ - -/* X structs */ Display *dpy; Window root, barwin; -Atom wm_atom[WMLast], net_atom[NetLast]; +Atom wmatom[WMLast], netatom[NetLast]; Cursor cursor[CurLast]; Bool running = True; -Bool issel; +Bool issel = True; int tsel = Tdev; /* default tag */ int screen, sx, sy, sw, sh, bx, by, bw, bh, mw; @@ -43,16 +29,23 @@ DC dc = {0}; Client *clients = NULL; Client *sel = NULL; -static Bool other_wm_running; -static const char version[] = - "dwm-" VERSION ", (C)opyright MMVI Anselm R. Garbe\n"; -static int (*x_xerror) (Display *, XErrorEvent *); +static Bool otherwm; +static int (*xerrorxlib)(Display *, XErrorEvent *); + +/* static functions */ static void -usage() { error("usage: dwm [-v]\n"); } +cleanup() +{ + while(sel) { + resize(sel, True); + unmanage(sel); + } + XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); +} static void -scan_wins() +scan() { unsigned int i, num; Window *wins; @@ -93,20 +86,33 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop) return res; } +/* + * Startup Error handler to check if another window manager + * is already running. + */ +static int +xerrorstart(Display *dsply, XErrorEvent *ee) +{ + otherwm = True; + return -1; +} + +/* extern functions */ + int -proto(Window w) +getproto(Window w) { unsigned char *protocols; long res; int protos = 0; int i; - res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L, &protocols); + res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols); if(res <= 0) { return protos; } for(i = 0; i < res; i++) { - if(protocols[i] == wm_atom[WMDelete]) + if(protocols[i] == wmatom[WMDelete]) protos |= WM_PROTOCOL_DELWIN; } free((char *) protocols); @@ -125,7 +131,13 @@ sendevent(Window w, Atom a, long value) e.xclient.data.l[0] = value; e.xclient.data.l[1] = CurrentTime; XSendEvent(dpy, w, False, NoEventMask, &e); - XFlush(dpy); + XSync(dpy, False); +} + +void +quit(Arg *arg) +{ + running = False; } /* @@ -135,52 +147,25 @@ sendevent(Window w, Atom a, long value) * calls exit(). */ int -xerror(Display *dpy, XErrorEvent *error) +xerror(Display *dpy, XErrorEvent *ee) { - if(error->error_code == BadWindow - || (error->request_code == X_SetInputFocus - && error->error_code == BadMatch) - || (error->request_code == X_PolyText8 - && error->error_code == BadDrawable) - || (error->request_code == X_PolyFillRectangle - && error->error_code == BadDrawable) - || (error->request_code == X_PolySegment - && error->error_code == BadDrawable) - || (error->request_code == X_ConfigureWindow - && error->error_code == BadMatch) - || (error->request_code == X_GrabKey - && error->error_code == BadAccess)) + if(ee->error_code == BadWindow + || (ee->request_code == X_SetInputFocus + && ee->error_code == BadMatch) + || (ee->request_code == X_PolyText8 + && ee->error_code == BadDrawable) + || (ee->request_code == X_PolyFillRectangle + && ee->error_code == BadDrawable) + || (ee->request_code == X_PolySegment + && ee->error_code == BadDrawable) + || (ee->request_code == X_ConfigureWindow + && ee->error_code == BadMatch) + || (ee->request_code == X_GrabKey + && ee->error_code == BadAccess)) return 0; fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", - error->request_code, error->error_code); - return x_xerror(dpy, error); /* may call exit() */ -} - -/* - * Startup Error handler to check if another window manager - * is already running. - */ -static int -startup_xerror(Display *dpy, XErrorEvent *error) -{ - other_wm_running = True; - return -1; -} - -static void -cleanup() -{ - while(sel) { - resize(sel, True); - unmanage(sel); - } - XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); -} - -void -quit(Arg *arg) -{ - running = False; + ee->request_code, ee->error_code); + return xerrorxlib(dpy, ee); /* may call exit() */ } int @@ -197,42 +182,43 @@ main(int argc, char *argv[]) for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) { switch (argv[i][1]) { case 'v': - fprintf(stdout, "%s", version); + fprintf(stdout, "%s", + "dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n"); exit(0); break; default: - usage(); + eprint("usage: dwm [-v]\n"); break; } } dpy = XOpenDisplay(0); if(!dpy) - error("dwm: cannot connect X server\n"); + eprint("dwm: cannot connect X server\n"); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); /* check if another WM is already running */ - other_wm_running = False; - XSetErrorHandler(startup_xerror); + otherwm = False; + XSetErrorHandler(xerrorstart); /* this causes an error if some other WM is running */ XSelectInput(dpy, root, SubstructureRedirectMask); - XFlush(dpy); + XSync(dpy, False); - if(other_wm_running) - error("dwm: another window manager is already running\n"); + if(otherwm) + eprint("dwm: another window manager is already running\n"); - XSetErrorHandler(0); - x_xerror = XSetErrorHandler(xerror); + XSetErrorHandler(NULL); + xerrorxlib = XSetErrorHandler(xerror); /* init atoms */ - wm_atom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); - wm_atom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); - net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); - net_atom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); - XChangeProperty(dpy, root, net_atom[NetSupported], XA_ATOM, 32, - PropModeReplace, (unsigned char *) net_atom, NetLast); + wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); + wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); + netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); + XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, + PropModeReplace, (unsigned char *) netatom, NetLast); /* init cursors */ cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr); @@ -278,7 +264,7 @@ main(int argc, char *argv[]) XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); strcpy(stext, "dwm-"VERSION); - scan_wins(); + scan(); /* main event loop, reads status text from stdin as well */ Mainloop: @@ -292,7 +278,7 @@ Mainloop: if(i == -1 && errno == EINTR) continue; if(i < 0) - error("select failed\n"); + eprint("select failed\n"); else if(i > 0) { if(FD_ISSET(ConnectionNumber(dpy), &rd)) { while(XPending(dpy)) {