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.37 by pcg, Sun Feb 22 08:09:38 2004 UTC

… …
49 int line; 49 int line;
50 int local; 50 int local;
51} ttymode_t; 51} ttymode_t;
52#endif 52#endif
53 53
54#ifdef GREEK_SUPPORT
55# include "grkelot.h"
56#endif
57#ifdef XPM_BACKGROUND 54#ifdef XPM_BACKGROUND
58# ifdef XPM_INC_X11 55# ifdef XPM_INC_X11
59# include <X11/xpm.h> 56# include <X11/xpm.h>
60# else 57# else
61# include <xpm.h> 58# include <xpm.h>
… …
130 do { \ 127 do { \
131 typeof swapittmp; \ 128 typeof swapittmp; \
132 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \ 129 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
133 } while (/* CONSTCOND */ 0) 130 } while (/* CONSTCOND */ 0)
134#define BOUND_POSITIVE_INT16(val) \ 131#define BOUND_POSITIVE_INT16(val) \
135 (int16_t)((val) <= 0 \ 132 (int16_t) ((val) <= 0 \
136 ? 0 \ 133 ? 0 \
137 : min((val), (((uint16_t)-1)>>1))) 134 : min ((val), (((uint16_t)-1)>>1)))
138 135
139/* 136/*
140 ***************************************************************************** 137 *****************************************************************************
141 * NORMAL DEFINES 138 * NORMAL DEFINES
142 ***************************************************************************** 139 *****************************************************************************
… …
241 * | | :::::::: | 238 * | | :::::::: |
242 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT 239 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
243 * | +---------+ | 240 * | +---------+ |
244 * | | ......%%| | 241 * | | ......%%| |
245 * | | ......%%| | 242 * | | ......%%| |
246 * | | ..()..%%| | 243 * | | .. ()..%%| |
247 * | | ......%%| | 244 * | | ......%%| |
248 * | | %%%%%%%%| | 245 * | | %%%%%%%%| |
249 * | +---------+ | <......................... 246 * | +---------+ | <.........................
250 * | | <---< SB_PADDING : 247 * | | <---< SB_PADDING :
251 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT 248 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT
… …
293/* special (internal) prefix for font commands */ 290/* special (internal) prefix for font commands */
294#define FONT_CMD '#' 291#define FONT_CMD '#'
295#define FONT_DN "#-" 292#define FONT_DN "#-"
296#define FONT_UP "#+" 293#define FONT_UP "#+"
297 294
298/* flags for rxvt_scr_gotorc() */ 295/* flags for rxvt_scr_gotorc () */
299#define C_RELATIVE 1 /* col movement is relative */ 296#define C_RELATIVE 1 /* col movement is relative */
300#define R_RELATIVE 2 /* row movement is relative */ 297#define R_RELATIVE 2 /* row movement is relative */
301#define RELATIVE (R_RELATIVE|C_RELATIVE) 298#define RELATIVE (R_RELATIVE|C_RELATIVE)
302 299
303/* modes for rxvt_scr_insdel_chars(), rxvt_scr_insdel_lines() */ 300/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
304#define INSERT -1 /* don't change these values */ 301#define INSERT -1 /* don't change these values */
305#define DELETE +1 302#define DELETE +1
306#define ERASE +2 303#define ERASE +2
307 304
308/* modes for rxvt_scr_page() - scroll page. used by scrollbar window */ 305/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
309enum page_dirn { 306enum page_dirn {
310 UP, 307 UP,
311 DN, 308 DN,
312 NO_DIR 309 NO_DIR
313}; 310};
314 311
315/* arguments for rxvt_scr_change_screen() */ 312/* arguments for rxvt_scr_change_screen () */
316enum { 313enum {
317 PRIMARY = 0, 314 PRIMARY = 0,
318 SECONDARY 315 SECONDARY
319}; 316};
320 317
… …
473 Rs_backgroundPixmap, 470 Rs_backgroundPixmap,
474#endif 471#endif
475#if (MENUBAR_MAX) 472#if (MENUBAR_MAX)
476 Rs_menu, 473 Rs_menu,
477#endif 474#endif
478#ifdef GREEK_SUPPORT
479 Rs_greek_keyboard,
480 Rs_greektoggle_key,
481#endif
482 Rs_loginShell, 475 Rs_loginShell,
483 Rs_jumpScroll, 476 Rs_jumpScroll,
484#ifdef HAVE_SCROLLBARS 477#ifdef HAVE_SCROLLBARS
485 Rs_scrollBar, 478 Rs_scrollBar,
486 Rs_scrollBar_right, 479 Rs_scrollBar_right,
… …
545 Rs_pointerBlankDelay, 538 Rs_pointerBlankDelay,
546 Rs_imLocale, 539 Rs_imLocale,
547 NUM_RESOURCES 540 NUM_RESOURCES
548}; 541};
549 542
550// see init.C:xa_named, which must be kept in sync 543// see init.C:xa_names, which must be kept in sync
551enum { 544enum {
552 XA_TEXT = 0, 545 XA_TEXT = 0,
553 XA_COMPOUND_TEXT, 546 XA_COMPOUND_TEXT,
554 XA_UTF8_STRING, 547 XA_UTF8_STRING,
555 XA_MULTIPLE, 548 XA_MULTIPLE,
… …
596#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 589#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
597#define PrivMode(test,bit) \ 590#define PrivMode(test,bit) \
598 if (test) \ 591 if (test) \
599 PrivateModes |= (bit); \ 592 PrivateModes |= (bit); \
600 else \ 593 else \
601 PrivateModes &= ~(bit) 594 PrivateModes &= ~ (bit)
602 595
603#ifdef ALLOW_132_MODE 596#ifdef ALLOW_132_MODE
604# define PrivMode_Default \ 597# define PrivMode_Default \
605(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 598(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
606#else 599#else
607# define PrivMode_Default \ 600# define PrivMode_Default \
608(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 601(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
609#endif 602#endif
610 603
611#define XDEPTH Xdepth 604#define XDEPTH display->depth
612#define XCMAP Xcmap 605#define XCMAP display->cmap
613#define XVISUAL Xvisual 606#define XVISUAL display->visual
614 607
615#define IMBUFSIZ 128 /* input modifier buffer sizes */ 608#define IMBUFSIZ 128 /* input modifier buffer sizes */
616#ifndef BUFSIZ 609#ifndef BUFSIZ
617# define BUFSIZ 4096 610# define BUFSIZ 4096
618#endif 611#endif
… …
650#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 643#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
651 644
652#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 645#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) 646#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth)
654 647
655#define Xroot DefaultRootWindow(Xdisplay)
656
657/* how to build & extract colors and attributes */ 648/* how to build & extract colors and attributes */
658#define GET_BASEFG(x) (((x) & RS_fgMask)) 649#define GET_BASEFG(x) (((x) & RS_fgMask))
659#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 650#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
660#ifndef NO_BRIGHTCOLOR 651#ifndef NO_BRIGHTCOLOR
661# define GET_FGCOLOR(x) \ 652# define GET_FGCOLOR(x) \
662 ((((x) & RS_Bold) == 0 \ 653 ((((x) & RS_Bold) == 0 \
663 || GET_BASEFG(x) < minCOLOR \ 654 || GET_BASEFG (x) < minCOLOR \
664 || GET_BASEFG(x) >= minBrightCOLOR) \ 655 || GET_BASEFG (x) >= minBrightCOLOR) \
665 ? GET_BASEFG(x) \ 656 ? GET_BASEFG (x) \
666 : (GET_BASEFG(x) + (minBrightCOLOR - minCOLOR))) 657 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
667# define GET_BGCOLOR(x) \ 658# define GET_BGCOLOR(x) \
668 ((((x) & RS_Blink) == 0 \ 659 ((((x) & RS_Blink) == 0 \
669 || GET_BASEBG(x) < minCOLOR \ 660 || GET_BASEBG (x) < minCOLOR \
670 || GET_BASEBG(x) >= minBrightCOLOR) \ 661 || GET_BASEBG (x) >= minBrightCOLOR) \
671 ? GET_BASEBG(x) \ 662 ? GET_BASEBG (x) \
672 : (GET_BASEBG(x) + (minBrightCOLOR - minCOLOR))) 663 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
673#else 664#else
674# define GET_FGCOLOR(x) GET_BASEFG(x) 665# define GET_FGCOLOR(x) GET_BASEFG(x)
675# define GET_BGCOLOR(x) GET_BASEBG(x) 666# define GET_BGCOLOR(x) GET_BASEBG(x)
676#endif 667#endif
677 668
… …
701#define scrollbar_isUpDn() isupper (scrollBar.state) 692#define scrollbar_isUpDn() isupper (scrollBar.state)
702#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win) 693#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win)
703 694
704#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1)) 695#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1))
705#define scrollbarnext_upButton(y) ((y) > scrollBar.end \ 696#define scrollbarnext_upButton(y) ((y) > scrollBar.end \
706 && (y) <= scrollbarnext_dnval()) 697 && (y) <= scrollbarnext_dnval ())
707#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) 698#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval())
708#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT 699#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
709#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg) 700#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg)
710#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end) 701#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end)
711#define SCROLLRXVT_MINHEIGHT 10 702#define SCROLLRXVT_MINHEIGHT 10
… …
716 : SCROLLRXVT_MINHEIGHT) 707 : SCROLLRXVT_MINHEIGHT)
717#define scrollbar_above_slider(y) ((y) < scrollBar.top) 708#define scrollbar_above_slider(y) ((y) < scrollBar.top)
718#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 709#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
719#define scrollbar_position(y) ((y) - scrollBar.beg) 710#define scrollbar_position(y) ((y) - scrollBar.beg)
720#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 711#define scrollbar_size() (scrollBar.end - scrollBar.beg \
721 - scrollbar_minheight()) 712 - scrollbar_minheight ())
722 713
723#if (MENUBAR_MAX > 1) 714#if (MENUBAR_MAX > 1)
724/* rendition style flags */ 715/* rendition style flags */
725# define menuBar_height() (TermWin.fheight + SHADOW) 716# define menuBar_height() (TermWin.fheight + SHADOW)
726# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 717# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
… …
821 812
822// primivite wrapper around mbstate_t to ensure initialisation 813// primivite wrapper around mbstate_t to ensure initialisation
823struct mbstate { 814struct mbstate {
824 mbstate_t mbs; 815 mbstate_t mbs;
825 816
826 mbstate () 817 operator mbstate_t *() { return &mbs; }
827 {
828 MEMSET (&mbs, 0, sizeof (mbs)); 818 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
829 } 819 mbstate () { reset (); }
830}; 820};
831 821
832struct rxvt_term : rxvt_vars { 822struct rxvt_term : rxvt_vars {
833 struct mbstate mbstate; 823 struct mbstate mbstate;
834 824
… …
869#endif 859#endif
870 scrollbar_align, 860 scrollbar_align,
871 selection_wait, 861 selection_wait,
872 selection_type; 862 selection_type;
873/* ---------- */ 863/* ---------- */
874#ifdef GREEK_SUPPORT
875 short greek_mode; /* greek keyboard mode */
876#endif
877 short rvideo; 864 short rvideo;
878 int16_t num_scr; /* screen: number lines scrolled */ 865 int16_t num_scr; /* screen: number lines scrolled */
879 unsigned int prev_ncol, /* screen: previous number of columns */ 866 unsigned int prev_ncol, /* screen: previous number of columns */
880 prev_nrow; /* screen: previous number of rows */ 867 prev_nrow; /* screen: previous number of rows */
881#ifdef RXVT_GRAPHICS
882 uint16_t gr_prev_start;
883#endif
884/* ---------- */ 868/* ---------- */
885 rend_t rstyle; 869 rend_t rstyle;
886/* ---------- */ 870/* ---------- */
887 uint32_t pixcolor_set[NPIXCLR_SETS]; 871 uint32_t pixcolor_set[NPIXCLR_SETS];
888/* ---------- */ 872/* ---------- */
… …
951#ifdef XTERM_SCROLLBAR 935#ifdef XTERM_SCROLLBAR
952 GC xscrollbarGC, 936 GC xscrollbarGC,
953 ShadowGC; 937 ShadowGC;
954#endif 938#endif
955#ifdef PLAIN_SCROLLBAR 939#ifdef PLAIN_SCROLLBAR
956 GC pscrollbarGC, 940 GC pscrollbarGC;
957 pShadowGC;
958#endif 941#endif
959#ifdef NEXT_SCROLLBAR 942#ifdef NEXT_SCROLLBAR
960 GC blackGC, 943 GC blackGC,
961 whiteGC, 944 whiteGC,
962 grayGC, 945 grayGC,
… …
991 const char *key_delete; 974 const char *key_delete;
992#endif 975#endif
993#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 976#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
994 KeySym ks_bigfont, ks_smallfont; 977 KeySym ks_bigfont, ks_smallfont;
995#endif 978#endif
996#ifdef GREEK_SUPPORT
997 KeySym ks_greekmodeswith;
998#endif
999#ifdef USE_XIM 979#ifdef USE_XIM
980 rxvt_xim *input_method;
1000 XIC Input_Context; 981 XIC Input_Context;
1001 XIMStyle input_style; 982 XIMStyle input_style;
1002 int event_type; 983 int event_type;
1003#endif 984#endif
1004 struct mouse_event MEvent; 985 struct mouse_event MEvent;
1005 XComposeStatus compose; 986 XComposeStatus compose;
1006#ifdef RXVT_GRAPHICS
1007 int graphics_up;
1008 struct grwin_t *gr_root;
1009#endif
1010 ttymode_t tio; 987 ttymode_t tio;
1011#ifdef UTMP_SUPPORT 988#ifdef UTMP_SUPPORT
1012# ifdef HAVE_STRUCT_UTMP 989# ifdef HAVE_STRUCT_UTMP
1013 struct utmp ut; 990 struct utmp ut;
1014# endif 991# endif
… …
1023 row_col_t oldcursor; 1000 row_col_t oldcursor;
1024#ifdef XPM_BACKGROUND 1001#ifdef XPM_BACKGROUND
1025 bgPixmap_t bgPixmap; 1002 bgPixmap_t bgPixmap;
1026 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1003 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1027#endif 1004#endif
1028#ifdef MULTICHAR_SET
1029 int oldcursormulti;
1030 void (*multichar_decode)(unsigned char *str, int len);
1031#endif
1032#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1005#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1033 struct stat ttyfd_stat; /* original status of our tty */ 1006 struct stat ttyfd_stat; /* original status of our tty */
1034#endif 1007#endif
1035#ifdef MENUBAR 1008#ifdef MENUBAR
1036 menu_t *ActiveMenu, /* currently active menu */ 1009 menu_t *ActiveMenu, /* currently active menu */
1037 *BuildMenu; /* the menu currently being built */ 1010 *BuildMenu; /* the menu currently being built */
1038 bar_t *CurrentBar; 1011 bar_t *CurrentBar;
1039# if !(MENUBAR_MAX > 1) 1012# if ! (MENUBAR_MAX > 1)
1040 bar_t BarList; 1013 bar_t BarList;
1041# endif /* (MENUBAR_MAX > 1) */ 1014# endif /* (MENUBAR_MAX > 1) */
1042#endif
1043#ifdef RXVT_GRAPHICS
1044 Window gr_last_id;
1045#endif 1015#endif
1046#ifdef CURSOR_BLINK 1016#ifdef CURSOR_BLINK
1047 struct timeval lastcursorchange; 1017 struct timeval lastcursorchange;
1048#endif 1018#endif
1049#ifdef POINTER_BLANK 1019#ifdef POINTER_BLANK
… …
1059 char *codeset; 1029 char *codeset;
1060 char charsets[4]; 1030 char charsets[4];
1061 unsigned char *v_buffer; /* pointer to physical buffer */ 1031 unsigned char *v_buffer; /* pointer to physical buffer */
1062 unsigned int v_buflen; /* size of area to write */ 1032 unsigned int v_buflen; /* size of area to write */
1063 char *newfont[MAX_NFONTS]; 1033 char *newfont[MAX_NFONTS];
1034 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1064#ifdef KEYSYM_RESOURCE 1035#ifdef KEYSYM_RESOURCE
1065 const unsigned char *Keysym_map[256]; 1036 const unsigned char *Keysym_map[256];
1066#endif 1037#endif
1067 const char *rs[NUM_RESOURCES]; 1038 const char *rs[NUM_RESOURCES];
1068/* command input buffering */ 1039/* command input buffering */
… …
1074 1045
1075 void paste (const unsigned char *data, unsigned int len); 1046 void paste (const unsigned char *data, unsigned int len);
1076 1047
1077 void flush (); 1048 void flush ();
1078 1049
1050 void rootwin_cb (XEvent &xev);
1051 xevent_watcher rootwin_ev;
1052
1053 void x_cb (XEvent &xev);
1054 xevent_watcher termwin_ev;
1055 xevent_watcher vt_ev;
1056#ifdef HAVE_SCROLLBARS
1057 xevent_watcher scrollbar_ev;
1058#endif
1059#ifdef MENUBAR
1060 xevent_watcher menubar_ev;
1061#endif
1062
1079 void check_cb (check_watcher &w); check_watcher check_ev; 1063 void check_cb (check_watcher &w); check_watcher check_ev;
1080 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1064 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1081 1065
1082 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1066 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 1067
1085 void incr_cb (time_watcher &w); time_watcher incr_ev; 1068 void incr_cb (time_watcher &w); time_watcher incr_ev;
1086 1069
1087#ifdef CURSOR_BLINK 1070#ifdef CURSOR_BLINK
1088 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1071 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1110 bool init_vars (); 1093 bool init_vars ();
1111 1094
1112 uint32_t next_char (); 1095 uint32_t next_char ();
1113 1096
1114 bool pty_fill (); 1097 bool pty_fill ();
1115 void process_x_events ();
1116 1098
1117 void *operator new (size_t s); 1099 void *operator new (size_t s);
1118 void operator delete (void *p, size_t s); 1100 void operator delete (void *p, size_t s);
1119 1101
1120 void init_secondary (); 1102 void init_secondary ();
… …
1124 void init_xlocale (); 1106 void init_xlocale ();
1125 void init_command (const char *const *argv); 1107 void init_command (const char *const *argv);
1126 int run_command (const char *const *argv); 1108 int run_command (const char *const *argv);
1127 int run_child (const char *const *argv); 1109 int run_child (const char *const *argv);
1128 1110
1129 void color_aliases(int idx); 1111 void color_aliases (int idx);
1130 void recolour_cursor (); 1112 void recolour_cursor ();
1131 void create_windows (int argc, const char *const *argv); 1113 void create_windows (int argc, const char *const *argv);
1132 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1114 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1133 void window_calc (unsigned int width, unsigned int height); 1115 void window_calc (unsigned int width, unsigned int height);
1134 void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1135 1116
1136#if USE_XIM 1117#if USE_XIM
1118 void im_destroy ();
1119 void im_cb (); im_watcher im_ev;
1137 void set_size (XRectangle *size); 1120 void im_set_size (XRectangle *size);
1138 void set_position (XPoint *pos); 1121 void im_set_position (XPoint *pos);
1139 void set_color (unsigned long *fg, unsigned long *bg); 1122 void im_set_color (unsigned long *fg, unsigned long *bg);
1123 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1124
1125 bool IMisRunning ();
1126 void IMSendSpot ();
1127 bool IM_get_IC (const char *modifiers);
1128 void IMSetStatusPosition ();
1140#endif 1129#endif
1141 1130
1142 void resize_scrollbar (); 1131 void resize_scrollbar ();
1143 1132
1144 void pixel_position (int *x, int *y); 1133 void pixel_position (int *x, int *y);
1145 1134
1146 void selection_click (int clicks, int x, int y); 1135 void selection_click (int clicks, int x, int y);
1147 void selection_extend (int x, int y, int flag); 1136 void selection_extend (int x, int y, int flag);
1148 void selection_rotate (int x, int y); 1137 void selection_rotate (int x, int y);
1149 1138
1150 /* screen(!) */ 1139 /* screen (!) */
1151 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1140 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1152 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1141 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1153 int scr_scroll_text (int row1, int row2, int count, int spec); 1142 int scr_scroll_text (int row1, int row2, int count, int spec);
1154 void scr_reset (); 1143 void scr_reset ();
1155 void scr_reset_realloc (); 1144 void scr_reset_realloc ();
… …
1162 void scr_expose (int x, int y, int width, int height, bool refresh); 1151 void scr_expose (int x, int y, int width, int height, bool refresh);
1163 1152
1164 /* autoconvert */ 1153 /* autoconvert */
1165 1154
1166 // command.C 1155 // command.C
1167 void lookup_key (XKeyEvent *ev); 1156 void lookup_key (XKeyEvent &ev);
1168 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1157 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1169 uint32_t cmd_getc (); 1158 uint32_t cmd_getc ();
1170 void mouse_report (const XButtonEvent *ev); 1159 void mouse_report (const XButtonEvent &ev);
1171 void process_x_event (XEvent *ev);
1172 void button_press (XButtonEvent *ev); 1160 void button_press (const XButtonEvent &ev);
1173 void button_release (XButtonEvent *ev); 1161 void button_release (const XButtonEvent &ev);
1174 int check_our_parents (); 1162 int check_our_parents ();
1175#ifdef PRINTPIPE 1163#ifdef PRINTPIPE
1176 FILE * popen_printer (); 1164 FILE * popen_printer ();
1177 int pclose_printer (FILE *stream); 1165 int pclose_printer (FILE *stream);
1178#endif 1166#endif
… …
1183 void process_csi_seq (); 1171 void process_csi_seq ();
1184 void process_window_ops (const int *args, unsigned int nargs); 1172 void process_window_ops (const int *args, unsigned int nargs);
1185 unsigned char * get_to_st (unsigned char *ends_how); 1173 unsigned char * get_to_st (unsigned char *ends_how);
1186 void process_dcs_seq (); 1174 void process_dcs_seq ();
1187 void process_osc_seq (); 1175 void process_osc_seq ();
1188 void xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))); 1176 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)));
1189 int privcases (int mode, unsigned long bit); 1177 int privcases (int mode, unsigned long bit);
1190 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1178 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1191 void process_sgr_mode (unsigned int nargs, const int *arg); 1179 void process_sgr_mode (unsigned int nargs, const int *arg);
1192 void process_graphics (); 1180 void process_graphics ();
1193 // init.C 1181 // init.C
… …
1206 void set_iconName (const char *str); 1194 void set_iconName (const char *str);
1207 void set_window_color (int idx, const char *color); 1195 void set_window_color (int idx, const char *color);
1208 void set_colorfgbg (); 1196 void set_colorfgbg ();
1209 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1197 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1210 void set_widthheight (unsigned int width, unsigned int height); 1198 void set_widthheight (unsigned int width, unsigned int height);
1211 bool IMisRunning ();
1212 void IMSendSpot ();
1213 bool IM_get_IC ();
1214 void IMSetStatusPosition ();
1215 1199
1216#ifdef MENUBAR 1200#ifdef MENUBAR
1217 // menubar.C 1201 // menubar.C
1218 void menuitem_free (menu_t *menu, menuitem_t *item); 1202 void menuitem_free (menu_t *menu, menuitem_t *item);
1219 int action_dispatch (action_t *action); 1203 int action_dispatch (action_t *action);
… …
1224 menu_t * menu_add (menu_t *parent, char *path); 1208 menu_t * menu_add (menu_t *parent, char *path);
1225 void drawbox_menubar (int x, int len, int state); 1209 void drawbox_menubar (int x, int len, int state);
1226 void drawtriangle (int x, int y, int state); 1210 void drawtriangle (int x, int y, int state);
1227 void drawbox_menuitem (int y, int state); 1211 void drawbox_menuitem (int y, int state);
1228 void menu_show (); 1212 void menu_show ();
1229 void menu_display (void (*update)(rxvt_t *)); 1213 void menu_display (void (*update) (rxvt_t *));
1230 void menu_hide_all (); 1214 void menu_hide_all ();
1231 void menu_hide (); 1215 void menu_hide ();
1232 void menu_clear (menu_t *menu); 1216 void menu_clear (menu_t *menu);
1233 void menubar_clear (); 1217 void menubar_clear ();
1234 bar_t * menubar_find (const char *name); 1218 bar_t * menubar_find (const char *name);
… …
1290 void selection_make (Time tm); 1274 void selection_make (Time tm);
1291 void selection_start_colrow (int col, int row); 1275 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); 1276 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); 1277 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1294 void selection_remove_trailing_spaces (); 1278 void selection_remove_trailing_spaces ();
1295 void selection_send (const XSelectionRequestEvent *rq); 1279 void selection_send (const XSelectionRequestEvent &rq);
1296 1280
1297#if defined(NEXT_SCROLLBAR) 1281#if defined(NEXT_SCROLLBAR)
1298 // scrollbar-next.C 1282 // scrollbar-next.C
1299 Pixmap renderPixmap (const char *const *data, int width, int height); 1283 Pixmap renderPixmap (const char *const *data, int width, int height);
1300 void init_scrollbar_stuff (); 1284 void init_scrollbar_stuff ();

Diff Legend

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