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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.217 by root, Sat Dec 31 16:30:42 2005 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC

  * 				- extensive modifications
  * Copyright (c) 1998      Alfredo K. Kojima <kojima@windowmaker.org>
  * Copyright (c) 2001      Marius Gedminas
  *				- Ctrl/Mod4+Tab works like Meta+Tab (options)
  * Copyright (c) 2003      Rob McMullen <robm@flipturn.org>
- * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/
 /*{{{ includes: */
-#include "../config.h"		/* NECESSARY */
+#include "../config.h"
-#include "rxvt.h"		/* NECESSARY */
+#include "rxvt.h"
+#include "rxvtperl.h"
 #include "version.h"
 #include "command.h"
+#if HAVE_SCHED_YIELD
+#undef HAVE_SCHED_YIELD // disabled for the time being
+//# include <sched.h>
+#endif
 #ifdef KEYSYM_RESOURCE
 # include "keyboard.h"
 #endif
       || !IN_RANGE_EXC (y, 0, nrow))
     return;
   for (;;)
     {
-      const line_t &l = ROW(y - view_start);
+      const line_t &l = ROW(y + view_start);
       text_t t = l.t[x];
       if (t != NOCHAR || !x)
         {
         }
       x--;
     }
 }
-#endif
 void
 rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
 {
-#if ENABLE_OVERLAY
   rxvt_fontset *fs = FONTSET (r);
   rxvt_font *f = (*fs)[fs->find_font (ch)];
   wchar_t *chr, *alloc, ch2, *fname;
   int len;
   char attr[80]; // plenty
   sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
            (int)r,
-           GET_FGCOLOR (r), GET_BGCOLOR (r),
+           fgcolor_of (r), bgcolor_of (r),
            r & RS_Bold    ? " bold"    : "",
            r & RS_Italic  ? " italic"  : "",
            r & RS_Blink   ? " blink"   : "",
            r & RS_RVid    ? " rvid"    : "",
            r & RS_Uline   ? " uline"   : "",
 # if ENABLE_COMBINING
   if (alloc)
     delete [] alloc;
 # endif
-#endif
 }
+#endif
 void
 rxvt_term::commit_iso14755 ()
 {
   wchar_t ch[2];
           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)
     {
                   scr_move_to (0, 1);
                   return;
                 }
               else if (keysym == XK_End)
                 {
-                  scr_move_to (1, 0);
+                  scr_move_to (1, 1);
                   return;
                 }
             }
 #endif
         }
         {
 #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_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
+    return;
   if (len <= 0)
     return;			/* not mapped */
-  if (options & Opt_scrollTtyKeypress)
+  if (OPTION (Opt_scrollTtyKeypress))
     if (view_start)
       {
         view_start = 0;
         want_refresh = 1;
       }
 #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;
+          int end_row = row + nrow;
+          while (row > top_row && ROW (row - 1).is_longer ())
+            --row;
+          do
+            {
+              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 < end_row);
+            }
+          while (row < end_row);
+        }
       scr_refresh (refresh_type);
       scrollbar_show (1);
 #ifdef USE_XIM
       IMSendSpot ();
 #endif
 }
 void
 rxvt_term::check_cb (check_watcher &w)
 {
-  SET_R (this);
+  make_current ();
-  SET_LOCALE (locale);
   display->flush ();
   if (want_refresh && !flush_ev.active)
-    flush_ev.start (NOW + 0.01);
+    flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
 }
 void
 rxvt_term::flush_cb (time_watcher &w)
 {
-  SET_R (this);
+  make_current ();
-  SET_LOCALE (locale);
   refresh_limit = 1;
   refresh_count = 0;
   flush ();
 }
 {
   if (mouse_slip_wheel_speed == 0
       || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
                                     : scr_page (UP,  mouse_slip_wheel_speed))
     {
-      if (view_start == nsaved ||
+      if (view_start == top_row || view_start == 0)
-          view_start == 0)
         mouse_slip_wheel_speed = 0;
       refresh_type |= SMOOTH_REFRESH;
       want_refresh = 1;
       w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
     }
 }
 #endif
