Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
applied sanders tag()/toggletag() fixes
[dwm.git] / client.c
diff --git a/client.c b/client.c
index 63fb1e5..14edf7c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -2,244 +2,120 @@
  * (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"
-
-static Rule rule[] = {
-       /* class                        instance        tags                                            floating */
-       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
-};
-
-Client *
-next(Client *c)
-{
-       for(; c && !c->tags[tsel]; c = c->next);
-       return c;
-}
-
-void
-ban_client(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
-resize_title(Client *c)
+resizetitle(Client *c)
 {
        int i;
 
        c->tw = 0;
 {
        int i;
 
        c->tw = 0;
-       for(i = 0; i < TLast; i++)
+       for(i = 0; i < ntags; i++)
                if(c->tags[i])
                if(c->tags[i])
-                       c->tw += textw(c->tags[i]);
+                       c->tw += textw(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;
        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);
-}
-
-void
-update_name(Client *c)
-{
-       XTextProperty name;
-       int n;
-       char **list = NULL;
+       if(isvisible(c))
+               XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+       else
+               XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
 
 
-       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);
-       resize_title(c);
 }
 
 }
 
-void
-update_size(Client *c)
+static int
+xerrordummy(Display *dsply, XErrorEvent *ee)
 {
 {
-       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;
-       }
-       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;
+       return 0;
 }
 
 }
 
-void
-craise(Client *c)
-{
-       XRaiseWindow(dpy, c->win);
-       XRaiseWindow(dpy, c->title);
-}
+/* extern functions */
 
 void
 
 void
-lower(Client *c)
+ban(Client *c)
 {
 {
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
 }
 
 void
 focus(Client *c)
 {
        Client *old = sel;
 }
 
 void
 focus(Client *c)
 {
        Client *old = sel;
-       XEvent ev;
 
 
-       XFlush(dpy);
+       if (!issel)
+               return;
+       if(sel && sel->ismax)
+               togglemax(NULL);
        sel = c;
        if(old && old != c)
        sel = c;
        if(old && old != c)
-               draw_client(old);
-       draw_client(c);
+               drawtitle(old);
+       drawtitle(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       XFlush(dpy);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 }
 
-static void
-init_tags(Client *c)
+void
+focusnext(Arg *arg)
 {
 {
-       XClassHint ch;
-       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
-       unsigned int i, j;
-       Bool matched = False;
-
-       if(!len) {
-               c->tags[tsel] = tags[tsel];
+       Client *c;
+   
+       if(!sel)
                return;
                return;
-       }
 
 
-       if(XGetClassHint(dpy, c->win, &ch)) {
-               if(ch.res_class && ch.res_name) {
-                       for(i = 0; i < len; i++)
-                               if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
-                                       && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
-                               {
-                                       for(j = 0; j < TLast; j++)
-                                               c->tags[j] = rule[i].tags[j];
-                                       c->floating = rule[i].floating;
-                                       matched = True;
-                                       break;
-                               }
-               }
-               if(ch.res_class)
-                       XFree(ch.res_class);
-               if(ch.res_name)
-                       XFree(ch.res_name);
+       if(!(c = getnext(sel->next)))
+               c = getnext(clients);
+       if(c) {
+               focus(c);
+               restack();
        }
        }
-
-       if(!matched)
-               c->tags[tsel] = tags[tsel];
 }
 
 void
 }
 
 void
-manage(Window w, XWindowAttributes *wa)
+focusprev(Arg *arg)
 {
 {
-       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 = win_proto(c->win);
-       update_size(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;
+       Client *c;
 
 
-       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);
+       if(!sel)
+               return;
 
 
-       update_name(c);
-       init_tags(c);
+       if(!(c = getprev(sel->prev))) {
+               for(c = clients; c && c->next; c = c->next);
+               c = getprev(c);
+       }
+       if(c) {
+               focus(c);
+               restack();
+       }
+}
 
 
-       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->floating)
-               c->floating = 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_client(c);
-               XMapRaised(dpy, c->win);
-               XMapRaised(dpy, c->title);
-       }
+       for(c = clients; c; c = c->next)
+               if(c->title == w)
+                       return c;
+       return NULL;
 }
 
 void
 }
 
 void
@@ -248,6 +124,8 @@ 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:
@@ -262,13 +140,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:
@@ -285,8 +163,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) {
@@ -297,98 +173,294 @@ gravitate(Client *c, Bool invert)
        c->y += dy;
 }
 
        c->y += dy;
 }
 
+void
+killclient(Arg *arg)
+{
+       if(!sel)
+               return;
+       if(sel->proto & PROTODELWIN)
+               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+       else
+               XKillClient(dpy, sel->win);
+}
 
 void
 
 void
