X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-x11.c;h=dbf1211bcdee8d72d1c8c8d8770c23ac7a737c31;hb=5dd54ab27b27c888741e5700aad89226009eb449;hp=16cbe632ec799c53e9ef158e9ad12f5e7b72d84b;hpb=d7d862c402564b4fe29f17e1a55cdbb2967aa6fd;p=wmpus diff --git a/sys-x11.c b/sys-x11.c index 16cbe63..dbf1211 100644 --- a/sys-x11.c +++ b/sys-x11.c @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -11,15 +12,26 @@ /* Internal structures */ struct win_sys { - Window win; + Window xid; Display *dpy; }; -/* Conversion functions */ -struct { +typedef struct { Key_t key; int sym; -} key2sym[] = { +} keymap_t; + +typedef enum { + wm_proto, wm_focus, natoms +} atom_t; + +/* Global data */ +static void *win_cache = NULL; +static Atom atoms[natoms]; +static int (*xerrorxlib)(Display *, XErrorEvent *); + +/* Conversion functions */ +static keymap_t key2sym[] = { {key_left , XK_Left }, {key_right , XK_Right}, {key_up , XK_Up }, @@ -42,129 +54,333 @@ struct { {key_f12 , XK_F12 }, }; -mod_t x2mod(unsigned int state) +/* - Modifiers */ +static mod_t x2mod(unsigned int state, int up) { return (mod_t){ .alt = !!(state & Mod1Mask ), .ctrl = !!(state & ControlMask), .shift = !!(state & ShiftMask ), .win = !!(state & Mod4Mask ), + .up = up, }; } -unsigned int mod2x(mod_t mod) -{ - return mod.alt ? Mod1Mask : 0 - | mod.ctrl ? ControlMask : 0 - | mod.shift ? ShiftMask : 0 - | mod.win ? Mod4Mask : 0; -} -KeySym key2x(Key_t key) -{ - return map_get(key2sym,key)->sym ?: key; -} -Key_t x2key(KeySym sym) +static unsigned int mod2x(mod_t mod) { - return map_getr(key2sym,sym)->key ?: sym; + return (mod.alt ? Mod1Mask : 0) + | (mod.ctrl ? ControlMask : 0) + | (mod.shift ? ShiftMask : 0) + | (mod.win ? Mod4Mask : 0); } -int btn2x(Key_t key) +/* - Keycodes */ +static Key_t x2key(KeySym sym) { - return key - key_mouse0; + keymap_t *km = map_getr(key2sym,sym); + return km ? km->key : sym; } -Key_t x2btn(int btn) + +static KeySym key2x(Key_t key) { - return btn + key_mouse0; + keymap_t *km = map_get(key2sym,key); + return km ? km->sym : key; } -ptr_t x2ptr(XEvent _ev) +static Key_t x2btn(int btn) { - XKeyEvent ev = _ev.xkey; - return (ptr_t){ev.x, ev.y, ev.x_root, ev.y_root}; + return btn + key_mouse0; } -/* Functions */ -void sys_move(win_t *win, int x, int y, int w, int h) +static int btn2x(Key_t key) { - printf("sys_move: %p - %d,%d %dx%d\n", win, x, y, w, h); - XMoveResizeWindow(win->sys->dpy, win->sys->win, x, y, w, h); + return key - key_mouse0; } -void sys_raise(win_t *win) +/* - Pointers */ +static ptr_t x2ptr(XEvent *_ev) { - printf("sys_raise: %p\n", win); - XRaiseWindow(win->sys->dpy, win->sys->win); + XKeyEvent *ev = &_ev->xkey; + return (ptr_t){ev->x, ev->y, ev->x_root, ev->y_root}; } - -void sys_watch(win_t *win, Key_t key, mod_t mod) +static Window getfocus(win_t *root, XEvent *event) { - if (key_mouse0 <= key && key <= key_mouse7) - XGrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->win, True, - mod.up ? ButtonReleaseMask : ButtonPressMask, - GrabModeAsync, GrabModeAsync, None, None); - else - XGrabKey(win->sys->dpy, XKeysymToKeycode(win->sys->dpy, key2x(key)), - mod2x(mod), win->sys->win, True, GrabModeAsync, GrabModeAsync); + int revert; + Window focus = PointerRoot; + if (event->type == KeyPress || event->type == KeyRelease) + XGetInputFocus(root->sys->dpy, &focus, &revert); + if (focus == PointerRoot) + focus = event->xkey.subwindow; + if (focus == None) + focus = event->xkey.window; + return focus; } -win_t *win_new(Display *xdpy, Window xwin) +/* Window functions */ +static win_t *win_new(Display *dpy, Window xid) { - if (!xdpy || !xwin) - return NULL; XWindowAttributes attr; - XGetWindowAttributes(xdpy, xwin, &attr); + if (XGetWindowAttributes(dpy, xid, &attr)) + if (attr.override_redirect) + return NULL; win_t *win = new0(win_t); win->x = attr.x; win->y = attr.y; win->w = attr.width; win->h = attr.height; win->sys = new0(win_sys_t); - win->sys->dpy = xdpy; - win->sys->win = xwin; + win->sys->dpy = dpy; + win->sys->xid = xid; + printf("%p = %p, %d\n", win, dpy, (int)xid); return win; } -void win_free(win_t *win) + +static int win_cmp(const void *_a, const void *_b) +{ + const win_t *a = _a, *b = _b; + if (a->sys->dpy < b->sys->dpy) return -1; + if (a->sys->dpy > b->sys->dpy) return 1; + if (a->sys->xid < b->sys->xid) return -1; + if (a->sys->xid > b->sys->xid) return 1; + return 0; +} + +static win_t *win_find(Display *dpy, Window xid, int create) +{ + if (!dpy || !xid) + return NULL; + //printf("win_find: %p, %d\n", dpy, (int)xid); + 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))) + return *old; + if (create && (new = win_new(dpy,xid))) + tsearch(new, &win_cache, win_cmp); + return new; +} + +static void win_remove(win_t *win) { + tdelete(win, &win_cache, win_cmp); free(win->sys); free(win); } +static int win_viewable(win_t *win) +{ + XWindowAttributes attr; + if (XGetWindowAttributes(win->sys->dpy, win->sys->xid, &attr)) + return attr.map_state == IsViewable; + else + return True; +} + +/* 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); + + /* Common data for all these events ... */ + ptr_t ptr; mod_t mod; + if (type == KeyPress || type == KeyRelease || + type == ButtonPress || type == ButtonRelease || + type == MotionNotify) { + Window xid = getfocus(root, ev); + if (!(win = win_find(dpy,xid,0))) + return; + ptr = x2ptr(ev); + mod = x2mod(ev->xkey.state, type==KeyRelease||type==ButtonRelease); + } + + /* Split based on event */ + if (type == KeyPress) { + while (XCheckTypedEvent(dpy, KeyPress, ev)); + KeySym sym = XKeycodeToKeysym(dpy, ev->xkey.keycode, 0); + 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); + } + else if (type == ButtonRelease) { + XUngrabPointer(dpy, CurrentTime); + wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr); + } + else if (type == MotionNotify) { + while (XCheckTypedEvent(dpy, MotionNotify, ev)); + wm_handle_ptr(win, ptr); + } + else if (type == EnterNotify || type == LeaveNotify) { + printf("enter: %d\n", type); + key_t key = EnterNotify ? key_enter : key_leave; + if ((win = win_find(dpy,ev->xcrossing.window,0))) + wm_handle_key(win, key, MOD(), PTR()); + } + else if (type == FocusIn || type == FocusOut) { + 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()); + } + else if (type == ConfigureNotify) { + //printf("configure: %d\n", type); + } + else if (type == MapNotify) { + //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); + 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); + } + else if (type == MapRequest) { + printf("map_req: %d\n", type); + if ((win = win_find(dpy,ev->xmaprequest.window,1))) + wm_insert(win); + XMapWindow(dpy,ev->xmaprequest.window); + } + else { + printf("unknown event: %d\n", type); + } +} + +static int xwmerror(Display *dpy, XErrorEvent *err) +{ + return error("another window manager is running?"); +} + +static int xerror(Display *dpy, XErrorEvent *err) +{ + if (err->error_code == BadWindow || + (err->request_code == X_SetInputFocus && err->error_code == BadMatch ) || + (err->request_code == X_PolyText8 && err->error_code == BadDrawable) || + (err->request_code == X_PolyFillRectangle && err->error_code == BadDrawable) || + (err->request_code == X_PolySegment && err->error_code == BadDrawable) || + (err->request_code == X_ConfigureWindow && err->error_code == BadMatch ) || + (err->request_code == X_GrabButton && err->error_code == BadAccess ) || + (err->request_code == X_GrabKey && err->error_code == BadAccess ) || + (err->request_code == X_CopyArea && err->error_code == BadDrawable)) + return 0; + return xerrorxlib(dpy, err); +} + +/***************** + * Sys functions * + *****************/ +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 = x; win->y = y; + win->w = w; win->h = h; + 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 */ + XEvent ev; + XSync(win->sys->dpy, False); + while (XCheckMaskEvent(win->sys->dpy, EnterWindowMask|LeaveWindowMask, &ev)) + printf("Skipping enter/leave event\n"); +} + +void sys_raise(win_t *win) +{ + //printf("sys_raise: %p\n", win); + XRaiseWindow(win->sys->dpy, win->sys->xid); +} + +void sys_focus(win_t *win) +{ + printf("sys_focus: %p\n", win); + XEvent ev = { + .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) +{ + //printf("sys_watch: %p - %x %hhx\n", win, key, mod); + XWindowAttributes attr; + 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, + mod.up ? ButtonReleaseMask : ButtonPressMask, + GrabModeAsync, GrabModeAsync, None, None); + else if (key == key_enter) + XSelectInput(win->sys->dpy, win->sys->xid, EnterWindowMask|mask); + else if (key == key_leave) + XSelectInput(win->sys->dpy, win->sys->xid, LeaveWindowMask|mask); + else if (key == key_focus || key == key_unfocus) + XSelectInput(win->sys->dpy, win->sys->xid, FocusChangeMask|mask); + else + XGrabKey(win->sys->dpy, XKeysymToKeycode(win->sys->dpy, key2x(key)), + mod2x(mod), win->sys->xid, True, GrabModeAsync, GrabModeAsync); +} + win_t *sys_init(void) { - Display *xdpy = XOpenDisplay(NULL); - Window xwin = DefaultRootWindow(xdpy); - return win_new(xdpy, xwin); + Display *dpy; + Window xid; + if (!(dpy = XOpenDisplay(NULL))) + 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); + XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask); + XSetInputFocus(dpy, None, RevertToNone, CurrentTime); + xerrorxlib = XSetErrorHandler(xerror); + return win_find(dpy, xid, 1); } void sys_run(win_t *root) { - Display *dpy = root->sys->dpy; + /* Add each initial window */ + unsigned int nkids; + Window par, xid, *kids = NULL; + if (XQueryTree(root->sys->dpy, root->sys->xid, + &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)) + wm_insert(win); + } + + /* Main loop */ for(;;) { XEvent ev; - XNextEvent(dpy, &ev); - //printf("event: %d\n", ev.type); - if (ev.type == KeyPress && ev.xkey.subwindow) { - while (XCheckTypedEvent(dpy, KeyPress, &ev)); - KeySym sym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0); - wm_handle_key(win_new(dpy, ev.xkey.subwindow), - x2key(sym), x2mod(ev.xkey.state), x2ptr(ev)); - } - else if (ev.type == ButtonPress && ev.xbutton.subwindow) { - wm_handle_key(win_new(dpy, ev.xkey.subwindow), - x2btn(ev.xbutton.button), MOD(.up=0), x2ptr(ev)); - XGrabPointer(dpy, ev.xkey.subwindow, True, - PointerMotionMask|ButtonReleaseMask, GrabModeAsync, - GrabModeAsync, None, None, CurrentTime); - } - else if(ev.type == ButtonRelease) { - XUngrabPointer(dpy, CurrentTime); - wm_handle_key(win_new(dpy, ev.xkey.subwindow), - x2btn(ev.xbutton.button), MOD(.up=1), x2ptr(ev)); - } - else if(ev.type == MotionNotify) { - while (XCheckTypedEvent(dpy, MotionNotify, &ev)); - wm_handle_ptr(win_new(dpy, ev.xkey.subwindow), x2ptr(ev)); - } + XNextEvent(root->sys->dpy, &ev); + process_event(ev.type, &ev, root); } }