+#if HAVE_SCHED_YIELD
+static struct event_handler
+{
+  check_watcher cw_yield;
+  void yield (check_watcher &w)
+  {
+    sched_yield ();
+    w.stop ();
+  }
+  event_handler ()
+  : cw_yield (this, &event_handler::yield)
+  {
+  }
+} event_handler;
+#endif
 bool
 rxvt_term::pty_fill ()
 {
   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;
   cmdbuf_endp = cmdbuf_ptr + n;
-  n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
+  ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
-  if (n > 0)
+  if (r > 0)
     {
-      cmdbuf_endp += n;
+      cmdbuf_endp += r;
       return true;
     }
-  else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
+  else if (r < 0 && (errno == EAGAIN || errno == EINTR))
+    {
+#if HAVE_SCHED_YIELD
+      if (display->is_local)
+        event_handler.cw_yield.start ();
+#endif
+    }
+  else
     {
       pty_ev.stop ();
-      if (!(options & Opt_hold))
+      if (!OPTION (Opt_hold))
         destroy ();
     }
   return false;
 }
 void
 rxvt_term::pty_cb (io_watcher &w, short revents)
 {
-  SET_R (this);
+  make_current ();
-  SET_LOCALE (locale);
   if (revents & EVENT_READ)
     // loop, but don't allow a single term to monopolize us
     while (pty_fill ())
       if (cmd_parse ())
   recolour_cursor ();
 #ifdef POINTER_BLANK
   hidden_pointer = 0;
-  if (options & Opt_pointerBlank)
+  if (OPTION (Opt_pointerBlank))
     pointer_ev.start (NOW + pointerBlankDelay);
 #endif
 }
 #ifdef POINTER_BLANK
 void
 rxvt_term::pointer_blank ()
 {
-  if (! (options & Opt_pointerBlank))
+  if (!OPTION (Opt_pointerBlank))
     return;
   XDefineCursor (display->display, vt, display->blank_cursor);
   XFlush (display->display);
 }
 void
 rxvt_term::pointer_cb (time_watcher &w)
 {
-  SET_R (this);
+  make_current ();
-  SET_LOCALE (locale);
   pointer_blank ();
 }
 #endif
 /*{{{ process an X event */
 void
 rxvt_term::x_cb (XEvent &ev)
 {
+  make_current ();
   dDisp;
-  SET_R (this);
+  if (ev.xany.window == vt
-  SET_LOCALE (locale);
+      && SHOULD_INVOKE (HOOK_X_EVENT)
+      && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
+    return;
-#if defined(CURSOR_BLINK)
+  // for XQueryPointer
-  if ((options & Opt_cursorBlink) && ev.type == KeyPress)
-    {
-      if (hidden_cursor)
-        {
-          hidden_cursor = 0;
-          want_refresh = 1;
-        }
-      cursor_blink_ev.start (NOW + BLINK_INTERVAL);
-    }
-#endif
-#if defined(POINTER_BLANK)
-  if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
-    {
-      if (ev.type == MotionNotify
-          || ev.type == ButtonPress
-          || ev.type == ButtonRelease)
-        if (hidden_pointer)
-          pointer_unblank ();
-      if (ev.type == KeyPress && hidden_pointer == 0)
-        pointer_blank ();
-    }
-#endif
   Window unused_root, unused_child;
   int unused_root_x, unused_root_y;
   unsigned int unused_mask;
   switch (ev.type)
         break;
       case KeyRelease:
         {
-#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
+#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
-          KeySym ks;
+          KeySym keysym;
-          ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
+          keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
 #endif
 #if ENABLE_FRILLS || ISO_14755
           // ISO 14755 support
           if (iso14755buf)
 # endif
 # if ISO_14755
                 // iso14755 part 5.2 handling: release time
                 // first: controls
                 if ((ev.xkey.state & ControlMask)
-                     && ((ks >= 0x40 && ks <= 0x5f)
+                     && ((keysym >= 0x40 && keysym <= 0x5f)
-                         || (ks >= 0x61 && ks <= 0x7f)))
+                         || (keysym >= 0x61 && keysym <= 0x7f)))
                   {
-                    iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
+                    iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
                     commit_iso14755 ();
-                    return; // case-break;
+                    goto skip_switch;
                   }
                 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
-                  if (i[0] == ks)
+                  if (i[0] == keysym)
                     {
                       iso14755buf = ISO_14755_51 | i[1];
                       commit_iso14755 ();
-                      return; // case-break;
+                      goto skip_switch;
                     }
                 scr_bell ();
 # endif
                 iso14755buf = 0;
                 else
                   iso14755buf = 0;
               }
 #endif
+          if (ev.xany.window == vt
+              && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
+            break;
 #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
           if (!(ev.xkey.state & ControlMask))
             slip_wheel_ev.stop ();
-          else if (ks == XK_Control_L || ks == XK_Control_R)
+          else if (keysym == XK_Control_L || keysym == XK_Control_R)
             mouse_slip_wheel_speed = 0;
 #endif
           break;
         }
                 seen_resize = 1;
                 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
               }
 #ifdef TRANSPARENT		/* XXX: maybe not needed - leave in for now */
