X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-x11.c;h=dbab94820cc3dce31adeb1d1f9f310b25773768b;hb=306672f9422fb3be995152e37abb704a9b568726;hp=75c2edd8a88b600a82f4e4e73c1bf22dfe657c56;hpb=e396d3e091801135cf20b76d69199a9955ff3dc9;p=wmpus

diff --git a/sys-x11.c b/sys-x11.c
index 75c2edd..dbab948 100644
--- a/sys-x11.c
+++ b/sys-x11.c
@@ -11,6 +11,8 @@
 #include "sys.h"
 #include "wm.h"
 
+#define BORDER 2
+
 /* Internal structures */
 struct win_sys {
 	Window   xid;
@@ -29,10 +31,15 @@ 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 *win_cache;
 static Atom atoms[natoms];
 static int (*xerrorxlib)(Display *, XErrorEvent *);
+static unsigned long colors[ncolors];
 
 /* Conversion functions */
 static keymap_t key2sym[] = {
@@ -184,7 +191,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;
 }
 
@@ -229,6 +238,16 @@ 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)
 {
@@ -258,9 +277,18 @@ static void process_event(int type, XEvent *ev, win_t *root)
 		//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);
@@ -300,20 +328,20 @@ static void process_event(int type, XEvent *ev, win_t *root)
 	}
 	else if (type == ConfigureRequest) {
 		XConfigureRequestEvent *cre = &ev->xconfigurerequest;
-		XWindowChanges wc = {
-			.x     = cre->x,     .y      = cre->y,
-			.width = cre->width, .height = cre->height,
-		};
-		if ((win = win_find(dpy,ev->xmaprequest.window,1))) {
-			wc.x      = win->x;
-			wc.y      = win->y;
-			wc.width  = win->w;
-			wc.height = win->h;
-		}
 		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 necessasairy 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);
@@ -351,10 +379,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 = MAX(x,0);   win->y = MAX(y,0);
+	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 */
@@ -373,19 +402,26 @@ void sys_raise(win_t *win)
 void sys_focus(win_t *win)
 {
 	printf("sys_focus: %p\n", win);
-	XEvent ev = {
+
+	/* 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_watch(win_t *win, Key_t key, mod_t mod)
@@ -395,7 +431,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)
@@ -409,6 +445,12 @@ 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);
+}
+
 win_t *sys_init(void)
 {
 	Display *dpy;
@@ -420,6 +462,10 @@ win_t *sys_init(void)
 	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]);
 	XSelectInput(dpy, xid, SubstructureRedirectMask|SubstructureNotifyMask);
 	XSetInputFocus(dpy, None, RevertToNone, CurrentTime);
 	xerrorxlib = XSetErrorHandler(xerror);