Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
rearranged
[dwm.git] / client.c
diff --git a/client.c b/client.c
index e05fdd7..63fb1e5 100644 (file)
--- a/client.c
+++ b/client.c
@@ -4,13 +4,48 @@
  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <string.h>
 #include <X11/Xatom.h>
+#include <X11/Xutil.h>
 
 
-#include "util.h"
-#include "wm.h"
+#include "dwm.h"
 
 
-#define CLIENT_MASK            (StructureNotifyMask | PropertyChangeMask | EnterWindowMask)
+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 void
+resize_title(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);
+}
 
 void
 update_name(Client *c)
 
 void
 update_name(Client *c)
@@ -37,24 +72,111 @@ update_name(Client *c)
                }
        }
        XFree(name.value);
                }
        }
        XFree(name.value);
-       if(c == stack)
-               draw_bar();
+       resize_title(c);
+}
+
+void
+update_size(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;
+       }
        else
        else
-               draw_client(c);
+               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
-focus(Client *c)
+craise(Client *c)
 {
 {
-       Client **l;
-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       eassert(*l == c);
-       *l = c->snext;
-       c->snext = stack;
-       stack = c;
        XRaiseWindow(dpy, c->win);
        XRaiseWindow(dpy, c->win);
+       XRaiseWindow(dpy, c->title);
+}
+
+void
+lower(Client *c)
+{
+       XLowerWindow(dpy, c->title);
+       XLowerWindow(dpy, c->win);
+}
+
+void
+focus(Client *c)
+{
+       Client *old = sel;
+       XEvent ev;
+
+       XFlush(dpy);
+       sel = c;
+       if(old && old != c)
+               draw_client(old);
+       draw_client(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+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
 }
 
 void
@@ -62,71 +184,162 @@ manage(Window w, XWindowAttributes *wa)
 {
        Client *c, **l;
        XSetWindowAttributes twa;
 {
        Client *c, **l;
        XSetWindowAttributes twa;
-       long msize;
+       Window trans;
 
        c = emallocz(sizeof(Client));
        c->win = w;
 
        c = emallocz(sizeof(Client));
        c->win = w;
-       c->r[RFloat].x = wa->x;
-       c->r[RFloat].y = wa->y;
-       c->r[RFloat].width = wa->width;
-       c->r[RFloat].height = wa->height;
-       c->border = wa->border_width;
-       XSetWindowBorderWidth(dpy, c->win, 0);
-       XSelectInput(dpy, c->win, CLIENT_MASK);
-       XGetTransientForHint(dpy, c->win, &c->trans);
-       if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize) || !c->size.flags)
-               c->size.flags = PSize;
-       c->fixedsize =
-               (c->size.flags & PMinSize && c->size.flags & PMaxSize
-                && c->size.min_width == c->size.max_width
-                && c->size.min_height == c->size.max_height);
-       update_name(c);
+       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;
 
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 
-       c->title = XCreateWindow(dpy, root, c->r[RFloat].x, c->r[RFloat].y,
-                       c->r[RFloat].width, barrect.height, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
+       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);
 
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
-       for(l=&clients; *l; l=&(*l)->next);
+       update_name(c);
+       init_tags(c);
+
+       for(l = &clients; *l; l = &(*l)->next);
        c->next = *l; /* *l == nil */
        *l = c;
        c->next = *l; /* *l == nil */
        *l = c;
-       c->snext = stack;
-       stack = c;
-       XMapWindow(dpy, c->win);
-       XGrabButton(dpy, AnyButton, Mod1Mask, c->win, False, ButtonPressMask,
+
+       XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+       XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
                        GrabModeAsync, GrabModeSync, None, None);
-       focus(c);
+       XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+
+       if(!c->floating)
+               c->floating = trans
+                       || ((c->maxw == c->minw) && (c->maxh == c->minh));
+
+       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);
+       }
 }
 
 void
 }
 
 void
-resize(Client *c)
+gravitate(Client *c, Bool invert)
+{
+       int dx = 0, dy = 0;
+
+       switch(c->grav) {
+       case StaticGravity:
+       case NorthWestGravity:
+       case NorthGravity:
+       case NorthEastGravity:
+               dy = c->border;
+               break;
+       case EastGravity:
+       case CenterGravity:
+       case WestGravity:
+               dy = -(c->h / 2) + c->border;
+               break;
+       case SouthEastGravity:
+       case SouthGravity:
+       case SouthWestGravity:
+               dy = -c->h;
+               break;
+       default:
+               break;
+       }
+
+       switch (c->grav) {
+       case StaticGravity:
+       case NorthWestGravity:
+       case WestGravity:
+       case SouthWestGravity:
+               dx = c->border;
+               break;
+       case NorthGravity:
+       case CenterGravity:
+       case SouthGravity:
+               dx = -(c->w / 2) + c->border;
+               break;
+       case NorthEastGravity:
+       case EastGravity:
+       case SouthEastGravity:
+               dx = -(c->w + c->border);
+               break;
+       default:
+               break;
+       }
+
+       if(invert) {
+               dx = -dx;
+               dy = -dy;
+       }
+       c->x += dx;
+       c->y += dy;
+}
+
+
+void
+resize(Client *c, Bool inc)
 {
        XConfigureEvent e;
 
 {
        XConfigureEvent e;
 
-       XMoveResizeWindow(dpy, c->win, c->r[RFloat].x, c->r[RFloat].y,
-                       c->r[RFloat].width, c->r[RFloat].height);
+       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;
+       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.type = ConfigureNotify;
        e.event = c->win;
        e.window = c->win;
-       e.x = c->r[RFloat].x;
-       e.y = c->r[RFloat].y;
-       e.width = c->r[RFloat].width;
-       e.height = c->r[RFloat].height;
+       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;
        e.border_width = c->border;
        e.above = None;
        e.override_redirect = False;
-       XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
-       XSelectInput(dpy, c->win, CLIENT_MASK);
        XFlush(dpy);
 }
 
 static int
        XFlush(dpy);
 }
 
 static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
+dummy_error_handler(Display *dsply, XErrorEvent *err)
 {
        return 0;
 }
 {
        return 0;
 }
@@ -140,40 +353,42 @@ unmanage(Client *c)
        XSetErrorHandler(dummy_error_handler);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XSetErrorHandler(dummy_error_handler);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       XUnmapWindow(dpy, c->win);
        XDestroyWindow(dpy, c->title);
 
        XDestroyWindow(dpy, c->title);
 
-       for(l=&clients; *l && *l != c; l=&(*l)->next);
-       eassert(*l == c);
+       for(l = &clients; *l && *l != c; l = &(*l)->next);
        *l = c->next;
        *l = c->next;
-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       eassert(*l == c);
-       *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);
-       discard_events(EnterWindowMask);
-       if(stack)
-               focus(stack);
+       arrange(NULL);
+       if(sel)
+               focus(sel);
 }
 
 }
 
-
 Client *
 Client *
-getclient(Window w)
+gettitle(Window w)
 {
        Client *c;
        for(c = clients; c; c = c->next)
 {
        Client *c;
        for(c = clients; c; c = c->next)
-               if(c->win == w)
+               if(c->title == w)
                        return c;
        return NULL;
 }
 
                        return c;
        return NULL;
 }
 
-void
-draw_client(Client *c)
+Client *
+getclient(Window w)
 {
 {
-       
-
-
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->win == w)
+                       return c;
+       return NULL;
 }
 }