AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 11:20:12 +00:00
Code Issues Projects Releases Wiki Activity

Keymap: properly initialize lock state

Browse Source 
We need to get explicitly lock state initially, before we can
rely on state changed events to track it.
https://bugzilla.gnome.org/show_bug.cgi?id=645341
This commit is contained in:
Matthias Clasen 2011-04-02 18:39:28 -04:00
parent 0b8a1dcac2
commit 2226996b80
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gdk/x11/gdkkeys-x11.c
View File

@ -75,6 +75,7 @@ struct _GdkX11Keymap
PangoDirection current_direction; PangoDirection current_direction;
guint sun_keypad : 1; guint sun_keypad : 1;
guint have_direction : 1; guint have_direction : 1;
guint have_lock_state : 1;
guint caps_lock_state : 1; guint caps_lock_state : 1;
guint num_lock_state : 1; guint num_lock_state : 1;
guint current_serial; guint current_serial;
@ -118,6 +119,7 @@ gdk_x11_keymap_init (GdkX11Keymap *keymap)
keymap->group_switch_mask = 0; keymap->group_switch_mask = 0;
keymap->lock_keysym = GDK_KEY_Caps_Lock; keymap->lock_keysym = GDK_KEY_Caps_Lock;
keymap->have_direction = FALSE; keymap->have_direction = FALSE;
keymap->have_lock_state = FALSE;
keymap->current_serial = 0; keymap->current_serial = 0;
#ifdef HAVE_XKB #ifdef HAVE_XKB
@ -482,7 +484,7 @@ get_effective_keymap (GdkKeymap *keymap,
return keymap; return keymap;
} }
#if HAVE_XKB #ifdef HAVE_XKB
static PangoDirection static PangoDirection
get_direction (XkbDescRec *xkb, get_direction (XkbDescRec *xkb,
gint group) gint group)
@ -617,17 +619,25 @@ static gboolean
update_lock_state (GdkX11Keymap *keymap_x11, update_lock_state (GdkX11Keymap *keymap_x11,
gint locked_mods) gint locked_mods)
{ {
XkbDescPtr xkb G_GNUC_UNUSED;
gboolean have_lock_state;
gboolean caps_lock_state; gboolean caps_lock_state;
gboolean num_lock_state; gboolean num_lock_state;
/* ensure keymap_x11->num_lock_mask is initialized */
xkb = get_xkb (keymap_x11);
have_lock_state = keymap_x11->have_lock_state;
caps_lock_state = keymap_x11->caps_lock_state; caps_lock_state = keymap_x11->caps_lock_state;
num_lock_state = keymap_x11->num_lock_state; num_lock_state = keymap_x11->num_lock_state;
keymap_x11->have_lock_state = TRUE;
keymap_x11->caps_lock_state = (locked_mods & GDK_LOCK_MASK) != 0; keymap_x11->caps_lock_state = (locked_mods & GDK_LOCK_MASK) != 0;
keymap_x11->num_lock_state = (locked_mods & keymap_x11->num_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) return !have_lock_state
|| (num_lock_state != keymap_x11->num_lock_state); || (caps_lock_state != keymap_x11->caps_lock_state)
|| (num_lock_state != keymap_x11->num_lock_state);
} }
/* keep this in sync with the XkbSelectEventDetails() /* keep this in sync with the XkbSelectEventDetails()
@ -654,6 +664,26 @@ _gdk_x11_keymap_state_changed (GdkDisplay *display,
#endif /* HAVE_XKB */ #endif /* HAVE_XKB */
static void
ensure_lock_state (GdkKeymap *keymap)
{
#ifdef HAVE_XKB
if (KEYMAP_USE_XKB (keymap))
{
GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
if (!keymap_x11->have_lock_state)
{
GdkDisplay *display = keymap->display;
XkbStateRec state_rec;
XkbGetState (GDK_DISPLAY_XDISPLAY (display), XkbUseCoreKbd, &state_rec);
update_lock_state (keymap_x11, state_rec.locked_mods);
}
}
#endif /* HAVE_XKB */
}
void void
_gdk_x11_keymap_keys_changed (GdkDisplay *display) _gdk_x11_keymap_keys_changed (GdkDisplay *display)
{ {
@ -670,7 +700,7 @@ gdk_x11_keymap_get_direction (GdkKeymap *keymap)
{ {
keymap = GET_EFFECTIVE_KEYMAP (keymap); keymap = GET_EFFECTIVE_KEYMAP (keymap);
#if HAVE_XKB #ifdef HAVE_XKB
if (KEYMAP_USE_XKB (keymap)) if (KEYMAP_USE_XKB (keymap))
{ {
GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap); GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
@ -697,7 +727,7 @@ gdk_x11_keymap_have_bidi_layouts (GdkKeymap *keymap)
{ {
keymap = GET_EFFECTIVE_KEYMAP (keymap); keymap = GET_EFFECTIVE_KEYMAP (keymap);
#if HAVE_XKB #ifdef HAVE_XKB
if (KEYMAP_USE_XKB (keymap)) if (KEYMAP_USE_XKB (keymap))
{ {
GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap); GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
@ -728,6 +758,8 @@ gdk_x11_keymap_get_caps_lock_state (GdkKeymap *keymap)
{ {
keymap = GET_EFFECTIVE_KEYMAP (keymap); keymap = GET_EFFECTIVE_KEYMAP (keymap);
ensure_lock_state (keymap);
return GDK_X11_KEYMAP (keymap)->caps_lock_state; return GDK_X11_KEYMAP (keymap)->caps_lock_state;
} }
@ -736,6 +768,8 @@ gdk_x11_keymap_get_num_lock_state (GdkKeymap *keymap)
{ {
keymap = GET_EFFECTIVE_KEYMAP (keymap); keymap = GET_EFFECTIVE_KEYMAP (keymap);
ensure_lock_state (keymap);
return GDK_X11_KEYMAP (keymap)->num_lock_state; return GDK_X11_KEYMAP (keymap)->num_lock_state;
} }