Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
except improvements to the mouse handling this is already nearly feature complete
[dwm.git] / client.c
diff --git a/client.c b/client.c
index 5e7321d..b2318ab 100644 (file)
--- a/client.c
+++ b/client.c
@@ -3,119 +3,216 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 
-#include <math.h>
 #include <stdlib.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 #include "dwm.h"
 
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 #include "dwm.h"
 
-static void floating(void);
-static void tiling(void);
-static void (*arrange)(void) = floating;
+void (*arrange)(Arg *) = tiling;
+
+static Rule rule[] = {
+       /* class                        instance        tags                                            floating */
+       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
+};
+
+static Client *
+next(Client *c)
+{
+       for(; c && !c->tags[tsel]; c = c->next);
+       return c;
+}
+
+void
+zoom(Arg *arg)
+{
+       Client **l, *old;
+
+       if(!(old = sel))
+               return;
+
+       for(l = &clients; *l && *l != sel; l = &(*l)->next);
+       *l = sel->next;
+
+       old->next = clients; /* pop */
+       clients = old;
+       sel = old;
+       arrange(NULL);
+       focus(sel);
+}
 
 void
 
 void
-max(void *aux)
+max(Arg *arg)
 {
 {
-       if(!stack)
+       if(!sel)
                return;
                return;
-       stack->x = sx;
-       stack->y = sy;
-       stack->w = sw - 2 * stack->border;
-       stack->h = sh - 2 * stack->border;
-       resize(stack);
+       sel->x = sx;
+       sel->y = sy;
+       sel->w = sw - 2 * sel->border;
+       sel->h = sh - 2 * sel->border;
+       craise(sel);
+       resize(sel, False);
        discard_events(EnterWindowMask);
 }
 
        discard_events(EnterWindowMask);
 }
 
-static void
-floating(void)
+void
+view(Arg *arg)
 {
        Client *c;
 
 {
        Client *c;
 
-       for(c = stack; c; c = c->snext)
-               resize(c);
-       discard_events(EnterWindowMask);
+       tsel = arg->i;
+       arrange(NULL);
+
+       for(c = clients; c; c = next(c->next))
+               draw_client(c);
+}
+
+void
+tappend(Arg *arg)
+{
+       if(!sel)
+               return;
+
+       sel->tags[arg->i] = tags[arg->i];
+       arrange(NULL);
+}
+
+void
+ttrunc(Arg *arg)
+{
+       int i;
+       if(!sel)
+               return;
+
+       for(i = 0; i < TLast; i++)
+               sel->tags[i] = NULL;
+       tappend(arg);
 }
 
 static void
 }
 
 static void
-tiling(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);
+}
+
+void
+floating(Arg *arg)
 {
        Client *c;
 {
        Client *c;
-       int n, cols, rows, gw, gh, i, j;
-    float rt, fd;
 
 
-       if(!clients)
-               return;
-       for(n = 0, c = clients; c; c = c->next, n++);
-       rt = sqrt(n);
-       if(modff(rt, &fd) < 0.5)
-               rows = floor(rt);
-       else
-               rows = ceil(rt);
-       if(rows * rows < n)
-               cols = rows + 1;
-       else
-               cols = rows;
-
-       gw = (sw - 2)  / cols;
-       gh = (sh - 2) / rows;
-
-       for(i = j = 0, c = clients; c; c = c->next) {
-               c->x = i * gw;
-               c->y = j * gh;
-               c->w = gw;
-               c->h = gh;
-               resize(c);
-               if(++i == cols) {
-                       j++;
-                       i = 0;
+       arrange = floating;
+       for(c = clients; c; c = c->next) {
+               if(c->tags[tsel])
+                       resize(c, True);
+               else
+                       ban_client(c);
+       }
+       if(sel && !sel->tags[tsel]) {
+               if((sel = next(clients))) {
+                       craise(sel);
+                       focus(sel);
                }
        }
        discard_events(EnterWindowMask);
 }
 
 void
                }
        }
        discard_events(EnterWindowMask);
 }
 
 void
