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.33 by pcg, Wed Feb 11 08:13:45 2004 UTC

… …
545 Rs_pointerBlankDelay, 545 Rs_pointerBlankDelay,
546 Rs_imLocale, 546 Rs_imLocale,
547 NUM_RESOURCES 547 NUM_RESOURCES
548}; 548};
549 549
550// see init.C:xa_named, which must be kept in sync 550// see init.C:xa_names, which must be kept in sync
551enum { 551enum {
552 XA_TEXT = 0, 552 XA_TEXT = 0,
553 XA_COMPOUND_TEXT, 553 XA_COMPOUND_TEXT,
554 XA_UTF8_STRING, 554 XA_UTF8_STRING,
555 XA_MULTIPLE, 555 XA_MULTIPLE,
… …
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,
… …
995#endif 992#endif
996#ifdef GREEK_SUPPORT 993#ifdef GREEK_SUPPORT
997 KeySym ks_greekmodeswith; 994 KeySym ks_greekmodeswith;
998#endif 995#endif
999#ifdef USE_XIM 996#ifdef USE_XIM
997 rxvt_xim *input_method;
1000 XIC Input_Context; 998 XIC Input_Context;
1001 XIMStyle input_style; 999 XIMStyle input_style;
1002 int event_type; 1000 int event_type;
1003#endif 1001#endif
1004 struct mouse_event MEvent; 1002 struct mouse_event MEvent;
… …
1074 1072
1075 void paste (const unsigned char *data, unsigned int len); 1073 void paste (const unsigned char *data, unsigned int len);
1076 1074
1077 void flush (); 1075 void flush ();
1078 1076
1077 void rootwin_cb (XEvent &xev);
1078 xevent_watcher rootwin_ev;
1079
1080 void x_cb (XEvent &xev);
1081 xevent_watcher termwin_ev;
1082 xevent_watcher vt_ev;
1083#ifdef HAVE_SCROLLBARS
1084 xevent_watcher scrollbar_ev;
1085#endif
1086#ifdef MENUBAR
1087 xevent_watcher menubar_ev;
1088#endif
1089
1079 void check_cb (check_watcher &w); check_watcher check_ev; 1090 void check_cb (check_watcher &w); check_watcher check_ev;
1080 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1091 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1081 1092
1082 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1093 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 1094
1085 void incr_cb (time_watcher &w); time_watcher incr_ev; 1095 void incr_cb (time_watcher &w); time_watcher incr_ev;
1086 1096
1087#ifdef CURSOR_BLINK 1097#ifdef CURSOR_BLINK
1088 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1098 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1110 bool init_vars (); 1120 bool init_vars ();
1111 1121
1112 uint32_t next_char (); 1122 uint32_t next_char ();
1113 1123
1114 bool pty_fill (); 1124 bool pty_fill ();
1115 void process_x_events ();
1116 1125
1117 void *operator new (size_t s); 1126 void *operator new (size_t s);
1118 void operator delete (void *p, size_t s); 1127 void operator delete (void *p, size_t s);
1119 1128
1120 void init_secondary (); 1129 void init_secondary ();
… …
1129 void color_aliases(int idx); 1138 void color_aliases(int idx);
1130 void recolour_cursor (); 1139 void recolour_cursor ();
1131 void create_windows (int argc, const char *const *argv); 1140 void create_windows (int argc, const char *const *argv);
1132 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1141 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1133 void window_calc (unsigned int width, unsigned int height); 1142 void window_calc (unsigned int width, unsigned int height);
1134 void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1135 1143
1136#if USE_XIM 1144#if USE_XIM
1145 void im_destroy ();
1146 void im_cb (); im_watcher im_ev;
1137 void set_size (XRectangle *size); 1147 void im_set_size (XRectangle *size);
1138 void set_position (XPoint *pos); 1148 void im_set_position (XPoint *pos);
1139 void set_color (unsigned long *fg, unsigned long *bg); 1149 void im_set_color (unsigned long *fg, unsigned long *bg);
1150 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1151
1152 bool IMisRunning ();
1153 void IMSendSpot ();
1154 bool IM_get_IC (const char *modifiers);
1155 void IMSetStatusPosition ();
1140#endif 1156#endif
1141 1157
1142 void resize_scrollbar (); 1158 void resize_scrollbar ();
1143 1159
1144 void pixel_position (int *x, int *y); 1160 void pixel_position (int *x, int *y);
… …
1162 void scr_expose (int x, int y, int width, int height, bool refresh); 1178 void scr_expose (int x, int y, int width, int height, bool refresh);
1163 1179
1164 /* autoconvert */ 1180 /* autoconvert */
1165 1181
1166 // command.C 1182 // command.C
1167 void lookup_key (XKeyEvent *ev); 1183 void lookup_key (XKeyEvent &ev);
1168 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1184 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1169 uint32_t cmd_getc (); 1185 uint32_t cmd_getc ();
1170 void mouse_report (const XButtonEvent *ev); 1186 void mouse_report (const XButtonEvent &ev);
1171 void process_x_event (XEvent *ev);
1172 void button_press (XButtonEvent *ev); 1187 void button_press (const XButtonEvent &ev);
1173 void button_release (XButtonEvent *ev); 1188 void button_release (const XButtonEvent &ev);
1174 int check_our_parents (); 1189 int check_our_parents ();
1175#ifdef PRINTPIPE 1190#ifdef PRINTPIPE
1176 FILE * popen_printer (); 1191 FILE * popen_printer ();
1177 int pclose_printer (FILE *stream); 1192 int pclose_printer (FILE *stream);
1178#endif 1193#endif
… …
1206 void set_iconName (const char *str); 1221 void set_iconName (const char *str);
1207 void set_window_color (int idx, const char *color); 1222 void set_window_color (int idx, const char *color);
1208 void set_colorfgbg (); 1223 void set_colorfgbg ();
1209 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1224 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1210 void set_widthheight (unsigned int width, unsigned int height); 1225 void set_widthheight (unsigned int width, unsigned int height);
1211 bool IMisRunning ();
1212 void IMSendSpot ();
1213 bool IM_get_IC ();
1214 void IMSetStatusPosition ();
1215 1226
1216#ifdef MENUBAR 1227#ifdef MENUBAR
1217 // menubar.C 1228 // menubar.C
1218 void menuitem_free (menu_t *menu, menuitem_t *item); 1229 void menuitem_free (menu_t *menu, menuitem_t *item);
1219 int action_dispatch (action_t *action); 1230 int action_dispatch (action_t *action);
… …
1290 void selection_make (Time tm); 1301 void selection_make (Time tm);
1291 void selection_start_colrow (int col, int row); 1302 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); 1303 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); 1304 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1294 void selection_remove_trailing_spaces (); 1305 void selection_remove_trailing_spaces ();
1295 void selection_send (const XSelectionRequestEvent *rq); 1306 void selection_send (const XSelectionRequestEvent &rq);
1296 1307
1297#if defined(NEXT_SCROLLBAR) 1308#if defined(NEXT_SCROLLBAR)
1298 // scrollbar-next.C 1309 // scrollbar-next.C
1299 Pixmap renderPixmap (const char *const *data, int width, int height); 1310 Pixmap renderPixmap (const char *const *data, int width, int height);
1300 void init_scrollbar_stuff (); 1311 void init_scrollbar_stuff ();

Diff Legend

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