ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/scrollbar-xterm.C
(Generate patch)

Comparing rxvt-unicode/src/scrollbar-xterm.C (file contents):
Revision 1.18 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.26 by ayin, Tue Dec 18 11:08:45 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: scrollbar-xterm.C 2 * File: scrollbar-xterm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 7 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
40 if ((scrollBar.init & R_SB_XTERM) == 0) 40 if ((scrollBar.init & R_SB_XTERM) == 0)
41 { 41 {
42 XGCValues gcvalue; 42 XGCValues gcvalue;
43 43
44 scrollBar.init |= R_SB_XTERM; 44 scrollBar.init |= R_SB_XTERM;
45 gcvalue.stipple = XCreateBitmapFromData (display->display, scrollBar.win, 45 gcvalue.stipple = XCreateBitmapFromData (dpy, scrollBar.win,
46 (char *)x_stp_bits, x_stp_width, 46 (char *)x_stp_bits, x_stp_width,
47 x_stp_height); 47 x_stp_height);
48 if (!gcvalue.stipple) 48 if (!gcvalue.stipple)
49 rxvt_fatal ("can't create bitmap\n"); 49 rxvt_fatal ("can't create bitmap\n");
50 50
51 gcvalue.fill_style = FillOpaqueStippled; 51 gcvalue.fill_style = FillOpaqueStippled;
52 gcvalue.foreground = pix_colors_focused[Color_fg]; 52 gcvalue.foreground = pix_colors_focused[Color_scroll];
53 gcvalue.background = pix_colors_focused[Color_bg]; 53 gcvalue.background = pix_colors_focused[Color_bg];
54 54
55 xscrollbarGC = XCreateGC (display->display, scrollBar.win, 55 xscrollbarGC = XCreateGC (dpy, scrollBar.win,
56 GCForeground | GCBackground 56 GCForeground | GCBackground
57 | GCFillStyle | GCStipple, &gcvalue); 57 | GCFillStyle | GCStipple, &gcvalue);
58 gcvalue.foreground = pix_colors_focused[Color_border]; 58 gcvalue.foreground = pix_colors_focused[Color_border];
59 ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue); 59 ShadowGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue);
60 } 60 }
61
62 xsb = option (Opt_scrollBar_right) ? 1 : 0;
61 63
62 if (update) 64 if (update)
63 { 65 {
64 xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
65 if (last_top < scrollBar.top) 66 if (last_top < scrollBar.top)
66 XClearArea (display->display, scrollBar.win, 67 XClearArea (dpy, scrollBar.win,
67 sb_shadow + xsb, last_top, 68 sb_shadow + xsb, last_top,
68 sbwidth, (scrollBar.top - last_top), False); 69 sbwidth, (scrollBar.top - last_top), False);
69 70
70 if (scrollBar.bot < last_bot) 71 if (scrollBar.bot < last_bot)
71 XClearArea (display->display, scrollBar.win, 72 XClearArea (dpy, scrollBar.win,
72 sb_shadow + xsb, scrollBar.bot, 73 sb_shadow + xsb, scrollBar.bot,
73 sbwidth, (last_bot - scrollBar.bot), False); 74 sbwidth, (last_bot - scrollBar.bot), False);
74 } 75 }
75 else 76 else
76 XClearWindow (display->display, scrollBar.win); 77 XClearWindow (dpy, scrollBar.win);
77 78
78 /* scrollbar slider */ 79 /* scrollbar slider */
79 XFillRectangle (display->display, scrollBar.win, xscrollbarGC, 80 XFillRectangle (dpy, scrollBar.win, xscrollbarGC,
80 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len); 81 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
81 82
82 XDrawLine (display->display, scrollBar.win, ShadowGC, 83 XDrawLine (dpy, scrollBar.win, ShadowGC,
83 xsb ? 0 : sbwidth, scrollBar.beg, 84 xsb ? 0 : sbwidth, scrollBar.beg,
84 xsb ? 0 : sbwidth, scrollBar.end); 85 xsb ? 0 : sbwidth, scrollBar.end);
85 return 1; 86 return 1;
86} 87}
87#endif /* XTERM_SCROLLBAR */ 88#endif /* XTERM_SCROLLBAR */
88/*----------------------- end-of-file (C source) -----------------------*/ 89/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines