Move scrollbar definitions from rxvt.h to its own header.

diff --git a/MANIFEST b/MANIFEST
index 1133c80f4981c840dc8ea41f536d5c5ffe26fc84..1e29c1ab20c3155da7c0dd3cb944549fa1e2db4a 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -83,6 +83,7 @@ src/scrollbar-rxvt.C
 src/scrollbar-xterm.C
 src/scrollbar-plain.C
 src/scrollbar.C
+src/scrollbar.h
 src/version.h
 src/xdefaults.C
 

diff --git a/src/rxvt.h b/src/rxvt.h
index 1b26ef7bfa3da1dd4b4ddbf275613cdb9b4bb9f0..4dd311cf80f0e74d3101da7134e682579d6a61f0 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -78,6 +78,7 @@ typedef  int32_t tlen_t_; // specifically for use in the line_t structure
 #include "rxvtutil.h"
 #include "rxvtfont.h"
 #include "rxvttoolkit.h"
+#include "scrollbar.h"
 #include "ev_cpp.h"
 #include "salloc.h"
 #include "libptytty.h"
@@ -283,85 +284,6 @@ struct mouse_event {
 # define HAVE_SCROLLBARS 1
 #endif
 
-#define R_SB_ALIGN_CENTRE       0
-#define R_SB_ALIGN_TOP          1
-#define R_SB_ALIGN_BOTTOM       2
-
-#define R_SB_NEXT               1
-#define R_SB_XTERM              2
-#define R_SB_PLAIN              4
-#define R_SB_RXVT               8
-
-#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
-  *    | ::::::::::: |
-  *    | ::::::::::: |
-  *   '''''''''''''''''
-  *   ,,,,,,,,,,,,,,,,,
-  *    | ::::::::::: |
-  *    | ::::::::::: |
-  *    |  +---------------< SB_BEVEL_WIDTH_UPPER_LEFT
-  *    |  | :::::::: |
-  *    |  V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
-  *    | +---------+ |
-  *    | | ......%%| |
-  *    | | ......%%| |
-  *    | | .. ()..%%| |
-  *    | | ......%%| |
-  *    | | %%%%%%%%| |
-  *    | +---------+ | <.........................
-  *    |             | <---< SB_PADDING         :
-  *    | +---------+ | <-+..........            :---< SB_BUTTON_TOTAL_HEIGHT
-  *    | | ......%%| |   |         :            :
-  *    | | ../\..%%| |   |---< SB_BUTTON_HEIGHT :
-  *    | | %%%%%%%%| |   |         :            :
-  *    | +---------+ | <-+         :            :
-  *    |             |             :            :
-  *    | +---------+ | <-+         :---< SB_BUTTON_BOTH_HEIGHT
-  *    | | ......%%| |   |         :            :
-  *    | | ..\/..%%| |   |         :            :
-  *    | | %%%%%%%%| |   |---< SB_BUTTON_SINGLE_HEIGHT
-  *    | +---------+ |   |         :            :
-  *    |             |   |         :            :
-  *    +-------------+ <-+.........:............:
-  *    ^^|_________| :
-  *    ||     |      :
-  *    ||     +---< SB_BUTTON_WIDTH
-  *    ||            :
-  *    |+------< SB_PADDING
-  *    |:            :
-  *    +----< SB_BORDER_WIDTH
-  *     :            :
-  *     :............:
-  *           |
-  *           +---< SB_WIDTH_NEXT
-  */
-
 enum {
   NO_REFRESH       = 0,  /* Window not visible at all!        */
   FAST_REFRESH     = 1,  /* Fully exposed window              */
@@ -745,30 +667,6 @@ typedef struct _mwmhints {
 #else
 # define scrollbar_TotalWidth() (0)
 #endif
-#define scrollbar_isMotion()    (scrollBar.state == 'm')
-#define scrollbar_isUp()        (scrollBar.state == 'U')
-#define scrollbar_isDn()        (scrollBar.state == 'D')
-#define scrollbar_isUpDn()      isupper (scrollBar.state)
-#define isScrollbarWindow(w)    (scrollBar.state && (w) == scrollBar.win)
-
-#define scrollbarnext_dnval()   (scrollBar.end + (scrollBar.width + 1))
-#define scrollbarnext_upButton(y)       ((y) > scrollBar.end \
-                                         && (y) <= scrollbarnext_dnval ())
-#define scrollbarnext_dnButton(y)       ((y) > scrollbarnext_dnval())
-#define SCROLLNEXT_MINHEIGHT    SB_THUMB_MIN_HEIGHT
-#define scrollbarrxvt_upButton(y)       ((y) < scrollBar.beg)
-#define scrollbarrxvt_dnButton(y)       ((y) > scrollBar.end)
-#define SCROLLRXVT_MINHEIGHT    10
-#define SCROLLXTERM_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 ())
 
 typedef callback<void (const char *)> log_callback;
 typedef callback<int (int)> getfd_callback;
@@ -1031,24 +929,6 @@ Opt_count
 
 /* ------------------------------------------------------------------------- */
 
-typedef struct {
-  char            state;        /* scrollbar state                          */
-  char            init;         /* scrollbar has been initialised           */
-  unsigned int    beg;          /* slider sub-window begin height           */
-  unsigned int    end;          /* slider sub-window end height             */
-  unsigned int    top;          /* slider top position                      */
-  unsigned int    bot;          /* slider bottom position                   */
-  unsigned int    style;        /* style: rxvt, xterm, next                 */
-  unsigned int    width;        /* scrollbar width                          */
-  Window          win;
-  int             (rxvt_term::*update)(int, int, int, int);
-
-  void setIdle()   { state =  1 ; }
-  void setMotion() { state = 'm'; }
-  void setUp()     { state = 'U'; }
-  void setDn()     { state = 'D'; }
-} scrollBar_t;
-
 struct rxvt_vars : TermWin_t {
   scrollBar_t     scrollBar;
   uint8_t         options[(Opt_count + 7) >> 3];

diff --git a/src/scrollbar.h b/src/scrollbar.h
new file mode 100644 (file)
index 0000000..dd775a1
--- /dev/null
+++ b/src/scrollbar.h
@@ -0,0 +1,130 @@
+#ifndef SCROLLBAR_H
+#define SCROLLBAR_H
+
+#include <X11/Xlib.h>
+
+struct rxvt_term;
+
+typedef struct {
+  char            state;        /* scrollbar state                          */
+  char            init;         /* scrollbar has been initialised           */
+  unsigned int    beg;          /* slider sub-window begin height           */
+  unsigned int    end;          /* slider sub-window end height             */
+  unsigned int    top;          /* slider top position                      */
+  unsigned int    bot;          /* slider bottom position                   */
+  unsigned int    style;        /* style: rxvt, xterm, next                 */
+  unsigned int    width;        /* scrollbar width                          */
+  Window          win;
+  int             (rxvt_term::*update)(int, int, int, int);
+
+  void setIdle()   { state =  1 ; }
+  void setMotion() { state = 'm'; }
+  void setUp()     { state = 'U'; }
+  void setDn()     { state = 'D'; }
+} scrollBar_t;
+
+#define scrollbar_isMotion()    (scrollBar.state == 'm')
+#define scrollbar_isUp()        (scrollBar.state == 'U')
+#define scrollbar_isDn()        (scrollBar.state == 'D')
+#define scrollbar_isUpDn()      isupper (scrollBar.state)
+#define isScrollbarWindow(w)    (scrollBar.state && (w) == scrollBar.win)
+
+#define scrollbarnext_dnval()   (scrollBar.end + (scrollBar.width + 1))
+#define scrollbarnext_upButton(y)       ((y) > scrollBar.end \
+                                         && (y) <= scrollbarnext_dnval ())
+#define scrollbarnext_dnButton(y)       ((y) > scrollbarnext_dnval())
+#define SCROLLNEXT_MINHEIGHT    SB_THUMB_MIN_HEIGHT
+#define scrollbarrxvt_upButton(y)       ((y) < scrollBar.beg)
+#define scrollbarrxvt_dnButton(y)       ((y) > scrollBar.end)
+#define SCROLLRXVT_MINHEIGHT    10
+#define SCROLLXTERM_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 R_SB_NEXT               1
+#define R_SB_XTERM              2
+#define R_SB_PLAIN              4
+#define R_SB_RXVT               8
+
+#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
+  *    | ::::::::::: |
+  *    | ::::::::::: |
+  *   '''''''''''''''''
+  *   ,,,,,,,,,,,,,,,,,
+  *    | ::::::::::: |
+  *    | ::::::::::: |
+  *    |  +---------------< SB_BEVEL_WIDTH_UPPER_LEFT
+  *    |  | :::::::: |
+  *    |  V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
+  *    | +---------+ |
+  *    | | ......%%| |
+  *    | | ......%%| |
+  *    | | .. ()..%%| |
+  *    | | ......%%| |
+  *    | | %%%%%%%%| |
+  *    | +---------+ | <.........................
+  *    |             | <---< SB_PADDING         :
+  *    | +---------+ | <-+..........            :---< SB_BUTTON_TOTAL_HEIGHT
+  *    | | ......%%| |   |         :            :
+  *    | | ../\..%%| |   |---< SB_BUTTON_HEIGHT :
+  *    | | %%%%%%%%| |   |         :            :
+  *    | +---------+ | <-+         :            :
+  *    |             |             :            :
+  *    | +---------+ | <-+         :---< SB_BUTTON_BOTH_HEIGHT
+  *    | | ......%%| |   |         :            :
+  *    | | ..\/..%%| |   |         :            :
+  *    | | %%%%%%%%| |   |---< SB_BUTTON_SINGLE_HEIGHT
+  *    | +---------+ |   |         :            :
+  *    |             |   |         :            :
+  *    +-------------+ <-+.........:............:
+  *    ^^|_________| :
+  *    ||     |      :
+  *    ||     +---< SB_BUTTON_WIDTH
+  *    ||            :
+  *    |+------< SB_PADDING
+  *    |:            :
+  *    +----< SB_BORDER_WIDTH
+  *     :            :
+  *     :............:
+  *           |
+  *           +---< SB_WIDTH_NEXT
+  */
+
+#endif