* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <ctype.h>
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "gdk.h"
+#include "gdkx.h"
#include "gdkprivate-x11.h"
#include "gdkinternals.h"
+#include "gdkdisplay-x11.h"
#include "gdkkeysyms.h"
-#include "config.h"
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+
+/* OSF-4.0 is apparently missing this macro
+ */
+# ifndef XkbKeySymEntry
+# define XkbKeySymEntry(d,k,sl,g) \
+ (XkbKeySym(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))))
+# endif
+#endif /* HAVE_XKB */
+
+typedef struct _GdkKeymapX11 GdkKeymapX11;
+typedef struct _GdkKeymapClass GdkKeymapX11Class;
+
+#define GDK_TYPE_KEYMAP_X11 (gdk_keymap_x11_get_type ())
+#define GDK_KEYMAP_X11(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_KEYMAP_X11, GdkKeymapX11))
+#define GDK_IS_KEYMAP_X11(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_KEYMAP_X11))
+
+typedef struct _DirectionCacheEntry DirectionCacheEntry;
+
+struct _DirectionCacheEntry
+{
+ guint serial;
+ Atom group_atom;
+ PangoDirection direction;
+};
-guint _gdk_keymap_serial = 0;
+struct _GdkKeymapX11
+{
+ GdkKeymap parent_instance;
+
+ gint min_keycode;
+ gint max_keycode;
+ KeySym* keymap;
+ gint keysyms_per_keycode;
+ XModifierKeymap* mod_keymap;
+ guint lock_keysym;
+ GdkModifierType group_switch_mask;
+ GdkModifierType num_lock_mask;
+ GdkModifierType modmap[8];
+ PangoDirection current_direction;
+ guint sun_keypad : 1;
+ guint have_direction : 1;
+ guint caps_lock_state : 1;
+ guint num_lock_state : 1;
+ guint current_serial;
+
+#ifdef HAVE_XKB
+ XkbDescPtr xkb_desc;
+ /* We cache the directions */
+ Atom current_group_atom;
+ guint current_cache_serial;
+ /* A cache of size four should be more than enough, people usually
+ * have two groups around, and the xkb limit is four. It still
+ * works correct for more than four groups. It's just the
+ * cache.
+ */
+ DirectionCacheEntry group_direction_cache[4];
+#endif
+};
-static gint min_keycode = 0;
-static gint max_keycode = 0;
+#define KEYMAP_USE_XKB(keymap) GDK_DISPLAY_X11 ((keymap)->display)->use_xkb
+#define KEYMAP_XDISPLAY(keymap) GDK_DISPLAY_XDISPLAY ((keymap)->display)
+
+static GType gdk_keymap_x11_get_type (void);
+static void gdk_keymap_x11_class_init (GdkKeymapX11Class *klass);
+static void gdk_keymap_x11_init (GdkKeymapX11 *keymap);
+static void gdk_keymap_x11_finalize (GObject *object);
+
+static GdkKeymapClass *parent_class = NULL;
+
+static GType
+gdk_keymap_x11_get_type (void)
+{
+ static GType object_type = 0;
+
+ if (!object_type)
+ {
+ const GTypeInfo object_info =
+ {
+ sizeof (GdkKeymapClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gdk_keymap_x11_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GdkKeymapX11),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gdk_keymap_x11_init,
+ };
+
+ object_type = g_type_register_static (GDK_TYPE_KEYMAP,
+ g_intern_static_string ("GdkKeymapX11"),
+ &object_info, 0);
+ }
+
+ return object_type;
+}
+
+static void
+gdk_keymap_x11_class_init (GdkKeymapX11Class *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_class->finalize = gdk_keymap_x11_finalize;
+}
+
+static void
+gdk_keymap_x11_init (GdkKeymapX11 *keymap)
+{
+ keymap->min_keycode = 0;
+ keymap->max_keycode = 0;
+
+ keymap->keymap = NULL;
+ keymap->keysyms_per_keycode = 0;
+ keymap->mod_keymap = NULL;
+
+ keymap->num_lock_mask = 0;
+ keymap->sun_keypad = FALSE;
+ keymap->group_switch_mask = 0;
+ keymap->lock_keysym = GDK_KEY_Caps_Lock;
+ keymap->have_direction = FALSE;
+ keymap->current_serial = 0;
+
+#ifdef HAVE_XKB
+ keymap->xkb_desc = NULL;
+ keymap->current_group_atom = 0;
+ keymap->current_cache_serial = 0;
+#endif
+
+}
+
+static void
+gdk_keymap_x11_finalize (GObject *object)
+{
+ GdkKeymapX11 *keymap_x11 = GDK_KEYMAP_X11 (object);
+
+ if (keymap_x11->keymap)
+ XFree (keymap_x11->keymap);
+
+ if (keymap_x11->mod_keymap)
+ XFreeModifiermap (keymap_x11->mod_keymap);
+
+#ifdef HAVE_XKB
+ if (keymap_x11->xkb_desc)
+ XkbFreeKeyboard (keymap_x11->xkb_desc, XkbAllComponentsMask, True);
+#endif
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
static inline void
-update_keyrange (void)
+update_keyrange (GdkKeymapX11 *keymap_x11)
{
- if (max_keycode == 0)
- XDisplayKeycodes (gdk_display, &min_keycode, &max_keycode);
+ if (keymap_x11->max_keycode == 0)
+ XDisplayKeycodes (KEYMAP_XDISPLAY (GDK_KEYMAP (keymap_x11)),
+ &keymap_x11->min_keycode, &keymap_x11->max_keycode);
}
#ifdef HAVE_XKB
-#include <X11/XKBlib.h>
-gboolean _gdk_use_xkb = FALSE;
-gint _gdk_xkb_event_type;
-static XkbDescPtr xkb_desc = NULL;
+static void
+update_modmap (Display *display,
+ GdkKeymapX11 *keymap_x11)
+{
+ static struct {
+ const gchar *name;
+ Atom atom;
+ GdkModifierType mask;
+ } vmods[] = {
+ { "Meta", 0, GDK_META_MASK },
+ { "Super", 0, GDK_SUPER_MASK },
+ { "Hyper", 0, GDK_HYPER_MASK },
+ { NULL, 0, 0 }
+ };
+
+ gint i, j, k;
+
+ if (!vmods[0].atom)
+ for (i = 0; vmods[i].name; i++)
+ vmods[i].atom = XInternAtom (display, vmods[i].name, FALSE);
+
+ for (i = 0; i < 8; i++)
+ keymap_x11->modmap[i] = 1 << i;
+
+ for (i = 0; i < XkbNumVirtualMods; i++)
+ {
+ for (j = 0; vmods[j].atom; j++)
+ {
+ if (keymap_x11->xkb_desc->names->vmods[i] == vmods[j].atom)
+ {
+ for (k = 0; k < 8; k++)
+ {
+ if (keymap_x11->xkb_desc->server->vmods[i] & (1 << k))
+ keymap_x11->modmap[k] |= vmods[j].mask;
+ }
+ }
+ }
+ }
+}
static XkbDescPtr
-get_xkb (void)
+get_xkb (GdkKeymapX11 *keymap_x11)
{
- static guint current_serial = 0;
-
- update_keyrange ();
+ GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_KEYMAP (keymap_x11)->display);
+ Display *xdisplay = display_x11->xdisplay;
+
+ update_keyrange (keymap_x11);
- if (xkb_desc == NULL)
+ if (keymap_x11->xkb_desc == NULL)
{
- xkb_desc = XkbGetMap (gdk_display, XkbKeySymsMask, XkbUseCoreKbd);
- if (xkb_desc == NULL)
- g_error ("Failed to get keymap");
+ keymap_x11->xkb_desc = XkbGetMap (xdisplay, XkbKeySymsMask | XkbKeyTypesMask | XkbModifierMapMask | XkbVirtualModsMask, XkbUseCoreKbd);
+ if (keymap_x11->xkb_desc == NULL)
+ {
+ g_error ("Failed to get keymap");
+ return NULL;
+ }
+
+ XkbGetNames (xdisplay, XkbGroupNamesMask | XkbVirtualModNamesMask, keymap_x11->xkb_desc);
- XkbGetNames (gdk_display, XkbGroupNamesMask, xkb_desc);
+ update_modmap (xdisplay, keymap_x11);
}
- else if (current_serial != _gdk_keymap_serial)
+ else if (keymap_x11->current_serial != display_x11->keymap_serial)
{
- XkbGetUpdatedMap (gdk_display, XkbKeySymsMask, xkb_desc);
- XkbGetNames (gdk_display, XkbGroupNamesMask, xkb_desc);
+ XkbGetUpdatedMap (xdisplay, XkbKeySymsMask | XkbKeyTypesMask | XkbModifierMapMask | XkbVirtualModsMask,
+ keymap_x11->xkb_desc);
+ XkbGetNames (xdisplay, XkbGroupNamesMask | XkbVirtualModNamesMask, keymap_x11->xkb_desc);
+
+ update_modmap (xdisplay, keymap_x11);
}
- current_serial = _gdk_keymap_serial;
+ keymap_x11->current_serial = display_x11->keymap_serial;
+
+ if (keymap_x11->num_lock_mask == 0)
+ keymap_x11->num_lock_mask = XkbKeysymToModifiers (KEYMAP_XDISPLAY (GDK_KEYMAP (keymap_x11)), XK_Num_Lock);
- return xkb_desc;
+ return keymap_x11->xkb_desc;
}
#endif /* HAVE_XKB */
* XkbSetDetectableAutorepeat. If FALSE, we'll fall back
* to checking the next event with XPending().
*/
-gboolean _gdk_have_xkb_autorepeat = FALSE;
-
-static KeySym* keymap = NULL;
-static gint keysyms_per_keycode = 0;
-static XModifierKeymap* mod_keymap = NULL;
-static GdkModifierType group_switch_mask = 0;
-static PangoDirection current_direction;
-static gboolean have_direction = FALSE;
-static GdkKeymap *default_keymap = NULL;
-/**
- * gdk_keymap_get_default:
- *
- * Gets the #GdkKeymap for the default display.
- *
- * Return value: the default keymap
+/**
+ * gdk_keymap_get_for_display:
+ * @display: the #GdkDisplay.
+ * @returns: the #GdkKeymap attached to @display.
+ *
+ * Returns the #GdkKeymap attached to @display.
+ *
+ * Since: 2.2
**/
GdkKeymap*
-gdk_keymap_get_default (void)
+gdk_keymap_get_for_display (GdkDisplay *display)
+{
+ GdkDisplayX11 *display_x11;
+ g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+ display_x11 = GDK_DISPLAY_X11 (display);
+
+ if (!display_x11->keymap)
+ display_x11->keymap = g_object_new (gdk_keymap_x11_get_type (), NULL);
+
+ display_x11->keymap->display = display;
+
+ return display_x11->keymap;
+}
+
+/* Find the index of the group/level pair within the keysyms for a key.
+ * We round up the number of keysyms per keycode to the next even number,
+ * otherwise we lose a whole group of keys
+ */
+#define KEYSYM_INDEX(keymap_impl, group, level) \
+ (2 * ((group) % (gint)((keymap_impl->keysyms_per_keycode + 1) / 2)) + (level))
+#define KEYSYM_IS_KEYPAD(s) (((s) >= 0xff80 && (s) <= 0xffbd) || \
+ ((s) >= 0x11000000 && (s) <= 0x1100ffff))
+
+static gint
+get_symbol (const KeySym *syms,
+ GdkKeymapX11 *keymap_x11,
+ gint group,
+ gint level)
{
- if (default_keymap == NULL)
- default_keymap = g_object_new (gdk_keymap_get_type (), NULL);
+ gint index;
+
+ index = KEYSYM_INDEX(keymap_x11, group, level);
+ if (index >= keymap_x11->keysyms_per_keycode)
+ return NoSymbol;
+
+ return syms[index];
+}
+
+static void
+set_symbol (KeySym *syms,
+ GdkKeymapX11 *keymap_x11,
+ gint group,
+ gint level,
+ KeySym sym)
+{
+ gint index;
+
+ index = KEYSYM_INDEX(keymap_x11, group, level);
+ if (index >= keymap_x11->keysyms_per_keycode)
+ return;
- return default_keymap;
+ syms[index] = sym;
}
static void
-update_keymaps (void)
+update_keymaps (GdkKeymapX11 *keymap_x11)
{
- static guint current_serial = 0;
+ GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_KEYMAP (keymap_x11)->display);
+ Display *xdisplay = display_x11->xdisplay;
#ifdef HAVE_XKB
- g_assert (!_gdk_use_xkb);
+ g_assert (!KEYMAP_USE_XKB (GDK_KEYMAP (keymap_x11)));
#endif
- if (keymap == NULL ||
- current_serial != _gdk_keymap_serial)
+ if (keymap_x11->keymap == NULL ||
+ keymap_x11->current_serial != display_x11->keymap_serial)
{
gint i;
gint map_size;
+ gint keycode;
- current_serial = _gdk_keymap_serial;
-
- update_keyrange ();
+ keymap_x11->current_serial = display_x11->keymap_serial;
+
+ update_keyrange (keymap_x11);
- if (keymap)
- XFree (keymap);
+ if (keymap_x11->keymap)
+ XFree (keymap_x11->keymap);
- if (mod_keymap)
- XFreeModifiermap (mod_keymap);
+ if (keymap_x11->mod_keymap)
+ XFreeModifiermap (keymap_x11->mod_keymap);
- keymap = XGetKeyboardMapping (gdk_display, min_keycode,
- max_keycode - min_keycode,
- &keysyms_per_keycode);
+ keymap_x11->keymap = XGetKeyboardMapping (xdisplay, keymap_x11->min_keycode,
+ keymap_x11->max_keycode - keymap_x11->min_keycode + 1,
+ &keymap_x11->keysyms_per_keycode);
- mod_keymap = XGetModifierMapping (gdk_display);
+ /* GDK_ISO_Left_Tab, as usually configured through XKB, really messes
+ * up the whole idea of "consumed modifiers" because shift is consumed.
+ * However, <shift>Tab is not usually GDK_ISO_Left_Tab without XKB,
+ * we we fudge the map here.
+ */
+ keycode = keymap_x11->min_keycode;
+ while (keycode <= keymap_x11->max_keycode)
+ {
+ KeySym *syms = keymap_x11->keymap + (keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
+ /* Check both groups */
+ for (i = 0 ; i < 2 ; i++)
+ {
+ if (get_symbol (syms, keymap_x11, i, 0) == GDK_KEY_Tab)
+ set_symbol (syms, keymap_x11, i, 1, GDK_KEY_ISO_Left_Tab);
+ }
+
+ /*
+ * If there is one keysym and the key symbol has upper and lower
+ * case variants fudge the keymap
+ */
+ if (get_symbol (syms, keymap_x11, 0, 1) == 0)
+ {
+ guint lower;
+ guint upper;
- group_switch_mask = 0;
+ gdk_keyval_convert_case (get_symbol (syms, keymap_x11, 0, 0), &lower, &upper);
+ if (lower != upper)
+ {
+ set_symbol (syms, keymap_x11, 0, 0, lower);
+ set_symbol (syms, keymap_x11, 0, 1, upper);
+ }
+ }
+
+
+ ++keycode;
+ }
+
+ keymap_x11->mod_keymap = XGetModifierMapping (xdisplay);
+
+ keymap_x11->lock_keysym = GDK_KEY_VoidSymbol;
+ keymap_x11->group_switch_mask = 0;
+ keymap_x11->num_lock_mask = 0;
- /* there are 8 modifiers, and the first 3 are shift, shift lock,
- * and control
+ for (i = 0; i < 8; i++)
+ keymap_x11->modmap[i] = 1 << i;
+
+ /* There are 8 sets of modifiers, with each set containing
+ * max_keypermod keycodes.
*/
- map_size = 8 * mod_keymap->max_keypermod;
- i = 3 * mod_keymap->max_keypermod;
- while (i < map_size)
+ map_size = 8 * keymap_x11->mod_keymap->max_keypermod;
+ for (i = 0; i < map_size; i++)
{
- /* get the key code at this point in the map,
- * see if its keysym is GDK_Mode_switch, if so
- * we have the mode key
+ /* Get the key code at this point in the map. */
+ gint keycode = keymap_x11->mod_keymap->modifiermap[i];
+ gint j;
+ KeySym *syms;
+ guint mask;
+
+ /* Ignore invalid keycodes. */
+ if (keycode < keymap_x11->min_keycode ||
+ keycode > keymap_x11->max_keycode)
+ continue;
+
+ syms = keymap_x11->keymap + (keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
+
+ mask = 0;
+ for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
+ {
+ if (syms[j] == GDK_KEY_Meta_L ||
+ syms[j] == GDK_KEY_Meta_R)
+ mask |= GDK_META_MASK;
+ else if (syms[j] == GDK_KEY_Hyper_L ||
+ syms[j] == GDK_KEY_Hyper_R)
+ mask |= GDK_HYPER_MASK;
+ else if (syms[j] == GDK_KEY_Super_L ||
+ syms[j] == GDK_KEY_Super_R)
+ mask |= GDK_SUPER_MASK;
+ }
+
+ keymap_x11->modmap[i/keymap_x11->mod_keymap->max_keypermod] |= mask;
+
+ /* The fourth modifier, GDK_MOD1_MASK is 1 << 3.
+ * Each group of max_keypermod entries refers to the same modifier.
*/
- gint keycode = mod_keymap->modifiermap[i];
-
- if (keycode >= min_keycode &&
- keycode <= max_keycode)
+ mask = 1 << (i / keymap_x11->mod_keymap->max_keypermod);
+
+ switch (mask)
{
- gint j = 0;
- KeySym *syms = keymap + (keycode - min_keycode) * keysyms_per_keycode;
- while (j < keysyms_per_keycode)
+ case GDK_LOCK_MASK:
+ /* Get the Lock keysym. If any keysym bound to the Lock modifier
+ * is Caps_Lock, we will interpret the modifier as Caps_Lock;
+ * otherwise, if any is bound to Shift_Lock, we will interpret
+ * the modifier as Shift_Lock. Otherwise, the lock modifier
+ * has no effect.
+ */
+ for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
+ {
+ if (syms[j] == GDK_KEY_Caps_Lock)
+ keymap_x11->lock_keysym = GDK_KEY_Caps_Lock;
+ else if (syms[j] == GDK_KEY_Shift_Lock &&
+ keymap_x11->lock_keysym == GDK_KEY_VoidSymbol)
+ keymap_x11->lock_keysym = GDK_KEY_Shift_Lock;
+ }
+ break;
+
+ case GDK_CONTROL_MASK:
+ case GDK_SHIFT_MASK:
+ case GDK_MOD1_MASK:
+ /* Some keyboard maps are known to map Mode_Switch as an
+ * extra Mod1 key. In circumstances like that, it won't be
+ * used to switch groups.
+ */
+ break;
+
+ default:
+ /* Find the Mode_Switch and Num_Lock modifiers. */
+ for (j = 0; j < keymap_x11->keysyms_per_keycode; j++)
{
- if (syms[j] == GDK_Mode_switch)
+ if (syms[j] == GDK_KEY_Mode_switch)
{
/* This modifier swaps groups */
-
- /* GDK_MOD1_MASK is 1 << 3 for example, i.e. the
- * fourth modifier, i / keyspermod is the modifier
- * index
- */
-
- group_switch_mask |= (1 << ( i / mod_keymap->max_keypermod));
- break;
+ keymap_x11->group_switch_mask |= mask;
+ }
+ else if (syms[j] == GDK_KEY_Num_Lock)
+ {
+ /* This modifier is used for Num_Lock */
+ keymap_x11->num_lock_mask |= mask;
}
-
- ++j;
}
+ break;
}
-
- ++i;
}
+
+ /* Hack: The Sun X server puts the keysym to use when the Num Lock
+ * modifier is on in the third element of the keysym array, instead
+ * of the second.
+ */
+ if ((strcmp (ServerVendor (xdisplay), "Sun Microsystems, Inc.") == 0) &&
+ (keymap_x11->keysyms_per_keycode > 2))
+ keymap_x11->sun_keypad = TRUE;
+ else
+ keymap_x11->sun_keypad = FALSE;
}
}
static const KeySym*
-get_keymap (void)
+get_keymap (GdkKeymapX11 *keymap_x11)
{
- update_keymaps ();
+ update_keymaps (keymap_x11);
+ return keymap_x11->keymap;
+}
+
+#define GET_EFFECTIVE_KEYMAP(keymap) get_effective_keymap ((keymap), G_STRFUNC)
+
+static GdkKeymap *
+get_effective_keymap (GdkKeymap *keymap,
+ const char *function)
+{
+ if (!keymap)
+ {
+ GDK_NOTE (MULTIHEAD,
+ g_message ("reverting to default display keymap in %s",
+ function));
+ return gdk_keymap_get_default ();
+ }
+
return keymap;
}
#if HAVE_XKB
static PangoDirection
-get_direction (void)
+get_direction (XkbDescRec *xkb,
+ gint group)
{
- XkbDescRec *xkb = get_xkb ();
- const char *name;
- XkbStateRec state_rec;
- PangoDirection result;
+ gint code;
- XkbGetState (gdk_display, XkbUseCoreKbd, &state_rec);
+ gint rtl_minus_ltr = 0; /* total number of RTL keysyms minus LTR ones */
- if (xkb->names->groups[state_rec.locked_group] == None)
- result = PANGO_DIRECTION_LTR;
+ for (code = xkb->min_key_code; code <= xkb->max_key_code; code++)
+ {
+ gint level = 0;
+ KeySym sym = XkbKeySymEntry (xkb, code, level, group);
+ PangoDirection dir = pango_unichar_direction (gdk_keyval_to_unicode (sym));
+
+ switch (dir)
+ {
+ case PANGO_DIRECTION_RTL:
+ rtl_minus_ltr++;
+ break;
+ case PANGO_DIRECTION_LTR:
+ rtl_minus_ltr--;
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (rtl_minus_ltr > 0)
+ return PANGO_DIRECTION_RTL;
else
+ return PANGO_DIRECTION_LTR;
+}
+
+static PangoDirection
+get_direction_from_cache (GdkKeymapX11 *keymap_x11,
+ XkbDescPtr xkb,
+ gint group)
+{
+ Atom group_atom = xkb->names->groups[group];
+
+ gboolean cache_hit = FALSE;
+ DirectionCacheEntry *cache = keymap_x11->group_direction_cache;
+
+ PangoDirection direction = PANGO_DIRECTION_NEUTRAL;
+ gint i;
+
+ if (keymap_x11->have_direction)
{
- name = gdk_x11_get_xatom_name (xkb->names->groups[state_rec.locked_group]);
- if (g_strcasecmp (name, "arabic") == 0 ||
- g_strcasecmp (name, "hebrew") == 0 ||
- g_strcasecmp (name, "israelian") == 0)
- result = PANGO_DIRECTION_RTL;
- else
- result = PANGO_DIRECTION_LTR;
+ /* lookup in cache */
+ for (i = 0; i < G_N_ELEMENTS (keymap_x11->group_direction_cache); i++)
+ {
+ if (cache[i].group_atom == group_atom)
+ {
+ cache_hit = TRUE;
+ cache[i].serial = keymap_x11->current_cache_serial++; /* freshen */
+ direction = cache[i].direction;
+ group_atom = cache[i].group_atom;
+ break;
+ }
+ }
}
-
- return result;
+ else
+ {
+ /* initialize cache */
+ for (i = 0; i < G_N_ELEMENTS (keymap_x11->group_direction_cache); i++)
+ {
+ cache[i].group_atom = 0;
+ cache[i].serial = keymap_x11->current_cache_serial;
+ }
+ keymap_x11->current_cache_serial++;
+ }
+
+ /* insert in cache */
+ if (!cache_hit)
+ {
+ gint oldest = 0;
+
+ direction = get_direction (xkb, group);
+
+ /* remove the oldest entry */
+ for (i = 0; i < G_N_ELEMENTS (keymap_x11->group_direction_cache); i++)
+ {
+ if (cache[i].serial < cache[oldest].serial)
+ oldest = i;
+ }
+
+ cache[oldest].group_atom = group_atom;
+ cache[oldest].direction = direction;
+ cache[oldest].serial = keymap_x11->current_cache_serial++;
+ }
+
+ return direction;
}
+static int
+get_num_groups (GdkKeymap *keymap,
+ XkbDescPtr xkb)
+{
+ Display *display = KEYMAP_XDISPLAY (keymap);
+ XkbGetControls(display, XkbSlowKeysMask, xkb);
+ XkbGetUpdatedMap (display, XkbKeySymsMask | XkbKeyTypesMask |
+ XkbModifierMapMask | XkbVirtualModsMask, xkb);
+ return xkb->ctrls->num_groups;
+}
+
+static gboolean
+update_direction (GdkKeymapX11 *keymap_x11,
+ gint group)
+{
+ XkbDescPtr xkb = get_xkb (keymap_x11);
+ Atom group_atom;
+ gboolean had_direction;
+ PangoDirection old_direction;
+
+ had_direction = keymap_x11->have_direction;
+ old_direction = keymap_x11->current_direction;
+
+ group_atom = xkb->names->groups[group];
+
+ /* a group change? */
+ if (!keymap_x11->have_direction || keymap_x11->current_group_atom != group_atom)
+ {
+ keymap_x11->current_direction = get_direction_from_cache (keymap_x11, xkb, group);
+ keymap_x11->current_group_atom = group_atom;
+ keymap_x11->have_direction = TRUE;
+ }
+
+ return !had_direction || old_direction != keymap_x11->current_direction;
+}
+
+static gboolean
+update_lock_state (GdkKeymapX11 *keymap_x11,
+ gint locked_mods)
+{
+ gboolean caps_lock_state;
+ gboolean num_lock_state;
+
+ caps_lock_state = keymap_x11->caps_lock_state;
+ num_lock_state = keymap_x11->num_lock_state;
+
+ keymap_x11->caps_lock_state = (locked_mods & GDK_LOCK_MASK) != 0;
+ keymap_x11->num_lock_state = (locked_mods & keymap_x11->num_lock_mask) != 0;
+
+ return (caps_lock_state != keymap_x11->caps_lock_state)
+ || (num_lock_state != keymap_x11->num_lock_state);
+}
+
+/* keep this in sync with the XkbSelectEventDetails() call
+ * in gdk_display_open()
+ */
void
-_gdk_keymap_state_changed (void)
+_gdk_keymap_state_changed (GdkDisplay *display,
+ XEvent *xevent)
{
- if (default_keymap)
+ GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
+ XkbEvent *xkb_event = (XkbEvent *)xevent;
+
+ if (display_x11->keymap)
{
- PangoDirection new_direction = get_direction ();
+ GdkKeymapX11 *keymap_x11 = GDK_KEYMAP_X11 (display_x11->keymap);
- if (!have_direction || new_direction != current_direction)
- {
- have_direction = TRUE;
- current_direction = new_direction;
- g_signal_emit_by_name (G_OBJECT (default_keymap), "direction_changed");
- }
+ if (update_direction (keymap_x11, XkbStateGroup (&xkb_event->state)))
+ g_signal_emit_by_name (keymap_x11, "direction-changed");
+
+ if (update_lock_state (keymap_x11, xkb_event->state.locked_mods))
+ g_signal_emit_by_name (keymap_x11, "state-changed");
}
}
+
#endif /* HAVE_XKB */
+
+void
+_gdk_keymap_keys_changed (GdkDisplay *display)
+{
+ GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
+
+ ++display_x11->keymap_serial;
+ if (display_x11->keymap)
+ g_signal_emit_by_name (display_x11->keymap, "keys_changed", 0);
+}
+
+/**
+ * gdk_keymap_get_direction:
+ * @keymap: a #GdkKeymap or %NULL to use the default keymap
+ *
+ * Returns the direction of effective layout of the keymap.
+ *
+ * Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL
+ * if it can determine the direction. %PANGO_DIRECTION_NEUTRAL
+ * otherwise.
+ **/
PangoDirection
gdk_keymap_get_direction (GdkKeymap *keymap)
{
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+
#if HAVE_XKB
- if (_gdk_use_xkb)
+ if (KEYMAP_USE_XKB (keymap))
{
- if (!have_direction)
+ GdkKeymapX11 *keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+ if (!keymap_x11->have_direction)
{
- current_direction = get_direction ();
- have_direction = TRUE;
+ GdkDisplay *display = GDK_KEYMAP (keymap_x11)->display;
+ XkbStateRec state_rec;
+
+ XkbGetState (GDK_DISPLAY_XDISPLAY (display), XkbUseCoreKbd,
+ &state_rec);
+ update_direction (keymap_x11, XkbStateGroup (&state_rec));
}
- return current_direction;
+ return keymap_x11->current_direction;
}
else
#endif /* HAVE_XKB */
- return PANGO_DIRECTION_LTR;
+ return PANGO_DIRECTION_NEUTRAL;
+}
+
+/**
+ * gdk_keymap_have_bidi_layouts:
+ * @keymap: a #GdkKeymap or %NULL to use the default keymap
+ *
+ * Determines if keyboard layouts for both right-to-left and left-to-right
+ * languages are in use.
+ *
+ * Returns: %TRUE if there are layouts in both directions, %FALSE otherwise
+ *
+ * Since: 2.12
+ **/
+gboolean
+gdk_keymap_have_bidi_layouts (GdkKeymap *keymap)
+{
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+
+#if HAVE_XKB
+ if (KEYMAP_USE_XKB (keymap))
+ {
+ GdkKeymapX11 *keymap_x11 = GDK_KEYMAP_X11 (keymap);
+ XkbDescPtr xkb = get_xkb (keymap_x11);
+ int num_groups = get_num_groups (keymap, xkb);
+
+ int i;
+ gboolean have_ltr_keyboard = FALSE;
+ gboolean have_rtl_keyboard = FALSE;
+
+ for (i = 0; i < num_groups; i++)
+ {
+ if (get_direction_from_cache (keymap_x11, xkb, i) == PANGO_DIRECTION_RTL)
+ have_rtl_keyboard = TRUE;
+ else
+ have_ltr_keyboard = TRUE;
+ }
+
+ return have_ltr_keyboard && have_rtl_keyboard;
+ }
+ else
+#endif /* HAVE_XKB */
+ return FALSE;
+}
+
+/**
+ * gdk_keymap_get_caps_lock_state:
+ * @keymap: a #GdkKeymap
+ *
+ * Returns whether the Caps Lock modifer is locked.
+ *
+ * Returns: %TRUE if Caps Lock is on
+ *
+ * Since: 2.16
+ */
+gboolean
+gdk_keymap_get_caps_lock_state (GdkKeymap *keymap)
+{
+ GdkKeymapX11 *keymap_x11;
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+ return keymap_x11->caps_lock_state;
+}
+
+/**
+ * gdk_keymap_get_num_lock_state:
+ * @keymap: a #GdkKeymap
+ *
+ * Returns whether the Num Lock modifer is locked.
+ *
+ * Returns: %TRUE if Num Lock is on
+ *
+ * Since: 3.0
+ */
+gboolean
+gdk_keymap_get_num_lock_state (GdkKeymap *keymap)
+{
+ GdkKeymapX11 *keymap_x11;
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+ return keymap_x11->num_lock_state;
}
/**
* gdk_keymap_get_entries_for_keyval:
- * @keymap: a #GdkKeymap, or %NULL to use the default keymap
+ * @keymap: (allow-none): a #GdkKeymap, or %NULL to use the default keymap
* @keyval: a keyval, such as %GDK_a, %GDK_Up, %GDK_Return, etc.
- * @keys: return location for an array of #GdkKeymapKey
- * @n_keys: return location for number of elements in returned array
- *
+ * @keys: (out): return location for an array of #GdkKeymapKey
+ * @n_keys: (out): return location for number of elements in returned array
+ *
* Obtains a list of keycode/group/level combinations that will
* generate @keyval. Groups and levels are two kinds of keyboard mode;
* in general, the level determines whether the top or bottom symbol
gint *n_keys)
{
GArray *retval;
+ GdkKeymapX11 *keymap_x11;
g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
g_return_val_if_fail (keys != NULL, FALSE);
g_return_val_if_fail (n_keys != NULL, FALSE);
g_return_val_if_fail (keyval != 0, FALSE);
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
#ifdef HAVE_XKB
- if (_gdk_use_xkb)
+ if (KEYMAP_USE_XKB (keymap))
{
/* See sec 15.3.4 in XKB docs */
- XkbDescRec *xkb = get_xkb ();
+ XkbDescRec *xkb = get_xkb (keymap_x11);
gint keycode;
- keycode = min_keycode;
+ keycode = keymap_x11->min_keycode;
- while (keycode <= max_keycode)
+ while (keycode <= keymap_x11->max_keycode)
{
gint max_shift_levels = XkbKeyGroupsWidth (xkb, keycode); /* "key width" */
gint group = 0;
g_array_append_val (retval, key);
- g_assert (XkbKeySymEntry (xkb, keycode, level, group) == keyval);
+ g_assert (XkbKeySymEntry (xkb, keycode, level, group) ==
+ keyval);
}
++level;
else
#endif
{
- const KeySym *map = get_keymap ();
+ const KeySym *map = get_keymap (keymap_x11);
gint keycode;
- keycode = min_keycode;
- while (keycode < max_keycode)
+ keycode = keymap_x11->min_keycode;
+ while (keycode <= keymap_x11->max_keycode)
{
- const KeySym *syms = map + (keycode - min_keycode) * keysyms_per_keycode;
+ const KeySym *syms = map + (keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
gint i = 0;
- while (i < keysyms_per_keycode)
+ while (i < keymap_x11->keysyms_per_keycode)
{
if (syms[i] == keyval)
{
/**
* gdk_keymap_get_entries_for_keycode:
- * @keymap: a #GdkKeymap or %NULL to use the default keymap
+ * @keymap: (allow-none): a #GdkKeymap or %NULL to use the default keymap
* @hardware_keycode: a keycode
- * @keys: return location for array of #GdkKeymapKey, or NULL
- * @keyvals: return location for array of keyvals, or NULL
+ * @keys: (out): return location for array of #GdkKeymapKey, or %NULL
+ * @keyvals: (out): return location for array of keyvals, or %NULL
* @n_entries: length of @keys and @keyvals
*
* Returns the keyvals bound to @hardware_keycode.
guint **keyvals,
gint *n_entries)
{
+ GdkKeymapX11 *keymap_x11;
+
GArray *key_array;
GArray *keyval_array;
g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
g_return_val_if_fail (n_entries != NULL, FALSE);
- update_keyrange ();
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+ update_keyrange (keymap_x11);
- if (hardware_keycode < min_keycode ||
- hardware_keycode > max_keycode)
+ if (hardware_keycode < keymap_x11->min_keycode ||
+ hardware_keycode > keymap_x11->max_keycode)
{
if (keys)
*keys = NULL;
keyval_array = NULL;
#ifdef HAVE_XKB
- if (_gdk_use_xkb)
+ if (KEYMAP_USE_XKB (keymap))
{
/* See sec 15.3.4 in XKB docs */
- XkbDescRec *xkb = get_xkb ();
+ XkbDescRec *xkb = get_xkb (keymap_x11);
gint max_shift_levels;
gint group = 0;
gint level = 0;
else
#endif
{
- const KeySym *map = get_keymap ();
+ const KeySym *map = get_keymap (keymap_x11);
const KeySym *syms;
gint i = 0;
- syms = map + (hardware_keycode - min_keycode) * keysyms_per_keycode;
+ syms = map + (hardware_keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
- while (i < keysyms_per_keycode)
+ while (i < keymap_x11->keysyms_per_keycode)
{
if (key_array)
{
++i;
}
}
-
- if ((key_array && key_array->len > 0) ||
- (keyval_array && keyval_array->len > 0))
- {
- if (keys)
- *keys = (GdkKeymapKey*) key_array->data;
- if (keyvals)
- *keyvals = (guint*) keyval_array->data;
+ *n_entries = 0;
- if (key_array)
- *n_entries = key_array->len;
- else
- *n_entries = keyval_array->len;
+ if (keys)
+ {
+ *n_entries = key_array->len;
+ *keys = (GdkKeymapKey*) g_array_free (key_array, FALSE);
}
- else
+
+ if (keyvals)
{
- if (keys)
- *keys = NULL;
-
- if (keyvals)
- *keyvals = NULL;
-
- *n_entries = 0;
+ *n_entries = keyval_array->len;
+ *keyvals = (guint*) g_array_free (keyval_array, FALSE);
}
- if (key_array)
- g_array_free (key_array, key_array->len > 0 ? FALSE : TRUE);
- if (keyval_array)
- g_array_free (keyval_array, keyval_array->len > 0 ? FALSE : TRUE);
-
return *n_entries > 0;
}
gdk_keymap_lookup_key (GdkKeymap *keymap,
const GdkKeymapKey *key)
{
+ GdkKeymapX11 *keymap_x11;
+
g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), 0);
g_return_val_if_fail (key != NULL, 0);
g_return_val_if_fail (key->group < 4, 0);
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
#ifdef HAVE_XKB
- if (_gdk_use_xkb)
+ if (KEYMAP_USE_XKB (keymap))
{
- XkbDescRec *xkb = get_xkb ();
+ XkbDescRec *xkb = get_xkb (keymap_x11);
return XkbKeySymEntry (xkb, key->keycode, key->level, key->group);
}
else
#endif
{
- update_keymaps ();
-
- return XKeycodeToKeysym (gdk_display, key->keycode,
- key->group * keysyms_per_keycode + key->level);
+ const KeySym *map = get_keymap (keymap_x11);
+ const KeySym *syms = map + (key->keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
+ return get_symbol (syms, keymap_x11, key->group, key->level);
}
}
#ifdef HAVE_XKB
-/* This is copied straight from XFree86 Xlib, because I needed to
- * add the group and level return. It's unchanged for ease of
- * diff against the Xlib sources; don't reformat it.
+/* This is copied straight from XFree86 Xlib, to:
+ * - add the group and level return.
+ * - change the interpretation of mods_rtrn as described
+ * in the docs for gdk_keymap_translate_keyboard_state()
+ * It's unchanged for ease of diff against the Xlib sources; don't
+ * reformat it.
*/
static Bool
MyEnhancedXkbTranslateKeyCode(register XkbDescPtr xkb,
register unsigned int mods,
unsigned int * mods_rtrn,
KeySym * keysym_rtrn,
- unsigned int * group_rtrn,
- unsigned int * level_rtrn)
+ int * group_rtrn,
+ int * level_rtrn)
{
XkbKeyTypeRec *type;
int col,nKeyGroups;
if (type->map) { /* find the column (shift level) within the group */
register int i;
register XkbKTMapEntryPtr entry;
+ /* ---- Begin section modified for GDK ---- */
+ int found = 0;
+
for (i=0,entry=type->map;i<type->map_count;i++,entry++) {
- if ((entry->active)&&((mods&type->mods.mask)==entry->mods.mask)) {
+ if (mods_rtrn) {
+ int bits = 0;
+ unsigned long tmp = entry->mods.mask;
+ while (tmp) {
+ if ((tmp & 1) == 1)
+ bits++;
+ tmp >>= 1;
+ }
+ /* We always add one-modifiers levels to mods_rtrn since
+ * they can't wipe out bits in the state unless the
+ * level would be triggered. But return other modifiers
+ *
+ */
+ if (bits == 1 || (mods&type->mods.mask)==entry->mods.mask)
+ *mods_rtrn |= entry->mods.mask;
+ }
+
+ if (!found&&entry->active&&((mods&type->mods.mask)==entry->mods.mask)) {
col+= entry->level;
if (type->preserve)
preserve= type->preserve[i].mask;
- /* ---- Begin stuff GDK adds to the original Xlib version ---- */
-
if (level_rtrn)
*level_rtrn = entry->level;
- /* ---- End stuff GDK adds to the original Xlib version ---- */
-
- break;
+ found = 1;
}
}
+ /* ---- End section modified for GDK ---- */
}
if (keysym_rtrn!=NULL)
*keysym_rtrn= syms[col];
if (mods_rtrn) {
- *mods_rtrn= type->mods.mask&(~preserve);
-
+ /* ---- Begin section modified for GDK ---- */
+ *mods_rtrn &= ~preserve;
+ /* ---- End section modified for GDK ---- */
+
/* ---- Begin stuff GDK comments out of the original Xlib version ---- */
/* This is commented out because xkb_info is a private struct */
/* ---- End stuff GDK adds to the original Xlib version ---- */
- return (syms[col]!=NoSymbol);
+ return (syms[col] != NoSymbol);
}
#endif /* HAVE_XKB */
+/* Translates from keycode/state to keysymbol using the traditional interpretation
+ * of the keyboard map. See section 12.7 of the Xlib reference manual
+ */
+static guint
+translate_keysym (GdkKeymapX11 *keymap_x11,
+ guint hardware_keycode,
+ gint group,
+ GdkModifierType state,
+ gint *effective_group,
+ gint *effective_level)
+{
+ const KeySym *map = get_keymap (keymap_x11);
+ const KeySym *syms = map + (hardware_keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
+
+#define SYM(k,g,l) get_symbol (syms, k,g,l)
+
+ GdkModifierType shift_modifiers;
+ gint shift_level;
+ guint tmp_keyval;
+ gint num_lock_index;
+
+ shift_modifiers = GDK_SHIFT_MASK;
+ if (keymap_x11->lock_keysym == GDK_KEY_Shift_Lock)
+ shift_modifiers |= GDK_LOCK_MASK;
+
+ /* Fall back to the first group if the passed in group is empty
+ */
+ if (!(SYM (keymap_x11, group, 0) || SYM (keymap_x11, group, 1)) &&
+ (SYM (keymap_x11, 0, 0) || SYM (keymap_x11, 0, 1)))
+ group = 0;
+
+ /* Hack: On Sun, the Num Lock modifier uses the third element in the
+ * keysym array, and Mode_Switch does not apply for a keypad key.
+ */
+ if (keymap_x11->sun_keypad)
+ {
+ num_lock_index = 2;
+
+ if (group != 0)
+ {
+ gint i;
+
+ for (i = 0; i < keymap_x11->keysyms_per_keycode; i++)
+ if (KEYSYM_IS_KEYPAD (SYM (keymap_x11, 0, i)))
+ group = 0;
+ }
+ }
+ else
+ num_lock_index = 1;
+
+ if ((state & keymap_x11->num_lock_mask) &&
+ KEYSYM_IS_KEYPAD (SYM (keymap_x11, group, num_lock_index)))
+ {
+ /* Shift, Shift_Lock cancel Num_Lock
+ */
+ shift_level = (state & shift_modifiers) ? 0 : num_lock_index;
+ if (!SYM (keymap_x11, group, shift_level) && SYM (keymap_x11, group, 0))
+ shift_level = 0;
+
+ tmp_keyval = SYM (keymap_x11, group, shift_level);
+ }
+ else
+ {
+ /* Fall back to the first level if no symbol for the level
+ * we were passed.
+ */
+ shift_level = (state & shift_modifiers) ? 1 : 0;
+ if (!SYM (keymap_x11, group, shift_level) && SYM (keymap_x11, group, 0))
+ shift_level = 0;
+
+ tmp_keyval = SYM (keymap_x11, group, shift_level);
+
+ if (keymap_x11->lock_keysym == GDK_KEY_Caps_Lock && (state & GDK_LOCK_MASK) != 0)
+ {
+ guint upper = gdk_keyval_to_upper (tmp_keyval);
+ if (upper != tmp_keyval)
+ tmp_keyval = upper;
+ }
+ }
+
+ if (effective_group)
+ *effective_group = group;
+
+ if (effective_level)
+ *effective_level = shift_level;
+
+ return tmp_keyval;
+
+#undef SYM
+}
+
/**
* gdk_keymap_translate_keyboard_state:
- * @keymap: a #GdkKeymap, or %NULL to use the default
+ * @keymap: (allow-none): a #GdkKeymap, or %NULL to use the default
* @hardware_keycode: a keycode
- * @state: a modifier state
+ * @state: a modifier state
* @group: active keyboard group
- * @keyval: return location for keyval
- * @effective_group: return location for effective group
- * @level: return location for level
- * @unused_modifiers: return location for modifiers that didn't affect the group or level
- *
+ * @keyval: (out) (allow-none): return location for keyval, or %NULL
+ * @effective_group: (out) (allow-none): return location for effective group, or %NULL
+ * @level: (out) (allow-none): return location for level, or %NULL
+ * @consumed_modifiers: (out) (allow-none): return location for modifiers that were used to
+ * determine the group or level, or %NULL
*
* Translates the contents of a #GdkEventKey into a keyval, effective
- * group, and level. Modifiers that didn't affect the translation and
- * are thus available for application use are returned in
- * @unused_modifiers. See gdk_keyval_get_keys() for an explanation of
+ * group, and level. Modifiers that affected the translation and
+ * are thus unavailable for application use are returned in
+ * @consumed_modifiers. See <xref linkend="key-group-explanation"/> for an explanation of
* groups and levels. The @effective_group is the group that was
* actually used for the translation; some keys such as Enter are not
* affected by the active keyboard group. The @level is derived from
* @state. For convenience, #GdkEventKey already contains the translated
* keyval, so this function isn't as useful as you might think.
+ *
+ * <note><para>
+ * @consumed_modifiers gives modifiers that should be masked out
+ * from @state when comparing this key press to a hot key. For
+ * instance, on a US keyboard, the <literal>plus</literal>
+ * symbol is shifted, so when comparing a key press to a
+ * <literal><Control>plus</literal> accelerator <Shift> should
+ * be masked out.
+ * </para>
+ * <informalexample><programlisting>
+ * /* We want to ignore irrelevant modifiers like ScrollLock */
+ * #define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)
+ * gdk_keymap_translate_keyboard_state (keymap, event->hardware_keycode,
+ * event->state, event->group,
+ * &keyval, NULL, NULL, &consumed);
+ * if (keyval == GDK_PLUS &&
+ * (event->state & ~consumed & ALL_ACCELS_MASK) == GDK_CONTROL_MASK)
+ * /* Control was pressed */
+ * </programlisting></informalexample>
+ * <para>
+ * An older interpretation @consumed_modifiers was that it contained
+ * all modifiers that might affect the translation of the key;
+ * this allowed accelerators to be stored with irrelevant consumed
+ * modifiers, by doing:</para>
+ * <informalexample><programlisting>
+ * /* XXX Don't do this XXX */
+ * if (keyval == accel_keyval &&
+ * (event->state & ~consumed & ALL_ACCELS_MASK) == (accel_mods & ~consumed))
+ * /* Accelerator was pressed */
+ * </programlisting></informalexample>
+ * <para>
+ * However, this did not work if multi-modifier combinations were
+ * used in the keymap, since, for instance, <literal><Control></literal>
+ * would be masked out even if only <literal><Control><Alt></literal>
+ * was used in the keymap. To support this usage as well as well as
+ * possible, all <emphasis>single modifier</emphasis> combinations
+ * that could affect the key for any combination of modifiers will
+ * be returned in @consumed_modifiers; multi-modifier combinations
+ * are returned only when actually found in @state. When you store
+ * accelerators, you should always store them with consumed modifiers
+ * removed. Store <literal><Control>plus</literal>,
+ * not <literal><Control><Shift>plus</literal>,
+ * </para></note>
*
* Return value: %TRUE if there was a keyval bound to the keycode/state/group
**/
guint *keyval,
gint *effective_group,
gint *level,
- GdkModifierType *unused_modifiers)
+ GdkModifierType *consumed_modifiers)
{
+ GdkKeymapX11 *keymap_x11;
KeySym tmp_keyval = NoSymbol;
+ guint tmp_modifiers;
g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
g_return_val_if_fail (group < 4, FALSE);
-
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
if (keyval)
*keyval = NoSymbol;
if (effective_group)
*effective_group = 0;
if (level)
*level = 0;
- if (unused_modifiers)
- *unused_modifiers = state;
+ if (consumed_modifiers)
+ *consumed_modifiers = 0;
- update_keyrange ();
+ update_keyrange (keymap_x11);
- if (hardware_keycode < min_keycode ||
- hardware_keycode > max_keycode)
+ if (hardware_keycode < keymap_x11->min_keycode ||
+ hardware_keycode > keymap_x11->max_keycode)
return FALSE;
-
+
#ifdef HAVE_XKB
- if (_gdk_use_xkb)
+ if (KEYMAP_USE_XKB (keymap))
{
- XkbDescRec *xkb = get_xkb ();
+ XkbDescRec *xkb = get_xkb (keymap_x11);
/* replace bits 13 and 14 with the provided group */
state &= ~(1 << 13 | 1 << 14);
MyEnhancedXkbTranslateKeyCode (xkb,
hardware_keycode,
state,
- unused_modifiers,
+ &tmp_modifiers,
&tmp_keyval,
effective_group,
level);
- if (keyval)
- *keyval = tmp_keyval;
+ if (state & ~tmp_modifiers & LockMask)
+ tmp_keyval = gdk_keyval_to_upper (tmp_keyval);
+
+ /* We need to augment the consumed modifiers with LockMask, since
+ * we handle that ourselves, and also with the group bits
+ */
+ tmp_modifiers |= LockMask | 1 << 13 | 1 << 14;
}
else
#endif
{
- gint shift_level;
-
- update_keymaps ();
-
- if ((state & GDK_SHIFT_MASK) &&
- (state & GDK_LOCK_MASK))
- shift_level = 0; /* shift disables shift lock */
- else if ((state & GDK_SHIFT_MASK) ||
- (state & GDK_LOCK_MASK))
- shift_level = 1;
- else
- shift_level = 0;
-
- tmp_keyval = XKeycodeToKeysym (gdk_display, hardware_keycode,
- group * keysyms_per_keycode + shift_level);
+ GdkModifierType bit;
- if (keyval)
- *keyval = tmp_keyval;
+ tmp_modifiers = 0;
- if (unused_modifiers)
- {
- *unused_modifiers = state;
- *unused_modifiers &= ~(GDK_SHIFT_MASK | GDK_LOCK_MASK | group_switch_mask);
- }
+ /* We see what modifiers matter by trying the translation with
+ * and without each possible modifier
+ */
+ for (bit = GDK_SHIFT_MASK; bit < GDK_BUTTON1_MASK; bit <<= 1)
+ {
+ /* Handling of the group here is a bit funky; a traditional
+ * X keyboard map can have more than two groups, but no way
+ * of accessing the extra groups is defined. We allow a
+ * caller to pass in any group to this function, but we
+ * only can represent switching between group 0 and 1 in
+ * consumed modifiers.
+ */
+ if (translate_keysym (keymap_x11, hardware_keycode,
+ (bit == keymap_x11->group_switch_mask) ? 0 : group,
+ state & ~bit,
+ NULL, NULL) !=
+ translate_keysym (keymap_x11, hardware_keycode,
+ (bit == keymap_x11->group_switch_mask) ? 1 : group,
+ state | bit,
+ NULL, NULL))
+ tmp_modifiers |= bit;
+ }
- if (effective_group)
- *effective_group = (state & group_switch_mask) ? 1 : 0;
-
- if (level)
- *level = shift_level;
+ tmp_keyval = translate_keysym (keymap_x11, hardware_keycode,
+ group, state,
+ level, effective_group);
}
+ if (consumed_modifiers)
+ *consumed_modifiers = tmp_modifiers;
+
+ if (keyval)
+ *keyval = tmp_keyval;
+
return tmp_keyval != NoSymbol;
}
gchar*
gdk_keyval_name (guint keyval)
{
+ switch (keyval)
+ {
+ case GDK_KEY_Page_Up:
+ return "Page_Up";
+ case GDK_KEY_Page_Down:
+ return "Page_Down";
+ case GDK_KEY_KP_Page_Up:
+ return "KP_Page_Up";
+ case GDK_KEY_KP_Page_Down:
+ return "KP_Page_Down";
+ }
+
return XKeysymToString (keyval);
}
KeySym xlower = 0;
KeySym xupper = 0;
+ /* Check for directly encoded 24-bit UCS characters: */
+ if ((symbol & 0xff000000) == 0x01000000)
+ {
+ if (lower)
+ *lower = gdk_unicode_to_keyval (g_unichar_tolower (symbol & 0x00ffffff));
+ if (upper)
+ *upper = gdk_unicode_to_keyval (g_unichar_toupper (symbol & 0x00ffffff));
+ return;
+ }
+
if (symbol)
XConvertCase (symbol, &xlower, &xupper);
*upper = xupper;
}
#endif /* HAVE_XCONVERTCASE */
+
+gint
+_gdk_x11_get_group_for_state (GdkDisplay *display,
+ GdkModifierType state)
+{
+ GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
+
+#ifdef HAVE_XKB
+ if (display_x11->use_xkb)
+ {
+ return XkbGroupForCoreState (state);
+ }
+ else
+#endif
+ {
+ GdkKeymapX11 *keymap_impl = GDK_KEYMAP_X11 (gdk_keymap_get_for_display (display));
+ update_keymaps (keymap_impl);
+ return (state & keymap_impl->group_switch_mask) ? 1 : 0;
+ }
+}
+
+void
+_gdk_keymap_add_virtual_modifiers_compat (GdkKeymap *keymap,
+ GdkModifierType *modifiers)
+{
+ GdkKeymapX11 *keymap_x11;
+ int i;
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+ for (i = 3; i < 8; i++)
+ {
+ if ((1 << i) & *modifiers)
+ {
+ if (keymap_x11->modmap[i] & GDK_MOD1_MASK)
+ *modifiers |= GDK_MOD1_MASK;
+ else if (keymap_x11->modmap[i] & GDK_SUPER_MASK)
+ *modifiers |= GDK_SUPER_MASK;
+ else if (keymap_x11->modmap[i] & GDK_HYPER_MASK)
+ *modifiers |= GDK_HYPER_MASK;
+ else if (keymap_x11->modmap[i] & GDK_META_MASK)
+ *modifiers |= GDK_META_MASK;
+ }
+ }
+}
+
+/**
+ * gdk_keymap_add_virtual_modifiers:
+ * @keymap: a #GdkKeymap
+ * @state: pointer to the modifier mask to change
+ *
+ * Adds virtual modifiers (i.e. Super, Hyper and Meta) which correspond
+ * to the real modifiers (i.e Mod2, Mod3, ...) in @modifiers.
+ * are set in @state to their non-virtual counterparts (i.e. Mod2,
+ * Mod3,...) and set the corresponding bits in @state.
+ *
+ * GDK already does this before delivering key events, but for
+ * compatibility reasons, it only sets the first virtual modifier
+ * it finds, whereas this function sets all matching virtual modifiers.
+ *
+ * This function is useful when matching key events against
+ * accelerators.
+ *
+ * Since: 2.20
+ */
+void
+gdk_keymap_add_virtual_modifiers (GdkKeymap *keymap,
+ GdkModifierType *state)
+{
+ GdkKeymapX11 *keymap_x11;
+ int i;
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+ for (i = 3; i < 8; i++)
+ {
+ if ((1 << i) & *state)
+ {
+ if (keymap_x11->modmap[i] & GDK_MOD1_MASK)
+ *state |= GDK_MOD1_MASK;
+ if (keymap_x11->modmap[i] & GDK_SUPER_MASK)
+ *state |= GDK_SUPER_MASK;
+ if (keymap_x11->modmap[i] & GDK_HYPER_MASK)
+ *state |= GDK_HYPER_MASK;
+ if (keymap_x11->modmap[i] & GDK_META_MASK)
+ *state |= GDK_META_MASK;
+ }
+ }
+}
+
+gboolean
+_gdk_keymap_key_is_modifier (GdkKeymap *keymap,
+ guint keycode)
+{
+ GdkKeymapX11 *keymap_x11;
+ gint i;
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+ if (keycode < keymap_x11->min_keycode ||
+ keycode > keymap_x11->max_keycode)
+ return FALSE;
+
+#ifdef HAVE_XKB
+ if (KEYMAP_USE_XKB (keymap))
+ {
+ XkbDescRec *xkb = get_xkb (keymap_x11);
+
+ if (xkb->map->modmap && xkb->map->modmap[keycode] != 0)
+ return TRUE;
+ }
+ else
+#endif
+ {
+ for (i = 0; i < 8 * keymap_x11->mod_keymap->max_keypermod; i++)
+ {
+ if (keycode == keymap_x11->mod_keymap->modifiermap[i])
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+/**
+ * gdk_keymap_map_virtual_modifiers:
+ * @keymap: a #GdkKeymap
+ * @state: pointer to the modifier state to map
+ *
+ * Maps the virtual modifiers (i.e. Super, Hyper and Meta) which
+ * are set in @state to their non-virtual counterparts (i.e. Mod2,
+ * Mod3,...) and set the corresponding bits in @state.
+ *
+ * This function is useful when matching key events against
+ * accelerators.
+ *
+ * Returns: %TRUE if no virtual modifiers were mapped to the
+ * same non-virtual modifier. Note that %FALSE is also returned
+ * if a virtual modifier is mapped to a non-virtual modifier that
+ * was already set in @state.
+ *
+ * Since: 2.20
+ */
+gboolean
+gdk_keymap_map_virtual_modifiers (GdkKeymap *keymap,
+ GdkModifierType *state)
+{
+ GdkKeymapX11 *keymap_x11;
+ const guint vmods[] = {
+ GDK_SUPER_MASK, GDK_HYPER_MASK, GDK_META_MASK
+ };
+ int i, j;
+ gboolean retval;
+
+ keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ keymap_x11 = GDK_KEYMAP_X11 (keymap);
+
+ if (KEYMAP_USE_XKB (keymap))
+ get_xkb (keymap_x11);
+
+ retval = TRUE;
+
+ for (j = 0; j < 3; j++)
+ {
+ if (*state & vmods[j])
+ {
+ for (i = 3; i < 8; i++)
+ {
+ if (keymap_x11->modmap[i] & vmods[j])
+ {
+ if (*state & (1 << i))
+ retval = FALSE;
+ else
+ *state |= 1 << i;
+ }
+ }
+ }
+ }
+
+ return retval;
+}
projects / ~andy / gtk / blobdiff