Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Button3 click on mode label toggles stack position now
[dwm.git] / client.c
diff --git a/client.c b/client.c
index 169c01e..efa9669 100644 (file)
--- a/client.c
+++ b/client.c
@@ -2,204 +2,143 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
-
+#include "dwm.h"
 #include <stdlib.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
-#include "dwm.h"
-
-void
-ban(Client *c)
-{
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
-}
+/* static functions */
 
 static void
 
 static void
-resizetitle(Client *c)
-{
-       int i;
-
-       c->tw = 0;
-       for(i = 0; i < TLast; i++)
-               if(c->tags[i])
-                       c->tw += textw(c->tags[i]);
-       c->tw += textw(c->name);
-       if(c->tw > c->w)
-               c->tw = c->w + 2;
-       c->tx = c->x + c->w - c->tw + 2;
-       c->ty = c->y;
-       XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+detachstack(Client *c) {
+       Client **tc;
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
 }
 
 }
 
-void
-settitle(Client *c)
-{
-       XTextProperty name;
-       int n;
-       char **list = NULL;
+static void
+grabbuttons(Client *c, Bool focused) {
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 
 
-       name.nitems = 0;
-       c->name[0] = 0;
-       XGetTextProperty(dpy, c->win, &name, net_atom[NetWMName]);
-       if(!name.nitems)
-               XGetWMName(dpy, c->win, &name);
-       if(!name.nitems)
-               return;
-       if(name.encoding == XA_STRING)
-               strncpy(c->name, (char *)name.value, sizeof(c->name));
-       else {
-               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-                               && n > 0 && *list)
-               {
-                       strncpy(c->name, *list, sizeof(c->name));
-                       XFreeStringList(list);
-               }
-       }
-       XFree(name.value);
-       resizetitle(c);
-}
-
-void
-setsize(Client *c)
-{
-       XSizeHints size;
-       long msize;
-       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
-               size.flags = PSize;
-       c->flags = size.flags;
-       if(c->flags & PBaseSize) {
-               c->basew = size.base_width;
-               c->baseh = size.base_height;
-       }
-       else
-               c->basew = c->baseh = 0;
-       if(c->flags & PResizeInc) {
-               c->incw = size.width_inc;
-               c->inch = size.height_inc;
-       }
-       else
-               c->incw = c->inch = 0;
-       if(c->flags & PMaxSize) {
-               c->maxw = size.max_width;
-               c->maxh = size.max_height;
+       if(focused) {
+               XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+
+               XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+
+               XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
        }
        else
        }
        else
-               c->maxw = c->maxh = 0;
-       if(c->flags & PMinSize) {
-               c->minw = size.min_width;
-               c->minh = size.min_height;
-       }
-       else
-               c->minw = c->minh = 0;
-       if(c->flags & PWinGravity)
-               c->grav = size.win_gravity;
-       else
-               c->grav = NorthWestGravity;
+               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
 }
 
 }
 
-void
-higher(Client *c)
-{
-       XRaiseWindow(dpy, c->win);
-       XRaiseWindow(dpy, c->title);
+static int
+xerrordummy(Display *dsply, XErrorEvent *ee) {
+       return 0;
 }
 
 }
 
+/* extern functions */
+
 void
 void
