--- rxvt-unicode/src/command.C	2011/04/29 13:08:24	1.485
+++ rxvt-unicode/src/command.C	2011/07/09 18:23:48	1.490
@@ -259,22 +259,19 @@
 void
 rxvt_term::commit_iso14755 ()
 {
-  wchar_t ch[2];
-
-  ch[0] = iso14755buf & ISO_14755_MASK;
-  ch[1] = 0;
+  wchar_t ch = iso14755buf & ISO_14755_MASK;
 
   if (iso14755buf & ISO_14755_51)
     {
-      char mb[16];
+      char mb[MB_LEN_MAX];
       int len;
 
       // allow verbatim 0-bytes and control-bytes to be entered
-      if (ch[0] >= 0x20)
-        len = wcstombs (mb, ch, 16);
+      if (ch >= 0x20)
+        len = wctomb (mb, ch);
       else
         {
-          mb[0] = ch[0];
+          mb[0] = ch;
           len = 1;
         }
 
@@ -992,7 +989,7 @@
       scr_refresh ();
       scrollBar.show (1);
 #ifdef USE_XIM
-      IMSendSpot ();
+      im_send_spot ();
 #endif
     }
 
@@ -1741,7 +1738,7 @@
 #if USE_XIM
       if (Input_Context != NULL)
         {
-          IMSetPosition ();
+          im_set_position ();
           XSetICFocus (Input_Context);
         }
 #endif
@@ -2224,7 +2221,7 @@
 
   for (;;)
     {
-      if (expect_false (ch == NOCHAR))
+      if (ecb_unlikely (ch == NOCHAR))
         {
           seq_begin = cmdbuf_ptr;
           ch = next_char ();
@@ -2233,9 +2230,9 @@
             break;
         }
 
-      if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
+      if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
         {
-          if (expect_false (!seen_input))
+          if (ecb_unlikely (!seen_input))
             {
               seen_input = 1;
               // many badly-written programs (e.g. jed) contain a race condition:
@@ -2258,12 +2255,12 @@
 
           for (;;)
             {
-              if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
+              if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
                 break;
 
               *str++ = ch;
 
-              if (expect_false (ch == C0_LF || str >= eol))
+              if (ecb_unlikely (ch == C0_LF || str >= eol))
                 {
                   if (ch == C0_LF)
                     nlines++;
@@ -2351,7 +2348,7 @@
   while (cmdbuf_ptr < cmdbuf_endp)
     {
       // assume 7-bit to be ascii ALWAYS
-      if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
+      if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
         return *cmdbuf_ptr++;
 
       wchar_t wc;
@@ -2629,7 +2626,6 @@
 
   switch (ch)
     {
-        /* case 1:        do_tek_mode (); break; */
       case '#':
         if (cmd_getc () == '8')
           scr_E ();
@@ -2662,6 +2658,7 @@
         scr_forwardindex ();
         break;
 #endif
+      // DECPAM/DECPNM
       case '=':
       case '>':
         set_privmode (PrivMode_aplKP, ch == '=');
@@ -2678,7 +2675,7 @@
       case C1_NEL:		/* ESC E */
         {
           wchar_t nlcr[] = { C0_LF, C0_CR };
-          scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
+          scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
         }
         break;
 
@@ -2700,10 +2697,10 @@
         break;
 
         /* 8.3.142: SINGLE-SHIFT TWO */
-      /*case C1_SS2: scr_single_shift (2);   break; */
+      /* case C1_SS2: break; */
 
         /* 8.3.143: SINGLE-SHIFT THREE */
-      /*case C1_SS3: scr_single_shift (3);   break; */
+      /* case C1_SS3: break; */
 
         /* 8.3.27: DEVICE CONTROL STRING */
       case C1_DCS:		/* ESC P */
@@ -2864,8 +2861,8 @@
                 static const int pm_h[] = { 7, 25 };
                 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
 
-                process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
-                process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
+                process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
+                process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
               }
           break;
         }
@@ -3610,7 +3607,7 @@
 
 /* we're not using priv _yet_ */
 void
-rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
+rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
 {
   unsigned int i, j;
   int state;
@@ -3621,7 +3618,7 @@
     const unsigned long bit;
   } argtopriv[] = {
                   { 1, PrivMode_aplCUR },       // DECCKM
-                  { 2, PrivMode_vt52 },
+                  { 2, PrivMode_vt52 },         // DECANM
                   { 3, PrivMode_132 },          // DECCOLM
                   { 4, PrivMode_smoothScroll }, // DECSCLM
                   { 5, PrivMode_rVideo },       // DECSCNM
@@ -3631,7 +3628,7 @@
                   { 9, PrivMode_MouseX10 },
                  // 18 end FF to printer after print screen
                  // 19 Print screen prints full screen/scroll region
-                  { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
+                  { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
 #ifdef scrollBar_esc
                   { scrollBar_esc, PrivMode_scrollBar },
 #endif
@@ -3642,7 +3639,7 @@
                  // 45 margin bell NYI
                  // 46 start logging
                   { 47, PrivMode_Screen },
-                  { 66, PrivMode_aplKP },       // DECPAM/DECPNM
+                  { 66, PrivMode_aplKP },       // DECNKM
 #ifndef NO_BACKSPACE_KEY
                   { 67, PrivMode_BackSpace },   // DECBKM
 #endif
@@ -3681,7 +3678,7 @@
       state = -1;
 
       /* basic handling */
-      for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
+      for (j = 0; j < ecb_array_length (argtopriv); j++)
         if (argtopriv[j].argval == arg[i])
           {
             state = privcases (mode, argtopriv[j].bit);