Add support for _NEW_WM_STRUT

Lets things like dzen work

diff --git a/sys-x11.c b/sys-x11.c
index e60b97c7e94f4f47e1ef2a5e8f9751d74b9075ce..c606d9a30beec484460930b293c9a0b31f70ae0b 100644 (file)
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -4,6 +4,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
+#include <X11/Xatom.h>
 #include <X11/keysym.h>
 
 #include "util.h"
@@ -14,6 +15,9 @@
 struct win_sys {
        Window   xid;
        Display *dpy;
+       struct {
+               int left, right, top, bottom;
+       } strut;
 };
 
 typedef struct {
@@ -22,7 +26,7 @@ typedef struct {
 } keymap_t;
 
 typedef enum {
-       wm_proto, wm_focus, natoms
+       wm_proto, wm_focus, net_strut, natoms
 } atom_t;
 
 /* Global data */
@@ -103,6 +107,7 @@ static ptr_t x2ptr(XEvent *_ev)
        XKeyEvent *ev = &_ev->xkey;
        return (ptr_t){ev->x, ev->y, ev->x_root, ev->y_root};
 }
+
 static Window getfocus(win_t *root, XEvent *event)
 {
        int revert;
@@ -116,6 +121,54 @@ static Window getfocus(win_t *root, XEvent *event)
        return focus;
 }
 
+/* Helpers */
+static int add_strut(win_t *root, win_t *win)
+{
+       /* Get X11 strut data */
+       Atom ret_type;
+       int ret_size;
+       unsigned long ret_items, bytes_left;
+       unsigned char *xdata;
+       int status = XGetWindowProperty(win->sys->dpy, win->sys->xid,
+                       atoms[net_strut], 0L, 4L, False, XA_CARDINAL,
+                       &ret_type, &ret_size, &ret_items, &bytes_left, &xdata);
+       if (status != Success || ret_size != 32 || ret_items != 4)
+               return 0;
+
+       int left   = ((int*)xdata)[0];
+       int right  = ((int*)xdata)[1];
+       int top    = ((int*)xdata)[2];
+       int bottom = ((int*)xdata)[3];
+       if (left == 0 && right == 0 && top == 0 && bottom == 0)
+               return 0;
+
+       win->sys->strut.left   = left;
+       win->sys->strut.right  = right;
+       win->sys->strut.top    = top;
+       win->sys->strut.bottom = bottom;
+       root->x += left;
+       root->y += top;
+       root->w -= left+right;
+       root->h -= top+bottom;
+       return 1;
+}
+
+static int del_strut(win_t *root, win_t *win)
+{
+       int left   = win->sys->strut.left;
+       int right  = win->sys->strut.right;
+       int top    = win->sys->strut.top;
+       int bottom = win->sys->strut.bottom;
+       if (left == 0 && right == 0 && top == 0 && bottom == 0)
+               return 0;
+
+       root->x -= left;
+       root->y -= top;
+       root->w += left+right;
+       root->h += top+bottom;
+       return 1;
+}
+
 /* Window functions */
 static win_t *win_new(Display *dpy, Window xid)
 {
@@ -237,8 +290,11 @@ static void process_event(int type, XEvent *ev, win_t *root)
        }
        else if (type == UnmapNotify) {
                //printf("unmap: %d\n", type);
-               if ((win = win_find(dpy,ev->xmap.window,0))) {
-                       wm_remove(win);
+               if ((win = win_find(dpy,ev->xunmap.window,0))) {
+                       if (!del_strut(root, win))
+                               wm_remove(win);
+                       else
+                               wm_update();
                        win_remove(win);
                }
        }
@@ -255,8 +311,12 @@ static void process_event(int type, XEvent *ev, win_t *root)
        }
        else if (type == MapRequest) {
                printf("map_req: %d\n", type);
-               if ((win = win_find(dpy,ev->xmaprequest.window,1)))
-                       wm_insert(win);
+               if ((win = win_find(dpy,ev->xmaprequest.window,1))) {
+                       if (!add_strut(root, win))
+                               wm_insert(win);
+                       else
+                               wm_update();
+               }
                XMapWindow(dpy,ev->xmaprequest.window);
        }
        else {
@@ -351,8 +411,9 @@ win_t *sys_init(void)
                error("Unable to get display");
        if (!(xid = DefaultRootWindow(dpy)))
                error("Unable to get root window");
-       atoms[wm_proto] = XInternAtom(dpy, "WM_PROTOCOLS",  False);
-       atoms[wm_focus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
+       atoms[wm_proto]  = XInternAtom(dpy, "WM_PROTOCOLS",  False);
+       atoms[wm_focus]  = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
+       atoms[net_strut] = XInternAtom(dpy, "_NET_WM_STRUT", False);
        XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask);
        XSetInputFocus(dpy, None, RevertToNone, CurrentTime);
        xerrorxlib = XSetErrorHandler(xerror);
@@ -368,9 +429,10 @@ void sys_run(win_t *root)
                                &par, &xid, &kids, &nkids))
                for(int i = 0; i < nkids; i++) {
                        win_t *win = win_find(root->sys->dpy, kids[i], 1);
-                       if (win && win_viewable(win))
+                       if (win && win_viewable(win) && !add_strut(root,win))
                                wm_insert(win);
                }
+       wm_update(); // For struts
 
        /* Main loop */
        for(;;)

diff --git a/wm-wmii.c b/wm-wmii.c
index 30ded07dc05dc186a1cae810cbc1ba9f91a7ef57..e432363d667876480f4eb006dfcaa2f4a559a3ce 100644 (file)
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -86,8 +86,8 @@ static void arrange(list_t *cols)
        int tx=0, ty=0; // Total x/y size
        int mx=0, my=0; // Maximum x/y size (screen size)
 
-
        /* Scale horizontally */
+       x  = wm_root->x;
        mx = wm_root->w - (list_length(wm_cols)+1)*MARGIN;
        for (list_t *lx = cols; lx; lx = lx->next)
                tx += ((col_t*)lx->data)->width;
@@ -100,7 +100,7 @@ static void arrange(list_t *cols)
                ty = 0;
                for (list_t *ly = col->rows; ly; ly = ly->next)
                        ty += ((win_t*)ly->data)->h;
-               y = 0;
+               y  = wm_root->y;
                my = wm_root->h - (list_length(col->rows)+1)*MARGIN;
                for (list_t *ly = col->rows; ly; ly = ly->next) {
                        win_t *win = ly->data;
@@ -215,6 +215,11 @@ static void shift_focus(win_t *win, int col, int row)
 }
 
 /* Window management functions */
+void wm_update(void)
+{
+       arrange(wm_cols);
+}
+
 int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 {
        if (!win || win == wm_root) return 0;

diff --git a/wm.h b/wm.h
index 024faa771f8bd17b5df0598fcd093c001db98a7d..d25750d274c586b23ecff6e48f7d14f704ea9e98 100644 (file)
--- a/wm.h
+++ b/wm.h
@@ -7,3 +7,5 @@ int wm_handle_ptr(win_t *win, ptr_t ptr);
 void wm_insert(win_t *win);
 
 void wm_remove(win_t *win);
+
+void wm_update(void);