--- rxvt-unicode/src/command.C	2006/01/13 15:42:50	1.261
+++ rxvt-unicode/src/command.C	2006/01/17 12:22:59	1.269
@@ -149,7 +149,7 @@
 
   for (;;)
     {
-      const line_t &l = ROW(y - view_start);
+      const line_t &l = ROW(y + view_start);
 
       text_t t = l.t[x];
 
@@ -445,7 +445,7 @@
                 }
               else if (keysym == XK_End)
                 {
-                  scr_move_to (1, 0);
+                  scr_move_to (1, 1);
                   return;
                 }
             }
@@ -921,9 +921,7 @@
 }
 /*}}} */
 
-#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
-/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
-/* attempt to `write' count to the input buffer */
+#if defined (KEYSYM_RESOURCE)
 unsigned int
 rxvt_term::cmd_write (const char *str, unsigned int count)
 {
@@ -974,10 +972,10 @@
     {
       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
@@ -1010,7 +1008,7 @@
           while (row < end_row);
         }
 
-      scr_refresh (refresh_type);
+      scr_refresh ();
       scrollbar_show (1);
 #ifdef USE_XIM
       IMSendSpot ();
@@ -1023,8 +1021,7 @@
 void
 rxvt_term::check_cb (check_watcher &w)
 {
-  SET_R (this);
-  SET_LOCALE (locale);
+  make_current ();
 
   display->flush ();
 
@@ -1035,8 +1032,7 @@
 void
 rxvt_term::flush_cb (time_watcher &w)
 {
-  SET_R (this);
-  SET_LOCALE (locale);
+  make_current ();
 
   refresh_limit = 1;
   refresh_count = 0;
@@ -1074,7 +1070,6 @@
   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);
     }
@@ -1088,7 +1083,6 @@
   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);
     }
@@ -1103,11 +1097,9 @@
       || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
                                     : scr_page (UP,  mouse_slip_wheel_speed))
     {
-      if (view_start == nsaved ||
-          view_start == 0)
+      if (view_start == top_row || view_start == 0)
         mouse_slip_wheel_speed = 0;
 
-      refresh_type |= SMOOTH_REFRESH;
       want_refresh = 1;
       w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
     }
@@ -1147,7 +1139,7 @@
   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)
     {
@@ -1175,8 +1167,7 @@
 void
 rxvt_term::pty_cb (io_watcher &w, short revents)
 {
-  SET_R (this);
-  SET_LOCALE (locale);
+  make_current ();
 
   if (revents & EVENT_READ)
     // loop, but don't allow a single term to monopolize us
@@ -1218,8 +1209,7 @@
 void
 rxvt_term::pointer_cb (time_watcher &w)
 {
-  SET_R (this);
-  SET_LOCALE (locale);
+  make_current ();
 
   pointer_blank ();
 }
@@ -1308,12 +1298,12 @@
 void
 rxvt_term::x_cb (XEvent &ev)
 {
-  dDisp;
+  make_current ();
 
-  SET_R (this);
-  SET_LOCALE (locale);
+  dDisp;
 
   if (ev.xany.window == vt
+      && SHOULD_INVOKE (HOOK_X_EVENT)
       && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
     return;
 
@@ -1594,10 +1584,6 @@
                 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])
@@ -1611,19 +1597,13 @@
         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 (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
+            if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
+                && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
               ; // nop
             else if (ev.xbutton.state & (Button1Mask | Button3Mask))
               {
@@ -1825,8 +1805,7 @@
 void
 rxvt_term::rootwin_cb (XEvent &ev)
 {
-  SET_R (this);
-  SET_LOCALE (locale);
+  make_current ();
 
   switch (ev.type)
     {
@@ -2105,14 +2084,6 @@
 
       return;
     }
-
-#if MENUBAR
-  /*
-   * Menubar window processing of button press
-   */
-  if (isMenuBarWindow (ev.window))
-    menubar_control (ev);
-#endif
 }
 
 void
@@ -2128,9 +2099,6 @@
     {
       scrollBar.setIdle ();
       scrollbar_show (0);
-#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
-      refresh_type &= ~SMOOTH_REFRESH;
-#endif
     }
 
 #ifdef SELECTION_SCROLLING
@@ -2231,10 +2199,6 @@
 #endif
         }
     }
-#ifdef MENUBAR
-  else if (isMenuBarWindow (ev.window))
-    menubar_control (ev);
-#endif
 }
 
 #ifdef TRANSPARENT
@@ -2787,7 +2751,8 @@
                   // 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)))
+                      if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
+                            && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
                         scr_add_lines (buf, str - buf, nlines);
 
                       nlines = 0;
@@ -2812,7 +2777,8 @@
               ch = next_char ();
             }
 
-          if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
+          if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
+                && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
             scr_add_lines (buf, str - buf, nlines);
 
           /*
@@ -2828,7 +2794,7 @@
               else
                 {
                   flag = true;
-                  scr_refresh (refresh_type);
+                  scr_refresh ();
                   want_refresh = 1;
                 }
             }
@@ -3963,12 +3929,6 @@
         // 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 */
         {
@@ -4011,7 +3971,7 @@
         else
           {
             set_locale (str);
-            pty.set_utf8_mode (enc_utf8);
+            pty->set_utf8_mode (enc_utf8);
             init_xlocale ();
           }
         break;
@@ -4095,9 +4055,6 @@
                   { 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
@@ -4202,13 +4159,6 @@
               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))
@@ -4463,12 +4413,12 @@
   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;
@@ -4487,7 +4437,7 @@
 
 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)
     {