--- rxvt-unicode/src/command.C	2008/10/15 17:16:47	1.421
+++ rxvt-unicode/src/command.C	2008/11/04 23:46:22	1.424
@@ -1193,9 +1193,8 @@
 
   if (revents & ev::READ)
     // loop, but don't allow a single term to monopolize us
-    while (pty_fill ())
-      if (cmd_parse ())
-        break;
+    for (int i = CBUFCNT; i-- && pty_fill (); )
+      cmd_parse ();
 
   if (revents & ev::WRITE)
     pty_write ();
@@ -2187,10 +2186,9 @@
 
 /*}}} */
 
-bool
+void
 rxvt_term::cmd_parse ()
 {
-  bool flag = false;
   wchar_t ch = NOCHAR;
   char *seq_begin; // remember start of esc-sequence here
 
@@ -2294,11 +2292,9 @@
            */
           if (refreshnow)
             {
-              flag = true;
               scr_refresh ();
               want_refresh = 1;
             }
-
         }
       else
         {
@@ -2316,8 +2312,6 @@
           ch = NOCHAR;
         }
     }
-
-  return flag;
 }
 
 // read the next character
@@ -2696,17 +2690,17 @@
         tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
         break;			/* steal obsolete ESC [ c */
 
-        /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
+        /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
       case C1_CSI:		/* ESC [ */
         process_csi_seq ();
         break;
 
-        /* 8.3.90: OPERATING SYSTEM COMMAND */
+        /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
       case C1_OSC:		/* ESC ] */
         process_osc_seq ();
         break;
 
-        /* 8.3.106: RESET TO INITIAL STATE */
+        /* 8.3.106: RESET TO INITIAL STATE (RIS) */
       case 'c':
         mbstate.reset ();
         scr_poweron ();
@@ -2771,9 +2765,9 @@
 
   priv = 0;
   ch = cmd_getc ();
-  if (ch >= '<' && ch <= '?')
+  if ((ch >= '<' && ch <= '?') || ch == '!')
     {
-      /* '<' '=' '>' '?' */
+      /* '<' '=' '>' '?' '!' */
       priv = ch;
       ch = cmd_getc ();
     }
@@ -2837,7 +2831,22 @@
             if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
               process_terminal_mode (ch, priv, nargs, arg);
             break;
+
+          case '!':
+            if (ch == CSI_70)
+              {
+                /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
+                scr_soft_reset ();
+
+                static const int pm_h[] = { 7, 25 };
+                static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
+
+                process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
+                process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
+              }
+          break;
         }
+
       return;
     }