From b7eb2ae8cd480804e99f6bad9c456a24bafe9c45 Mon Sep 17 00:00:00 2001
From: Antti K
Date: Sat, 26 Jul 2014 18:18:46 +0200
Subject: Rebrand to xkbcat

Having taken all reasonable measures to reach the author, I'll rename to
avoid confusion.
---
 compile  |   2 +-
 xkbcat.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 xspy.c   | 136 ---------------------------------------------------------------
 3 files changed, 133 insertions(+), 137 deletions(-)
 create mode 100644 xkbcat.c
 delete mode 100644 xspy.c

diff --git a/compile b/compile
index 9fde93e..5e1dc51 100755
--- a/compile
+++ b/compile
@@ -1 +1 @@
-clang -o xspy -lX11 xspy.c
+clang -o xkbcat -lX11 xkbcat.c
diff --git a/xkbcat.c b/xkbcat.c
new file mode 100644
index 0000000..d8f4cb2
--- /dev/null
+++ b/xkbcat.c
@@ -0,0 +1,132 @@
+// to compile run "gcc -o xkbcat -lX11 xkbcat.c"
+/*
+   xkbcat
+   Monitors key presses globally across X11.
+
+   A rather simplified version of
+   `xspy` by Jon A. Maxwell (JAM) <jmaxwell@acm.vt.edu>
+   as modified for easier physical key monitoring by Antti Korpi <an@cyan.io>.
+*/
+
+/*
+   xspy polls the keyboard to determine the state of all keys on
+   the keyboard.  By comparing results it determines which key has
+   been pressed.  In this way it echos to the user all physical keys typed.
+*/
+
+#include <X11/Xlib.h>
+#include <X11/X.h>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define VERSION "1.0c"
+#define DEFAULT_DISPLAY ":0"
+#define DEFAULT_DELAY   10000
+#define BIT(c, x)   ( c[x/8]&(1<<(x%8)) )
+#define TRUE    1
+#define FALSE   0
+
+#define KEYSYM_STRLEN   64
+
+/* Global variables */
+extern Display *disp;
+extern int PrintUp;
+
+Display *disp;
+int PrintUp  =FALSE;
+
+char *KeyCodeToStr(int code, int down);
+
+int usage() {
+   printf("%s\n%s\n%s\n%s\n%s%s%s\n",
+          "USAGE: xspy -display <display> -delay <usecs> -up",
+          "       Options: display, specifies an X display.",
+          "           delay, determines the polling frequency (.1 sec is 100000 usecs)",
+          "           up, gives up transitions for some keys.",
+          "       Version ",VERSION, ", by JAM");
+   exit(0);
+}
+
+int main(int argc, char *argv[]) {
+   char    *hostname=DEFAULT_DISPLAY,
+           *char_ptr,
+           buf1[32],   buf2[32],
+           *keys,
+           *saved;
+   int i,  delay=DEFAULT_DELAY;
+
+   /* get args */
+   for (i=1; i<argc; i++) {
+      if (!strcmp(argv[i], "-help")) usage();
+      else if (!strcmp(argv[i], "-display")) {
+         i++;
+         hostname=argv[i];
+      }
+      else if (!strcmp(argv[i], "-delay")) {
+         i++;
+         delay=atoi(argv[i]);
+      }
+      else if (!strcmp(argv[i], "-up"))   {PrintUp  =TRUE;}
+      else usage();
+   }
+
+   /* setup Xwindows */
+   disp=XOpenDisplay(hostname);
+   if (NULL==disp) {
+      fprintf(stderr, "Cannot open X display: %s\n", hostname);
+      exit(1);
+   }
+   XSynchronize(disp, TRUE);
+
+   /* setup buffers */
+   saved=buf1; keys=buf2;
+   XQueryKeymap(disp, saved);
+
+   while (1) {
+      /* find changed keys */
+      XQueryKeymap(disp, keys);
+      for (i=0; i<32*8; i++) {
+         if (BIT(keys, i)!=BIT(saved, i)) {
+            register char *str;
+            str=(char *)KeyCodeToStr(i, BIT(keys, i));
+            if (BIT(keys, i)!=0 || PrintUp) printf("%s\n",str);
+            fflush(stdout); /* in case user is writing to a pipe */
+         }
+      }
+
+      /* swap buffers */
+      char_ptr=saved;
+      saved=keys;
+      keys=char_ptr;
+
+      usleep(delay);
+   }
+}
+
+/*
+   Have a keycode, Look up keysym for it.
+   Convert keysym into its string representation.
+   Put it as (+string) or (-string), depending on if it's up or down.
+   Print out the string.
+*/
+
+char *KeyCodeToStr(int code, int down) {
+   static char *str, buf[KEYSYM_STRLEN+1];
+   KeySym keysym = XKeycodeToKeysym(disp, code, 0);
+   if (NoSymbol==keysym) return "";
+
+   /* convert keysym to a string, copy it to a local area */
+   str=XKeysymToString(keysym);
+
+   if (NULL==str) return "";
+   strncpy(buf, str, KEYSYM_STRLEN); buf[KEYSYM_STRLEN]=0;
+
+   /* still a string, so put it in form (+str) or (-str) */
+   if (down) strcpy(buf, "+ ");
+   else      strcpy(buf, "- ");
+   strcat(buf, str);
+   return buf;
+}
diff --git a/xspy.c b/xspy.c
deleted file mode 100644
index 5025a70..0000000
--- a/xspy.c
+++ /dev/null
@@ -1,136 +0,0 @@
-// to compile run "gcc -o xspy -lX11 xspy.c"
-/*
-   xspy
-   Jon A. Maxwell (JAM)
-   jmaxwell@acm.vt.edu
-   Monitors keystrokes even the keyboard is grabbed.
-*/
-
-
-/*
-   xspy polls the keyboard to determine the state of all keys on
-   the keyboard.  By comparing results it determines which key has
-   been pressed and what modifiers are in use.  In this way it
-   echos to the user all keystrokes typed.
-
-   xspy is freely distributable, provided the source remains intact.
-*/
-
-#include <X11/Xlib.h>
-#include <X11/X.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#define VERSION "1.0c"
-#define DEFAULT_DISPLAY ":0"
-#define DEFAULT_DELAY   10000
-#define BIT(c, x)   ( c[x/8]&(1<<(x%8)) )
-#define TRUE    1
-#define FALSE   0
-
-#define KEYSYM_STRLEN   64
-
-/* Global variables */
-extern Display *disp;
-extern int PrintUp;
-
-Display *disp;
-int PrintUp  =FALSE;
-
-char *KeyCodeToStr(int code, int down);
-
-int usage() {
-   printf("%s\n%s\n%s\n%s\n%s%s%s\n",
-          "USAGE: xspy -display <display> -delay <usecs> -up",
-          "       Options: display, specifies an X display.",
-          "           delay, determines the polling frequency (.1 sec is 100000 usecs)",
-          "           up, gives up transitions for some keys.",
-          "       Version ",VERSION, ", by JAM");
-   exit(0);
-}
-
-
-
-int main(int argc, char *argv[]) {
-   char    *hostname=DEFAULT_DISPLAY,
-           *char_ptr,
-           buf1[32],   buf2[32],
-           *keys,
-           *saved;
-   int i,  delay=DEFAULT_DELAY;
-
-   /* get args */
-   for (i=1; i<argc; i++) {
-      if (!strcmp(argv[i], "-help")) usage();
-      else if (!strcmp(argv[i], "-display")) {
-         i++;
-         hostname=argv[i];
-      }
-      else if (!strcmp(argv[i], "-delay")) {
-         i++;
-         delay=atoi(argv[i]);
-      }
-      else if (!strcmp(argv[i], "-up"))   {PrintUp  =TRUE;}
-      else usage();
-   }
-
-   /* setup Xwindows */
-   disp=XOpenDisplay(hostname);
-   if (NULL==disp) {
-      fprintf(stderr, "Cannot open X display: %s\n", hostname);
-      exit(1);
-   }
-   XSynchronize(disp, TRUE);
-
-   /* setup buffers */
-   saved=buf1; keys=buf2;
-   XQueryKeymap(disp, saved);
-
-   while (1) {
-      /* find changed keys */
-      XQueryKeymap(disp, keys);
-      for (i=0; i<32*8; i++) {
-         if (BIT(keys, i)!=BIT(saved, i)) {
-            register char *str;
-            str=(char *)KeyCodeToStr(i, BIT(keys, i));
-            if (BIT(keys, i)!=0 || PrintUp) printf("%s\n",str);
-            fflush(stdout); /* in case user is writing to a pipe */
-         }
-      }
-
-      /* swap buffers */
-      char_ptr=saved;
-      saved=keys;
-      keys=char_ptr;
-
-      usleep(delay);
-   }
-}
-
-/*
-   Have a keycode, Look up keysym for it.
-   Convert keysym into its string representation.
-   Put it as (+string) or (-string), depending on if it's up or down.
-   Print out the string.
-*/
-
-char *KeyCodeToStr(int code, int down) {
-   static char *str, buf[KEYSYM_STRLEN+1];
-   KeySym keysym = XKeycodeToKeysym(disp, code, 0);
-   if (NoSymbol==keysym) return "";
-
-   /* convert keysym to a string, copy it to a local area */
-   str=XKeysymToString(keysym);
-
-   if (NULL==str) return "";
-   strncpy(buf, str, KEYSYM_STRLEN); buf[KEYSYM_STRLEN]=0;
-
-   /* still a string, so put it in form (+str) or (-str) */
-   if (down) strcpy(buf, "+ ");
-   else      strcpy(buf, "- ");
-   strcat(buf, str);
-   return buf;
-}
-- 
cgit v1.3-2-g0d8e