| … | |
… | |
| 4 | * |
4 | * |
| 5 | * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> |
5 | * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> |
| 6 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
6 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
| 7 | * - N*XTstep like scrollbars |
7 | * - N*XTstep like scrollbars |
| 8 | * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> |
8 | * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> |
| 9 | * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> |
9 | * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com> |
| 10 | * |
10 | * |
| 11 | * This program is free software; you can redistribute it and/or modify |
11 | * This program is free software; you can redistribute it and/or modify |
| 12 | * it under the terms of the GNU General Public License as published by |
12 | * it under the terms of the GNU General Public License as published by |
| 13 | * the Free Software Foundation; either version 2 of the License, or |
13 | * the Free Software Foundation; either version 2 of the License, or |
| 14 | * (at your option) any later version. |
14 | * (at your option) any later version. |
| … | |
… | |
| 32 | * Map or unmap a scrollbar. Returns non-zero upon change of state |
32 | * Map or unmap a scrollbar. Returns non-zero upon change of state |
| 33 | */ |
33 | */ |
| 34 | int |
34 | int |
| 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) |
40 | if (map) |
| 41 | { |
41 | { |
| 42 | scrollBar.setIdle (); |
42 | scrollBar.setIdle (); |
| … | |
… | |
| 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 (dpy, 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 (dpy, scrollBar.win); |
| 57 | change = 1; |
57 | change = 1; |
| 58 | } |
58 | } |
| 59 | #endif |
59 | #endif |
|
|
60 | |
| 60 | return change; |
61 | return change; |
| 61 | } |
62 | } |
| 62 | |
63 | |
| 63 | void |
64 | void |
| 64 | rxvt_term::resize_scrollbar () |
65 | rxvt_term::resize_scrollbar () |
| … | |
… | |
| 109 | #endif |
110 | #endif |
| 110 | |
111 | |
| 111 | if (!scrollBar.win) |
112 | if (!scrollBar.win) |
| 112 | { |
113 | { |
| 113 | /* create the scrollbar window */ |
114 | /* create the scrollbar window */ |
| 114 | scrollBar.win = XCreateSimpleWindow (display->display, |
115 | scrollBar.win = XCreateSimpleWindow (dpy, |
| 115 | parent[0], |
116 | parent[0], |
| 116 | window_sb_x, 0, |
117 | window_sb_x, 0, |
| 117 | scrollbar_TotalWidth (), |
118 | scrollbar_TotalWidth (), |
| 118 | szHint.height, |
119 | szHint.height, |
| 119 | 0, |
120 | 0, |
| 120 | pix_colors[Color_fg], |
121 | pix_colors[Color_fg], |
| 121 | pix_colors[Color_border]); |
122 | pix_colors[Color_border]); |
| 122 | XDefineCursor (display->display, scrollBar.win, leftptr_cursor); |
123 | XDefineCursor (dpy, scrollBar.win, leftptr_cursor); |
| 123 | |
124 | |
| 124 | XSelectInput (display->display, scrollBar.win, |
125 | XSelectInput (dpy, scrollBar.win, |
| 125 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
126 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
| 126 | | Button1MotionMask | Button2MotionMask |
127 | | Button1MotionMask | Button2MotionMask |
| 127 | | Button3MotionMask); |
128 | | Button3MotionMask); |
| 128 | scrollbar_ev.start (display, scrollBar.win); |
129 | scrollbar_ev.start (display, scrollBar.win); |
| 129 | |
130 | |
| … | |
… | |
| 131 | } |
132 | } |
| 132 | |
133 | |
| 133 | scrollbar_show (1); |
134 | scrollbar_show (1); |
| 134 | |
135 | |
| 135 | if (delayed_init) |
136 | if (delayed_init) |
| 136 | XMapWindow (display->display, scrollBar.win); |
137 | XMapWindow (dpy, scrollBar.win); |
| 137 | #endif |
138 | #endif |
| 138 | } |
139 | } |
| 139 | |
140 | |
| 140 | /* |
141 | /* |
| 141 | * Update current scrollbar view w.r.t. slider heights, etc. |
142 | * Update current scrollbar view w.r.t. slider heights, etc. |
| … | |
… | |
| 228 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
229 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
| 229 | width = min (i, SB_WIDTH_MAXIMUM); |
230 | width = min (i, SB_WIDTH_MAXIMUM); |
| 230 | |
231 | |
| 231 | # ifdef RXVT_SCROLLBAR |
232 | # ifdef RXVT_SCROLLBAR |
| 232 | if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT) |
233 | if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT) |
| 233 | sb_shadow = 2; |
234 | sb_shadow = SHADOW_WIDTH; |
| 234 | # endif |
235 | # endif |
| 235 | |
236 | |
| 236 | scrollBar.style = style; |
237 | scrollBar.style = style; |
| 237 | scrollBar.width = width; |
238 | scrollBar.width = width; |
| 238 | |
239 | |
