Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/console-tools/showkey.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/console-tools/showkey.c (modified) (7 diffs)

branches/3.2/mindi-busybox/console-tools/showkey.c

@@ -7 +7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//usage:#define showkey_trivial_usage
+//usage:       "[-a | -k | -s]"
+//usage:#define showkey_full_usage "\n\n"
+//usage:       "Show keys pressed\n"
+//usage:     "\n    -a  Display decimal/octal/hex values of the keys"
+//usage:     "\n    -k  Display interpreted keycodes (default)"
+//usage:     "\n    -s  Display raw scan-codes"
 
 #include "libbb.h"
@@ -57 +65 @@
     getopt32(argv, "aks");
 
-    // get keyboard settings
-    xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
-    printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n",
-        kbmode == K_RAW ? "RAW" :
-            (kbmode == K_XLATE ? "XLATE" :
-                (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :
-                    (kbmode == K_UNICODE ? "UNICODE" : "UNKNOWN")))
-        , (option_mask32 & OPT_a) ? "on EOF (ctrl-D)" : "10s after last keypress"
-    );
-
     // prepare for raw mode
     xget1(&tio, &tio0);
@@ -72 +70 @@
     xset1(&tio);
 
+#define press_keys "Press any keys, program terminates %s:\r\n\n"
+
     if (option_mask32 & OPT_a) {
+        // just read stdin char by char
         unsigned char c;
 
-        // just read stdin char by char
+        printf(press_keys, "on EOF (ctrl-D)");
+
+        // read and show byte values
         while (1 == read(STDIN_FILENO, &c, 1)) {
             printf("%3u 0%03o 0x%02x\r\n", c, c, c);
@@ -81 +84 @@
                 break;
         }
+
     } else {
+        // we assume a PC keyboard
+        xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
+        printf("Keyboard mode was %s.\r\n\n",
+            kbmode == K_RAW ? "RAW" :
+                (kbmode == K_XLATE ? "XLATE" :
+                    (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :
+                        (kbmode == K_UNICODE ? "UNICODE" : "UNKNOWN")))
+        );
+
         // set raw keyboard mode
         xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW));
@@ -87 +100 @@
         // we should exit on any signal; signals should interrupt read
         bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
+
+        // inform user that program ends after time of inactivity
+        printf(press_keys, "10s after last keypress");
 
         // read and show scancodes
@@ -95 +111 @@
             // setup 10s watchdog
             alarm(10);
+
             // read scancodes
             n = read(STDIN_FILENO, buf, sizeof(buf));
@@ -122 +139 @@
             puts("\r");
         }
+
+        // restore keyboard mode
+        xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
     }
 
-    // restore keyboard and console settings
+    // restore console settings
     xset1(&tio0);
-    xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
 
     return EXIT_SUCCESS;