-            if (options & Opt_transparent)
+            if (OPTION (Opt_transparent))
               check_our_parents ();
 #endif
           }
         break;
       case SelectionRequest:
         selection_send (ev.xselectionrequest);
         break;
+      case MapNotify:
+        mapped = 1;
+#ifdef TEXT_BLINK
+        text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
+#endif
+        HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
+        break;
       case UnmapNotify:
         mapped = 0;
 #ifdef TEXT_BLINK
         text_blink_ev.stop ();
 #endif
-        break;
+        HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
-      case MapNotify:
-        mapped = 1;
-#ifdef TEXT_BLINK
-        text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
-#endif
         break;
 #ifdef TRANSPARENT
       case ReparentNotify:
         rootwin_cb (ev);
             while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
               scr_expose (ev.xexpose.x, ev.xexpose.y,
                           ev.xexpose.width, ev.xexpose.height, False);
-            scr_refresh (refresh_type);
+            want_refresh = 1;
           }
         else
           {
             XEvent unused_event;
         if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
           break;
         if (ev.xany.window == vt)
           {
+            if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
+                && 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,
                           &unused_root_x, &unused_root_y,
                           &ev.xbutton.x, &ev.xbutton.y,
                           &unused_mask);
             scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
                          scrollbar_size ());
-            scr_refresh (refresh_type);
+            want_refresh = 1;
             refresh_limit = 0;
             scrollbar_show (1);
           }
         break;
     }