-lower(Client *c)
-{
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
+ban(Client *c) {
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
 }
 
 void
-focus(Client *c)
-{
-       Client *old = sel;
-       XEvent ev;
-
-       XFlush(dpy);
-       sel = c;
-       if(old && old != c)
-               drawtitle(old);
-       drawtitle(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       XFlush(dpy);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+configure(Client *c) {
+       XEvent synev;
+
+       synev.type = ConfigureNotify;
+       synev.xconfigure.display = dpy;
+       synev.xconfigure.event = c->win;
+       synev.xconfigure.window = c->win;
+       synev.xconfigure.x = c->x;
+       synev.xconfigure.y = c->y;
+       synev.xconfigure.width = c->w;
+       synev.xconfigure.height = c->h;
+       synev.xconfigure.border_width = c->border;
+       synev.xconfigure.above = None;
+       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
 }
 
 void
 }
 
 void
-manage(Window w, XWindowAttributes *wa)
-{
-       Client *c, **l;
-       XSetWindowAttributes twa;
-       Window trans;
-
-       c = emallocz(sizeof(Client));
-       c->win = w;
-       c->tx = c->x = wa->x;
-       c->ty = c->y = wa->y;
-       if(c->y < bh)
-               c->ty = c->y += bh;
-       c->tw = c->w = wa->width;
-       c->h = wa->height;
-       c->th = bh;
-       c->border = 1;
-       c->proto = getproto(c->win);
-       setsize(c);
-       XSelectInput(dpy, c->win,
-                       StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       XGetTransientForHint(dpy, c->win, &trans);
-       twa.override_redirect = 1;
-       twa.background_pixmap = ParentRelative;
-       twa.event_mask = ExposureMask;
-
-       c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
-                       0, DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
+focus(Client *c) {
+       Client *old;
 
 
-       settitle(c);
-       settags(c);
+       if(!issel || (c && !isvisible(c)))
+               return;
+       if(!sel)
+               sel = c;
+       else if(sel != c) {
+               old = sel;
+               sel = c;
+               if(old) {
+                       grabbuttons(old, False);
+                       drawtitle(old);
+               }
+       }
+       if(c) {
+               detachstack(c);
+               c->snext = stack;
+               stack = c;
+               grabbuttons(c, True);
+               drawtitle(c);
+               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       }
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
 
 
-       for(l = &clients; *l; l = &(*l)->next);
-       c->next = *l; /* *l == nil */
-       *l = c;
+Client *
+getclient(Window w) {
+       Client *c;
 
 
-       XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
+       for(c = clients; c; c = c->next)
+               if(c->win == w)
+                       return c;
+       return NULL;
+}
 
 
-       if(!c->dofloat)
-               c->dofloat = trans
-                       || ((c->maxw == c->minw) && (c->maxh == c->minh));
+Client *
+getctitle(Window w) {
+       Client *c;
 
 
-       arrange(NULL);
-       /* mapping the window now prevents flicker */
-       if(c->tags[tsel]) {
-               XMapRaised(dpy, c->win);
-               XMapRaised(dpy, c->title);
-               focus(c);
-       }
-       else {
-               ban(c);
-               XMapRaised(dpy, c->win);
-               XMapRaised(dpy, c->title);
-       }
+       for(c = clients; c; c = c->next)
+               if(c->twin == w)
+                       return c;
+       return NULL;
 }
 
 void
 }
 
 void
-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {
        int dx = 0, dy = 0;
 
        switch(c->grav) {
        int dx = 0, dy = 0;
 
        switch(c->grav) {
+       default:
+               break;
        case StaticGravity:
        case NorthWestGravity:
        case NorthGravity:
        case StaticGravity:
        case NorthWestGravity:
        case NorthGravity:
@@ -214,13 +153,13 @@ gravitate(Client *c, Bool invert)
        case SouthEastGravity:
        case SouthGravity:
        case SouthWestGravity:
        case SouthEastGravity:
        case SouthGravity:
        case SouthWestGravity:
-               dy = -c->h;
-               break;
-       default:
+               dy = -(c->h);
                break;
        }
 
        switch (c->grav) {
                break;
        }
 
        switch (c->grav) {
+       default:
+               break;
        case StaticGravity:
        case NorthWestGravity:
        case WestGravity:
        case StaticGravity:
        case NorthWestGravity:
        case WestGravity:
@@ -237,8 +176,6 @@ gravitate(Client *c, Bool invert)
        case SouthEastGravity:
                dx = -(c->w + c->border);
                break;
        case SouthEastGravity:
                dx = -(c->w + c->border);
                break;
-       default:
-               break;
        }
 
        if(invert) {
        }
 
        if(invert) {
@@ -249,175 +186,228 @@ gravitate(Client *c, Bool invert)
        c->y += dy;
 }
 
        c->y += dy;
 }
 
-
 void
 void
-resize(Client *c, Bool inc)
-{
-       XConfigureEvent e;
-
-       if(inc) {
-               if(c->incw)
-                       c->w -= (c->w - c->basew) % c->incw;
-               if(c->inch)
-                       c->h -= (c->h - c->baseh) % c->inch;
-       }
-       if(c->x > sw) /* might happen on restart */
-               c->x = sw - c->w;
-       if(c->y > sh)
-               c->ty = c->y = sh - c->h;
-       if(c->minw && c->w < c->minw)
-               c->w = c->minw;
-       if(c->minh && c->h < c->minh)
-               c->h = c->minh;
-       if(c->maxw && c->w > c->maxw)
-               c->w = c->maxw;
-       if(c->maxh && c->h > c->maxh)
-               c->h = c->maxh;
-       resizetitle(c);
-       XSetWindowBorderWidth(dpy, c->win, 1);
-       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-       e.type = ConfigureNotify;
-       e.event = c->win;
-       e.window = c->win;
-       e.x = c->x;
-       e.y = c->y;
-       e.width = c->w;
-       e.height = c->h;
-       e.border_width = c->border;
-       e.above = None;
-       e.override_redirect = False;
-       XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
-       XFlush(dpy);
-}
-
-static int
-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
-       return 0;
+killclient(Arg *arg) {
+       if(!sel)
+               return;
+       if(sel->proto & PROTODELWIN)
+               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+       else
+               XKillClient(dpy, sel->win);
 }
 
 void
 }
 
 void
-unmanage(Client *c)
-{
-       Client **l;
+manage(Window w, XWindowAttributes *wa) {
+       Client *c;
+       Window trans;
+       XSetWindowAttributes twa;
 
 
-       XGrabServer(dpy);
-       XSetErrorHandler(xerrordummy);
+       c = emallocz(sizeof(Client));
+       c->tags = emallocz(ntags * sizeof(Bool));
+       c->win = w;
+       c->x = c->tx = wa->x;
+       c->y = c->ty = wa->y;
+       c->w = c->tw = wa->width;
+       c->h = wa->height;
+       c->th = bh;
 
 
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       XDestroyWindow(dpy, c->title);
+       c->border = 0;
+       updatesize(c);
 
 
-       for(l = &clients; *l && *l != c; l = &(*l)->next);
-       *l = c->next;
-       for(l = &clients; *l; l = &(*l)->next)
-               if((*l)->revert == c)
-                       (*l)->revert = NULL;
-       if(sel == c)
-               sel = sel->revert ? sel->revert : clients;
+       if(c->x + c->w + 2 * BORDERPX > sw)
+               c->x = sw - c->w - 2 * BORDERPX;
+       if(c->x < sx)
+               c->x = sx;
+       if(c->y + c->h + 2 * BORDERPX > sh)
+               c->y = sh - c->h - 2 * BORDERPX;
+       if(c->h != sh && c->y < bh)
+               c->y = bh;
 
 
-       free(c);
+       c->proto = getproto(c->win);
+       XSelectInput(dpy, c->win,
+               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       XGetTransientForHint(dpy, c->win, &trans);
+       twa.override_redirect = 1;
+       twa.background_pixmap = ParentRelative;
+       twa.event_mask = ExposureMask | EnterWindowMask;
 
 
-       XFlush(dpy);
-       XSetErrorHandler(xerror);
-       XUngrabServer(dpy);
-       arrange(NULL);
-       if(sel)
-               focus(sel);
-}
+       c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+                       0, DefaultDepth(dpy, screen), CopyFromParent,
+                       DefaultVisual(dpy, screen),
+                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
 
-Client *
-getctitle(Window w)
-{
-       Client *c;
-       for(c = clients; c; c = c->next)
-               if(c->title == w)
-                       return c;
-       return NULL;
-}
+       grabbuttons(c, False);
+       updatetitle(c);
+       settags(c, getclient(trans));
+       if(!c->isfloat)
+               c->isfloat = trans
+                       || (c->maxw && c->minw &&
+                               c->maxw == c->minw && c->maxh == c->minh);
+       resizetitle(c);
 
 
-Client *
-getclient(Window w)
-{
-       Client *c;
-       for(c = clients; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       c->snext = stack;
+       stack = clients = c;
+
+       ban(c);
+       XMapWindow(dpy, c->win);
+       XMapWindow(dpy, c->twin);
+       if(isvisible(c))
+               focus(c);
+       arrange(NULL);
 }
 
 void
 }
 
 void
-zoom(Arg *arg)
-{
-       Client **l, *c;
-
-       if(!sel)
-               return;
+resize(Client *c, Bool sizehints, Corner sticky) {
+       int bottom = c->y + c->h;
+       int right = c->x + c->w;
+       XWindowChanges wc;
 
 
-       if(sel == getnext(clients) && sel->next)  {
-               if((c = getnext(sel->next)))
-                       sel = c;
+       if(sizehints) {
+               if(c->incw)
+                       c->w -= (c->w - c->basew) % c->incw;
+               if(c->inch)
+                       c->h -= (c->h - c->baseh) % c->inch;
+               if(c->minw && c->w < c->minw)
+                       c->w = c->minw;
+               if(c->minh && c->h < c->minh)
+                       c->h = c->minh;
+               if(c->maxw && c->w > c->maxw)
+                       c->w = c->maxw;
+               if(c->maxh && c->h > c->maxh)
+                       c->h = c->maxh;
        }
        }
+       if(sticky == TopRight || sticky == BotRight)
+               c->x = right - c->w;
+       if(sticky == BotLeft || sticky == BotRight)
+               c->y = bottom - c->h;
+
+       /* offscreen appearance fixes */
+       if(c->x + c->w < sx)
+               c->x = sx;
+       if(c->y + c->h < bh)
+               c->y = bh;
+       if(c->x > sw)
+               c->x = sw - c->w;
+       if(c->y > sh)
+               c->y = sh - c->h;
 
 
-       for(l = &clients; *l && *l != sel; l = &(*l)->next);
-       *l = sel->next;
-
-       sel->next = clients; /* pop */
-       clients = sel;
-       arrange(NULL);
-       focus(sel);
+       resizetitle(c);
+       wc.x = c->x;
+       wc.y = c->y;
+       wc.width = c->w;
+       wc.height = c->h;
+       if(c->w == sw && c->h == sh)
+               wc.border_width = 0;
+       else
+               wc.border_width = BORDERPX;
+       XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+       configure(c);
+       XSync(dpy, False);
 }
 
 void
 }
 
 void
-maximize(Arg *arg)
-{
-       if(!sel)
-               return;
-       sel->x = sx;
-       sel->y = sy + bh;
-       sel->w = sw - 2 * sel->border;
-       sel->h = sh - 2 * sel->border - bh;
-       higher(sel);
-       resize(sel, False);
+resizetitle(Client *c) {
+       c->tw = textw(c->name);
+       if(c->tw > c->w)
+               c->tw = c->w + 2 * BORDERPX;
+       c->tx = c->x + c->w - c->tw + 2 * BORDERPX;
+       c->ty = c->y;
+       if(isvisible(c))
+               XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
+       else
+               XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
 }
 
 void
 }
 
 void
-focusprev(Arg *arg)
-{
-       Client *c;
-
-       if(!sel)
-               return;
+updatesize(Client *c) {
+       long msize;
+       XSizeHints size;
 
 
-       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
-               higher(c);
-               focus(c);
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+               size.flags = PSize;
+       c->flags = size.flags;
+       if(c->flags & PBaseSize) {
+               c->basew = size.base_width;
+               c->baseh = size.base_height;
+       }
+       else
+               c->basew = c->baseh = 0;
+       if(c->flags & PResizeInc) {
+               c->incw = size.width_inc;
+               c->inch = size.height_inc;
+       }
+       else
+               c->incw = c->inch = 0;
+       if(c->flags & PMaxSize) {
+               c->maxw = size.max_width;
+               c->maxh = size.max_height;
+       }
+       else
+               c->maxw = c->maxh = 0;
+       if(c->flags & PMinSize) {
+               c->minw = size.min_width;
+               c->minh = size.min_height;
        }
        }
+       else
+               c->minw = c->minh = 0;
+       if(c->flags & PWinGravity)
+               c->grav = size.win_gravity;
+       else
+               c->grav = NorthWestGravity;
 }
 
 void
 }
 
 void
-focusnext(Arg *arg)
-{
-       Client *c;
-   
-       if(!sel)
-               return;
+updatetitle(Client *c) {
+       char **list = NULL;
+       int n;
+       XTextProperty name;
 
 
-       if(!(c = getnext(sel->next)))
-               c = getnext(clients);
-       if(c) {
-               higher(c);
-               c->revert = sel;
-               focus(c);
+       name.nitems = 0;
+       c->name[0] = 0;
+       XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]);
+       if(!name.nitems)
+               XGetWMName(dpy, c->win, &name);
+       if(!name.nitems)
+               return;
+       if(name.encoding == XA_STRING)
+               strncpy(c->name, (char *)name.value, sizeof(c->name));
+       else {
+               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
+                               && n > 0 && *list)
+               {
+                       strncpy(c->name, *list, sizeof(c->name));
+                       XFreeStringList(list);
+               }
        }
        }
+       XFree(name.value);
 }
 
 void
 }
 
 void
-killclient(Arg *arg)
-{
-       if(!sel)
-               return;
-       if(sel->proto & WM_PROTOCOL_DELWIN)
-               sendevent(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-       else
-               XKillClient(dpy, sel->win);
+unmanage(Client *c) {
+       Client *nc;
+
+       /* The server grab construct avoids race conditions. */
+       XGrabServer(dpy);
+       XSetErrorHandler(xerrordummy);
+
+       detach(c);
+       detachstack(c);
+       if(sel == c) {
+               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);
+       }
+
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       XDestroyWindow(dpy, c->twin);
+
+       free(c->tags);
+       free(c);
+
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);
+       XUngrabServer(dpy);
+       arrange(NULL);
 }
 }