From 91ce141ffbbe584fb8dd6d49444f3447519ce8bb Mon Sep 17 00:00:00 2001 From: ayin Date: Mon, 31 Dec 2007 13:50:56 +0000 Subject: [PATCH] Remove pointless macro. --- src/command.C | 6 +++--- src/scrollbar.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/command.C b/src/command.C index 70cd5c55..de4bc557 100644 --- 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 fc483589..aee19713 100644 --- 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 \ -- 2.34.1