implemened distinguishing float/managed geometries of clients (works quite well)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 63fb1e5..beb7e35 100644 (file)
--- a/client.c
+++ b/client.c
@@ -2,129 +2,45 @@
  * (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;
 
 {
        int i;
 

-       c->tw = 0;
+       c->bw = 0;

        for(i = 0; i < TLast; i++)
                if(c->tags[i])
        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);
+                       c->bw += textw(c->tags[i]);
+       c->bw += textw(c->name);
+       if(c->bw > *c->w)
+               c->bw = *c->w + 2;
+       c->bx = *c->x + *c->w - c->bw + 2;
+       c->by = *c->y;
+       XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);

 }
 
 }
 

-void
-update_name(Client *c)
-{
-       XTextProperty name;
-       int n;
-       char **list = NULL;
-
-       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->bx + 2 * sw, c->by);

 }
 
 void
 }
 
 void


@@ -133,113 +49,64 @@ focus(Client *c)
        Client *old = sel;
        XEvent ev;
 
        Client *old = sel;
        XEvent ev;
 

-       XFlush(dpy);

        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);
+       XSync(dpy, False);

        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
        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, tsel)))
+               c = getnext(clients, tsel);
+       if(c) {
+               higher(c);
+               c->revert = sel;
+               focus(c);

        }
        }

-
-       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;
-
-       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);
-       init_tags(c);
-
-       for(l = &clients; *l; l = &(*l)->next);
-       c->next = *l; /* *l == nil */
-       *l = 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);
+       Client *c;

 
 

-       if(!c->floating)
-               c->floating = trans
-                       || ((c->maxw == c->minw) && (c->maxh == c->minh));
+       if(!sel)
+               return;

 
 

-       arrange(NULL);
-       /* mapping the window now prevents flicker */
-       if(c->tags[tsel]) {
-               XMapRaised(dpy, c->win);
-               XMapRaised(dpy, c->title);
+       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+               higher(c);

                focus(c);
        }
                focus(c);
        }

-       else {
-               ban_client(c);
-               XMapRaised(dpy, c->win);
-               XMapRaised(dpy, c->title);
-       }
+}
+
+Client *
+getclient(Window w)
+{
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->win == w)
+                       return c;
+       return NULL;
+}
+
+Client *
+getctitle(Window w)
+{
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->title == w)
+                       return c;
+       return NULL;

 }
 
 void
 }
 
 void


@@ -257,12 +124,12 @@ gravitate(Client *c, Bool invert)
        case EastGravity:
        case CenterGravity:
        case WestGravity:
        case EastGravity:
        case CenterGravity:
        case WestGravity:

-               dy = -(c->h / 2) + c->border;
+               dy = -(*c->h / 2) + c->border;

                break;
        case SouthEastGravity:
        case SouthGravity:
        case SouthWestGravity:
                break;
        case SouthEastGravity:
        case SouthGravity:
        case SouthWestGravity:

-               dy = -c->h;
+               dy = -(*c->h);

                break;
        default:
                break;
                break;
        default:
                break;


@@ -278,12 +145,12 @@ gravitate(Client *c, Bool invert)
        case NorthGravity:
        case CenterGravity:
        case SouthGravity:
        case NorthGravity:
        case CenterGravity:
        case SouthGravity:

-               dx = -(c->w / 2) + c->border;
+               dx = -(*c->w / 2) + c->border;

                break;
        case NorthEastGravity:
        case EastGravity:
        case SouthEastGravity:
                break;
        case NorthEastGravity:
        case EastGravity:
        case SouthEastGravity:

-               dx = -(c->w + c->border);
+               dx = -(*c->w + c->border);

                break;
        default:
                break;
                break;
        default:
                break;


@@ -293,10 +160,127 @@ gravitate(Client *c, Bool invert)
                dx = -dx;
                dy = -dy;
        }
                dx = -dx;
                dy = -dy;
        }

