* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
guint have_direction : 1;
guint have_lock_state : 1;
guint caps_lock_state : 1;
- guint num_lock_state : 1;
+ guint num_lock_state : 1;
+ guint modifier_state;
guint current_serial;
#ifdef HAVE_XKB
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;
-}
-
#ifdef HAVE_XKB
static PangoDirection
get_direction (XkbDescRec *xkb,
static gboolean
update_lock_state (GdkX11Keymap *keymap_x11,
- gint locked_mods)
+ gint locked_mods,
+ gint effective_mods)
{
XkbDescPtr xkb G_GNUC_UNUSED;
gboolean have_lock_state;
gboolean caps_lock_state;
gboolean num_lock_state;
+ guint modifier_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;
num_lock_state = keymap_x11->num_lock_state;
+ modifier_state = keymap_x11->modifier_state;
keymap_x11->have_lock_state = TRUE;
keymap_x11->caps_lock_state = (locked_mods & GDK_LOCK_MASK) != 0;
keymap_x11->num_lock_state = (locked_mods & keymap_x11->num_lock_mask) != 0;
+ /* FIXME: sanitize this */
+ keymap_x11->modifier_state = (guint)effective_mods;
return !have_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)
+ || (modifier_state != keymap_x11->modifier_state);
}
/* keep this in sync with the XkbSelectEventDetails()
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))
+ if (update_lock_state (keymap_x11,
+ xkb_event->state.locked_mods,
+ xkb_event->state.mods))
g_signal_emit_by_name (keymap_x11, "state-changed");
}
}
XkbStateRec state_rec;
XkbGetState (GDK_DISPLAY_XDISPLAY (display), XkbUseCoreKbd, &state_rec);
- update_lock_state (keymap_x11, state_rec.locked_mods);
+ update_lock_state (keymap_x11, state_rec.locked_mods, state_rec.mods);
}
}
#endif /* HAVE_XKB */
static PangoDirection
gdk_x11_keymap_get_direction (GdkKeymap *keymap)
{
- keymap = GET_EFFECTIVE_KEYMAP (keymap);
-
#ifdef HAVE_XKB
if (KEYMAP_USE_XKB (keymap))
{
static gboolean
gdk_x11_keymap_have_bidi_layouts (GdkKeymap *keymap)
{
- keymap = GET_EFFECTIVE_KEYMAP (keymap);
-
#ifdef HAVE_XKB
if (KEYMAP_USE_XKB (keymap))
{
static gboolean
gdk_x11_keymap_get_caps_lock_state (GdkKeymap *keymap)
{
- keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
ensure_lock_state (keymap);
- return GDK_X11_KEYMAP (keymap)->caps_lock_state;
+ return keymap_x11->caps_lock_state;
}
static gboolean
gdk_x11_keymap_get_num_lock_state (GdkKeymap *keymap)
{
- keymap = GET_EFFECTIVE_KEYMAP (keymap);
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
ensure_lock_state (keymap);
- return GDK_X11_KEYMAP (keymap)->num_lock_state;
+ return keymap_x11->num_lock_state;
+}
+
+static guint
+gdk_x11_keymap_get_modifier_state (GdkKeymap *keymap)
+{
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
+
+ ensure_lock_state (keymap);
+
+ return keymap_x11->modifier_state;
}
static gboolean
GdkKeymapKey **keys,
gint *n_keys)
{
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
GArray *retval;
- GdkX11Keymap *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_X11_KEYMAP (keymap);
retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
guint **keyvals,
gint *n_entries)
{
- GdkX11Keymap *keymap_x11;
-
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
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);
-
- keymap = GET_EFFECTIVE_KEYMAP (keymap);
- keymap_x11 = GDK_X11_KEYMAP (keymap);
-
update_keyrange (keymap_x11);
if (hardware_keycode < keymap_x11->min_keycode ||
gdk_x11_keymap_lookup_key (GdkKeymap *keymap,
const GdkKeymapKey *key)
{
- GdkX11Keymap *keymap_x11;
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
- 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_X11_KEYMAP (keymap);
-
#ifdef HAVE_XKB
if (KEYMAP_USE_XKB (keymap))
{
gint *level,
GdkModifierType *consumed_modifiers)
{
- GdkX11Keymap *keymap_x11;
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
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_X11_KEYMAP (keymap);
-
if (keyval)
*keyval = NoSymbol;
if (effective_group)
_gdk_x11_keymap_add_virt_mods (GdkKeymap *keymap,
GdkModifierType *modifiers)
{
- GdkX11Keymap *keymap_x11;
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
int i;
- keymap = GET_EFFECTIVE_KEYMAP (keymap);
- keymap_x11 = GDK_X11_KEYMAP (keymap);
-
/* See comment in add_virtual_modifiers() */
for (i = 4; i < 8; i++)
{
gdk_x11_keymap_add_virtual_modifiers (GdkKeymap *keymap,
GdkModifierType *state)
{
- GdkX11Keymap *keymap_x11;
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
int i;
- keymap = GET_EFFECTIVE_KEYMAP (keymap);
- keymap_x11 = GDK_X11_KEYMAP (keymap);
-
/* This loop used to start at 3, which included MOD1 in the
* virtual mapping. However, all of GTK+ treats MOD1 as a
* synonym for Alt, and does not expect it to be mapped around,
_gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
guint keycode)
{
- GdkX11Keymap *keymap_x11;
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
gint i;
- keymap = GET_EFFECTIVE_KEYMAP (keymap);
- keymap_x11 = GDK_X11_KEYMAP (keymap);
-
+ update_keyrange (keymap_x11);
if (keycode < keymap_x11->min_keycode ||
keycode > keymap_x11->max_keycode)
return FALSE;
gdk_x11_keymap_map_virtual_modifiers (GdkKeymap *keymap,
GdkModifierType *state)
{
- GdkX11Keymap *keymap_x11;
- const guint vmods[] = {
- GDK_SUPER_MASK, GDK_HYPER_MASK, GDK_META_MASK
- };
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
+ 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_X11_KEYMAP (keymap);
-
if (KEYMAP_USE_XKB (keymap))
get_xkb (keymap_x11);
return retval;
}
+static GdkModifierType
+gdk_x11_keymap_get_modifier_mask (GdkKeymap *keymap,
+ GdkModifierIntent intent)
+{
+ GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
+
+ switch (intent)
+ {
+ case GDK_MODIFIER_INTENT_SHIFT_GROUP:
+ return keymap_x11->group_switch_mask;
+
+ default:
+ return GDK_KEYMAP_CLASS (gdk_x11_keymap_parent_class)->get_modifier_mask (keymap,
+ intent);
+ }
+}
+
static void
gdk_x11_keymap_class_init (GdkX11KeymapClass *klass)
{
keymap_class->have_bidi_layouts = gdk_x11_keymap_have_bidi_layouts;
keymap_class->get_caps_lock_state = gdk_x11_keymap_get_caps_lock_state;
keymap_class->get_num_lock_state = gdk_x11_keymap_get_num_lock_state;
+ keymap_class->get_modifier_state = gdk_x11_keymap_get_modifier_state;
keymap_class->get_entries_for_keyval = gdk_x11_keymap_get_entries_for_keyval;
keymap_class->get_entries_for_keycode = gdk_x11_keymap_get_entries_for_keycode;
keymap_class->lookup_key = gdk_x11_keymap_lookup_key;
keymap_class->translate_keyboard_state = gdk_x11_keymap_translate_keyboard_state;
keymap_class->add_virtual_modifiers = gdk_x11_keymap_add_virtual_modifiers;
keymap_class->map_virtual_modifiers = gdk_x11_keymap_map_virtual_modifiers;
+ keymap_class->get_modifier_mask = gdk_x11_keymap_get_modifier_mask;
}
projects / ~andy / gtk / blobdiff