Remove pointless macro.

diff --git a/src/command.C b/src/command.C
index 70cd5c55018a20c9958015b66ed23e067ad50a91..de4bc55771f23768d7b3e98dde222d36cfc86bdd 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -1532,7 +1532,7 @@ rxvt_term::x_cb (XEvent &ev)
             while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
               ;
 
-            if (isScrollbarWindow (ev.xany.window))
+            if (scrollBar.state && ev.xany.window == scrollBar.win)
               {
                 scrollBar.setIdle ();
                 scrollbar_show (0);
@@ -1632,7 +1632,7 @@ rxvt_term::x_cb (XEvent &ev)
 #endif
               }
           }
-        else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
+        else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
           {
             while (XCheckTypedWindowEvent (dpy, scrollBar.win,
                                            MotionNotify, &ev))
@@ -1926,7 +1926,7 @@ rxvt_term::button_press (XButtonEvent &ev)
   /*
    * Scrollbar window processing of button press
    */
-  if (isScrollbarWindow (ev.window))
+  if (scrollBar.state && ev.window == scrollBar.win)
     {
       scrollBar.setIdle ();
       /*

diff --git a/src/scrollbar.h b/src/scrollbar.h
index fc483589bc851da99cc883fc824faef1d2916a12..aee19713a0cd51cff335ad621e93e6f1e29b968a 100644 (file)
--- a/src/scrollbar.h
+++ b/src/scrollbar.h
@@ -33,7 +33,6 @@ typedef struct {
 #define scrollbar_isUp()        (scrollBar.state == 'U')
 #define scrollbar_isDn()        (scrollBar.state == 'D')
 #define scrollbar_isUpDn()      (scrollbar_isUp () || scrollbar_isDn ())
-#define isScrollbarWindow(w)    (scrollBar.state && (w) == scrollBar.win)
 
 #define scrollbarnext_dnval()   (scrollBar.end + (scrollBar.width + 1))
 #define scrollbarnext_upButton(y)       ((y) > scrollBar.end \