+skip_switch: ;
+#if defined(CURSOR_BLINK)
+  if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
+    {
+      if (hidden_cursor)
+        {
+          hidden_cursor = 0;
+          want_refresh = 1;
+        }
+      cursor_blink_ev.start (NOW + BLINK_INTERVAL);
+    }
+#endif
+#if defined(POINTER_BLANK)
+  if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
+    {
+      if (ev.type == MotionNotify
+          || ev.type == ButtonPress
+          || ev.type == ButtonRelease)
+        if (hidden_pointer)
+          pointer_unblank ();
+      if (ev.type == KeyPress && hidden_pointer == 0)
+        pointer_blank ();
+    }
+#endif
 }
 void
 rxvt_term::focus_in ()
 {
   if (!focus)
     {
       focus = 1;
       want_refresh = 1;
+      HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
 #if USE_XIM
       if (Input_Context != NULL)
         {
           IMSetStatusPosition ();
           XSetICFocus (Input_Context);
         }
 #endif
 #if CURSOR_BLINK
-      if (options & Opt_cursorBlink)
+      if (OPTION (Opt_cursorBlink))
         cursor_blink_ev.start (NOW + BLINK_INTERVAL);
 #endif
 #if OFF_FOCUS_FADING
       if (rs[Rs_fade])
         {
   if (focus)
     {
       focus = 0;
       want_refresh = 1;
+      HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
 #if ENABLE_FRILLS || ISO_14755
+      if (iso14755buf)
+        {
-      iso14755buf = 0;
+          iso14755buf = 0;
-#endif
-#if ENABLE_OVERLAY
+# if ENABLE_OVERLAY
-      scr_overlay_off ();
+          scr_overlay_off ();
+# endif
+        }
 #endif
 #if USE_XIM
       if (Input_Context != NULL)
         XUnsetICFocus (Input_Context);
 #endif
 #if CURSOR_BLINK
-      if (options & Opt_cursorBlink)
+      if (OPTION (Opt_cursorBlink))
         cursor_blink_ev.stop ();
       hidden_cursor = 0;
 #endif
 #if OFF_FOCUS_FADING
       if (rs[Rs_fade])
 #if TRANSPARENT
 void
 rxvt_term::rootwin_cb (XEvent &ev)
 {
-  SET_R (this);
+  make_current ();
-  SET_LOCALE (locale);
   switch (ev.type)
     {
       case PropertyNotify:
         /*
             && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
           return;
         /* FALLTHROUGH */
       case ReparentNotify:
-        if ((options & Opt_transparent) && check_our_parents () && am_transparent)
+        if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
           want_refresh = want_full_refresh = 1;
         break;
     }
 }
 #endif
 rxvt_term::button_press (XButtonEvent &ev)
 {
   int reportmode = 0, clickintime;
   bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
   if (!bypass_keystate)
     reportmode = !! (priv_modes & PrivMode_mouse_report);
   /*
    * VT window processing of button press
 #ifdef MOUSE_REPORT_DOUBLECLICK
           if (ev.button == MEvent.button && clickintime)
             {
               /* same button, within alloted time */
               MEvent.clicks++;
               if (MEvent.clicks > 1)
                 {
                   /* only report double clicks */
                   MEvent.clicks = 2;
                   mouse_report (ev);
       else
         {
           if (ev.button != MEvent.button)
             MEvent.clicks = 0;
+          if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
-          switch (ev.button)
+            switch (ev.button)
-            {
+              {
-              case Button1:
+                case Button1:
-                /* allow meta + click to select rectangular areas */
+                  /* allow meta + click to select rectangular areas */
-                /* should be done in screen.C */
+                  /* should be done in screen.C */
 #if ENABLE_FRILLS
-                selection.rect = !!(ev.state & ModMetaMask);
+                  selection.rect = !!(ev.state & ModMetaMask);
 #else
-                selection.rect = false;
+                  selection.rect = false;
 #endif
-                /* allow shift+left click to extend selection */
+                  /* allow shift+left click to extend selection */
-                if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
+                  if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
-                  {
+                    {
-                    if (MEvent.button == Button1 && clickintime)
+                      if (MEvent.button == Button1 && clickintime)
-                      selection_rotate (ev.x, ev.y);
+                        selection_rotate (ev.x, ev.y);
-                    else
+                      else
-                      selection_extend (ev.x, ev.y, 1);
+                        selection_extend (ev.x, ev.y, 1);
-                  }
+                    }
-                else
+                  else
-                  {
+                    {
-                    if (MEvent.button == Button1 && clickintime)
+                      if (MEvent.button == Button1 && clickintime)
-                      MEvent.clicks++;
+                        MEvent.clicks++;
-                    else
+                      else
-                      MEvent.clicks = 1;
+                        MEvent.clicks = 1;
-                    selection_click (MEvent.clicks, ev.x, ev.y);
+                      selection_click (MEvent.clicks, ev.x, ev.y);
-                  }
+                    }
-                MEvent.button = Button1;
+                  MEvent.button = Button1;
-                break;
+                  break;
-              case Button3:
+                case Button3:
-                if (MEvent.button == Button3 && clickintime)
+                  if (MEvent.button == Button3 && clickintime)
-                  selection_rotate (ev.x, ev.y);
+                    selection_rotate (ev.x, ev.y);
-                else
+                  else
-                  selection_extend (ev.x, ev.y, 1);
+                    selection_extend (ev.x, ev.y, 1);
-                MEvent.button = Button3;
+                  MEvent.button = Button3;
-                break;
+                  break;
-            }
+              }
-        }
+          }
       MEvent.time = ev.time;
       return;
     }
                     }
                   break;
               }
         }
       return;
     }
 #if MENUBAR
   /*
    * Menubar window processing of button press
    */
   if (isMenuBarWindow (ev.window))
       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:
             selection_make (ev.time);
               v = ev.button == Button4 ? UP : DN;
               if (ev.state & ShiftMask)
                 i = 1;
