X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=3699f9955334b9147af73d6eda52419227cbe9ab;hb=5f19423c7bd2aa1ebb3010af15bebffbc3a9cbc3;hp=e87caabcd8fb942e8b6bcbb0a830bc9ee1276354;hpb=d0e0505301d356a63dc31ba6ed4a8509ef8f055f;p=dwm.git diff --git a/dwm.c b/dwm.c index e87caab..3699f99 100644 --- a/dwm.c +++ b/dwm.c @@ -53,7 +53,7 @@ enum { BarTop, BarBot, BarOff }; /* bar position */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ -enum { NetSupported, NetWMCheck, NetWMName, NetLast }; /* EWMH atoms */ +enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */ enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */ /* typedefs */ @@ -61,12 +61,11 @@ typedef struct Client Client; struct Client { char name[256]; int x, y, w, h; - int rx, ry, rw, rh; /* revert geometry */ int basew, baseh, incw, inch, maxw, maxh, minw, minh; int minax, maxax, minay, maxay; long flags; unsigned int border, oldborder; - Bool isbanned, isfixed, ismax, isfloating, wasfloating; + Bool isbanned, isfixed, isfloating; Bool *tags; Client *next; Client *prev; @@ -137,6 +136,7 @@ void eprint(const char *errstr, ...); void expose(XEvent *e); void floating(void); /* default floating layout */ void focus(Client *c); +void focusin(XEvent *e); void focusnext(const char *arg); void focusprev(const char *arg); Client *getclient(Window w); @@ -156,10 +156,12 @@ void leavenotify(XEvent *e); void manage(Window w, XWindowAttributes *wa); void mappingnotify(XEvent *e); void maprequest(XEvent *e); +void maximize(const char *arg); void movemouse(Client *c); Client *nexttiled(Client *c); void propertynotify(XEvent *e); void quit(const char *arg); +void reapply(const char *arg); void resize(Client *c, int x, int y, int w, int h, Bool sizehints); void resizemouse(Client *c); void restack(void); @@ -176,7 +178,6 @@ unsigned int textw(const char *text); void tile(void); void togglebar(const char *arg); void togglefloating(const char *arg); -void togglemax(const char *arg); void toggletag(const char *arg); void toggleview(const char *arg); void unban(Client *c); @@ -206,9 +207,10 @@ void (*handler[LASTEvent]) (XEvent *) = { [ConfigureNotify] = configurenotify, [DestroyNotify] = destroynotify, [EnterNotify] = enternotify, - [LeaveNotify] = leavenotify, [Expose] = expose, + [FocusIn] = focusin, [KeyPress] = keypress, + [LeaveNotify] = leavenotify, [MappingNotify] = mappingnotify, [MapRequest] = maprequest, [PropertyNotify] = propertynotify, @@ -463,7 +465,6 @@ configurerequest(XEvent *e) { XWindowChanges wc; if((c = getclient(ev->window))) { - c->ismax = False; if(ev->value_mask & CWBorderWidth) c->border = ev->border_width; if(c->isfixed || c->isfloating || (floating == layout->arrange)) { @@ -560,7 +561,7 @@ drawbar(void) { dc.x = x; if(sel) { drawtext(sel->name, dc.sel); - drawsquare(sel->ismax, sel->isfloating, dc.sel); + drawsquare(False, sel->isfloating, dc.sel); } else drawtext(NULL, dc.norm); @@ -710,6 +711,14 @@ focus(Client *c) { } void +focusin(XEvent *e) { /* there are some broken focus acquiring clients */ + XFocusChangeEvent *ev = &e->xfocus; + + if(sel && ev->window != sel->win) + XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime); +} + +void focusnext(const char *arg) { Client *c; @@ -1026,8 +1035,7 @@ manage(Window w, XWindowAttributes *wa) { XSetWindowBorder(dpy, w, dc.norm[ColBorder]); configure(c); /* propagates border_width, if size doesn't change */ updatesizehints(c); - XSelectInput(dpy, w, - StructureNotifyMask | PropertyChangeMask | EnterWindowMask); + XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask); grabbuttons(c, False); updatetitle(c); if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) @@ -1069,6 +1077,13 @@ maprequest(XEvent *e) { } void +maximize(const char *arg) { + if(!sel || (!sel->isfloating && layout->arrange != floating)) + return; + resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True); +} + +void movemouse(Client *c) { int x1, y1, ocx, ocy, di, nx, ny; unsigned int dui; @@ -1080,7 +1095,6 @@ movemouse(Client *c) { if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurMove], CurrentTime) != GrabSuccess) return; - c->ismax = False; XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); for(;;) { XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); @@ -1150,6 +1164,17 @@ quit(const char *arg) { readin = running = False; } +void +reapply(const char *arg) { + static Bool zerotags[LENGTH(tags)] = { 0 }; + Client *c; + + for(c = clients; c; c = c->next) { + memcpy(c->tags, zerotags, sizeof zerotags); + applyrules(c); + } + arrange(); +} void resize(Client *c, int x, int y, int w, int h, Bool sizehints) { @@ -1227,7 +1252,6 @@ resizemouse(Client *c) { if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurResize], CurrentTime) != GrabSuccess) return; - c->ismax = False; XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1); for(;;) { XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev); @@ -1427,20 +1451,19 @@ void setup(void) { int d; unsigned int i, j, mask; - Atom utf8string; Window w; XModifierKeymap *modmap; XSetWindowAttributes wa; /* init atoms */ - utf8string = XInternAtom(dpy, "UTF8_STRING", False); wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False); wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False); netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); - netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", 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); @@ -1516,16 +1539,6 @@ setup(void) { /* multihead support */ selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask); - /* EWMH properties */ - XChangeProperty(dpy, barwin, netatom[NetWMCheck], XA_WINDOW, 32, - PropModeReplace, (unsigned char *) &barwin, 1); - /* HACK: dwm identifies itself as compiz to workaround the XToolkit bug of Sun JDK */ - XChangeProperty(dpy, barwin, netatom[NetWMName], utf8string, 8, - PropModeReplace, (unsigned char *) "compiz", 6); - XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32, - PropModeReplace, (unsigned char *) &barwin, 1); - XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, - PropModeReplace, (unsigned char *) netatom, NetLast); } void @@ -1599,7 +1612,6 @@ tile(void) { ny = way; nw = 0; /* gcc stupidity requires this */ for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) { - c->ismax = False; if(i == 0) { /* master */ nw = mw - 2 * c->border; nh = wah - 2 * c->border; @@ -1645,34 +1657,6 @@ togglefloating(const char *arg) { } void -togglemax(const char *arg) { - XEvent ev; - - if(!sel || sel->isfixed) - return; - if((sel->ismax = !sel->ismax)) { - if((layout->arrange == floating) || sel->isfloating) - sel->wasfloating = True; - else { - togglefloating(NULL); - sel->wasfloating = False; - } - sel->rx = sel->x; - sel->ry = sel->y; - sel->rw = sel->w; - sel->rh = sel->h; - resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True); - } - else { - resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True); - if(!sel->wasfloating) - togglefloating(NULL); - } - drawbar(); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); -} - -void toggletag(const char *arg) { unsigned int i, j;