… | |
… | |
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 (xdisp, 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 (xdisp, scrollBar.win); |
56 | XUnmapWindow (dpy, scrollBar.win); |
57 | change = 1; |
57 | change = 1; |
58 | } |
58 | } |
59 | #endif |
59 | #endif |
60 | |
60 | |
61 | return change; |
61 | return change; |
… | |
… | |
110 | #endif |
110 | #endif |
111 | |
111 | |
112 | if (!scrollBar.win) |
112 | if (!scrollBar.win) |
113 | { |
113 | { |
114 | /* create the scrollbar window */ |
114 | /* create the scrollbar window */ |
115 | scrollBar.win = XCreateSimpleWindow (xdisp, |
115 | scrollBar.win = XCreateSimpleWindow (dpy, |
116 | parent[0], |
116 | parent[0], |
117 | window_sb_x, 0, |
117 | window_sb_x, 0, |
118 | scrollbar_TotalWidth (), |
118 | scrollbar_TotalWidth (), |
119 | szHint.height, |
119 | szHint.height, |
120 | 0, |
120 | 0, |
121 | pix_colors[Color_fg], |
121 | pix_colors[Color_fg], |
122 | pix_colors[Color_border]); |
122 | pix_colors[Color_border]); |
123 | XDefineCursor (xdisp, scrollBar.win, leftptr_cursor); |
123 | XDefineCursor (dpy, scrollBar.win, leftptr_cursor); |
124 | |
124 | |
125 | XSelectInput (xdisp, scrollBar.win, |
125 | XSelectInput (dpy, scrollBar.win, |
126 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
126 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
127 | | Button1MotionMask | Button2MotionMask |
127 | | Button1MotionMask | Button2MotionMask |
128 | | Button3MotionMask); |
128 | | Button3MotionMask); |
129 | scrollbar_ev.start (display, scrollBar.win); |
129 | scrollbar_ev.start (display, scrollBar.win); |
130 | |
130 | |
… | |
… | |
132 | } |
132 | } |
133 | |
133 | |
134 | scrollbar_show (1); |
134 | scrollbar_show (1); |
135 | |
135 | |
136 | if (delayed_init) |
136 | if (delayed_init) |
137 | XMapWindow (xdisp, scrollBar.win); |
137 | XMapWindow (dpy, scrollBar.win); |
138 | #endif |
138 | #endif |
139 | } |
139 | } |
140 | |
140 | |
141 | /* |
141 | /* |
142 | * Update current scrollbar view w.r.t. slider heights, etc. |
142 | * Update current scrollbar view w.r.t. slider heights, etc. |