-toggle(void *aux)
+tiling(Arg *arg)
 {
 {
-       if(arrange == floating)
-               arrange = tiling;
-       else
-               arrange = floating;
-       arrange();
+       Client *c;
+       int n, i, w, h;
+
+       w = sw - mw;
+       arrange = tiling;
+       for(n = 0, c = clients; c; c = c->next)
+               if(c->tags[tsel] && !c->floating)
+                       n++;
+
+       h = (n > 1) ? sh / (n - 1) : sh;
+
+       for(i = 0, c = clients; c; c = c->next) {
+               if(c->tags[tsel]) {
+                       if(c->floating) {
+                               craise(c);
+                               resize(c, True);
+                               continue;
+                       }
+                       if(n == 1) {
+                               c->x = sx;
+                               c->y = sy;
+                               c->w = sw - 2 * c->border;
+                               c->h = sh - 2 * c->border;
+                       }
+                       else if(i == 0) {
+                               c->x = sx;
+                               c->y = sy;
+                               c->w = mw - 2 * c->border;
+                               c->h = sh - 2 * c->border;
+                       }
+                       else {
+                               c->x = sx + mw;
+                               c->y = sy + (i - 1) * h;
+                               c->w = w - 2 * c->border;
+                               c->h = h - 2 * c->border;
+                       }
+                       resize(c, False);
+                       i++;
+               }
+               else
+                       ban_client(c);
+       }
+       if(sel && !sel->tags[tsel]) {
+               if((sel = next(clients))) {
+                       craise(sel);
+                       focus(sel);
+               }
+       }
+       discard_events(EnterWindowMask);
 }
 
 }
 
-
 void
 void
-sel(void *aux)
+prevc(Arg *arg)
 {
 {
-       const char *arg = aux;
-       Client *c = NULL;
+       Client *c;
 
 
-       if(!arg || !stack)
+       if(!sel)
                return;
                return;
-       if(!strncmp(arg, "next", 5))
-               c = stack->snext ? stack->snext : stack;
-       else if(!strncmp(arg, "prev", 5))
-               for(c = stack; c && c->snext; c = c->snext);
-       if(!c)
-               c = stack;
-       craise(c);
-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
-       focus(c);
+
+       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+               craise(c);
+               focus(c);
+       }
 }
 
 void
 }
 
 void
-ckill(void *aux)
+nextc(Arg *arg)
 {
 {
-       Client *c = stack;
+       Client *c;
+   
+       if(!sel)
+               return;
+
+       if(!(c = next(sel->next)))
+               c = next(clients);
+       if(c) {
+               craise(c);
+               c->revert = sel;
+               focus(c);
+       }
+}
 
 
-       if(!c)
+void
+ckill(Arg *arg)
+{
+       if(!sel)
                return;
                return;
-       if(c->proto & WM_PROTOCOL_DELWIN)
-               send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+       if(sel->proto & WM_PROTOCOL_DELWIN)
+               send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
        else
        else
-               XKillClient(dpy, c->win);
+               XKillClient(dpy, sel->win);
 }
 
 static void
 }
 
 static void