-resize(Client *c, Bool inc)
+manage(Window w, XWindowAttributes *wa)
 {
 {
-       XConfigureEvent e;
+       Client *c;
+       Window trans;
+       XSetWindowAttributes twa;
+
+       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;
+
+       c->border = 0;
+       setsize(c);
+
+       if(c->h != sh && c->y < bh)
+               c->y = c->ty = bh;
+
+       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;
 
 
-       if(inc) {
+       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);
+
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+
+       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);
+
+       settags(c);
+       if(!c->isfloat)
+               c->isfloat = trans
+                       || (c->maxw && c->minw &&
+                               c->maxw == c->minw && c->maxh == c->minh);
+       settitle(c);
+
+       if(isvisible(c))
+               sel = c;
+       arrange(NULL);
+       XMapWindow(dpy, c->win);
+       XMapWindow(dpy, c->title);
+       if(isvisible(c))
+               focus(c);
+}
+
+void
+resize(Client *c, Bool sizehints, Corner sticky)
+{
+       int bottom = c->y + c->h;
+       int right = c->x + c->w;
+       /*XConfigureEvent e;*/
+       XWindowChanges wc;
+
+       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->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(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;
-       resize_title(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);
+       if(c->x > right) /* might happen on restart */
+               c->x = right - c->w;
+       if(c->y > bottom)
+               c->y = bottom - c->h;
+       if(sticky == TopRight || sticky == BotRight)
+               c->x = right - c->w;
+       if(sticky == BotLeft || sticky == BotRight)
+               c->y = bottom - c->h;
+
+       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 = 1;
+       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       XSync(dpy, False);
 }
 
 }
 
-static int
-dummy_error_handler(Display *dsply, XErrorEvent *err)
+void
+setsize(Client *c)
 {
 {
-       return 0;
+       long msize;
+       XSizeHints size;
+
+       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
-unmanage(Client *c)
+settitle(Client *c)
 {
 {
-       Client **l;
+       char **list = NULL;
+       int n;
+       XTextProperty name;
 
 
+       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);
+       resizetitle(c);
+}
+
+void
+togglemax(Arg *arg)
+{
+       int ox, oy, ow, oh;
+       XEvent ev;
+
+       if(!sel)
+               return;
+
+       if((sel->ismax = !sel->ismax)) {
+               ox = sel->x;
+               oy = sel->y;
+               ow = sel->w;
+               oh = sel->h;
+               sel->x = sx;
+               sel->y = sy + bh;
+               sel->w = sw - 2;
+               sel->h = sh - 2 - bh;
+
+               restack();
+               resize(sel, arrange == dofloat, TopLeft);
+
+               sel->x = ox;
+               sel->y = oy;
+               sel->w = ow;
+               sel->h = oh;
+       }
+       else
+               resize(sel, False, TopLeft);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+unmanage(Client *c)
+{
        XGrabServer(dpy);
        XGrabServer(dpy);
-       XSetErrorHandler(dummy_error_handler);
+       XSetErrorHandler(xerrordummy);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->title);
 
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->title);
 
-       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(c->prev)
+               c->prev->next = c->next;
+       if(c->next)
+               c->next->prev = c->prev;
+       if(c == clients)
+               clients = c->next;
        if(sel == c)
        if(sel == c)
-               sel = sel->revert ? sel->revert : clients;
-
+               sel = getnext(clients);
+       free(c->tags);
        free(c);
 
        free(c);
 
-       XFlush(dpy);
-       XSetErrorHandler(error_handler);
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        XUngrabServer(dpy);
-       arrange(NULL);
        if(sel)
                focus(sel);
        if(sel)
                focus(sel);
+       arrange(NULL);
 }
 
 }
 
-Client *
-gettitle(Window w)
+void
+zoom(Arg *arg)
 {
        Client *c;
 {
        Client *c;
-       for(c = clients; c; c = c->next)
-               if(c->title == w)
-                       return c;
-       return NULL;
-}
 
 
-Client *
-getclient(Window w)
-{
-       Client *c;
-       for(c = clients; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
+       if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
+               return;
+
+       if(sel == getnext(clients))  {
+               if((c = getnext(sel->next)))
+                       sel = c;
+               else
+                       return;
+       }
+
+       /* pop */
+       sel->prev->next = sel->next;
+       if(sel->next)
+               sel->next->prev = sel->prev;
+       sel->prev = NULL;
+       clients->prev = sel;
+       sel->next = clients;
+       clients = sel;
+       focus(sel);
+       arrange(NULL);
 }
 }