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.30 by pcg, Sat Jan 31 04:20:20 2004 UTC vs.
Revision 1.35 by pcg, Fri Feb 13 13:28:17 2004 UTC

… …
130 do { \ 130 do { \
131 typeof swapittmp; \ 131 typeof swapittmp; \
132 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \ 132 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
133 } while (/* CONSTCOND */ 0) 133 } while (/* CONSTCOND */ 0)
134#define BOUND_POSITIVE_INT16(val) \ 134#define BOUND_POSITIVE_INT16(val) \
135 (int16_t)((val) <= 0 \ 135 (int16_t) ((val) <= 0 \
136 ? 0 \ 136 ? 0 \
137 : min((val), (((uint16_t)-1)>>1))) 137 : min ((val), (((uint16_t)-1)>>1)))
138 138
139/* 139/*
140 ***************************************************************************** 140 *****************************************************************************
141 * NORMAL DEFINES 141 * NORMAL DEFINES
142 ***************************************************************************** 142 *****************************************************************************
… …
241 * | | :::::::: | 241 * | | :::::::: |
242 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT 242 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
243 * | +---------+ | 243 * | +---------+ |
244 * | | ......%%| | 244 * | | ......%%| |
245 * | | ......%%| | 245 * | | ......%%| |
246 * | | ..()..%%| | 246 * | | .. ()..%%| |
247 * | | ......%%| | 247 * | | ......%%| |
248 * | | %%%%%%%%| | 248 * | | %%%%%%%%| |
249 * | +---------+ | <......................... 249 * | +---------+ | <.........................
250 * | | <---< SB_PADDING : 250 * | | <---< SB_PADDING :
251 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT 251 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT
… …
293/* special (internal) prefix for font commands */ 293/* special (internal) prefix for font commands */
294#define FONT_CMD '#' 294#define FONT_CMD '#'
295#define FONT_DN "#-" 295#define FONT_DN "#-"
296#define FONT_UP "#+" 296#define FONT_UP "#+"
297 297
298/* flags for rxvt_scr_gotorc() */ 298/* flags for rxvt_scr_gotorc () */
299#define C_RELATIVE 1 /* col movement is relative */ 299#define C_RELATIVE 1 /* col movement is relative */
300#define R_RELATIVE 2 /* row movement is relative */ 300#define R_RELATIVE 2 /* row movement is relative */
301#define RELATIVE (R_RELATIVE|C_RELATIVE) 301#define RELATIVE (R_RELATIVE|C_RELATIVE)
302 302
303/* modes for rxvt_scr_insdel_chars(), rxvt_scr_insdel_lines() */ 303/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
304#define INSERT -1 /* don't change these values */ 304#define INSERT -1 /* don't change these values */
305#define DELETE +1 305#define DELETE +1
306#define ERASE +2 306#define ERASE +2
307 307
308/* modes for rxvt_scr_page() - scroll page. used by scrollbar window */ 308/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
309enum page_dirn { 309enum page_dirn {
310 UP, 310 UP,
311 DN, 311 DN,
312 NO_DIR 312 NO_DIR
313}; 313};
314 314
315/* arguments for rxvt_scr_change_screen() */ 315/* arguments for rxvt_scr_change_screen () */
316enum { 316enum {
317 PRIMARY = 0, 317 PRIMARY = 0,
318 SECONDARY 318 SECONDARY
319}; 319};
320 320
… …
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,
… …
596#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 596#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
597#define PrivMode(test,bit) \ 597#define PrivMode(test,bit) \
598 if (test) \ 598 if (test) \
599 PrivateModes |= (bit); \ 599 PrivateModes |= (bit); \
600 else \ 600 else \
601 PrivateModes &= ~(bit) 601 PrivateModes &= ~ (bit)
602 602
603#ifdef ALLOW_132_MODE 603#ifdef ALLOW_132_MODE
604# define PrivMode_Default \ 604# define PrivMode_Default \
605(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 605(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
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) \
662 ((((x) & RS_Bold) == 0 \ 660 ((((x) & RS_Bold) == 0 \
663 || GET_BASEFG(x) < minCOLOR \ 661 || GET_BASEFG (x) < minCOLOR \
664 || GET_BASEFG(x) >= minBrightCOLOR) \ 662 || GET_BASEFG (x) >= minBrightCOLOR) \
665 ? GET_BASEFG(x) \ 663 ? GET_BASEFG (x) \
666 : (GET_BASEFG(x) + (minBrightCOLOR - minCOLOR))) 664 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
667# define GET_BGCOLOR(x) \ 665# define GET_BGCOLOR(x) \
668 ((((x) & RS_Blink) == 0 \ 666 ((((x) & RS_Blink) == 0 \
669 || GET_BASEBG(x) < minCOLOR \ 667 || GET_BASEBG (x) < minCOLOR \
670 || GET_BASEBG(x) >= minBrightCOLOR) \ 668 || GET_BASEBG (x) >= minBrightCOLOR) \
671 ? GET_BASEBG(x) \ 669 ? GET_BASEBG (x) \
672 : (GET_BASEBG(x) + (minBrightCOLOR - minCOLOR))) 670 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
673#else 671#else
674# define GET_FGCOLOR(x) GET_BASEFG(x) 672# define GET_FGCOLOR(x) GET_BASEFG(x)
675# define GET_BGCOLOR(x) GET_BASEBG(x) 673# define GET_BGCOLOR(x) GET_BASEBG(x)
676#endif 674#endif
677 675
… …
701#define scrollbar_isUpDn() isupper (scrollBar.state) 699#define scrollbar_isUpDn() isupper (scrollBar.state)
702#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win) 700#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win)
703 701
704#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1)) 702#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1))
705#define scrollbarnext_upButton(y) ((y) > scrollBar.end \ 703#define scrollbarnext_upButton(y) ((y) > scrollBar.end \
706 && (y) <= scrollbarnext_dnval()) 704 && (y) <= scrollbarnext_dnval ())
707#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) 705#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval())
708#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT 706#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
709#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg) 707#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg)
710#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end) 708#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end)
711#define SCROLLRXVT_MINHEIGHT 10 709#define SCROLLRXVT_MINHEIGHT 10
… …
716 : SCROLLRXVT_MINHEIGHT) 714 : SCROLLRXVT_MINHEIGHT)
717#define scrollbar_above_slider(y) ((y) < scrollBar.top) 715#define scrollbar_above_slider(y) ((y) < scrollBar.top)
718#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 716#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
719#define scrollbar_position(y) ((y) - scrollBar.beg) 717#define scrollbar_position(y) ((y) - scrollBar.beg)
720#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 718#define scrollbar_size() (scrollBar.end - scrollBar.beg \
721 - scrollbar_minheight()) 719 - scrollbar_minheight ())
722 720
723#if (MENUBAR_MAX > 1) 721#if (MENUBAR_MAX > 1)
724/* rendition style flags */ 722/* rendition style flags */
725# define menuBar_height() (TermWin.fheight + SHADOW) 723# define menuBar_height() (TermWin.fheight + SHADOW)
726# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 724# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
… …
994#endif 992#endif
995#ifdef GREEK_SUPPORT 993#ifdef GREEK_SUPPORT
996 KeySym ks_greekmodeswith; 994 KeySym ks_greekmodeswith;
997#endif 995#endif
998#ifdef USE_XIM 996#ifdef USE_XIM
997 rxvt_xim *input_method;
999 XIC Input_Context; 998 XIC Input_Context;
1000 XIMStyle input_style; 999 XIMStyle input_style;
1001 int event_type; 1000 int event_type;
1002#endif 1001#endif
1003 struct mouse_event MEvent; 1002 struct mouse_event MEvent;
… …
1024 bgPixmap_t bgPixmap; 1023 bgPixmap_t bgPixmap;
1025 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1024 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1026#endif 1025#endif
1027#ifdef MULTICHAR_SET 1026#ifdef MULTICHAR_SET
1028 int oldcursormulti; 1027 int oldcursormulti;
1029 void (*multichar_decode)(unsigned char *str, int len); 1028 void (*multichar_decode) (unsigned char *str, int len);
1030#endif 1029#endif
1031#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1030#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1032 struct stat ttyfd_stat; /* original status of our tty */ 1031 struct stat ttyfd_stat; /* original status of our tty */
1033#endif 1032#endif
1034#ifdef MENUBAR 1033#ifdef MENUBAR
1035 menu_t *ActiveMenu, /* currently active menu */ 1034 menu_t *ActiveMenu, /* currently active menu */
1036 *BuildMenu; /* the menu currently being built */ 1035 *BuildMenu; /* the menu currently being built */
1037 bar_t *CurrentBar; 1036 bar_t *CurrentBar;
1038# if !(MENUBAR_MAX > 1) 1037# if ! (MENUBAR_MAX > 1)
1039 bar_t BarList; 1038 bar_t BarList;
1040# endif /* (MENUBAR_MAX > 1) */ 1039# endif /* (MENUBAR_MAX > 1) */
1041#endif 1040#endif
1042#ifdef RXVT_GRAPHICS 1041#ifdef RXVT_GRAPHICS
1043 Window gr_last_id; 1042 Window gr_last_id;
… …
1058 char *codeset; 1057 char *codeset;
1059 char charsets[4]; 1058 char charsets[4];
1060 unsigned char *v_buffer; /* pointer to physical buffer */ 1059 unsigned char *v_buffer; /* pointer to physical buffer */
1061 unsigned int v_buflen; /* size of area to write */ 1060 unsigned int v_buflen; /* size of area to write */
1062 char *newfont[MAX_NFONTS]; 1061 char *newfont[MAX_NFONTS];
1062 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1063#ifdef KEYSYM_RESOURCE 1063#ifdef KEYSYM_RESOURCE
1064 const unsigned char *Keysym_map[256]; 1064 const unsigned char *Keysym_map[256];
1065#endif 1065#endif
1066 const char *rs[NUM_RESOURCES]; 1066 const char *rs[NUM_RESOURCES];
1067/* command input buffering */ 1067/* command input buffering */
… …
1073 1073
1074 void paste (const unsigned char *data, unsigned int len); 1074 void paste (const unsigned char *data, unsigned int len);
1075 1075
1076 void flush (); 1076 void flush ();
1077 1077
1078 void rootwin_cb (XEvent &xev);
1079 xevent_watcher rootwin_ev;
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
1078 void check_cb (check_watcher &w); check_watcher check_ev; 1091 void check_cb (check_watcher &w); check_watcher check_ev;
1079 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1092 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1080 1093
1081 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;
1082 void x_cb (io_watcher &w, short revents); io_watcher x_ev;
1083 1095
1084 void incr_cb (time_watcher &w); time_watcher incr_ev; 1096 void incr_cb (time_watcher &w); time_watcher incr_ev;
1085 1097
1086#ifdef CURSOR_BLINK 1098#ifdef CURSOR_BLINK
1087 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;
… …
1109 bool init_vars (); 1121 bool init_vars ();
1110 1122
1111 uint32_t next_char (); 1123 uint32_t next_char ();
1112 1124
1113 bool pty_fill (); 1125 bool pty_fill ();
1114 void process_x_events ();
1115 1126
1116 void *operator new (size_t s); 1127 void *operator new (size_t s);
1117 void operator delete (void *p, size_t s); 1128 void operator delete (void *p, size_t s);
1118 1129
1119 void init_secondary (); 1130 void init_secondary ();
… …
1123 void init_xlocale (); 1134 void init_xlocale ();
1124 void init_command (const char *const *argv); 1135 void init_command (const char *const *argv);
1125 int run_command (const char *const *argv); 1136 int run_command (const char *const *argv);
1126 int run_child (const char *const *argv); 1137 int run_child (const char *const *argv);
1127 1138
1128 void color_aliases(int idx); 1139 void color_aliases (int idx);
1129 void recolour_cursor (); 1140 void recolour_cursor ();
1130 void create_windows (int argc, const char *const *argv); 1141 void create_windows (int argc, const char *const *argv);
1131 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1142 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1132 void window_calc (unsigned int width, unsigned int height); 1143 void window_calc (unsigned int width, unsigned int height);
1133 void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1134 1144
1135#if USE_XIM 1145#if USE_XIM
1146 void im_destroy ();
1147 void im_cb (); im_watcher im_ev;
1136 void set_size (XRectangle *size); 1148 void im_set_size (XRectangle *size);
1137 void set_position (XPoint *pos); 1149 void im_set_position (XPoint *pos);
1138 void set_color (unsigned long *fg, unsigned long *bg); 1150 void im_set_color (unsigned long *fg, unsigned long *bg);
1151 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1152
1153 bool IMisRunning ();
1154 void IMSendSpot ();
1155 bool IM_get_IC (const char *modifiers);
1156 void IMSetStatusPosition ();
1139#endif 1157#endif
1140 1158
1141 void resize_scrollbar (); 1159 void resize_scrollbar ();
1142 1160
1143 void pixel_position (int *x, int *y); 1161 void pixel_position (int *x, int *y);
1144 1162
1145 void selection_click (int clicks, int x, int y); 1163 void selection_click (int clicks, int x, int y);
1146 void selection_extend (int x, int y, int flag); 1164 void selection_extend (int x, int y, int flag);
1147 void selection_rotate (int x, int y); 1165 void selection_rotate (int x, int y);
1148 1166
1149 /* screen(!) */ 1167 /* screen (!) */
1150 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1168 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1151 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1169 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1152 int scr_scroll_text (int row1, int row2, int count, int spec); 1170 int scr_scroll_text (int row1, int row2, int count, int spec);
1153 void scr_reset (); 1171 void scr_reset ();
1154 void scr_reset_realloc (); 1172 void scr_reset_realloc ();
… …
1161 void scr_expose (int x, int y, int width, int height, bool refresh); 1179 void scr_expose (int x, int y, int width, int height, bool refresh);
1162 1180
1163 /* autoconvert */ 1181 /* autoconvert */
1164 1182
1165 // command.C 1183 // command.C
1166 void lookup_key (XKeyEvent *ev); 1184 void lookup_key (XKeyEvent &ev);
1167 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1185 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1168 uint32_t cmd_getc (); 1186 uint32_t cmd_getc ();
1169 void mouse_report (const XButtonEvent *ev); 1187 void mouse_report (const XButtonEvent &ev);
1170 void process_x_event (XEvent *ev);
1171 void button_press (XButtonEvent *ev); 1188 void button_press (const XButtonEvent &ev);
1172 void button_release (XButtonEvent *ev); 1189 void button_release (const XButtonEvent &ev);
1173 int check_our_parents (); 1190 int check_our_parents ();
1174#ifdef PRINTPIPE 1191#ifdef PRINTPIPE
1175 FILE * popen_printer (); 1192 FILE * popen_printer ();
1176 int pclose_printer (FILE *stream); 1193 int pclose_printer (FILE *stream);
1177#endif 1194#endif
… …
1182 void process_csi_seq (); 1199 void process_csi_seq ();
1183 void process_window_ops (const int *args, unsigned int nargs); 1200 void process_window_ops (const int *args, unsigned int nargs);
1184 unsigned char * get_to_st (unsigned char *ends_how); 1201 unsigned char * get_to_st (unsigned char *ends_how);
1185 void process_dcs_seq (); 1202 void process_dcs_seq ();
1186 void process_osc_seq (); 1203 void process_osc_seq ();
1187 void xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))); 1204 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)));
1188 int privcases (int mode, unsigned long bit); 1205 int privcases (int mode, unsigned long bit);
1189 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1206 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1190 void process_sgr_mode (unsigned int nargs, const int *arg); 1207 void process_sgr_mode (unsigned int nargs, const int *arg);
1191 void process_graphics (); 1208 void process_graphics ();
1192 // init.C 1209 // init.C
… …
1205 void set_iconName (const char *str); 1222 void set_iconName (const char *str);
1206 void set_window_color (int idx, const char *color); 1223 void set_window_color (int idx, const char *color);
1207 void set_colorfgbg (); 1224 void set_colorfgbg ();
1208 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1225 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1209 void set_widthheight (unsigned int width, unsigned int height); 1226 void set_widthheight (unsigned int width, unsigned int height);
1210 bool IMisRunning ();
1211 void IMSendSpot ();
1212 bool IM_get_IC ();
1213 void IMSetStatusPosition ();
1214 1227
1215#ifdef MENUBAR 1228#ifdef MENUBAR
1216 // menubar.C 1229 // menubar.C
1217 void menuitem_free (menu_t *menu, menuitem_t *item); 1230 void menuitem_free (menu_t *menu, menuitem_t *item);
1218 int action_dispatch (action_t *action); 1231 int action_dispatch (action_t *action);
… …
1223 menu_t * menu_add (menu_t *parent, char *path); 1236 menu_t * menu_add (menu_t *parent, char *path);
1224 void drawbox_menubar (int x, int len, int state); 1237 void drawbox_menubar (int x, int len, int state);
1225 void drawtriangle (int x, int y, int state); 1238 void drawtriangle (int x, int y, int state);
1226 void drawbox_menuitem (int y, int state); 1239 void drawbox_menuitem (int y, int state);
1227 void menu_show (); 1240 void menu_show ();
1228 void menu_display (void (*update)(rxvt_t *)); 1241 void menu_display (void (*update) (rxvt_t *));
1229 void menu_hide_all (); 1242 void menu_hide_all ();
1230 void menu_hide (); 1243 void menu_hide ();
1231 void menu_clear (menu_t *menu); 1244 void menu_clear (menu_t *menu);
1232 void menubar_clear (); 1245 void menubar_clear ();
1233 bar_t * menubar_find (const char *name); 1246 bar_t * menubar_find (const char *name);
… …
1289 void selection_make (Time tm); 1302 void selection_make (Time tm);
1290 void selection_start_colrow (int col, int row); 1303 void selection_start_colrow (int col, int row);
1291 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1304 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1292 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1305 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1293 void selection_remove_trailing_spaces (); 1306 void selection_remove_trailing_spaces ();
1294 void selection_send (const XSelectionRequestEvent *rq); 1307 void selection_send (const XSelectionRequestEvent &rq);
1295 1308
1296#if defined(NEXT_SCROLLBAR) 1309#if defined(NEXT_SCROLLBAR)
1297 // scrollbar-next.C 1310 // scrollbar-next.C
1298 Pixmap renderPixmap (const char *const *data, int width, int height); 1311 Pixmap renderPixmap (const char *const *data, int width, int height);
1299 void init_scrollbar_stuff (); 1312 void init_scrollbar_stuff ();

Diff Legend

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