[AppSwitcher] add a workaround for a gjs problem with GdkModifierType

gdk_display_get_pointer() sometimes returns values for the mask that
aren't part of the GdkModifierType enumeration, which gjs doesn't like
(bug 597292). Work around that by adding a C wrapper that strips out
the extra flags.

https://bugzilla.gnome.org/show_bug.cgi?id=597559
This commit is contained in:
Dan Winship 2009-10-06 10:53:25 -04:00
parent d120d03de9
commit 439daf828f
3 changed files with 23 additions and 1 deletions

View File

@ -158,7 +158,7 @@ AltTabPopup.prototype = {
// https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
// details.) So we check now. (Have to do this after calling
// _updateSelection.)
let [screen, x, y, mods] = Gdk.Display.get_default().get_pointer();
let mods = global.get_modifier_keys();
if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
this._finish();
return false;

View File

@ -978,3 +978,23 @@ shell_global_get_focus_monitor (ShellGlobal *global)
meta_screen_get_monitor_geometry (screen, 0, &rect);
return g_boxed_copy (GDK_TYPE_RECTANGLE, &rect);
}
/**
* shell_global_get_modifier_keys:
* @global: the #ShellGlobal
*
* Gets the current set of modifier keys that are pressed down;
* this is a wrapper around gdk_display_get_pointer() that strips
* out any un-declared modifier flags, to make gjs happy; see
* https://bugzilla.gnome.org/show_bug.cgi?id=597292.
*
* Return value: the current modifiers
*/
GdkModifierType
shell_global_get_modifier_keys (ShellGlobal *global)
{
GdkModifierType mods;
gdk_display_get_pointer (gdk_display_get_default (), NULL, NULL, NULL, &mods);
return mods & GDK_MODIFIER_MASK;
}

View File

@ -77,6 +77,8 @@ GSList *shell_global_get_monitors (ShellGlobal *global);
GdkRectangle *shell_global_get_primary_monitor (ShellGlobal *global);
GdkRectangle *shell_global_get_focus_monitor (ShellGlobal *global);
GdkModifierType shell_global_get_modifier_keys (ShellGlobal *global);
G_END_DECLS
#endif /* __SHELL_GLOBAL_H__ */