CVS commit: [netbsd-9] xsrc/external/mit/xf86-input-keyboard/dist/src

[Martin Husemann]

Module Name:    xsrc
Committed By:   martin
Date:           Mon Oct  4 15:42:40 UTC 2021

Modified Files:
        xsrc/external/mit/xf86-input-keyboard/dist/src [netbsd-9]: kbd.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1354):

        external/mit/xf86-input-keyboard/dist/src/kbd.c: revision 1.8

Handle DEVICE_ABORT to restore the original keyboard state after crash.

No particular comment in PR xsrc/56415.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 \
    xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.7 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.7.4.1
--- xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.7	Sun Mar  5 08:05:23 2017
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c	Mon Oct  4 15:42:40 2021
@@ -384,6 +384,15 @@ KbdProc(DeviceIntPtr device, int what)
     device->public.on = FALSE;
     break;
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
+  case DEVICE_ABORT:
+    /*
+     * Restore original keyboard state even on crash.
+     */
+    pKbd->KbdOff(pInfo, what);
+    break;
+#endif
+
   default:
     return BadValue;
   }