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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.232 by root, Wed Jan 4 01:10:08 2006 UTC vs.
Revision 1.240 by root, Fri Jan 6 03:40:19 2006 UTC

           mb[0] = ch[0];
           len = 1;
         }
       if (len > 0)
-        tt_write ((unsigned char *)mb, len);
+        tt_write (mb, len);
       else
         scr_bell ();
     }
   iso14755buf = 0;
   KeySym keysym;
 #ifdef DEBUG_CMD
   static int debug_key = 1;	/* accessible by a debugger only */
 #endif
   int valid_keysym;
-  unsigned char kbuf[KBUFSZ];
+  char kbuf[KBUFSZ];
   /*
    * use Num_Lock to toggle Keypad on/off.  If Num_Lock is off, allow an
    * escape sequence to toggle the Keypad.
    *
       Status status_return;
 #if 0
 #ifdef X_HAVE_UTF8_STRING
       if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
-        len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
+        len = Xutf8LookupString (Input_Context, &ev, kbuf,
                                  KBUFSZ, &keysym, &status_return);
       else
 #endif
 #endif
         {
                      || status_return == XLookupBoth;
     }
   else
 #endif
     {
-      len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
+      len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
       valid_keysym = keysym != NoSymbol;
     }
   if (valid_keysym)
     {
         {
 #ifdef META8_OPTION
           /* set 8-bit on */
           if (meta && (meta_char == 0x80))
             {
-              unsigned char  *ch;
+              char *ch;
               for (ch = kbuf; ch < kbuf + len; ch++)
                 *ch |= 0x80;
               meta = 0;
             }
 #endif
           /* nil */ ;
         }
     }
+  if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
+    return;
   if (len <= 0)
     return;			/* not mapped */
   if (OPTION (Opt_scrollTtyKeypress))
 #ifdef META8_OPTION
       && meta_char == C0_ESC
 #endif
      )
     {
-      const unsigned char ch = C0_ESC;
+      const char ch = C0_ESC;
       tt_write (&ch, 1);
     }
 #if defined(DEBUG_CMD)
   /* Display keyboard buffer contents */
 #if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
 /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
 /* attempt to `write' count to the input buffer */
 unsigned int
-rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
+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;
     }
 #endif
   if (want_refresh)
     {
+      if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
+        {
+          int row = -view_start;
+          while (row > -nsaved && ROW (row - 1).is_longer ())
+            --row;
+          while (row < -view_start + nrow)
+            {
+              int start_row = row;
+              line_t *l;
+              do
+                {
+                  l = &ROW (row);
+                  if (!(l->f & LINE_FILTERED))
+                    {
+                      // line not filtered, mark it as filtered
+                      l->f |= LINE_FILTERED;
+                      while (l->is_longer ())
+                        {
+                          l = &ROW (++row);
+                          l->f |= LINE_FILTERED;
+                        }
+                      // and filter it
+                      HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
+                      break;
+                    }
+                }
+              while (l->is_longer ());
+              row++;
+            }
+        }
       scr_refresh (refresh_type);
       scrollbar_show (1);
 #ifdef USE_XIM
       IMSendSpot ();
 #endif
 {
   ssize_t n = cmdbuf_endp - cmdbuf_ptr;
   if (CBUFSIZ == n)
     {
-      rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
+      rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
       n = 0;
     }
   memmove (cmdbuf_base, cmdbuf_ptr, n);
   cmdbuf_ptr = cmdbuf_base;
         if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
           break;
         if (ev.xany.window == vt)
           {
+            if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
+              ; // nop
-            if (ev.xbutton.state & (Button1Mask | Button3Mask))
+            else if (ev.xbutton.state & (Button1Mask | Button3Mask))
               {
                 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
                   ;
                 XQueryPointer (disp, vt,
   if (!focus)
     {
       focus = 1;
       want_refresh = 1;
-      PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
+      HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
 #if USE_XIM
       if (Input_Context != NULL)
         {
           IMSetStatusPosition ();
   if (focus)
     {
       focus = 0;
       want_refresh = 1;
-      PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
+      HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
 #if ENABLE_FRILLS || ISO_14755
       if (iso14755buf)
         {
           iso14755buf = 0;
       else
         {
           if (ev.button != MEvent.button)
             MEvent.clicks = 0;
-          if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
+          if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
             switch (ev.button)
               {
                 case Button1:
                   /* allow meta + click to select rectangular areas */
                   /* should be done in screen.C */
        */
       if (priv_modes & PrivMode_mouse_report
           && bypass_keystate
           && ev.button == Button1 && MEvent.clicks <= 1)
         selection_extend (ev.x, ev.y, 0);
+      if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
+        return;
       switch (ev.button)
         {
           case Button1:
           case Button3:
 bool
 rxvt_term::cmd_parse ()
 {
   bool flag = false;
   unicode_t ch = NOCHAR;
-  unsigned char *seq_begin; // remember start of esc-sequence here
+  char *seq_begin; // remember start of esc-sequence here
   for (;;)
     {
       if (ch == NOCHAR)
         {
           seq_begin = cmdbuf_ptr;
           ch = next_char ();
-        }
-      if (ch == NOCHAR) // TODO: improve
+          if (ch == NOCHAR)
-        break;
+            break;
+        }
       if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
         {
           if (!seen_input)
             {
                     }
                   // 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)))
-                      scr_add_lines (buf, nlines, str - buf);
+                        scr_add_lines (buf, nlines, str - buf);
                       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)))
-          scr_add_lines (buf, nlines, str - buf);
+            scr_add_lines (buf, nlines, str - buf);
           /*
            * 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
 rxvt_term::next_char ()
 {
   while (cmdbuf_ptr < cmdbuf_endp)
     {
       // assume 7-bit to be ascii ALWAYS
-      if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
+      if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
         return *cmdbuf_ptr++;
       wchar_t wc;
-      size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
+      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;
       case C0_ESC:
         process_escape_seq ();
         break;
       case C0_ENQ:	/* terminal Status */
         if (rs[Rs_answerbackstring])
-          tt_write ((const unsigned char *)rs[Rs_answerbackstring],
+          tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
-                    (unsigned int)strlen (rs[Rs_answerbackstring]));
         else
-          tt_write ((unsigned char *)VT100_ANS,
+          tt_write (VT100_ANS, strlen (VT100_ANS));
-                    (unsigned int)strlen (VT100_ANS));
         break;
       case C0_BEL:	/* bell */
         scr_bell ();
         break;
       case C0_BS:		/* backspace */
         process_dcs_seq ();
         break;
         /* 8.3.110: SINGLE CHARACTER INTRODUCER */
       case C1_SCI:		/* ESC Z */
-        tt_write ((const unsigned char *)ESCZ_ANSWER,
+        tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
-                 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
         break;			/* steal obsolete ESC [ c */
         /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
       case C1_CSI:		/* ESC [ */
         process_csi_seq ();
       case CSI_SU:		/* 8.3.148: (1) SCROLL UP */
         scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
         break;
       case CSI_DA:		/* 8.3.24: (0) DEVICE ATTRIBUTES */
-        tt_write ((const unsigned char *)VT100_ANS,
+        tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
-                  (unsigned int) (sizeof (VT100_ANS) - 1));
         break;
       case CSI_SGR:		/* 8.3.118: (0) SELECT GRAPHIC RENDITION */
         process_sgr_mode (nargs, arg);
         break;
 /*----------------------------------------------------------------------*/
 /*
  * get input up until STRING TERMINATOR (or BEL)
  * ends_how is terminator used. returned input must be free()'d
  */
-unsigned char *
+char *
 rxvt_term::get_to_st (unicode_t &ends_how)
 {
   unicode_t ch;
   bool seen_esc = false;
   unsigned int n = 0;
   string[n++] = '\0';
   ends_how = (ch == 0x5c ? C0_ESC : ch);
-  return (unsigned char *)rxvt_wcstombs (string);
+  return rxvt_wcstombs (string);
 }
 /*----------------------------------------------------------------------*/
 /*
  * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
  */
 void
 rxvt_term::process_dcs_seq ()
 {
-  unsigned char *s;
+  char *s;
   unicode_t eh;
   /*
    * Not handled yet
    */
   for (arg = 0; isdigit (ch); ch = cmd_getc ())
     arg = arg * 10 + (ch - '0');
   if (ch == ';')
     {
-      unsigned char *s = get_to_st (eh);
+      char *s = get_to_st (eh);
       if (s)
         {
-          process_xterm_seq (arg, (char *)s, eh);
+          process_xterm_seq (arg, s, eh);
           free (s);
         }
     }
 }
 void
-rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
+rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
 {
   if (str[0] == '?' && !str[1])
     {
       unsigned short r, g, b;
       pix_colors_focused[color].get (display, r, g, b);
 /*
  * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
  */
 void
-rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
+rxvt_term::process_xterm_seq (int op, const char *str, char resp)
 {
   int changed = 0;
   int color;
   char *buf, *name;
   bool query = str[0] == '?' && !str[1];
         break;
 #endif
 #if ENABLE_PERL
       case URxvt_perl:
-        if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
+        if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
           ; // no responses yet
         break;
 #endif
     }
 }
             scr_color (Color_bg, Color_bg);
             break;
           //case 50: // not variable spacing
-#ifndef NO_BRIGHTCOLOR
+#if ENABLE_FRILLS
           case 90:
           case 91:		/* set bright fg color */
           case 92:
           case 93:
           case 94:
  */
 void
 rxvt_term::tt_printf (const char *fmt,...)
 {
   va_list arg_ptr;
-  unsigned char buf[256];
+  char buf[256];
   va_start (arg_ptr, fmt);
   vsnprintf ((char *)buf, 256, fmt, arg_ptr);
   va_end (arg_ptr);
   tt_write (buf, strlen (buf));
  * or generated by us in response to a query ESC sequence.
  */
 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
 void
-rxvt_term::tt_write (const unsigned char *data, unsigned int len)
+rxvt_term::tt_write (const char *data, unsigned int len)
 {
+  if (pty.pty < 0)
+    return;
   if (v_buflen == 0)
     {
       ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
       if ((unsigned int)written == len)
       data += written;
       len  -= written;
     }
-  v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
+  v_buffer = (char *)realloc (v_buffer, v_buflen + len);
   memcpy (v_buffer + v_buflen, data, len);
   v_buflen += len;
   pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.232 by root, Wed Jan 4 01:10:08 2006 UTC vs. Revision 1.240 by root, Fri Jan 6 03:40:19 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.232 by root, Wed Jan 4 01:10:08 2006 UTC vs.
Revision 1.240 by root, Fri Jan 6 03:40:19 2006 UTC