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.29 by pcg, Sat Jan 31 04:12:10 2004 UTC vs.
Revision 1.31 by pcg, Mon Feb 9 07:11:49 2004 UTC

… …
606#else 606#else
607# define PrivMode_Default \ 607# define PrivMode_Default \
608(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 608(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
609#endif 609#endif
610 610
611#define XDEPTH Xdepth 611#define XDEPTH display->depth
612#define XCMAP Xcmap 612#define XCMAP display->cmap
613#define XVISUAL Xvisual 613#define XVISUAL display->visual
614 614
615#define IMBUFSIZ 128 /* input modifier buffer sizes */ 615#define IMBUFSIZ 128 /* input modifier buffer sizes */
616#ifndef BUFSIZ 616#ifndef BUFSIZ
617# define BUFSIZ 4096 617# define BUFSIZ 4096
618#endif 618#endif
… …
650#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 650#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
651 651
652#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)
653#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)
654 654
655#define Xroot DefaultRootWindow(Xdisplay)
656
657/* how to build & extract colors and attributes */ 655/* how to build & extract colors and attributes */
658#define GET_BASEFG(x) (((x) & RS_fgMask)) 656#define GET_BASEFG(x) (((x) & RS_fgMask))
659#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 657#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
660#ifndef NO_BRIGHTCOLOR 658#ifndef NO_BRIGHTCOLOR
661# define GET_FGCOLOR(x) \ 659# define GET_FGCOLOR(x) \
… …
951#ifdef XTERM_SCROLLBAR 949#ifdef XTERM_SCROLLBAR
952 GC xscrollbarGC, 950 GC xscrollbarGC,
953 ShadowGC; 951 ShadowGC;
954#endif 952#endif
955#ifdef PLAIN_SCROLLBAR 953#ifdef PLAIN_SCROLLBAR
956 GC pscrollbarGC, 954 GC pscrollbarGC;
957 pShadowGC;
958#endif 955#endif
959#ifdef NEXT_SCROLLBAR 956#ifdef NEXT_SCROLLBAR
960 GC blackGC, 957 GC blackGC,
961 whiteGC, 958 whiteGC,
962 grayGC, 959 grayGC,
… …
1074 1071
1075 void paste (const unsigned char *data, unsigned int len); 1072 void paste (const unsigned char *data, unsigned int len);
1076 1073
1077 void flush (); 1074 void flush ();
1078 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
1079 void check_cb (check_watcher &w); check_watcher check_ev; 1091 void check_cb (check_watcher &w); check_watcher check_ev;
1080 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1092 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1081 1093
1082 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;
1083 void x_cb (io_watcher &w, short revents); io_watcher x_ev;
1084 1095
1085 void incr_cb (time_watcher &w); time_watcher incr_ev; 1096 void incr_cb (time_watcher &w); time_watcher incr_ev;
1086 1097
1087#ifdef CURSOR_BLINK 1098#ifdef CURSOR_BLINK
1088 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;
… …
1110 bool init_vars (); 1121 bool init_vars ();
1111 1122
1112 uint32_t next_char (); 1123 uint32_t next_char ();
1113 1124
1114 bool pty_fill (); 1125 bool pty_fill ();
1115 void process_x_events ();
1116 1126
1117 void *operator new (size_t s); 1127 void *operator new (size_t s);
1118 void operator delete (void *p, size_t s); 1128 void operator delete (void *p, size_t s);
1119 1129
1120 void init_secondary (); 1130 void init_secondary ();
… …
1162 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);
1163 1173
1164 /* autoconvert */ 1174 /* autoconvert */
1165 1175
1166 // command.C 1176 // command.C
1167 void lookup_key (XKeyEvent *ev); 1177 void lookup_key (XKeyEvent &ev);
1168 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1178 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1169 uint32_t cmd_getc (); 1179 uint32_t cmd_getc ();
1170 void mouse_report (const XButtonEvent *ev); 1180 void mouse_report (const XButtonEvent &ev);
1171 void process_x_event (XEvent *ev);
1172 void button_press (XButtonEvent *ev); 1181 void button_press (const XButtonEvent &ev);
1173 void button_release (XButtonEvent *ev); 1182 void button_release (const XButtonEvent &ev);
1174 int check_our_parents (); 1183 int check_our_parents ();
1175#ifdef PRINTPIPE 1184#ifdef PRINTPIPE
1176 FILE * popen_printer (); 1185 FILE * popen_printer ();
1177 int pclose_printer (FILE *stream); 1186 int pclose_printer (FILE *stream);
1178#endif 1187#endif
… …
1290 void selection_make (Time tm); 1299 void selection_make (Time tm);
1291 void selection_start_colrow (int col, int row); 1300 void selection_start_colrow (int col, int row);
1292 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);
1293 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);
1294 void selection_remove_trailing_spaces (); 1303 void selection_remove_trailing_spaces ();
1295 void selection_send (const XSelectionRequestEvent *rq); 1304 void selection_send (const XSelectionRequestEvent &rq);
1296 1305
1297#if defined(NEXT_SCROLLBAR) 1306#if defined(NEXT_SCROLLBAR)
1298 // scrollbar-next.C 1307 // scrollbar-next.C
1299 Pixmap renderPixmap (const char *const *data, int width, int height); 1308 Pixmap renderPixmap (const char *const *data, int width, int height);
1300 void init_scrollbar_stuff (); 1309 void init_scrollbar_stuff ();

Diff Legend

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