From 1cd4885a6802c63432ce6daac4c8d06e314b05de Mon Sep 17 00:00:00 2001 From: spbisc97 Date: Sun, 4 Apr 2021 21:14:45 +0200 Subject: [PATCH 1/8] add prev and next tab --- extendedgestures@mpiannucci.github.com/extension.js | 6 ++++++ extendedgestures@mpiannucci.github.com/prefs.js | 2 ++ .../org.gnome.shell.extensions.extendedgestures.gschema.xml | 2 ++ 3 files changed, 10 insertions(+) diff --git a/extendedgestures@mpiannucci.github.com/extension.js b/extendedgestures@mpiannucci.github.com/extension.js index f1b6f57..d447eb1 100644 --- a/extendedgestures@mpiannucci.github.com/extension.js +++ b/extendedgestures@mpiannucci.github.com/extension.js @@ -196,6 +196,12 @@ const TouchpadGestureAction = new Lang.Class({ focusedWindow.make_fullscreen(); } break; + case 12: + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Tab,); + break; + case 13: + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Tab,); + break; default: break; } diff --git a/extendedgestures@mpiannucci.github.com/prefs.js b/extendedgestures@mpiannucci.github.com/prefs.js index 081db94..009883d 100644 --- a/extendedgestures@mpiannucci.github.com/prefs.js +++ b/extendedgestures@mpiannucci.github.com/prefs.js @@ -128,6 +128,8 @@ const ExtendedGesturesSettingsWidget = new GObject.Class({ 'Go Back', 'Show App Drawer (unanimated)', 'Toggle Fullscreen', + 'Previous Tab', + 'Next Tab' ]; // Disable four finger options for now :( diff --git a/extendedgestures@mpiannucci.github.com/schemas/org.gnome.shell.extensions.extendedgestures.gschema.xml b/extendedgestures@mpiannucci.github.com/schemas/org.gnome.shell.extensions.extendedgestures.gschema.xml index 492b5ef..3b3db70 100644 --- a/extendedgestures@mpiannucci.github.com/schemas/org.gnome.shell.extensions.extendedgestures.gschema.xml +++ b/extendedgestures@mpiannucci.github.com/schemas/org.gnome.shell.extensions.extendedgestures.gschema.xml @@ -12,6 +12,8 @@ + + From 8ed244ff3cf7ebd8528e615379852a56a3b962d3 Mon Sep 17 00:00:00 2001 From: spbisc97 Date: Sun, 4 Apr 2021 21:31:59 +0200 Subject: [PATCH 2/8] Update schemas + prev tab --- .../extension.js | 4 +++- .../schemas/gschemas.compiled | Bin 1972 -> 2100 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/extendedgestures@mpiannucci.github.com/extension.js b/extendedgestures@mpiannucci.github.com/extension.js index d447eb1..639f337 100644 --- a/extendedgestures@mpiannucci.github.com/extension.js +++ b/extendedgestures@mpiannucci.github.com/extension.js @@ -197,9 +197,11 @@ const TouchpadGestureAction = new Lang.Class({ } break; case 12: - this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Tab,); + //prev tab + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.Key_Shift_L,Clutter.KEY_Tab,); break; case 13: + //next tab this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Tab,); break; default: diff --git a/extendedgestures@mpiannucci.github.com/schemas/gschemas.compiled b/extendedgestures@mpiannucci.github.com/schemas/gschemas.compiled index b207aaf01310c68d345c006becff94c44423924f..2e27e0b0c3148b9a90e56a75c5d4d0b6e33f6846 100644 GIT binary patch delta 437 zcmdnOzeQkz2cIqn0}%Ky7yxM#j)`Ga_3F$F47Eys*ja(%AhsYw8G{9owgqCZ+S+)K zIEW1r4*=4kKpgzhw*Vv#VhaJqGl2Ab76yg`wRPP8fdIs21&Xf#(lN&;E9nFyE?$!1Kzl*yg!+5l8M BVHf}a delta 317 zcmdlYu!Vnu2j5zD1|aZZ*Z`!ruulxDs%K|rV5n94!_Ep62eAbi$`~Yov@8&N)z-#? z#6fJ3xB-wh1>)e3z6Bt05L*Z+?g6CZSr`}&)YftT2LceA6)2toq-TKGq6`cmaS$71 zJBU62#EXxY)jNX>0&(Pl8Xf@Y7eM@Zc|a^k9K==xiVFZa5 Date: Sun, 4 Apr 2021 21:43:19 +0200 Subject: [PATCH 3/8] edd extension --- extendedgestures@mpiannucci.github.com/extension.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extendedgestures@mpiannucci.github.com/extension.js b/extendedgestures@mpiannucci.github.com/extension.js index 639f337..84bfe54 100644 --- a/extendedgestures@mpiannucci.github.com/extension.js +++ b/extendedgestures@mpiannucci.github.com/extension.js @@ -198,7 +198,7 @@ const TouchpadGestureAction = new Lang.Class({ break; case 12: //prev tab - this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.Key_Shift_L,Clutter.KEY_Tab,); + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Shift_L,Clutter.KEY_Tab,); break; case 13: //next tab From f7e48ad6de4cf9554d2247f967d23b84e6b0ed43 Mon Sep 17 00:00:00 2001 From: spbisc97 Date: Sun, 4 Apr 2021 22:27:54 +0200 Subject: [PATCH 4/8] add close and restore tab --- .../extension.js | 6 ++++++ .../prefs.js | 4 +++- .../schemas/gschemas.compiled | Bin 2100 -> 2284 bytes ...ll.extensions.extendedgestures.gschema.xml | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/extendedgestures@mpiannucci.github.com/extension.js b/extendedgestures@mpiannucci.github.com/extension.js index 84bfe54..24f6e61 100644 --- a/extendedgestures@mpiannucci.github.com/extension.js +++ b/extendedgestures@mpiannucci.github.com/extension.js @@ -204,6 +204,12 @@ const TouchpadGestureAction = new Lang.Class({ //next tab this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Tab,); break; + case 14: + //close tab + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.W,); + case 15: + //reopen tab + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Shift_L,Clutter.T,); default: break; } diff --git a/extendedgestures@mpiannucci.github.com/prefs.js b/extendedgestures@mpiannucci.github.com/prefs.js index 009883d..da8e208 100644 --- a/extendedgestures@mpiannucci.github.com/prefs.js +++ b/extendedgestures@mpiannucci.github.com/prefs.js @@ -129,7 +129,9 @@ const ExtendedGesturesSettingsWidget = new GObject.Class({ 'Show App Drawer (unanimated)', 'Toggle Fullscreen', 'Previous Tab', - 'Next Tab' + 'Next Tab', + 'Close Tab', + 'Restore Closed Tab' ]; // Disable four finger options for now :( diff --git a/extendedgestures@mpiannucci.github.com/schemas/gschemas.compiled b/extendedgestures@mpiannucci.github.com/schemas/gschemas.compiled index 2e27e0b0c3148b9a90e56a75c5d4d0b6e33f6846..95a255dbe48ea1605b098555b3c7f41144e4ce5c 100644 GIT binary patch delta 515 zcmdlY@J4Wg2k%o31|aZZcmbr}Obo5A4`yays8#yI&I%L;u>~2*7&3r#E)aXw*2aUx zL2QtC1CVY7;^2?I1t4({TL>sV14#d7VPH5=TgUw$2taIBpg53VFaTm!Q3eK(IEW3h z97IO|@#5oU_0AwM5Jw)Up#n%Z0P*ML0kI%)5L*!_z5+;Z0AhjD>t=(*L2Qu4CxG-> zAnsi(V*(Nfu|W=f0HnRy85pD@FWd!*gV_8)@dO}!8tC)uMuwaq@zWgK5Qzss!Ka&V zGCDJA@&U#FC+FlBr|Om@CNccy2l0zii%as0Qgy-NDPReP$&$?SK#wvoY_?#IAw}Or l7U9h+SVWjeuxclpJQL8OHdZrIEaK#lpPa+W3G_4=008pvegpsj delta 355 zcmaDOxJ6)s2d^#%0}%Ky7yxOLiJ{f?>dXubwMu{3S%JbJwje_pg9VVb1!Aw-+IWyS zhz$}C0MemA9Q@I@03;4#3jxJ5fb@J828IK*b=?1f0K{emimw3DH$ZGr1_qEghz+tF zOal#Ae7vmQ8DtPpHG@1*g94D&0OHTf17bnqAhsgNVjvv>!~&<+%?62s*dU8Rt|$fK z-o-K|AaM{I@u4lu$nMVKENR}xq+FL I9V7z;0E&V_%K!iX diff --git a/extendedgestures@mpiannucci.github.com/schemas/org.gnome.shell.extensions.extendedgestures.gschema.xml b/extendedgestures@mpiannucci.github.com/schemas/org.gnome.shell.extensions.extendedgestures.gschema.xml index 3b3db70..04cda53 100644 --- a/extendedgestures@mpiannucci.github.com/schemas/org.gnome.shell.extensions.extendedgestures.gschema.xml +++ b/extendedgestures@mpiannucci.github.com/schemas/org.gnome.shell.extensions.extendedgestures.gschema.xml @@ -14,6 +14,8 @@ + + From a84f5e9fcf5b4209cea127f6de5323add04cc629 Mon Sep 17 00:00:00 2001 From: spbisc97 Date: Sun, 4 Apr 2021 23:11:53 +0200 Subject: [PATCH 5/8] add gey code and reopen --- extendedgestures@mpiannucci.github.com/extension.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extendedgestures@mpiannucci.github.com/extension.js b/extendedgestures@mpiannucci.github.com/extension.js index 24f6e61..3de383f 100644 --- a/extendedgestures@mpiannucci.github.com/extension.js +++ b/extendedgestures@mpiannucci.github.com/extension.js @@ -206,10 +206,12 @@ const TouchpadGestureAction = new Lang.Class({ break; case 14: //close tab - this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.W,); + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_W,); + break; case 15: //reopen tab - this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Shift_L,Clutter.T,); + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Shift_L,Clutter.KEY_T,); + break; default: break; } @@ -231,6 +233,7 @@ const TouchpadGestureAction = new Lang.Class({ _sendKeyEvent: function (...keys) { let currentTime = Clutter.get_current_event_time(); keys.forEach(key => this._virtualDevice.notify_keyval(currentTime, key, Clutter.KeyState.PRESSED)); + keys.reverse(); keys.forEach(key => this._virtualDevice.notify_keyval(currentTime, key, Clutter.KeyState.RELEASED)); }, From 46f627469485c6661dbf5e9622f0423c55ace242 Mon Sep 17 00:00:00 2001 From: spbisc97 Date: Sun, 4 Apr 2021 23:34:56 +0200 Subject: [PATCH 6/8] lowercase clutter --- extendedgestures@mpiannucci.github.com/extension.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extendedgestures@mpiannucci.github.com/extension.js b/extendedgestures@mpiannucci.github.com/extension.js index 3de383f..c111d98 100644 --- a/extendedgestures@mpiannucci.github.com/extension.js +++ b/extendedgestures@mpiannucci.github.com/extension.js @@ -206,11 +206,11 @@ const TouchpadGestureAction = new Lang.Class({ break; case 14: //close tab - this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_W,); + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_W + 32); break; case 15: //reopen tab - this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Shift_L,Clutter.KEY_T,); + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Shift_L,Clutter.KEY_T + 32); break; default: break; From 4a4e229fe8c7ad773265284f60fc61f48205ffe5 Mon Sep 17 00:00:00 2001 From: spbisc97 Date: Sun, 4 Apr 2021 23:49:57 +0200 Subject: [PATCH 7/8] change shift to page up/down --- extendedgestures@mpiannucci.github.com/extension.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extendedgestures@mpiannucci.github.com/extension.js b/extendedgestures@mpiannucci.github.com/extension.js index c111d98..6847c42 100644 --- a/extendedgestures@mpiannucci.github.com/extension.js +++ b/extendedgestures@mpiannucci.github.com/extension.js @@ -198,11 +198,11 @@ const TouchpadGestureAction = new Lang.Class({ break; case 12: //prev tab - this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Shift_L,Clutter.KEY_Tab,); + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Page_Up); break; case 13: //next tab - this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Tab,); + this._sendKeyEvent(Clutter.KEY_Control_L,Clutter.KEY_Page_Down); break; case 14: //close tab From 5d88329f640e54a0a85af5b408a8cfa903d47877 Mon Sep 17 00:00:00 2001 From: spbisc97 Date: Mon, 5 Apr 2021 02:53:22 +0200 Subject: [PATCH 8/8] add comments --- extendedgestures@mpiannucci.github.com/extension.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extendedgestures@mpiannucci.github.com/extension.js b/extendedgestures@mpiannucci.github.com/extension.js index 6847c42..755cb3c 100644 --- a/extendedgestures@mpiannucci.github.com/extension.js +++ b/extendedgestures@mpiannucci.github.com/extension.js @@ -71,7 +71,7 @@ const TouchpadGestureAction = new Lang.Class({ rounded_direction = 2; } let dir = DIRECTION_LOOKUP[rounded_direction] - + // Main.notify('test','direction '+rounded_direction+' dy,dx='+ this._dy+' ,'+this._dx); if (!this._checkSwipeValid(dir, fingerCount, magnitude)) return; @@ -87,9 +87,11 @@ const TouchpadGestureAction = new Lang.Class({ if (event.get_gesture_phase() == Clutter.TouchpadGesturePhase.UPDATE) { let [dx, dy] = event.get_gesture_motion_delta(); - + // when natural scrolling is enabled + // dy is reversed this._dx += dx; this._dy += dy; + // Main.notify('increment','dy,dx='+ dy+' ,'+dx) } else { if (event.get_gesture_phase() == Clutter.TouchpadGesturePhase.END) this._checkActivated(event.get_touchpad_gesture_finger_count());