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.51 by pcg, Sat Mar 6 00:05:01 2004 UTC

… …
12 12
13#include "defaultfont.h" 13#include "defaultfont.h"
14#include "rxvtcolor.h" 14#include "rxvtcolor.h"
15#include "iom.h" 15#include "iom.h"
16#include "salloc.h" 16#include "salloc.h"
17
18#include <wchar.h>
19 17
20/* 18/*
21 ***************************************************************************** 19 *****************************************************************************
22 * SYSTEM HACKS 20 * SYSTEM HACKS
23 ***************************************************************************** 21 *****************************************************************************
… …
49 int line; 47 int line;
50 int local; 48 int local;
51} ttymode_t; 49} ttymode_t;
52#endif 50#endif
53 51
54#ifdef GREEK_SUPPORT
55# include "grkelot.h"
56#endif
57#ifdef XPM_BACKGROUND 52#ifdef XPM_BACKGROUND
58# ifdef XPM_INC_X11 53# ifdef XPM_INC_X11
59# include <X11/xpm.h> 54# include <X11/xpm.h>
60# else 55# else
61# include <xpm.h> 56# include <xpm.h>
… …
130 do { \ 125 do { \
131 typeof swapittmp; \ 126 typeof swapittmp; \
132 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \ 127 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
133 } while (/* CONSTCOND */ 0) 128 } while (/* CONSTCOND */ 0)
134#define BOUND_POSITIVE_INT16(val) \ 129#define BOUND_POSITIVE_INT16(val) \
135 (int16_t)((val) <= 0 \ 130 (int16_t) ((val) <= 0 \
136 ? 0 \ 131 ? 0 \
137 : min((val), (((uint16_t)-1)>>1))) 132 : min ((val), (((uint16_t)-1)>>1)))
138 133
139/* 134/*
140 ***************************************************************************** 135 *****************************************************************************
141 * NORMAL DEFINES 136 * NORMAL DEFINES
142 ***************************************************************************** 137 *****************************************************************************
… …
144 139
145#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION) 140#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
146# error if you disable both selection styles, how can you select, silly? 141# error if you disable both selection styles, how can you select, silly?
147#endif 142#endif
148 143
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 */ 144/* COLORTERM, TERM environment variables */
154#define COLORTERMENV "rxvt" 145#define COLORTERMENV "rxvt"
155#ifdef XPM_BACKGROUND 146#ifdef XPM_BACKGROUND
156# define COLORTERMENVFULL COLORTERMENV "-xpm" 147# define COLORTERMENVFULL COLORTERMENV "-xpm"
157#else 148#else
158# define COLORTERMENVFULL COLORTERMENV 149# define COLORTERMENVFULL COLORTERMENV
159#endif 150#endif
160#ifndef TERMENV 151#ifndef TERMENV
161# define TERMENV "xterm" 152# define TERMENV "rxvt"
162#endif 153#endif
163 154
164#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 155#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
165# define NO_MOUSE_REPORT_SCROLLBAR 156# define NO_MOUSE_REPORT_SCROLLBAR
166#endif 157#endif
… …
241 * | | :::::::: | 232 * | | :::::::: |
242 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT 233 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
243 * | +---------+ | 234 * | +---------+ |
244 * | | ......%%| | 235 * | | ......%%| |
245 * | | ......%%| | 236 * | | ......%%| |
246 * | | ..()..%%| | 237 * | | .. ()..%%| |
247 * | | ......%%| | 238 * | | ......%%| |
248 * | | %%%%%%%%| | 239 * | | %%%%%%%%| |
249 * | +---------+ | <......................... 240 * | +---------+ | <.........................
250 * | | <---< SB_PADDING : 241 * | | <---< SB_PADDING :
251 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT 242 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT
… …
272 * :............: 263 * :............:
273 * | 264 * |
274 * +---< SB_WIDTH_NEXT 265 * +---< SB_WIDTH_NEXT
275 */ 266 */
276 267
268enum {
277#define NO_REFRESH 0 /* Window not visible at all! */ 269 NO_REFRESH = 0 , /* Window not visible at all! */
278#define FAST_REFRESH (1<<0) /* Fully exposed window */ 270 FAST_REFRESH = 1<<0, /* Fully exposed window */
279#define SLOW_REFRESH (1<<1) /* Partially exposed window */ 271 SLOW_REFRESH = 1<<1, /* Partially exposed window */
280#define SMOOTH_REFRESH (1<<2) /* Do sync'ing to make it smooth */ 272 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
281#define REFRESH_BOUNDS (1<<3) 273 REFRESH_BOUNDS = 1<<3
274};
282 275
283#ifdef NO_SECONDARY_SCREEN 276#ifdef NO_SECONDARY_SCREEN
284# define NSCREENS 0 277# define NSCREENS 0
285#else 278#else
286# define NSCREENS 1 279# define NSCREENS 1
… …
293/* special (internal) prefix for font commands */ 286/* special (internal) prefix for font commands */
294#define FONT_CMD '#' 287#define FONT_CMD '#'
295#define FONT_DN "#-" 288#define FONT_DN "#-"
296#define FONT_UP "#+" 289#define FONT_UP "#+"
297 290
298/* flags for rxvt_scr_gotorc() */ 291/* flags for rxvt_scr_gotorc () */
292enum {
299#define C_RELATIVE 1 /* col movement is relative */ 293 C_RELATIVE = 1 , /* col movement is relative */
300#define R_RELATIVE 2 /* row movement is relative */ 294 R_RELATIVE = 2, /* row movement is relative */
301#define RELATIVE (R_RELATIVE|C_RELATIVE) 295 RELATIVE = 1 | 2,
296};
302 297
303/* modes for rxvt_scr_insdel_chars(), rxvt_scr_insdel_lines() */ 298/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
304#define INSERT -1 /* don't change these values */ 299enum {
305#define DELETE +1 300 INSERT = -1, /* don't change these values */
306#define ERASE +2 301 DELETE = +1,
302 ERASE = +2,
303};
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
321#define RS_None 0 /* Normal */ 318#define RS_None 0 /* Normal */
322 319
323#define RS_fgMask 0x000001FFu /* 512 colors */ 320#define RS_fgMask 0x000001FFu /* 512 colors */
… …
347enum { 344enum {
348 C0_NUL = 0x00, 345 C0_NUL = 0x00,
349 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 346 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
350 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 347 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
351 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 348 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
352 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1 349 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
353}; 350};
354#define CHAR_ST 0x9c /* 0234 */ 351#define CHAR_ST 0x9c /* 0234 */
355 352
356/* 353/*
357 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 354 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
358 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 355 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
359 */ 356 */
357enum {
360#define XTerm_name 0 358 XTerm_name = 0,
361#define XTerm_iconName 1 359 XTerm_iconName = 1,
362#define XTerm_title 2 360 XTerm_title = 2,
361 XTerm_property = 3, // change X property, not yet implemented
363#define XTerm_Color 4 /* change colors */ 362 XTerm_Color = 4, // change colors
363 XTerm_Color00 = 10, // not implemented, CLASH!
364 XTerm_Color01 = 11, // not implemented
364#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ 365 XTerm_Color_cursor = 12, // change actual 'Cursor' color
365#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ 366 XTerm_Color_pointer = 13, // change actual 'Pointer' color
367 XTerm_Color04 = 14, // not implemented
368 XTerm_Color05 = 15, // not implemented
369 XTerm_Color06 = 16, // not implemented
366#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ 370 XTerm_Color_RV = 17, // change actual 'Highlight' color
367#define XTerm_Color_BD 18 /* change actual 'Bold' color */
368#define XTerm_Color_UL 19 /* change actual 'Underline' color */
369#define XTerm_logfile 46 /* not implemented */ 371 XTerm_logfile = 46, // not implemented
370#define XTerm_font 50 372 XTerm_font = 50,
371 373
372/* 374 XTerm_konsole30 = 30, // reserved for konsole
375 XTerm_konsole31 = 31, // reserved for konsole
376 XTerm_emacs51 = 51, // reserved for emacs shell
377 /*
373 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 378 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
374 */ 379 */
375#define XTerm_Menu 10 /* set menu item */ 380 XTerm_Menu = 10, // set menu item
381 XTerm_Color_BD = 18, // change actual 'Bold' color
382 XTerm_Color_UL = 19, // change actual 'Underline' color
376#define XTerm_Pixmap 20 /* new bg pixmap */ 383 XTerm_Pixmap = 20, // new bg pixmap
377#define XTerm_restoreFG 39 /* change default fg color */ 384 XTerm_restoreFG = 39, // change default fg color
378#define XTerm_restoreBG 49 /* change default bg color */ 385 XTerm_restoreBG = 49, // change default bg color
379#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 386 XTerm_dumpscreen = 55, // dump scrollback and all of screen
387 XTerm_locale = 701, // change locale
388 XTerm_findfont = 702, // find font of given character (in decimal)
389};
380 390
381/* Words starting with `Color_' are colours. Others are counts */ 391/* Words starting with `Color_' are colours. Others are counts */
382/* 392/*
383 * The following comment is mostly obsolete since pixcolor_set was expanded: 393 * The following comment is mostly obsolete since pixcolor_set was expanded:
384 * We're currently upto 29 colours. Only 3 more available. The 394 * We're currently upto 29 colours. Only 3 more available. The
… …
473 Rs_backgroundPixmap, 483 Rs_backgroundPixmap,
474#endif 484#endif
475#if (MENUBAR_MAX) 485#if (MENUBAR_MAX)
476 Rs_menu, 486 Rs_menu,
477#endif 487#endif
478#ifdef GREEK_SUPPORT
479 Rs_greek_keyboard,
480 Rs_greektoggle_key,
481#endif
482 Rs_loginShell, 488 Rs_loginShell,
483 Rs_jumpScroll, 489 Rs_jumpScroll,
484#ifdef HAVE_SCROLLBARS 490#ifdef HAVE_SCROLLBARS
485 Rs_scrollBar, 491 Rs_scrollBar,
486 Rs_scrollBar_right, 492 Rs_scrollBar_right,
… …
545 Rs_pointerBlankDelay, 551 Rs_pointerBlankDelay,
546 Rs_imLocale, 552 Rs_imLocale,
547 NUM_RESOURCES 553 NUM_RESOURCES
548}; 554};
549 555
550// see init.C:xa_named, which must be kept in sync 556// see init.C:xa_names, which must be kept in sync
551enum { 557enum {
552 XA_TEXT = 0, 558 XA_TEXT = 0,
553 XA_COMPOUND_TEXT, 559 XA_COMPOUND_TEXT,
554 XA_UTF8_STRING, 560 XA_UTF8_STRING,
555 XA_MULTIPLE, 561 XA_MULTIPLE,
… …
596#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 602#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
597#define PrivMode(test,bit) \ 603#define PrivMode(test,bit) \
598 if (test) \ 604 if (test) \
599 PrivateModes |= (bit); \ 605 PrivateModes |= (bit); \
600 else \ 606 else \
601 PrivateModes &= ~(bit) 607 PrivateModes &= ~ (bit)
602 608
603#ifdef ALLOW_132_MODE 609#ifdef ALLOW_132_MODE
604# define PrivMode_Default \ 610# define PrivMode_Default \
605(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 611(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
606#else 612#else
607# define PrivMode_Default \ 613# define PrivMode_Default \
608(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 614(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
609#endif 615#endif
610 616
611#define XDEPTH Xdepth 617#define XDEPTH display->depth
612#define XCMAP Xcmap 618#define XCMAP display->cmap
613#define XVISUAL Xvisual 619#define XVISUAL display->visual
614 620
615#define IMBUFSIZ 128 /* input modifier buffer sizes */ 621#define IMBUFSIZ 128 /* input modifier buffer sizes */
616#ifndef BUFSIZ 622#ifndef BUFSIZ
617# define BUFSIZ 4096 623# define BUFSIZ 4096
618#endif 624#endif
… …
650#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 656#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
651 657
652#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 658#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) 659#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth)
654 660
655#define Xroot DefaultRootWindow(Xdisplay)
656
657/* how to build & extract colors and attributes */ 661/* how to build & extract colors and attributes */
658#define GET_BASEFG(x) (((x) & RS_fgMask)) 662#define GET_BASEFG(x) (((x) & RS_fgMask))
659#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 663#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
660#ifndef NO_BRIGHTCOLOR 664#ifndef NO_BRIGHTCOLOR
661# define GET_FGCOLOR(x) \ 665# define GET_FGCOLOR(x) \
662 ((((x) & RS_Bold) == 0 \ 666 ((((x) & RS_Bold) == 0 \
663 || GET_BASEFG(x) < minCOLOR \ 667 || GET_BASEFG (x) < minCOLOR \
664 || GET_BASEFG(x) >= minBrightCOLOR) \ 668 || GET_BASEFG (x) >= minBrightCOLOR) \
665 ? GET_BASEFG(x) \ 669 ? GET_BASEFG (x) \
666 : (GET_BASEFG(x) + (minBrightCOLOR - minCOLOR))) 670 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
667# define GET_BGCOLOR(x) \ 671# define GET_BGCOLOR(x) \
668 ((((x) & RS_Blink) == 0 \ 672 ((((x) & RS_Blink) == 0 \
669 || GET_BASEBG(x) < minCOLOR \ 673 || GET_BASEBG (x) < minCOLOR \
670 || GET_BASEBG(x) >= minBrightCOLOR) \ 674 || GET_BASEBG (x) >= minBrightCOLOR) \
671 ? GET_BASEBG(x) \ 675 ? GET_BASEBG (x) \
672 : (GET_BASEBG(x) + (minBrightCOLOR - minCOLOR))) 676 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
673#else 677#else
674# define GET_FGCOLOR(x) GET_BASEFG(x) 678# define GET_FGCOLOR(x) GET_BASEFG(x)
675# define GET_BGCOLOR(x) GET_BASEBG(x) 679# define GET_BGCOLOR(x) GET_BASEBG(x)
676#endif 680#endif
677 681
… …
701#define scrollbar_isUpDn() isupper (scrollBar.state) 705#define scrollbar_isUpDn() isupper (scrollBar.state)
702#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win) 706#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win)
703 707
704#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1)) 708#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1))
705#define scrollbarnext_upButton(y) ((y) > scrollBar.end \ 709#define scrollbarnext_upButton(y) ((y) > scrollBar.end \
706 && (y) <= scrollbarnext_dnval()) 710 && (y) <= scrollbarnext_dnval ())
707#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) 711#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval())
708#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT 712#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
709#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg) 713#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg)
710#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end) 714#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end)
711#define SCROLLRXVT_MINHEIGHT 10 715#define SCROLLRXVT_MINHEIGHT 10
… …
716 : SCROLLRXVT_MINHEIGHT) 720 : SCROLLRXVT_MINHEIGHT)
717#define scrollbar_above_slider(y) ((y) < scrollBar.top) 721#define scrollbar_above_slider(y) ((y) < scrollBar.top)
718#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 722#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
719#define scrollbar_position(y) ((y) - scrollBar.beg) 723#define scrollbar_position(y) ((y) - scrollBar.beg)
720#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 724#define scrollbar_size() (scrollBar.end - scrollBar.beg \
721 - scrollbar_minheight()) 725 - scrollbar_minheight ())
722 726
723#if (MENUBAR_MAX > 1) 727#if (MENUBAR_MAX > 1)
724/* rendition style flags */ 728/* rendition style flags */
725# define menuBar_height() (TermWin.fheight + SHADOW) 729# define menuBar_height() (TermWin.fheight + SHADOW)
726# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 730# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
… …
821 825
822// primivite wrapper around mbstate_t to ensure initialisation 826// primivite wrapper around mbstate_t to ensure initialisation
823struct mbstate { 827struct mbstate {
824 mbstate_t mbs; 828 mbstate_t mbs;
825 829
826 mbstate () 830 operator mbstate_t *() { return &mbs; }
831 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
832 mbstate () { reset (); }
833};
834
835#if UNICODE3
836# define COMPOSE_LO 0x40000000UL
837# define COMPOSE_HI 0x400fffffUL
838# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
839#else
840# define COMPOSE_LO 0xd800UL
841# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...
842# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)
843#endif
844
845#if ENCODING_COMPOSE
846// compose chars are used to represent composite characters
847// that are not representable in unicode, as well as characters
848// not fitting in the BMP.
849struct compose_char {
850 uint32_t c1, c2; // any chars != NOCHAR are valid
851 compose_char (uint32_t c1, uint32_t c2)
852 : c1(c1), c2(c2)
853 { }
854};
855
856class rxvt_composite_vec {
857 vector<compose_char> v;
858public:
859 text_t compose (uint32_t c1, uint32_t c2 = NOCHAR);
860 int expand (uint32_t c, wchar_t *r);
861 compose_char *operator [](text_t c)
827 { 862 {
828 MEMSET (&mbs, 0, sizeof (mbs)); 863 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
864 ? &v[c - COMPOSE_LO]
865 : 0;
829 } 866 }
830}; 867};
831 868
869extern class rxvt_composite_vec rxvt_composite;
870#endif
871
872
832struct rxvt_term : rxvt_vars { 873struct rxvt_term : rxvt_vars {
833 struct mbstate mbstate; 874 struct mbstate mbstate;
834 875
835 unsigned char want_refresh:1, 876 unsigned char want_refresh:1,
836#ifdef TRANSPARENT 877#ifdef TRANSPARENT
837 want_full_refresh:1, /* awaiting full screen refresh */ 878 want_full_refresh:1, /* awaiting full screen refresh */
838#endif 879#endif
… …
869#endif 910#endif
870 scrollbar_align, 911 scrollbar_align,
871 selection_wait, 912 selection_wait,
872 selection_type; 913 selection_type;
873/* ---------- */ 914/* ---------- */
874#ifdef GREEK_SUPPORT
875 short greek_mode; /* greek keyboard mode */
876#endif
877 short rvideo; 915 short rvideo;
878 int16_t num_scr; /* screen: number lines scrolled */ 916 int16_t num_scr; /* screen: number lines scrolled */
879 unsigned int prev_ncol, /* screen: previous number of columns */ 917 unsigned int prev_ncol, /* screen: previous number of columns */
880 prev_nrow; /* screen: previous number of rows */ 918 prev_nrow; /* screen: previous number of rows */
881#ifdef RXVT_GRAPHICS
882 uint16_t gr_prev_start;
883#endif
884/* ---------- */ 919/* ---------- */
885 rend_t rstyle; 920 rend_t rstyle;
886/* ---------- */ 921/* ---------- */
887 uint32_t pixcolor_set[NPIXCLR_SETS]; 922 uint32_t pixcolor_set[NPIXCLR_SETS];
888/* ---------- */ 923/* ---------- */
… …
990 const char *key_delete; 1025 const char *key_delete;
991#endif 1026#endif
992#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 1027#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
993 KeySym ks_bigfont, ks_smallfont; 1028 KeySym ks_bigfont, ks_smallfont;
994#endif 1029#endif
995#ifdef GREEK_SUPPORT
996 KeySym ks_greekmodeswith;
997#endif
998#ifdef USE_XIM 1030#ifdef USE_XIM
1031 rxvt_xim *input_method;
999 XIC Input_Context; 1032 XIC Input_Context;
1000 XIMStyle input_style; 1033 XIMStyle input_style;
1001 int event_type; 1034 int event_type;
1002#endif 1035#endif
1003 struct mouse_event MEvent; 1036 struct mouse_event MEvent;
1004 XComposeStatus compose; 1037 XComposeStatus compose;
1005#ifdef RXVT_GRAPHICS
1006 int graphics_up;
1007 struct grwin_t *gr_root;
1008#endif
1009 ttymode_t tio; 1038 ttymode_t tio;
1010#ifdef UTMP_SUPPORT 1039#ifdef UTMP_SUPPORT
1011# ifdef HAVE_STRUCT_UTMP 1040# ifdef HAVE_STRUCT_UTMP
1012 struct utmp ut; 1041 struct utmp ut;
1013# endif 1042# endif
… …
1022 row_col_t oldcursor; 1051 row_col_t oldcursor;
1023#ifdef XPM_BACKGROUND 1052#ifdef XPM_BACKGROUND
1024 bgPixmap_t bgPixmap; 1053 bgPixmap_t bgPixmap;
1025 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1054 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1026#endif 1055#endif
1027#ifdef MULTICHAR_SET
1028 int oldcursormulti;
1029 void (*multichar_decode)(unsigned char *str, int len);
1030#endif
1031#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1056#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1032 struct stat ttyfd_stat; /* original status of our tty */ 1057 struct stat ttyfd_stat; /* original status of our tty */
1033#endif 1058#endif
1034#ifdef MENUBAR 1059#ifdef MENUBAR
1035 menu_t *ActiveMenu, /* currently active menu */ 1060 menu_t *ActiveMenu, /* currently active menu */
1036 *BuildMenu; /* the menu currently being built */ 1061 *BuildMenu; /* the menu currently being built */
1037 bar_t *CurrentBar; 1062 bar_t *CurrentBar;
1038# if !(MENUBAR_MAX > 1) 1063# if ! (MENUBAR_MAX > 1)
1039 bar_t BarList; 1064 bar_t BarList;
1040# endif /* (MENUBAR_MAX > 1) */ 1065# endif /* (MENUBAR_MAX > 1) */
1041#endif
1042#ifdef RXVT_GRAPHICS
1043 Window gr_last_id;
1044#endif 1066#endif
1045#ifdef CURSOR_BLINK 1067#ifdef CURSOR_BLINK
1046 struct timeval lastcursorchange; 1068 struct timeval lastcursorchange;
1047#endif 1069#endif
1048#ifdef POINTER_BLANK 1070#ifdef POINTER_BLANK
… …
1058 char *codeset; 1080 char *codeset;
1059 char charsets[4]; 1081 char charsets[4];
1060 unsigned char *v_buffer; /* pointer to physical buffer */ 1082 unsigned char *v_buffer; /* pointer to physical buffer */
1061 unsigned int v_buflen; /* size of area to write */ 1083 unsigned int v_buflen; /* size of area to write */
1062 char *newfont[MAX_NFONTS]; 1084 char *newfont[MAX_NFONTS];
1085 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1063#ifdef KEYSYM_RESOURCE 1086#ifdef KEYSYM_RESOURCE
1064 const unsigned char *Keysym_map[256]; 1087 const unsigned char *Keysym_map[256];
1065#endif 1088#endif
1066 const char *rs[NUM_RESOURCES]; 1089 const char *rs[NUM_RESOURCES];
1067/* command input buffering */ 1090/* command input buffering */
… …
1073 1096
1074 void paste (const unsigned char *data, unsigned int len); 1097 void paste (const unsigned char *data, unsigned int len);
1075 1098
1076 void flush (); 1099 void flush ();
1077 1100
1101 void rootwin_cb (XEvent &xev);
1102 xevent_watcher rootwin_ev;
1103
1104 void x_cb (XEvent &xev);
1105 xevent_watcher termwin_ev;
1106 xevent_watcher vt_ev;
1107#ifdef HAVE_SCROLLBARS
1108 xevent_watcher scrollbar_ev;
1109#endif
1110#ifdef MENUBAR
1111 xevent_watcher menubar_ev;
1112#endif
1113
1078 void check_cb (check_watcher &w); check_watcher check_ev; 1114 void check_cb (check_watcher &w); check_watcher check_ev;
1079 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1115 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1080 1116
1081 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1117 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 1118
1084 void incr_cb (time_watcher &w); time_watcher incr_ev; 1119 void incr_cb (time_watcher &w); time_watcher incr_ev;
1085 1120
1086#ifdef CURSOR_BLINK 1121#ifdef CURSOR_BLINK
1087 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1122 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1109 bool init_vars (); 1144 bool init_vars ();
1110 1145
1111 uint32_t next_char (); 1146 uint32_t next_char ();
1112 1147
1113 bool pty_fill (); 1148 bool pty_fill ();
1114 void process_x_events ();
1115 1149
1116 void *operator new (size_t s); 1150 void *operator new (size_t s);
1117 void operator delete (void *p, size_t s); 1151 void operator delete (void *p, size_t s);
1118 1152
1119 void init_secondary (); 1153 void init_secondary ();
… …
1123 void init_xlocale (); 1157 void init_xlocale ();
1124 void init_command (const char *const *argv); 1158 void init_command (const char *const *argv);
1125 int run_command (const char *const *argv); 1159 int run_command (const char *const *argv);
1126 int run_child (const char *const *argv); 1160 int run_child (const char *const *argv);
1127 1161
1128 void color_aliases(int idx); 1162 void color_aliases (int idx);
1129 void recolour_cursor (); 1163 void recolour_cursor ();
1130 void create_windows (int argc, const char *const *argv); 1164 void create_windows (int argc, const char *const *argv);
1131 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1165 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1132 void window_calc (unsigned int width, unsigned int height); 1166 void window_calc (unsigned int width, unsigned int height);
1133 void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1134 1167
1135#if USE_XIM 1168#if USE_XIM
1169 void im_destroy ();
1170 void im_cb (); im_watcher im_ev;
1136 void set_size (XRectangle *size); 1171 void im_set_size (XRectangle *size);
1137 void set_position (XPoint *pos); 1172 void im_set_position (XPoint *pos);
1138 void set_color (unsigned long *fg, unsigned long *bg); 1173 void im_set_color (unsigned long *fg, unsigned long *bg);
1174 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1175
1176 bool IMisRunning ();
1177 void IMSendSpot ();
1178 bool IM_get_IC (const char *modifiers);
1179 void IMSetStatusPosition ();
1139#endif 1180#endif
1140 1181
1141 void resize_scrollbar (); 1182 void resize_scrollbar ();
1142 1183
1143 void pixel_position (int *x, int *y); 1184 void pixel_position (int *x, int *y);
1144 1185
1145 void selection_click (int clicks, int x, int y); 1186 void selection_click (int clicks, int x, int y);
1146 void selection_extend (int x, int y, int flag); 1187 void selection_extend (int x, int y, int flag);
1147 void selection_rotate (int x, int y); 1188 void selection_rotate (int x, int y);
1148 1189
1149 /* screen(!) */ 1190 /* screen (!) */
1150 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1191 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); 1192 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); 1193 int scr_scroll_text (int row1, int row2, int count, int spec);
1153 void scr_reset (); 1194 void scr_reset ();
1154 void scr_reset_realloc (); 1195 void scr_reset_realloc ();
1155 void scr_release (); 1196 void scr_release ();
1156 void scr_clear (); 1197 void scr_clear (bool really = true);
1157 void scr_refresh (unsigned char refresh_type); 1198 void scr_refresh (unsigned char refresh_type);
1158 bool scr_refresh_rend (rend_t mask, rend_t value); 1199 bool scr_refresh_rend (rend_t mask, rend_t value);
1159 void scr_erase_screen (int mode); 1200 void scr_erase_screen (int mode);
1160 void scr_touch (bool refresh); 1201 void scr_touch (bool refresh);
1161 void scr_expose (int x, int y, int width, int height, bool refresh); 1202 void scr_expose (int x, int y, int width, int height, bool refresh);
1203 void scr_remap_chars ();
1204 void scr_remap_chars (text_t *tp, rend_t *rp);
1162 1205
1163 /* autoconvert */ 1206 /* autoconvert */
1164 1207
1165 // command.C 1208 // command.C
1166 void lookup_key (XKeyEvent *ev); 1209 void lookup_key (XKeyEvent &ev);
1167 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1210 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1168 uint32_t cmd_getc (); 1211 uint32_t cmd_getc ();
1212 bool cmd_parse ();
1169 void mouse_report (const XButtonEvent *ev); 1213 void mouse_report (XButtonEvent &ev);
1170 void process_x_event (XEvent *ev);
1171 void button_press (XButtonEvent *ev); 1214 void button_press (XButtonEvent &ev);
1172 void button_release (XButtonEvent *ev); 1215 void button_release (XButtonEvent &ev);
1173 int check_our_parents (); 1216 int check_our_parents ();
1174#ifdef PRINTPIPE 1217#ifdef PRINTPIPE
1175 FILE * popen_printer (); 1218 FILE *popen_printer ();
1176 int pclose_printer (FILE *stream); 1219 int pclose_printer (FILE *stream);
1177#endif 1220#endif
1178 void process_print_pipe (); 1221 void process_print_pipe ();
1179 void process_nonprinting (unsigned char ch); 1222 void process_nonprinting (unsigned char ch);
1180 void process_escape_vt52 (unsigned char ch); 1223 void process_escape_vt52 (unsigned char ch);
… …
1182 void process_csi_seq (); 1225 void process_csi_seq ();
1183 void process_window_ops (const int *args, unsigned int nargs); 1226 void process_window_ops (const int *args, unsigned int nargs);
1184 unsigned char * get_to_st (unsigned char *ends_how); 1227 unsigned char * get_to_st (unsigned char *ends_how);
1185 void process_dcs_seq (); 1228 void process_dcs_seq ();
1186 void process_osc_seq (); 1229 void process_osc_seq ();
1187 void xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))); 1230 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)));
1188 int privcases (int mode, unsigned long bit); 1231 int privcases (int mode, unsigned long bit);
1189 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1232 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); 1233 void process_sgr_mode (unsigned int nargs, const int *arg);
1191 void process_graphics (); 1234 void process_graphics ();
1192 // init.C 1235 // init.C
… …
1197 void cleanutent (); 1240 void cleanutent ();
1198 // main.C; 1241 // main.C;
1199 void privileges (int mode); 1242 void privileges (int mode);
1200 void privileged_utmp (char action); 1243 void privileged_utmp (char action);
1201 void privileged_ttydev (char action); 1244 void privileged_ttydev (char action);
1202 void change_font (int init, const char *fontname); 1245 bool change_font (const char *fontname);
1203 void font_up_down (int n, int direction); 1246 bool font_up_down (int n, int direction);
1204 void set_title (const char *str); 1247 void set_title (const char *str);
1205 void set_iconName (const char *str); 1248 void set_iconName (const char *str);
1206 void set_window_color (int idx, const char *color); 1249 void set_window_color (int idx, const char *color);
1207 void set_colorfgbg (); 1250 void set_colorfgbg ();
1208 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1251 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1209 void set_widthheight (unsigned int width, unsigned int height); 1252 void set_widthheight (unsigned int width, unsigned int height);
1210 bool IMisRunning ();
1211 void IMSendSpot ();
1212 bool IM_get_IC ();
1213 void IMSetStatusPosition ();
1214 1253
1215#ifdef MENUBAR 1254#ifdef MENUBAR
1216 // menubar.C 1255 // menubar.C
1217 void menuitem_free (menu_t *menu, menuitem_t *item); 1256 void menuitem_free (menu_t *menu, menuitem_t *item);
1218 int action_dispatch (action_t *action); 1257 int action_dispatch (action_t *action);
1219 void menuarrow_free (char name); 1258 void menuarrow_free (char name);
1220 void menuarrow_add (char *string); 1259 void menuarrow_add (char *string);
1221 char * menu_find_base (menu_t **menu, char *path); 1260 char *menu_find_base (menu_t **menu, char *path);
1222 menu_t * menu_delete (menu_t *menu); 1261 menu_t *menu_delete (menu_t *menu);
1223 menu_t * menu_add (menu_t *parent, char *path); 1262 menu_t *menu_add (menu_t *parent, char *path);
1224 void drawbox_menubar (int x, int len, int state); 1263 void drawbox_menubar (int x, int len, int state);
1225 void drawtriangle (int x, int y, int state); 1264 void drawtriangle (int x, int y, int state);
1226 void drawbox_menuitem (int y, int state); 1265 void drawbox_menuitem (int y, int state);
1227 void menu_show (); 1266 void menu_show ();
1228 void menu_display (void (*update)(rxvt_t *)); 1267 void menu_display (void (rxvt_term::*update) ());
1229 void menu_hide_all (); 1268 void menu_hide_all ();
1230 void menu_hide (); 1269 void menu_hide ();
1231 void menu_clear (menu_t *menu); 1270 void menu_clear (menu_t *menu);
1232 void menubar_clear (); 1271 void menubar_clear ();
1233 bar_t * menubar_find (const char *name); 1272 bar_t *menubar_find (const char *name);
1234 int menubar_push (const char *name); 1273 int menubar_push (const char *name);
1235 void menubar_remove (const char *name); 1274 void menubar_remove (const char *name);
1236 void menubar_dump (FILE *fp); 1275 void menubar_dump (FILE *fp);
1237 void menubar_read (const char *filename); 1276 void menubar_read (const char *filename);
1238 void menubar_dispatch (char *str); 1277 void menubar_dispatch (char *str);
1239 void draw_Arrows (int name, int state); 1278 void draw_Arrows (int name, int state);
1240 void menubar_expose (); 1279 void menubar_expose ();
1241 int menubar_mapping (int map); 1280 int menubar_mapping (int map);
1242 int menu_select (XButtonEvent *ev); 1281 int menu_select (XButtonEvent &ev);
1243 void menubar_select (XButtonEvent *ev); 1282 void menubar_select (XButtonEvent &ev);
1244 void menubar_control (XButtonEvent *ev); 1283 void menubar_control (XButtonEvent &ev);
1245 void map_menuBar (int map); 1284 void map_menuBar (int map);
1246#endif 1285#endif
1247 1286
1248 // screen.C 1287 // screen.C
1249 void scr_poweron (); 1288 void scr_poweron ();
… …
1289 void selection_make (Time tm); 1328 void selection_make (Time tm);
1290 void selection_start_colrow (int col, int row); 1329 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); 1330 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); 1331 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1293 void selection_remove_trailing_spaces (); 1332 void selection_remove_trailing_spaces ();
1294 void selection_send (const XSelectionRequestEvent *rq); 1333 void selection_send (const XSelectionRequestEvent &rq);
1295 1334
1296#if defined(NEXT_SCROLLBAR) 1335#if defined(NEXT_SCROLLBAR)
1297 // scrollbar-next.C 1336 // scrollbar-next.C
1298 Pixmap renderPixmap (const char *const *data, int width, int height); 1337 Pixmap renderPixmap (const char *const *data, int width, int height);
1299 void init_scrollbar_stuff (); 1338 void init_scrollbar_stuff ();

Diff Legend

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