-              else if (options & Opt_mouseWheelScrollPage)
+              else if (OPTION (Opt_mouseWheelScrollPage))
                 i = nrow - 1;
               else
                 i = 5;
 # ifdef MOUSE_SLIP_WHEELING
                   slip_wheel_ev.start ();
                 }
               else
                 {
 # endif
-# ifdef JUMP_MOUSE_WHEEL
                   scr_page (v, i);
-                  scr_refresh (SMOOTH_REFRESH);
                   scrollbar_show (1);
-# else
-                  while (i--)
-                    {
-                      scr_page (v, 1);
-                      scr_refresh (SMOOTH_REFRESH);
-                      scrollbar_show (1);
-                    }
-# endif
 # ifdef MOUSE_SLIP_WHEELING
                 }
-#endif
+# endif
             }
             break;
 #endif
         }
     }
   XWindowAttributes wattr, wrootattr;
   dDisp;
   pchanged = 0;
-  if (!(options & Opt_transparent))
+  if (!OPTION (Opt_transparent))
     return pchanged;	/* Don't try any more */
   XGetWindowAttributes (disp, display->root, &wrootattr);
   rootdepth = wrootattr.depth;
 bool
 rxvt_term::cmd_parse ()
 {
   bool flag = false;
-  unicode_t ch = NOCHAR;
+  wchar_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)
             {
               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;
                   if (ch == C0_LF)
                     nlines++;
                   refresh_count++;
-                  if (!(options & Opt_jumpScroll)
+                  if (!OPTION (Opt_jumpScroll)
                       || (refresh_count >= refresh_limit * (nrow - 1)))
                     {
                       refreshnow = true;
+                      refresh_count = 0;
                       ch = NOCHAR;
                       break;
                     }
                   // scr_add_lines only works for nlines <= nrow - 1.
                   if (nlines >= nrow - 1)
                     {
+                      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_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
            * is incremented here because we must be doing flat-out scrolling.
            */
           if (refreshnow)
             {
-              if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
+              if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
                 refresh_limit++;
               else
                 {
                   flag = true;
                   scr_refresh (refresh_type);
+                  want_refresh = 1;
                 }
             }
         }
       else
     }
   return flag;
 }
-// read the next octet
-unicode_t
-rxvt_term::next_octet ()
-{
-  return cmdbuf_ptr < cmdbuf_endp
-         ? *cmdbuf_ptr++
-         : NOCHAR;
-}
 // read the next character
-unicode_t
+wchar_t
 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;
           break;
         }
       if (len == (size_t)-1)
