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.7 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.9 by pcg, Wed Mar 17 03:47:14 2004 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 __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 {
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 (display->display, 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 {
50 rxvt_print_error("can't create bitmap"); 49 rxvt_fatal ("can't create bitmap");
51 exit(EXIT_FAILURE); 50
52 }
53 gcvalue.fill_style = FillOpaqueStippled; 51 gcvalue.fill_style = FillOpaqueStippled;
54 gcvalue.foreground = PixColors[Color_fg]; 52 gcvalue.foreground = PixColors[Color_fg];
55 gcvalue.background = PixColors[Color_bg]; 53 gcvalue.background = PixColors[Color_bg];
56 54
57 xscrollbarGC = XCreateGC(display->display, scrollBar.win, 55 xscrollbarGC = XCreateGC (display->display, scrollBar.win,
58 GCForeground | GCBackground 56 GCForeground | GCBackground
59 | GCFillStyle | GCStipple, &gcvalue); 57 | GCFillStyle | GCStipple, &gcvalue);
60 gcvalue.foreground = PixColors[Color_border]; 58 gcvalue.foreground = PixColors[Color_border];
61 ShadowGC = XCreateGC(display->display, scrollBar.win, GCForeground, &gcvalue); 59 ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue);
62 } 60 }
63 /* instead of XClearWindow (display->display, scrollBar.win); */ 61 /* instead of XClearWindow (display->display, scrollBar.win); */
64 xsb = (Options & Opt_scrollBar_right) ? 1 : 0; 62 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
65 if (last_top < scrollBar.top) 63 if (last_top < scrollBar.top)
66 XClearArea(display->display, scrollBar.win, 64 XClearArea (display->display, scrollBar.win,
67 sb_shadow + xsb, last_top, 65 sb_shadow + xsb, last_top,
68 sbwidth, (scrollBar.top - last_top), False); 66 sbwidth, (scrollBar.top - last_top), False);
69 67
70 if (scrollBar.bot < last_bot) 68 if (scrollBar.bot < last_bot)
71 XClearArea(display->display, scrollBar.win, 69 XClearArea (display->display, scrollBar.win,
72 sb_shadow + xsb, scrollBar.bot, 70 sb_shadow + xsb, scrollBar.bot,
73 sbwidth, (last_bot - scrollBar.bot), False); 71 sbwidth, (last_bot - scrollBar.bot), False);
74 72
75 /* scrollbar slider */ 73 /* scrollbar slider */
76 XFillRectangle(display->display, scrollBar.win, xscrollbarGC, 74 XFillRectangle (display->display, scrollBar.win, xscrollbarGC,
77 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len); 75 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
78 76
79 XDrawLine(display->display, scrollBar.win, ShadowGC, 77 XDrawLine (display->display, scrollBar.win, ShadowGC,
80 xsb ? 0 : sbwidth, scrollBar.beg, 78 xsb ? 0 : sbwidth, scrollBar.beg,
81 xsb ? 0 : sbwidth, scrollBar.end); 79 xsb ? 0 : sbwidth, scrollBar.end);
82 return 1; 80 return 1;
83} 81}
84#endif /* XTERM_SCROLLBAR */ 82#endif /* XTERM_SCROLLBAR */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines