X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-x11.c;h=dbab94820cc3dce31adeb1d1f9f310b25773768b;hb=306672f9422fb3be995152e37abb704a9b568726;hp=fd26bf64aed8be4b46ecc1af56498194646395aa;hpb=1d8f2e6933d91390670b30d86e4492a54354e2ac;p=wmpus diff --git a/sys-x11.c b/sys-x11.c index fd26bf6..dbab948 100644 --- a/sys-x11.c +++ b/sys-x11.c @@ -4,16 +4,22 @@ #include #include +#include #include #include "util.h" #include "sys.h" #include "wm.h" +#define BORDER 2 + /* Internal structures */ struct win_sys { Window xid; Display *dpy; + struct { + int left, right, top, bottom; + } strut; }; typedef struct { @@ -22,13 +28,18 @@ typedef struct { } keymap_t; typedef enum { - wm_proto, wm_focus, natoms + wm_proto, wm_focus, net_strut, natoms } atom_t; +typedef enum { + clr_focus, clr_unfocus, clr_urgent, ncolors +} color_t; + /* Global data */ -static void *win_cache = NULL; +static void *win_cache; static Atom atoms[natoms]; static int (*xerrorxlib)(Display *, XErrorEvent *); +static unsigned long colors[ncolors]; /* Conversion functions */ static keymap_t key2sym[] = { @@ -103,6 +114,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 +128,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) { @@ -131,7 +191,9 @@ static win_t *win_new(Display *dpy, Window xid) win->sys = new0(win_sys_t); win->sys->dpy = dpy; win->sys->xid = xid; - printf("%p = %p, %d\n", win, dpy, (int)xid); + printf("win_new: %p = %p, %d (%d,%d %dx%d)\n", + win, dpy, (int)xid, + win->x, win->y, win->w, win->h); return win; } @@ -176,6 +238,16 @@ static int win_viewable(win_t *win) return True; } +/* Drawing functions */ +unsigned long get_color(Display *dpy, const char *name) +{ + XColor color; + int screen = DefaultScreen(dpy); + Colormap cmap = DefaultColormap(dpy, screen); + XAllocNamedColor(dpy, cmap, name, &color, &color); + return color.pixel; +} + /* Callbacks */ static void process_event(int type, XEvent *ev, win_t *root) { @@ -205,9 +277,18 @@ static void process_event(int type, XEvent *ev, win_t *root) //printf("release: %d\n", type); } else if (type == ButtonPress) { - wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr); - XGrabPointer(dpy, ev->xbutton.root, True, PointerMotionMask|ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, None, None, CurrentTime); + if (wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr)) + XGrabPointer(dpy, ev->xbutton.root, True, PointerMotionMask|ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime); + else { + printf("resending event\n"); + XSendEvent(win->sys->dpy, ev->xbutton.window, True, NoEventMask, ev); + XSendEvent(win->sys->dpy, ev->xbutton.window, False, NoEventMask, ev); + XSendEvent(win->sys->dpy, ev->xbutton.root, True, NoEventMask, ev); + XSendEvent(win->sys->dpy, ev->xbutton.root, False, NoEventMask, ev); + XSendEvent(win->sys->dpy, ev->xbutton.subwindow, True, NoEventMask, ev); + XSendEvent(win->sys->dpy, ev->xbutton.subwindow, False, NoEventMask, ev); + } } else if (type == ButtonRelease) { XUngrabPointer(dpy, CurrentTime); @@ -230,33 +311,46 @@ static void process_event(int type, XEvent *ev, win_t *root) wm_handle_key(win, key, MOD(), PTR()); } else if (type == ConfigureNotify) { - //printf("configure: %d\n", type); + printf("configure: %d\n", type); } else if (type == MapNotify) { - //printf("map: %d\n", type); + printf("map: %d\n", type); } 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); } } else if (type == ConfigureRequest) { XConfigureRequestEvent *cre = &ev->xconfigurerequest; - XWindowChanges wc = { - .x = cre->x, .y = cre->y, - .width = cre->width, .height = cre->height, - }; printf("configure_req: %d - %x, (0x%lx) %dx%d @ %d,%d\n", type, (int)cre->window, cre->value_mask, cre->height, cre->width, cre->x, cre->y); - XConfigureWindow(dpy, cre->window, cre->value_mask, &wc); + XConfigureWindow(dpy, cre->window, cre->value_mask, &(XWindowChanges){ + .x = cre->x, + .y = cre->y, + .width = cre->width, + .height = cre->height, + }); + + /* This seems necessasairy for, but causes flicker + * there could be a better way to do this */ + if ((win = win_find(dpy,ev->xmaprequest.window,0))) + sys_move(win, win->x, win->y, win->w, win->h); } 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 { @@ -285,10 +379,11 @@ static int xerror(Display *dpy, XErrorEvent *err) void sys_move(win_t *win, int x, int y, int w, int h) { //printf("sys_move: %p - %d,%d %dx%d\n", win, x, y, w, h); - win->x = MAX(x,0); win->y = MAX(y,0); - win->w = MAX(w,1); win->h = MAX(h,1); - XMoveResizeWindow(win->sys->dpy, win->sys->xid, - win->x, win->y, win->w, win-h); + int b = 2*BORDER; + win->x = MAX(x,0); win->y = MAX(y,0); + win->w = MAX(w,1+b); win->h = MAX(h,1+b); + w = MAX(w-b,1); h = MAX(h-b,1); + XMoveResizeWindow(win->sys->dpy, win->sys->xid, x, y, w, h); /* Flush events, so moving window doesn't cuase re-focus * There's probably a better way to do this */ @@ -307,19 +402,26 @@ void sys_raise(win_t *win) void sys_focus(win_t *win) { printf("sys_focus: %p\n", win); - XEvent ev = { + + /* Set border on focused window */ + static win_t *last = NULL; + if (last) + XSetWindowBorder(last->sys->dpy, last->sys->xid, colors[clr_unfocus]); + XSetWindowBorder(win->sys->dpy, win->sys->xid, colors[clr_focus]); + XSetWindowBorderWidth(win->sys->dpy, win->sys->xid, BORDER); + last = win; + + /* Set actual focus */ + XSetInputFocus(win->sys->dpy, win->sys->xid, + RevertToPointerRoot, CurrentTime); + XSendEvent(win->sys->dpy, win->sys->xid, False, NoEventMask, &(XEvent){ .type = ClientMessage, .xclient.window = win->sys->xid, .xclient.message_type = atoms[wm_proto], .xclient.format = 32, .xclient.data.l[0] = atoms[wm_focus], .xclient.data.l[1] = CurrentTime, - }; - XSetInputFocus(win->sys->dpy, win->sys->xid, - RevertToPointerRoot, CurrentTime); - //XSetInputFocus(win->sys->dpy, PointerRoot, - // RevertToPointerRoot, CurrentTime); - XSendEvent(win->sys->dpy, win->sys->xid, False, NoEventMask, &ev); + }); } void sys_watch(win_t *win, Key_t key, mod_t mod) @@ -329,7 +431,7 @@ void sys_watch(win_t *win, Key_t key, mod_t mod) XGetWindowAttributes(win->sys->dpy, win->sys->xid, &attr); long mask = attr.your_event_mask; if (key_mouse0 <= key && key <= key_mouse7) - XGrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->xid, True, + XGrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->xid, False, mod.up ? ButtonReleaseMask : ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None); else if (key == key_enter) @@ -343,6 +445,12 @@ void sys_watch(win_t *win, Key_t key, mod_t mod) mod2x(mod), win->sys->xid, True, GrabModeAsync, GrabModeAsync); } +void sys_unwatch(win_t *win, Key_t key, mod_t mod) +{ + if (key_mouse0 <= key && key <= key_mouse7) + XUngrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->xid); +} + win_t *sys_init(void) { Display *dpy; @@ -351,8 +459,13 @@ 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); + colors[clr_focus] = get_color(dpy, "#a0a0ff"); + colors[clr_unfocus] = get_color(dpy, "#101066"); + colors[clr_urgent] = get_color(dpy, "#ff0000"); + printf("colors = #%06lx #%06lx #%06lx\n", colors[0], colors[1], colors[2]); XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask); XSetInputFocus(dpy, None, RevertToNone, CurrentTime); xerrorxlib = XSetErrorHandler(xerror); @@ -368,9 +481,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(;;)