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

padOsd: Use ClutterSeat to fetch devices

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/760
This commit is contained in:
Carlos Garnacho 2019-10-05 12:36:52 +02:00 committed by Carlos Garnacho
parent 84d92bf65e
commit 484dd98448
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/padOsd.js
View File

@ -648,15 +648,15 @@ var PadOsd = GObject.registerClass({
this._capturedEventId = global.stage.connect('captured-event', this._onCapturedEvent.bind(this)); this._capturedEventId = global.stage.connect('captured-event', this._onCapturedEvent.bind(this));
this._padChooser = null; this._padChooser = null;
let deviceManager = Clutter.DeviceManager.get_default(); let seat = Clutter.get_default_backend().get_default_seat();
this._deviceAddedId = deviceManager.connect('device-added', (manager, device) => { this._deviceAddedId = seat.connect('device-added', (_seat, device) => {
if (device.get_device_type() == Clutter.InputDeviceType.PAD_DEVICE && if (device.get_device_type() == Clutter.InputDeviceType.PAD_DEVICE &&
this.padDevice.is_grouped(device)) { this.padDevice.is_grouped(device)) {
this._groupPads.push(device); this._groupPads.push(device);
this._updatePadChooser(); this._updatePadChooser();
} }
}); });
this._deviceRemovedId = deviceManager.connect('device-removed', (manager, device) => { this._deviceRemovedId = seat.connect('device-removed', (_seat, device) => {
// If the device is being removed, destroy the padOsd. // If the device is being removed, destroy the padOsd.
if (device == this.padDevice) { if (device == this.padDevice) {
this.destroy(); this.destroy();
@ -669,7 +669,7 @@ var PadOsd = GObject.registerClass({
} }
}); });
deviceManager.list_devices().forEach(device => { seat.list_devices().forEach(device => {
if (device != this.padDevice && if (device != this.padDevice &&
device.get_device_type() == Clutter.InputDeviceType.PAD_DEVICE && device.get_device_type() == Clutter.InputDeviceType.PAD_DEVICE &&
this.padDevice.is_grouped(device)) this.padDevice.is_grouped(device))
@ -960,13 +960,13 @@ var PadOsd = GObject.registerClass({
Main.popModal(this); Main.popModal(this);
this._actionEditor.close(); this._actionEditor.close();
let deviceManager = Clutter.DeviceManager.get_default(); let seat = Clutter.get_default_backend().get_default_seat();
if (this._deviceRemovedId != 0) { if (this._deviceRemovedId != 0) {
deviceManager.disconnect(this._deviceRemovedId); seat.disconnect(this._deviceRemovedId);
this._deviceRemovedId = 0; this._deviceRemovedId = 0;
} }
if (this._deviceAddedId != 0) { if (this._deviceAddedId != 0) {
deviceManager.disconnect(this._deviceAddedId); seat.disconnect(this._deviceAddedId);
this._deviceAddedId = 0; this._deviceAddedId = 0;
} }
@ -990,8 +990,8 @@ var PadOsdService = class {
ShowAsync(params, invocation) { ShowAsync(params, invocation) {
let [deviceNode, editionMode] = params; let [deviceNode, editionMode] = params;
let deviceManager = Clutter.DeviceManager.get_default(); let seat = Clutter.get_default_backend().get_default_seat();
let devices = deviceManager.list_devices(); let devices = seat.list_devices();
let padDevice = null; let padDevice = null;
devices.forEach(device => { devices.forEach(device => {