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.45 by pcg, Wed Mar 3 04:07:52 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 *****************************************************************************
… …
144 141
145#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION) 142#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
146# error if you disable both selection styles, how can you select, silly? 143# error if you disable both selection styles, how can you select, silly?
147#endif 144#endif
148 145
149#define APL_CLASS "XTerm" /* class name */
150#define APL_SUBCLASS "Rxvt" /* also check resources under this name */
151#define APL_NAME "rxvt" /* normal name */
152
153/* COLORTERM, TERM environment variables */ 146/* COLORTERM, TERM environment variables */
154#define COLORTERMENV "rxvt" 147#define COLORTERMENV "rxvt"
155#ifdef XPM_BACKGROUND 148#ifdef XPM_BACKGROUND
156# define COLORTERMENVFULL COLORTERMENV "-xpm" 149# define COLORTERMENVFULL COLORTERMENV "-xpm"
157#else 150#else
158# define COLORTERMENVFULL COLORTERMENV 151# define COLORTERMENVFULL COLORTERMENV
159#endif 152#endif
160#ifndef TERMENV 153#ifndef TERMENV
161# define TERMENV "xterm" 154# define TERMENV "rxvt"
162#endif 155#endif
163 156
164#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 157#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
165# define NO_MOUSE_REPORT_SCROLLBAR 158# define NO_MOUSE_REPORT_SCROLLBAR
166#endif 159#endif
… …
182 175
183#define menuBar_esc 10 176#define menuBar_esc 10
184#define scrollBar_esc 30 177#define scrollBar_esc 30
185#define menuBar_margin 2 /* margin below text */ 178#define menuBar_margin 2 /* margin below text */
186 179
187#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 180#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
188# define HAVE_SCROLLBARS 181# define HAVE_SCROLLBARS
189#endif 182#endif
190 183
191/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 184/* width of scrollBar, menuBar shadow, must be 1 or 2 */
192#ifdef HALFSHADOW 185#ifdef HALFSHADOW
… …
200#define R_SB_ALIGN_BOTTOM 2 193#define R_SB_ALIGN_BOTTOM 2
201 194
202#define R_SB_RXVT 0 195#define R_SB_RXVT 0
203#define R_SB_NEXT 1 196#define R_SB_NEXT 1
204#define R_SB_XTERM 2 197#define R_SB_XTERM 2
198#define R_SB_PLAIN 4
205 199
206#define SB_WIDTH_NEXT 19 200#define SB_WIDTH_NEXT 19
207#define SB_WIDTH_XTERM 7 201#define SB_WIDTH_XTERM 15
202#define SB_WIDTH_PLAIN 7
208#ifndef SB_WIDTH_RXVT 203#ifndef SB_WIDTH_RXVT
209# define SB_WIDTH_RXVT 10 204# define SB_WIDTH_RXVT 10
210#endif 205#endif
211 206
212/* 207/*
… …
239 * | | :::::::: | 234 * | | :::::::: |
240 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT 235 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
241 * | +---------+ | 236 * | +---------+ |
242 * | | ......%%| | 237 * | | ......%%| |
243 * | | ......%%| | 238 * | | ......%%| |
244 * | | ..()..%%| | 239 * | | .. ()..%%| |
245 * | | ......%%| | 240 * | | ......%%| |
246 * | | %%%%%%%%| | 241 * | | %%%%%%%%| |
247 * | +---------+ | <......................... 242 * | +---------+ | <.........................
248 * | | <---< SB_PADDING : 243 * | | <---< SB_PADDING :
249 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT 244 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT
… …
270 * :............: 265 * :............:
271 * | 266 * |
272 * +---< SB_WIDTH_NEXT 267 * +---< SB_WIDTH_NEXT
273 */ 268 */
274 269
270enum {
275#define NO_REFRESH 0 /* Window not visible at all! */ 271 NO_REFRESH = 0 , /* Window not visible at all! */
276#define FAST_REFRESH (1<<0) /* Fully exposed window */ 272 FAST_REFRESH = 1<<0, /* Fully exposed window */
277#define SLOW_REFRESH (1<<1) /* Partially exposed window */ 273 SLOW_REFRESH = 1<<1, /* Partially exposed window */
278#define SMOOTH_REFRESH (1<<2) /* Do sync'ing to make it smooth */ 274 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
279#define REFRESH_BOUNDS (1<<3) 275 REFRESH_BOUNDS = 1<<3
276};
280 277
281#ifdef NO_SECONDARY_SCREEN 278#ifdef NO_SECONDARY_SCREEN
282# define NSCREENS 0 279# define NSCREENS 0
283#else 280#else
284# define NSCREENS 1 281# define NSCREENS 1
… …
291/* special (internal) prefix for font commands */ 288/* special (internal) prefix for font commands */
292#define FONT_CMD '#' 289#define FONT_CMD '#'
293#define FONT_DN "#-" 290#define FONT_DN "#-"
294#define FONT_UP "#+" 291#define FONT_UP "#+"
295 292
296/* flags for rxvt_scr_gotorc() */ 293/* flags for rxvt_scr_gotorc () */
294enum {
297#define C_RELATIVE 1 /* col movement is relative */ 295 C_RELATIVE = 1 , /* col movement is relative */
298#define R_RELATIVE 2 /* row movement is relative */ 296 R_RELATIVE = 2, /* row movement is relative */
299#define RELATIVE (R_RELATIVE|C_RELATIVE) 297 RELATIVE = 1 | 2,
298};
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 */ 301enum {
303#define DELETE +1 302 INSERT = -1, /* don't change these values */
304#define ERASE +2 303 DELETE = +1,
304 ERASE = +2,
305};
305 306
306/* modes for rxvt_scr_page() - scroll page. used by scrollbar window */ 307/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
307enum page_dirn { 308enum page_dirn {
308 UP, 309 UP,
309 DN, 310 DN,
310 NO_DIR 311 NO_DIR,
311}; 312};
312 313
313/* arguments for rxvt_scr_change_screen() */ 314/* arguments for rxvt_scr_change_screen () */
314enum { 315enum {
315 PRIMARY = 0, 316 PRIMARY = 0,
316 SECONDARY 317 SECONDARY,
317}; 318};
318 319
319#define RS_None 0 /* Normal */ 320#define RS_None 0 /* Normal */
320 321
321#define RS_fgMask 0x000001FFu /* 512 colors */ 322#define RS_fgMask 0x000001FFu /* 512 colors */
… …
345enum { 346enum {
346 C0_NUL = 0x00, 347 C0_NUL = 0x00,
347 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 348 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
348 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 349 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
349 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 350 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
350 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1 351 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
351}; 352};
352#define CHAR_ST 0x9c /* 0234 */ 353#define CHAR_ST 0x9c /* 0234 */
353 354
354/* 355/*
355 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 356 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
356 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 357 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
357 */ 358 */
359enum {
358#define XTerm_name 0 360 XTerm_name = 0,
359#define XTerm_iconName 1 361 XTerm_iconName = 1,
360#define XTerm_title 2 362 XTerm_title = 2,
363 XTerm_property = 3, /* change X property, not yet implemented */
361#define XTerm_Color 4 /* change colors */ 364 XTerm_Color = 4, /* change colors */
365 XTerm_Color00 = 10, /* not implemented, CLASH! */
366 XTerm_Color01 = 11, /* not implemented */
362#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ 367 XTerm_Color_cursor = 12, /* change actual 'Cursor' color */
363#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ 368 XTerm_Color_pointer = 13, /* change actual 'Pointer' color */
369 XTerm_Color04 = 14, /* not implemented */
370 XTerm_Color05 = 15, /* not implemented */
371 XTerm_Color06 = 16, /* not implemented */
364#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ 372 XTerm_Color_RV = 17, /* change actual 'Highlight' color */
365#define XTerm_Color_BD 18 /* change actual 'Bold' color */
366#define XTerm_Color_UL 19 /* change actual 'Underline' color */
367#define XTerm_logfile 46 /* not implemented */ 373 XTerm_logfile = 46, /* not implemented */
368#define XTerm_font 50 374 XTerm_font = 50,
369 375
370/* 376 XTerm_konsole30 = 30, /* reserved for konsole */
377 XTerm_konsole31 = 31, /* reserved for konsole */
378 XTerm_emacs51 = 51, /* reserved for emacs shell */
379 /*
371 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 380 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
372 */ 381 */
382 XTerm_locale = 9, /* change locale */
373#define XTerm_Menu 10 /* set menu item */ 383 XTerm_Menu = 10, /* set menu item */
384 XTerm_Color_BD = 18, /* change actual 'Bold' color */
385 XTerm_Color_UL = 19, /* change actual 'Underline' color */
374#define XTerm_Pixmap 20 /* new bg pixmap */ 386 XTerm_Pixmap = 20, /* new bg pixmap */
375#define XTerm_restoreFG 39 /* change default fg color */ 387 XTerm_restoreFG = 39, /* change default fg color */
376#define XTerm_restoreBG 49 /* change default bg color */ 388 XTerm_restoreBG = 49, /* change default bg color */
377#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 389 XTerm_dumpscreen = 55, /* dump scrollback and all of screen */
390};
378 391
379/* Words starting with `Color_' are colours. Others are counts */ 392/* Words starting with `Color_' are colours. Others are counts */
380/* 393/*
381 * The following comment is mostly obsolete since pixcolor_set was expanded: 394 * The following comment is mostly obsolete since pixcolor_set was expanded:
382 * We're currently upto 29 colours. Only 3 more available. The 395 * We're currently upto 29 colours. Only 3 more available. The
… …
471 Rs_backgroundPixmap, 484 Rs_backgroundPixmap,
472#endif 485#endif
473#if (MENUBAR_MAX) 486#if (MENUBAR_MAX)
474 Rs_menu, 487 Rs_menu,
475#endif 488#endif
476#ifdef GREEK_SUPPORT
477 Rs_greek_keyboard,
478 Rs_greektoggle_key,
479#endif
480 Rs_loginShell, 489 Rs_loginShell,
481 Rs_jumpScroll, 490 Rs_jumpScroll,
482#ifdef HAVE_SCROLLBARS 491#ifdef HAVE_SCROLLBARS
483 Rs_scrollBar, 492 Rs_scrollBar,
484 Rs_scrollBar_right, 493 Rs_scrollBar_right,
… …
543 Rs_pointerBlankDelay, 552 Rs_pointerBlankDelay,
544 Rs_imLocale, 553 Rs_imLocale,
545 NUM_RESOURCES 554 NUM_RESOURCES
546}; 555};
547 556
548// see init.C:xa_named, which must be kept in sync 557// see init.C:xa_names, which must be kept in sync
549enum { 558enum {
550 XA_TEXT = 0, 559 XA_TEXT = 0,
551 XA_COMPOUND_TEXT, 560 XA_COMPOUND_TEXT,
552 XA_UTF8_STRING, 561 XA_UTF8_STRING,
553 XA_MULTIPLE, 562 XA_MULTIPLE,
… …
594#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 603#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
595#define PrivMode(test,bit) \ 604#define PrivMode(test,bit) \
596 if (test) \ 605 if (test) \
597 PrivateModes |= (bit); \ 606 PrivateModes |= (bit); \
598 else \ 607 else \
599 PrivateModes &= ~(bit) 608 PrivateModes &= ~ (bit)
600 609
601#ifdef ALLOW_132_MODE 610#ifdef ALLOW_132_MODE
602# define PrivMode_Default \ 611# define PrivMode_Default \
603(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 612(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
604#else 613#else
605# define PrivMode_Default \ 614# define PrivMode_Default \
606(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 615(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
607#endif 616#endif
608 617
609#define XDEPTH Xdepth 618#define XDEPTH display->depth
610#define XCMAP Xcmap 619#define XCMAP display->cmap
611#define XVISUAL Xvisual 620#define XVISUAL display->visual
612 621
613#define IMBUFSIZ 128 /* input modifier buffer sizes */ 622#define IMBUFSIZ 128 /* input modifier buffer sizes */
614#ifndef BUFSIZ 623#ifndef BUFSIZ
615# define BUFSIZ 4096 624# define BUFSIZ 4096
616#endif 625#endif
… …
648#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 657#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
649 658
650#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 659#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) 660#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth)
652 661
653#define Xroot DefaultRootWindow(Xdisplay)
654
655/* how to build & extract colors and attributes */ 662/* how to build & extract colors and attributes */
656#define GET_BASEFG(x) (((x) & RS_fgMask)) 663#define GET_BASEFG(x) (((x) & RS_fgMask))
657#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 664#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
658#ifndef NO_BRIGHTCOLOR 665#ifndef NO_BRIGHTCOLOR
659# define GET_FGCOLOR(x) \ 666# define GET_FGCOLOR(x) \
660 ((((x) & RS_Bold) == 0 \ 667 ((((x) & RS_Bold) == 0 \
661 || GET_BASEFG(x) < minCOLOR \ 668 || GET_BASEFG (x) < minCOLOR \
662 || GET_BASEFG(x) >= minBrightCOLOR) \ 669 || GET_BASEFG (x) >= minBrightCOLOR) \
663 ? GET_BASEFG(x) \ 670 ? GET_BASEFG (x) \
664 : (GET_BASEFG(x) + (minBrightCOLOR - minCOLOR))) 671 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
665# define GET_BGCOLOR(x) \ 672# define GET_BGCOLOR(x) \
666 ((((x) & RS_Blink) == 0 \ 673 ((((x) & RS_Blink) == 0 \
667 || GET_BASEBG(x) < minCOLOR \ 674 || GET_BASEBG (x) < minCOLOR \
668 || GET_BASEBG(x) >= minBrightCOLOR) \ 675 || GET_BASEBG (x) >= minBrightCOLOR) \
669 ? GET_BASEBG(x) \ 676 ? GET_BASEBG (x) \
670 : (GET_BASEBG(x) + (minBrightCOLOR - minCOLOR))) 677 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
671#else 678#else
672# define GET_FGCOLOR(x) GET_BASEFG(x) 679# define GET_FGCOLOR(x) GET_BASEFG(x)
673# define GET_BGCOLOR(x) GET_BASEBG(x) 680# define GET_BGCOLOR(x) GET_BASEBG(x)
674#endif 681#endif
675 682
… …
699#define scrollbar_isUpDn() isupper (scrollBar.state) 706#define scrollbar_isUpDn() isupper (scrollBar.state)
700#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win) 707#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win)
701 708
702#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1)) 709#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1))
703#define scrollbarnext_upButton(y) ((y) > scrollBar.end \ 710#define scrollbarnext_upButton(y) ((y) > scrollBar.end \
704 && (y) <= scrollbarnext_dnval()) 711 && (y) <= scrollbarnext_dnval ())
705#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) 712#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval())
706#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT 713#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
707#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg) 714#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg)
708#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end) 715#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end)
709#define SCROLLRXVT_MINHEIGHT 10 716#define SCROLLRXVT_MINHEIGHT 10
… …
714 : SCROLLRXVT_MINHEIGHT) 721 : SCROLLRXVT_MINHEIGHT)
715#define scrollbar_above_slider(y) ((y) < scrollBar.top) 722#define scrollbar_above_slider(y) ((y) < scrollBar.top)
716#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 723#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
717#define scrollbar_position(y) ((y) - scrollBar.beg) 724#define scrollbar_position(y) ((y) - scrollBar.beg)
718#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 725#define scrollbar_size() (scrollBar.end - scrollBar.beg \
719 - scrollbar_minheight()) 726 - scrollbar_minheight ())
720 727
721#if (MENUBAR_MAX > 1) 728#if (MENUBAR_MAX > 1)
722/* rendition style flags */ 729/* rendition style flags */
723# define menuBar_height() (TermWin.fheight + SHADOW) 730# define menuBar_height() (TermWin.fheight + SHADOW)
724# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 731# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
… …
819 826
820// primivite wrapper around mbstate_t to ensure initialisation 827// primivite wrapper around mbstate_t to ensure initialisation
821struct mbstate { 828struct mbstate {
822 mbstate_t mbs; 829 mbstate_t mbs;
823 830
824 mbstate () 831 operator mbstate_t *() { return &mbs; }
825 {
826 MEMSET (&mbs, 0, sizeof (mbs)); 832 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
827 } 833 mbstate () { reset (); }
828}; 834};
829 835
830struct rxvt_term : rxvt_vars { 836struct rxvt_term : rxvt_vars {
831 struct mbstate mbstate; 837 struct mbstate mbstate;
832 838
… …
867#endif 873#endif
868 scrollbar_align, 874 scrollbar_align,
869 selection_wait, 875 selection_wait,
870 selection_type; 876 selection_type;
871/* ---------- */ 877/* ---------- */
872#ifdef GREEK_SUPPORT
873 short greek_mode; /* greek keyboard mode */
874#endif
875 short rvideo; 878 short rvideo;
876 int16_t num_scr; /* screen: number lines scrolled */ 879 int16_t num_scr; /* screen: number lines scrolled */
877 unsigned int prev_ncol, /* screen: previous number of columns */ 880 unsigned int prev_ncol, /* screen: previous number of columns */
878 prev_nrow; /* screen: previous number of rows */ 881 prev_nrow; /* screen: previous number of rows */
879#ifdef RXVT_GRAPHICS
880 uint16_t gr_prev_start;
881#endif
882/* ---------- */ 882/* ---------- */
883 rend_t rstyle; 883 rend_t rstyle;
884/* ---------- */ 884/* ---------- */
885 uint32_t pixcolor_set[NPIXCLR_SETS]; 885 uint32_t pixcolor_set[NPIXCLR_SETS];
886/* ---------- */ 886/* ---------- */
… …
948#endif 948#endif
949#ifdef XTERM_SCROLLBAR 949#ifdef XTERM_SCROLLBAR
950 GC xscrollbarGC, 950 GC xscrollbarGC,
951 ShadowGC; 951 ShadowGC;
952#endif 952#endif
953#ifdef PLAIN_SCROLLBAR
954 GC pscrollbarGC;
955#endif
953#ifdef NEXT_SCROLLBAR 956#ifdef NEXT_SCROLLBAR
954 GC blackGC, 957 GC blackGC,
955 whiteGC, 958 whiteGC,
956 grayGC, 959 grayGC,
957 darkGC, 960 darkGC,
… …
985 const char *key_delete; 988 const char *key_delete;
986#endif 989#endif
987#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 990#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
988 KeySym ks_bigfont, ks_smallfont; 991 KeySym ks_bigfont, ks_smallfont;
989#endif 992#endif
990#ifdef GREEK_SUPPORT
991 KeySym ks_greekmodeswith;
992#endif
993#ifdef USE_XIM 993#ifdef USE_XIM
994 rxvt_xim *input_method;
994 XIC Input_Context; 995 XIC Input_Context;
995 XIMStyle input_style; 996 XIMStyle input_style;
996 int event_type; 997 int event_type;
997#endif 998#endif
998 struct mouse_event MEvent; 999 struct mouse_event MEvent;
999 XComposeStatus compose; 1000 XComposeStatus compose;
1000#ifdef RXVT_GRAPHICS
1001 int graphics_up;
1002 struct grwin_t *gr_root;
1003#endif
1004 ttymode_t tio; 1001 ttymode_t tio;
1005#ifdef UTMP_SUPPORT 1002#ifdef UTMP_SUPPORT
1006# ifdef HAVE_STRUCT_UTMP 1003# ifdef HAVE_STRUCT_UTMP
1007 struct utmp ut; 1004 struct utmp ut;
1008# endif 1005# endif
… …
1017 row_col_t oldcursor; 1014 row_col_t oldcursor;
1018#ifdef XPM_BACKGROUND 1015#ifdef XPM_BACKGROUND
1019 bgPixmap_t bgPixmap; 1016 bgPixmap_t bgPixmap;
1020 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1017 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1021#endif 1018#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 1019#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1027 struct stat ttyfd_stat; /* original status of our tty */ 1020 struct stat ttyfd_stat; /* original status of our tty */
1028#endif 1021#endif
1029#ifdef MENUBAR 1022#ifdef MENUBAR
1030 menu_t *ActiveMenu, /* currently active menu */ 1023 menu_t *ActiveMenu, /* currently active menu */
1031 *BuildMenu; /* the menu currently being built */ 1024 *BuildMenu; /* the menu currently being built */
1032 bar_t *CurrentBar; 1025 bar_t *CurrentBar;
1033# if !(MENUBAR_MAX > 1) 1026# if ! (MENUBAR_MAX > 1)
1034 bar_t BarList; 1027 bar_t BarList;
1035# endif /* (MENUBAR_MAX > 1) */ 1028# endif /* (MENUBAR_MAX > 1) */
1036#endif
1037#ifdef RXVT_GRAPHICS
1038 Window gr_last_id;
1039#endif 1029#endif
1040#ifdef CURSOR_BLINK 1030#ifdef CURSOR_BLINK
1041 struct timeval lastcursorchange; 1031 struct timeval lastcursorchange;
1042#endif 1032#endif
1043#ifdef POINTER_BLANK 1033#ifdef POINTER_BLANK
… …
1053 char *codeset; 1043 char *codeset;
1054 char charsets[4]; 1044 char charsets[4];
1055 unsigned char *v_buffer; /* pointer to physical buffer */ 1045 unsigned char *v_buffer; /* pointer to physical buffer */
1056 unsigned int v_buflen; /* size of area to write */ 1046 unsigned int v_buflen; /* size of area to write */
1057 char *newfont[MAX_NFONTS]; 1047 char *newfont[MAX_NFONTS];
1048 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1058#ifdef KEYSYM_RESOURCE 1049#ifdef KEYSYM_RESOURCE
1059 const unsigned char *Keysym_map[256]; 1050 const unsigned char *Keysym_map[256];
1060#endif 1051#endif
1061 const char *rs[NUM_RESOURCES]; 1052 const char *rs[NUM_RESOURCES];
1062/* command input buffering */ 1053/* command input buffering */
… …
1068 1059
1069 void paste (const unsigned char *data, unsigned int len); 1060 void paste (const unsigned char *data, unsigned int len);
1070 1061
1071 void flush (); 1062 void flush ();
1072 1063
1064 void rootwin_cb (XEvent &xev);
1065 xevent_watcher rootwin_ev;
1066
1067 void x_cb (XEvent &xev);
1068 xevent_watcher termwin_ev;
1069 xevent_watcher vt_ev;
1070#ifdef HAVE_SCROLLBARS
1071 xevent_watcher scrollbar_ev;
1072#endif
1073#ifdef MENUBAR
1074 xevent_watcher menubar_ev;
1075#endif
1076
1073 void check_cb (check_watcher &w); check_watcher check_ev; 1077 void check_cb (check_watcher &w); check_watcher check_ev;
1074 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1078 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1075 1079
1076 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1080 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 1081
1079 void incr_cb (time_watcher &w); time_watcher incr_ev; 1082 void incr_cb (time_watcher &w); time_watcher incr_ev;
1080 1083
1081#ifdef CURSOR_BLINK 1084#ifdef CURSOR_BLINK
1082 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1085 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1104 bool init_vars (); 1107 bool init_vars ();
1105 1108
1106 uint32_t next_char (); 1109 uint32_t next_char ();
1107 1110
1108 bool pty_fill (); 1111 bool pty_fill ();
1109 void process_x_events ();
1110 1112
1111 void *operator new (size_t s); 1113 void *operator new (size_t s);
1112 void operator delete (void *p, size_t s); 1114 void operator delete (void *p, size_t s);
1113 1115
1114 void init_secondary (); 1116 void init_secondary ();
… …
1118 void init_xlocale (); 1120 void init_xlocale ();
1119 void init_command (const char *const *argv); 1121 void init_command (const char *const *argv);
1120 int run_command (const char *const *argv); 1122 int run_command (const char *const *argv);
1121 int run_child (const char *const *argv); 1123 int run_child (const char *const *argv);
1122 1124
1123 void color_aliases(int idx); 1125 void color_aliases (int idx);
1124 void recolour_cursor (); 1126 void recolour_cursor ();
1125 void create_windows (int argc, const char *const *argv); 1127 void create_windows (int argc, const char *const *argv);
1126 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1128 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1127 void window_calc (unsigned int width, unsigned int height); 1129 void window_calc (unsigned int width, unsigned int height);
1128 void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1129 1130
1130#if USE_XIM 1131#if USE_XIM
1132 void im_destroy ();
1133 void im_cb (); im_watcher im_ev;
1131 void set_size (XRectangle *size); 1134 void im_set_size (XRectangle *size);
1132 void set_position (XPoint *pos); 1135 void im_set_position (XPoint *pos);
1133 void set_color (unsigned long *fg, unsigned long *bg); 1136 void im_set_color (unsigned long *fg, unsigned long *bg);
1137 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1138
1139 bool IMisRunning ();
1140 void IMSendSpot ();
1141 bool IM_get_IC (const char *modifiers);
1142 void IMSetStatusPosition ();
1134#endif 1143#endif
1135 1144
1136 void resize_scrollbar (); 1145 void resize_scrollbar ();
1137 1146
1138 void pixel_position (int *x, int *y); 1147 void pixel_position (int *x, int *y);
1139 1148
1140 void selection_click (int clicks, int x, int y); 1149 void selection_click (int clicks, int x, int y);
1141 void selection_extend (int x, int y, int flag); 1150 void selection_extend (int x, int y, int flag);
1142 void selection_rotate (int x, int y); 1151 void selection_rotate (int x, int y);
1143 1152
1144 /* screen(!) */ 1153 /* screen (!) */
1145 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1154 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); 1155 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); 1156 int scr_scroll_text (int row1, int row2, int count, int spec);
1148 void scr_reset (); 1157 void scr_reset ();
1149 void scr_reset_realloc (); 1158 void scr_reset_realloc ();
1150 void scr_release (); 1159 void scr_release ();
1151 void scr_clear (); 1160 void scr_clear (bool really = true);
1152 void scr_refresh (unsigned char refresh_type); 1161 void scr_refresh (unsigned char refresh_type);
1153 bool scr_refresh_rend (rend_t mask, rend_t value); 1162 bool scr_refresh_rend (rend_t mask, rend_t value);
1154 void scr_erase_screen (int mode); 1163 void scr_erase_screen (int mode);
1155 void scr_touch (bool refresh); 1164 void scr_touch (bool refresh);
1156 void scr_expose (int x, int y, int width, int height, bool refresh); 1165 void scr_expose (int x, int y, int width, int height, bool refresh);
1166 void scr_remap_chars ();
1167 void scr_remap_chars (text_t *tp, rend_t *rp);
1157 1168
1158 /* autoconvert */ 1169 /* autoconvert */
1159 1170
1160 // command.C 1171 // command.C
1161 void lookup_key (XKeyEvent *ev); 1172 void lookup_key (XKeyEvent &ev);
1162 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1173 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1163 uint32_t cmd_getc (); 1174 uint32_t cmd_getc ();
1175 bool cmd_parse ();
1164 void mouse_report (const XButtonEvent *ev); 1176 void mouse_report (XButtonEvent &ev);
1165 void process_x_event (XEvent *ev);
1166 void button_press (XButtonEvent *ev); 1177 void button_press (XButtonEvent &ev);
1167 void button_release (XButtonEvent *ev); 1178 void button_release (XButtonEvent &ev);
1168 int check_our_parents (); 1179 int check_our_parents ();
1169#ifdef PRINTPIPE 1180#ifdef PRINTPIPE
1170 FILE * popen_printer (); 1181 FILE *popen_printer ();
1171 int pclose_printer (FILE *stream); 1182 int pclose_printer (FILE *stream);
1172#endif 1183#endif
1173 void process_print_pipe (); 1184 void process_print_pipe ();
1174 void process_nonprinting (unsigned char ch); 1185 void process_nonprinting (unsigned char ch);
1175 void process_escape_vt52 (unsigned char ch); 1186 void process_escape_vt52 (unsigned char ch);
… …
1177 void process_csi_seq (); 1188 void process_csi_seq ();
1178 void process_window_ops (const int *args, unsigned int nargs); 1189 void process_window_ops (const int *args, unsigned int nargs);
1179 unsigned char * get_to_st (unsigned char *ends_how); 1190 unsigned char * get_to_st (unsigned char *ends_how);
1180 void process_dcs_seq (); 1191 void process_dcs_seq ();
1181 void process_osc_seq (); 1192 void process_osc_seq ();
1182 void xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))); 1193 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)));
1183 int privcases (int mode, unsigned long bit); 1194 int privcases (int mode, unsigned long bit);
1184 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1195 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); 1196 void process_sgr_mode (unsigned int nargs, const int *arg);
1186 void process_graphics (); 1197 void process_graphics ();
1187 // init.C 1198 // init.C
… …
1192 void cleanutent (); 1203 void cleanutent ();
1193 // main.C; 1204 // main.C;
1194 void privileges (int mode); 1205 void privileges (int mode);
1195 void privileged_utmp (char action); 1206 void privileged_utmp (char action);
1196 void privileged_ttydev (char action); 1207 void privileged_ttydev (char action);
1197 void change_font (int init, const char *fontname); 1208 bool change_font (const char *fontname);
1198 void font_up_down (int n, int direction); 1209 bool font_up_down (int n, int direction);
1199 void set_title (const char *str); 1210 void set_title (const char *str);
1200 void set_iconName (const char *str); 1211 void set_iconName (const char *str);
1201 void set_window_color (int idx, const char *color); 1212 void set_window_color (int idx, const char *color);
1202 void set_colorfgbg (); 1213 void set_colorfgbg ();
1203 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1214 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1204 void set_widthheight (unsigned int width, unsigned int height); 1215 void set_widthheight (unsigned int width, unsigned int height);
1205 bool IMisRunning ();
1206 void IMSendSpot ();
1207 bool IM_get_IC ();
1208 void IMSetStatusPosition ();
1209 1216
1210#ifdef MENUBAR 1217#ifdef MENUBAR
1211 // menubar.C 1218 // menubar.C
1212 void menuitem_free (menu_t *menu, menuitem_t *item); 1219 void menuitem_free (menu_t *menu, menuitem_t *item);
1213 int action_dispatch (action_t *action); 1220 int action_dispatch (action_t *action);
1214 void menuarrow_free (char name); 1221 void menuarrow_free (char name);
1215 void menuarrow_add (char *string); 1222 void menuarrow_add (char *string);
1216 char * menu_find_base (menu_t **menu, char *path); 1223 char *menu_find_base (menu_t **menu, char *path);
1217 menu_t * menu_delete (menu_t *menu); 1224 menu_t *menu_delete (menu_t *menu);
1218 menu_t * menu_add (menu_t *parent, char *path); 1225 menu_t *menu_add (menu_t *parent, char *path);
1219 void drawbox_menubar (int x, int len, int state); 1226 void drawbox_menubar (int x, int len, int state);
1220 void drawtriangle (int x, int y, int state); 1227 void drawtriangle (int x, int y, int state);
1221 void drawbox_menuitem (int y, int state); 1228 void drawbox_menuitem (int y, int state);
1222 void menu_show (); 1229 void menu_show ();
1223 void menu_display (void (*update)(rxvt_t *)); 1230 void menu_display (void (rxvt_term::*update) ());
1224 void menu_hide_all (); 1231 void menu_hide_all ();
1225 void menu_hide (); 1232 void menu_hide ();
1226 void menu_clear (menu_t *menu); 1233 void menu_clear (menu_t *menu);
1227 void menubar_clear (); 1234 void menubar_clear ();
1228 bar_t * menubar_find (const char *name); 1235 bar_t *menubar_find (const char *name);
1229 int menubar_push (const char *name); 1236 int menubar_push (const char *name);
1230 void menubar_remove (const char *name); 1237 void menubar_remove (const char *name);
1231 void menubar_dump (FILE *fp); 1238 void menubar_dump (FILE *fp);
1232 void menubar_read (const char *filename); 1239 void menubar_read (const char *filename);
1233 void menubar_dispatch (char *str); 1240 void menubar_dispatch (char *str);
1234 void draw_Arrows (int name, int state); 1241 void draw_Arrows (int name, int state);
1235 void menubar_expose (); 1242 void menubar_expose ();
1236 int menubar_mapping (int map); 1243 int menubar_mapping (int map);
1237 int menu_select (XButtonEvent *ev); 1244 int menu_select (XButtonEvent &ev);
1238 void menubar_select (XButtonEvent *ev); 1245 void menubar_select (XButtonEvent &ev);
1239 void menubar_control (XButtonEvent *ev); 1246 void menubar_control (XButtonEvent &ev);
1240 void map_menuBar (int map); 1247 void map_menuBar (int map);
1241#endif 1248#endif
1242 1249
1243 // screen.C 1250 // screen.C
1244 void scr_poweron (); 1251 void scr_poweron ();
… …
1284 void selection_make (Time tm); 1291 void selection_make (Time tm);
1285 void selection_start_colrow (int col, int row); 1292 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); 1293 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); 1294 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1288 void selection_remove_trailing_spaces (); 1295 void selection_remove_trailing_spaces ();
1289 void selection_send (const XSelectionRequestEvent *rq); 1296 void selection_send (const XSelectionRequestEvent &rq);
1290 1297
1291#if defined(NEXT_SCROLLBAR) 1298#if defined(NEXT_SCROLLBAR)
1292 // scrollbar-next.C 1299 // scrollbar-next.C
1293 Pixmap renderPixmap (const char *const *data, int width, int height); 1300 Pixmap renderPixmap (const char *const *data, int width, int height);
1294 void init_scrollbar_stuff (); 1301 void init_scrollbar_stuff ();
1295 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1302 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); 1303 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 1304#endif
1299 1305
1300#if defined(RXVT_SCROLLBAR) 1306#if defined(RXVT_SCROLLBAR)
1301 // scrollbar-rxvt.C 1307 // scrollbar-rxvt.C
1302 void Draw_button (int x, int y, int state, int dirn); 1308 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); 1309 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 1310#endif
1306 1311
1307#if defined(XTERM_SCROLLBAR) 1312#if defined(XTERM_SCROLLBAR)
1308 // scrollbar-xterm.C 1313 // scrollbar-xterm.C
1309 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len); 1314 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1310# define scrollbar_update scrollbar_show_xterm // HACK 1315#endif
1316
1317#if defined(PLAIN_SCROLLBAR)
1318 // scrollbar-plain.C
1319 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1311#endif 1320#endif
1312 1321
1313 // scrollbar.C 1322 // scrollbar.C
1314 int scrollbar_mapping (int map); 1323 int scrollbar_mapping (int map);
1315 int scrollbar_show (int update); 1324 int scrollbar_show (int update);

Diff Legend

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