--- rxvt-unicode/src/scrollbar.h	2008/01/29 14:45:55	1.14
+++ rxvt-unicode/src/scrollbar.h	2008/02/17 12:11:56	1.17
@@ -10,6 +10,35 @@
 #define R_SB_PLAIN              4
 #define R_SB_RXVT               8
 
+#define R_SB_ALIGN_CENTRE       0
+#define R_SB_ALIGN_TOP          1
+#define R_SB_ALIGN_BOTTOM       2
+
+#define SB_WIDTH_NEXT           19
+#define SB_WIDTH_XTERM          15
+#define SB_WIDTH_PLAIN          7
+#ifndef SB_WIDTH_RXVT
+# define SB_WIDTH_RXVT          10
+#endif
+
+/*
+ * NeXT scrollbar defines
+ */
+#define SB_PADDING              1
+#define SB_BORDER_WIDTH         1
+#define SB_BEVEL_WIDTH_UPPER_LEFT       1
+#define SB_BEVEL_WIDTH_LOWER_RIGHT      2
+#define SB_LEFT_PADDING         (SB_PADDING + SB_BORDER_WIDTH)
+#define SB_MARGIN_SPACE         (SB_PADDING * 2)
+#define SB_BUTTON_WIDTH         (SB_WIDTH_NEXT - SB_MARGIN_SPACE - SB_BORDER_WIDTH)
+#define SB_BUTTON_HEIGHT        (SB_BUTTON_WIDTH)
+#define SB_BUTTON_SINGLE_HEIGHT (SB_BUTTON_HEIGHT + SB_PADDING)
+#define SB_BUTTON_BOTH_HEIGHT   (SB_BUTTON_SINGLE_HEIGHT * 2)
+#define SB_BUTTON_TOTAL_HEIGHT  (SB_BUTTON_BOTH_HEIGHT + SB_PADDING)
+#define SB_BUTTON_BEVEL_X       (SB_LEFT_PADDING)
+#define SB_BUTTON_FACE_X        (SB_BUTTON_BEVEL_X + SB_BEVEL_WIDTH_UPPER_LEFT)
+#define SB_THUMB_MIN_HEIGHT     (SB_BUTTON_WIDTH - (SB_PADDING * 2))
+
 enum sb_state {
   STATE_IDLE = 1,
   STATE_MOTION,
@@ -54,50 +83,24 @@
       return y > end;
     return false;
   }
+  unsigned min_height ()
+  {
+    return style == R_SB_NEXT ? SB_THUMB_MIN_HEIGHT : 10;
+  }
+  unsigned size ()
+  {
+    return end - beg - min_height ();
+  }
+  unsigned total_width ()
+  {
+    return width + shadow * 2;
+  }
 };
 
-#define scrollbar_TotalWidth()  (scrollBar.width + scrollBar.shadow * 2)
-
-#define SCROLLNEXT_MINHEIGHT    SB_THUMB_MIN_HEIGHT
-#define SCROLLRXVT_MINHEIGHT    10
-
-#define scrollbar_minheight()   (scrollBar.style == R_SB_NEXT        \
-                                 ? SCROLLNEXT_MINHEIGHT                 \
-                                 : SCROLLRXVT_MINHEIGHT)
 #define scrollbar_above_slider(y)       ((y) < scrollBar.top)
 #define scrollbar_below_slider(y)       ((y) > scrollBar.bot)
 #define scrollbar_position(y)           ((y) - scrollBar.beg)
-#define scrollbar_size()                (scrollBar.end - scrollBar.beg \
-                                         - scrollbar_minheight ())
-
-#define R_SB_ALIGN_CENTRE       0
-#define R_SB_ALIGN_TOP          1
-#define R_SB_ALIGN_BOTTOM       2
 
-#define SB_WIDTH_NEXT           19
-#define SB_WIDTH_XTERM          15
-#define SB_WIDTH_PLAIN          7
-#ifndef SB_WIDTH_RXVT
-# define SB_WIDTH_RXVT          10
-#endif
-
-/*
- * NeXT scrollbar defines
- */
-#define SB_PADDING              1
-#define SB_BORDER_WIDTH         1
-#define SB_BEVEL_WIDTH_UPPER_LEFT       1
-#define SB_BEVEL_WIDTH_LOWER_RIGHT      2
-#define SB_LEFT_PADDING         (SB_PADDING + SB_BORDER_WIDTH)
-#define SB_MARGIN_SPACE         (SB_PADDING * 2)
-#define SB_BUTTON_WIDTH         (SB_WIDTH_NEXT - SB_MARGIN_SPACE - SB_BORDER_WIDTH)
-#define SB_BUTTON_HEIGHT        (SB_BUTTON_WIDTH)
-#define SB_BUTTON_SINGLE_HEIGHT (SB_BUTTON_HEIGHT + SB_PADDING)
-#define SB_BUTTON_BOTH_HEIGHT   (SB_BUTTON_SINGLE_HEIGHT * 2)
-#define SB_BUTTON_TOTAL_HEIGHT  (SB_BUTTON_BOTH_HEIGHT + SB_PADDING)
-#define SB_BUTTON_BEVEL_X       (SB_LEFT_PADDING)
-#define SB_BUTTON_FACE_X        (SB_BUTTON_BEVEL_X + SB_BEVEL_WIDTH_UPPER_LEFT)
-#define SB_THUMB_MIN_HEIGHT     (SB_BUTTON_WIDTH - (SB_PADDING * 2))
  /*
   *    +-------------+
   *    |             | <---< SB_PADDING