From 032a688a72110c7f7b976a5b3bd03c3feab32646 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 1 Sep 2014 21:22:36 +0200 Subject: [PATCH] Revert "keyboard: Handle touch events" This reverts commit a84fb99c0aca9fd6eeb83a270c48113133e89de2. This commit didn't make the OSK fully operational yet on Wayland, and caused the double emission of key events on X11 due to the OSK keys receiving first touch events from the passive touch grab, and then emulated pointer events from event selection after the touch sequence was rejected in the grab. When we make a better effort at handling touch events just once on X11, this commit can be reapplied and remaining wayland OSK support resumed from there. In the mean time, this patch is better reverted. https://bugzilla.gnome.org/show_bug.cgi?id=735681 --- js/ui/keyboard.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js index 3805fb0b7..cfce86142 100644 --- a/js/ui/keyboard.js +++ b/js/ui/keyboard.js @@ -90,25 +90,6 @@ const Key = new Lang.Class({ key.release(); return Clutter.EVENT_PROPAGATE; })); - button.connect('touch-event', Lang.bind(this, - function (actor, event) { - let device = event.get_device(); - let sequence = event.get_event_sequence(); - - if (!this._touchPressed && - event.type() == Clutter.EventType.TOUCH_BEGIN) { - device.sequence_grab(sequence, actor); - this._touchPressed = true; - key.press(); - } else if (this._touchPressed && - event.type() == Clutter.EventType.TOUCH_END && - device.sequence_get_grabbed_actor(sequence) == actor) { - device.sequence_ungrab(sequence); - this._touchPressed = false; - key.release(); - } - return Clutter.EVENT_PROPAGATE; - })); return button; },