--- rxvt-unicode/src/command.C	2004/02/24 16:25:44	1.57
+++ rxvt-unicode/src/command.C	2004/03/11 00:53:19	1.67
@@ -293,35 +293,11 @@
                       }
                     else
                       STRCPY (kbuf, key_backspace);
-# ifdef MULTICHAR_SET
-                    if ((Options & Opt_mc_hack) && screen.cur.col > 0)
-                      {
-                        int             col, row;
-
-                        newlen = STRLEN (kbuf);
-                        col = screen.cur.col - 1;
-                        row = screen.cur.row + TermWin.saveLines;
-                        if (IS_MULTI2 (screen.rend[row][col]))
-                          MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
-                      }
-# endif
                     break;
 #endif
 #ifndef NO_DELETE_KEY
                   case XK_Delete:
                     STRCPY (kbuf, key_delete);
-# ifdef MULTICHAR_SET
-                    if (Options & Opt_mc_hack)
-                      {
-                        int             col, row;
-
-                        newlen = STRLEN (kbuf);
-                        col = screen.cur.col;
-                        row = screen.cur.row + TermWin.saveLines;
-                        if (IS_MULTI1 (screen.rend[row][col]))
-                          MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
-                      }
-# endif
                     break;
 #endif
                   case XK_Tab:
@@ -373,41 +349,6 @@
                       }
                     else if (PrivateModes & PrivMode_aplCUR)
                       kbuf[1] = 'O';
-#ifdef MULTICHAR_SET
-                    //TODO: ??
-                    if (Options & Opt_mc_hack)
-                      {
-                        int             col, row, m;
-
-                        col = screen.cur.col;
-                        row = screen.cur.row + TermWin.saveLines;
-                        m = 0;
-                        if (keysym == XK_Right
-                            && IS_MULTI1 (screen.rend[row][col]))
-                          m = 1;
-                        else if (keysym == XK_Left)
-                          {
-                            if (col > 0)
-                              {
-                                if (IS_MULTI2 (screen.rend[row][col - 1]))
-                                  m = 1;
-                              }
-                            else if (screen.cur.row > 0)
-                              {
-                                col = screen.tlen[--row];
-                                if (col == -1)
-                                  col = TermWin.ncol - 1;
-                                else
-                                  col--;
-                                if (col > 0
-                                    && IS_MULTI2 (screen.rend[row][col]))
-                                  m = 1;
-                              }
-                          }
-                        if (m)
-                          MEMMOVE (kbuf + 3, kbuf, 3 + 1);
-                      }
-#endif
                     break;
 
 #ifndef UNSHIFTED_SCROLLKEYS
@@ -944,14 +885,20 @@
 {
   while (cmdbuf_ptr < cmdbuf_endp)
     {
-      if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
+      // assume 0x20 .. 0x7f to be ascii ALWAYS (all shift-states etc.) uh-oh
+      if ((*cmdbuf_ptr <= 0x7f && 0x20 <= *cmdbuf_ptr)
+          || !*cmdbuf_ptr)
         return *cmdbuf_ptr++;
 
       wchar_t wc;
       size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
 
       if (len == (size_t)-2)
-        return NOCHAR;
+        {
+          // the mbstate stores incomplete sequences. didn't know this :/
+          cmdbuf_ptr = cmdbuf_endp;
+          break;
+        }
 
       if (len == (size_t)-1)
         return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
@@ -1989,30 +1936,33 @@
       /*
        * Copy display->root pixmap transparency
        */
-      int             sx, sy, nx, ny;
-      unsigned int    nw, nh;
-      Window          cr;
-      XImage         *image;
-      GC              gc;
-      XGCValues       gcvalue;
+      int sx, sy, nx, ny;
+      unsigned int nw, nh;
+      Window cr;
+      XImage *image;
+      GC gc;
+      XGCValues gcvalue;
 
       XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
                             0, 0, &sx, &sy, &cr);
       nw = (unsigned int)szHint.width;
       nh = (unsigned int)szHint.height;
       nx = ny = 0;
+
       if (sx < 0)
         {
           nw += sx;
           nx = -sx;
           sx = 0;
         }
+
       if (sy < 0)
         {
           nh += sy;
           ny = -sy;
           sy = 0;
         }
+
       MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
       MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
       allowedxerror = -1;
@@ -2055,6 +2005,7 @@
           am_transparent = am_pixmap_trans = 1;
         }
     }
+
   if (!am_pixmap_trans)
     {
       unsigned int    n;
@@ -2079,7 +2030,9 @@
           if (oldp != TermWin.parent[i])
             pchanged = 1;
         }
+
       n = 0;
+
       if (pchanged)
         {
           for (; n < (unsigned int)i; n++)
@@ -2093,6 +2046,7 @@
                 }
             }
         }
+
       if (n > (int) (sizeof (TermWin.parent)
                     / sizeof (TermWin.parent[0])))
         {
@@ -2125,6 +2079,7 @@
                                      ParentRelative);
           am_transparent = 1;
         }
+
       for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
         TermWin.parent[i] = None;
     }
@@ -2140,7 +2095,7 @@
 FILE *
 rxvt_term::popen_printer ()
 {
-  FILE           *stream = popen (rs[Rs_print_pipe], "w");
+  FILE *stream = popen (rs[Rs_print_pipe], "w");
 
   if (stream == NULL)
     rxvt_print_error ("can't open printer pipe");
@@ -2362,11 +2317,6 @@
       case '+':
         scr_charset_set (3, (unsigned int)cmd_getc ());
         break;
-#ifdef MULTICHAR_SET
-      case '$':
-        scr_charset_set (-2, (unsigned int)cmd_getc ());
-        break;
-#endif
 #ifndef NO_FRILLS
       case '6':
         scr_backindex ();
@@ -2717,7 +2667,7 @@
               break;
 #endif
             case 8:			/* unofficial extension */
-              xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
+              xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
               break;
           }
         break;
@@ -2996,12 +2946,13 @@
  *      50 = change font
  *
  * rxvt extensions:
- *       9 = change locale (NYI)
  *      10 = menu (may change in future)
  *      20 = bg pixmap
  *      39 = change default fg color
  *      49 = change default bg color
  *      55 = dump scrollback buffer and all of screen
+ *     701 = change locale
+ *     702 = find font
  */
 void
 rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
@@ -3099,15 +3050,25 @@
       case XTerm_font:
         change_font (str);
         break;
+#ifndef NO_FRILLS
       case XTerm_locale:
         if (str[0] == '?' && !str[1])
           tt_printf ("%-.250s\n", locale);
         else
           {
             set_locale (str);
+# ifdef USE_XIM
             im_cb ();
+# endif
           }
         break;
+      case XTerm_findfont:
+        {
+          int fid = TermWin.fontset->find_font (atoi (str));
+          tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
+        }
+        break;
+#endif
 #if 0
       case XTerm_dumpscreen:	/* no error notices */
         {
@@ -3245,8 +3206,7 @@
             break;
           case 3:			/* 80/132 */
             if (PrivateModes & PrivMode_132OK)
-              set_widthheight (		    (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
-                                     (unsigned int)TermWin.height);
+              set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
             break;
           case 4:			/* smooth scrolling */
             if (state)