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.30 by ayin, Sun Feb 17 19:07:20 2008 UTC vs.
Revision 1.31 by ayin, Tue Feb 19 13:01:33 2008 UTC

30#define x_stp_width 8 30#define x_stp_width 8
31#define x_stp_height 2 31#define x_stp_height 2
32const unsigned char x_stp_bits[] = { 0xaa, 0x55 }; 32const unsigned char x_stp_bits[] = { 0xaa, 0x55 };
33 33
34int 34int
35rxvt_term::scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len) 35scrollBar_t::show_xterm (int update)
36{ 36{
37 int xsb = 0; 37 int xsb = 0;
38 int sbwidth = scrollBar.width - 1; 38 int sbwidth = width - 1;
39 39
40 if ((scrollBar.init & R_SB_XTERM) == 0) 40 if ((init & R_SB_XTERM) == 0)
41 { 41 {
42 XGCValues gcvalue; 42 XGCValues gcvalue;
43 43
44 scrollBar.init |= R_SB_XTERM; 44 init |= R_SB_XTERM;
45 gcvalue.stipple = XCreateBitmapFromData (dpy, scrollBar.win, 45 gcvalue.stipple = XCreateBitmapFromData (term->dpy, 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_scroll]; 52 gcvalue.foreground = term->pix_colors_focused[Color_scroll];
53 gcvalue.background = pix_colors_focused[Color_bg]; 53 gcvalue.background = term->pix_colors_focused[Color_bg];
54 54
55 xscrollbarGC = XCreateGC (dpy, scrollBar.win, 55 xscrollbarGC = XCreateGC (term->dpy, 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 = term->pix_colors_focused[Color_border];
59 ShadowGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue); 59 ShadowGC = XCreateGC (term->dpy, win, GCForeground, &gcvalue);
60 } 60 }
61 61
62 xsb = option (Opt_scrollBar_right) ? 1 : 0; 62 xsb = term->option (Opt_scrollBar_right) ? 1 : 0;
63 63
64 if (update) 64 if (update)
65 { 65 {
66 if (last_top < scrollBar.top) 66 if (last_top < top)
67 XClearArea (dpy, scrollBar.win, 67 XClearArea (term->dpy, win,
68 xsb, last_top, 68 xsb, last_top,
69 sbwidth, (scrollBar.top - last_top), False); 69 sbwidth, (top - last_top), False);
70 70
71 if (scrollBar.bot < last_bot) 71 if (bot < last_bot)
72 XClearArea (dpy, scrollBar.win, 72 XClearArea (term->dpy, win,
73 xsb, scrollBar.bot, 73 xsb, bot,
74 sbwidth, (last_bot - scrollBar.bot), False); 74 sbwidth, (last_bot - bot), False);
75 } 75 }
76 else 76 else
77 XClearWindow (dpy, scrollBar.win); 77 XClearWindow (term->dpy, win);
78 78
79 /* scrollbar slider */ 79 /* scrollbar slider */
80 XFillRectangle (dpy, scrollBar.win, xscrollbarGC, 80 XFillRectangle (term->dpy, win, xscrollbarGC,
81 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len); 81 xsb + 1, top, sbwidth - 2, len);
82 82
83 XDrawLine (dpy, scrollBar.win, ShadowGC, 83 XDrawLine (term->dpy, win, ShadowGC,
84 xsb ? 0 : sbwidth, scrollBar.beg, 84 xsb ? 0 : sbwidth, beg,
85 xsb ? 0 : sbwidth, scrollBar.end); 85 xsb ? 0 : sbwidth, end);
86 return 1; 86 return 1;
87} 87}
88#endif /* XTERM_SCROLLBAR */ 88#endif /* XTERM_SCROLLBAR */
89/*----------------------- end-of-file (C source) -----------------------*/ 89/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines