X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=02475e0f102f4880622b2076ac4a17368132e8ab;hb=fd995dac78e34cc427abd7198af0db957a40664a;hp=0f22c448afead7bcf167204112594841b0bccd38;hpb=b003a35fde6e83bd65efa6d195d96a835fd457ea;p=dwm.git diff --git a/main.c b/main.c index 0f22c44..02475e0 100644 --- a/main.c +++ b/main.c @@ -1,9 +1,10 @@ -/* (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" #include +#include #include #include #include @@ -16,13 +17,13 @@ /* extern */ -char stext[1024]; -Bool *seltag; -int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah; -unsigned int master, ntags, numlockmask; +char stext[256]; +int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah; +unsigned int master, nmaster, ntags, numlockmask; Atom wmatom[WMLast], netatom[NetLast]; Bool running = True; -Bool issel = True; +Bool *seltag; +Bool selscreen = True; Client *clients = NULL; Client *sel = NULL; Client *stack = NULL; @@ -39,9 +40,9 @@ static Bool otherwm, readin; static void cleanup(void) { close(STDIN_FILENO); - while(sel) { - resize(sel, True, TopLeft); - unmanage(sel); + while(stack) { + resize(stack, True); + unmanage(stack); } if(dc.font.set) XFreeFontSet(dpy, dc.font.set); @@ -51,6 +52,9 @@ cleanup(void) { XFreePixmap(dpy, dc.drawable); XFreeGC(dpy, dc.gc); XDestroyWindow(dpy, barwin); + XFreeCursor(dpy, cursor[CurNormal]); + XFreeCursor(dpy, cursor[CurResize]); + XFreeCursor(dpy, cursor[CurMove]); XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); XSync(dpy, False); free(seltag); @@ -88,6 +92,7 @@ setup(void) { /* init atoms */ wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False); netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, @@ -97,6 +102,7 @@ setup(void) { cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); /* init modifier map */ + numlockmask = 0; modmap = XGetModifierMapping(dpy); for (i = 0; i < 8; i++) { for (j = 0; j < modmap->max_keypermod; j++) { @@ -104,7 +110,7 @@ setup(void) { numlockmask = (1 << i); } } - XFree(modmap); + XFreeModifiermap(modmap); /* select for events */ wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask; @@ -116,35 +122,34 @@ setup(void) { seltag = emallocz(sizeof(Bool) * ntags); seltag[0] = True; /* style */ + dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR); dc.norm[ColBG] = getcolor(NORMBGCOLOR); dc.norm[ColFG] = getcolor(NORMFGCOLOR); + dc.sel[ColBorder] = getcolor(SELBORDERCOLOR); dc.sel[ColBG] = getcolor(SELBGCOLOR); dc.sel[ColFG] = getcolor(SELFGCOLOR); - dc.status[ColBG] = getcolor(STATUSBGCOLOR); - dc.status[ColFG] = getcolor(STATUSFGCOLOR); setfont(FONT); /* geometry */ - bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL); sx = sy = 0; sw = DisplayWidth(dpy, screen); sh = DisplayHeight(dpy, screen); master = MASTER; + nmaster = NMASTER; + bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL); /* bar */ - bx = by = 0; - bw = sw; dc.h = bh = dc.font.height + 2; wa.override_redirect = 1; wa.background_pixmap = ParentRelative; wa.event_mask = ButtonPressMask | ExposureMask; - barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen), - CopyFromParent, DefaultVisual(dpy, screen), + barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0, + DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); XDefineCursor(dpy, barwin, cursor[CurNormal]); XMapRaised(dpy, barwin); strcpy(stext, "dwm-"VERSION); /* windowarea */ wax = sx; - way = bh; + way = sy + (TOPBAR ? bh : 0); wah = sh - bh; waw = sw; /* pixmap for everything */ @@ -152,7 +157,7 @@ setup(void) { dc.gc = XCreateGC(dpy, root, 0, 0); XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); /* multihead support */ - issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); + selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); } /* @@ -167,24 +172,6 @@ xerrorstart(Display *dsply, XErrorEvent *ee) { /* extern */ -int -getproto(Window w) { - int i, format, protos, status; - unsigned long extra, res; - Atom *protocols, real; - - protos = 0; - status = XGetWindowProperty(dpy, w, wmatom[WMProtocols], 0L, 20L, False, - XA_ATOM, &real, &format, &res, &extra, (unsigned char **)&protocols); - if(status != Success || protocols == 0) - return protos; - for(i = 0; i < res; i++) - if(protocols[i] == wmatom[WMDelete]) - protos |= PROTODELWIN; - free(protocols); - return protos; -} - void sendevent(Window w, Atom a, long value) { XEvent e; @@ -226,15 +213,17 @@ xerror(Display *dpy, XErrorEvent *ee) { int main(int argc, char *argv[]) { + char *p; int r, xfd; fd_set rd; if(argc == 2 && !strncmp("-v", argv[1], 3)) { - fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); + fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout); exit(EXIT_SUCCESS); } else if(argc != 1) eprint("usage: dwm [-v]\n"); + setlocale(LC_CTYPE, ""); dpy = XOpenDisplay(0); if(!dpy) eprint("dwm: cannot open display\n"); @@ -266,22 +255,32 @@ main(int argc, char *argv[]) { if(readin) FD_SET(STDIN_FILENO, &rd); FD_SET(xfd, &rd); - r = select(xfd + 1, &rd, NULL, NULL, NULL); - if((r == -1) && (errno == EINTR)) - continue; - if(r > 0) { - if(readin && FD_ISSET(STDIN_FILENO, &rd)) { - readin = NULL != fgets(stext, sizeof(stext), stdin); - if(readin) - stext[strlen(stext) - 1] = 0; - else - strcpy(stext, "broken pipe"); - drawstatus(); + if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) { + if(errno == EINTR) + continue; + eprint("select failed\n"); + } + if(FD_ISSET(STDIN_FILENO, &rd)) { + switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) { + case -1: + strncpy(stext, strerror(errno), sizeof stext - 1); + stext[sizeof stext - 1] = '\0'; + readin = False; + break; + case 0: + strncpy(stext, "EOF", 4); + readin = False; + break; + default: + for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0'); + for(; p >= stext && *p != '\n'; --p); + if(p > stext) + strncpy(stext, p + 1, sizeof stext); } + drawstatus(); } - else if(r < 0) - eprint("select failed\n"); - procevent(); + if(FD_ISSET(xfd, &rd)) + procevent(); } cleanup(); XCloseDisplay(dpy);