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.5 by pcg, Sat Jan 31 04:12:10 2004 UTC vs.
Revision 1.6 by pcg, Sun Feb 1 01:34:41 2004 UTC

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 __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 35rxvt_term::scrollbar_show_xterm (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)
36{ 36{
37 int xsb = 0; 37 int xsb = 0;
38 int sbwidth = scrollBar.width - 1; 38 int sbwidth = scrollBar.width - 1;
39 39
40 if ((scrollBar.init & R_SB_XTERM) == 0) { 40 if ((scrollBar.init & R_SB_XTERM) == 0)
41 {
41 XGCValues gcvalue; 42 XGCValues gcvalue;
42 43
43 scrollBar.init |= R_SB_XTERM; 44 scrollBar.init |= R_SB_XTERM;
44 gcvalue.stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win, 45 gcvalue.stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win,
45 (char *)x_stp_bits, x_stp_width, 46 (char *)x_stp_bits, x_stp_width,
46 x_stp_height); 47 x_stp_height);
47 if (!gcvalue.stipple) { 48 if (!gcvalue.stipple)
49 {
48 rxvt_print_error("can't create bitmap"); 50 rxvt_print_error("can't create bitmap");
49 exit(EXIT_FAILURE); 51 exit(EXIT_FAILURE);
50 } 52 }
51 gcvalue.fill_style = FillOpaqueStippled; 53 gcvalue.fill_style = FillOpaqueStippled;
52 gcvalue.foreground = PixColors[Color_fg]; 54 gcvalue.foreground = PixColors[Color_fg];
53 gcvalue.background = PixColors[Color_bg]; 55 gcvalue.background = PixColors[Color_bg];
54 56
55 xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win, 57 xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win,
56 GCForeground | GCBackground 58 GCForeground | GCBackground
57 | GCFillStyle | GCStipple, &gcvalue); 59 | GCFillStyle | GCStipple, &gcvalue);
58 gcvalue.foreground = PixColors[Color_border]; 60 gcvalue.foreground = PixColors[Color_border];
59 ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground, &gcvalue); 61 ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground, &gcvalue);
60 } 62 }
61/* instead of XClearWindow (Xdisplay, scrollBar.win); */ 63 /* instead of XClearWindow (Xdisplay, scrollBar.win); */
62 xsb = (Options & Opt_scrollBar_right) ? 1 : 0; 64 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
63 if (last_top < scrollBar.top) 65 if (last_top < scrollBar.top)
64 XClearArea(Xdisplay, scrollBar.win, 66 XClearArea(Xdisplay, scrollBar.win,
65 sb_shadow + xsb, last_top, 67 sb_shadow + xsb, last_top,
66 sbwidth, (scrollBar.top - last_top), False); 68 sbwidth, (scrollBar.top - last_top), False);
67 69
68 if (scrollBar.bot < last_bot) 70 if (scrollBar.bot < last_bot)
69 XClearArea(Xdisplay, scrollBar.win, 71 XClearArea(Xdisplay, scrollBar.win,
70 sb_shadow + xsb, scrollBar.bot, 72 sb_shadow + xsb, scrollBar.bot,
71 sbwidth, (last_bot - scrollBar.bot), False); 73 sbwidth, (last_bot - scrollBar.bot), False);
72 74
73/* scrollbar slider */ 75 /* scrollbar slider */
74 XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC, 76 XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC,
75 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len); 77 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
76 78
77 XDrawLine(Xdisplay, scrollBar.win, ShadowGC, 79 XDrawLine(Xdisplay, scrollBar.win, ShadowGC,
78 xsb ? 0 : sbwidth, scrollBar.beg, 80 xsb ? 0 : sbwidth, scrollBar.beg,
79 xsb ? 0 : sbwidth, scrollBar.end); 81 xsb ? 0 : sbwidth, scrollBar.end);
80 return 1; 82 return 1;
81} 83}
82#endif /* XTERM_SCROLLBAR */ 84#endif /* XTERM_SCROLLBAR */
83/*----------------------- end-of-file (C source) -----------------------*/ 85/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines