[gnome-shell] lookingGlass: Replace global grabs with input device grabs
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] lookingGlass: Replace global grabs with input device grabs
- Date: Tue, 2 Jul 2019 01:24:17 +0000 (UTC)
commit 6c33aff6d1b0e0620b7156a67a38bd99204347d2
Author: Jonas Dreßler <verdre v0yd nl>
Date: Sun Apr 14 18:32:11 2019 +0200
lookingGlass: Replace global grabs with input device grabs
Global grabs are being removed from Clutter in favour of input device
grabs.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/495
js/ui/lookingGlass.js | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index 4e5b988ba..e191b509e 100644
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -491,8 +491,13 @@ var Inspector = GObject.registerClass({
eventHandler.connect('button-press-event', this._onButtonPressEvent.bind(this));
eventHandler.connect('scroll-event', this._onScrollEvent.bind(this));
eventHandler.connect('motion-event', this._onMotionEvent.bind(this));
- Clutter.grab_pointer(eventHandler);
- Clutter.grab_keyboard(eventHandler);
+
+ let dm = Clutter.DeviceManager.get_default();
+ this._pointerDevice = dm.get_core_device(Clutter.InputDeviceType.POINTER_DEVICE);
+ this._keyboardDevice = dm.get_core_device(Clutter.InputDeviceType.KEYBOARD_DEVICE);
+
+ this._pointerDevice.grab(eventHandler);
+ this._keyboardDevice.grab(eventHandler);
// this._target is the actor currently shown by the inspector.
// this._pointerTarget is the actor directly under the pointer.
@@ -525,8 +530,8 @@ var Inspector = GObject.registerClass({
}
_close() {
- Clutter.ungrab_pointer();
- Clutter.ungrab_keyboard();
+ this._pointerDevice.ungrab();
+ this._keyboardDevice.ungrab();
this._eventHandler.destroy();
this._eventHandler = null;
this.emit('closed');
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]