X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fkeymap%2Ffindkeyboards;h=537d1631329ef37cb1e748cec7786c82de1c5302;hb=eabac232a51b8d8dc2f6897018968bfe96d2912d;hp=e39084cde953fc46bee581ead03e0599353da0a7;hpb=2417dc20f5147556d0ed4f95a37b1547fb4b0f2b;p=elogind.git

diff --git a/extras/keymap/findkeyboards b/extras/keymap/findkeyboards
index e39084cde..537d16313 100755
--- a/extras/keymap/findkeyboards
+++ b/extras/keymap/findkeyboards
@@ -14,31 +14,55 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 
+# returns OK if $1 contains $2
+strstr() {
+    [ "${1#*$2*}" != "$1" ]
+}
+
+# returns OK if $1 contains $2 at the beginning
+str_starts() {
+    [ "${1#$2*}" != "$1" ]
+}
+
+str_line_starts() {
+    while read a; do str_starts "$a" "$1" && return 0;done
+    return 1;
+}
 
 # print a list of input devices which are keyboard-like
 keyboard_devices() {
-    input_devs=`udevadm trigger --dry-run --verbose --subsystem-match=input --attr-match=dev`
-
     # standard AT keyboard
-    for dev in $input_devs; do
-        info=`udevadm info --attribute-walk --path=$dev`
-        
-        if echo "$info" | grep -q 'DRIVERS=="atkbd"'; then
+    for dev in `udevadm trigger --dry-run --verbose --property-match=ID_INPUT_KEYBOARD=1`; do
+        walk=`udevadm info --attribute-walk --path=$dev`
+        env=`udevadm info --query=env --path=$dev`
+        # filter out non-event devices, such as the parent input devices which
+        # have no devnode
+        if ! echo "$env" | str_line_starts 'DEVNAME='; then
+            continue
+        fi
+        if strstr "$walk" 'DRIVERS=="atkbd"'; then
             echo -n 'AT keyboard: '
-            udevadm info --query=name --path=$dev
+        elif echo "$env" | str_line_starts 'ID_USB_DRIVER=usbhid'; then
+            echo -n 'USB keyboard: '
+        else
+            echo -n 'Unknown type: '
         fi
+        udevadm info --query=name --path=$dev
     done
 
     # modules
-    module=`udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*Extra Buttons'`
+    module=$(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*Extra Buttons')
+    module="$module
+$(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*extra buttons')"
     module="$module
-`udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='Sony Vaio Keys'`"
+$(udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='Sony Vaio Keys')"
     for m in $module; do
-	evdev=`ls -d $m/event* 2>/dev/null`
-	if [ -e "$evdev/dev" ]; then
-	    echo -n 'module: '
-	    udevadm info --query=name --path=$evdev
-	fi
+        for evdev in $m/event*/dev; do
+            if [ -e "$evdev" ]; then
+		echo -n 'module: '
+		udevadm info --query=name --path=${evdev%%/dev}
+            fi
+	done
     done
 }