diff options
| author | Raul Gutierrez Segales <rgs@collabora.co.uk> | 2011-11-15 21:56:24 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-11-22 12:28:57 (GMT) |
| commit | a91983682a09ed5c631fb5bbb18b7fb14982b124 (patch) | |
| tree | 09082f550820d902096d849525f86de2c74bfd79 | |
| parent | b213493bd336852604cb30c5d3ea1c4b2526c7bb (diff) | |
Port key handling code to GTK3
[split patch into several parts, added minimal description]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
| -rw-r--r-- | src/sugar3/eggaccelerators.c | 27 | ||||
| -rw-r--r-- | src/sugar3/eggdesktopfile.c | 4 | ||||
| -rw-r--r-- | src/sugar3/sugar-key-grabber.c | 10 |
3 files changed, 22 insertions, 19 deletions
diff --git a/src/sugar3/eggaccelerators.c b/src/sugar3/eggaccelerators.c index 0487db0..45fcb17 100644 --- a/src/sugar3/eggaccelerators.c +++ b/src/sugar3/eggaccelerators.c @@ -25,6 +25,8 @@ #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> +#define GDK_KEY(symbol) GDK_KEY_##symbol + enum { EGG_MODMAP_ENTRY_SHIFT = 0, @@ -352,9 +354,10 @@ egg_accelerator_parse_virtual (const gchar *accelerator, bad_keyval = TRUE; } } - } else if (keycode != NULL) - *keycode = XKeysymToKeycode (GDK_DISPLAY(), keyval); - + } else if (keycode != NULL) { + *keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY(gdk_display_get_default ()), + keyval); + } accelerator += len; len -= len; } @@ -624,20 +627,20 @@ reload_modmap (GdkKeymap *keymap, j = 0; while (j < n_entries) { - if (keyvals[j] == GDK_Num_Lock) + if (keyvals[j] == GDK_KEY(Num_Lock)) mask |= EGG_VIRTUAL_NUM_LOCK_MASK; - else if (keyvals[j] == GDK_Scroll_Lock) + else if (keyvals[j] == GDK_KEY(Scroll_Lock)) mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK; - else if (keyvals[j] == GDK_Meta_L || - keyvals[j] == GDK_Meta_R) + else if (keyvals[j] == GDK_KEY(Meta_L) || + keyvals[j] == GDK_KEY(Meta_R)) mask |= EGG_VIRTUAL_META_MASK; - else if (keyvals[j] == GDK_Hyper_L || - keyvals[j] == GDK_Hyper_R) + else if (keyvals[j] == GDK_KEY(Hyper_L) || + keyvals[j] == GDK_KEY(Hyper_R)) mask |= EGG_VIRTUAL_HYPER_MASK; - else if (keyvals[j] == GDK_Super_L || - keyvals[j] == GDK_Super_R) + else if (keyvals[j] == GDK_KEY(Super_L) || + keyvals[j] == GDK_KEY(Super_R)) mask |= EGG_VIRTUAL_SUPER_MASK; - else if (keyvals[j] == GDK_Mode_switch) + else if (keyvals[j] == GDK_KEY(Mode_switch)) mask |= EGG_VIRTUAL_MODE_SWITCH_MASK; ++j; diff --git a/src/sugar3/eggdesktopfile.c b/src/sugar3/eggdesktopfile.c index d095a2f..ce1feb1 100644 --- a/src/sugar3/eggdesktopfile.c +++ b/src/sugar3/eggdesktopfile.c @@ -32,8 +32,8 @@ #include <glib/gi18n.h> #include <gdk/gdk.h> -#include <gtk/gtkwindow.h> -#include <gdk/gdkx.h> +#include <gtk/gtk.h> + struct EggDesktopFile { GKeyFile *key_file; diff --git a/src/sugar3/sugar-key-grabber.c b/src/sugar3/sugar-key-grabber.c index 8a00a80..28da2cc 100644 --- a/src/sugar3/sugar-key-grabber.c +++ b/src/sugar3/sugar-key-grabber.c @@ -18,9 +18,9 @@ */ #include <X11/X.h> -#include <gdk/gdkscreen.h> -#include <gdk/gdkx.h> +#include <X11/Xlib.h> #include <gdk/gdk.h> +#include <gdk/gdkx.h> #include "sugar-key-grabber.h" #include "eggaccelerators.h" @@ -161,10 +161,10 @@ static void grab_key_real (Key *key, GdkWindow *root, gboolean grab, int result) { if (grab) - XGrabKey (GDK_DISPLAY(), key->keycode, (result | key->state), + XGrabKey (GDK_DISPLAY_XDISPLAY(gdk_display_get_default ()), key->keycode, (result | key->state), GDK_WINDOW_XID (root), True, GrabModeAsync, GrabModeAsync); else - XUngrabKey(GDK_DISPLAY(), key->keycode, (result | key->state), + XUngrabKey(GDK_DISPLAY_XDISPLAY(gdk_display_get_default ()), key->keycode, (result | key->state), GDK_WINDOW_XID (root)); } @@ -255,7 +255,7 @@ sugar_key_grabber_is_modifier(SugarKeyGrabber *grabber, guint keycode, guint mas gint start, end, i, mod_index; gboolean is_modifier = FALSE; - xdisplay = gdk_x11_drawable_get_xdisplay(GDK_DRAWABLE (grabber->root)); + xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default ()); modmap = XGetModifierMapping(xdisplay); |