--- rxvt-unicode/src/command.C	2004/02/22 08:09:37	1.50
+++ rxvt-unicode/src/command.C	2004/02/22 20:08:18	1.55
@@ -112,10 +112,19 @@
           if (status_return == XLookupChars
               || status_return == XLookupBoth)
             {
-              wkbuf[len] = 0;
-              len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
-              if (len < 0)
-                len = 0;
+              /* make sure the user can type ctrl-@, i.e. NUL */
+              if (len == 1 && *wkbuf == 0)
+                {
+                  kbuf[0] = 0;
+                  len = 1;
+                }
+              else
+                {
+                  wkbuf[len] = 0;
+                  len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
+                  if (len < 0)
+                    len = 0;
+                }
             }
           else
             len = 0;
@@ -143,12 +152,12 @@
         {
           if (keysym == ks_bigfont)
             {
-              change_font (0, FONT_UP);
+              change_font (FONT_UP);
               return;
             }
           else if (keysym == ks_smallfont)
             {
-              change_font (0, FONT_DN);
+              change_font (FONT_DN);
               return;
             }
         }
@@ -231,10 +240,10 @@
                     return;
                     /* rxvt extras */
                   case XK_KP_Add:	/* Shift+KP_Add = bigger font */
-                    change_font (0, FONT_UP);
+                    change_font (FONT_UP);
                     return;
                   case XK_KP_Subtract:	/* Shift+KP_Subtract = smaller font */
-                    change_font (0, FONT_DN);
+                    change_font (FONT_DN);
                     return;
                 }
             }
@@ -655,25 +664,23 @@
   /* escape prefix */
   if (meta
 #ifdef META8_OPTION
-      && (meta_char == C0_ESC)
+      && meta_char == C0_ESC
 #endif
      )
     {
       const unsigned char ch = C0_ESC;
-
       tt_write (&ch, 1);
     }
-#ifdef DEBUG_CMD
-  if (debug_key)
-    {		/* Display keyboard buffer contents */
-      char           *p;
-      int             i;
-
-      fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
-      for (i = 0, p = kbuf; i < len; i++, p++)
-        fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
-      fprintf (stderr, "'\n");
-    }
+
+#if defined(DEBUG_CMD)
+  /* Display keyboard buffer contents */
+  unsigned char *p;
+  int i;
+
+  fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
+  for (i = 0, p = kbuf; i < len; i++, p++)
+    fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
+  fprintf (stderr, "'\n");
 #endif				/* DEBUG_CMD */
   tt_write (kbuf, (unsigned int)len);
 }
@@ -2973,6 +2980,7 @@
  *      50 = change font
  *
  * rxvt extensions:
+ *       9 = change locale (NYI)
  *      10 = menu (may change in future)
  *      20 = bg pixmap
  *      39 = change default fg color
@@ -3073,7 +3081,16 @@
       case XTerm_logfile:
         break;
       case XTerm_font:
-        change_font (0, str);
+        change_font (str);
+        break;
+      case XTerm_locale:
+        if (str[0] == '?' && !str[1])
+          tt_printf ("%-.250s\n", locale);
+        else
+          {
+            set_locale (str);
+            im_cb ();
+          }
         break;
 #if 0
       case XTerm_dumpscreen:	/* no error notices */