X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=main.c;h=de5924475b2554d265afc6ce383265b0a30d3d00;hp=bfc63b163cb4f82befa90a16eb26c73676f2189d;hb=79cd408844c62963aa0eec45bb0414ed66f06f6f;hpb=0e5c8198bc5a69e87b0114b81d6569188828edfa diff --git a/main.c b/main.c index bfc63b1..de59244 100644 --- a/main.c +++ b/main.c @@ -3,56 +3,35 @@ * 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]; -Cursor cursor[CurLast]; -Bool running = True; -Bool issel; - -int tsel = Tdev; /* default tag */ -int screen, sx, sy, sw, sh, bx, by, bw, bh, mw; -char stext[1024]; -DC dc = {0}; -Client *clients = NULL; -Client *sel = NULL; +/* static */ -static Bool other_wm_running; -static const char version[] = - "dwm-" VERSION ", (C)opyright MMVI Anselm R. Garbe\n"; -static int (*x_error_handler) (Display *, XErrorEvent *); +static Bool otherwm; +static int (*xerrorxlib)(Display *, XErrorEvent *); static void -usage() { error("usage: dwm [-v]\n"); } +cleanup() +{ + while(sel) { + resize(sel, True, TopLeft); + unmanage(sel); + } + XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); +} static void -scan_wins() +scan() { unsigned int i, num; Window *wins; @@ -93,20 +72,46 @@ 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 */ + +char stext[1024]; +int tsel = Tdev; /* default tag */ +int screen, sx, sy, sw, sh, bx, by, bw, bh, mw; +Atom wmatom[WMLast], netatom[NetLast]; +Bool running = True; +Bool issel = True; +Client *clients = NULL; +Client *sel = NULL; +Cursor cursor[CurLast]; +Display *dpy; +DC dc = {0}; +Window root, barwin; + int -win_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); @@ -114,7 +119,7 @@ win_proto(Window w) } void -send_message(Window w, Atom a, long value) +sendevent(Window w, Atom a, long value) { XEvent e; @@ -125,62 +130,40 @@ send_message(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); } -/* - * There's no way to check accesses to destroyed windows, thus - * those cases are ignored (especially on UnmapNotify's). - * Other types of errors call Xlib's default error handler, which - * calls exit(). - */ -int -error_handler(Display *dpy, XErrorEvent *error) +void +quit(Arg *arg) { - 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)) - return 0; - fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", - error->request_code, error->error_code); - return x_error_handler(dpy, error); /* may call exit() */ + running = False; } /* - * Startup Error handler to check if another window manager - * is already running. + * There's no way to check accesses to destroyed windows, thus those cases are + * ignored (especially on UnmapNotify's). Other types of errors call Xlibs + * default error handler, which calls exit(). */ -static int -startup_error_handler(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) +int +xerror(Display *dpy, XErrorEvent *ee) { - running = False; + 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", + ee->request_code, ee->error_code); + return xerrorxlib(dpy, ee); /* may call exit() */ } int @@ -190,61 +173,62 @@ main(int argc, char *argv[]) fd_set rd; XSetWindowAttributes wa; unsigned int mask; + Bool readstdin = True; Window w; XEvent ev; for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) { switch (argv[i][1]) { - case 'v': - fprintf(stdout, "%s", version); - exit(0); - break; default: - usage(); + eprint("usage: dwm [-v]\n"); + break; + case 'v': + fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); + exit(EXIT_SUCCESS); 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_error_handler); + 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_error_handler = XSetErrorHandler(error_handler); + 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); cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); - update_keys(); + grabkeys(); /* style */ - dc.bg = initcolor(BGCOLOR); - dc.fg = initcolor(FGCOLOR); - dc.border = initcolor(BORDERCOLOR); - initfont(FONT); + dc.bg = getcolor(BGCOLOR); + dc.fg = getcolor(FGCOLOR); + dc.border = getcolor(BORDERCOLOR); + setfont(FONT); sx = sy = 0; sw = DisplayWidth(dpy, screen); @@ -264,6 +248,10 @@ main(int argc, char *argv[]) XDefineCursor(dpy, barwin, cursor[CurNormal]); XMapRaised(dpy, barwin); + dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen)); + dc.gc = XCreateGC(dpy, root, 0, 0); + drawstatus(); + issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); wa.event_mask = SubstructureRedirectMask | EnterWindowMask \ @@ -272,36 +260,46 @@ main(int argc, char *argv[]) XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); - dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen)); - dc.gc = XCreateGC(dpy, root, 0, 0); - strcpy(stext, "dwm-"VERSION); - scan_wins(); - draw_bar(); + + scan(); /* main event loop, reads status text from stdin as well */ +Mainloop: while(running) { FD_ZERO(&rd); - FD_SET(0, &rd); + if(readstdin) + FD_SET(STDIN_FILENO, &rd); FD_SET(ConnectionNumber(dpy), &rd); i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0); 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) && XPending(dpy) > 0) { - XNextEvent(dpy, &ev); - if(handler[ev.type]) - (handler[ev.type])(&ev); /* call handler */ + if(FD_ISSET(ConnectionNumber(dpy), &rd)) { + while(XPending(dpy)) { + XNextEvent(dpy, &ev); + if(handler[ev.type]) + (handler[ev.type])(&ev); /* call handler */ + } } - if(FD_ISSET(0, &rd)) { + if(readstdin && FD_ISSET(STDIN_FILENO, &rd)) { i = n = 0; - while((i = getchar()) != '\n' && n < sizeof(stext) - 1) + for(;;) { + if((i = getchar()) == EOF) { + /* broken pipe/end of producer */ + readstdin = False; + strcpy(stext, "broken pipe"); + goto Mainloop; + } + if(i == '\n' || n >= sizeof(stext) - 1) + break; stext[n++] = i; + } stext[n] = 0; - draw_bar(); + drawstatus(); } } }