X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=sys-x11.c;h=a947e196747bf95ad765954e87126b3e04226611;hp=dc22fba6ecf9bdc1b9102639d97399e9ce22fb86;hb=7c451aa4d38c4658fa3eb1130b420380d081b40d;hpb=bcf8984f9b78949a7f33b2771800e67a538caddc diff --git a/sys-x11.c b/sys-x11.c index dc22fba..a947e19 100644 --- a/sys-x11.c +++ b/sys-x11.c @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2011, Andy Spencer + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + */ + +#define _GNU_SOURCE #include #include #include @@ -9,10 +25,13 @@ #include #include "util.h" +#include "conf.h" #include "sys.h" #include "wm.h" -#define BORDER 2 +/* Configuration */ +static int border = 2; +static int no_capture = 0; /* Internal structures */ struct win_sys { @@ -25,46 +44,49 @@ struct win_sys { }; typedef struct { - Key_t key; - int sym; -} keymap_t; + event_t ev; + int sym; +} event_map_t; typedef enum { - wm_proto, wm_focus, net_strut, natoms + WM_PROTO, WM_FOCUS, NET_STRUT, NATOMS } atom_t; typedef enum { - clr_focus, clr_unfocus, clr_urgent, ncolors + CLR_FOCUS, CLR_UNFOCUS, CLR_URGENT, NCOLORS } color_t; /* Global data */ -static void *win_cache; -static Atom atoms[natoms]; +static int running; +static void *cache; +static Atom atoms[NATOMS]; static int (*xerrorxlib)(Display *, XErrorEvent *); -static unsigned long colors[ncolors]; +static unsigned long colors[NCOLORS]; +static list_t *screens; +static list_t *struts; /* Conversion functions */ -static keymap_t key2sym[] = { - {key_left , XK_Left }, - {key_right , XK_Right}, - {key_up , XK_Up }, - {key_down , XK_Down }, - {key_home , XK_Home }, - {key_end , XK_End }, - {key_pageup , XK_Prior}, - {key_pagedown, XK_Next }, - {key_f1 , XK_F1 }, - {key_f2 , XK_F2 }, - {key_f3 , XK_F3 }, - {key_f4 , XK_F4 }, - {key_f5 , XK_F5 }, - {key_f6 , XK_F6 }, - {key_f7 , XK_F7 }, - {key_f8 , XK_F8 }, - {key_f9 , XK_F9 }, - {key_f10 , XK_F10 }, - {key_f11 , XK_F11 }, - {key_f12 , XK_F12 }, +static event_map_t ev2sym[] = { + {EV_LEFT , XK_Left }, + {EV_RIGHT , XK_Right}, + {EV_UP , XK_Up }, + {EV_DOWN , XK_Down }, + {EV_HOME , XK_Home }, + {EV_END , XK_End }, + {EV_PAGEUP , XK_Prior}, + {EV_PAGEDOWN, XK_Next }, + {EV_F1 , XK_F1 }, + {EV_F2 , XK_F2 }, + {EV_F3 , XK_F3 }, + {EV_F4 , XK_F4 }, + {EV_F5 , XK_F5 }, + {EV_F6 , XK_F6 }, + {EV_F7 , XK_F7 }, + {EV_F8 , XK_F8 }, + {EV_F9 , XK_F9 }, + {EV_F10 , XK_F10 }, + {EV_F11 , XK_F11 }, + {EV_F12 , XK_F12 }, }; /* - Modifiers */ @@ -88,50 +110,67 @@ static unsigned int mod2x(mod_t mod) } /* - Keycodes */ -static Key_t x2key(KeySym sym) +static event_t xk2ev(KeySym sym) { - keymap_t *km = map_getr(key2sym,sym); - return km ? km->key : sym; + event_map_t *em = map_getr(ev2sym,sym); + return em ? em->ev : sym; } -static KeySym key2x(Key_t key) +static KeySym ev2xk(event_t ev) { - keymap_t *km = map_get(key2sym,key); - return km ? km->sym : key; + event_map_t *em = map_get(ev2sym,ev); + return em ? em->sym : ev; } -static Key_t x2btn(int btn) +static event_t xb2ev(int btn) { - return btn + key_mouse0; + return btn + EV_MOUSE0; } -static int btn2x(Key_t key) +static int ev2xb(event_t ev) { - return key - key_mouse0; + return ev - EV_MOUSE0; } /* - Pointers */ -static ptr_t x2ptr(XEvent *_ev) +static ptr_t x2ptr(XEvent *xe) { - XKeyEvent *ev = &_ev->xkey; - return (ptr_t){ev->x, ev->y, ev->x_root, ev->y_root}; + XKeyEvent *xke = &xe->xkey; + return (ptr_t){xke->x, xke->y, xke->x_root, xke->y_root}; } -static Window getfocus(win_t *root, XEvent *event) +static Window getfocus(win_t *root, XEvent *xe) { int revert; Window focus = PointerRoot; - if (event->type == KeyPress || event->type == KeyRelease) + if (xe->type == KeyPress || xe->type == KeyRelease) XGetInputFocus(root->sys->dpy, &focus, &revert); if (focus == PointerRoot) - focus = event->xkey.subwindow; + focus = xe->xkey.subwindow; if (focus == None) - focus = event->xkey.window; + focus = xe->xkey.window; return focus; } -/* Helpers */ -static int add_strut(win_t *root, win_t *win) +/* Strut functions + * Struts are spaces at the edges of the screen that are used by + * toolbars and statusbars such as dzen. */ +static int strut_copy(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 strut_add(win_t *root, win_t *win) { /* Get X11 strut data */ Atom ret_type; @@ -139,43 +178,29 @@ static int add_strut(win_t *root, win_t *win) 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, + 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; + 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]; + struts = list_insert(struts, win); + for (list_t *cur = screens; cur; cur = cur->next) + strut_copy(cur->data, win, 1); + return strut_copy(root, win, 1); } -static int del_strut(win_t *root, win_t *win) +static int strut_del(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; + list_t *lwin = list_find(struts, win); + if (lwin) + struts = list_remove(struts, lwin, 0); + for (list_t *cur = screens; cur; cur = cur->next) + strut_copy(cur->data, win, -1); + return strut_copy(root, win, -1); } /* Window functions */ @@ -217,20 +242,25 @@ 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) +static void win_free(win_t *win) { - tdelete(win, &win_cache, win_cmp); free(win->sys); free(win); } +static void win_remove(win_t *win) +{ + tdelete(win, &cache, win_cmp); + win_free(win); +} + static int win_viewable(win_t *win) { XWindowAttributes attr; @@ -241,7 +271,7 @@ static int win_viewable(win_t *win) } /* Drawing functions */ -unsigned long get_color(Display *dpy, const char *name) +static unsigned long get_color(Display *dpy, const char *name) { XColor color; int screen = DefaultScreen(dpy); @@ -251,67 +281,67 @@ unsigned long get_color(Display *dpy, const char *name) } /* Callbacks */ -static void process_event(int type, XEvent *ev, win_t *root) +static void process_event(int type, XEvent *xe, 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; + ptr_t ptr = {}; mod_t mod = {}; if (type == KeyPress || type == KeyRelease || type == ButtonPress || type == ButtonRelease || type == MotionNotify) { - Window xid = getfocus(root, ev); + Window xid = getfocus(root, xe); if (!(win = win_find(dpy,xid,0))) return; - ptr = x2ptr(ev); - mod = x2mod(ev->xkey.state, type==KeyRelease||type==ButtonRelease); + ptr = x2ptr(xe); + mod = x2mod(xe->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); - printf("got key %c %hhx\n", x2key(sym), mod2int(mod)); - wm_handle_key(win, x2key(sym), mod, ptr); + while (XCheckTypedEvent(dpy, KeyPress, xe)); + KeySym sym = XKeycodeToKeysym(dpy, xe->xkey.keycode, 0); + printf("got xe %c %hhx\n", xk2ev(sym), mod2int(mod)); + wm_handle_event(win, xk2ev(sym), mod, ptr); } else if (type == KeyRelease) { //printf("release: %d\n", type); } else if (type == ButtonPress) { - if (wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr)) - XGrabPointer(dpy, ev->xbutton.root, True, PointerMotionMask|ButtonReleaseMask, + if (wm_handle_event(win, xb2ev(xe->xbutton.button), mod, ptr)) + XGrabPointer(dpy, xe->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); + XSendEvent(win->sys->dpy, xe->xbutton.window, True, NoEventMask, xe); + XSendEvent(win->sys->dpy, xe->xbutton.window, False, NoEventMask, xe); + XSendEvent(win->sys->dpy, xe->xbutton.root, True, NoEventMask, xe); + XSendEvent(win->sys->dpy, xe->xbutton.root, False, NoEventMask, xe); + XSendEvent(win->sys->dpy, xe->xbutton.subwindow, True, NoEventMask, xe); + XSendEvent(win->sys->dpy, xe->xbutton.subwindow, False, NoEventMask, xe); } } else if (type == ButtonRelease) { XUngrabPointer(dpy, CurrentTime); - wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr); + wm_handle_event(win, xb2ev(xe->xbutton.button), mod, ptr); } else if (type == MotionNotify) { - while (XCheckTypedEvent(dpy, MotionNotify, ev)); + while (XCheckTypedEvent(dpy, MotionNotify, xe)); 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()); + event_t ev = EnterNotify ? EV_ENTER : EV_LEAVE; + if ((win = win_find(dpy,xe->xcrossing.window,0))) + wm_handle_event(win, ev, 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()); + event_t ev = FocusIn ? EV_FOCUS : EV_UNFOCUS; + if ((win = win_find(dpy,xe->xfocus.window,0))) + wm_handle_event(win, ev, MOD(), PTR()); } else if (type == ConfigureNotify) { printf("configure: %d\n", type); @@ -320,22 +350,22 @@ static void process_event(int type, XEvent *ev, win_t *root) printf("map: %d\n", type); } else if (type == UnmapNotify) { - if ((win = win_find(dpy,ev->xunmap.window,0)) && - win->sys->state == st_show) { - if (!del_strut(root, win)) + if ((win = win_find(dpy,xe->xunmap.window,0)) && + win->sys->state != ST_HIDE) { + if (!strut_del(root, win)) wm_remove(win); else wm_update(); - win->sys->state = st_hide; + win->sys->state = ST_HIDE; } } else if (type == DestroyNotify) { //printf("destroy: %d\n", type); - if ((win = win_find(dpy,ev->xdestroywindow.window,0))) + if ((win = win_find(dpy,xe->xdestroywindow.window,0))) win_remove(win); } else if (type == ConfigureRequest) { - XConfigureRequestEvent *cre = &ev->xconfigurerequest; + XConfigureRequestEvent *cre = &xe->xconfigurerequest; 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); @@ -346,20 +376,20 @@ static void process_event(int type, XEvent *ev, win_t *root) .height = cre->height, }); - /* This seems necessasairy for, but causes flicker + /* This seems necessary for, but causes flicker * there could be a better way to do this */ - if ((win = win_find(dpy,ev->xmaprequest.window,0))) + if ((win = win_find(dpy,xe->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))) { - if (!add_strut(root, win)) + if ((win = win_find(dpy,xe->xmaprequest.window,1))) { + if (!strut_add(root, win)) wm_insert(win); else wm_update(); } - XMapWindow(dpy,ev->xmaprequest.window); + XMapWindow(dpy,xe->xmaprequest.window); } else { printf("unknown event: %d\n", type); @@ -381,23 +411,23 @@ static int xerror(Display *dpy, XErrorEvent *err) return xerrorxlib(dpy, err); } -/***************** - * Sys functions * - *****************/ +/******************** + * System 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); - int b = 2*BORDER; + 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 + /* Flush events, so moving window doesn't cause re-focus * There's probably a better way to do this */ - XEvent ev; + XEvent xe; XSync(win->sys->dpy, False); - while (XCheckMaskEvent(win->sys->dpy, EnterWindowMask|LeaveWindowMask, &ev)) + while (XCheckMaskEvent(win->sys->dpy, EnterWindowMask|LeaveWindowMask, &xe)) printf("Skipping enter/leave event\n"); } @@ -405,6 +435,9 @@ void sys_raise(win_t *win) { //printf("sys_raise: %p\n", win); XRaiseWindow(win->sys->dpy, win->sys->xid); + for (list_t *cur = struts; cur; cur = cur->next) + XRaiseWindow(((win_t*)cur->data)->sys->dpy, + ((win_t*)cur->data)->sys->xid); } void sys_focus(win_t *win) @@ -414,9 +447,9 @@ void sys_focus(win_t *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); + 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 */ @@ -425,9 +458,9 @@ void sys_focus(win_t *win) XSendEvent(win->sys->dpy, win->sys->xid, False, NoEventMask, &(XEvent){ .type = ClientMessage, .xclient.window = win->sys->xid, - .xclient.message_type = atoms[wm_proto], + .xclient.message_type = atoms[WM_PROTO], .xclient.format = 32, - .xclient.data.l[0] = atoms[wm_focus], + .xclient.data.l[0] = atoms[WM_FOCUS], .xclient.data.l[1] = CurrentTime, }); } @@ -436,72 +469,81 @@ void sys_show(win_t *win, state_t state) { win->sys->state = state; switch (state) { - case st_show: + case ST_SHOW: printf("sys_show: show\n"); XMapWindow(win->sys->dpy, win->sys->xid); + XSync(win->sys->dpy, False); return; - case st_full: + case ST_FULL: printf("sys_show: full\n"); return; - case st_shade: + case ST_SHADE: printf("sys_show: shade\n"); return; - case st_icon: + case ST_ICON: printf("sys_show: icon\n"); return; - case st_hide: + case ST_HIDE: printf("sys_show: hide\n"); XUnmapWindow(win->sys->dpy, win->sys->xid); return; + case ST_CLOSE: + printf("sys_show: close\n"); + XDestroyWindow(win->sys->dpy, win->sys->xid); + return; } } -void sys_watch(win_t *win, Key_t key, mod_t mod) +void sys_watch(win_t *win, event_t ev, mod_t mod) { - //printf("sys_watch: %p - %x %hhx\n", win, key, mod); + //printf("sys_watch: %p - %x %hhx\n", win, ev, 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, False, + if (EV_MOUSE0 <= ev && ev <= EV_MOUSE7) + XGrabButton(win->sys->dpy, ev2xb(ev), mod2x(mod), win->sys->xid, False, mod.up ? ButtonReleaseMask : ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None); - else if (key == key_enter) + else if (ev == EV_ENTER) XSelectInput(win->sys->dpy, win->sys->xid, EnterWindowMask|mask); - else if (key == key_leave) + else if (ev == EV_LEAVE) XSelectInput(win->sys->dpy, win->sys->xid, LeaveWindowMask|mask); - else if (key == key_focus || key == key_unfocus) + else if (ev == EV_FOCUS || ev == EV_UNFOCUS) XSelectInput(win->sys->dpy, win->sys->xid, FocusChangeMask|mask); else - XGrabKey(win->sys->dpy, XKeysymToKeycode(win->sys->dpy, key2x(key)), + XGrabKey(win->sys->dpy, XKeysymToKeycode(win->sys->dpy, ev2xk(ev)), mod2x(mod), win->sys->xid, True, GrabModeAsync, GrabModeAsync); } -void sys_unwatch(win_t *win, Key_t key, mod_t mod) +void sys_unwatch(win_t *win, event_t ev, mod_t mod) { - if (key_mouse0 <= key && key <= key_mouse7) - XUngrabButton(win->sys->dpy, btn2x(key), mod2x(mod), win->sys->xid); + if (EV_MOUSE0 <= ev && ev <= EV_MOUSE7) + XUngrabButton(win->sys->dpy, ev2xb(ev), mod2x(mod), win->sys->xid); } list_t *sys_info(win_t *win) { - 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); + /* Use global copy of screens so we can add struts */ + if (screens == NULL) { + /* Add Xinerama screens */ + int n = 0; + XineramaScreenInfo *info = NULL; + if (XineramaIsActive(win->sys->dpy)) + info = XineramaQueryScreens(win->sys->dpy, &n); + 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); + } } - list_t *screens = NULL; - for (int i = 0; i < n; i++) { + if (screens == NULL) { + /* No xinerama support */ 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); + *screen = *win; + screens = list_insert(NULL, screen); } return screens; } @@ -511,6 +553,10 @@ win_t *sys_init(void) Display *dpy; Window xid; + /* Load configuration */ + border = conf_get_int("main.border", border); + no_capture = conf_get_int("main.no-capture", no_capture); + /* Open the display */ if (!(dpy = XOpenDisplay(NULL))) error("Unable to get display"); @@ -518,18 +564,17 @@ win_t *sys_init(void) 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); + 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"); + 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 */ + /* Select window management events */ XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask); - XSetInputFocus(dpy, None, RevertToNone, CurrentTime); xerrorxlib = XSetErrorHandler(xerror); return win_find(dpy, xid, 1); @@ -538,22 +583,40 @@ win_t *sys_init(void) void sys_run(win_t *root) { /* 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) && !add_strut(root,win)) - wm_insert(win); + if (!no_capture) { + 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) && !strut_add(root,win)) + wm_insert(win); + } + XFree(kids); } - wm_update(); // For struts + wm_update(); // For struts + } /* Main loop */ - for(;;) + running = 1; + while (running) { - XEvent ev; - XNextEvent(root->sys->dpy, &ev); - process_event(ev.type, &ev, root); + XEvent xe; + XNextEvent(root->sys->dpy, &xe); + process_event(xe.type, &xe, root); } } + +void sys_exit(void) +{ + running = 0; +} + +void sys_free(win_t *root) +{ + XCloseDisplay(root->sys->dpy); + while (screens) + screens = list_remove(screens, screens, 1); + tdestroy(cache, (void(*)(void*))win_free); +}