-        return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
+        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
+uint32_t
+rxvt_term::next_octet ()
+{
+  return cmdbuf_ptr < cmdbuf_endp
+         ? (unsigned char)*cmdbuf_ptr++
+         : 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;
       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 */
         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 */
         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;
               break;
             case 6:			/* CPR requested */
               scr_report_position ();
               break;
             case 7:			/* unofficial extension */
-              if (options & Opt_insecure)
+              if (OPTION (Opt_insecure))
                 tt_printf ("%-.250s\012", rs[Rs_display_name]);
               break;
             case 8:			/* unofficial extension */
               process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
               break;
         break;
       case 20:			/* report icon label */
         {
           char *s;
           XGetIconName (disp, parent[0], &s);
-          tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : "");	/* 8bit ST */
+          tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : "");	/* 8bit ST */
           XFree (s);
         }
         break;
       case 21:			/* report window title */
         {
           char *s;
           XFetchName (disp, parent[0], &s);
-          tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : "");	/* 8bit ST */
+          tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : "");	/* 8bit ST */
           XFree (s);
         }
         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];
           {
             if ((name = strchr (buf, ';')) == NULL)
               break;
             *name++ = '\0';
-            color = atoi (buf);
+            color = atoi (buf) + minCOLOR;
-            if (color < 0 || color >= TOTAL_COLORS)
+            if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
               break;
             if ((buf = strchr (name, ';')) != NULL)
               *buf++ = '\0';
             if (name[0] == '?' && !name[1])
               {
                 unsigned short r, g, b;
-                pix_colors_focused[color + minCOLOR].get (display, r, g, b);
+                pix_colors_focused[color].get (display, r, g, b);
                 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
               }
             else
-              set_window_color (color + minCOLOR, name);
+              set_window_color (color, name);
           }
         break;
       case XTerm_Color00:
         process_color_seq (XTerm_Color00, Color_fg, str, resp);
         break;
       case XTerm_Color01:
-        process_color_seq (XTerm_Color00, Color_bg, str, resp);
+        process_color_seq (XTerm_Color01, Color_bg, str, resp);
         break;
 #ifndef NO_CURSORCOLOR
       case XTerm_Color_cursor:
         process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
         break;
         break;
       case XTerm_Color_pointer_bg:
         process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
         break;
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-      case XTerm_Color_BD:
-        process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
-        break;
-      case XTerm_Color_UL:
-        process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
-        break;
       case XTerm_Color_RV:
         process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
+        break;
+      case Rxvt_Color_BD:
+      case URxvt_Color_BD:
+        process_color_seq (op, Color_BD, str, resp);
+        break;
+      case Rxvt_Color_UL:
+      case URxvt_Color_UL:
+        process_color_seq (op, Color_UL, str, resp);
         break;
       case URxvt_Color_IT:
         process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
         break;
 #endif
         if (am_transparent)
           want_full_refresh = want_refresh = 1;
         break;
 #endif
