Added termkey_snprint_key() to render nice string outputs of key events

1 files changed, 6 insertions, 24 deletions

diff --git a/demo.c b/demo.c
index 4a5cb38..94b029c 100644
--- a/demo.c
+++ b/demo.c
@@ -3,36 +3,18 @@
 #include "termkey.h"
 
 int main(int argc, char *argv[]) {
+  char buffer[50];
   termkey_t *tk = termkey_new(0, 0);
 
   termkey_result ret;
   termkey_key key;
 
   while((ret = termkey_waitkey(tk, &key)) != TERMKEY_RES_EOF) {
-    switch(key.type) {
-    case TERMKEY_TYPE_KEYSYM:
-      printf("Key %s%s%s%s (code %d)\n",
-          key.modifiers & TERMKEY_KEYMOD_SHIFT ? "Shift-" : "",
-          key.modifiers & TERMKEY_KEYMOD_ALT   ? "Alt-" : "",
-          key.modifiers & TERMKEY_KEYMOD_CTRL  ? "Ctrl-" : "",
-          termkey_get_keyname(tk, key.code.sym),
-          key.code.sym);
-      break;
-    case TERMKEY_TYPE_FUNCTION:
-      printf("Function key %s%s%sF%d\n",
-          key.modifiers & TERMKEY_KEYMOD_SHIFT ? "Shift-" : "",
-          key.modifiers & TERMKEY_KEYMOD_ALT   ? "Alt-" : "",
-          key.modifiers & TERMKEY_KEYMOD_CTRL  ? "Ctrl-" : "",
-          key.code.number);
-      break;
-    case TERMKEY_TYPE_UNICODE:
-      printf("Unicode %s%s%s%s (U+%04X)\n",
-          key.modifiers & TERMKEY_KEYMOD_SHIFT ? "Shift-" : "",
-          key.modifiers & TERMKEY_KEYMOD_ALT   ? "Alt-" : "",
-          key.modifiers & TERMKEY_KEYMOD_CTRL  ? "Ctrl-" : "",
-          key.utf8,
-          key.code.codepoint);
-      break;
+    if(key.type == TERMKEY_TYPE_UNICODE && !key.modifiers)
+      printf("%s\n", key.utf8);
+    else {
+      termkey_snprint_key(tk, buffer, sizeof buffer, &key, 1);
+      printf("<%s>\n", buffer);
     }
 
     if(key.type == TERMKEY_TYPE_UNICODE &&