… | |
… | |
35 | rxvt_term::scrollbar_mapping (int map) |
35 | rxvt_term::scrollbar_mapping (int map) |
36 | { |
36 | { |
37 | int change = 0; |
37 | int change = 0; |
38 | |
38 | |
39 | #ifdef HAVE_SCROLLBARS |
39 | #ifdef HAVE_SCROLLBARS |
40 | if (map && !scrollbar_visible ()) |
40 | if (map) |
41 | { |
41 | { |
42 | scrollBar.setIdle (); |
42 | scrollBar.setIdle (); |
|
|
43 | |
43 | if (!scrollBar.win) |
44 | if (!scrollBar.win) |
44 | resize_scrollbar (); |
45 | resize_scrollbar (); |
|
|
46 | |
45 | if (scrollBar.win) |
47 | if (scrollBar.win) |
46 | { |
48 | { |
47 | XMapWindow (display->display, scrollBar.win); |
49 | XMapWindow (display->display, scrollBar.win); |
48 | change = 1; |
50 | change = 1; |
49 | } |
51 | } |
50 | } |
52 | } |
51 | else if (!map && scrollbar_visible ()) |
53 | else |
52 | { |
54 | { |
53 | scrollBar.state = 0; |
55 | scrollBar.state = 0; |
54 | XUnmapWindow (display->display, scrollBar.win); |
56 | XUnmapWindow (display->display, scrollBar.win); |
55 | change = 1; |
57 | change = 1; |
56 | } |
58 | } |
… | |
… | |
66 | |
68 | |
67 | #define R_SCROLLBEG_XTERM 0 |
69 | #define R_SCROLLBEG_XTERM 0 |
68 | #define R_SCROLLEND_XTERM szHint.height |
70 | #define R_SCROLLEND_XTERM szHint.height |
69 | #define R_SCROLLBEG_NEXT 0 |
71 | #define R_SCROLLBEG_NEXT 0 |
70 | #define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ |
72 | #define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ |
71 | SB_PADDING) |
73 | SB_PADDING) |
72 | #define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow |
74 | #define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow |
73 | #define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ |
75 | #define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ |
74 | (2 * sb_shadow) |
76 | (2 * sb_shadow) |
75 | |
77 | |
76 | #if defined(PLAIN_SCROLLBAR) |
78 | #if defined(PLAIN_SCROLLBAR) |
77 | if (scrollBar.style == R_SB_PLAIN) |
79 | if (scrollBar.style == R_SB_PLAIN) |
78 | { |
80 | { |
79 | scrollBar.beg = R_SCROLLBEG_XTERM; |
81 | scrollBar.beg = R_SCROLLBEG_XTERM; |
… | |
… | |
108 | |
110 | |
109 | if (!scrollBar.win) |
111 | if (!scrollBar.win) |
110 | { |
112 | { |
111 | /* create the scrollbar window */ |
113 | /* create the scrollbar window */ |
112 | scrollBar.win = XCreateSimpleWindow (display->display, |
114 | scrollBar.win = XCreateSimpleWindow (display->display, |
113 | TermWin.parent[0], |
115 | parent[0], |
114 | window_sb_x, 0, |
116 | window_sb_x, 0, |
115 | scrollbar_TotalWidth (), |
117 | scrollbar_TotalWidth (), |
116 | szHint.height, |
118 | szHint.height, |
117 | 0, |
119 | 0, |
118 | pix_colors[Color_fg], |
120 | pix_colors[Color_fg], |
119 | pix_colors[Color_bg]); |
121 | pix_colors[Color_border]); |
120 | #ifdef DEBUG_X |
122 | #ifdef DEBUG_X |
121 | XStoreName (display->display, scrollBar.win, "scrollbar"); |
123 | XStoreName (display->display, scrollBar.win, "scrollbar"); |
122 | #endif |
124 | #endif |
123 | XDefineCursor (display->display, scrollBar.win, leftptr_cursor); |
125 | XDefineCursor (display->display, scrollBar.win, leftptr_cursor); |
124 | |
126 | |
… | |
… | |
151 | if (!scrollbar_visible ()) |
153 | if (!scrollbar_visible ()) |
152 | return 0; |
154 | return 0; |
153 | |
155 | |
154 | if (update) |
156 | if (update) |
155 | { |
157 | { |
156 | top = (TermWin.nscrolled - TermWin.view_start); |
158 | top = view_start - top_row; |
157 | bot = top + (TermWin.nrow - 1); |
159 | bot = top + (nrow - 1); |
158 | len = max ((TermWin.nscrolled + (TermWin.nrow - 1)), 1); |
160 | len = max (nrow - 1 - top_row, 1); |
159 | adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; |
161 | adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; |
160 | |
162 | |
161 | scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); |
163 | scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); |
162 | scrollbar_len = ((bot - top) * scrollbar_size ()) / len + |
164 | scrollbar_len = ((bot - top) * scrollbar_size ()) / len + |
163 | scrollbar_minheight () + adj; |
165 | scrollbar_minheight () + adj; |
… | |
… | |
228 | if (style != R_SB_NEXT) /* dishonour request - for now */ |
230 | if (style != R_SB_NEXT) /* dishonour request - for now */ |
229 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
231 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
230 | width = min (i, SB_WIDTH_MAXIMUM); |
232 | width = min (i, SB_WIDTH_MAXIMUM); |
231 | |
233 | |
232 | # if defined(RXVT_SCROLLBAR) |
234 | # if defined(RXVT_SCROLLBAR) |
233 | if (! (options & Opt_scrollBar_floating) && style == R_SB_RXVT) |
235 | if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT) |
234 | sb_shadow = SHADOW; |
236 | sb_shadow = MENU_SHADOW; |
235 | # endif |
237 | # endif |
236 | |
238 | |
237 | scrollBar.style = style; |
239 | scrollBar.style = style; |
238 | scrollBar.width = width; |
240 | scrollBar.width = width; |
239 | |
241 | |