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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.257 by root, Wed Jan 11 05:29:40 2006 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC

       || !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)
         {
                   scr_move_to (0, 1);
                   return;
                 }
               else if (keysym == XK_End)
                 {
-                  scr_move_to (1, 0);
+                  scr_move_to (1, 1);
                   return;
                 }
             }
 #endif
         }
             {
               switch (keysym)
                 {
                     /* normal XTerm key bindings */
                   case XK_Insert:	/* Shift+Insert = paste mouse selection */
-                    selection_request (ev.time, 0, 0);
+                    selection_request (ev.time, Sel_Primary);
                     return;
 #if TODO
                     /* rxvt extras */
                   case XK_KP_Add:	/* Shift+KP_Add = bigger font */
                     change_font (FONT_UP);
 #endif				/* DEBUG_CMD */
   tt_write (kbuf, (unsigned int)len);
 }
 /*}}} */
-#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
+#if defined (KEYSYM_RESOURCE)
-/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
-/* attempt to `write' count to the input buffer */
 unsigned int
 rxvt_term::cmd_write (const char *str, unsigned int count)
 {
   unsigned int n, s;
   if (want_refresh)
     {
       if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
         {
-          int row = -view_start;
+          int row = view_start;
           int end_row = row + nrow;
-          while (row > -nsaved && ROW (row - 1).is_longer ())
+          while (row > top_row && ROW (row - 1).is_longer ())
             --row;
           do
             {
               int start_row = row;
               while (l->is_longer () && row < end_row);
             }
           while (row < end_row);
         }
-      scr_refresh (refresh_type);
+      scr_refresh ();
       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 + 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 ();
 }
 rxvt_term::cont_scroll_cb (time_watcher &w)
 {
   if ((scrollbar_isUp() || scrollbar_isDn()) &&
       scr_page (scrollbar_isUp() ? UP : DN, 1))
     {
-      refresh_type |= SMOOTH_REFRESH;
       want_refresh = 1;
       w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
     }
 }
 #endif
 rxvt_term::sel_scroll_cb (time_watcher &w)
 {
   if (scr_page (scroll_selection_dir, scroll_selection_lines))
     {
       selection_extend (selection_save_x, selection_save_y, selection_save_state);
-      refresh_type |= SMOOTH_REFRESH;
       want_refresh = 1;
       w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
     }
 }
 #endif
 {
   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
   memmove (cmdbuf_base, cmdbuf_ptr, n);
   cmdbuf_ptr = cmdbuf_base;
   cmdbuf_endp = cmdbuf_ptr + n;
-  ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
+  ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
   if (r > 0)
     {
       cmdbuf_endp += r;
       return true;
 }
 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 ())
 }
 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;
+  // for XQueryPointer
   Window unused_root, unused_child;
   int unused_root_x, unused_root_y;
   unsigned int unused_mask;
   switch (ev.type)
               {
                 seen_resize = 1;
                 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
               }
+            HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
 #ifdef TRANSPARENT		/* XXX: maybe not needed - leave in for now */
             if (OPTION (Opt_transparent))
               check_our_parents ();
 #endif
           }
             if (isScrollbarWindow (ev.xany.window))
               {
                 scrollBar.setIdle ();
                 scrollbar_show (0);
               }
-#ifdef MENUBAR
-            if (menubar_visible () && isMenuBarWindow (ev.xany.window))
-              menubar_expose ();
-#endif
 #ifdef TRANSPARENT
             if (am_transparent && ev.xany.window == parent[0])
               XClearWindow (disp, ev.xany.window);
 #endif
       case MotionNotify:
 #ifdef POINTER_BLANK
         if (hidden_pointer)
           pointer_unblank ();
 #endif
