Merge lp:~bregma/ginn/bug-650787 into lp:ginn

[Stephen M. Webb]

Un-hardcoded root windowid.

(1) Used pkg-config to detect dependant packages so I could build on my dev machine.

(2) Asked X11 for its root window ID instead of hardcoding it to some random value (fixes LP:#650787)

[Henrik Rydberg (rydberg)]

Line 34 has a cosmetic flaw (trailing whitespace), but otherwise great, since ginn now actually works without arguments. :-)

review: Approve

[Chase Douglas (chasedouglas)]

I haven't tested it, but on code review this looks good!

review: Approve

[Chase Douglas (chasedouglas)]

BTW, as a team we need to get into the habit of adding the bug numbers (LP: #650787) to the commit messages that fix the bugs. That will cause launchpad to close out the bugs when the fixes are merged.

Not a show stopper here, just another friendly reminder :).

=== modified file 'configure.ac'
--- configure.ac	2010-09-15 14:32:59 +0000
+++ configure.ac	2010-09-29 13:21:03 +0000
@@ -23,6 +23,9 @@
 AC_PROG_INSTALL
 
 PKG_CHECK_MODULES([GEIS], [libutouch-geis >= 1.0.10])
+PKG_CHECK_MODULES([X11],  [x11 >= 1.3.3])
+PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.7.7])
+PKG_CHECK_MODULES([XTST], [xtst >= 1.1.0])
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-09-15 14:32:59 +0000
+++ src/Makefile.am	2010-09-29 13:21:03 +0000
@@ -1,5 +1,5 @@
 bin_PROGRAMS = ginn
 
 ginn_SOURCES = ginn.c config.c xt.c
-ginn_CFLAGS = -I/usr/include/libxml2
-ginn_LDFLAGS = -lX11 -lXtst -lutouch-geis -lxml2 -lm
+ginn_CFLAGS = $(GEIS_CFLAGS) $(XTST_CFLAGS) $(X11_CFLAGS) $(XML2_CFLAGS)
+ginn_LDFLAGS = $(GEIS_LIBS) $(XTST_LIBS) $(X11_LIBS) $(XML2_LIBS)

=== modified file 'src/ginn.c'
--- src/ginn.c	2010-09-15 14:32:59 +0000
+++ src/ginn.c	2010-09-29 13:21:03 +0000
@@ -27,6 +27,27 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/select.h>
+#include <X11/Xlib.h>
+
+
+static Window getRootWindow()
+{
+  Display *display = NULL;
+  Window window = 0;
+  
+  display = XOpenDisplay(NULL);
+  if (!display)
+  {
+    fprintf(stderr, "error opening X11 display.\n");
+    exit(1);
+  }
+
+  window = DefaultRootWindow(display);
+
+  XCloseDisplay(display);
+
+  return window;
+}
 
 static void
 print_attr(GeisGestureAttr *attr)
@@ -133,7 +154,7 @@
   GeisXcbWinInfo xcb_win_info = {
     .display_name  = NULL,
     .screenp       = NULL,
-    .window_id     = 0x296
+    .window_id     = getRootWindow()
   };
   GeisWinInfo win_info = {
     GEIS_XCB_FULL_WINDOW,