sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Key grabber: make grab_keys introspectable

Browse Source 
To the grab_keys function we pass a list of strings the key
grabber should listen for. In order to make this
introspectable we need to annotate the function correctly. I
followed the instructions for passing arrays [1] and have
chosen the type of the array data looking at [2].

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Daniel Narvaez <dwnarvaez@gmail.com>
Tested-by: Manuel Quiñones <manuq@laptop.org>

[1] https://live.gnome.org/PyGObject/IntrospectionPorting#Passing_arrays
[2] https://live.gnome.org/GObjectIntrospection/Annotations#Default_Basic_Types
This commit is contained in:
Simon Schampijer 2012-08-22 12:34:25 +02:00
parent 1d0692c18c
commit 09e9373612
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/sugar3/sugar-key-grabber.c
View File

@ -199,34 +199,41 @@ grab_key (SugarKeyGrabber *grabber, Key *key, gboolean grab)
} }
} }
/**
* sugar_key_grabber_grab_keys:
* @grabber: a #SugarKeyGrabber
* @keys: (array length=n_elements) (element-type utf8): array of
* keys the grabber will listen to
* @n_elements: number of elements in @keys.
*
* Pass to the key grabber the keys it should listen to.
**/
void void
sugar_key_grabber_grab_keys(SugarKeyGrabber *grabber, const char **keys) sugar_key_grabber_grab_keys(SugarKeyGrabber *grabber,
const gchar *keys[],
gint n_elements)
{ {
const char **cur = keys; gint i;
const char *key; const char *key;
Key *keyinfo = NULL; Key *keyinfo = NULL;
int min_keycodes, max_keycodes; gint min_keycodes, max_keycodes;
XDisplayKeycodes(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XDisplayKeycodes(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
&min_keycodes, &max_keycodes); &min_keycodes, &max_keycodes);
while (*cur != NULL) { for (i = 0; i < n_elements; i++){
key = *cur; keyinfo = g_new0 (Key, 1);
cur += 1; keyinfo->key = g_strdup(keys[i]);
keyinfo = g_new0 (Key, 1); if (!egg_accelerator_parse_virtual (keys[i], &keyinfo->keysym,
keyinfo->key = g_strdup(key);
if (!egg_accelerator_parse_virtual (key, &keyinfo->keysym,
&keyinfo->keycode, &keyinfo->keycode,
&keyinfo->state)) { &keyinfo->state)) {
g_warning ("Invalid key specified: %s", key); g_warning ("Invalid key specified: %s", keys[i]);
continue; continue;
} }
if (keyinfo->keycode < min_keycodes || keyinfo->keycode > max_keycodes) { if (keyinfo->keycode < min_keycodes || keyinfo->keycode > max_keycodes) {
g_warning ("Keycode out of bounds: %d for key %s", keyinfo->keycode, key); g_warning ("Keycode out of bounds: %d for key %s", keyinfo->keycode, keys[i]);
continue; continue;
} }
@ -239,12 +246,13 @@ sugar_key_grabber_grab_keys(SugarKeyGrabber *grabber, const char **keys)
if(!error_code) if(!error_code)
grabber->keys = g_list_append(grabber->keys, keyinfo); grabber->keys = g_list_append(grabber->keys, keyinfo);
else if(error_code == BadAccess) else if(error_code == BadAccess)
g_warning ("Grab failed, another application may already have access to key '%s'", key); g_warning ("Grab failed, another application may already have access to key '%s'", keys[i]);
else if(error_code == BadValue) else if(error_code == BadValue)
g_warning ("Grab failed, invalid key %s specified. keysym: %u keycode: %u state: %u", g_warning ("Grab failed, invalid key %s specified. keysym: %u keycode: %u state: %u",
key, keyinfo->keysym, keyinfo->keycode, keyinfo->state); keys[i], keyinfo->keysym, keyinfo->keycode, keyinfo->state);
else else
g_warning ("Grab failed for key '%s' for unknown reason '%d'", key, error_code); g_warning ("Grab failed for key '%s' for unknown reason '%d'", keys[i], error_code);
} }
} }
@ -285,4 +293,3 @@ sugar_key_grabber_is_modifier(SugarKeyGrabber *grabber, guint keycode, guint mas
return is_modifier; return is_modifier;
} }

3
src/sugar3/sugar-key-grabber.h
View File

@ -56,7 +56,8 @@ struct _SugarKeyGrabberClass {
GType sugar_key_grabber_get_type (void); GType sugar_key_grabber_get_type (void);
void sugar_key_grabber_grab_keys (SugarKeyGrabber *grabber, void sugar_key_grabber_grab_keys (SugarKeyGrabber *grabber,
const char **keys); const gchar *keys[],
gint n_elements);
char *sugar_key_grabber_get_key (SugarKeyGrabber *grabber, char *sugar_key_grabber_get_key (SugarKeyGrabber *grabber,
guint keycode, guint keycode,
guint state); guint state);