diff --git a/files/0001-Support-stateless-configuration-and-use-it-by-defaul.patch b/files/0001-Support-stateless-configuration-and-use-it-by-defaul.patch --- a/files/0001-Support-stateless-configuration-and-use-it-by-defaul.patch +++ b/files/0001-Support-stateless-configuration-and-use-it-by-defaul.patch @@ -1,6 +1,6 @@ -From 9123d05eea6cd66ec76fe30be26eeed6b17f9789 Mon Sep 17 00:00:00 2001 +From e0b89ac29d4072c6a9830fde988c12460ecb6e9c Mon Sep 17 00:00:00 2001 From: Pierre-Yves -Date: Fri, 9 Jun 2017 22:56:48 +0200 +Date: Wed, 11 Apr 2018 16:49:58 +0200 Subject: [PATCH] Support stateless configuration and use it by default Signed-off-by: Pierre-Yves @@ -10,13 +10,13 @@ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libinput-gestures b/libinput-gestures -index d4c8979..8bb7112 100755 +index 4af44ae..26b0ca1 100755 --- a/libinput-gestures +++ b/libinput-gestures -@@ -10,7 +10,8 @@ PROG = Path(sys.argv[0]).name +@@ -12,7 +12,8 @@ PROG = Path(sys.argv[0]).stem # Search first for user file then system file. CONFNAME = '{}.conf'.format(PROG) - USERDIR = os.getenv('XDG_CONFIG_DIR', os.path.expanduser('~/.config')) + USERDIR = os.getenv('XDG_CONFIG_HOME', os.path.expanduser('~/.config')) -CONFDIRS = (USERDIR, '/etc') +VENDORDIR = '/usr/share/{}'.format(PROG) +CONFDIRS = (USERDIR, '/etc', VENDORDIR) @@ -24,7 +24,7 @@ # Ratio of X/Y (or Y/X) at which we consider an oblique swipe gesture. # The number is the trigger angle in degrees. diff --git a/libinput-gestures-setup b/libinput-gestures-setup -index 55802f0..8a179bc 100755 +index cf74952..46ed67d 100755 --- a/libinput-gestures-setup +++ b/libinput-gestures-setup @@ -12,6 +12,7 @@ ICODIR="$ICOBAS/128x128/apps" @@ -35,22 +35,24 @@ HCFDIR="${XDG_CONFIG_HOME:-$HOME/.config}" AUTDIR="$HCFDIR/autostart" -@@ -150,13 +151,13 @@ if [ $cmd = "install" -o $cmd = "uninstall" ]; then +@@ -155,7 +156,7 @@ if [[ $cmd == install || $cmd == uninstall ]]; then install -CDv -m 755 -t $DESTDIR$BINDIR $NAME install -CDv -m 644 -t $DESTDIR$APPDIR $NAME.desktop install -CDv -m 644 -t $DESTDIR$ICODIR $NAME.png - install -CDv -m 644 -t $DESTDIR$CNFDIR $NAME.conf + install -CDv -m 644 -t $DESTDIR$VNDDIR $NAME.conf install -CDv -m 644 -t $DESTDIR$DOCDIR README.md - else + + # Also install HTML file if markdown is available +@@ -166,7 +167,7 @@ if [[ $cmd == install || $cmd == uninstall ]]; then rm -rfv $DESTDIR$BINDIR/$NAME rm -rfv $DESTDIR$APPDIR/$NAME.desktop rm -rfv $DESTDIR$ICODIR/$NAME.png - rm -rfv $DESTDIR$CNFDIR/$NAME.conf -+ rm -rfv $DESTDIR$VNDDIR/$NAME.conf ++ rm -rfv $DESTDIR$VNDDIR $NAME.conf rm -rfv $DESTDIR$DOCDIR rm -rfv $DESTDIR$BINDIR/$NAME-setup fi -- -2.13.1 +2.16.3 diff --git a/files/libinput-gestures.conf b/files/libinput-gestures.conf --- a/files/libinput-gestures.conf +++ b/files/libinput-gestures.conf @@ -9,7 +9,7 @@ # described below. The keyword can optionally be appended with a ":" (to # maintain compatibility with original format configuration files). # -# Each gesture line has 3 [or 4] arguments: +# Each gesture line has 3 [or 4] arguments separated by whitespace: # # action motion [finger_count] command # @@ -35,7 +35,11 @@ # Typically command will be xdotool, or wmctrl. See "man xdotool" for # the many things you can action with that tool. Note that unfortunately # xdotool does not work with native Wayland clients. -# + +############################################################################### +# SWIPE GESTURES: +############################################################################### + # Note the default is an "internal" command that uses wmctrl to switch # workspaces and, unlike xdotool, works on both Xorg and Wayland (via # XWayland). It also can be configured for vertical and horizontal @@ -46,8 +50,19 @@ # gesture swipe up _internal ws_up gesture swipe up xdotool set_desktop --relative 1 +# NOTE ABOUT FINGER COUNT: +# The above command will configure this command for all fingers (i.e. 3 +# for 4) but to configure it for 3 fingers only, change it to: +# gesture swipe up 3 _internal ws_up +# Then you can configure something else for 4 fingers or leave 4 fingers +# unconfigured. You can configure an explicit finger count like this for +# all example commands in this configuration file. +# +# gesture swipe up xdotool key super+Page_Down + # Move to prev workspace (works for GNOME/KDE/etc on Wayland and Xorg) # gesture swipe down _internal ws_down +# gesture swipe down xdotool key super+Page_Up gesture swipe down xdotool set_desktop --relative -- -1 # Browser go forward (works only for Xorg, and Xwayland clients) @@ -92,15 +107,30 @@ # gesture swipe left xdotool key ctrl+alt+Left # gesture swipe right xdotool key ctrl+alt+Right -# GNOME SHELL open/close overview (works for GNOME on Wayland and Xorg) -gesture pinch in dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();' +# Example to change audio volume: +# Note this only works on an Xorg desktop (not Wayland). +# gesture swipe up xdotool key XF86AudioRaiseVolume +# gesture swipe down xdotool key XF86AudioLowerVolume + +############################################################################### +# PINCH GESTURES: +############################################################################### -gesture pinch out dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();' +# GNOME SHELL open/close overview (works for GNOME on Xorg only) +gesture pinch in xdotool key super+s +gesture pinch out xdotool key super+s + +# GNOME SHELL open/close overview (works for GNOME on Wayland and Xorg) +# Note since GNOME 3.24 on Wayland this is implemented natively so no +# real point configuring for Wayland. +# gesture pinch in dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();' +# gesture pinch out dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();' # Optional extended pinch gestures: # gesture pinch clockwise # gesture pinch anticlockwise +############################################################################### # This application normally determines your touchpad device # automatically. Some users may have multiple touchpads but by default # we use only the first one found. However, you can choose to specify @@ -117,7 +147,8 @@ # /dev/input/by-path/*. # # You can choose to use ALL touchpad devices by setting the device name -# to "all". This reduces performance slightly so only set this if you -# need to. +# to "all". E.g. Do this if you have multiple touchpads which you want +# to use in parallel. This reduces performance slightly so only set this +# if you have to. # # device all diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,11 +1,11 @@ name : libinput-gestures -version : '2.30' -release : 4 +version : 2.36 +release : 5 source : - - https://github.com/bulletmark/libinput-gestures/archive/2.30.tar.gz : 9e2b9e779c96153481e7b198d336780bc37bc5150ae166cdde18f54778c55162 -license : GPL-3.0 + - https://github.com/bulletmark/libinput-gestures/archive/2.36.tar.gz : e1a4509b90f1fc20215c54ed34317153376ea56078280b64ede4bec8562b3e27 +license : GPL-3.0-or-later component : desktop -summary : Background application to intercept and action libinput gestures from touchpad. +summary : Background application to intercept and action libinput gestures from touchpad description: | Libinput-gestures is a utility which reads libinput gestures from your touchpad and maps them to gestures you configure in a configuration file. Each gesture can be configured to activate a shell command which is typically an xdotool command to action desktop/window/application keyboard combinations and commands. rundeps : @@ -14,4 +14,4 @@ %patch -p1 < $pkgfiles/0001-Support-stateless-configuration-and-use-it-by-defaul.patch install : | %make_install - install -Dm644 $pkgfiles/libinput-gestures.conf $installdir/usr/share/libinput-gestures/libinput-gestures.conf + install -Dm00644 $pkgfiles/libinput-gestures.conf $installdir/usr/share/libinput-gestures/libinput-gestures.conf diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,19 +2,19 @@ libinput-gestures - Bryan T. Meyers - bmeyers@datadrake.com + Pierre-Yves + pyu@riseup.net - GPL-3.0 + GPL-3.0-or-later desktop - Background application to intercept and action libinput gestures from touchpad. + Background application to intercept and action libinput gestures from touchpad Libinput-gestures is a utility which reads libinput gestures from your touchpad and maps them to gestures you configure in a configuration file. Each gesture can be configured to activate a shell command which is typically an xdotool command to action desktop/window/application keyboard combinations and commands. https://solus-project.com/sources/README.Solus libinput-gestures - Background application to intercept and action libinput gestures from touchpad. + Background application to intercept and action libinput gestures from touchpad Libinput-gestures is a utility which reads libinput gestures from your touchpad and maps them to gestures you configure in a configuration file. Each gesture can be configured to activate a shell command which is typically an xdotool command to action desktop/window/application keyboard combinations and commands. desktop @@ -27,12 +27,12 @@ - - 2017-12-16 - 2.30 + + 2018-05-18 + 2.36 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Pierre-Yves + pyu@riseup.net - \ No newline at end of file +