--- rxvt-unicode/src/command.C	2005/02/20 02:00:43	1.199
+++ rxvt-unicode/src/command.C	2005/08/11 02:05:07	1.206
@@ -165,9 +165,11 @@
 {
   rxvt_fontset *fs = FONTSET (r);
   rxvt_font *f = (*fs)[fs->find_font (ch)];
-  wchar_t *chr, *alloc, ch2;
+  wchar_t *chr, *alloc, ch2, *fname;
   int len;
 
+  fname = rxvt_utf8towcs (f->name);
+
 #if ENABLE_COMBINING
   if (IS_COMPOSE (ch))
     {
@@ -185,7 +187,7 @@
       len = 1;
     }
 
-  int width = strlen (f->name);
+  int width = wcswidth (fname, wcslen (fname));
 
   scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
 
@@ -208,7 +210,9 @@
       scr_overlay_set (12, y, NOCHAR, r);
     }
 
-  scr_overlay_set (0, len, f->name);
+  scr_overlay_set (0, len, fname);
+
+  free (fname);
 
 #if ENABLE_COMBINING
   if (alloc)
@@ -318,9 +322,11 @@
           // at the point of XOpenIM, so temporarily switch locales
           if (rs[Rs_imLocale])
             SET_LOCALE (rs[Rs_imLocale]);
+
           // assume wchar_t == unicode or better
           len = XwcLookupString (Input_Context, &ev, wkbuf,
                                  KBUFSZ, &keysym, &status_return);
+
           if (rs[Rs_imLocale])
             SET_LOCALE (locale);
 
@@ -1332,12 +1338,19 @@
 
       case ClientMessage:
         if (ev.xclient.format == 32
-            && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
-            && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
-           destroy ();
+            && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
+          {
+            if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
+              destroy ();
+#if ENABLE_EWMH
+            else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
+              XSendEvent (disp, ev.xclient.window = display->root,
+                          False, SubstructureRedirectMask | SubstructureNotifyMask,
+                          &ev);
+#endif
+          }
 #if ENABLE_XEMBED
-        else if (ev.xclient.format == 32
-                 && ev.xclient.message_type == xa[XA_XEMBED])
+        else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
           {
             if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
               focus_in ();
@@ -1641,18 +1654,18 @@
     {
       TermWin.focus = 1;
       want_refresh = 1;
-#ifdef USE_XIM
+#if USE_XIM
       if (Input_Context != NULL)
         {
           IMSetStatusPosition ();
           XSetICFocus (Input_Context);
         }
 #endif
-#ifdef CURSOR_BLINK
+#if CURSOR_BLINK
       if (options & Opt_cursorBlink)
         cursor_blink_ev.start (NOW + BLINK_INTERVAL);
 #endif
-#ifdef OFF_FOCUS_FADING
+#if OFF_FOCUS_FADING
       if (rs[Rs_fade])
         {
           pix_colors = pix_colors_focused;
@@ -1676,16 +1689,16 @@
 #if ENABLE_OVERLAY
       scr_overlay_off ();
 #endif
-#ifdef USE_XIM
+#if USE_XIM
       if (Input_Context != NULL)
         XUnsetICFocus (Input_Context);
 #endif
-#ifdef CURSOR_BLINK
+#if CURSOR_BLINK
       if (options & Opt_cursorBlink)
         cursor_blink_ev.stop ();
       hidden_cursor = 0;
 #endif
-#ifdef OFF_FOCUS_FADING
+#if OFF_FOCUS_FADING
       if (rs[Rs_fade])
         {
           pix_colors = pix_colors_unfocused;
@@ -2635,6 +2648,7 @@
           bool refreshnow = false;
           int nlines = 0;
           unicode_t *str = buf;
+          unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
 
           for (;;)
             {
@@ -2643,9 +2657,11 @@
 
               *str++ = ch;
 
-              if (ch == C0_LF)
+              if (ch == C0_LF || str >= eol)
                 {
-                  nlines++;
+                  if (ch == C0_LF)
+                    nlines++;
+
                   refresh_count++;
 
                   if (!(options & Opt_jumpScroll)
@@ -2662,13 +2678,20 @@
                       scr_add_lines (buf, nlines, str - buf);
                       nlines = 0;
                       str = buf;
+                      eol = str + min (TermWin.ncol, UBUFSIZ);
+                    }
+
+                  if (str >= eol)
+                    {
+                      if (eol >= buf + UBUFSIZ)
+                        {
+                          ch = NOCHAR;
+                          break;
+                        }
+                      else
+                        eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
                     }
-                }
 
-              if (str >= buf + UBUFSIZ)
-                {
-                  ch = NOCHAR;
-                  break;
                 }
 
               seq_begin = cmdbuf_ptr;
@@ -3583,7 +3606,7 @@
 
       seen_esc = false;
 
-      if (n >= sizeof (string) - 1)
+      if (n >= STRING_MAX - 1)
         // stop at some sane length
         return NULL;
 
@@ -3661,28 +3684,6 @@
 
 /*
  * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
- *       0 = change iconName/title
- *       1 = change iconName
- *       2 = change title
- *       4 = change color
- *      10 = change fg color
- *      11 = change bg color
- *      12 = change text color
- *      13 = change mouse foreground color 
- *      17 = change highlight character colour
- *      18 = change bold character color
- *      19 = change underlined character color 
- *      46 = change logfile (not implemented)
- *      50 = change font
- *
- * rxvt extensions:
- *      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
- *     703 = menu
  */
 void
 rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
@@ -3791,19 +3792,19 @@
       case XTerm_Color_BD:
         process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
         break;
-      case XTerm_Color_IT:
-        process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
-        break;
       case XTerm_Color_UL:
         process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
         break;
       case XTerm_Color_RV:
         process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
         break;
+      case URxvt_Color_IT:
+        process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
+        break;
 #endif
 #if TRANSPARENT && TINTING
-      case XTerm_Color_tint:
-        process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
+      case URxvt_Color_tint:
+        process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
         check_our_parents ();
         if (am_transparent)
           want_full_refresh = want_refresh = 1;
@@ -3847,6 +3848,24 @@
         // TODO, when secure mode?
         break;
 
+#ifdef MENUBAR
+     case URxvt_Menu:
+       if (options & Opt_insecure)
+         menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
+       break;
+#endif
+#if 0
+      case XTerm_dumpscreen:	/* no error notices */
+        {
+          int fd;
+          if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
+            {
+              scr_dump (fd);
+              close (fd);
+            }
+        }
+        break;
+#endif
       case XTerm_font:
         op = URxvt_font;
       case URxvt_font:
@@ -3871,9 +3890,9 @@
         break;
 
 #if ENABLE_FRILLS
-      case XTerm_locale:
+      case URxvt_locale:
         if (query)
-          tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
+          tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
         else
           {
             set_locale (str);
@@ -3881,24 +3900,18 @@
             init_xlocale ();
           }
         break;
-#endif
 
-#ifdef MENUBAR
-     case XTerm_Menu:
-       if (options & Opt_insecure)
-         menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
-       break;
-#endif
-#if 0
-      case XTerm_dumpscreen:	/* no error notices */
-        {
-          int fd;
-          if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
-            {
-              scr_dump (fd);
-              close (fd);
-            }
-        }
+      case URxvt_view_up:
+      case URxvt_view_down:
+        int lines = atoi (str);
+
+        if (lines)
+          scr_page (op == URxvt_view_up ? UP : DN, lines);
+        else
+          {
+            scr_erase_savelines ();
+          }
+
         break;
 #endif
     }