globalhotkeys 0.3.1 → 0.3.2

data/ChangeLog

@@ -1,3 +1,8 @@
+## rghk 0.3.2
+Fix a crash : rescue Xlib error in KeyBinder#bind
+Define XlibError exception.
+Add X11 header in extconf.rb
+
 ## rghk 0.3.1
 Fix a bug in KeyVal constants name.
 

data/extconf.rb

@@ -34,6 +34,9 @@ $CFLAGS+=gtk_cflags
 find_library('X11', 'XKeysymToKeycode') or exit 1
 find_library('gobject-2.0', 'g_type_init') or exit 1
 find_library('gdk-x11-2.0', '') or exit 1
+find_header('string.h') or exit 1
+find_header('X11/X.h') or exit 1
+find_header('X11/Xlib.h') or exit 1
 find_header('gdk/gdkwindow.h') or exit 1
 find_header('gdk/gdkevents.h') or exit 1
 find_header('gdk/gdkx.h') or exit 1

data/globalhotkeys.c

@@ -19,7 +19,10 @@ This file is part of rghk.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <string.h>
 #include <ruby.h>
+#include <X11/Xlib.h>
+#include <X11/X.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkwindow.h>
 #include <gdk/gdkx.h>
@@ -43,10 +46,12 @@ enum Modifier
 };
 
 GdkWindow * root_window;
+char xlib_error[256];
 VALUE mGlobalHotKeys;
 VALUE eInitFailed;
 VALUE eInvalidKeyVal;
 VALUE eBinded;
+VALUE eXlibError;
 VALUE mKeyVal;
 VALUE mModifier;
 VALUE cKeyBinder;
@@ -66,6 +71,28 @@ keyval_from_name(VALUE self, VALUE name)
 	return INT2FIX(keyval);
 }
 
+int
+xlib_error_handler(Display *display, XErrorEvent *error)
+{
+//FIXME : cannot ungrab possible grabbed key in incriminate call of kb_bind_common function : this function should not generate internal X protocol requests
+	char buff[256];
+
+	if (error->error_code==BadAccess)
+	{
+		strcpy(xlib_error, "Xlib BadAccess error (key must be grabbed by another programm)");
+	}
+	else
+	{
+		if (strcmp(xlib_error, "")==0)
+		{
+			XGetErrorText(GDK_WINDOW_XDISPLAY(root_window), error->error_code,
+				buff, sizeof(buff));
+			strcpy(xlib_error, buff);
+		}
+	}
+	return 0;
+}
+
 void
 kb_bind_common(VALUE self, VALUE key, VALUE modifier, VALUE block)
 {
@@ -76,6 +103,7 @@ kb_bind_common(VALUE self, VALUE key, VALUE modifier, VALUE block)
 		RGHK_LOCK_MASK|RGHK_NUM_LOCK_MASK|RGHK_SCROLL_LOCK};*/
 	uint ignored[]={0, RGHK_LOCK_MASK, RGHK_NUM_LOCK_MASK, RGHK_LOCK_MASK|RGHK_NUM_LOCK_MASK};
 	uint mod;
+	XErrorHandler handler;
 
 	if (rb_funcall(rb_cv_get(cKeyBinder, "@@stock"), rb_intern("include?"), 1, self)==Qtrue)
 		rb_raise(eBinded, "KeyBinder allready binded.");
@@ -91,12 +119,18 @@ kb_bind_common(VALUE self, VALUE key, VALUE modifier, VALUE block)
 	else
 		mod=NUM2UINT(modifier);
 
+	strcpy(xlib_error, "");
+	handler=XSetErrorHandler(xlib_error_handler);
 	int i;
 	for (i=0; i<4 ; i++)
 	{
 		XGrabKey(xdisplay, keycode, mod|ignored[i],  GDK_WINDOW_XWINDOW(root_window), False,
 			GrabModeAsync, GrabModeAsync);
 	}
+	XSync(xdisplay, FALSE);
+	XSetErrorHandler(handler);
+	if (strcmp(xlib_error, "")!=0)
+		rb_raise(eXlibError, xlib_error);
 //XGrabKey(xdisplay, keycode, AnyModifier, GDK_WINDOW_XWINDOW(root_window), False, GrabModeAsync, GrabModeAsync);
 
 	rb_iv_set(self, "@key", key);
@@ -167,7 +201,7 @@ kb_unbind(VALUE self)
 }
 
 /*
- * Unset a all global hotkeys.
+ * Unset all global hotkeys.
 */
 VALUE
 kb_unbind_all(VALUE self)
@@ -248,6 +282,7 @@ Init_globalhotkeys()
 	eInitFailed=rb_define_class_under(mGlobalHotKeys, "InitFailed", rb_eException);
 	eInvalidKeyVal=rb_define_class_under(mGlobalHotKeys, "InvalidKeyVal", rb_eException);
 	eBinded=rb_define_class_under(mGlobalHotKeys, "Binded", rb_eException);
+	eXlibError=rb_define_class_under(mGlobalHotKeys, "XlibError", rb_eException);
 
 	mKeyVal=rb_define_module_under(mGlobalHotKeys, "KeyVal");
 	rb_define_module_function(mKeyVal, "from_name", keyval_from_name, 1);

data/lib/globalhotkeys.rb

@@ -24,7 +24,7 @@ require 'globalhotkeys.so'
 
 #:main: GlobalHotKeys
 module GlobalHotKeys
-VERSION=[0, 3, 1]
+VERSION=[0, 3, 2]
 end
 
 GlobalHotKeys.init

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: globalhotkeys
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Vincent Carmona
@@ -36,7 +36,7 @@ cert_chain:
   oxzIRXlS
   -----END CERTIFICATE-----
 
-date: 2011-03-10 00:00:00 +01:00
+date: 2011-03-20 00:00:00 +01:00
 default_executable: 
 dependencies: []