removed obsolete stuff

[dwm.git] / client.c

diff --git a/client.c b/client.c
index f87fb80..679e2be 100644 (file)
--- a/client.c
+++ b/client.c
@@ -3,13 +3,137 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

+#include <math.h>

 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>

+#include <X11/Xutil.h>

 
 

-#include "util.h"

 #include "wm.h"
 
 #include "wm.h"
 

+static void floating(void);
+static void tiling(void);
+static void (*arrange)(void) = tiling;
+
+void
+max(void *aux)
+{
+       if(!stack)
+               return;
+       stack->x = sx;
+       stack->y = sy;
+       stack->w = sw - 2 * stack->border;
+       stack->h = sh - 2 * stack->border;
+       resize(stack);
+       discard_events(EnterWindowMask);
+}
+
+static void
+floating(void)
+{
+       Client *c;
+
+       for(c = stack; c; c = c->snext)
+               resize(c);
+       discard_events(EnterWindowMask);
+}
+
+static void
+tiling(void)
+{
+       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;
+               }
+       }
+       discard_events(EnterWindowMask);
+}
+
+void
+toggle(void *aux)
+{
+       if(arrange == floating)
+               arrange = tiling;
+       else
+               arrange = floating;
+       arrange();
+}
+
+
+void
+sel(void *aux)
+{
+       const char *arg = aux;
+       Client *c = NULL;
+
+       if(!arg || !stack)
+               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);
+       focus(c);
+}
+
+void
+ckill(void *aux)
+{
+       Client *c = stack;
+
+       if(!c)
+               return;
+       if(c->proto & WM_PROTOCOL_DELWIN)
+               send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+       else
+               XKillClient(dpy, c->win);
+}
+
+static void
+resize_title(Client *c)
+{
+       int i;
+
+       c->tw = 0;
+       for(i = 0; i < TLast; i++)
+               if(c->tags[i])
+                       c->tw += textw(&dc.font, c->tags[i]) + dc.font.height;
+       c->tw += textw(&dc.font, c->name) + dc.font.height;
+       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)
 {


@@ -35,18 +159,78 @@ update_name(Client *c)
                }
        }
        XFree(name.value);
                }
        }
        XFree(name.value);

+       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
+               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
+craise(Client *c)
+{
+       XRaiseWindow(dpy, c->win);
+       XRaiseWindow(dpy, c->title);
+}
+
+void
+lower(Client *c)
+{
+       XLowerWindow(dpy, c->title);
+       XLowerWindow(dpy, c->win);

 }
 
 void
 focus(Client *c)
 {
 }
 
 void
 focus(Client *c)
 {

-       Client **l;
-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       eassert(*l == c);
-       *l = c->snext;
+       Client **l, *old;
+
+       old = stack;
+       for(l = &stack; *l && *l != c; l = &(*l)->snext);
+       if(*l)
+               *l = c->snext;

        c->snext = stack;
        stack = c;
        c->snext = stack;
        stack = c;

-       XRaiseWindow(dpy, c->win);
+       if(old && old != c) {
+               XMapWindow(dpy, old->title);
+               draw_client(old);
+       }
+       XUnmapWindow(dpy, c->title);
+       draw_client(c);

        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
 }
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        XFlush(dpy);
 }


@@ -56,45 +240,138 @@ manage(Window w, XWindowAttributes *wa)
 {
        Client *c, **l;
        XSetWindowAttributes twa;
 {
        Client *c, **l;
        XSetWindowAttributes twa;

-       long msize;

 
        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);
+       c->tx = c->x = wa->x;
+       c->ty = c->y = wa->y;
+       c->tw = c->w = wa->width;
+       c->h = wa->height;
+       c->th = th;
+       c->border = 1;
+       update_size(c);
+       XSetWindowBorderWidth(dpy, c->win, 1);
+       XSetWindowBorder(dpy, c->win, dc.border);
+       XSelectInput(dpy, c->win,
+                       StructureNotifyMask | PropertyChangeMask | EnterWindowMask);

        XGetTransientForHint(dpy, c->win, &c->trans);
        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);

        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->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);
 
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 

+       update_name(c);

        for(l=&clients; *l; l=&(*l)->next);
        c->next = *l; /* *l == nil */
        *l = c;
        for(l=&clients; *l; l=&(*l)->next);
        c->next = *l; /* *l == nil */
        *l = c;

-       c->snext = stack;
-       stack = c;
-       XMapWindow(dpy, c->win);
+       XMapRaised(dpy, c->win);
+       XMapRaised(dpy, c->title);
+       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);
+       arrange();

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

+void
+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)
+{
+       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(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);
+       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
 static int

-dummy_error_handler(Display *dpy, XErrorEvent *error)
+dummy_error_handler(Display *dsply, XErrorEvent *err)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -107,25 +384,32 @@ unmanage(Client *c)
        XGrabServer(dpy);
        XSetErrorHandler(dummy_error_handler);
 
        XGrabServer(dpy);
        XSetErrorHandler(dummy_error_handler);
 

-       XUnmapWindow(dpy, c->win);
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

        XDestroyWindow(dpy, c->title);
 
        for(l=&clients; *l && *l != c; l=&(*l)->next);
        XDestroyWindow(dpy, c->title);
 
        for(l=&clients; *l && *l != c; l=&(*l)->next);

-       eassert(*l == c);

        *l = c->next;
        for(l=&stack; *l && *l != c; l=&(*l)->snext);
        *l = c->next;
        for(l=&stack; *l && *l != c; l=&(*l)->snext);

-       eassert(*l == c);

        *l = c->snext;
        free(c);
 
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);
        *l = c->snext;
        free(c);
 
        XFlush(dpy);
        XSetErrorHandler(error_handler);
        XUngrabServer(dpy);

-       flush_events(EnterWindowMask);
+       arrange();

        if(stack)
                focus(stack);
 }
 
        if(stack)
                focus(stack);
 }
 

+Client *
+gettitle(Window w)
+{
+       Client *c;
+       for(c = clients; c; c = c->next)
+               if(c->title == w)
+                       return c;
+       return NULL;
+}

 
 Client *
 getclient(Window w)
 
 Client *
 getclient(Window w)


@@ -140,7 +424,25 @@ getclient(Window w)
 void
 draw_client(Client *c)
 {
 void
 draw_client(Client *c)
 {

-       
+       int i;
+       if(c == stack)
+               return;

 
 

+       dc.x = dc.y = 0;
+       dc.h = c->th;

 
 

+       dc.w = 0;
+       for(i = 0; i < TLast; i++) {
+               if(c->tags[i]) {
+                       dc.x += dc.w;
+                       dc.w = textw(&dc.font, c->tags[i]) + dc.font.height;
+                       draw(True, c->tags[i]);
+               }
+       }
+       dc.x += dc.w;
+       dc.w = textw(&dc.font, c->name) + dc.font.height;
+       draw(True, c->name);
+       XCopyArea(dpy, dc.drawable, c->title, dc.gc,
+                       0, 0, c->tw, c->th, 0, 0);
+       XFlush(dpy);

 }
 }