=== modified file 'demo.c'
--- demo.c	2008-10-06 21:22:09 +0000
+++ demo.c	2008-08-21 19:20:07 +0000
@@ -13,9 +13,7 @@
     if(key.type == TERMKEY_TYPE_UNICODE && !key.modifiers)
       printf("%s\n", key.utf8);
     else {
-      termkey_snprint_key(tk, buffer, sizeof buffer, &key, 0);
-      printf("<%s> or ", buffer);
-      termkey_snprint_key(tk, buffer, sizeof buffer, &key, ~0);
+      termkey_snprint_key(tk, buffer, sizeof buffer, &key, 1);
       printf("<%s>\n", buffer);
     }
 

=== modified file 'termkey.c'
--- termkey.c	2008-10-06 21:22:09 +0000
+++ termkey.c	2008-10-06 21:02:12 +0000
@@ -863,18 +863,6 @@
 
   int longmod = format & TERMKEY_FORMAT_LONGMOD;
 
-  if(format & TERMKEY_FORMAT_CARETCTRL) {
-    if(key->type == TERMKEY_TYPE_UNICODE &&
-       key->modifiers == TERMKEY_KEYMOD_CTRL &&
-       key->code.number >= '@' &&
-       key->code.number <= '_') {
-      l = snprintf(buffer + pos, len - pos, "^");
-      if(l <= 0) return pos;
-      pos += l;
-      goto do_codepoint;
-    }
-  }
-
   if(key->modifiers & TERMKEY_KEYMOD_CTRL) {
     l = snprintf(buffer + pos, len - pos, longmod ? "Ctrl-" : "C-");
     if(l <= 0) return pos;
@@ -882,10 +870,7 @@
   }
 
   if(key->modifiers & TERMKEY_KEYMOD_ALT) {
-    int altismeta = format & TERMKEY_FORMAT_ALTISMETA;
-
-    l = snprintf(buffer + pos, len - pos, longmod ? ( altismeta ? "Meta-" : "Alt-" )
-                                                  : ( altismeta ? "M-"    : "A-" ));
+    l = snprintf(buffer + pos, len - pos, longmod ? "Alt-" : "A-");
     if(l <= 0) return pos;
     pos += l;
   }
@@ -896,8 +881,6 @@
     pos += l;
   }
 
-do_codepoint:
-
   switch(key->type) {
   case TERMKEY_TYPE_UNICODE:
     l = snprintf(buffer + pos, len - pos, "%s", key->utf8);

=== modified file 'termkey.h'
--- termkey.h	2008-10-06 21:22:09 +0000
+++ termkey.h	2008-10-06 21:02:12 +0000
@@ -133,9 +133,7 @@
 termkey_keysym termkey_register_csifunc_full(termkey_t *tk, termkey_type type, termkey_keysym sym, int modifier_set, int modifier_mask, int number, const char *name);
 
 typedef enum {
-  TERMKEY_FORMAT_LONGMOD = 1,
-  TERMKEY_FORMAT_CARETCTRL = 2,
-  TERMKEY_FORMAT_ALTISMETA = 4,
+  TERMKEY_FORMAT_LONGMOD = 1
 } termkey_format;
 
 size_t termkey_snprint_key(termkey_t *tk, char *buffer, size_t len, termkey_key *key, termkey_format format);