| … | |
… | |
| 44 | if (!scrollBar.win) |
44 | if (!scrollBar.win) |
| 45 | resize_scrollbar (); |
45 | resize_scrollbar (); |
| 46 | |
46 | |
| 47 | if (scrollBar.win) |
47 | if (scrollBar.win) |
| 48 | { |
48 | { |
| 49 | XMapWindow (display->display, scrollBar.win); |
49 | XMapWindow (xdisp, scrollBar.win); |
| 50 | change = 1; |
50 | change = 1; |
| 51 | } |
51 | } |
| 52 | } |
52 | } |
| 53 | else |
53 | else |
| 54 | { |
54 | { |
| 55 | scrollBar.state = 0; |
55 | scrollBar.state = 0; |
| 56 | XUnmapWindow (display->display, scrollBar.win); |
56 | XUnmapWindow (xdisp, scrollBar.win); |
| 57 | change = 1; |
57 | change = 1; |
| 58 | } |
58 | } |
| 59 | #endif |
59 | #endif |
| 60 | return change; |
60 | return change; |
| 61 | } |
61 | } |
| … | |
… | |
| 109 | #endif |
109 | #endif |
| 110 | |
110 | |
| 111 | if (!scrollBar.win) |
111 | if (!scrollBar.win) |
| 112 | { |
112 | { |
| 113 | /* create the scrollbar window */ |
113 | /* create the scrollbar window */ |
| 114 | scrollBar.win = XCreateSimpleWindow (display->display, |
114 | scrollBar.win = XCreateSimpleWindow (xdisp, |
| 115 | parent[0], |
115 | parent[0], |
| 116 | window_sb_x, 0, |
116 | window_sb_x, 0, |
| 117 | scrollbar_TotalWidth (), |
117 | scrollbar_TotalWidth (), |
| 118 | szHint.height, |
118 | szHint.height, |
| 119 | 0, |
119 | 0, |
| 120 | pix_colors[Color_fg], |
120 | pix_colors[Color_fg], |
| 121 | pix_colors[Color_border]); |
121 | pix_colors[Color_border]); |
| 122 | #ifdef DEBUG_X |
|
|
| 123 | XStoreName (display->display, scrollBar.win, "scrollbar"); |
|
|
| 124 | #endif |
|
|
| 125 | XDefineCursor (display->display, scrollBar.win, leftptr_cursor); |
122 | XDefineCursor (xdisp, scrollBar.win, leftptr_cursor); |
| 126 | |
123 | |
| 127 | XSelectInput (display->display, scrollBar.win, |
124 | XSelectInput (xdisp, scrollBar.win, |
| 128 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
125 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
| 129 | | Button1MotionMask | Button2MotionMask |
126 | | Button1MotionMask | Button2MotionMask |
| 130 | | Button3MotionMask); |
127 | | Button3MotionMask); |
| 131 | scrollbar_ev.start (display, scrollBar.win); |
128 | scrollbar_ev.start (display, scrollBar.win); |
| 132 | |
129 | |
| … | |
… | |
| 134 | } |
131 | } |
| 135 | |
132 | |
| 136 | scrollbar_show (1); |
133 | scrollbar_show (1); |
| 137 | |
134 | |
| 138 | if (delayed_init) |
135 | if (delayed_init) |
| 139 | XMapWindow (display->display, scrollBar.win); |
136 | XMapWindow (xdisp, scrollBar.win); |
| 140 | #endif |
137 | #endif |
| 141 | } |
138 | } |
| 142 | |
139 | |
| 143 | /* |
140 | /* |
| 144 | * Update current scrollbar view w.r.t. slider heights, etc. |
141 | * Update current scrollbar view w.r.t. slider heights, etc. |
| … | |
… | |
| 148 | { |
145 | { |
| 149 | int ret = 0; |
146 | int ret = 0; |
| 150 | #ifdef HAVE_SCROLLBARS |
147 | #ifdef HAVE_SCROLLBARS |
| 151 | int top, bot, len, adj; |
148 | int top, bot, len, adj; |
| 152 | |
149 | |
| 153 | if (!scrollbar_visible ()) |
150 | if (!scrollBar.state) |
| 154 | return 0; |
151 | return 0; |
| 155 | |
152 | |
| 156 | if (update) |
153 | if (update) |
| 157 | { |
154 | { |
| 158 | top = nsaved - view_start; |
155 | top = view_start - top_row; |
| 159 | bot = top + (nrow - 1); |
156 | bot = top + (nrow - 1); |
| 160 | len = max (nsaved + (nrow - 1), 1); |
157 | len = max (nrow - 1 - top_row, 1); |
| 161 | adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; |
158 | adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; |
| 162 | |
159 | |
| 163 | scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); |
160 | scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); |
| 164 | scrollbar_len = ((bot - top) * scrollbar_size ()) / len + |
161 | scrollbar_len = ((bot - top) * scrollbar_size ()) / len + |
| 165 | scrollbar_minheight () + adj; |
162 | scrollbar_minheight () + adj; |
| … | |
… | |
| 229 | |
226 | |
| 230 | if (style != R_SB_NEXT) /* dishonour request - for now */ |
227 | if (style != R_SB_NEXT) /* dishonour request - for now */ |
| 231 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
228 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
| 232 | width = min (i, SB_WIDTH_MAXIMUM); |
229 | width = min (i, SB_WIDTH_MAXIMUM); |
| 233 | |
230 | |
| 234 | # if defined(RXVT_SCROLLBAR) |
231 | # ifdef RXVT_SCROLLBAR |
| 235 | if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT) |
232 | if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT) |
| 236 | sb_shadow = SHADOW; |
233 | sb_shadow = 2; |
| 237 | # endif |
234 | # endif |
| 238 | |
235 | |
| 239 | scrollBar.style = style; |
236 | scrollBar.style = style; |
| 240 | scrollBar.width = width; |
237 | scrollBar.width = width; |
| 241 | |
238 | |