@@ -218,32 +315,59 @@ lower(Client *c)
 void
 focus(Client *c)
 {
 void
 focus(Client *c)
 {
-       Client **l, *old;
+       Client *old = sel;
 
 
-       old = stack;
-       for(l = &stack; *l && *l != c; l = &(*l)->snext);
-       if(*l)
-               *l = c->snext;
-       c->snext = stack;
-       stack = c;
-       if(old && old != c) {
-               XSetWindowBorder(dpy, old->win, dc.bg);
-               XMapWindow(dpy, old->title);
+       sel = c;
+       if(old && old != c)
                draw_client(old);
                draw_client(old);
-       }
-       XUnmapWindow(dpy, c->title);
-       XSetWindowBorder(dpy, c->win, dc.fg);
        draw_client(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
        discard_events(EnterWindowMask);
 }
 
        draw_client(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
        discard_events(EnterWindowMask);
 }
 
+static void
+init_tags(Client *c)
+{
+       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];
+               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(!matched)
+               c->tags[tsel] = tags[tsel];
+}
+
 void
 manage(Window w, XWindowAttributes *wa)
 {
        Client *c, **l;
        XSetWindowAttributes twa;
 void
 manage(Window w, XWindowAttributes *wa)
 {
        Client *c, **l;
        XSetWindowAttributes twa;
+       Window trans;
 
        c = emallocz(sizeof(Client));
        c->win = w;
 
        c = emallocz(sizeof(Client));
        c->win = w;
@@ -253,24 +377,27 @@ manage(Window w, XWindowAttributes *wa)
        c->h = wa->height;
        c->th = th;
        c->border = 1;
        c->h = wa->height;
        c->th = th;
        c->border = 1;
+       c->proto = win_proto(c->win);
        update_size(c);
        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        update_size(c);
        XSelectInput(dpy, c->win,
                        StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-       XGetTransientForHint(dpy, c->win, &c->trans);
+       XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 
-       c->tags[tsel] = tags[tsel];
        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);
 
        update_name(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);
 
        update_name(c);
-       for(l=&clients; *l; l=&(*l)->next);
+       init_tags(c);
+
+       for(l = &clients; *l; l = &(*l)->next);
        c->next = *l; /* *l == nil */
        *l = c;
        c->next = *l; /* *l == nil */
        *l = c;
+
        XSetWindowBorderWidth(dpy, c->win, 1);
        XMapRaised(dpy, c->win);
        XMapRaised(dpy, c->title);
        XSetWindowBorderWidth(dpy, c->win, 1);
        XMapRaised(dpy, c->win);
        XMapRaised(dpy, c->title);
@@ -280,9 +407,16 @@ manage(Window w, XWindowAttributes *wa)
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
-       arrange();
-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
-       focus(c);
+
+       if(!c->floating)
+               c->floating = trans
+                       || ((c->maxw == c->minw) && (c->maxh == c->minh));
+
+       arrange(NULL);
+       if(c->tags[tsel])
+               focus(c);
+       else
+               ban_client(c);
 }
 
 void
 }
 
 void
@@ -342,14 +476,16 @@ gravitate(Client *c, Bool invert)
 
 
 void
 
 
 void
-resize(Client *c)
+resize(Client *c, Bool inc)
 {
        XConfigureEvent e;
 
 {
        XConfigureEvent e;
 
-       if(c->incw)
-               c->w -= (c->w - c->basew) % c->incw;
-       if(c->inch)
-               c->h -= (c->h - c->baseh) % c->inch;
+       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->minw && c->w < c->minw)
                c->w = c->minw;
        if(c->minh && c->h < c->minh)
        if(c->minw && c->w < c->minw)
                c->w = c->minw;
        if(c->minh && c->h < c->minh)
@@ -391,18 +527,22 @@ unmanage(Client *c)
        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);
+       for(l = &clients; *l && *l != c; l = &(*l)->next);
        *l = c->next;
        *l = c->next;
-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       *l = c->snext;
+       for(l = &clients; *l; l = &(*l)->next)
+               if((*l)->revert == c)
+                       (*l)->revert = NULL;
+       if(sel == c)
+               sel = sel->revert ? sel->revert : clients;
+
        free(c);
 
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);
        free(c);
 
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);
-       arrange();
-       if(stack)
-               focus(stack);
+       arrange(NULL);
+       if(sel)
+               focus(sel);
 }
 
 Client *
 }
 
 Client *
@@ -429,8 +569,14 @@ void
 draw_client(Client *c)
 {
        int i;
 draw_client(Client *c)
 {
        int i;
-       if(c == stack)
+       if(c == sel) {
+               XUnmapWindow(dpy, c->title);
+               XSetWindowBorder(dpy, c->win, dc.fg);
                return;
                return;
+       }
+
+       XSetWindowBorder(dpy, c->win, dc.bg);
+       XMapWindow(dpy, c->title);
 
        dc.x = dc.y = 0;
        dc.h = c->th;
 
        dc.x = dc.y = 0;
        dc.h = c->th;