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.37 by pcg, Sun Feb 22 08:09:38 2004 UTC vs.
Revision 1.71 by pcg, Sun May 9 18:19:49 2004 UTC

… …
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include "rxvtlib.h" 4#include "rxvtlib.h"
5 5
6#include "feature.h" 6#include "feature.h"
7
8#include <limits.h>
7 9
8#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
9#include <X11/keysym.h> 11#include <X11/keysym.h>
10#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
11#include <X11/Xatom.h> 13#include <X11/Xatom.h>
12 14
15#include "encoding.h"
13#include "defaultfont.h" 16#include "defaultfont.h"
14#include "rxvtcolor.h" 17#include "rxvtcolor.h"
15#include "iom.h" 18#include "iom.h"
16#include "salloc.h" 19#include "salloc.h"
17
18#include <wchar.h>
19 20
20/* 21/*
21 ***************************************************************************** 22 *****************************************************************************
22 * SYSTEM HACKS 23 * SYSTEM HACKS
23 ***************************************************************************** 24 *****************************************************************************
… …
29# define __svr4__ 30# define __svr4__
30#endif 31#endif
31#if defined (sun) && !defined (__sun__) 32#if defined (sun) && !defined (__sun__)
32# define __sun__ 33# define __sun__
33#endif 34#endif
34
35 35
36#ifndef HAVE_XPOINTER 36#ifndef HAVE_XPOINTER
37typedef char *XPointer; 37typedef char *XPointer;
38#endif 38#endif
39 39
… …
137 ***************************************************************************** 137 *****************************************************************************
138 * NORMAL DEFINES 138 * NORMAL DEFINES
139 ***************************************************************************** 139 *****************************************************************************
140 */ 140 */
141 141
142#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
143# error if you disable both selection styles, how can you select, silly?
144#endif
145
146#define APL_CLASS "XTerm" /* class name */
147#define APL_SUBCLASS "Rxvt" /* also check resources under this name */
148#define APL_NAME "rxvt" /* normal name */
149
150/* COLORTERM, TERM environment variables */ 142/* COLORTERM, TERM environment variables */
151#define COLORTERMENV "rxvt" 143#define COLORTERMENV "rxvt"
152#ifdef XPM_BACKGROUND 144#ifdef XPM_BACKGROUND
153# define COLORTERMENVFULL COLORTERMENV "-xpm" 145# define COLORTERMENVFULL COLORTERMENV "-xpm"
154#else 146#else
155# define COLORTERMENVFULL COLORTERMENV 147# define COLORTERMENVFULL COLORTERMENV
156#endif 148#endif
157#ifndef TERMENV 149#ifndef TERMENV
158# define TERMENV "xterm" 150# define TERMENV "rxvt"
159#endif 151#endif
160 152
161#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 153#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
162# define NO_MOUSE_REPORT_SCROLLBAR 154# define NO_MOUSE_REPORT_SCROLLBAR
163#endif 155#endif
… …
269 * :............: 261 * :............:
270 * | 262 * |
271 * +---< SB_WIDTH_NEXT 263 * +---< SB_WIDTH_NEXT
272 */ 264 */
273 265
266enum {
274#define NO_REFRESH 0 /* Window not visible at all! */ 267 NO_REFRESH = 0 , /* Window not visible at all! */
275#define FAST_REFRESH (1<<0) /* Fully exposed window */ 268 FAST_REFRESH = 1<<0, /* Fully exposed window */
276#define SLOW_REFRESH (1<<1) /* Partially exposed window */ 269 SLOW_REFRESH = 1<<1, /* Partially exposed window */
277#define SMOOTH_REFRESH (1<<2) /* Do sync'ing to make it smooth */ 270 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
278#define REFRESH_BOUNDS (1<<3) 271 REFRESH_BOUNDS = 1<<3
272};
279 273
280#ifdef NO_SECONDARY_SCREEN 274#ifdef NO_SECONDARY_SCREEN
281# define NSCREENS 0 275# define NSCREENS 0
282#else 276#else
283# define NSCREENS 1 277# define NSCREENS 1
… …
291#define FONT_CMD '#' 285#define FONT_CMD '#'
292#define FONT_DN "#-" 286#define FONT_DN "#-"
293#define FONT_UP "#+" 287#define FONT_UP "#+"
294 288
295/* flags for rxvt_scr_gotorc () */ 289/* flags for rxvt_scr_gotorc () */
290enum {
296#define C_RELATIVE 1 /* col movement is relative */ 291 C_RELATIVE = 1 , /* col movement is relative */
297#define R_RELATIVE 2 /* row movement is relative */ 292 R_RELATIVE = 2, /* row movement is relative */
298#define RELATIVE (R_RELATIVE|C_RELATIVE) 293 RELATIVE = 1 | 2,
294};
299 295
300/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 296/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
301#define INSERT -1 /* don't change these values */ 297enum {
302#define DELETE +1 298 INSERT = -1, /* don't change these values */
303#define ERASE +2 299 DELETE = +1,
300 ERASE = +2,
301};
304 302
305/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 303/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
306enum page_dirn { 304enum page_dirn {
307 UP, 305 UP,
308 DN, 306 DN,
309 NO_DIR 307 NO_DIR,
310}; 308};
311 309
312/* arguments for rxvt_scr_change_screen () */ 310/* arguments for rxvt_scr_change_screen () */
313enum { 311enum {
314 PRIMARY = 0, 312 PRIMARY = 0,
315 SECONDARY 313 SECONDARY,
316}; 314};
317 315
318#define RS_None 0 /* Normal */ 316#define RS_None 0 /* Normal */
319 317
320#define RS_fgMask 0x000001FFu /* 512 colors */ 318#define RS_fgMask 0x000001FFu /* 512 colors */
… …
344enum { 342enum {
345 C0_NUL = 0x00, 343 C0_NUL = 0x00,
346 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 344 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
347 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 345 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
348 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 346 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
349 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1 347 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
350}; 348};
351#define CHAR_ST 0x9c /* 0234 */ 349#define CHAR_ST 0x9c /* 0234 */
352 350
353/* 351/*
354 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 352 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
355 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 353 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
356 */ 354 */
355enum {
357#define XTerm_name 0 356 XTerm_name = 0,
358#define XTerm_iconName 1 357 XTerm_iconName = 1,
359#define XTerm_title 2 358 XTerm_title = 2,
359 XTerm_property = 3, // change X property
360#define XTerm_Color 4 /* change colors */ 360 XTerm_Color = 4, // change colors
361 XTerm_Color00 = 10, // not implemented, CLASH!
362 XTerm_Color01 = 11, // not implemented
361#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ 363 XTerm_Color_cursor = 12, // change actual 'Cursor' color
362#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ 364 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color
365 XTerm_Color_pointer_bg = 14, // not implemented
366 XTerm_Color05 = 15, // not implemented
367 XTerm_Color06 = 16, // not implemented
363#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ 368 XTerm_Color_RV = 17, // change actual 'Highlight' color
364#define XTerm_Color_BD 18 /* change actual 'Bold' color */
365#define XTerm_Color_UL 19 /* change actual 'Underline' color */
366#define XTerm_logfile 46 /* not implemented */ 369 XTerm_logfile = 46, // not implemented
367#define XTerm_font 50 370 XTerm_font = 50,
368 371
369/* 372 XTerm_konsole30 = 30, // reserved for konsole
373 XTerm_konsole31 = 31, // reserved for konsole
374 XTerm_emacs51 = 51, // reserved for emacs shell
375 /*
370 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 376 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
371 */ 377 */
372#define XTerm_Menu 10 /* set menu item */ 378 XTerm_Color_BD = 18, // change actual 'Bold' color
379 XTerm_Color_UL = 19, // change actual 'Underline' color
373#define XTerm_Pixmap 20 /* new bg pixmap */ 380 XTerm_Pixmap = 20, // new bg pixmap
374#define XTerm_restoreFG 39 /* change default fg color */ 381 XTerm_restoreFG = 39, // change default fg color
375#define XTerm_restoreBG 49 /* change default bg color */ 382 XTerm_restoreBG = 49, // change default bg color
376#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 383 XTerm_dumpscreen = 55, // dump scrollback and all of screen
384 XTerm_locale = 701, // change locale
385 XTerm_findfont = 702, // find font of given character (in decimal)
386 XTerm_Menu = 703, // set menu item
387};
377 388
378/* Words starting with `Color_' are colours. Others are counts */ 389/* Words starting with `Color_' are colours. Others are counts */
379/* 390/*
380 * The following comment is mostly obsolete since pixcolor_set was expanded: 391 * The following comment is mostly obsolete since pixcolor_set was expanded:
381 * We're currently upto 29 colours. Only 3 more available. The 392 * We're currently upto 29 colours. Only 3 more available. The
… …
417#endif 428#endif
418#ifndef NO_CURSORCOLOR 429#ifndef NO_CURSORCOLOR
419 Color_cursor, 430 Color_cursor,
420 Color_cursor2, 431 Color_cursor2,
421#endif 432#endif
422 Color_pointer, 433 Color_pointer_fg,
434 Color_pointer_bg,
423 Color_border, 435 Color_border,
424#ifndef NO_BOLD_UNDERLINE_REVERSE 436#ifndef NO_BOLD_UNDERLINE_REVERSE
425 Color_BD, 437 Color_BD,
426 Color_UL, 438 Color_UL,
427 Color_RV, 439 Color_RV,
… …
430 Color_HC, 442 Color_HC,
431#endif 443#endif
432#ifdef KEEP_SCROLLCOLOR 444#ifdef KEEP_SCROLLCOLOR
433 Color_scroll, 445 Color_scroll,
434 Color_trough, 446 Color_trough,
447#endif
448#if TINTING
449 Color_tint,
435#endif 450#endif
436 NRS_COLORS, /* */ 451 NRS_COLORS, /* */
437#ifdef KEEP_SCROLLCOLOR 452#ifdef KEEP_SCROLLCOLOR
438 Color_topShadow = NRS_COLORS, 453 Color_topShadow = NRS_COLORS,
439 Color_bottomShadow, 454 Color_bottomShadow,
… …
508#endif 523#endif
509#ifdef USE_XIM 524#ifdef USE_XIM
510 Rs_preeditType, 525 Rs_preeditType,
511 Rs_inputMethod, 526 Rs_inputMethod,
512#endif 527#endif
513#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
514 Rs_bigfont_key,
515 Rs_smallfont_key,
516#endif
517#ifdef TRANSPARENT 528#ifdef TRANSPARENT
518 Rs_transparent, 529 Rs_transparent,
519 Rs_transparent_all, 530 Rs_transparent_all,
520#endif 531#endif
521#ifndef NO_FRILLS 532#ifndef NO_FRILLS
… …
525 Rs_scrollBar_thickness, 536 Rs_scrollBar_thickness,
526#ifndef NO_LINESPACE 537#ifndef NO_LINESPACE
527 Rs_lineSpace, 538 Rs_lineSpace,
528#endif 539#endif
529 Rs_cutchars, 540 Rs_cutchars,
530#ifdef ACS_ASCII
531 Rs_acs_chars,
532#endif
533 Rs_modifier, 541 Rs_modifier,
534 Rs_answerbackstring, 542 Rs_answerbackstring,
535 Rs_tripleclickwords, 543 Rs_tripleclickwords,
544 Rs_insecure,
536 Rs_cursorBlink, 545 Rs_cursorBlink,
537 Rs_pointerBlank, 546 Rs_pointerBlank,
538 Rs_pointerBlankDelay, 547 Rs_pointerBlankDelay,
539 Rs_imLocale, 548 Rs_imLocale,
549#ifndef NO_SECONDARY_SCREEN
550 Rs_secondaryScreen,
551 Rs_secondaryScroll,
552#endif
540 NUM_RESOURCES 553 NUM_RESOURCES
541}; 554};
542 555
543// see init.C:xa_names, which must be kept in sync 556// see init.C:xa_names, which must be kept in sync
544enum { 557enum {
… …
551 XA_VT_SELECTION, 564 XA_VT_SELECTION,
552 XA_INCR, 565 XA_INCR,
553 XA_WMDELETEWINDOW, 566 XA_WMDELETEWINDOW,
554#ifdef TRANSPARENT 567#ifdef TRANSPARENT
555 XA_XROOTPMAPID, 568 XA_XROOTPMAPID,
569 XA_XSETROOTID,
556#endif 570#endif
557#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 571#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
558 XA_DNDPROTOCOL, 572 XA_DNDPROTOCOL,
559 XA_DNDSELECTION, 573 XA_DNDSELECTION,
560#endif /* OFFIX_DND */ 574#endif /* OFFIX_DND */
… …
582#define PrivMode_TtyOutputInh (1LU<<16) 596#define PrivMode_TtyOutputInh (1LU<<16)
583#define PrivMode_Keypress (1LU<<17) 597#define PrivMode_Keypress (1LU<<17)
584#define PrivMode_smoothScroll (1LU<<18) 598#define PrivMode_smoothScroll (1LU<<18)
585#define PrivMode_vt52 (1LU<<19) 599#define PrivMode_vt52 (1LU<<19)
586/* too annoying to implement X11 highlight tracking */ 600/* too annoying to implement X11 highlight tracking */
587/* #define PrivMode_MouseX11Track (1LU<<18) */ 601/* #define PrivMode_MouseX11Track (1LU<<20) */
588 602
589#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 603#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
590#define PrivMode(test,bit) \ 604#define PrivMode(test,bit) \
591 if (test) \ 605 if (test) \
592 PrivateModes |= (bit); \ 606 PrivateModes |= (bit); \
593 else \ 607 else \
594 PrivateModes &= ~ (bit) 608 PrivateModes &= ~(bit)
595 609
596#ifdef ALLOW_132_MODE 610#ifdef ALLOW_132_MODE
597# define PrivMode_Default \
598(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 611# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
599#else 612#else
600# define PrivMode_Default \
601(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 613# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
602#endif 614#endif
603 615
604#define XDEPTH display->depth 616#define XDEPTH display->depth
605#define XCMAP display->cmap 617#define XCMAP display->cmap
606#define XVISUAL display->visual 618#define XVISUAL display->visual
607 619
608#define IMBUFSIZ 128 /* input modifier buffer sizes */ 620#define IMBUFSIZ 128 // input modifier buffer sizes
609#ifndef BUFSIZ
610# define BUFSIZ 4096
611#endif
612#define KBUFSZ 512 /* size of keyboard mapping buffer */ 621#define KBUFSZ 512 // size of keyboard mapping buffer
622#define CBUFSIZ 4096 // size of command buffer
623#define UBUFSIZ 4096 // character buffer
624
625#ifndef PATH_MAX
626# define PATH_MAX 16384
627#endif
613 628
614/* 629/*
615 ***************************************************************************** 630 *****************************************************************************
616 * MACRO DEFINES 631 * MACRO DEFINES
617 ***************************************************************************** 632 *****************************************************************************
… …
787# define D_X(x) fprintf x ; fputc('\n', stderr) 802# define D_X(x) fprintf x ; fputc('\n', stderr)
788#else 803#else
789# define D_X(x) 804# define D_X(x)
790#endif 805#endif
791 806
807extern class rxvt_failure_exception { } rxvt_failure_exception;
808
809typedef callback1<void, const char *> log_callback;
810
811extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
812extern void rxvt_log (const char *fmt, ...);
813extern void rxvt_warn (const char *fmt, ...);
814extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
815extern void rxvt_exit_failure () __attribute__ ((noreturn));
816
817#define SET_LOCALE(locale) rxvt_set_locale (locale)
818extern bool rxvt_set_locale (const char *locale);
819
792/* 820/*
793 ***************************************************************************** 821 *****************************************************************************
794 * VARIABLES 822 * VARIABLES
795 ***************************************************************************** 823 *****************************************************************************
796 */ 824 */
… …
817 operator mbstate_t *() { return &mbs; } 845 operator mbstate_t *() { return &mbs; }
818 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); } 846 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
819 mbstate () { reset (); } 847 mbstate () { reset (); }
820}; 848};
821 849
850#if UNICODE3
851# define COMPOSE_LO 0x40000000UL
852# define COMPOSE_HI 0x400fffffUL
853# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
854#else
855# define COMPOSE_LO 0xd800UL
856# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...
857# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)
858#endif
859
860#if ENABLE_COMBINING
861// compose chars are used to represent composite characters
862// that are not representable in unicode, as well as characters
863// not fitting in the BMP.
864struct compose_char {
865 unicode_t c1, c2; // any chars != NOCHAR are valid
866 compose_char (unicode_t c1, unicode_t c2)
867 : c1(c1), c2(c2)
868 { }
869};
870
871class rxvt_composite_vec {
872 vector<compose_char> v;
873public:
874 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
875 int expand (unicode_t c, wchar_t *r);
876 compose_char *operator [](text_t c)
877 {
878 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
879 ? &v[c - COMPOSE_LO]
880 : 0;
881 }
882};
883
884extern class rxvt_composite_vec rxvt_composite;
885#endif
886
887
822struct rxvt_term : rxvt_vars { 888struct rxvt_term : rxvt_vars {
823 struct mbstate mbstate; 889 log_callback *log_hook; // log error messages through this hook, if != 0
890
891 struct mbstate mbstate; // current input multibyte state
824 892
825 unsigned char want_refresh:1, 893 unsigned char want_refresh:1,
826#ifdef TRANSPARENT 894#ifdef TRANSPARENT
827 want_full_refresh:1, /* awaiting full screen refresh */ 895 want_full_refresh:1, /* awaiting full screen refresh */
828#endif 896#endif
… …
841 hidden_text:1, 909 hidden_text:1,
842#endif 910#endif
843#ifdef POINTER_BLANK 911#ifdef POINTER_BLANK
844 hidden_pointer:1, 912 hidden_pointer:1,
845#endif 913#endif
846 parsed_geometry:1,
847 seen_input:1, /* wether any input has been seen so far */
848 enc_utf8:1; /* wether terminal reads/writes utf-8 */ 914// enc_utf8:1, /* wether terminal reads/writes utf-8 */
915 parsed_geometry:1;
849 916
850 unsigned char refresh_type, 917 unsigned char refresh_type,
851#ifdef UTMP_SUPPORT 918#ifdef UTMP_SUPPORT
852 next_utmp_action, 919 next_utmp_action,
853#endif 920#endif
854#ifndef NO_SETOWNER_TTYDEV 921#ifndef NO_SETOWNER_TTYDEV
855 next_tty_action, 922 next_tty_action,
856#endif 923#endif
857#ifdef META8_OPTION 924#ifdef META8_OPTION
858 meta_char, /* Alt-key prefix */ 925 meta_char, /* Alt-key prefix */
859#endif 926#endif
860 scrollbar_align, 927 scrollbar_align,
861 selection_wait, 928 selection_wait,
862 selection_type; 929 selection_type;
863/* ---------- */ 930/* ---------- */
864 short rvideo; 931 short rvideo;
865 int16_t num_scr; /* screen: number lines scrolled */ 932 int16_t num_scr; /* screen: number lines scrolled */
866 unsigned int prev_ncol, /* screen: previous number of columns */ 933 unsigned int prev_ncol, /* screen: previous number of columns */
867 prev_nrow; /* screen: previous number of rows */ 934 prev_nrow; /* screen: previous number of rows */
868/* ---------- */ 935/* ---------- */
869 rend_t rstyle; 936 rend_t rstyle;
870/* ---------- */ 937/* ---------- */
871 uint32_t pixcolor_set[NPIXCLR_SETS]; 938 uint32_t pixcolor_set[NPIXCLR_SETS];
872/* ---------- */ 939/* ---------- */
… …
971 const char *key_backspace; 1038 const char *key_backspace;
972#endif 1039#endif
973#ifndef NO_DELETE_KEY 1040#ifndef NO_DELETE_KEY
974 const char *key_delete; 1041 const char *key_delete;
975#endif 1042#endif
976#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
977 KeySym ks_bigfont, ks_smallfont;
978#endif
979#ifdef USE_XIM 1043#ifdef USE_XIM
980 rxvt_xim *input_method; 1044 rxvt_xim *input_method;
981 XIC Input_Context; 1045 XIC Input_Context;
982 XIMStyle input_style; 1046 XIMStyle input_style;
983 int event_type; 1047 int event_type;
… …
1018#endif 1082#endif
1019#ifdef POINTER_BLANK 1083#ifdef POINTER_BLANK
1020 struct timeval lastmotion; 1084 struct timeval lastmotion;
1021#endif 1085#endif
1022 1086
1023/* these three don't need to be kept but do so to placate some mem checkers */ 1087 vector<void *> allocated; // free these memory blocks with free()
1088
1024 char *env_windowid; /* environmental variable WINDOWID */ 1089 char *env_windowid; /* environmental variable WINDOWID */
1025 char *env_display; /* environmental variable DISPLAY */ 1090 char *env_display; /* environmental variable DISPLAY */
1026 char *env_term; /* environmental variable TERM */ 1091 char *env_term; /* environmental variable TERM */
1027 char *env_colorfgbg; 1092 char *env_colorfgbg;
1028 char *locale; 1093 char *locale;
1094#if 0
1029 char *codeset; 1095 char *codeset;
1096#endif
1030 char charsets[4]; 1097 char charsets[4];
1031 unsigned char *v_buffer; /* pointer to physical buffer */ 1098 unsigned char *v_buffer; /* pointer to physical buffer */
1032 unsigned int v_buflen; /* size of area to write */ 1099 unsigned int v_buflen; /* size of area to write */
1033 char *newfont[MAX_NFONTS];
1034 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1100 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1035#ifdef KEYSYM_RESOURCE 1101#ifdef KEYSYM_RESOURCE
1036 const unsigned char *Keysym_map[256]; 1102 const unsigned char *Keysym_map[256];
1037#endif 1103#endif
1038 const char *rs[NUM_RESOURCES]; 1104 const char *rs[NUM_RESOURCES];
1039/* command input buffering */ 1105 /* command input buffering */
1040 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1106 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1041 unsigned char cmdbuf_base[BUFSIZ]; 1107 unsigned char cmdbuf_base[CBUFSIZ];
1042 1108
1043 rxvt_salloc *ralloc; 1109 rxvt_salloc *talloc; // text line allocator
1044 rxvt_salloc *talloc; 1110 rxvt_salloc *ralloc; // rend line allocator
1111
1112 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1045 1113
1046 void paste (const unsigned char *data, unsigned int len); 1114 void paste (const unsigned char *data, unsigned int len);
1047 1115
1048 void flush (); 1116 void flush ();
1049 1117
… …
1090 void destroy (); 1158 void destroy ();
1091 1159
1092 bool init (int argc, const char *const *argv); 1160 bool init (int argc, const char *const *argv);
1093 bool init_vars (); 1161 bool init_vars ();
1094 1162
1095 uint32_t next_char (); 1163 unicode_t next_char ();
1096 1164
1097 bool pty_fill (); 1165 bool pty_fill ();
1098 1166
1099 void *operator new (size_t s); 1167 void *operator new (size_t s);
1100 void operator delete (void *p, size_t s); 1168 void operator delete (void *p, size_t s);
… …
1105 void set_locale (const char *locale); 1173 void set_locale (const char *locale);
1106 void init_xlocale (); 1174 void init_xlocale ();
1107 void init_command (const char *const *argv); 1175 void init_command (const char *const *argv);
1108 int run_command (const char *const *argv); 1176 int run_command (const char *const *argv);
1109 int run_child (const char *const *argv); 1177 int run_child (const char *const *argv);
1178 static void child_exited (int pid);
1110 1179
1111 void color_aliases (int idx); 1180 void color_aliases (int idx);
1112 void recolour_cursor (); 1181 void recolour_cursor ();
1113 void create_windows (int argc, const char *const *argv); 1182 void create_windows (int argc, const char *const *argv);
1114 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1183 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
… …
1141 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1210 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1142 int scr_scroll_text (int row1, int row2, int count, int spec); 1211 int scr_scroll_text (int row1, int row2, int count, int spec);
1143 void scr_reset (); 1212 void scr_reset ();
1144 void scr_reset_realloc (); 1213 void scr_reset_realloc ();
1145 void scr_release (); 1214 void scr_release ();
1146 void scr_clear (); 1215 void scr_clear (bool really = false);
1147 void scr_refresh (unsigned char refresh_type); 1216 void scr_refresh (unsigned char refresh_type);
1148 bool scr_refresh_rend (rend_t mask, rend_t value); 1217 bool scr_refresh_rend (rend_t mask, rend_t value);
1149 void scr_erase_screen (int mode); 1218 void scr_erase_screen (int mode);
1150 void scr_touch (bool refresh); 1219 void scr_touch (bool refresh);
1151 void scr_expose (int x, int y, int width, int height, bool refresh); 1220 void scr_expose (int x, int y, int width, int height, bool refresh);
1221 void scr_remap_chars ();
1222 void scr_remap_chars (text_t *tp, rend_t *rp);
1152 1223
1153 /* autoconvert */ 1224 /* autoconvert */
1154 1225
1155 // command.C 1226 // command.C
1156 void lookup_key (XKeyEvent &ev); 1227 void lookup_key (XKeyEvent &ev);
1157 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1228 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1158 uint32_t cmd_getc (); 1229 unicode_t cmd_getc ();
1230 bool cmd_parse ();
1159 void mouse_report (const XButtonEvent &ev); 1231 void mouse_report (XButtonEvent &ev);
1160 void button_press (const XButtonEvent &ev); 1232 void button_press (XButtonEvent &ev);
1161 void button_release (const XButtonEvent &ev); 1233 void button_release (XButtonEvent &ev);
1162 int check_our_parents (); 1234 int check_our_parents ();
1163#ifdef PRINTPIPE 1235#ifdef PRINTPIPE
1164 FILE * popen_printer (); 1236 FILE *popen_printer ();
1165 int pclose_printer (FILE *stream); 1237 int pclose_printer (FILE *stream);
1166#endif 1238#endif
1167 void process_print_pipe (); 1239 void process_print_pipe ();
1168 void process_nonprinting (unsigned char ch); 1240 void process_nonprinting (unicode_t ch);
1169 void process_escape_vt52 (unsigned char ch); 1241 void process_escape_vt52 (unicode_t ch);
1170 void process_escape_seq (); 1242 void process_escape_seq ();
1171 void process_csi_seq (); 1243 void process_csi_seq ();
1172 void process_window_ops (const int *args, unsigned int nargs); 1244 void process_window_ops (const int *args, unsigned int nargs);
1173 unsigned char * get_to_st (unsigned char *ends_how); 1245 unsigned char *get_to_st (unicode_t &ends_how);
1174 void process_dcs_seq (); 1246 void process_dcs_seq ();
1175 void process_osc_seq (); 1247 void process_osc_seq ();
1248 void process_color_seq (int report, int color, const char *str, unsigned char resp);
1176 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))); 1249 void process_xterm_seq (int op, const char *str, unsigned char resp);
1177 int privcases (int mode, unsigned long bit); 1250 int privcases (int mode, unsigned long bit);
1178 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1251 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1179 void process_sgr_mode (unsigned int nargs, const int *arg); 1252 void process_sgr_mode (unsigned int nargs, const int *arg);
1180 void process_graphics (); 1253 void process_graphics ();
1181 // init.C 1254 // init.C
… …
1186 void cleanutent (); 1259 void cleanutent ();
1187 // main.C; 1260 // main.C;
1188 void privileges (int mode); 1261 void privileges (int mode);
1189 void privileged_utmp (char action); 1262 void privileged_utmp (char action);
1190 void privileged_ttydev (char action); 1263 void privileged_ttydev (char action);
1191 void change_font (int init, const char *fontname); 1264 bool change_font (const char *fontname);
1192 void font_up_down (int n, int direction); 1265 bool font_up_down (int n, int direction);
1193 void set_title (const char *str); 1266 void set_title (const char *str);
1194 void set_iconName (const char *str); 1267 void set_icon_name (const char *str);
1195 void set_window_color (int idx, const char *color); 1268 void set_window_color (int idx, const char *color);
1196 void set_colorfgbg (); 1269 void set_colorfgbg ();
1197 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1270 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1198 void set_widthheight (unsigned int width, unsigned int height); 1271 void set_widthheight (unsigned int width, unsigned int height);
1199 1272
… …
1201 // menubar.C 1274 // menubar.C
1202 void menuitem_free (menu_t *menu, menuitem_t *item); 1275 void menuitem_free (menu_t *menu, menuitem_t *item);
1203 int action_dispatch (action_t *action); 1276 int action_dispatch (action_t *action);
1204 void menuarrow_free (char name); 1277 void menuarrow_free (char name);
1205 void menuarrow_add (char *string); 1278 void menuarrow_add (char *string);
1206 char * menu_find_base (menu_t **menu, char *path); 1279 char *menu_find_base (menu_t **menu, char *path);
1207 menu_t * menu_delete (menu_t *menu); 1280 menu_t *menu_delete (menu_t *menu);
1208 menu_t * menu_add (menu_t *parent, char *path); 1281 menu_t *menu_add (menu_t *parent, char *path);
1209 void drawbox_menubar (int x, int len, int state); 1282 void drawbox_menubar (int x, int len, int state);
1210 void drawtriangle (int x, int y, int state); 1283 void drawtriangle (int x, int y, int state);
1211 void drawbox_menuitem (int y, int state); 1284 void drawbox_menuitem (int y, int state);
1212 void menu_show (); 1285 void menu_show ();
1213 void menu_display (void (*update) (rxvt_t *)); 1286 void menu_display (void (rxvt_term::*update) ());
1214 void menu_hide_all (); 1287 void menu_hide_all ();
1215 void menu_hide (); 1288 void menu_hide ();
1216 void menu_clear (menu_t *menu); 1289 void menu_clear (menu_t *menu);
1217 void menubar_clear (); 1290 void menubar_clear ();
1218 bar_t * menubar_find (const char *name); 1291 bar_t *menubar_find (const char *name);
1219 int menubar_push (const char *name); 1292 int menubar_push (const char *name);
1220 void menubar_remove (const char *name); 1293 void menubar_remove (const char *name);
1221 void menubar_dump (FILE *fp); 1294 void menubar_dump (FILE *fp);
1222 void menubar_read (const char *filename); 1295 void menubar_read (const char *filename);
1223 void menubar_dispatch (char *str); 1296 void menubar_dispatch (char *str);
1224 void draw_Arrows (int name, int state); 1297 void draw_Arrows (int name, int state);
1225 void menubar_expose (); 1298 void menubar_expose ();
1226 int menubar_mapping (int map); 1299 int menubar_mapping (int map);
1227 int menu_select (XButtonEvent *ev); 1300 int menu_select (XButtonEvent &ev);
1228 void menubar_select (XButtonEvent *ev); 1301 void menubar_select (XButtonEvent &ev);
1229 void menubar_control (XButtonEvent *ev); 1302 void menubar_control (XButtonEvent &ev);
1230 void map_menuBar (int map); 1303 void map_menuBar (int map);
1231#endif 1304#endif
1232 1305
1233 // screen.C 1306 // screen.C
1234 void scr_poweron (); 1307 void scr_poweron ();
1235 void scr_cursor (int mode); 1308 void scr_cursor (int mode);
1236 int scr_change_screen (int scrn); 1309 int scr_change_screen (int scrn);
1237 void scr_color (unsigned int color, int fgbg); 1310 void scr_color (unsigned int color, int fgbg);
1238 void scr_rendition (int set, int style); 1311 void scr_rendition (int set, int style);
1239 void scr_add_lines (const uint32_t *str, int nlines, int len); 1312 void scr_add_lines (const unicode_t *str, int nlines, int len);
1240 void scr_backspace (); 1313 void scr_backspace ();
1241 void scr_tab (int count); 1314 void scr_tab (int count);
1242 void scr_backindex (); 1315 void scr_backindex ();
1243 void scr_forwardindex (); 1316 void scr_forwardindex ();
1244 void scr_gotorc (int row, int col, int relative); 1317 void scr_gotorc (int row, int col, int relative);
… …
1316 int scale_pixmap (const char *geom); 1389 int scale_pixmap (const char *geom);
1317 void resize_pixmap (); 1390 void resize_pixmap ();
1318 Pixmap set_bgPixmap (const char *file); 1391 Pixmap set_bgPixmap (const char *file);
1319}; 1392};
1320 1393
1321#define SET_LOCALE(locale) rxvt_set_locale (locale)
1322extern void rxvt_set_locale (const char *locale);
1323
1324/* 1394/*
1325 ***************************************************************************** 1395 *****************************************************************************
1326 * PROTOTYPES 1396 * PROTOTYPES
1327 ***************************************************************************** 1397 *****************************************************************************
1328 */ 1398 */

Diff Legend

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