… | |
… | |
8 | * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> |
8 | * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> |
9 | * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de> |
9 | * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de> |
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 3 of the License, or |
14 | * (at your option) any later version. |
14 | * (at your option) any later version. |
15 | * |
15 | * |
16 | * This program is distributed in the hope that it will be useful, |
16 | * This program is distributed in the hope that it will be useful, |
17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
233 | scrollBar_t::show_next (int update) |
233 | scrollBar_t::show_next (int update) |
234 | { |
234 | { |
235 | int height = end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; |
235 | int height = end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; |
236 | Drawable src; |
236 | Drawable src; |
237 | |
237 | |
238 | if ((init & R_SB_NEXT) == 0) |
238 | if ((init & SB_STYLE_NEXT) == 0) |
239 | { |
239 | { |
240 | init |= R_SB_NEXT; |
240 | init |= SB_STYLE_NEXT; |
241 | init_next (); |
241 | init_next (); |
242 | } |
242 | } |
243 | |
243 | |
244 | if (term->top_row == 0 || !update) |
244 | if (term->top_row == 0 || !update) |
245 | { |
245 | { |
… | |
… | |
282 | SB_BUTTON_HEIGHT); |
282 | SB_BUTTON_HEIGHT); |
283 | drawBevel (this, SB_BUTTON_BEVEL_X, |
283 | drawBevel (this, SB_BUTTON_BEVEL_X, |
284 | height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, |
284 | height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, |
285 | SB_BUTTON_HEIGHT); |
285 | SB_BUTTON_HEIGHT); |
286 | |
286 | |
287 | src = state == STATE_UP ? upArrowHi : upArrow; |
287 | src = state == SB_STATE_UP ? upArrowHi : upArrow; |
288 | XCopyArea (term->dpy, src, win, whiteGC, 0, 0, |
288 | XCopyArea (term->dpy, src, win, whiteGC, 0, 0, |
289 | ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, |
289 | ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, |
290 | height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); |
290 | height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); |
291 | |
291 | |
292 | src = state == STATE_DOWN ? downArrowHi : downArrow; |
292 | src = state == SB_STATE_DOWN ? downArrowHi : downArrow; |
293 | XCopyArea (term->dpy, src, win, whiteGC, 0, 0, |
293 | XCopyArea (term->dpy, src, win, whiteGC, 0, 0, |
294 | ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, |
294 | ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, |
295 | height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); |
295 | height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); |
296 | } |
296 | } |
297 | |
297 | |