[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:
parent
d120d03de9
commit
439daf828f
@ -158,7 +158,7 @@ AltTabPopup.prototype = {
|
|||||||
// https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
|
// https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
|
||||||
// details.) So we check now. (Have to do this after calling
|
// details.) So we check now. (Have to do this after calling
|
||||||
// _updateSelection.)
|
// _updateSelection.)
|
||||||
let [screen, x, y, mods] = Gdk.Display.get_default().get_pointer();
|
let mods = global.get_modifier_keys();
|
||||||
if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
|
if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
|
||||||
this._finish();
|
this._finish();
|
||||||
return false;
|
return false;
|
||||||
|
@ -978,3 +978,23 @@ shell_global_get_focus_monitor (ShellGlobal *global)
|
|||||||
meta_screen_get_monitor_geometry (screen, 0, &rect);
|
meta_screen_get_monitor_geometry (screen, 0, &rect);
|
||||||
return g_boxed_copy (GDK_TYPE_RECTANGLE, &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;
|
||||||
|
}
|
||||||
|
@ -77,6 +77,8 @@ GSList *shell_global_get_monitors (ShellGlobal *global);
|
|||||||
GdkRectangle *shell_global_get_primary_monitor (ShellGlobal *global);
|
GdkRectangle *shell_global_get_primary_monitor (ShellGlobal *global);
|
||||||
GdkRectangle *shell_global_get_focus_monitor (ShellGlobal *global);
|
GdkRectangle *shell_global_get_focus_monitor (ShellGlobal *global);
|
||||||
|
|
||||||
|
GdkModifierType shell_global_get_modifier_keys (ShellGlobal *global);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* __SHELL_GLOBAL_H__ */
|
#endif /* __SHELL_GLOBAL_H__ */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user