+/*
+ * Copyright (c) 2011, Andy Spencer <andy753421@gmail.com>
+ *
+ * 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 <stdio.h>
#include <stdlib.h>
#include <search.h>
#include <X11/Xproto.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>
+#include <X11/extensions/Xinerama.h>
#include "util.h"
+#include "conf.h"
#include "sys.h"
#include "wm.h"
+/* Configuration */
+static int BORDER = 2;
+static int NO_CAPTURE = 0;
+
/* Internal structures */
struct win_sys {
Window xid;
struct {
int left, right, top, bottom;
} strut;
+ state_t state;
};
typedef struct {
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 int running;
+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[] = {
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;
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)
+ 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;
+ for (list_t *cur = screens; cur; cur = cur->next)
+ strut_copy(cur->data, win, -1);
+ return strut_copy(root, win, -1);
}
/* Window functions */
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;
}
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;
return True;
}
+/* Drawing functions */
+static 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;
+ ptr_t ptr = {}; mod_t mod = {};
if (type == KeyPress || type == KeyRelease ||
type == ButtonPress || type == ButtonRelease ||
type == MotionNotify) {
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);
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());
printf("map: %d\n", type);
}
else if (type == UnmapNotify) {
- //printf("unmap: %d\n", type);
- if ((win = win_find(dpy,ev->xunmap.window,0))) {
- if (!del_strut(root, win))
+ if ((win = win_find(dpy,ev->xunmap.window,0)) &&
+ win->sys->state == st_show) {
+ if (!strut_del(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;
- 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 necessary 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))) {
- if (!add_strut(root, win))
+ if (!strut_add(root, win))
wm_insert(win);
else
wm_update();
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);
- 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
+ /* Flush events, so moving window doesn't cause re-focus
* There's probably a better way to do this */
XEvent ev;
XSync(win->sys->dpy, False);
void sys_focus(win_t *win)
{
- printf("sys_focus: %p\n", win);
- XEvent ev = {
+ //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){
.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_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);
+ XSync(win->sys->dpy, False);
+ 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)
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)
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) {
+ /* 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);
+ }
+ }
+ if (screens == NULL) {
+ /* No xinerama support */
+ win_t *screen = new0(win_t);
+ *screen = *win;
+ screens = list_insert(NULL, screen);
+ }
+ return screens;
+}
+
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");
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]);
+
+ /* Select window management events */
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, 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);
}
}
+
+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);
+}
projects / wmpus / blobdiff