X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-x11.c;h=92eb8705a05c3c151fa0a720cd77fed7b899bdae;hb=ebb648622191195e3e216c103b83549f97cf28d4;hp=8d3887e925e1f7a153a6f4b62f66fb2383c973ea;hpb=644f831b887f220651fc651852cb4b668eae705c;p=wmpus diff --git a/sys-x11.c b/sys-x11.c index 8d3887e..92eb870 100644 --- a/sys-x11.c +++ b/sys-x11.c @@ -6,11 +6,16 @@ #include #include #include +#include #include "util.h" #include "sys.h" #include "wm.h" +#ifndef BORDER +#define BORDER 2 +#endif + /* Internal structures */ struct win_sys { Window xid; @@ -18,6 +23,7 @@ struct win_sys { struct { int left, right, top, bottom; } strut; + state_t state; }; typedef struct { @@ -29,10 +35,16 @@ typedef enum { 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 *cache; static Atom atoms[natoms]; static int (*xerrorxlib)(Display *, XErrorEvent *); +static unsigned long colors[ncolors]; +static list_t *screens; /* Conversion functions */ static keymap_t key2sym[] = { @@ -122,6 +134,21 @@ static Window getfocus(win_t *root, XEvent *event) } /* Helpers */ +static int copy_strut(win_t *to, win_t *from, int scale) +{ + int left = from->sys->strut.left; + int right = from->sys->strut.right; + int top = from->sys->strut.top; + int bottom = from->sys->strut.bottom; + if (left == 0 && right == 0 && top == 0 && bottom == 0) + return 0; + to->x += scale*(left ); + to->y += scale*(top ); + to->w -= scale*(left+right); + to->h -= scale*(top+bottom); + return 1; +} + static int add_strut(win_t *root, win_t *win) { /* Get X11 strut data */ @@ -135,38 +162,20 @@ static int add_strut(win_t *root, win_t *win) 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; + win->sys->strut.left = ((int*)xdata)[0]; + win->sys->strut.right = ((int*)xdata)[1]; + win->sys->strut.top = ((int*)xdata)[2]; + win->sys->strut.bottom = ((int*)xdata)[3]; + for (list_t *cur = screens; cur; cur = cur->next) + copy_strut(cur->data, win, 1); + return copy_strut(root, win, 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; + for (list_t *cur = screens; cur; cur = cur->next) + copy_strut(cur->data, win, -1); + return copy_strut(root, win, -1); } /* Window functions */ @@ -184,7 +193,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; } @@ -206,16 +217,16 @@ static win_t *win_find(Display *dpy, Window xid, int create) win_sys_t sys = {.dpy=dpy, .xid=xid}; win_t tmp = {.sys=&sys}; win_t **old = NULL, *new = NULL; - if ((old = tfind(&tmp, &win_cache, win_cmp))) + if ((old = tfind(&tmp, &cache, win_cmp))) return *old; if (create && (new = win_new(dpy,xid))) - tsearch(new, &win_cache, win_cmp); + tsearch(new, &cache, win_cmp); return new; } static void win_remove(win_t *win) { - tdelete(win, &win_cache, win_cmp); + tdelete(win, &cache, win_cmp); free(win->sys); free(win); } @@ -229,12 +240,22 @@ 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) { Display *dpy = root->sys->dpy; win_t *win = NULL; - printf("event: %d\n", type); + //printf("event: %d\n", type); /* Common data for all these events ... */ ptr_t ptr; mod_t mod; @@ -252,15 +273,25 @@ static void process_event(int type, XEvent *ev, win_t *root) if (type == KeyPress) { while (XCheckTypedEvent(dpy, KeyPress, ev)); KeySym sym = XKeycodeToKeysym(dpy, ev->xkey.keycode, 0); + printf("got key %c %hhx\n", x2key(sym), mod2int(mod)); wm_handle_key(win, x2key(sym), mod, ptr); } else if (type == KeyRelease) { //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); @@ -277,7 +308,7 @@ static void process_event(int type, XEvent *ev, win_t *root) wm_handle_key(win, key, MOD(), PTR()); } else if (type == FocusIn || type == FocusOut) { - printf("focus: %d\n", type); + //printf("focus: %d\n", type); key_t key = FocusIn ? key_focus : key_unfocus; if ((win = win_find(dpy,ev->xfocus.window,0))) wm_handle_key(win, key, MOD(), PTR()); @@ -289,15 +320,20 @@ static void process_event(int type, XEvent *ev, win_t *root) printf("map: %d\n", type); } else if (type == UnmapNotify) { - //printf("unmap: %d\n", type); - if ((win = win_find(dpy,ev->xunmap.window,0))) { + if ((win = win_find(dpy,ev->xunmap.window,0)) && + win->sys->state == st_show) { if (!del_strut(root, win)) wm_remove(win); else wm_update(); - win_remove(win); + win->sys->state = st_hide; } } + else if (type == DestroyNotify) { + //printf("destroy: %d\n", type); + if ((win = win_find(dpy,ev->xdestroywindow.window,0))) + win_remove(win); + } else if (type == ConfigureRequest) { XConfigureRequestEvent *cre = &ev->xconfigurerequest; printf("configure_req: %d - %x, (0x%lx) %dx%d @ %d,%d\n", @@ -351,10 +387,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 = x; win->y = y; + 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 */ @@ -372,7 +409,17 @@ void sys_raise(win_t *win) void sys_focus(win_t *win) { - printf("sys_focus: %p\n", win); + //printf("sys_focus: %p\n", win); + + /* 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){ @@ -385,6 +432,30 @@ void sys_focus(win_t *win) }); } +void sys_show(win_t *win, state_t state) +{ + win->sys->state = state; + switch (state) { + case st_show: + printf("sys_show: show\n"); + XMapWindow(win->sys->dpy, win->sys->xid); + return; + case st_full: + printf("sys_show: full\n"); + return; + case st_shade: + printf("sys_show: shade\n"); + return; + case st_icon: + printf("sys_show: icon\n"); + return; + case st_hide: + printf("sys_show: hide\n"); + XUnmapWindow(win->sys->dpy, win->sys->xid); + return; + } +} + void sys_watch(win_t *win, Key_t key, mod_t mod) { //printf("sys_watch: %p - %x %hhx\n", win, key, mod); @@ -392,7 +463,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) @@ -406,20 +477,63 @@ 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); +} + +list_t *sys_info(win_t *win) +{ + /* Use global copy of screens so we can add struts */ + if (screens == NULL) { + int n; + XineramaScreenInfo *info = NULL; + if (XineramaIsActive(win->sys->dpy)) + info = XineramaQueryScreens(win->sys->dpy, &n); + if (!info) { + win_t *screen = new0(win_t); + *screen = *win; + return list_insert(NULL, screen); + } + for (int i = 0; i < n; i++) { + win_t *screen = new0(win_t); + screen->x = info[i].x_org; + screen->y = info[i].y_org; + screen->w = info[i].width; + screen->h = info[i].height; + screens = list_append(screens, screen); + } + } + return screens; +} + win_t *sys_init(void) { Display *dpy; Window xid; + + /* Open the display */ if (!(dpy = XOpenDisplay(NULL))) error("Unable to get display"); if (!(xid = DefaultRootWindow(dpy))) error("Unable to get root window"); + + /* Setup X11 data */ 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]); + + /* Selec Window Managmenet events */ XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask); XSetInputFocus(dpy, None, RevertToNone, CurrentTime); xerrorxlib = XSetErrorHandler(xerror); + return win_find(dpy, xid, 1); }