| … | |
… | |
| 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 | XDefineCursor (display->display, scrollBar.win, leftptr_cursor); |
122 | XDefineCursor (xdisp, scrollBar.win, leftptr_cursor); |
| 123 | |
123 | |
| 124 | XSelectInput (display->display, scrollBar.win, |
124 | XSelectInput (xdisp, scrollBar.win, |
| 125 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
125 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
| 126 | | Button1MotionMask | Button2MotionMask |
126 | | Button1MotionMask | Button2MotionMask |
| 127 | | Button3MotionMask); |
127 | | Button3MotionMask); |
| 128 | scrollbar_ev.start (display, scrollBar.win); |
128 | scrollbar_ev.start (display, scrollBar.win); |
| 129 | |
129 | |
| … | |
… | |
| 131 | } |
131 | } |
| 132 | |
132 | |
| 133 | scrollbar_show (1); |
133 | scrollbar_show (1); |
| 134 | |
134 | |
| 135 | if (delayed_init) |
135 | if (delayed_init) |
| 136 | XMapWindow (display->display, scrollBar.win); |
136 | XMapWindow (xdisp, scrollBar.win); |
| 137 | #endif |
137 | #endif |
| 138 | } |
138 | } |
| 139 | |
139 | |
| 140 | /* |
140 | /* |
| 141 | * Update current scrollbar view w.r.t. slider heights, etc. |
141 | * Update current scrollbar view w.r.t. slider heights, etc. |
