wm_proto, wm_focus, natoms
} atom_t;
-Atom atoms[natoms];
-
/* Global data */
-void *win_cache = NULL;
+static void *win_cache = NULL;
+static Atom atoms[natoms];
+static int (*xerrorxlib)(Display *, XErrorEvent *);
/* Conversion functions */
-keymap_t key2sym[] = {
+static keymap_t key2sym[] = {
{key_left , XK_Left },
{key_right , XK_Right},
{key_up , XK_Up },
};
/* - Modifiers */
-mod_t x2mod(unsigned int state, int up)
+static mod_t x2mod(unsigned int state, int up)
{
return (mod_t){
.alt = !!(state & Mod1Mask ),
};
}
-unsigned int mod2x(mod_t mod)
+static unsigned int mod2x(mod_t mod)
{
return (mod.alt ? Mod1Mask : 0)
| (mod.ctrl ? ControlMask : 0)
}
/* - Keycodes */
-Key_t x2key(KeySym sym)
+static Key_t x2key(KeySym sym)
{
keymap_t *km = map_getr(key2sym,sym);
return km ? km->key : sym;
}
-KeySym key2x(Key_t key)
+static KeySym key2x(Key_t key)
{
keymap_t *km = map_get(key2sym,key);
return km ? km->sym : key;
}
-Key_t x2btn(int btn)
+static Key_t x2btn(int btn)
{
return btn + key_mouse0;
}
-int btn2x(Key_t key)
+static int btn2x(Key_t key)
{
return key - key_mouse0;
}
/* - Pointers */
-ptr_t x2ptr(XEvent *_ev)
+static ptr_t x2ptr(XEvent *_ev)
{
XKeyEvent *ev = &_ev->xkey;
return (ptr_t){ev->x, ev->y, ev->x_root, ev->y_root};
}
-Window getfocus(win_t *root, XEvent *event)
+static Window getfocus(win_t *root, XEvent *event)
{
int revert;
Window focus = PointerRoot;
return focus;
}
-/* Helper functions */
-win_t *win_new(Display *dpy, Window xid)
+/* Window functions */
+static win_t *win_new(Display *dpy, Window xid)
{
XWindowAttributes attr;
- XGetWindowAttributes(dpy, xid, &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->sys = new0(win_sys_t);
win->sys->dpy = dpy;
win->sys->xid = xid;
- printf("win_new: %p = %p, %d\n", win, dpy, (int)xid);
+ printf("%p = %p, %d\n", win, dpy, (int)xid);
return win;
}
-int win_cmp(const void *_a, const void *_b)
+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;
return 0;
}
-win_t *win_find(Display *dpy, Window xid)
+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};
- return *(win_t**)(tfind(&tmp, &win_cache, win_cmp) ?:
- tsearch(win_new(dpy,xid), &win_cache, win_cmp));
+ 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;
}
-void win_remove(win_t *win)
+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 */
-void process_event(int type, XEvent *ev, win_t *root)
+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 ... */
- win_t *win = NULL; 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);
- win = win_find(dpy,xid);
+ if (!(win = win_find(dpy,xid,0)))
+ return;
ptr = x2ptr(ev);
mod = x2mod(ev->xkey.state, type==KeyRelease||type==ButtonRelease);
}
/* Split based on event */
- //printf("event: %d\n", type);
if (type == KeyPress) {
while (XCheckTypedEvent(dpy, KeyPress, ev));
KeySym sym = XKeycodeToKeysym(dpy, ev->xkey.keycode, 0);
}
else if (type == ButtonPress) {
wm_handle_key(win, x2btn(ev->xbutton.button), mod, ptr);
- XGrabPointer(dpy, win->sys->xid, True, PointerMotionMask|ButtonReleaseMask,
+ XGrabPointer(dpy, ev->xbutton.root, True, PointerMotionMask|ButtonReleaseMask,
GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
}
else if (type == ButtonRelease) {
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 == DestroyNotify) {
- //printf("destory: %d\n", type);
- win_remove(win_find(dpy,ev->xdestroywindow.window));
- }
else if (type == UnmapNotify) {
//printf("unmap: %d\n", type);
- wm_remove(win_find(dpy,ev->xmap.window));
+ if ((win = win_find(dpy,ev->xmap.window,0))) {
+ wm_remove(win);
+ win_remove(win);
+ }
}
else if (type == ConfigureRequest) {
XConfigureRequestEvent *cre = &ev->xconfigurerequest;
}
else if (type == MapRequest) {
printf("map_req: %d\n", type);
- wm_insert(win_find(dpy,ev->xmaprequest.window));
+ if ((win = win_find(dpy,ev->xmaprequest.window,1)))
+ wm_insert(win);
XMapWindow(dpy,ev->xmaprequest.window);
}
else {
}
}
+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);
+ 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);
+
+ /* 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)
void sys_focus(win_t *win)
{
- //printf("sys_raise: %p\n", win);
+ printf("sys_focus: %p\n", win);
XEvent ev = {
.type = ClientMessage,
.xclient.window = win->sys->xid,
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 *dpy = XOpenDisplay(NULL);
- Window xid = DefaultRootWindow(dpy);
+ 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, SubstructureNotifyMask|SubstructureRedirectMask);
- return win_find(dpy, xid);
+ 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)
{
/* Add each initial window */
unsigned int nkids;
- Window par, win, *kids = NULL;
+ Window par, xid, *kids = NULL;
if (XQueryTree(root->sys->dpy, root->sys->xid,
- &par, &win, &kids, &nkids))
- for(int i = 0; i < nkids; i++)
- wm_insert(win_find(root->sys->dpy, kids[i]));
+ &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(;;)
projects / wmpus / blobdiff