isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deal with unknown flags from ClutterEvent.get_state()

Browse Source 
When we get a ClutterModifierType from Clutter, it might contain
bits not in the enumeration. See bug 59771 for a similar problem
with GdkModifierType.

Add a wrapper Shell.get_event_state() around clutter_event_get_state()
to mask these bits out and only return approved bits.

https://bugzilla.gnome.org/show_bug.cgi?id=597735
This commit is contained in:
Owen W. Taylor
2009-10-07 17:20:33 -04:00
parent a81a16801d
commit ff39edd1ee
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/altTab.js
View File

@ -148,7 +148,7 @@ AltTabPopup.prototype = {
_keyPressEvent : function(actor, event) {
let keysym = event.get_key_symbol();
let shift = (event.get_state() & Clutter.ModifierType.SHIFT_MASK);
let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
// The WASD stuff is for debugging in Xephyr, where the arrow
// keys aren't mapped correctly

2
js/ui/appDisplay.js
View File

@ -554,7 +554,7 @@ RunningWellItem.prototype = {
},
_onActivate: function (actor, event) {
let modifiers = event.get_state();
let modifiers = Shell.get_event_state(event);
if (modifiers & Clutter.ModifierType.CONTROL_MASK) {
this.appInfo.launch();

2
js/ui/main.js
View File

@ -201,7 +201,7 @@ function _globalKeyPressHandler(actor, event) {
overview.hide();
return true;
} else if (symbol == Clutter.F2 && (event.get_state() & Clutter.ModifierType.MOD1_MASK)) {
} else if (symbol == Clutter.F2 && (Shell.get_event_state(event) & Clutter.ModifierType.MOD1_MASK)) {
getRunDialog().open();
}
}