Skip to content

Commit edc6718

Browse files
committed
Text changes in README etc
1 parent 9276cf9 commit edc6718

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,15 @@ You can check the status of the app with:
191191

192192
This utility exploits `xdotool` which unfortunately only works with
193193
X11/Xorg based applications. So `xdotool` shortcuts for the desktop do
194-
not work under GNOME on Wayland which is now the default since GNOME
194+
not work under GNOME on Wayland which is the default since GNOME
195195
3.22. However, it is found that `wmctrl` desktop selection commands do work
196196
under GNOME on Wayland (via XWayland) so this utility adds a built-in
197197
`_internal` command which can be used to switch workspaces using the
198198
swipe commands.
199199
The `_internal` `ws_up` and `ws_down` commands use `wmctrl` to work out
200200
the current workspace and select the next one. Since this works on both
201201
Wayland and Xorg, and with GNOME, KDE, and other EWMH compliant
202-
desktops, it is now the default configuration command for swipe up and
202+
desktops, it is the default configuration command for swipe up and
203203
down commands in `libinput-gestures.conf`. See the comments in that file
204204
about other options you can do with the `_internal` command.
205205
Unfortunately `_internal` does not work with Compiz for Ubuntu

libinput-gestures

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ def get_device_info(name, cmd_list_devices, device_list):
111111
# If the device name starts with a '/' then it is instead
112112
# considered as the explicit device path although since
113113
# device paths can change through reboots this is best to be
114-
# a symlink. E.g. use the corresponding full path link under
115-
# /dev/input/by-path/ or /dev/input/by-id/.
114+
# a symlink. E.g. users should use the corresponding full
115+
# path link under /dev/input/by-path/ or /dev/input/by-id/.
116116
if kdev:
117117
if d.get('kernel') == kdev:
118118
return d
@@ -125,13 +125,11 @@ def get_device_info(name, cmd_list_devices, device_list):
125125
if 'size' in d and 'pointer' in d.get('capabilities'):
126126
return d
127127
# Otherwise look for 1st device with touchpad in it's name
128-
for d in devices:
129-
if re.search(r'touch ?pad', d.get('device', ''), re.I):
130-
return d
131-
# Otherwise look for 1st device with trackpad in it's name
132-
for d in devices:
133-
if re.search(r'track ?pad', d.get('device', ''), re.I):
134-
return d
128+
# or, failing that, 1st device with trackpad in it's name
129+
for txt in ('touch ?pad', 'track ?pad'):
130+
for d in devices:
131+
if re.search(txt, d.get('device', ''), re.I):
132+
return d
135133

136134
# Give up
137135
return None

libinput-gestures.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ gesture pinch out xdotool key super+s
169169
# If the device name starts with a '/' then it is instead considered as
170170
# the explicit device path although since device paths can change
171171
# through reboots this is best to be a symlink. E.g. instead of specifying
172-
# /dev/input/event12, use the corresponding full path link under
173-
# /dev/input/by-path/ or /dev/input/by-id/.
172+
# /dev/input/event12, you should use the corresponding full path link
173+
# under /dev/input/by-path/ or /dev/input/by-id/.
174174
#
175175
# You can choose to use ALL touchpad devices by setting the device name
176176
# to "all". E.g. Do this if you have multiple touchpads which you want

0 commit comments

Comments
 (0)