-      case XTerm_Pixmap:
+      case Rxvt_Pixmap:
         if (*str != ';')
           {
 #if XPM_BACKGROUND
             scale_pixmap ("");	/* reset to default scaling */
             set_bgPixmap (str);	/* change pixmap */
-#endif
             scr_touch (true);
+#endif
           }
         while ((str = strchr (str, ';')) != NULL)
           {
             str++;
 #if XPM_BACKGROUND
             changed += scale_pixmap (str);
         if (changed)
           {
 #ifdef XPM_BACKGROUND
             resize_pixmap ();
-#endif
             scr_touch (true);
+#endif
           }
         break;
-      case XTerm_restoreFG:
+      case Rxvt_restoreFG:
         set_window_color (Color_fg, str);
         break;
-      case XTerm_restoreBG:
+      case Rxvt_restoreBG:
         set_window_color (Color_bg, str);
         break;
       case XTerm_logfile:
         // TODO, when secure mode?
         break;
 #ifdef MENUBAR
      case URxvt_Menu:
-       if (options & Opt_insecure)
+       if (OPTION (Opt_insecure))
          menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
        break;
 #endif
 #if 0
-      case XTerm_dumpscreen:	/* no error notices */
+      case Rxvt_dumpscreen:	/* no error notices */
         {
           int fd;
           if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
             {
               scr_dump (fd);
       case URxvt_italicFont:
       case URxvt_boldItalicFont:
 #endif
         if (query)
           tt_printf ("\33]%d;%-.250s%c", saveop,
-                     (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
+                     OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
                        ? fontset[op - URxvt_font]->fontdesc : "",
                      resp);
         else
           {
             const char *&res = rs[Rs_font + (op - URxvt_font)];
         break;
 #if ENABLE_FRILLS
       case URxvt_locale:
         if (query)
-          tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
+          tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
         else
           {
             set_locale (str);
             pty.set_utf8_mode (enc_utf8);
             init_xlocale ();
           }
         break;
       case URxvt_view_up:
       case URxvt_view_down:
+        {
-        int lines = atoi (str);
+          int lines = atoi (str);
-        if (lines)
+          if (lines)
-          scr_page (op == URxvt_view_up ? UP : DN, lines);
+            scr_page (op == URxvt_view_up ? UP : DN, lines);
-        else
+          else
-          {
             scr_erase_savelines ();
-          }
+        }
+        break;
+#endif
+#if ENABLE_PERL
+      case URxvt_perl:
+        if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
+          ; // no responses yet
         break;
 #endif
     }
 }
 /*----------------------------------------------------------------------*/
           }
       /* extra handling for values with state unkept  */
       switch (arg[i])
         {
+#if ENABLE_STYLES
+          case 1021:
+            set_option (Opt_intensityStyles, mode);
+            scr_touch (true);
+            break;
+#endif
           case 1048:		/* alternative cursor save */
           case 1049:
-            if (options & Opt_secondaryScreen)
+            if (OPTION (Opt_secondaryScreen))
               if (mode == 0)
                 scr_cursor (RESTORE);
               else if (mode == 1)
                 scr_cursor (SAVE);
             break;
             case 3:			/* 80/132 */
               if (priv_modes & PrivMode_132OK)
                 set_widthheight (((state ? 132 : 80) * fwidth), height);
               break;
             case 4:			/* smooth scrolling */
-              if (state)
-                options &= ~Opt_jumpScroll;
-              else
-                options |= Opt_jumpScroll;
+              set_option (Opt_jumpScroll, !state);
               break;
             case 5:			/* reverse video */
               scr_rvideo_mode (state);
               break;
             case 6:			/* relative/absolute origins  */
 #if 0
             case 1001:
               break;		/* X11 mouse highlighting */
 #endif
             case 1010:		/* scroll to bottom on TTY output inhibit */
-              if (state)
-                options &= ~Opt_scrollTtyOutput;
-              else
-                options |= Opt_scrollTtyOutput;
+              set_option (Opt_scrollTtyOutput, !state);
               break;
             case 1011:		/* scroll to bottom on key press */
-              if (state)
-                options |= Opt_scrollTtyKeypress;
+              set_option (Opt_scrollTtyKeypress, state);
-              else
-                options &= ~Opt_scrollTtyKeypress;
               break;
             case 1047:		/* secondary screen w/ clearing last */
-              if (options & Opt_secondaryScreen)
+              if (OPTION (Opt_secondaryScreen))
                 if (current_screen != PRIMARY)
                   scr_erase_screen (2);
               scr_change_screen (state);
               break;
             case 1049:		/* secondary screen w/ clearing first */
               scr_change_screen (state);
-              if (options & Opt_secondaryScreen)
+              if (OPTION (Opt_secondaryScreen))
                 if (current_screen != PRIMARY)
                   scr_erase_screen (2);
               break;
             default:
               break;
             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:
           case 106:
           case 107:
             scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
             break;
 #endif
         }
     }
 }
 /*}}} */
  */
 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 (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
+    return;
+  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.217 by root, Sat Dec 31 16:30:42 2005 UTC vs. Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.217 by root, Sat Dec 31 16:30:42 2005 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 2006 UTC