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

Comparing rxvt-unicode/src/scrollbar-plain.C (file contents):
Revision 1.20 by root, Mon Feb 20 22:40:35 2006 UTC vs.
Revision 1.26 by ayin, Tue Feb 19 17:49:16 2008 UTC

26 26
27/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
28#if defined(PLAIN_SCROLLBAR) 28#if defined(PLAIN_SCROLLBAR)
29 29
30int 30int
31rxvt_term::scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len) 31scrollBar_t::show_plain (int update)
32{ 32{
33 int xsb = 0; 33 int xsb = 0;
34 int sbwidth = scrollBar.width - 1; 34 int sbwidth = width - 1;
35 35
36 if ((scrollBar.init & R_SB_PLAIN) == 0) 36 if ((init & R_SB_PLAIN) == 0)
37 { 37 {
38 XGCValues gcvalue; 38 XGCValues gcvalue;
39 39
40 scrollBar.init |= R_SB_PLAIN; 40 init |= R_SB_PLAIN;
41 gcvalue.foreground = pix_colors_focused[Color_scroll]; 41 gcvalue.foreground = term->pix_colors_focused[Color_scroll];
42 42
43 pscrollbarGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue); 43 pscrollbarGC = XCreateGC (term->dpy, win, GCForeground, &gcvalue);
44 } 44 }
45 45
46 xsb = OPTION (Opt_scrollBar_right) ? 1 : 0; 46 xsb = term->option (Opt_scrollBar_right) ? 1 : 0;
47 47
48 if (update) 48 if (update)
49 { 49 {
50 if (last_top < scrollBar.top) 50 if (last_top < top)
51 XClearArea (dpy, scrollBar.win, 51 XClearArea (term->dpy, win,
52 sb_shadow, last_top, 52 0, last_top,
53 sbwidth + 1, scrollBar.top - last_top, False); 53 sbwidth + 1, top - last_top, False);
54 54
55 if (scrollBar.bot < last_bot) 55 if (bot < last_bot)
56 XClearArea (dpy, scrollBar.win, 56 XClearArea (term->dpy, win,
57 sb_shadow, scrollBar.bot, 57 0, bot,
58 sbwidth + 1, last_bot - scrollBar.bot, False); 58 sbwidth + 1, last_bot - bot, False);
59 } 59 }
60 else 60 else
61 XClearWindow (dpy, scrollBar.win); 61 XClearWindow (term->dpy, win);
62 62
63 /* scrollbar slider */ 63 /* scrollbar slider */
64 XFillRectangle (dpy, scrollBar.win, pscrollbarGC, 64 XFillRectangle (term->dpy, win, pscrollbarGC,
65 1 - xsb, scrollBar.top, sbwidth, scrollbar_len); 65 1 - xsb, top, sbwidth, bot - top);
66 66
67 return 1; 67 return 1;
68} 68}
69 69
70#endif 70#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines