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.38 by pcg, Sun Feb 22 08:28:36 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 *****************************************************************************
… …
182 179
183#define menuBar_esc 10 180#define menuBar_esc 10
184#define scrollBar_esc 30 181#define scrollBar_esc 30
185#define menuBar_margin 2 /* margin below text */ 182#define menuBar_margin 2 /* margin below text */
186 183
187#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 184#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
188# define HAVE_SCROLLBARS 185# define HAVE_SCROLLBARS
189#endif 186#endif
190 187
191/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 188/* width of scrollBar, menuBar shadow, must be 1 or 2 */
192#ifdef HALFSHADOW 189#ifdef HALFSHADOW
… …
200#define R_SB_ALIGN_BOTTOM 2 197#define R_SB_ALIGN_BOTTOM 2
201 198
202#define R_SB_RXVT 0 199#define R_SB_RXVT 0
203#define R_SB_NEXT 1 200#define R_SB_NEXT 1
204#define R_SB_XTERM 2 201#define R_SB_XTERM 2
202#define R_SB_PLAIN 4
205 203
206#define SB_WIDTH_NEXT 19 204#define SB_WIDTH_NEXT 19
207#define SB_WIDTH_XTERM 7 205#define SB_WIDTH_XTERM 15
206#define SB_WIDTH_PLAIN 7
208#ifndef SB_WIDTH_RXVT 207#ifndef SB_WIDTH_RXVT
209# define SB_WIDTH_RXVT 10 208# define SB_WIDTH_RXVT 10
210#endif 209#endif
211 210
212/* 211/*
… …
239 * | | :::::::: | 238 * | | :::::::: |
240 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT 239 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
241 * | +---------+ | 240 * | +---------+ |
242 * | | ......%%| | 241 * | | ......%%| |
243 * | | ......%%| | 242 * | | ......%%| |
244 * | | ..()..%%| | 243 * | | .. ()..%%| |
245 * | | ......%%| | 244 * | | ......%%| |
246 * | | %%%%%%%%| | 245 * | | %%%%%%%%| |
247 * | +---------+ | <......................... 246 * | +---------+ | <.........................
248 * | | <---< SB_PADDING : 247 * | | <---< SB_PADDING :
249 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT 248 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT
… …
291/* special (internal) prefix for font commands */ 290/* special (internal) prefix for font commands */
292#define FONT_CMD '#' 291#define FONT_CMD '#'
293#define FONT_DN "#-" 292#define FONT_DN "#-"
294#define FONT_UP "#+" 293#define FONT_UP "#+"
295 294
296/* flags for rxvt_scr_gotorc() */ 295/* flags for rxvt_scr_gotorc () */
297#define C_RELATIVE 1 /* col movement is relative */ 296#define C_RELATIVE 1 /* col movement is relative */
298#define R_RELATIVE 2 /* row movement is relative */ 297#define R_RELATIVE 2 /* row movement is relative */
299#define RELATIVE (R_RELATIVE|C_RELATIVE) 298#define RELATIVE (R_RELATIVE|C_RELATIVE)
300 299
301/* modes for rxvt_scr_insdel_chars(), rxvt_scr_insdel_lines() */ 300/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
302#define INSERT -1 /* don't change these values */ 301#define INSERT -1 /* don't change these values */
303#define DELETE +1 302#define DELETE +1
304#define ERASE +2 303#define ERASE +2
305 304
306/* modes for rxvt_scr_page() - scroll page. used by scrollbar window */ 305/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
307enum page_dirn { 306enum page_dirn {
308 UP, 307 UP,
309 DN, 308 DN,
310 NO_DIR 309 NO_DIR
311}; 310};
312 311
313/* arguments for rxvt_scr_change_screen() */ 312/* arguments for rxvt_scr_change_screen () */
314enum { 313enum {
315 PRIMARY = 0, 314 PRIMARY = 0,
316 SECONDARY 315 SECONDARY
317}; 316};
318 317
… …
368#define XTerm_font 50 367#define XTerm_font 50
369 368
370/* 369/*
371 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 370 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
372 */ 371 */
372#define XTerm_locale 9 /* change locale */
373#define XTerm_Menu 10 /* set menu item */ 373#define XTerm_Menu 10 /* set menu item */
374#define XTerm_Pixmap 20 /* new bg pixmap */ 374#define XTerm_Pixmap 20 /* new bg pixmap */
375#define XTerm_restoreFG 39 /* change default fg color */ 375#define XTerm_restoreFG 39 /* change default fg color */
376#define XTerm_restoreBG 49 /* change default bg color */ 376#define XTerm_restoreBG 49 /* change default bg color */
377#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 377#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */
… …
471 Rs_backgroundPixmap, 471 Rs_backgroundPixmap,
472#endif 472#endif
473#if (MENUBAR_MAX) 473#if (MENUBAR_MAX)
474 Rs_menu, 474 Rs_menu,
475#endif 475#endif
476#ifdef GREEK_SUPPORT
477 Rs_greek_keyboard,
478 Rs_greektoggle_key,
479#endif
480 Rs_loginShell, 476 Rs_loginShell,
481 Rs_jumpScroll, 477 Rs_jumpScroll,
482#ifdef HAVE_SCROLLBARS 478#ifdef HAVE_SCROLLBARS
483 Rs_scrollBar, 479 Rs_scrollBar,
484 Rs_scrollBar_right, 480 Rs_scrollBar_right,
… …
543 Rs_pointerBlankDelay, 539 Rs_pointerBlankDelay,
544 Rs_imLocale, 540 Rs_imLocale,
545 NUM_RESOURCES 541 NUM_RESOURCES
546}; 542};
547 543
548// see init.C:xa_named, which must be kept in sync 544// see init.C:xa_names, which must be kept in sync
549enum { 545enum {
550 XA_TEXT = 0, 546 XA_TEXT = 0,
551 XA_COMPOUND_TEXT, 547 XA_COMPOUND_TEXT,
552 XA_UTF8_STRING, 548 XA_UTF8_STRING,
553 XA_MULTIPLE, 549 XA_MULTIPLE,
… …
594#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 590#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
595#define PrivMode(test,bit) \ 591#define PrivMode(test,bit) \
596 if (test) \ 592 if (test) \
597 PrivateModes |= (bit); \ 593 PrivateModes |= (bit); \
598 else \ 594 else \
599 PrivateModes &= ~(bit) 595 PrivateModes &= ~ (bit)
600 596
601#ifdef ALLOW_132_MODE 597#ifdef ALLOW_132_MODE
602# define PrivMode_Default \ 598# define PrivMode_Default \
603(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 599(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
604#else 600#else
605# define PrivMode_Default \ 601# define PrivMode_Default \
606(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 602(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
607#endif 603#endif
608 604
609#define XDEPTH Xdepth 605#define XDEPTH display->depth
610#define XCMAP Xcmap 606#define XCMAP display->cmap
611#define XVISUAL Xvisual 607#define XVISUAL display->visual
612 608
613#define IMBUFSIZ 128 /* input modifier buffer sizes */ 609#define IMBUFSIZ 128 /* input modifier buffer sizes */
614#ifndef BUFSIZ 610#ifndef BUFSIZ
615# define BUFSIZ 4096 611# define BUFSIZ 4096
616#endif 612#endif
… …
648#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 644#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
649 645
650#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 646#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) 647#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth)
652 648
653#define Xroot DefaultRootWindow(Xdisplay)
654
655/* how to build & extract colors and attributes */ 649/* how to build & extract colors and attributes */
656#define GET_BASEFG(x) (((x) & RS_fgMask)) 650#define GET_BASEFG(x) (((x) & RS_fgMask))
657#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 651#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
658#ifndef NO_BRIGHTCOLOR 652#ifndef NO_BRIGHTCOLOR
659# define GET_FGCOLOR(x) \ 653# define GET_FGCOLOR(x) \
660 ((((x) & RS_Bold) == 0 \ 654 ((((x) & RS_Bold) == 0 \
661 || GET_BASEFG(x) < minCOLOR \ 655 || GET_BASEFG (x) < minCOLOR \
662 || GET_BASEFG(x) >= minBrightCOLOR) \ 656 || GET_BASEFG (x) >= minBrightCOLOR) \
663 ? GET_BASEFG(x) \ 657 ? GET_BASEFG (x) \
664 : (GET_BASEFG(x) + (minBrightCOLOR - minCOLOR))) 658 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
665# define GET_BGCOLOR(x) \ 659# define GET_BGCOLOR(x) \
666 ((((x) & RS_Blink) == 0 \ 660 ((((x) & RS_Blink) == 0 \
667 || GET_BASEBG(x) < minCOLOR \ 661 || GET_BASEBG (x) < minCOLOR \
668 || GET_BASEBG(x) >= minBrightCOLOR) \ 662 || GET_BASEBG (x) >= minBrightCOLOR) \
669 ? GET_BASEBG(x) \ 663 ? GET_BASEBG (x) \
670 : (GET_BASEBG(x) + (minBrightCOLOR - minCOLOR))) 664 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
671#else 665#else
672# define GET_FGCOLOR(x) GET_BASEFG(x) 666# define GET_FGCOLOR(x) GET_BASEFG(x)
673# define GET_BGCOLOR(x) GET_BASEBG(x) 667# define GET_BGCOLOR(x) GET_BASEBG(x)
674#endif 668#endif
675 669
… …
699#define scrollbar_isUpDn() isupper (scrollBar.state) 693#define scrollbar_isUpDn() isupper (scrollBar.state)
700#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win) 694#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win)
701 695
702#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1)) 696#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1))
703#define scrollbarnext_upButton(y) ((y) > scrollBar.end \ 697#define scrollbarnext_upButton(y) ((y) > scrollBar.end \
704 && (y) <= scrollbarnext_dnval()) 698 && (y) <= scrollbarnext_dnval ())
705#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) 699#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval())
706#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT 700#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
707#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg) 701#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg)
708#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end) 702#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end)
709#define SCROLLRXVT_MINHEIGHT 10 703#define SCROLLRXVT_MINHEIGHT 10
… …
714 : SCROLLRXVT_MINHEIGHT) 708 : SCROLLRXVT_MINHEIGHT)
715#define scrollbar_above_slider(y) ((y) < scrollBar.top) 709#define scrollbar_above_slider(y) ((y) < scrollBar.top)
716#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 710#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
717#define scrollbar_position(y) ((y) - scrollBar.beg) 711#define scrollbar_position(y) ((y) - scrollBar.beg)
718#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 712#define scrollbar_size() (scrollBar.end - scrollBar.beg \
719 - scrollbar_minheight()) 713 - scrollbar_minheight ())
720 714
721#if (MENUBAR_MAX > 1) 715#if (MENUBAR_MAX > 1)
722/* rendition style flags */ 716/* rendition style flags */
723# define menuBar_height() (TermWin.fheight + SHADOW) 717# define menuBar_height() (TermWin.fheight + SHADOW)
724# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 718# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
… …
819 813
820// primivite wrapper around mbstate_t to ensure initialisation 814// primivite wrapper around mbstate_t to ensure initialisation
821struct mbstate { 815struct mbstate {
822 mbstate_t mbs; 816 mbstate_t mbs;
823 817
824 mbstate () 818 operator mbstate_t *() { return &mbs; }
825 {
826 MEMSET (&mbs, 0, sizeof (mbs)); 819 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
827 } 820 mbstate () { reset (); }
828}; 821};
829 822
830struct rxvt_term : rxvt_vars { 823struct rxvt_term : rxvt_vars {
831 struct mbstate mbstate; 824 struct mbstate mbstate;
832 825
… …
867#endif 860#endif
868 scrollbar_align, 861 scrollbar_align,
869 selection_wait, 862 selection_wait,
870 selection_type; 863 selection_type;
871/* ---------- */ 864/* ---------- */
872#ifdef GREEK_SUPPORT
873 short greek_mode; /* greek keyboard mode */
874#endif
875 short rvideo; 865 short rvideo;
876 int16_t num_scr; /* screen: number lines scrolled */ 866 int16_t num_scr; /* screen: number lines scrolled */
877 unsigned int prev_ncol, /* screen: previous number of columns */ 867 unsigned int prev_ncol, /* screen: previous number of columns */
878 prev_nrow; /* screen: previous number of rows */ 868 prev_nrow; /* screen: previous number of rows */
879#ifdef RXVT_GRAPHICS
880 uint16_t gr_prev_start;
881#endif
882/* ---------- */ 869/* ---------- */
883 rend_t rstyle; 870 rend_t rstyle;
884/* ---------- */ 871/* ---------- */
885 uint32_t pixcolor_set[NPIXCLR_SETS]; 872 uint32_t pixcolor_set[NPIXCLR_SETS];
886/* ---------- */ 873/* ---------- */
… …
948#endif 935#endif
949#ifdef XTERM_SCROLLBAR 936#ifdef XTERM_SCROLLBAR
950 GC xscrollbarGC, 937 GC xscrollbarGC,
951 ShadowGC; 938 ShadowGC;
952#endif 939#endif
940#ifdef PLAIN_SCROLLBAR
941 GC pscrollbarGC;
942#endif
953#ifdef NEXT_SCROLLBAR 943#ifdef NEXT_SCROLLBAR
954 GC blackGC, 944 GC blackGC,
955 whiteGC, 945 whiteGC,
956 grayGC, 946 grayGC,
957 darkGC, 947 darkGC,
… …
985 const char *key_delete; 975 const char *key_delete;
986#endif 976#endif
987#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 977#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
988 KeySym ks_bigfont, ks_smallfont; 978 KeySym ks_bigfont, ks_smallfont;
989#endif 979#endif
990#ifdef GREEK_SUPPORT
991 KeySym ks_greekmodeswith;
992#endif
993#ifdef USE_XIM 980#ifdef USE_XIM
981 rxvt_xim *input_method;
994 XIC Input_Context; 982 XIC Input_Context;
995 XIMStyle input_style; 983 XIMStyle input_style;
996 int event_type; 984 int event_type;
997#endif 985#endif
998 struct mouse_event MEvent; 986 struct mouse_event MEvent;
999 XComposeStatus compose; 987 XComposeStatus compose;
1000#ifdef RXVT_GRAPHICS
1001 int graphics_up;
1002 struct grwin_t *gr_root;
1003#endif
1004 ttymode_t tio; 988 ttymode_t tio;
1005#ifdef UTMP_SUPPORT 989#ifdef UTMP_SUPPORT
1006# ifdef HAVE_STRUCT_UTMP 990# ifdef HAVE_STRUCT_UTMP
1007 struct utmp ut; 991 struct utmp ut;
1008# endif 992# endif
… …
1017 row_col_t oldcursor; 1001 row_col_t oldcursor;
1018#ifdef XPM_BACKGROUND 1002#ifdef XPM_BACKGROUND
1019 bgPixmap_t bgPixmap; 1003 bgPixmap_t bgPixmap;
1020 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1004 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1021#endif 1005#endif
1022#ifdef MULTICHAR_SET
1023 int oldcursormulti;
1024 void (*multichar_decode)(unsigned char *str, int len);
1025#endif
1026#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1006#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1027 struct stat ttyfd_stat; /* original status of our tty */ 1007 struct stat ttyfd_stat; /* original status of our tty */
1028#endif 1008#endif
1029#ifdef MENUBAR 1009#ifdef MENUBAR
1030 menu_t *ActiveMenu, /* currently active menu */ 1010 menu_t *ActiveMenu, /* currently active menu */
1031 *BuildMenu; /* the menu currently being built */ 1011 *BuildMenu; /* the menu currently being built */
1032 bar_t *CurrentBar; 1012 bar_t *CurrentBar;
1033# if !(MENUBAR_MAX > 1) 1013# if ! (MENUBAR_MAX > 1)
1034 bar_t BarList; 1014 bar_t BarList;
1035# endif /* (MENUBAR_MAX > 1) */ 1015# endif /* (MENUBAR_MAX > 1) */
1036#endif
1037#ifdef RXVT_GRAPHICS
1038 Window gr_last_id;
1039#endif 1016#endif
1040#ifdef CURSOR_BLINK 1017#ifdef CURSOR_BLINK
1041 struct timeval lastcursorchange; 1018 struct timeval lastcursorchange;
1042#endif 1019#endif
1043#ifdef POINTER_BLANK 1020#ifdef POINTER_BLANK
… …
1053 char *codeset; 1030 char *codeset;
1054 char charsets[4]; 1031 char charsets[4];
1055 unsigned char *v_buffer; /* pointer to physical buffer */ 1032 unsigned char *v_buffer; /* pointer to physical buffer */
1056 unsigned int v_buflen; /* size of area to write */ 1033 unsigned int v_buflen; /* size of area to write */
1057 char *newfont[MAX_NFONTS]; 1034 char *newfont[MAX_NFONTS];
1035 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1058#ifdef KEYSYM_RESOURCE 1036#ifdef KEYSYM_RESOURCE
1059 const unsigned char *Keysym_map[256]; 1037 const unsigned char *Keysym_map[256];
1060#endif 1038#endif
1061 const char *rs[NUM_RESOURCES]; 1039 const char *rs[NUM_RESOURCES];
1062/* command input buffering */ 1040/* command input buffering */
… …
1068 1046
1069 void paste (const unsigned char *data, unsigned int len); 1047 void paste (const unsigned char *data, unsigned int len);
1070 1048
1071 void flush (); 1049 void flush ();
1072 1050
1051 void rootwin_cb (XEvent &xev);
1052 xevent_watcher rootwin_ev;
1053
1054 void x_cb (XEvent &xev);
1055 xevent_watcher termwin_ev;
1056 xevent_watcher vt_ev;
1057#ifdef HAVE_SCROLLBARS
1058 xevent_watcher scrollbar_ev;
1059#endif
1060#ifdef MENUBAR
1061 xevent_watcher menubar_ev;
1062#endif
1063
1073 void check_cb (check_watcher &w); check_watcher check_ev; 1064 void check_cb (check_watcher &w); check_watcher check_ev;
1074 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1065 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1075 1066
1076 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1067 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 1068
1079 void incr_cb (time_watcher &w); time_watcher incr_ev; 1069 void incr_cb (time_watcher &w); time_watcher incr_ev;
1080 1070
1081#ifdef CURSOR_BLINK 1071#ifdef CURSOR_BLINK
1082 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1072 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1104 bool init_vars (); 1094 bool init_vars ();
1105 1095
1106 uint32_t next_char (); 1096 uint32_t next_char ();
1107 1097
1108 bool pty_fill (); 1098 bool pty_fill ();
1109 void process_x_events ();
1110 1099
1111 void *operator new (size_t s); 1100 void *operator new (size_t s);
1112 void operator delete (void *p, size_t s); 1101 void operator delete (void *p, size_t s);
1113 1102
1114 void init_secondary (); 1103 void init_secondary ();
… …
1118 void init_xlocale (); 1107 void init_xlocale ();
1119 void init_command (const char *const *argv); 1108 void init_command (const char *const *argv);
1120 int run_command (const char *const *argv); 1109 int run_command (const char *const *argv);
1121 int run_child (const char *const *argv); 1110 int run_child (const char *const *argv);
1122 1111
1123 void color_aliases(int idx); 1112 void color_aliases (int idx);
1124 void recolour_cursor (); 1113 void recolour_cursor ();
1125 void create_windows (int argc, const char *const *argv); 1114 void create_windows (int argc, const char *const *argv);
1126 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1115 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1127 void window_calc (unsigned int width, unsigned int height); 1116 void window_calc (unsigned int width, unsigned int height);
1128 void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1129 1117
1130#if USE_XIM 1118#if USE_XIM
1119 void im_destroy ();
1120 void im_cb (); im_watcher im_ev;
1131 void set_size (XRectangle *size); 1121 void im_set_size (XRectangle *size);
1132 void set_position (XPoint *pos); 1122 void im_set_position (XPoint *pos);
1133 void set_color (unsigned long *fg, unsigned long *bg); 1123 void im_set_color (unsigned long *fg, unsigned long *bg);
1124 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1125
1126 bool IMisRunning ();
1127 void IMSendSpot ();
1128 bool IM_get_IC (const char *modifiers);
1129 void IMSetStatusPosition ();
1134#endif 1130#endif
1135 1131
1136 void resize_scrollbar (); 1132 void resize_scrollbar ();
1137 1133
1138 void pixel_position (int *x, int *y); 1134 void pixel_position (int *x, int *y);
1139 1135
1140 void selection_click (int clicks, int x, int y); 1136 void selection_click (int clicks, int x, int y);
1141 void selection_extend (int x, int y, int flag); 1137 void selection_extend (int x, int y, int flag);
1142 void selection_rotate (int x, int y); 1138 void selection_rotate (int x, int y);
1143 1139
1144 /* screen(!) */ 1140 /* screen (!) */
1145 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1141 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1146 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1142 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1147 int scr_scroll_text (int row1, int row2, int count, int spec); 1143 int scr_scroll_text (int row1, int row2, int count, int spec);
1148 void scr_reset (); 1144 void scr_reset ();
1149 void scr_reset_realloc (); 1145 void scr_reset_realloc ();
… …
1156 void scr_expose (int x, int y, int width, int height, bool refresh); 1152 void scr_expose (int x, int y, int width, int height, bool refresh);
1157 1153
1158 /* autoconvert */ 1154 /* autoconvert */
1159 1155
1160 // command.C 1156 // command.C
1161 void lookup_key (XKeyEvent *ev); 1157 void lookup_key (XKeyEvent &ev);
1162 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1158 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1163 uint32_t cmd_getc (); 1159 uint32_t cmd_getc ();
1164 void mouse_report (const XButtonEvent *ev); 1160 void mouse_report (const XButtonEvent &ev);
1165 void process_x_event (XEvent *ev);
1166 void button_press (XButtonEvent *ev); 1161 void button_press (const XButtonEvent &ev);
1167 void button_release (XButtonEvent *ev); 1162 void button_release (const XButtonEvent &ev);
1168 int check_our_parents (); 1163 int check_our_parents ();
1169#ifdef PRINTPIPE 1164#ifdef PRINTPIPE
1170 FILE * popen_printer (); 1165 FILE * popen_printer ();
1171 int pclose_printer (FILE *stream); 1166 int pclose_printer (FILE *stream);
1172#endif 1167#endif
… …
1177 void process_csi_seq (); 1172 void process_csi_seq ();
1178 void process_window_ops (const int *args, unsigned int nargs); 1173 void process_window_ops (const int *args, unsigned int nargs);
1179 unsigned char * get_to_st (unsigned char *ends_how); 1174 unsigned char * get_to_st (unsigned char *ends_how);
1180 void process_dcs_seq (); 1175 void process_dcs_seq ();
1181 void process_osc_seq (); 1176 void process_osc_seq ();
1182 void xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))); 1177 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)));
1183 int privcases (int mode, unsigned long bit); 1178 int privcases (int mode, unsigned long bit);
1184 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1179 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1185 void process_sgr_mode (unsigned int nargs, const int *arg); 1180 void process_sgr_mode (unsigned int nargs, const int *arg);
1186 void process_graphics (); 1181 void process_graphics ();
1187 // init.C 1182 // init.C
… …
1192 void cleanutent (); 1187 void cleanutent ();
1193 // main.C; 1188 // main.C;
1194 void privileges (int mode); 1189 void privileges (int mode);
1195 void privileged_utmp (char action); 1190 void privileged_utmp (char action);
1196 void privileged_ttydev (char action); 1191 void privileged_ttydev (char action);
1197 void change_font (int init, const char *fontname); 1192 bool change_font (const char *fontname);
1198 void font_up_down (int n, int direction); 1193 bool font_up_down (int n, int direction);
1199 void set_title (const char *str); 1194 void set_title (const char *str);
1200 void set_iconName (const char *str); 1195 void set_iconName (const char *str);
1201 void set_window_color (int idx, const char *color); 1196 void set_window_color (int idx, const char *color);
1202 void set_colorfgbg (); 1197 void set_colorfgbg ();
1203 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1198 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1204 void set_widthheight (unsigned int width, unsigned int height); 1199 void set_widthheight (unsigned int width, unsigned int height);
1205 bool IMisRunning ();
1206 void IMSendSpot ();
1207 bool IM_get_IC ();
1208 void IMSetStatusPosition ();
1209 1200
1210#ifdef MENUBAR 1201#ifdef MENUBAR
1211 // menubar.C 1202 // menubar.C
1212 void menuitem_free (menu_t *menu, menuitem_t *item); 1203 void menuitem_free (menu_t *menu, menuitem_t *item);
1213 int action_dispatch (action_t *action); 1204 int action_dispatch (action_t *action);
… …
1218 menu_t * menu_add (menu_t *parent, char *path); 1209 menu_t * menu_add (menu_t *parent, char *path);
1219 void drawbox_menubar (int x, int len, int state); 1210 void drawbox_menubar (int x, int len, int state);
1220 void drawtriangle (int x, int y, int state); 1211 void drawtriangle (int x, int y, int state);
1221 void drawbox_menuitem (int y, int state); 1212 void drawbox_menuitem (int y, int state);
1222 void menu_show (); 1213 void menu_show ();
1223 void menu_display (void (*update)(rxvt_t *)); 1214 void menu_display (void (*update) (rxvt_t *));
1224 void menu_hide_all (); 1215 void menu_hide_all ();
1225 void menu_hide (); 1216 void menu_hide ();
1226 void menu_clear (menu_t *menu); 1217 void menu_clear (menu_t *menu);
1227 void menubar_clear (); 1218 void menubar_clear ();
1228 bar_t * menubar_find (const char *name); 1219 bar_t * menubar_find (const char *name);
… …
1284 void selection_make (Time tm); 1275 void selection_make (Time tm);
1285 void selection_start_colrow (int col, int row); 1276 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); 1277 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); 1278 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1288 void selection_remove_trailing_spaces (); 1279 void selection_remove_trailing_spaces ();
1289 void selection_send (const XSelectionRequestEvent *rq); 1280 void selection_send (const XSelectionRequestEvent &rq);
1290 1281
1291#if defined(NEXT_SCROLLBAR) 1282#if defined(NEXT_SCROLLBAR)
1292 // scrollbar-next.C 1283 // scrollbar-next.C
1293 Pixmap renderPixmap (const char *const *data, int width, int height); 1284 Pixmap renderPixmap (const char *const *data, int width, int height);
1294 void init_scrollbar_stuff (); 1285 void init_scrollbar_stuff ();
1295 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1286 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); 1287 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 1288#endif
1299 1289
1300#if defined(RXVT_SCROLLBAR) 1290#if defined(RXVT_SCROLLBAR)
1301 // scrollbar-rxvt.C 1291 // scrollbar-rxvt.C
1302 void Draw_button (int x, int y, int state, int dirn); 1292 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); 1293 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 1294#endif
1306 1295
1307#if defined(XTERM_SCROLLBAR) 1296#if defined(XTERM_SCROLLBAR)
1308 // scrollbar-xterm.C 1297 // scrollbar-xterm.C
1309 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len); 1298 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1310# define scrollbar_update scrollbar_show_xterm // HACK 1299#endif
1300
1301#if defined(PLAIN_SCROLLBAR)
1302 // scrollbar-plain.C
1303 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1311#endif 1304#endif
1312 1305
1313 // scrollbar.C 1306 // scrollbar.C
1314 int scrollbar_mapping (int map); 1307 int scrollbar_mapping (int map);
1315 int scrollbar_show (int update); 1308 int scrollbar_show (int update);

Diff Legend

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