[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.245 by root, Fri Jan 6 18:33:30 2006 UTC

 #endif
           /* nil */ ;
         }
     }
-  if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
+  if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
     return;
   if (len <= 0)
     return;			/* not mapped */
 bool
 rxvt_term::cmd_parse ()
 {
   bool flag = false;
-  unicode_t ch = NOCHAR;
+  wchar_t ch = NOCHAR;
   char *seq_begin; // remember start of esc-sequence here
   for (;;)
     {
       if (ch == NOCHAR)
               if (seen_resize && cmd_pid)
                 kill (-cmd_pid, SIGWINCH);
             }
           /* Read a text string from the input buffer */
-          unicode_t buf[UBUFSIZ];
+          wchar_t buf[UBUFSIZ];
           bool refreshnow = false;
           int nlines = 0;
-          unicode_t *str = buf;
+          wchar_t *str = buf;
-          unicode_t *eol = str + min (ncol, UBUFSIZ);
+          wchar_t *eol = str + min (ncol, UBUFSIZ);
           for (;;)
             {
               if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
                 break;
                     }
                   // scr_add_lines only works for nlines <= nrow - 1.
                   if (nlines >= nrow - 1)
                     {
-                      if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
+                      if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
-                        scr_add_lines (buf, nlines, str - buf);
+                        scr_add_lines (buf, str - buf, nlines);
                       nlines = 0;
                       str = buf;
                       eol = str + min (ncol, UBUFSIZ);
                     }
               seq_begin = cmdbuf_ptr;
               ch = next_char ();
             }
-          if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
+          if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
-            scr_add_lines (buf, nlines, str - buf);
+            scr_add_lines (buf, str - buf, nlines);
           /*
            * If there have been a lot of new lines, then update the screen
            * What the heck I'll cheat and only refresh less than every page-full.
            * the number of pages between refreshes is refresh_limit, which
     }
   return flag;
 }
+// read the next character
+wchar_t
+rxvt_term::next_char ()
+{
+  while (cmdbuf_ptr < cmdbuf_endp)
+    {
+      // assume 7-bit to be ascii ALWAYS
+      if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
+        return *cmdbuf_ptr++;
+      wchar_t wc;
+      size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
+      if (len == (size_t)-2)
+        {
+          // the mbstate stores incomplete sequences. didn't know this :/
+          cmdbuf_ptr = cmdbuf_endp;
+          break;
+        }
+      if (len == (size_t)-1)
+        return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
+      // assume wchar == unicode
+      cmdbuf_ptr += len;
+      return wc & UNICODE_MASK;
+    }
+  return NOCHAR;
+}
 // read the next octet
-unicode_t
+uint32_t
 rxvt_term::next_octet ()
 {
   return cmdbuf_ptr < cmdbuf_endp
          ? *cmdbuf_ptr++
          : NOCHAR;
-}
-// read the next character
-unicode_t
-rxvt_term::next_char ()
-{
-  while (cmdbuf_ptr < cmdbuf_endp)
-    {
-      // assume 7-bit to be ascii ALWAYS
-      if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
-        return *cmdbuf_ptr++;
-      wchar_t wc;
-      size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
-      if (len == (size_t)-2)
-        {
-          // the mbstate stores incomplete sequences. didn't know this :/
-          cmdbuf_ptr = cmdbuf_endp;
-          break;
-        }
-      if (len == (size_t)-1)
-        return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
-      // assume wchar == unicode
-      cmdbuf_ptr += len;
-      return wc & UNICODE_MASK;
-    }
-  return NOCHAR;
 }
 /* rxvt_cmd_getc () - Return next input character */
 /*
  * Return the next input character after first passing any keyboard input
  * to the command.
  */
-unicode_t
+wchar_t
 rxvt_term::cmd_getc ()
 {
-  unicode_t c = next_char ();
+  wchar_t c = next_char ();
   if (c == NOCHAR)
     throw out_of_input;
   return c;
 }
-unicode_t
+uint32_t
 rxvt_term::cmd_get8 ()
 {
-  unicode_t c = next_octet ();
+  uint32_t c = next_octet ();
   if (c == NOCHAR)
     throw out_of_input;
   return c;
         break;
         /* 8.3.87: NEXT LINE */
       case C1_NEL:		/* ESC E */
         {
-          unicode_t nlcr[] = { C0_LF, C0_CR };
+          wchar_t nlcr[] = { C0_LF, C0_CR };
-          scr_add_lines (nlcr, 1, 2);
+          scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
         }
         break;
         /* kidnapped escape sequence: Should be 8.3.48 */
       case C1_ESA:		/* ESC G */
         break;
 #endif
 #if ENABLE_PERL
       case URxvt_perl:
-        if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
+        if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
           ; // no responses yet
         break;
 #endif
     }
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.244 by root, Fri Jan 6 17:09:27 2006 UTC vs. Revision 1.245 by root, Fri Jan 6 18:33:30 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.245 by root, Fri Jan 6 18:33:30 2006 UTC