From 111a88129dcd5891b7fad40771f07cc73183e146 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu>
Date: Sat, 27 Nov 2010 14:25:47 +0000
Subject: [PATCH 1/2] Explicitely link libxcb when needed for static arches.

---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1576e77..8c43a84 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,11 @@ SRCS=		calmwm.c screen.c xmalloc.c client.c menu.c \
 CPPFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${.CURDIR}
 
 CFLAGS+=	-Wall
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=		-lxcb
+.endif
 
-LDADD+=		-L${X11BASE}/lib -lXft -lXrender -lX11 -lXau -lXdmcp \
+LDADD+=		-L${X11BASE}/lib -lXft -lXrender -lX11 ${LIBXCB} -lXau -lXdmcp \
 		-lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
 
 MANDIR=		${X11BASE}/man/cat

From cd23316a72b1549ba0cd6941ee2472f420c75c75 Mon Sep 17 00:00:00 2001
From: martynas <martynas>
Date: Tue, 14 Dec 2010 11:08:47 +0000
Subject: [PATCH 2/2] in MotionNotify geom.x, geom.y calculations take into
 account bwidth. fixes the annoying bug where windows would go +bwidth pixels
 right, +bwidth pixels down.  ok okan@

---
 mousefunc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mousefunc.c b/mousefunc.c
index 75e28cc..5c14062 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -157,8 +157,8 @@ mousefunc_window_move(struct client_ctx *cc, void *arg)
 			client_draw_border(cc);
 			break;
 		case MotionNotify:
-			cc->geom.x = ev.xmotion.x_root - px;
-			cc->geom.y = ev.xmotion.y_root - py;
+			cc->geom.x = ev.xmotion.x_root - px - cc->bwidth;
+			cc->geom.y = ev.xmotion.y_root - py - cc->bwidth;
 
 			/* don't sync more than 60 times / second */
 			if ((ev.xmotion.time - time) > (1000 / 60)) {