-#if MENUBAR
-        if (isMenuBarWindow (ev.xany.window))
-          {
-            menubar_control (ev.xbutton);
-            break;
-          }
-#endif
         if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
           break;
         if (ev.xany.window == vt)
           {
+            if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
-            if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
+                && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
               ; // nop
             else if (ev.xbutton.state & (Button1Mask | Button3Mask))
               {
                 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
                   ;
 #if TRANSPARENT
 void
 rxvt_term::rootwin_cb (XEvent &ev)
 {
-  SET_R (this);
+  make_current ();
-  SET_LOCALE (locale);
   switch (ev.type)
     {
       case PropertyNotify:
         /*
 #else
                   selection.rect = false;
 #endif
                   /* 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)
                         selection_rotate (ev.x, ev.y);
                       else
                         selection_extend (ev.x, ev.y, 1);
               }
         }
       return;
     }
-#if MENUBAR
-  /*
-   * Menubar window processing of button press
-   */
-  if (isMenuBarWindow (ev.window))
-    menubar_control (ev);
-#endif
 }
 void
 rxvt_term::button_release (XButtonEvent &ev)
 {
   if (scrollbar_isUpDn ())
     {
       scrollBar.setIdle ();
       scrollbar_show (0);
-#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
-      refresh_type &= ~SMOOTH_REFRESH;
-#endif
     }
 #ifdef SELECTION_SCROLLING
   if (sel_scroll_ev.active)
     sel_scroll_ev.stop();
         {
           case Button1:
           case Button3:
             selection_make (ev.time);
             break;
           case Button2:
-            selection_request (ev.time, ev.x, ev.y);
+            if (IN_RANGE_EXC (ev.x, 0, width)
+                && IN_RANGE_EXC (ev.y, 0, height))  // inside window?
+	      {
+		if (ev.state & ShiftMask)
+		  selection_request (ev.time, Sel_Clipboard);
+		else
+		  selection_request (ev.time, Sel_Primary);
+	      }
             break;
 #ifdef MOUSE_WHEEL
           case Button4:
           case Button5:
             {
               int i;
             }
             break;
 #endif
         }
     }
-#ifdef MENUBAR
-  else if (isMenuBarWindow (ev.window))
-    menubar_control (ev);
-#endif
 }
 #ifdef TRANSPARENT
 #if TINTING
 /* taken from aterm-0.4.2 */
                     }
                   // scr_add_lines only works for nlines <= nrow - 1.
                   if (nlines >= nrow - 1)
                     {
+                      if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
-                      if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
+                            && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
                         scr_add_lines (buf, str - buf, nlines);
                       nlines = 0;
                       str = buf;
                       eol = str + min (ncol, UBUFSIZ);
               seq_begin = cmdbuf_ptr;
               ch = next_char ();
             }
+          if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
-          if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
+                && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
             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.
               if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
                 refresh_limit++;
               else
                 {
                   flag = true;
-                  scr_refresh (refresh_type);
+                  scr_refresh ();
                   want_refresh = 1;
                 }
             }
         }
  * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
  */
 void
 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];
   int saveop = op;
   dDisp;
           want_full_refresh = want_refresh = 1;
         break;
 #endif
       case Rxvt_Pixmap:
+        {
-        if (*str != ';')
+          if (*str != ';')
-          {
+            {
 #if XPM_BACKGROUND
-            scale_pixmap ("");	/* reset to default scaling */
+              scale_pixmap ("");	/* reset to default scaling */
-            set_bgPixmap (str);	/* change pixmap */
+              set_bgPixmap (str);	/* change pixmap */
-            scr_touch (true);
+              scr_touch (true);
 #endif
-          }
+            }
+          int changed = 0;
-        while ((str = strchr (str, ';')) != NULL)
+          while ((str = strchr (str, ';')) != NULL)
-          {
+            {
-            str++;
+              str++;
 #if XPM_BACKGROUND
-            changed += scale_pixmap (str);
+              changed += scale_pixmap (str);
 #endif
-          }
+            }
-        if (changed)
+          if (changed)
-          {
+            {
 #ifdef XPM_BACKGROUND
-            resize_pixmap ();
+              resize_pixmap ();
-            scr_touch (true);
+              scr_touch (true);
 #endif
-          }
+            }
+        }
         break;
       case Rxvt_restoreFG:
         set_window_color (Color_fg, str);
         break;
       case XTerm_logfile:
         // TODO, when secure mode?
         break;
-#ifdef MENUBAR
-     case URxvt_Menu:
-       if (OPTION (Opt_insecure))
-         menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
-       break;
-#endif
 #if 0
       case Rxvt_dumpscreen:	/* no error notices */
         {
           int fd;
           if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
         if (query)
           tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
         else
           {
             set_locale (str);
-            pty.set_utf8_mode (enc_utf8);
+            pty->set_utf8_mode (enc_utf8);
             init_xlocale ();
           }
         break;
       case URxvt_view_up:
                   { 5, PrivMode_rVideo },
                   { 6, PrivMode_relOrigin },
                   { 7, PrivMode_Autowrap },
                  // 8, bi-directional support mode
                   { 9, PrivMode_MouseX10 },
-#ifdef menuBar_esc
-                  { menuBar_esc, PrivMode_menuBar },
-#endif
                  // 18, 19 printing-related
                   { 25, PrivMode_VisibleCursor },
 #ifdef scrollBar_esc
                   { scrollBar_esc, PrivMode_scrollBar },
 #endif
             /* case 8:	- auto repeat, can't do on a per window basis */
             case 9:			/* X10 mouse reporting */
               if (state)		/* orthogonal */
                 priv_modes &= ~PrivMode_MouseX11;
               break;
-#ifdef menuBar_esc
-            case menuBar_esc:
-#ifdef MENUBAR
-              map_menuBar (state);
-#endif
-              break;
-#endif
 #ifdef scrollBar_esc
             case scrollBar_esc:
               if (scrollbar_mapping (state))
                 {
                   resize_all_windows (0, 0, 0);
 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)
+  if (pty->pty < 0)
     return;
   if (v_buflen == 0)
     {
-      ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
+      ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
       if ((unsigned int)written == len)
         return;
       data += written;
   pty_ev.set (EVENT_READ | EVENT_WRITE);
 }
 void rxvt_term::pty_write ()
 {
-  int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
+  int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
   if (written > 0)
     {
       v_buflen -= written;

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.257 by root, Wed Jan 11 05:29:40 2006 UTC vs. Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.257 by root, Wed Jan 11 05:29:40 2006 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC