From 349aa4fbe2c878157ee62d96d56b429aaf3a9052 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Mon, 16 Jan 2006 08:57:02 +0000
Subject: [PATCH] *** empty log message ***

---
 src/command.C | 6 ++++--
 src/screen.C  | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/command.C b/src/command.C
index 8b711101..b12df331 100644
--- a/src/command.C
+++ b/src/command.C
@@ -2782,7 +2782,8 @@ rxvt_term::cmd_parse ()
                   // 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;
@@ -2807,7 +2808,8 @@ rxvt_term::cmd_parse ()
               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);
 
           /*
diff --git a/src/screen.C b/src/screen.C
index d0423454..68a9833b 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -619,8 +619,6 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count)
     {
       top_row = max (top_row - count, -saveLines);
 
-      HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
-      
       // scroll everything up 'count' lines
       term_start = (term_start + count) % total_rows;
 
@@ -677,6 +675,9 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count)
           && view_start != 0
           && view_start != -saveLines)
         scr_page (UP, count);
+
+      if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
+        HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
     }
   else
     {
@@ -1841,9 +1842,10 @@ rxvt_term::scr_changeview (int new_view_start)
 
   num_scr += new_view_start - view_start;
   view_start = new_view_start;
-  HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
   want_refresh = 1;
 
+  HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
+
   return true;
 }
 
-- 
2.34.1