X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=wm.c;h=ed002f760731722a5cafa5391222a7ebde869a3a;hp=4c4a513770f202ae546f0ee49a8ba16d25a38b01;hb=650a1fb4e1a798aca48a53739f5bb2649191bc1c;hpb=8a34fa50f75f4d6d8af234ac0c4f6d40b988d700 diff --git a/wm.c b/wm.c index 4c4a513..ed002f7 100644 --- a/wm.c +++ b/wm.c @@ -13,28 +13,41 @@ #include "wm.h" +/********** CUSTOMIZE **********/ + +char *tags[TLast] = { + [Tscratch] = "scratch", + [Tdev] = "dev", + [Tirc] = "irc", + [Twww] = "www", + [Twork] = "work", +}; + +/********** CUSTOMIZE **********/ + +/* X structs */ Display *dpy; -Window root; -XRectangle rect; -int screen, sel_screen; -Atom wm_atom[WMLast]; -Atom net_atom[NetLast]; +Window root, barwin; +Atom wm_atom[WMLast], net_atom[NetLast]; Cursor cursor[CurLast]; -unsigned int kmask, numlock_mask; -Pixmap pmap; +Bool running = True; +Bool issel; -enum { WM_PROTOCOL_DELWIN = 1 }; +char stext[1024]; +int tsel = Tdev; /* default tag */ +int screen, sx, sy, sw, sh, th; + +DC dc = {0}; +Client *clients = NULL; +Client *stack = NULL; 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 char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n"; static void -usage() -{ - fputs("usage: gridwm [-v]\n", stderr); - exit(1); -} +usage() { error("usage: dwm [-v]\n"); } static void scan_wins() @@ -51,7 +64,7 @@ scan_wins() if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) continue; if(wa.map_state == IsViewable) - /*manage*/; + manage(wins[i], &wa); } } if(wins) @@ -81,13 +94,12 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop) int win_proto(Window w) { - Atom *protocols; + unsigned char *protocols; long res; int protos = 0; int i; - res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L, - ((unsigned char **) &protocols)); + res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L, &protocols); if(res <= 0) { return protos; } @@ -99,13 +111,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 @@ -122,7 +149,7 @@ error_handler(Display *dpy, XErrorEvent *error) || (error->request_code == X_GrabKey && error->error_code == BadAccess)) return 0; - fprintf(stderr, "gridwm: fatal error: request code=%d, error code=%d\n", + 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() */ } @@ -139,40 +166,17 @@ startup_error_handler(Display *dpy, XErrorEvent *error) } static void -init_lock_keys() +cleanup() { - 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); - - kmask = 255 & ~(numlock_mask | LockMask); + while(clients) + unmanage(clients); + XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); } -static void -cleanup() +void +quit(void *aux) { - /* - Client *c; - for(c=client; c; c=c->next) - reparent_client(c, root, c->sel->rect.x, c->sel->rect.y); - XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); - */ + running = False; } int @@ -182,6 +186,7 @@ main(int argc, char *argv[]) XSetWindowAttributes wa; unsigned int mask; Window w; + XEvent ev; /* command line args */ for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) { @@ -198,7 +203,7 @@ main(int argc, char *argv[]) dpy = XOpenDisplay(0); if(!dpy) - error("gridwm: cannot connect X server\n"); + error("dwm: cannot connect X server\n"); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); @@ -208,21 +213,20 @@ main(int argc, char *argv[]) XSetErrorHandler(startup_error_handler); /* this causes an error if some other WM is running */ XSelectInput(dpy, root, SubstructureRedirectMask); - XSync(dpy, False); + XFlush(dpy); if(other_wm_running) - error("gridwm: another window manager is already running\n"); + error("dwm: another window manager is already running\n"); - rect.x = rect.y = 0; - rect.width = DisplayWidth(dpy, screen); - rect.height = DisplayHeight(dpy, screen); - sel_screen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); + sx = sy = 0; + sw = DisplayWidth(dpy, screen); + sh = DisplayHeight(dpy, screen); + issel = 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); @@ -237,17 +241,30 @@ main(int argc, char *argv[]) cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); - init_lock_keys(); + update_keys(); + + /* style */ + initcolors(BGCOLOR, FGCOLOR, BORDERCOLOR); + initfont(&dc.font, FONT); + + th = texth(&dc.font); - pmap = XCreatePixmap(dpy, root, rect.width, rect.height, - DefaultDepth(dpy, screen)); + dc.drawable = XCreatePixmap(dpy, root, sw, th, DefaultDepth(dpy, screen)); + dc.gc = XCreateGC(dpy, root, 0, 0); - 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 */ + } + cleanup(); XCloseDisplay(dpy);