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.35 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.60 by pcg, Mon Mar 22 15:15:04 2004 UTC

… …
8#include <X11/cursorfont.h> 8#include <X11/cursorfont.h>
9#include <X11/keysym.h> 9#include <X11/keysym.h>
10#include <X11/keysymdef.h> 10#include <X11/keysymdef.h>
11#include <X11/Xatom.h> 11#include <X11/Xatom.h>
12 12
13#include "encoding.h"
13#include "defaultfont.h" 14#include "defaultfont.h"
14#include "rxvtcolor.h" 15#include "rxvtcolor.h"
15#include "iom.h" 16#include "iom.h"
16#include "salloc.h" 17#include "salloc.h"
17
18#include <wchar.h>
19 18
20/* 19/*
21 ***************************************************************************** 20 *****************************************************************************
22 * SYSTEM HACKS 21 * SYSTEM HACKS
23 ***************************************************************************** 22 *****************************************************************************
… …
30#endif 29#endif
31#if defined (sun) && !defined (__sun__) 30#if defined (sun) && !defined (__sun__)
32# define __sun__ 31# define __sun__
33#endif 32#endif
34 33
35
36#ifndef HAVE_XPOINTER 34#ifndef HAVE_XPOINTER
37typedef char *XPointer; 35typedef char *XPointer;
38#endif 36#endif
39 37
40#ifdef HAVE_TERMIOS_H 38#ifdef HAVE_TERMIOS_H
… …
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>
… …
140 ***************************************************************************** 135 *****************************************************************************
141 * NORMAL DEFINES 136 * NORMAL DEFINES
142 ***************************************************************************** 137 *****************************************************************************
143 */ 138 */
144 139
145#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
146# error if you disable both selection styles, how can you select, silly?
147#endif
148
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 */ 140/* COLORTERM, TERM environment variables */
154#define COLORTERMENV "rxvt" 141#define COLORTERMENV "rxvt"
155#ifdef XPM_BACKGROUND 142#ifdef XPM_BACKGROUND
156# define COLORTERMENVFULL COLORTERMENV "-xpm" 143# define COLORTERMENVFULL COLORTERMENV "-xpm"
157#else 144#else
158# define COLORTERMENVFULL COLORTERMENV 145# define COLORTERMENVFULL COLORTERMENV
159#endif 146#endif
160#ifndef TERMENV 147#ifndef TERMENV
161# define TERMENV "xterm" 148# define TERMENV "rxvt"
162#endif 149#endif
163 150
164#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 151#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
165# define NO_MOUSE_REPORT_SCROLLBAR 152# define NO_MOUSE_REPORT_SCROLLBAR
166#endif 153#endif
… …
272 * :............: 259 * :............:
273 * | 260 * |
274 * +---< SB_WIDTH_NEXT 261 * +---< SB_WIDTH_NEXT
275 */ 262 */
276 263
264enum {
277#define NO_REFRESH 0 /* Window not visible at all! */ 265 NO_REFRESH = 0 , /* Window not visible at all! */
278#define FAST_REFRESH (1<<0) /* Fully exposed window */ 266 FAST_REFRESH = 1<<0, /* Fully exposed window */
279#define SLOW_REFRESH (1<<1) /* Partially exposed window */ 267 SLOW_REFRESH = 1<<1, /* Partially exposed window */
280#define SMOOTH_REFRESH (1<<2) /* Do sync'ing to make it smooth */ 268 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
281#define REFRESH_BOUNDS (1<<3) 269 REFRESH_BOUNDS = 1<<3
270};
282 271
283#ifdef NO_SECONDARY_SCREEN 272#ifdef NO_SECONDARY_SCREEN
284# define NSCREENS 0 273# define NSCREENS 0
285#else 274#else
286# define NSCREENS 1 275# define NSCREENS 1
… …
294#define FONT_CMD '#' 283#define FONT_CMD '#'
295#define FONT_DN "#-" 284#define FONT_DN "#-"
296#define FONT_UP "#+" 285#define FONT_UP "#+"
297 286
298/* flags for rxvt_scr_gotorc () */ 287/* flags for rxvt_scr_gotorc () */
288enum {
299#define C_RELATIVE 1 /* col movement is relative */ 289 C_RELATIVE = 1 , /* col movement is relative */
300#define R_RELATIVE 2 /* row movement is relative */ 290 R_RELATIVE = 2, /* row movement is relative */
301#define RELATIVE (R_RELATIVE|C_RELATIVE) 291 RELATIVE = 1 | 2,
292};
302 293
303/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 294/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
304#define INSERT -1 /* don't change these values */ 295enum {
305#define DELETE +1 296 INSERT = -1, /* don't change these values */
306#define ERASE +2 297 DELETE = +1,
298 ERASE = +2,
299};
307 300
308/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 301/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
309enum page_dirn { 302enum page_dirn {
310 UP, 303 UP,
311 DN, 304 DN,
312 NO_DIR 305 NO_DIR,
313}; 306};
314 307
315/* arguments for rxvt_scr_change_screen () */ 308/* arguments for rxvt_scr_change_screen () */
316enum { 309enum {
317 PRIMARY = 0, 310 PRIMARY = 0,
318 SECONDARY 311 SECONDARY,
319}; 312};
320 313
321#define RS_None 0 /* Normal */ 314#define RS_None 0 /* Normal */
322 315
323#define RS_fgMask 0x000001FFu /* 512 colors */ 316#define RS_fgMask 0x000001FFu /* 512 colors */
… …
347enum { 340enum {
348 C0_NUL = 0x00, 341 C0_NUL = 0x00,
349 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 342 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 , 343 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, 344 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 345 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
353}; 346};
354#define CHAR_ST 0x9c /* 0234 */ 347#define CHAR_ST 0x9c /* 0234 */
355 348
356/* 349/*
357 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 350 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
358 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 351 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
359 */ 352 */
353enum {
360#define XTerm_name 0 354 XTerm_name = 0,
361#define XTerm_iconName 1 355 XTerm_iconName = 1,
362#define XTerm_title 2 356 XTerm_title = 2,
357 XTerm_property = 3, // change X property, not yet implemented
363#define XTerm_Color 4 /* change colors */ 358 XTerm_Color = 4, // change colors
359 XTerm_Color00 = 10, // not implemented, CLASH!
360 XTerm_Color01 = 11, // not implemented
364#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ 361 XTerm_Color_cursor = 12, // change actual 'Cursor' color
365#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ 362 XTerm_Color_pointer = 13, // change actual 'Pointer' color
363 XTerm_Color04 = 14, // not implemented
364 XTerm_Color05 = 15, // not implemented
365 XTerm_Color06 = 16, // not implemented
366#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ 366 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 */ 367 XTerm_logfile = 46, // not implemented
370#define XTerm_font 50 368 XTerm_font = 50,
371 369
372/* 370 XTerm_konsole30 = 30, // reserved for konsole
371 XTerm_konsole31 = 31, // reserved for konsole
372 XTerm_emacs51 = 51, // reserved for emacs shell
373 /*
373 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 374 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
374 */ 375 */
375#define XTerm_Menu 10 /* set menu item */ 376 XTerm_Menu = 10, // set menu item
377 XTerm_Color_BD = 18, // change actual 'Bold' color
378 XTerm_Color_UL = 19, // change actual 'Underline' color
376#define XTerm_Pixmap 20 /* new bg pixmap */ 379 XTerm_Pixmap = 20, // new bg pixmap
377#define XTerm_restoreFG 39 /* change default fg color */ 380 XTerm_restoreFG = 39, // change default fg color
378#define XTerm_restoreBG 49 /* change default bg color */ 381 XTerm_restoreBG = 49, // change default bg color
379#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 382 XTerm_dumpscreen = 55, // dump scrollback and all of screen
383 XTerm_locale = 701, // change locale
384 XTerm_findfont = 702, // find font of given character (in decimal)
385};
380 386
381/* Words starting with `Color_' are colours. Others are counts */ 387/* Words starting with `Color_' are colours. Others are counts */
382/* 388/*
383 * The following comment is mostly obsolete since pixcolor_set was expanded: 389 * The following comment is mostly obsolete since pixcolor_set was expanded:
384 * We're currently upto 29 colours. Only 3 more available. The 390 * We're currently upto 29 colours. Only 3 more available. The
… …
473 Rs_backgroundPixmap, 479 Rs_backgroundPixmap,
474#endif 480#endif
475#if (MENUBAR_MAX) 481#if (MENUBAR_MAX)
476 Rs_menu, 482 Rs_menu,
477#endif 483#endif
478#ifdef GREEK_SUPPORT
479 Rs_greek_keyboard,
480 Rs_greektoggle_key,
481#endif
482 Rs_loginShell, 484 Rs_loginShell,
483 Rs_jumpScroll, 485 Rs_jumpScroll,
484#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
485 Rs_scrollBar, 487 Rs_scrollBar,
486 Rs_scrollBar_right, 488 Rs_scrollBar_right,
… …
515#endif 517#endif
516#ifdef USE_XIM 518#ifdef USE_XIM
517 Rs_preeditType, 519 Rs_preeditType,
518 Rs_inputMethod, 520 Rs_inputMethod,
519#endif 521#endif
520#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
521 Rs_bigfont_key,
522 Rs_smallfont_key,
523#endif
524#ifdef TRANSPARENT 522#ifdef TRANSPARENT
525 Rs_transparent, 523 Rs_transparent,
526 Rs_transparent_all, 524 Rs_transparent_all,
527#endif 525#endif
528#ifndef NO_FRILLS 526#ifndef NO_FRILLS
… …
532 Rs_scrollBar_thickness, 530 Rs_scrollBar_thickness,
533#ifndef NO_LINESPACE 531#ifndef NO_LINESPACE
534 Rs_lineSpace, 532 Rs_lineSpace,
535#endif 533#endif
536 Rs_cutchars, 534 Rs_cutchars,
537#ifdef ACS_ASCII
538 Rs_acs_chars,
539#endif
540 Rs_modifier, 535 Rs_modifier,
541 Rs_answerbackstring, 536 Rs_answerbackstring,
542 Rs_tripleclickwords, 537 Rs_tripleclickwords,
543 Rs_cursorBlink, 538 Rs_cursorBlink,
544 Rs_pointerBlank, 539 Rs_pointerBlank,
… …
589#define PrivMode_TtyOutputInh (1LU<<16) 584#define PrivMode_TtyOutputInh (1LU<<16)
590#define PrivMode_Keypress (1LU<<17) 585#define PrivMode_Keypress (1LU<<17)
591#define PrivMode_smoothScroll (1LU<<18) 586#define PrivMode_smoothScroll (1LU<<18)
592#define PrivMode_vt52 (1LU<<19) 587#define PrivMode_vt52 (1LU<<19)
593/* too annoying to implement X11 highlight tracking */ 588/* too annoying to implement X11 highlight tracking */
594/* #define PrivMode_MouseX11Track (1LU<<18) */ 589/* #define PrivMode_MouseX11Track (1LU<<20) */
595 590
596#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 591#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
597#define PrivMode(test,bit) \ 592#define PrivMode(test,bit) \
598 if (test) \ 593 if (test) \
599 PrivateModes |= (bit); \ 594 PrivateModes |= (bit); \
600 else \ 595 else \
601 PrivateModes &= ~ (bit) 596 PrivateModes &= ~(bit)
602 597
603#ifdef ALLOW_132_MODE 598#ifdef ALLOW_132_MODE
604# define PrivMode_Default \
605(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 599# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
606#else 600#else
607# define PrivMode_Default \
608(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 601# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
609#endif 602#endif
610 603
611#define XDEPTH display->depth 604#define XDEPTH display->depth
612#define XCMAP display->cmap 605#define XCMAP display->cmap
613#define XVISUAL display->visual 606#define XVISUAL display->visual
614 607
615#define IMBUFSIZ 128 /* input modifier buffer sizes */ 608#define IMBUFSIZ 128 // input modifier buffer sizes
616#ifndef BUFSIZ
617# define BUFSIZ 4096
618#endif
619#define KBUFSZ 512 /* size of keyboard mapping buffer */ 609#define KBUFSZ 512 // size of keyboard mapping buffer
610#define CBUFSIZ 4096 // size of command buffer
611#define UBUFSIZ 4096 // character buffer
620 612
621/* 613/*
622 ***************************************************************************** 614 *****************************************************************************
623 * MACRO DEFINES 615 * MACRO DEFINES
624 ***************************************************************************** 616 *****************************************************************************
… …
794# define D_X(x) fprintf x ; fputc('\n', stderr) 786# define D_X(x) fprintf x ; fputc('\n', stderr)
795#else 787#else
796# define D_X(x) 788# define D_X(x)
797#endif 789#endif
798 790
791extern class rxvt_failure_exception { } rxvt_failure_exception;
792
793typedef callback1<void, const char *> log_callback;
794
795extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
796extern void rxvt_log (const char *fmt, ...);
797extern void rxvt_warn (const char *fmt, ...);
798extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
799extern void rxvt_exit_failure () __attribute__ ((noreturn));
800
801#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern void rxvt_set_locale (const char *locale);
803
799/* 804/*
800 ***************************************************************************** 805 *****************************************************************************
801 * VARIABLES 806 * VARIABLES
802 ***************************************************************************** 807 *****************************************************************************
803 */ 808 */
… …
819 824
820// primivite wrapper around mbstate_t to ensure initialisation 825// primivite wrapper around mbstate_t to ensure initialisation
821struct mbstate { 826struct mbstate {
822 mbstate_t mbs; 827 mbstate_t mbs;
823 828
824 mbstate () 829 operator mbstate_t *() { return &mbs; }
830 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
831 mbstate () { reset (); }
832};
833
834#if UNICODE3
835# define COMPOSE_LO 0x40000000UL
836# define COMPOSE_HI 0x400fffffUL
837# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
838#else
839# define COMPOSE_LO 0xd800UL
840# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...
841# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)
842#endif
843
844#if ENABLE_COMBINING
845// compose chars are used to represent composite characters
846// that are not representable in unicode, as well as characters
847// not fitting in the BMP.
848struct compose_char {
849 unicode_t c1, c2; // any chars != NOCHAR are valid
850 compose_char (unicode_t c1, unicode_t c2)
851 : c1(c1), c2(c2)
852 { }
853};
854
855class rxvt_composite_vec {
856 vector<compose_char> v;
857public:
858 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
859 int expand (unicode_t c, wchar_t *r);
860 compose_char *operator [](text_t c)
825 { 861 {
826 MEMSET (&mbs, 0, sizeof (mbs)); 862 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
863 ? &v[c - COMPOSE_LO]
864 : 0;
827 } 865 }
828}; 866};
829 867
868extern class rxvt_composite_vec rxvt_composite;
869#endif
870
871
830struct rxvt_term : rxvt_vars { 872struct rxvt_term : rxvt_vars {
873 log_callback *log_hook;
874
831 struct mbstate mbstate; 875 struct mbstate mbstate;
832 876
833 unsigned char want_refresh:1, 877 unsigned char want_refresh:1,
834#ifdef TRANSPARENT 878#ifdef TRANSPARENT
835 want_full_refresh:1, /* awaiting full screen refresh */ 879 want_full_refresh:1, /* awaiting full screen refresh */
836#endif 880#endif
… …
850#endif 894#endif
851#ifdef POINTER_BLANK 895#ifdef POINTER_BLANK
852 hidden_pointer:1, 896 hidden_pointer:1,
853#endif 897#endif
854 parsed_geometry:1, 898 parsed_geometry:1,
899// enc_utf8:1, /* wether terminal reads/writes utf-8 */
855 seen_input:1, /* wether any input has been seen so far */ 900 seen_input:1; /* wether any input has been seen so far */
856 enc_utf8:1; /* wether terminal reads/writes utf-8 */
857 901
858 unsigned char refresh_type, 902 unsigned char refresh_type,
859#ifdef UTMP_SUPPORT 903#ifdef UTMP_SUPPORT
860 next_utmp_action, 904 next_utmp_action,
861#endif 905#endif
… …
867#endif 911#endif
868 scrollbar_align, 912 scrollbar_align,
869 selection_wait, 913 selection_wait,
870 selection_type; 914 selection_type;
871/* ---------- */ 915/* ---------- */
872#ifdef GREEK_SUPPORT
873 short greek_mode; /* greek keyboard mode */
874#endif
875 short rvideo; 916 short rvideo;
876 int16_t num_scr; /* screen: number lines scrolled */ 917 int16_t num_scr; /* screen: number lines scrolled */
877 unsigned int prev_ncol, /* screen: previous number of columns */ 918 unsigned int prev_ncol, /* screen: previous number of columns */
878 prev_nrow; /* screen: previous number of rows */ 919 prev_nrow; /* screen: previous number of rows */
879#ifdef RXVT_GRAPHICS
880 uint16_t gr_prev_start;
881#endif
882/* ---------- */ 920/* ---------- */
883 rend_t rstyle; 921 rend_t rstyle;
884/* ---------- */ 922/* ---------- */
885 uint32_t pixcolor_set[NPIXCLR_SETS]; 923 uint32_t pixcolor_set[NPIXCLR_SETS];
886/* ---------- */ 924/* ---------- */
… …
985 const char *key_backspace; 1023 const char *key_backspace;
986#endif 1024#endif
987#ifndef NO_DELETE_KEY 1025#ifndef NO_DELETE_KEY
988 const char *key_delete; 1026 const char *key_delete;
989#endif 1027#endif
990#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
991 KeySym ks_bigfont, ks_smallfont;
992#endif
993#ifdef GREEK_SUPPORT
994 KeySym ks_greekmodeswith;
995#endif
996#ifdef USE_XIM 1028#ifdef USE_XIM
997 rxvt_xim *input_method; 1029 rxvt_xim *input_method;
998 XIC Input_Context; 1030 XIC Input_Context;
999 XIMStyle input_style; 1031 XIMStyle input_style;
1000 int event_type; 1032 int event_type;
1001#endif 1033#endif
1002 struct mouse_event MEvent; 1034 struct mouse_event MEvent;
1003 XComposeStatus compose; 1035 XComposeStatus compose;
1004#ifdef RXVT_GRAPHICS
1005 int graphics_up;
1006 struct grwin_t *gr_root;
1007#endif
1008 ttymode_t tio; 1036 ttymode_t tio;
1009#ifdef UTMP_SUPPORT 1037#ifdef UTMP_SUPPORT
1010# ifdef HAVE_STRUCT_UTMP 1038# ifdef HAVE_STRUCT_UTMP
1011 struct utmp ut; 1039 struct utmp ut;
1012# endif 1040# endif
… …
1021 row_col_t oldcursor; 1049 row_col_t oldcursor;
1022#ifdef XPM_BACKGROUND 1050#ifdef XPM_BACKGROUND
1023 bgPixmap_t bgPixmap; 1051 bgPixmap_t bgPixmap;
1024 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1052 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1025#endif 1053#endif
1026#ifdef MULTICHAR_SET
1027 int oldcursormulti;
1028 void (*multichar_decode) (unsigned char *str, int len);
1029#endif
1030#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1054#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1031 struct stat ttyfd_stat; /* original status of our tty */ 1055 struct stat ttyfd_stat; /* original status of our tty */
1032#endif 1056#endif
1033#ifdef MENUBAR 1057#ifdef MENUBAR
1034 menu_t *ActiveMenu, /* currently active menu */ 1058 menu_t *ActiveMenu, /* currently active menu */
… …
1036 bar_t *CurrentBar; 1060 bar_t *CurrentBar;
1037# if ! (MENUBAR_MAX > 1) 1061# if ! (MENUBAR_MAX > 1)
1038 bar_t BarList; 1062 bar_t BarList;
1039# endif /* (MENUBAR_MAX > 1) */ 1063# endif /* (MENUBAR_MAX > 1) */
1040#endif 1064#endif
1041#ifdef RXVT_GRAPHICS
1042 Window gr_last_id;
1043#endif
1044#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1045 struct timeval lastcursorchange; 1066 struct timeval lastcursorchange;
1046#endif 1067#endif
1047#ifdef POINTER_BLANK 1068#ifdef POINTER_BLANK
1048 struct timeval lastmotion; 1069 struct timeval lastmotion;
1049#endif 1070#endif
1050 1071
1051/* these three don't need to be kept but do so to placate some mem checkers */ 1072 vector<void *> allocated; // free these memory blocks
1073
1052 char *env_windowid; /* environmental variable WINDOWID */ 1074 char *env_windowid; /* environmental variable WINDOWID */
1053 char *env_display; /* environmental variable DISPLAY */ 1075 char *env_display; /* environmental variable DISPLAY */
1054 char *env_term; /* environmental variable TERM */ 1076 char *env_term; /* environmental variable TERM */
1055 char *env_colorfgbg; 1077 char *env_colorfgbg;
1056 char *locale; 1078 char *locale;
1079#if 0
1057 char *codeset; 1080 char *codeset;
1081#endif
1058 char charsets[4]; 1082 char charsets[4];
1059 unsigned char *v_buffer; /* pointer to physical buffer */ 1083 unsigned char *v_buffer; /* pointer to physical buffer */
1060 unsigned int v_buflen; /* size of area to write */ 1084 unsigned int v_buflen; /* size of area to write */
1061 char *newfont[MAX_NFONTS];
1062 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 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 */
1068 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1091 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1069 unsigned char cmdbuf_base[BUFSIZ]; 1092 unsigned char cmdbuf_base[CBUFSIZ];
1070 1093
1071 rxvt_salloc *ralloc; 1094 rxvt_salloc *ralloc;
1072 rxvt_salloc *talloc; 1095 rxvt_salloc *talloc;
1073 1096
1074 void paste (const unsigned char *data, unsigned int len); 1097 void paste (const unsigned char *data, unsigned int len);
… …
1118 void destroy (); 1141 void destroy ();
1119 1142
1120 bool init (int argc, const char *const *argv); 1143 bool init (int argc, const char *const *argv);
1121 bool init_vars (); 1144 bool init_vars ();
1122 1145
1123 uint32_t next_char (); 1146 unicode_t next_char ();
1124 1147
1125 bool pty_fill (); 1148 bool pty_fill ();
1126 1149
1127 void *operator new (size_t s); 1150 void *operator new (size_t s);
1128 void operator delete (void *p, size_t s); 1151 void operator delete (void *p, size_t s);
… …
1169 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);
1170 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);
1171 void scr_reset (); 1194 void scr_reset ();
1172 void scr_reset_realloc (); 1195 void scr_reset_realloc ();
1173 void scr_release (); 1196 void scr_release ();
1174 void scr_clear (); 1197 void scr_clear (bool really = true);
1175 void scr_refresh (unsigned char refresh_type); 1198 void scr_refresh (unsigned char refresh_type);
1176 bool scr_refresh_rend (rend_t mask, rend_t value); 1199 bool scr_refresh_rend (rend_t mask, rend_t value);
1177 void scr_erase_screen (int mode); 1200 void scr_erase_screen (int mode);
1178 void scr_touch (bool refresh); 1201 void scr_touch (bool refresh);
1179 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);
1180 1205
1181 /* autoconvert */ 1206 /* autoconvert */
1182 1207
1183 // command.C 1208 // command.C
1184 void lookup_key (XKeyEvent &ev); 1209 void lookup_key (XKeyEvent &ev);
1185 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1210 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1186 uint32_t cmd_getc (); 1211 unicode_t cmd_getc ();
1212 bool cmd_parse ();
1187 void mouse_report (const XButtonEvent &ev); 1213 void mouse_report (XButtonEvent &ev);
1188 void button_press (const XButtonEvent &ev); 1214 void button_press (XButtonEvent &ev);
1189 void button_release (const XButtonEvent &ev); 1215 void button_release (XButtonEvent &ev);
1190 int check_our_parents (); 1216 int check_our_parents ();
1191#ifdef PRINTPIPE 1217#ifdef PRINTPIPE
1192 FILE * popen_printer (); 1218 FILE *popen_printer ();
1193 int pclose_printer (FILE *stream); 1219 int pclose_printer (FILE *stream);
1194#endif 1220#endif
1195 void process_print_pipe (); 1221 void process_print_pipe ();
1196 void process_nonprinting (unsigned char ch); 1222 void process_nonprinting (unicode_t ch);
1197 void process_escape_vt52 (unsigned char ch); 1223 void process_escape_vt52 (unicode_t ch);
1198 void process_escape_seq (); 1224 void process_escape_seq ();
1199 void process_csi_seq (); 1225 void process_csi_seq ();
1200 void process_window_ops (const int *args, unsigned int nargs); 1226 void process_window_ops (const int *args, unsigned int nargs);
1201 unsigned char * get_to_st (unsigned char *ends_how); 1227 unsigned char *get_to_st (unicode_t &ends_how);
1202 void process_dcs_seq (); 1228 void process_dcs_seq ();
1203 void process_osc_seq (); 1229 void process_osc_seq ();
1204 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)));
1205 int privcases (int mode, unsigned long bit); 1231 int privcases (int mode, unsigned long bit);
1206 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);
… …
1214 void cleanutent (); 1240 void cleanutent ();
1215 // main.C; 1241 // main.C;
1216 void privileges (int mode); 1242 void privileges (int mode);
1217 void privileged_utmp (char action); 1243 void privileged_utmp (char action);
1218 void privileged_ttydev (char action); 1244 void privileged_ttydev (char action);
1219 void change_font (int init, const char *fontname); 1245 bool change_font (const char *fontname);
1220 void font_up_down (int n, int direction); 1246 bool font_up_down (int n, int direction);
1221 void set_title (const char *str); 1247 void set_title (const char *str);
1222 void set_iconName (const char *str); 1248 void set_icon_name (const char *str);
1223 void set_window_color (int idx, const char *color); 1249 void set_window_color (int idx, const char *color);
1224 void set_colorfgbg (); 1250 void set_colorfgbg ();
1225 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1251 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1226 void set_widthheight (unsigned int width, unsigned int height); 1252 void set_widthheight (unsigned int width, unsigned int height);
1227 1253
… …
1229 // menubar.C 1255 // menubar.C
1230 void menuitem_free (menu_t *menu, menuitem_t *item); 1256 void menuitem_free (menu_t *menu, menuitem_t *item);
1231 int action_dispatch (action_t *action); 1257 int action_dispatch (action_t *action);
1232 void menuarrow_free (char name); 1258 void menuarrow_free (char name);
1233 void menuarrow_add (char *string); 1259 void menuarrow_add (char *string);
1234 char * menu_find_base (menu_t **menu, char *path); 1260 char *menu_find_base (menu_t **menu, char *path);
1235 menu_t * menu_delete (menu_t *menu); 1261 menu_t *menu_delete (menu_t *menu);
1236 menu_t * menu_add (menu_t *parent, char *path); 1262 menu_t *menu_add (menu_t *parent, char *path);
1237 void drawbox_menubar (int x, int len, int state); 1263 void drawbox_menubar (int x, int len, int state);
1238 void drawtriangle (int x, int y, int state); 1264 void drawtriangle (int x, int y, int state);
1239 void drawbox_menuitem (int y, int state); 1265 void drawbox_menuitem (int y, int state);
1240 void menu_show (); 1266 void menu_show ();
1241 void menu_display (void (*update) (rxvt_t *)); 1267 void menu_display (void (rxvt_term::*update) ());
1242 void menu_hide_all (); 1268 void menu_hide_all ();
1243 void menu_hide (); 1269 void menu_hide ();
1244 void menu_clear (menu_t *menu); 1270 void menu_clear (menu_t *menu);
1245 void menubar_clear (); 1271 void menubar_clear ();
1246 bar_t * menubar_find (const char *name); 1272 bar_t *menubar_find (const char *name);
1247 int menubar_push (const char *name); 1273 int menubar_push (const char *name);
1248 void menubar_remove (const char *name); 1274 void menubar_remove (const char *name);
1249 void menubar_dump (FILE *fp); 1275 void menubar_dump (FILE *fp);
1250 void menubar_read (const char *filename); 1276 void menubar_read (const char *filename);
1251 void menubar_dispatch (char *str); 1277 void menubar_dispatch (char *str);
1252 void draw_Arrows (int name, int state); 1278 void draw_Arrows (int name, int state);
1253 void menubar_expose (); 1279 void menubar_expose ();
1254 int menubar_mapping (int map); 1280 int menubar_mapping (int map);
1255 int menu_select (XButtonEvent *ev); 1281 int menu_select (XButtonEvent &ev);
1256 void menubar_select (XButtonEvent *ev); 1282 void menubar_select (XButtonEvent &ev);
1257 void menubar_control (XButtonEvent *ev); 1283 void menubar_control (XButtonEvent &ev);
1258 void map_menuBar (int map); 1284 void map_menuBar (int map);
1259#endif 1285#endif
1260 1286
1261 // screen.C 1287 // screen.C
1262 void scr_poweron (); 1288 void scr_poweron ();
1263 void scr_cursor (int mode); 1289 void scr_cursor (int mode);
1264 int scr_change_screen (int scrn); 1290 int scr_change_screen (int scrn);
1265 void scr_color (unsigned int color, int fgbg); 1291 void scr_color (unsigned int color, int fgbg);
1266 void scr_rendition (int set, int style); 1292 void scr_rendition (int set, int style);
1267 void scr_add_lines (const uint32_t *str, int nlines, int len); 1293 void scr_add_lines (const unicode_t *str, int nlines, int len);
1268 void scr_backspace (); 1294 void scr_backspace ();
1269 void scr_tab (int count); 1295 void scr_tab (int count);
1270 void scr_backindex (); 1296 void scr_backindex ();
1271 void scr_forwardindex (); 1297 void scr_forwardindex ();
1272 void scr_gotorc (int row, int col, int relative); 1298 void scr_gotorc (int row, int col, int relative);
… …
1344 int scale_pixmap (const char *geom); 1370 int scale_pixmap (const char *geom);
1345 void resize_pixmap (); 1371 void resize_pixmap ();
1346 Pixmap set_bgPixmap (const char *file); 1372 Pixmap set_bgPixmap (const char *file);
1347}; 1373};
1348 1374
1349#define SET_LOCALE(locale) rxvt_set_locale (locale)
1350extern void rxvt_set_locale (const char *locale);
1351
1352/* 1375/*
1353 ***************************************************************************** 1376 *****************************************************************************
1354 * PROTOTYPES 1377 * PROTOTYPES
1355 ***************************************************************************** 1378 *****************************************************************************
1356 */ 1379 */

Diff Legend

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