-       c->x += dx;
-       c->y += dy;
+       *c->x += dx;
+       *c->y += dy;
+}
+
+void
+higher(Client *c)
+{
+       XRaiseWindow(dpy, c->win);
+       XRaiseWindow(dpy, c->title);
+}
+
+void
+killclient(Arg *arg)
+{
+       if(!sel)
+               return;
+       if(sel->proto & WM_PROTOCOL_DELWIN)
+               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+       else
+               XKillClient(dpy, sel->win);
+}
+
+void
+lower(Client *c)
+{
+       XLowerWindow(dpy, c->title);
+       XLowerWindow(dpy, c->win);
+}
+
+void
+manage(Window w, XWindowAttributes *wa)
+{
+       Client *c;
+       XSetWindowAttributes twa;
+       Window trans;
+
+       c = emallocz(sizeof(Client));
+       c->win = w;
+       c->bx = c->fx = c->tx = wa->x;
+       c->by = c->fy = c->ty = wa->y;
+       if(c->fy < bh)
+               c->by = c->fy = c->ty += bh;
+       c->bw = c->fw = c->tw = wa->width;
+       c->fh = c->th = wa->height;
+       c->bh = 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->bx, c->by, c->bw, c->bh,
+                       0, DefaultDepth(dpy, screen), CopyFromParent,
+                       DefaultVisual(dpy, screen),
+                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
+
+       settags(c);
+
+       c->next = clients;
+       clients = c;
+
+       XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
+                       GrabModeAsync, GrabModeSync, None, None);
+       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);
+
+       if(!c->isfloat)
+               c->isfloat = trans
+                       || ((c->maxw == c->minw) && (c->maxh == c->minh));
+
+       setgeom(c);
+       settitle(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);
+               XSync(dpy, False);
+       }

 }
 
 }
 

+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);
+}
+
+void
+pop(Client *c)
+{
+       Client **l;
+       for(l = &clients; *l && *l != c; l = &(*l)->next);
+       *l = c->next;
+
+       c->next = clients; /* pop */
+       clients = c;
+       arrange(NULL);
+}

 
 void
 resize(Client *c, Bool inc)
 
 void
 resize(Client *c, Bool inc)


@@ -305,43 +289,120 @@ resize(Client *c, Bool inc)
 
        if(inc) {
                if(c->incw)
 
        if(inc) {
                if(c->incw)

-                       c->w -= (c->w - c->basew) % c->incw;
+                       *c->w -= (*c->w - c->basew) % c->incw;

                if(c->inch)
                if(c->inch)

-                       c->h -= (c->h - c->baseh) % 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);
+       if(*c->x > sw) /* might happen on restart */
+               *c->x = sw - *c->w;
+       if(*c->y > sh)
+               *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);
        XSetWindowBorderWidth(dpy, c->win, 1);

-       XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+       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->x;
-       e.y = c->y;
-       e.width = c->w;
-       e.height = c->h;
+       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);
        e.border_width = c->border;
        e.above = None;
        e.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);

-       XFlush(dpy);
+       XSync(dpy, False);

 }
 
 }
 

-static int
-dummy_error_handler(Display *dsply, XErrorEvent *err)
+void
+setgeom(Client *c)

 {
 {

-       return 0;
+       if((arrange == dotile) && !c->isfloat) {
+               c->x = &c->tx;
+               c->y = &c->ty;
+               c->w = &c->tw;
+               c->h = &c->th;
+       }
+       else {
+               c->x = &c->fx;
+               c->y = &c->fy;
+               c->w = &c->fw;
+               c->h = &c->fh;
+       }
+}
+
+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;
+       }
+       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
+settitle(Client *c)
+{
+       XTextProperty name;
+       int n;
+       char **list = NULL;
+
+       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
 }
 
 void


@@ -350,7 +411,7 @@ unmanage(Client *c)
        Client **l;
 
        XGrabServer(dpy);
        Client **l;
 
        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);


@@ -365,30 +426,27 @@ unmanage(Client *c)
 
        free(c);
 
 
        free(c);
 

-       XFlush(dpy);
-       XSetErrorHandler(error_handler);
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);

        XUngrabServer(dpy);
        arrange(NULL);
        if(sel)
                focus(sel);
 }
 
        XUngrabServer(dpy);
        arrange(NULL);
        if(sel)
                focus(sel);
 }
 

-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)
+               return;
+
+       if(sel == getnext(clients, tsel) && sel->next)  {
+               if((c = getnext(sel->next, tsel)))
+                       sel = c;
+       }
+
+       pop(sel);
+       focus(sel);

 }
 }