X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=wm.c;h=f0069d249a8f639fa156e96aef76fa6dcff20ae5;hp=a4caf64c1f9dc335977c12e3584f5ce9ce4b2d1b;hb=dfd84f9bf3b9d949412a73bc62a43109b340d395;hpb=8a8b7956b6de80decbfd3bff6d2ad6e5bb69b2bd diff --git a/wm.c b/wm.c index a4caf64..f0069d2 100644 --- a/wm.c +++ b/wm.c @@ -3,10 +3,15 @@ * See LICENSE file for license details. */ +#include + #include #include #include +#include +#include + #include #include #include @@ -18,22 +23,25 @@ Display *dpy; Window root, barwin; Atom wm_atom[WMLast], net_atom[NetLast]; Cursor cursor[CurLast]; -XRectangle rect, barrect; Bool running = True; -Client *client = NULL; +Bool sel_screen; -char *bartext, tag[256]; -int screen, sel_screen; -unsigned int lock_mask, numlock_mask; +char statustext[1024], tag[256]; +int screen, sx, sy, sw, sh, bx, by, bw, bh; -/* draw structs */ Brush brush = {0}; - -enum { WM_PROTOCOL_DELWIN = 1 }; +Client *clients = NULL; +Client *stack = NULL; static Bool other_wm_running; +static const char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n"; static int (*x_error_handler) (Display *, XErrorEvent *); -static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n"; + +static const char *status[] = { + "sh", "-c", "echo -n `date '+%Y-%m-%d %H:%M'`" + " `uptime | sed 's/.*://; s/,//g'`" + " `acpi | awk '{print $4}' | sed 's/,//'`", 0 +}; static void usage() @@ -57,7 +65,7 @@ scan_wins() if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) continue; if(wa.map_state == IsViewable) - manage(create_client(wins[i], &wa)); + manage(wins[i], &wa); } } if(wins) @@ -75,11 +83,12 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop) status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format, &res, &extra, prop); - if(status != Success || *prop == NULL) { + if(status != Success || *prop == 0) { return 0; } - if(res == 0) + if(res == 0) { free((void *) *prop); + } return res; } @@ -104,13 +113,28 @@ win_proto(Window w) return protos; } +void +send_message(Window w, Atom a, long value) +{ + XEvent e; + + e.type = ClientMessage; + e.xclient.window = w; + e.xclient.message_type = a; + e.xclient.format = 32; + e.xclient.data.l[0] = value; + e.xclient.data.l[1] = CurrentTime; + XSendEvent(dpy, w, False, NoEventMask, &e); + XFlush(dpy); +} + /* * 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(). */ -static int +int error_handler(Display *dpy, XErrorEvent *error) { if(error->error_code == BadWindow @@ -144,40 +168,11 @@ startup_error_handler(Display *dpy, XErrorEvent *error) } static void -init_lock_keys() -{ - XModifierKeymap *modmap; - KeyCode numlock; - int i; - static int masks[] = { - ShiftMask, LockMask, ControlMask, Mod1Mask, - Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask - }; - - numlock_mask = 0; - modmap = XGetModifierMapping(dpy); - numlock = XKeysymToKeycode(dpy, XStringToKeysym("Num_Lock")); - - if(modmap && modmap->max_keypermod > 0) { - int max = (sizeof(masks) / sizeof(int)) * modmap->max_keypermod; - for(i = 0; i < max; i++) - if(numlock && (modmap->modifiermap[i] == numlock)) - numlock_mask = masks[i / modmap->max_keypermod]; - } - XFreeModifiermap(modmap); - - lock_mask = 255 & ~(numlock_mask | LockMask); -} - -static void cleanup() { - /* - Client *c; - for(c=client; c; c=c->next) - reparent_client(c, root, c->sel->rect.x, c->sel->rect.y); + while(clients) + unmanage(clients); XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); - */ } int @@ -188,6 +183,11 @@ main(int argc, char *argv[]) unsigned int mask; Window w; XEvent ev; + fd_set fds; + struct timeval t, timeout = { + .tv_usec = 0, + .tv_sec = STATUSDELAY, + }; /* command line args */ for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) { @@ -219,16 +219,15 @@ main(int argc, char *argv[]) if(other_wm_running) error("gridwm: another window manager is already running\n"); - rect.x = rect.y = 0; - rect.width = DisplayWidth(dpy, screen); - rect.height = DisplayHeight(dpy, screen); + sx = sy = 0; + sw = DisplayWidth(dpy, screen); + sh = DisplayHeight(dpy, screen); sel_screen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); XSetErrorHandler(0); x_error_handler = XSetErrorHandler(error_handler); /* init atoms */ - wm_atom[WMState] = XInternAtom(dpy, "WM_STATE", False); 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); @@ -243,11 +242,7 @@ main(int argc, char *argv[]) cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); - init_lock_keys(); - - brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height, - DefaultDepth(dpy, screen)); - brush.gc = XCreateGC(dpy, root, 0, 0); + update_keys(); /* style */ loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR); @@ -257,28 +252,44 @@ main(int argc, char *argv[]) wa.background_pixmap = ParentRelative; wa.event_mask = ExposureMask; - barrect = rect; - barrect.height = labelheight(&brush.font); - barrect.y = rect.height - barrect.height; - barwin = XCreateWindow(dpy, root, barrect.x, barrect.y, - barrect.width, barrect.height, 0, DefaultDepth(dpy, screen), + bx = by = 0; + bw = sw; + bh = texth(&brush.font); + barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - bartext = NULL; XDefineCursor(dpy, barwin, cursor[CurNormal]); XMapRaised(dpy, barwin); + + brush.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen)); + brush.gc = XCreateGC(dpy, root, 0, 0); + + pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status); draw_bar(); - wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask; + wa.event_mask = SubstructureRedirectMask | EnterWindowMask \ + | LeaveWindowMask; wa.cursor = cursor[CurNormal]; XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); scan_wins(); while(running) { - XNextEvent(dpy, &ev); - if(handler[ev.type]) - (handler[ev.type]) (&ev); /* call handler */ + if(XPending(dpy) > 0) { + XNextEvent(dpy, &ev); + if(handler[ev.type]) + (handler[ev.type]) (&ev); /* call handler */ + continue; + } + FD_ZERO(&fds); + FD_SET(ConnectionNumber(dpy), &fds); + t = timeout; + if(select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &t) > 0) + continue; + else if(errno != EINTR) { + pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status); + draw_bar(); + } } cleanup();