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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.27 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.31 by pcg, Mon Feb 9 07:11:49 2004 UTC

… …
182 182
183#define menuBar_esc 10 183#define menuBar_esc 10
184#define scrollBar_esc 30 184#define scrollBar_esc 30
185#define menuBar_margin 2 /* margin below text */ 185#define menuBar_margin 2 /* margin below text */
186 186
187#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 187#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
188# define HAVE_SCROLLBARS 188# define HAVE_SCROLLBARS
189#endif 189#endif
190 190
191/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 191/* width of scrollBar, menuBar shadow, must be 1 or 2 */
192#ifdef HALFSHADOW 192#ifdef HALFSHADOW
… …
200#define R_SB_ALIGN_BOTTOM 2 200#define R_SB_ALIGN_BOTTOM 2
201 201
202#define R_SB_RXVT 0 202#define R_SB_RXVT 0
203#define R_SB_NEXT 1 203#define R_SB_NEXT 1
204#define R_SB_XTERM 2 204#define R_SB_XTERM 2
205#define R_SB_PLAIN 4
205 206
206#define SB_WIDTH_NEXT 19 207#define SB_WIDTH_NEXT 19
207#define SB_WIDTH_XTERM 7 208#define SB_WIDTH_XTERM 15
209#define SB_WIDTH_PLAIN 7
208#ifndef SB_WIDTH_RXVT 210#ifndef SB_WIDTH_RXVT
209# define SB_WIDTH_RXVT 10 211# define SB_WIDTH_RXVT 10
210#endif 212#endif
211 213
212/* 214/*
… …
604#else 606#else
605# define PrivMode_Default \ 607# define PrivMode_Default \
606(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 608(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
607#endif 609#endif
608 610
609#define XDEPTH Xdepth 611#define XDEPTH display->depth
610#define XCMAP Xcmap 612#define XCMAP display->cmap
611#define XVISUAL Xvisual 613#define XVISUAL display->visual
612 614
613#define IMBUFSIZ 128 /* input modifier buffer sizes */ 615#define IMBUFSIZ 128 /* input modifier buffer sizes */
614#ifndef BUFSIZ 616#ifndef BUFSIZ
615# define BUFSIZ 4096 617# define BUFSIZ 4096
616#endif 618#endif
… …
648#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 650#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
649 651
650#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 652#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth)
651#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) 653#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth)
652 654
653#define Xroot DefaultRootWindow(Xdisplay)
654
655/* how to build & extract colors and attributes */ 655/* how to build & extract colors and attributes */
656#define GET_BASEFG(x) (((x) & RS_fgMask)) 656#define GET_BASEFG(x) (((x) & RS_fgMask))
657#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 657#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
658#ifndef NO_BRIGHTCOLOR 658#ifndef NO_BRIGHTCOLOR
659# define GET_FGCOLOR(x) \ 659# define GET_FGCOLOR(x) \
… …
948#endif 948#endif
949#ifdef XTERM_SCROLLBAR 949#ifdef XTERM_SCROLLBAR
950 GC xscrollbarGC, 950 GC xscrollbarGC,
951 ShadowGC; 951 ShadowGC;
952#endif 952#endif
953#ifdef PLAIN_SCROLLBAR
954 GC pscrollbarGC;
955#endif
953#ifdef NEXT_SCROLLBAR 956#ifdef NEXT_SCROLLBAR
954 GC blackGC, 957 GC blackGC,
955 whiteGC, 958 whiteGC,
956 grayGC, 959 grayGC,
957 darkGC, 960 darkGC,
… …
1068 1071
1069 void paste (const unsigned char *data, unsigned int len); 1072 void paste (const unsigned char *data, unsigned int len);
1070 1073
1071 void flush (); 1074 void flush ();
1072 1075
1076#ifdef TRANSPARENT
1077 void rootwin_cb (XEvent &xev);
1078 xevent_watcher rootwin_ev;
1079#endif
1080
1081 void x_cb (XEvent &xev);
1082 xevent_watcher termwin_ev;
1083 xevent_watcher vt_ev;
1084#ifdef HAVE_SCROLLBARS
1085 xevent_watcher scrollbar_ev;
1086#endif
1087#ifdef MENUBAR
1088 xevent_watcher menubar_ev;
1089#endif
1090
1073 void check_cb (check_watcher &w); check_watcher check_ev; 1091 void check_cb (check_watcher &w); check_watcher check_ev;
1074 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1092 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1075 1093
1076 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1094 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1077 void x_cb (io_watcher &w, short revents); io_watcher x_ev;
1078 1095
1079 void incr_cb (time_watcher &w); time_watcher incr_ev; 1096 void incr_cb (time_watcher &w); time_watcher incr_ev;
1080 1097
1081#ifdef CURSOR_BLINK 1098#ifdef CURSOR_BLINK
1082 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1099 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1104 bool init_vars (); 1121 bool init_vars ();
1105 1122
1106 uint32_t next_char (); 1123 uint32_t next_char ();
1107 1124
1108 bool pty_fill (); 1125 bool pty_fill ();
1109 void process_x_events ();
1110 1126
1111 void *operator new (size_t s); 1127 void *operator new (size_t s);
1112 void operator delete (void *p, size_t s); 1128 void operator delete (void *p, size_t s);
1113 1129
1114 void init_secondary (); 1130 void init_secondary ();
… …
1156 void scr_expose (int x, int y, int width, int height, bool refresh); 1172 void scr_expose (int x, int y, int width, int height, bool refresh);
1157 1173
1158 /* autoconvert */ 1174 /* autoconvert */
1159 1175
1160 // command.C 1176 // command.C
1161 void lookup_key (XKeyEvent *ev); 1177 void lookup_key (XKeyEvent &ev);
1162 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1178 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1163 uint32_t cmd_getc (); 1179 uint32_t cmd_getc ();
1164 void mouse_report (const XButtonEvent *ev); 1180 void mouse_report (const XButtonEvent &ev);
1165 void process_x_event (XEvent *ev);
1166 void button_press (XButtonEvent *ev); 1181 void button_press (const XButtonEvent &ev);
1167 void button_release (XButtonEvent *ev); 1182 void button_release (const XButtonEvent &ev);
1168 int check_our_parents (); 1183 int check_our_parents ();
1169#ifdef PRINTPIPE 1184#ifdef PRINTPIPE
1170 FILE * popen_printer (); 1185 FILE * popen_printer ();
1171 int pclose_printer (FILE *stream); 1186 int pclose_printer (FILE *stream);
1172#endif 1187#endif
… …
1284 void selection_make (Time tm); 1299 void selection_make (Time tm);
1285 void selection_start_colrow (int col, int row); 1300 void selection_start_colrow (int col, int row);
1286 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1301 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1287 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1302 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1288 void selection_remove_trailing_spaces (); 1303 void selection_remove_trailing_spaces ();
1289 void selection_send (const XSelectionRequestEvent *rq); 1304 void selection_send (const XSelectionRequestEvent &rq);
1290 1305
1291#if defined(NEXT_SCROLLBAR) 1306#if defined(NEXT_SCROLLBAR)
1292 // scrollbar-next.C 1307 // scrollbar-next.C
1293 Pixmap renderPixmap (const char *const *data, int width, int height); 1308 Pixmap renderPixmap (const char *const *data, int width, int height);
1294 void init_scrollbar_stuff (); 1309 void init_scrollbar_stuff ();
1295 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1310 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1296 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1311 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1297# define scrollbar_update scrollbar_show_next // HACK
1298#endif 1312#endif
1299 1313
1300#if defined(RXVT_SCROLLBAR) 1314#if defined(RXVT_SCROLLBAR)
1301 // scrollbar-rxvt.C 1315 // scrollbar-rxvt.C
1302 void Draw_button (int x, int y, int state, int dirn); 1316 void Draw_button (int x, int y, int state, int dirn);
1303 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1317 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1304# define scrollbar_update scrollbar_show_rxvt // HACK
1305#endif 1318#endif
1306 1319
1307#if defined(XTERM_SCROLLBAR) 1320#if defined(XTERM_SCROLLBAR)
1308 // scrollbar-xterm.C 1321 // scrollbar-xterm.C
1309 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len); 1322 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1310# define scrollbar_update scrollbar_show_xterm // HACK 1323#endif
1324
1325#if defined(PLAIN_SCROLLBAR)
1326 // scrollbar-plain.C
1327 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1311#endif 1328#endif
1312 1329
1313 // scrollbar.C 1330 // scrollbar.C
1314 int scrollbar_mapping (int map); 1331 int scrollbar_mapping (int map);
1315 int scrollbar_show (int update); 1332 int scrollbar_show (int update);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines