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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.4 by pcg, Sat Jan 31 00:20:21 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: scrollbar-xterm.c 2 * File: scrollbar-xterm.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: scrollbar-xterm.C,v 1.3 2003/11/25 11:52:42 pcg Exp $ 4 * $Id: scrollbar-xterm.C,v 1.4 2004/01/31 00:20:21 pcg Exp $
5 * 5 *
6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
7 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 7 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.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
30 30
31#define x_stp_width 8 31#define x_stp_width 8
32#define x_stp_height 2 32#define x_stp_height 2
33const unsigned char x_stp_bits[] = { 0xff, 0xff }; 33const unsigned char x_stp_bits[] = { 0xff, 0xff };
34 34
35/* EXTPROTO */
36int 35int
37rxvt_scrollbar_show_xterm(pR_ int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 36rxvt_term::scrollbar_show_xterm (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)
38{ 37{
39 int xsb = 0; 38 int xsb = 0;
40 int sbwidth = R->scrollBar.width - 1; 39 int sbwidth = scrollBar.width - 1;
41 40
42 if ((R->scrollBar.init & R_SB_XTERM) == 0) { 41 if ((scrollBar.init & R_SB_XTERM) == 0) {
43 XGCValues gcvalue; 42 XGCValues gcvalue;
44 43
45 R->scrollBar.init |= R_SB_XTERM; 44 scrollBar.init |= R_SB_XTERM;
46 gcvalue.stipple = XCreateBitmapFromData(R->Xdisplay, R->scrollBar.win, 45 gcvalue.stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win,
47 (char *)x_stp_bits, x_stp_width, 46 (char *)x_stp_bits, x_stp_width,
48 x_stp_height); 47 x_stp_height);
49 if (!gcvalue.stipple) { 48 if (!gcvalue.stipple) {
50 rxvt_print_error("can't create bitmap"); 49 rxvt_print_error("can't create bitmap");
51 exit(EXIT_FAILURE); 50 exit(EXIT_FAILURE);
52 } 51 }
53 gcvalue.fill_style = FillOpaqueStippled; 52 gcvalue.fill_style = FillOpaqueStippled;
54 gcvalue.foreground = R->PixColors[Color_fg]; 53 gcvalue.foreground = PixColors[Color_fg];
55 gcvalue.background = R->PixColors[Color_bg]; 54 gcvalue.background = PixColors[Color_bg];
56 55
57 R->xscrollbarGC = XCreateGC(R->Xdisplay, R->scrollBar.win, 56 xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win,
58 GCForeground | GCBackground 57 GCForeground | GCBackground
59 | GCFillStyle | GCStipple, &gcvalue); 58 | GCFillStyle | GCStipple, &gcvalue);
60 gcvalue.foreground = R->PixColors[Color_border]; 59 gcvalue.foreground = PixColors[Color_border];
61 R->ShadowGC = XCreateGC(R->Xdisplay, R->scrollBar.win, GCForeground, 60 ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground,
62 &gcvalue); 61 &gcvalue);
63 } 62 }
64/* instead of XClearWindow (R->Xdisplay, R->scrollBar.win); */ 63/* instead of XClearWindow (Xdisplay, scrollBar.win); */
65 xsb = (R->Options & Opt_scrollBar_right) ? 1 : 0; 64 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
66 if (last_top < R->scrollBar.top) 65 if (last_top < scrollBar.top)
67 XClearArea(R->Xdisplay, R->scrollBar.win, 66 XClearArea(Xdisplay, scrollBar.win,
68 R->sb_shadow + xsb, last_top, 67 sb_shadow + xsb, last_top,
69 sbwidth + 1, (R->scrollBar.top - last_top), False); 68 sbwidth + 1, (scrollBar.top - last_top), False);
70 69
71 if (R->scrollBar.bot < last_bot) 70 if (scrollBar.bot < last_bot)
72 XClearArea(R->Xdisplay, R->scrollBar.win, 71 XClearArea(Xdisplay, scrollBar.win,
73 R->sb_shadow + xsb, R->scrollBar.bot, 72 sb_shadow + xsb, scrollBar.bot,
74 sbwidth + 1, (last_bot - R->scrollBar.bot), False); 73 sbwidth + 1, (last_bot - scrollBar.bot), False);
75 74
76/* scrollbar slider */ 75/* scrollbar slider */
77 XFillRectangle(R->Xdisplay, R->scrollBar.win, R->xscrollbarGC, 76 XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC,
78 xsb + 1, R->scrollBar.top, sbwidth, scrollbar_len); 77 xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
79 78
80 /*XDrawLine(R->Xdisplay, R->scrollBar.win, R->ShadowGC, 79 /*XDrawLine(Xdisplay, scrollBar.win, ShadowGC,
81 xsb ? 0 : sbwidth, R->scrollBar.beg, 80 xsb ? 0 : sbwidth, scrollBar.beg,
82 xsb ? 0 : sbwidth, R->scrollBar.end);*/ 81 xsb ? 0 : sbwidth, scrollBar.end);*/
83 return 1; 82 return 1;
84} 83}
85#endif /* XTERM_SCROLLBAR */ 84#endif /* XTERM_SCROLLBAR */
86/*----------------------- end-of-file (C source) -----------------------*/ 85/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines