--- rxvt-unicode/src/command.C	2011/03/07 11:48:55	1.480
+++ rxvt-unicode/src/command.C	2011/04/26 16:19:45	1.483
@@ -938,39 +938,6 @@
 #endif
 }
 
-#if defined (KEYSYM_RESOURCE)
-unsigned int
-rxvt_term::cmd_write (const char *str, unsigned int count)
-{
-  unsigned int n, s;
-
-  n = cmdbuf_ptr - cmdbuf_base;
-  s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
-
-  if (n > 0 && s < count)
-    {
-      memmove (cmdbuf_base, cmdbuf_ptr,
-              (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
-      cmdbuf_ptr = cmdbuf_base;
-      cmdbuf_endp -= n;
-      s += n;
-    }
-
-  if (count > s)
-    {
-      rxvt_warn ("data loss: cmd_write too large, continuing.\n");
-      count = s;
-    }
-
-  for (; count--;)
-    *cmdbuf_endp++ = *str++;
-
-  cmd_parse ();
-
-  return 0;
-}
-#endif
-
 void
 rxvt_term::flush ()
 {
@@ -1154,19 +1121,55 @@
 } event_handler;
 #endif
 
+/* make sure all the cmd data is at beginning of cmdbuf */
+void
+rxvt_term::cmdbuf_reify ()
+{
+  if (cmdbuf_ptr == cmdbuf_base)
+    return;
+
+  ssize_t used = cmdbuf_endp - cmdbuf_ptr;
+
+  memmove (cmdbuf_base, cmdbuf_ptr, used);
+  cmdbuf_ptr  = cmdbuf_base;
+  cmdbuf_endp = cmdbuf_ptr + used;
+
+}
+
+#if defined (KEYSYM_RESOURCE)
+void
+rxvt_term::cmdbuf_append (const char *str, size_t count)
+{
+  cmdbuf_reify ();
+
+  size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
+
+  if (count > avail)
+    return;
+
+  memcpy (cmdbuf_endp, str, count);
+  cmdbuf_endp += count;
+
+  cmd_parse ();
+}
+#endif
+
 bool
 rxvt_term::pty_fill ()
 {
-  ssize_t n = cmdbuf_endp - cmdbuf_ptr;
+  cmdbuf_reify ();
 
-  if (CBUFSIZ == n)
-    n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
+  size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
 
-  memmove (cmdbuf_base, cmdbuf_ptr, n);
-  cmdbuf_ptr = cmdbuf_base;
-  cmdbuf_endp = cmdbuf_ptr + n;
+  if (!avail)
+    {
+      // normally this indicates a "too long" command sequence - just drop the data we have
+      cmdbuf_ptr  = cmdbuf_base;
+      cmdbuf_endp = cmdbuf_ptr;
+      avail       = CBUFSIZ;
+    }
 
-  ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
+  ssize_t r = read (pty->pty, cmdbuf_endp, avail);
 
   if (r > 0)
     {
@@ -1444,7 +1447,7 @@
         break;
 
       case ConfigureNotify:
-        if (ev.xconfigure.window == parent[0])
+        if (ev.xconfigure.window == parent)
           {
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
               ;
@@ -1720,10 +1723,10 @@
   if (enable == urgency_hint)
     return;
 
-  if (XWMHints *h = XGetWMHints (dpy, parent[0]))
+  if (XWMHints *h = XGetWMHints (dpy, parent))
     {
       h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
-      XSetWMHints (dpy, parent[0], h);
+      XSetWMHints (dpy, parent, h);
       urgency_hint = enable;
     }
 }
@@ -2388,11 +2391,6 @@
 
 static class out_of_input out_of_input;
 
-/* rxvt_cmd_getc () - Return next input character */
-/*
- * Return the next input character after first passing any keyboard input
- * to the command.
- */
 wchar_t
 rxvt_term::cmd_getc () THROW ((class out_of_input))
 {
@@ -3121,22 +3119,22 @@
        * commands
        */
       case 1:			/* deiconify window */
-        XMapWindow (dpy, parent[0]);
+        XMapWindow (dpy, parent);
         break;
       case 2:			/* iconify window */
-        XIconifyWindow (dpy, parent[0], display->screen);
+        XIconifyWindow (dpy, parent, display->screen);
         break;
       case 3:			/* set position (pixels) */
-        XMoveWindow (dpy, parent[0], args[1], args[2]);
+        XMoveWindow (dpy, parent, args[1], args[2]);
         break;
       case 4:			/* set size (pixels) */
         set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
         break;
       case 5:			/* raise window */
-        XRaiseWindow (dpy, parent[0]);
+        XRaiseWindow (dpy, parent);
         break;
       case 6:			/* lower window */
-        XLowerWindow (dpy, parent[0]);
+        XLowerWindow (dpy, parent);
         break;
       case 7:			/* refresh window */
         scr_touch (true);
@@ -3157,18 +3155,18 @@
        * reports - some output format copied from XTerm
        */
       case 11:			/* report window state */
-        XGetWindowAttributes (dpy, parent[0], &wattr);
+        XGetWindowAttributes (dpy, parent, &wattr);
         tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
         break;
       case 13:			/* report window position */
-        XGetWindowAttributes (dpy, parent[0], &wattr);
-        XTranslateCoordinates (dpy, parent[0], wattr.root,
+        XGetWindowAttributes (dpy, parent, &wattr);
+        XTranslateCoordinates (dpy, parent, wattr.root,
                                -wattr.border_width, -wattr.border_width,
                                &x, &y, &wdummy);
         tt_printf ("\033[3;%d;%dt", x, y);
         break;
       case 14:			/* report window size (pixels) */
-        XGetWindowAttributes (dpy, parent[0], &wattr);
+        XGetWindowAttributes (dpy, parent, &wattr);
         tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
         break;
       case 18:			/* report text area size (chars) */
@@ -3180,7 +3178,7 @@
       case 20:			/* report icon label */
         {
           char *s;
-          XGetIconName (dpy, parent[0], &s);
+          XGetIconName (dpy, parent, &s);
           tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : "");	/* 8bit ST */
           XFree (s);
         }
@@ -3188,7 +3186,7 @@
       case 21:			/* report window title */
         {
           char *s;
-          XFetchName (dpy, parent[0], &s);
+          XFetchName (dpy, parent, &s);
           tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : "");	/* 8bit ST */
           XFree (s);
         }
@@ -3352,7 +3350,7 @@
             const char *str = "";
 
             if (prop
-                && XGetWindowProperty (dpy, parent[0],
+                && XGetWindowProperty (dpy, parent,
                                        prop, 0, 1<<16, 0, AnyPropertyType,
                                        &actual_type, &actual_format,
                                        &nitems, &bytes_after, &value) == Success
@@ -3374,7 +3372,7 @@
                 set_utf8_property (display->atom (str), eq + 1);
               }
             else
-              XDeleteProperty (dpy, parent[0],
+              XDeleteProperty (dpy, parent,
                                display->atom (str));
           }
         break;