[gnome-shell/wip/exalm/gestures: 12/17] edgeDragAction: Update for gesture-action rewrite

[Alexander Mikhaylenko <alexm src gnome org>]

commit 72b67aeb141e11673bfb86e53f47cb7521f4be0f
Author: Jonas Dreßler <verdre v0yd nl>
Date:   Sun Jun 16 18:29:23 2019 +0200

    edgeDragAction: Update for gesture-action rewrite
    
    Update the edgeDragAction after the rewrite of ClutterGestureAction. The
    gesture now emits the 'activated' signal while the touchpoint is still
    on the screen and is automaticaly cancelled after a timeout has passed
    or the touchpoint exceeded a distance threshold.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/596

 js/ui/edgeDragAction.js | 118 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 89 insertions(+), 29 deletions(-)
---
diff --git a/js/ui/edgeDragAction.js b/js/ui/edgeDragAction.js
index bc026b4ef..27ccd1354 100644
--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@@ -1,11 +1,14 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const { Clutter, GObject, Meta, St } = imports.gi;
+const { Clutter, GObject, GLib, Meta, St } = imports.gi;
 
 const Main = imports.ui.main;
 
 var EDGE_THRESHOLD = 20;
 var DRAG_DISTANCE = 80;
+var CANCEL_THRESHOLD = 120;
+
+var CANCEL_TIMEOUT = 300;
 
 var EdgeDragAction = GObject.registerClass({
     Signals: { 'activated': {} },
@@ -15,56 +18,113 @@ var EdgeDragAction = GObject.registerClass({
         this._side = side;
         this._allowedModes = allowedModes;
         this.set_n_touch_points(1);
+        this.set_replay_events(true);
+        this.set_max_replay_delay(320);
     }
 
-    _getMonitorRect(x, y) {
+    _getMonitorForPoint(x, y) {
         let rect = new Meta.Rectangle({ x: x - 1, y: y - 1, width: 1, height: 1 });
         let monitorIndex = global.display.get_monitor_index_for_rect(rect);
 
-        return global.display.get_monitor_geometry(monitorIndex);
+        return Main.layoutManager.monitors[monitorIndex];
+    }
+
+    _isNearMonitorEdge(x, y) {
+        let monitor = this._getMonitorForPoint(x, y);
+
+        switch (this._side) {
+        case St.Side.LEFT:
+            return x < monitor.x + EDGE_THRESHOLD;
+        case St.Side.RIGHT:
+            return x > monitor.x + monitor.width - EDGE_THRESHOLD;
+        case St.Side.TOP:
+            return y < monitor.y + EDGE_THRESHOLD;
+        case St.Side.BOTTOM:
+            return y > monitor.y + monitor.height - EDGE_THRESHOLD;
+        }
+    }
+
+    _exceedsCancelThreshold(x, y) {
+        let [startX, startY] = this.get_press_coords(0);
+        let offsetX = Math.abs(x - startX);
+        let offsetY = Math.abs(y - startY);
+
+        switch (this._side) {
+        case St.Side.LEFT:
+        case St.Side.RIGHT:
+            return offsetY > CANCEL_THRESHOLD;
+        case St.Side.TOP:
+        case St.Side.BOTTOM:
+            return offsetX > CANCEL_THRESHOLD;
+        }
+    }
+
+    _passesDistanceNeeded(x, y) {
+        let [startX, startY] = this.get_press_coords(0);
+        let monitor = this._getMonitorForPoint(startX, startY);
+
+        switch (this._side) {
+        case St.Side.LEFT:
+            return x > monitor.x + DRAG_DISTANCE;
+        case St.Side.RIGHT:
+            return x < monitor.x + monitor.width - DRAG_DISTANCE;
+        case St.Side.TOP:
+            return y > monitor.y + DRAG_DISTANCE;
+        case St.Side.BOTTOM:
+            return y < monitor.y + monitor.height - DRAG_DISTANCE;
+        }
     }
 
-    vfunc_gesture_prepare(actor, point) {
-        if (this.get_n_current_points() == 0)
-            return false;
 
+    vfunc_gesture_begin(actor, point) {
         if (!(this._allowedModes & Main.actionMode))
             return false;
 
         let [x, y] = this.get_press_coords(0);
-        let monitorRect = this._getMonitorRect(x, y);
+        if (!this._isNearMonitorEdge(x, y))
+            return false;
+
+        this._successful = false;
+
+        this._cancelTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, CANCEL_TIMEOUT,
+            () => {
+                let [x, y] = this.get_press_coords(0);
+                if (this._isNearMonitorEdge(x, y))
+                    this.cancel();
+
+                this._cancelTimeoutId = 0;
+                return GLib.SOURCE_REMOVE;
+            });
+        GLib.Source.set_name_by_id(this._cancelTimeoutId, '[gnome-shell] this.cancel');
 
-        return ((this._side == St.Side.LEFT && x < monitorRect.x + EDGE_THRESHOLD) ||
-                (this._side == St.Side.RIGHT && x > monitorRect.x + monitorRect.width - EDGE_THRESHOLD) ||
-                (this._side == St.Side.TOP && y < monitorRect.y + EDGE_THRESHOLD) ||
-                (this._side == St.Side.BOTTOM && y > monitorRect.y + monitorRect.height - EDGE_THRESHOLD));
+        return true;
     }
 
     vfunc_gesture_progress(actor, point) {
-        let [startX, startY] = this.get_press_coords(0);
         let [x, y] = this.get_motion_coords(0);
-        let offsetX = Math.abs (x - startX);
-        let offsetY = Math.abs (y - startY);
 
-        if (offsetX < EDGE_THRESHOLD && offsetY < EDGE_THRESHOLD)
-            return;
+        if (this._exceedsCancelThreshold(x, y)) {
+            if (this._cancelTimeoutId != 0) {
+                GLib.source_remove(this._cancelTimeoutId);
+                this._cancelTimeoutId = 0;
+            }
 
-        if ((offsetX > offsetY &&
-             (this._side == St.Side.TOP || this._side == St.Side.BOTTOM)) ||
-            (offsetY > offsetX &&
-             (this._side == St.Side.LEFT || this._side == St.Side.RIGHT)))
             this.cancel();
+        } else if (this._passesDistanceNeeded(x, y)) {
+            if (this._cancelTimeoutId != 0) {
+                GLib.source_remove(this._cancelTimeoutId);
+                this._cancelTimeoutId = 0;
+            }
+
+            this._successful = true;
+            this.emit('activated');
+            this.end();
+        }
+
     }
 
     vfunc_gesture_end(actor, point) {
-        let [startX, startY] = this.get_press_coords(0);
-        let [x, y] = this.get_motion_coords(0);
-        let monitorRect = this._getMonitorRect(startX, startY);
-
-        if ((this._side == St.Side.TOP && y > monitorRect.y + DRAG_DISTANCE) ||
-            (this._side == St.Side.BOTTOM && y < monitorRect.y + monitorRect.height - DRAG_DISTANCE) ||
-            (this._side == St.Side.LEFT && x > monitorRect.x + DRAG_DISTANCE) ||
-            (this._side == St.Side.RIGHT && x < monitorRect.x + monitorRect.width - DRAG_DISTANCE))
-            this.emit('activated');
+        if (!this._successful)
+            this.cancel();
     }
 });