--- rxvt-unicode/src/command.C	2011/02/11 01:24:46	1.476
+++ rxvt-unicode/src/command.C	2011/03/24 17:34:28	1.481
@@ -27,7 +27,7 @@
  * Copyright (c) 2001      Marius Gedminas
  *				- Ctrl/Mod4+Tab works like Meta+Tab (options)
  * Copyright (c) 2003      Rob McMullen <robm@flipturn.org>
- * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
  * Copyright (c) 2007      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -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,22 +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)
+  size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
+
+  if (!avail)
     {
-      rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
-      n = 0;
+      // normally this indicates a "too long" command sequence - just drop the data we have
+      cmdbuf_ptr  = cmdbuf_base;
+      cmdbuf_endp = cmdbuf_ptr;
+      avail       = CBUFSIZ;
     }
 
-  memmove (cmdbuf_base, cmdbuf_ptr, n);
-  cmdbuf_ptr = cmdbuf_base;
-  cmdbuf_endp = cmdbuf_ptr + n;
-
-  ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
+  ssize_t r = read (pty->pty, cmdbuf_endp, avail);
 
   if (r > 0)
     {
@@ -2693,7 +2693,9 @@
 
         /* kidnapped escape sequence: Should be 8.3.48 */
       case C1_ESA:		/* ESC G */
-        process_graphics ();
+        // used by original rxvt for rob nations own graphics mode
+        if (cmd_getc () == 'Q')
+          tt_printf ("\033G0\012");	/* query graphics - no graphics */
         break;
 
         /* 8.3.63: CHARACTER TABULATION SET */
@@ -3974,25 +3976,6 @@
 }
 /*}}} */
 
-/*{{{ (do not) process Rob Nation's own graphics mode sequences */
-void
-rxvt_term::process_graphics ()
-{
-  unicode_t ch, cmd = cmd_getc ();
-
-  if (cmd == 'Q')
-    {
-      /* query graphics */
-      tt_printf ("\033G0\012");	/* no graphics */
-      return;
-    }
-  /* swallow other graphics sequences until terminating ':' */
-  do
-    ch = cmd_getc ();
-  while (ch != ':');
-}
-/*}}} */
-
 /* ------------------------------------------------------------------------- */
 
 /*
@@ -4030,7 +4013,9 @@
     {
       ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
 
-      if ((unsigned int)written == len)
+      max_it (written, 0);
+
+      if (written == len)
         return;
 
       data += written;