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.173 by root, Sat Dec 31 16:40:28 2005 UTC vs.
Revision 1.199 by root, Thu Jan 12 01:30:53 2006 UTC

… …
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#include "rxvtperl.h"
23 25
24#if ENABLE_FRILLS 26#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 27# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 28# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1 29# define CURSOR_BLINK 1
… …
70 72
71#ifndef STDIN_FILENO 73#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 74# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 75# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 76# define STDERR_FILENO 2
75#endif
76
77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
79# define NO_SETOWNER_TTYDEV 1
80# endif
81#endif
82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
83# define NO_SETOWNER_TTYDEV 1
84#endif 77#endif
85 78
86/* 79/*
87 ***************************************************************************** 80 *****************************************************************************
88 * PROTOTYPES 81 * PROTOTYPES
… …
120char * rxvt_File_find (const char *file, const char *ext, const char *path); 113char * rxvt_File_find (const char *file, const char *ext, const char *path);
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 114void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 115void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
123void rxvt_usleep (int usecs); 116void rxvt_usleep (int usecs);
124 117
118/////////////////////////////////////////////////////////////////////////////
119
120// temporarily replace the process environment
121extern char **environ;
122extern char **rxvt_environ; // the original environ pointer
123
124inline void set_environ (stringvec *envv)
125{
126 if (envv)
127 environ = (char **)envv->begin ();
128}
129
130inline void set_environ (char **envv)
131{
132 if (envv)
133 environ = envv;
134}
135
125/* 136/*
126 ***************************************************************************** 137 *****************************************************************************
127 * STRUCTURES AND TYPEDEFS 138 * STRUCTURES AND TYPEDEFS
128 ***************************************************************************** 139 *****************************************************************************
129 */ 140 */
… …
218 229
219#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 230#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
220# define NO_MOUSE_REPORT_SCROLLBAR 1 231# define NO_MOUSE_REPORT_SCROLLBAR 1
221#endif 232#endif
222 233
223#ifdef NO_RESOURCES 234#if defined (ISO_14755) || defined (ENABLE_PERL)
224# undef USE_XGETDEFAULT
225#endif
226
227#if ISO_14755
228# define ENABLE_OVERLAY 1 235# define ENABLE_OVERLAY 1
229#endif 236#endif
230 237
231/* now look for other badly set stuff */ 238/* now look for other badly set stuff */
232 239
… …
247# define HAVE_SCROLLBARS 1 254# define HAVE_SCROLLBARS 1
248#endif 255#endif
249 256
250/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 257/* width of scrollBar, menuBar shadow, must be 1 or 2 */
251#ifdef HALFSHADOW 258#ifdef HALFSHADOW
252# define SHADOW 1 259# define MENU_SHADOW 1
253#else 260#else
254# define SHADOW 2 261# define MENU_SHADOW 2
255#endif 262#endif
256 263
257#define R_SB_ALIGN_CENTRE 0 264#define R_SB_ALIGN_CENTRE 0
258#define R_SB_ALIGN_TOP 1 265#define R_SB_ALIGN_TOP 1
259#define R_SB_ALIGN_BOTTOM 2 266#define R_SB_ALIGN_BOTTOM 2
… …
376enum { 383enum {
377 PRIMARY = 0, 384 PRIMARY = 0,
378 SECONDARY, 385 SECONDARY,
379}; 386};
380 387
381#define RS_None 0 /* Normal */ 388#define RS_None 0
382 389
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 390#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 391#define RS_bgMask 0x00003f80UL // 128 colors
385 392
386// font styles 393// font styles
387#define RS_Bold 0x00004000UL // value 1 394#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 395#define RS_Italic 0x00008000UL // value 2
389 396
390// fake styles 397// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 398#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 399#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 400#define RS_Uline 0x00040000UL // underline
394 401
395// 5 bits still to go 402// 5 custom bits for extensions
403#define RS_customCount 32
404#define RS_customMask 0x00f80000UL
405#define RS_customShift 19
396 406
397// other flags 407// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 408#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 409
400#define RS_styleCount 4 410#define RS_styleCount 4
… …
442 XTerm_property = 3, // change X property 452 XTerm_property = 3, // change X property
443 XTerm_Color = 4, // change colors 453 XTerm_Color = 4, // change colors
444 XTerm_Color00 = 10, // not implemented, CLASH! 454 XTerm_Color00 = 10, // not implemented, CLASH!
445 XTerm_Color01 = 11, // not implemented 455 XTerm_Color01 = 11, // not implemented
446 XTerm_Color_cursor = 12, // change actual 'Cursor' color 456 XTerm_Color_cursor = 12, // change actual 'Cursor' color
447 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 457 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
448 XTerm_Color_pointer_bg = 14, // not implemented 458 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
449 XTerm_Color05 = 15, // not implemented 459 XTerm_Color05 = 15, // not implemented (tektronix fg)
450 XTerm_Color06 = 16, // not implemented 460 XTerm_Color06 = 16, // not implemented (tektronix bg)
451 XTerm_Color_RV = 17, // change actual 'Highlight' color 461 XTerm_Color_RV = 17, // change actual 'Highlight' color
452 XTerm_logfile = 46, // not implemented 462 XTerm_logfile = 46, // not implemented
453 XTerm_font = 50, 463 XTerm_font = 50,
454 464
455 XTerm_konsole30 = 30, // reserved for konsole 465 XTerm_konsole30 = 30, // reserved for konsole
456 XTerm_konsole31 = 31, // reserved for konsole 466 XTerm_konsole31 = 31, // reserved for konsole
457 XTerm_emacs51 = 51, // reserved for emacs shell 467 XTerm_emacs51 = 51, // reserved for emacs shell
458 /* 468 /*
459 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 469 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
470 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
460 */ 471 */
461 XTerm_Color_BD = 18, // change actual 'Bold' color 472 Rxvt_Color_BD = 18, // change actual 'Bold' color
462 XTerm_Color_UL = 19, // change actual 'Underline' color 473 Rxvt_Color_UL = 19, // change actual 'Underline' color
463 XTerm_Pixmap = 20, // new bg pixmap 474 Rxvt_Pixmap = 20, // new bg pixmap
464 XTerm_restoreFG = 39, // change default fg color 475 Rxvt_restoreFG = 39, // change default fg color
465 XTerm_restoreBG = 49, // change default bg color 476 Rxvt_restoreBG = 49, // change default bg color
466 XTerm_dumpscreen = 55, // dump scrollback and all of screen 477 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
467 478
468 URxvt_locale = 701, // change locale 479 URxvt_locale = 701, // change locale
469 URxvt_Menu = 703, // set menu item 480 URxvt_Menu = 703, // set menu item
470 URxvt_Color_IT = 704, // change actual 'Italic' colour 481 URxvt_Color_IT = 704, // change actual 'Italic' colour
471 URxvt_Color_tint = 705, // change actual tint colour 482 URxvt_Color_tint = 705, // change actual tint colour
483 URxvt_Color_BD = 706,
484 URxvt_Color_UL = 707,
472 485
473 URxvt_font = 710, 486 URxvt_font = 710,
474 URxvt_boldFont = 711, 487 URxvt_boldFont = 711,
475 URxvt_italicFont = 712, 488 URxvt_italicFont = 712,
476 URxvt_boldItalicFont = 713, 489 URxvt_boldItalicFont = 713,
477 490
478 URxvt_view_up = 720, 491 URxvt_view_up = 720,
479 URxvt_view_down = 721, 492 URxvt_view_down = 721,
493
494 URxvt_perl = 777,
480}; 495};
481 496
482/* Words starting with `Color_' are colours. Others are counts */ 497/* Words starting with `Color_' are colours. Others are counts */
483/* 498/*
484 * The PixColor and rendition colour usage should probably be decoupled 499 * The PixColor and rendition colour usage should probably be decoupled
… …
561 576
562/* 577/*
563 * Resource list 578 * Resource list
564 */ 579 */
565enum { 580enum {
566 Rs_display_name = 0, 581# define def(name) Rs_ ## name,
567 Rs_term_name, 582# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
568 Rs_iconName, 583# include "rsinc.h"
569 Rs_geometry, 584# undef def
570 Rs_reverseVideo, 585# undef reserve
571 Rs_color,
572 _Rs_color = Rs_color + NRS_COLORS - 1,
573 Rs_font,
574#if ENABLE_STYLES
575 Rs_boldFont,
576 Rs_italicFont,
577 Rs_boldItalicFont,
578#endif
579 Rs_name,
580 Rs_title,
581#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
582 Rs_path,
583#endif
584#ifdef XPM_BACKGROUND
585 Rs_backgroundPixmap,
586#endif
587#if (MENUBAR_MAX)
588 Rs_menu,
589#endif
590 Rs_loginShell,
591 Rs_jumpScroll,
592#ifdef HAVE_SCROLLBARS
593 Rs_scrollBar,
594 Rs_scrollBar_right,
595 Rs_scrollBar_floating,
596 Rs_scrollBar_align,
597 Rs_scrollstyle, /* Rs_scrollBar_style */
598 Rs_scrollBar_thickness,
599#endif
600 Rs_scrollTtyOutput,
601 Rs_scrollTtyKeypress,
602 Rs_scrollWithBuffer,
603 Rs_saveLines,
604 Rs_utmpInhibit,
605 Rs_visualBell,
606#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
607 Rs_mapAlert,
608#endif
609#ifdef META8_OPTION
610 Rs_meta8,
611#endif
612#ifdef MOUSE_WHEEL
613 Rs_mouseWheelScrollPage,
614#endif
615#ifndef NO_BACKSPACE_KEY
616 Rs_backspace_key,
617#endif
618#ifndef NO_DELETE_KEY
619 Rs_delete_key,
620#endif
621 Rs_selectstyle,
622#ifdef PRINTPIPE
623 Rs_print_pipe,
624#endif
625#ifdef USE_XIM
626 Rs_preeditType,
627 Rs_inputMethod,
628#endif
629#ifdef TRANSPARENT
630 Rs_transparent,
631 Rs_transparent_all,
632#endif
633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
636 Rs_ext_bwidth,
637 Rs_int_bwidth,
638 Rs_borderLess,
639 Rs_lineSpace,
640 Rs_cursorUnderline,
641 Rs_intensityStyles,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
645#endif
646#if ENABLE_XEMBED
647 Rs_embed,
648#endif
649 Rs_cutchars,
650 Rs_modifier,
651 Rs_answerbackstring,
652 Rs_tripleclickwords,
653 Rs_insecure,
654 Rs_pointerBlank,
655 Rs_pointerBlankDelay,
656 Rs_imLocale,
657 Rs_imFont,
658 Rs_pastableTabs,
659#ifndef NO_SECONDARY_SCREEN
660 Rs_secondaryScreen,
661 Rs_secondaryScroll,
662#endif
663#ifdef OFF_FOCUS_FADING
664 Rs_fade,
665#endif
666#ifdef TINTING
667 Rs_shade,
668#endif
669 NUM_RESOURCES 586 NUM_RESOURCES
670}; 587};
671 588
672// see init.C:xa_names, which must be kept in sync 589// see init.C:xa_names, which must be kept in sync
673enum { 590enum {
… …
748#endif 665#endif
749 666
750// do not change these constants lightly, there are many interdependencies 667// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 668#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 669#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 670#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 671#define UBUFSIZ 2048 // character buffer
755 672
756#ifndef PATH_MAX 673#ifndef PATH_MAX
757# define PATH_MAX 16384 674# define PATH_MAX 16384
758#endif 675#endif
759 676
… …
787/* 704/*
788 ***************************************************************************** 705 *****************************************************************************
789 * MACRO DEFINES 706 * MACRO DEFINES
790 ***************************************************************************** 707 *****************************************************************************
791 */ 708 */
792#define memset(x, y, z) memset((x), (y), (size_t)(z))
793#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
794#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
795#define strcasecmp(x, y) strcasecmp((x), (y))
796#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
797#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
798#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
799#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
800#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
801#define strcat(x, y) strcat((char *)(x), (const char *)(y))
802#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
803#define strdup(x) strdup((const char *)(x))
804#define strlen(x) strlen((const char *)(x))
805#define strchr(x, y) strchr((const char *)(x), (int)(y))
806#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
807
808#define dDisp Display *disp = display->display 709#define dDisp Display *disp = display->display
809 710
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 716#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 717#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 720
820#define TermWin_TotalWidth() ((int32_t)this->width) 721#define OPTION(opt) (options & (opt))
821#define TermWin_TotalHeight() ((int32_t)this->height) 722#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
723 | Opt_jumpScroll | Opt_secondaryScreen \
724 | Opt_pastableTabs | Opt_intensityStyles)
822 725
823// for m >= -n, ensure remainder lies between 0..n-1 726// for m >= -n, ensure remainder lies between 0..n-1
824#define MOD(m,n) (((m) + (n)) % (n)) 727#define MOD(m,n) (((m) + (n)) % (n))
825 728
826#define LINENO(n) MOD (term_start + int(n), total_rows) 729#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
886#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 789#define scrollbar_size() (scrollBar.end - scrollBar.beg \
887 - scrollbar_minheight ()) 790 - scrollbar_minheight ())
888 791
889#if (MENUBAR_MAX > 1) 792#if (MENUBAR_MAX > 1)
890/* rendition style flags */ 793/* rendition style flags */
891# define menuBar_height() (fheight + SHADOW) 794# define menuBar_height() (fheight + MENU_SHADOW)
892# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 795# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
893# define isMenuBarWindow(w) ((w) == menuBar.win) 796# define isMenuBarWindow(w) ((w) == menuBar.win)
894#else 797#else
895# define menuBar_height() (0) 798# define menuBar_height() (0)
896# define menuBar_TotalHeight() (0) 799# define menuBar_TotalHeight() (0)
897# define isMenuBarWindow(w) (0) 800# define isMenuBarWindow(w) (0)
… …
953extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 856extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
954extern void rxvt_exit_failure () __attribute__ ((noreturn)); 857extern void rxvt_exit_failure () __attribute__ ((noreturn));
955 858
956#define SET_LOCALE(locale) rxvt_set_locale (locale) 859#define SET_LOCALE(locale) rxvt_set_locale (locale)
957extern bool rxvt_set_locale (const char *locale); 860extern bool rxvt_set_locale (const char *locale);
861extern void rxvt_push_locale (const char *locale);
862extern void rxvt_pop_locale ();
958 863
959/*
960 ***************************************************************************** 864/****************************************************************************/
961 * VARIABLES 865
962 *****************************************************************************
963 */
964#ifdef MENUBAR 866#ifdef MENUBAR
965# include "menubar.h" 867# include "menubar.h"
966#endif 868#endif
967 869
968#define BLINK_INTERVAL 0.5 870#define BLINK_INTERVAL 0.5
… …
975# endif 877# endif
976# endif 878# endif
977# define __attribute__(x) 879# define __attribute__(x)
978#endif 880#endif
979 881
882/****************************************************************************/
883
884#define LINE_LONGER 0x0001 // line is continued on the next row
885#define LINE_FILTERED 0x0002 // line has been filtered
886#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
887
888struct line_t {
889 text_t *t; // terminal the text
890 rend_t *r; // rendition, uses RS_ flags
891 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
892 uint32_t f; // flags
893
894 bool is_longer ()
895 {
896 return f & LINE_LONGER;
897 }
898
899 void is_longer (int set)
900 {
901 if (set)
902 f |= LINE_LONGER;
903 else
904 f &= ~LINE_LONGER;
905 }
906
907 void clear ()
908 {
909 t = 0;
910 r = 0;
911 l = 0;
912 f = 0;
913 }
914
915 void touch () // call whenever a line is changed/touched/updated
916 {
917#if ENABLE_PERL
918 f &= ~LINE_FILTERED;
919#endif
920 }
921
922 void touch (int col)
923 {
924 max_it (l, col);
925 touch ();
926 }
927};
928
929/****************************************************************************/
930
980// primivite wrapper around mbstate_t to ensure initialisation 931// primivite wrapper around mbstate_t to ensure initialisation
981struct mbstate { 932struct mbstate {
982 mbstate_t mbs; 933 mbstate_t mbs;
983 934
984 operator mbstate_t *() { return &mbs; } 935 operator mbstate_t *() { return &mbs; }
985 void reset () { memset (&mbs, 0, sizeof (mbs)); } 936 void reset () { memset (&mbs, 0, sizeof (mbs)); }
986 mbstate () { reset (); } 937 mbstate () { reset (); }
987}; 938};
988 939
940/****************************************************************************/
941
989#define UNICODE_MASK 0x1fffffUL 942#define UNICODE_MASK 0x1fffffUL
990 943
991#if UNICODE3 944#if UNICODE3
992# define COMPOSE_LO 0x40000000UL 945# define COMPOSE_LO 0x40000000UL
993# define COMPOSE_HI 0x400fffffUL 946# define COMPOSE_HI 0x400fffffUL
994# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 947# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
995#else 948#else
949# if ENABLE_PERL
950# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
951# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
952# else
996# define COMPOSE_LO 0xd800UL 953# define COMPOSE_LO 0xd800UL
997# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 954# define COMPOSE_HI 0xf8ffUL
998# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 955# endif
956# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
999#endif 957#endif
1000 958
1001#if ENABLE_COMBINING 959#if ENABLE_COMBINING
1002// compose chars are used to represent composite characters 960// compose chars are used to represent composite characters
1003// that are not representable in unicode, as well as characters 961// that are not representable in unicode, as well as characters
… …
1023}; 981};
1024 982
1025extern class rxvt_composite_vec rxvt_composite; 983extern class rxvt_composite_vec rxvt_composite;
1026#endif 984#endif
1027 985
986/****************************************************************************/
1028 987
1029#ifdef KEYSYM_RESOURCE 988#ifdef KEYSYM_RESOURCE
1030 class keyboard_manager; 989 class keyboard_manager;
1031#endif 990#endif
1032 991
1033struct rxvt_term : zero_initialized, rxvt_vars { 992struct rxvt_term : zero_initialized, rxvt_vars {
1034 log_callback *log_hook; // log error messages through this hook, if != 0 993 log_callback *log_hook; // log error messages through this hook, if != 0
1035 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 994 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1036 995#if ENABLE_PERL
996 rxvt_perl_term perl;
997#endif
1037 struct mbstate mbstate; // current input multibyte state 998 struct mbstate mbstate; // current input multibyte state
1038 999
1039 unsigned char want_refresh:1, 1000 unsigned char want_refresh:1,
1040#ifdef TRANSPARENT 1001#ifdef TRANSPARENT
1041 want_full_refresh:1, /* awaiting full screen refresh */ 1002 want_full_refresh:1, /* awaiting full screen refresh */
… …
1191 bar_t *CurrentBar; 1152 bar_t *CurrentBar;
1192# if ! (MENUBAR_MAX > 1) 1153# if ! (MENUBAR_MAX > 1)
1193 bar_t BarList; 1154 bar_t BarList;
1194# endif /* (MENUBAR_MAX > 1) */ 1155# endif /* (MENUBAR_MAX > 1) */
1195#endif 1156#endif
1196#ifdef CURSOR_BLINK
1197 struct timeval lastcursorchange;
1198#endif
1199#ifdef POINTER_BLANK
1200 struct timeval lastmotion;
1201#endif
1202 1157
1203#if ENABLE_OVERLAY 1158#if ENABLE_OVERLAY
1204 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1159 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1205 text_t **ov_text; 1160 text_t **ov_text;
1206 rend_t **ov_rend; 1161 rend_t **ov_rend;
… …
1221 char *env_display; /* environmental variable DISPLAY */ 1176 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */ 1177 char *env_term; /* environmental variable TERM */
1223 char *env_colorfgbg; 1178 char *env_colorfgbg;
1224 char *locale; 1179 char *locale;
1225 char charsets[4]; 1180 char charsets[4];
1226 unsigned char *v_buffer; /* pointer to physical buffer */ 1181 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1182 unsigned int v_buflen; /* size of area to write */
1228 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1183 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1229 1184
1230#ifdef KEYSYM_RESOURCE 1185#ifdef KEYSYM_RESOURCE
1231 keyboard_manager *keyboard; 1186 keyboard_manager *keyboard;
1232#endif 1187#endif
1233 1188
1234 const char *rs[NUM_RESOURCES]; 1189 const char *rs[NUM_RESOURCES];
1235 /* command input buffering */ 1190 /* command input buffering */
1236 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1191 char *cmdbuf_ptr, *cmdbuf_endp;
1237 unsigned char cmdbuf_base[CBUFSIZ]; 1192 char cmdbuf_base[CBUFSIZ];
1238 1193
1239 rxvt_salloc *talloc; // text line allocator 1194 rxvt_salloc *talloc; // text line allocator
1240 rxvt_salloc *ralloc; // rend line allocator 1195 rxvt_salloc *ralloc; // rend line allocator
1241 1196
1242 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1197 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1251 void iso14755_54 (int x, int y); 1206 void iso14755_54 (int x, int y);
1252# endif 1207# endif
1253#endif 1208#endif
1254 1209
1255 // modifies first argument(!) 1210 // modifies first argument(!)
1256 void paste (unsigned char *data, unsigned int len); 1211 void paste (char *data, unsigned int len);
1257 1212
1258 void flush (); 1213 void flush ();
1259 1214
1260#if TRANSPARENT 1215#if TRANSPARENT
1261 void rootwin_cb (XEvent &xev); 1216 void rootwin_cb (XEvent &xev);
… …
1302 void pointer_blank (); 1257 void pointer_blank ();
1303#endif 1258#endif
1304 void pointer_unblank (); 1259 void pointer_unblank ();
1305 1260
1306 void tt_printf (const char *fmt,...); 1261 void tt_printf (const char *fmt,...);
1307 void tt_write (const unsigned char *data, unsigned int len); 1262 void tt_write (const char *data, unsigned int len);
1308 void pty_write (); 1263 void pty_write ();
1309 1264
1310 void tt_winch (); 1265 void tt_winch ();
1311 1266
1312 rxvt_term (); 1267 rxvt_term ();
… …
1320 1275
1321 bool pty_fill (); 1276 bool pty_fill ();
1322 1277
1323 void init_secondary (); 1278 void init_secondary ();
1324 const char **init_resources (int argc, const char *const *argv); 1279 const char **init_resources (int argc, const char *const *argv);
1280 const char *x_resource (const char *name);
1325 void init_env (); 1281 void init_env ();
1326 void set_locale (const char *locale); 1282 void set_locale (const char *locale);
1327 void init_xlocale (); 1283 void init_xlocale ();
1328 void init_command (const char *const *argv); 1284 void init_command (const char *const *argv);
1329 void run_command (const char *const *argv); 1285 void run_command (const char *const *argv);
… …
1364 1320
1365 /* autoconvert */ 1321 /* autoconvert */
1366 1322
1367 // command.C 1323 // command.C
1368 void lookup_key (XKeyEvent &ev); 1324 void lookup_key (XKeyEvent &ev);
1369 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1325 unsigned int cmd_write (const char *str, unsigned int count);
1370 1326
1371 unicode_t next_char (); 1327 wchar_t next_char ();
1372 unicode_t cmd_getc (); 1328 wchar_t cmd_getc ();
1373 unicode_t next_octet (); 1329 uint32_t next_octet ();
1374 unicode_t cmd_get8 (); 1330 uint32_t cmd_get8 ();
1375 1331
1376 bool cmd_parse (); 1332 bool cmd_parse ();
1377 void mouse_report (XButtonEvent &ev); 1333 void mouse_report (XButtonEvent &ev);
1378 void button_press (XButtonEvent &ev); 1334 void button_press (XButtonEvent &ev);
1379 void button_release (XButtonEvent &ev); 1335 void button_release (XButtonEvent &ev);
… …
1388 void process_nonprinting (unicode_t ch); 1344 void process_nonprinting (unicode_t ch);
1389 void process_escape_vt52 (unicode_t ch); 1345 void process_escape_vt52 (unicode_t ch);
1390 void process_escape_seq (); 1346 void process_escape_seq ();
1391 void process_csi_seq (); 1347 void process_csi_seq ();
1392 void process_window_ops (const int *args, unsigned int nargs); 1348 void process_window_ops (const int *args, unsigned int nargs);
1393 unsigned char *get_to_st (unicode_t &ends_how); 1349 char *get_to_st (unicode_t &ends_how);
1394 void process_dcs_seq (); 1350 void process_dcs_seq ();
1395 void process_osc_seq (); 1351 void process_osc_seq ();
1396 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1352 void process_color_seq (int report, int color, const char *str, char resp);
1397 void process_xterm_seq (int op, const char *str, unsigned char resp); 1353 void process_xterm_seq (int op, const char *str, char resp);
1398 int privcases (int mode, unsigned long bit); 1354 int privcases (int mode, unsigned long bit);
1399 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1355 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1400 void process_sgr_mode (unsigned int nargs, const int *arg); 1356 void process_sgr_mode (unsigned int nargs, const int *arg);
1401 void process_graphics (); 1357 void process_graphics ();
1402 // init.C 1358 // init.C
… …
1483 int fgcolor_of (rend_t r) 1439 int fgcolor_of (rend_t r)
1484 { 1440 {
1485 int base = GET_BASEFG (r); 1441 int base = GET_BASEFG (r);
1486#ifndef NO_BRIGHTCOLOR 1442#ifndef NO_BRIGHTCOLOR
1487 if (r & RS_Bold 1443 if (r & RS_Bold
1488 && (!ENABLE_STYLES || options & Opt_intensityStyles) 1444# if ENABLE_STYLES
1445 && OPTION (Opt_intensityStyles)
1446# endif
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1447 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR; 1448 base += minBrightCOLOR - minCOLOR;
1491#endif 1449#endif
1492 return base; 1450 return base;
1493 } 1451 }
… …
1495 int bgcolor_of (rend_t r) 1453 int bgcolor_of (rend_t r)
1496 { 1454 {
1497 int base = GET_BASEBG (r); 1455 int base = GET_BASEBG (r);
1498#ifndef NO_BRIGHTCOLOR 1456#ifndef NO_BRIGHTCOLOR
1499 if (r & RS_Blink 1457 if (r & RS_Blink
1500 && (!ENABLE_STYLES || options & Opt_intensityStyles) 1458# if ENABLE_STYLES
1459 && OPTION (Opt_intensityStyles)
1460# endif
1501 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1461 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1502 base += minBrightCOLOR - minCOLOR; 1462 base += minBrightCOLOR - minCOLOR;
1503#endif 1463#endif
1504 return base; 1464 return base;
1465 }
1466
1467 bool option (uint32_t opt)
1468 {
1469 return OPTION (opt);
1470 }
1471
1472 void set_option (uint32_t opt, bool set)
1473 {
1474 if (set)
1475 options |= opt;
1476 else
1477 options &= ~opt;
1505 } 1478 }
1506 1479
1507 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1480 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1508 void scr_blank_screen_mem (line_t &l, rend_t efs); 1481 void scr_blank_screen_mem (line_t &l, rend_t efs);
1509 int scr_scroll_text (int row1, int row2, int count); 1482 int scr_scroll_text (int row1, int row2, int count);
… …
1521 void scr_touch (bool refresh); 1494 void scr_touch (bool refresh);
1522 void scr_expose (int x, int y, int width, int height, bool refresh); 1495 void scr_expose (int x, int y, int width, int height, bool refresh);
1523 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1496 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1524 void scr_recolour (); 1497 void scr_recolour ();
1525 void scr_remap_chars (); 1498 void scr_remap_chars ();
1526 void scr_remap_chars (const line_t &l); 1499 void scr_remap_chars (line_t &l);
1527 1500
1528 void scr_poweron (); 1501 void scr_poweron ();
1529 void scr_cursor (int mode); 1502 void scr_cursor (int mode);
1530 void scr_do_wrap (); 1503 void scr_do_wrap ();
1531 int scr_change_screen (int scrn); 1504 int scr_change_screen (int scrn);
1532 void scr_color (unsigned int color, int fgbg); 1505 void scr_color (unsigned int color, int fgbg);
1533 void scr_rendition (int set, int style); 1506 void scr_rendition (int set, int style);
1534 void scr_add_lines (const unicode_t *str, int nlines, int len); 1507 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1535 void scr_backspace (); 1508 void scr_backspace ();
1536 void scr_tab (int count, bool ht = false); 1509 void scr_tab (int count, bool ht = false);
1537 void scr_gotorc (int row, int col, int relative); 1510 void scr_gotorc (int row, int col, int relative);
1538 void scr_index (enum page_dirn direction); 1511 void scr_index (enum page_dirn direction);
1539 void scr_erase_line (int mode); 1512 void scr_erase_line (int mode);
… …
1554 int scr_move_to (int y, int len); 1527 int scr_move_to (int y, int len);
1555 int scr_page (enum page_dirn direction, int nlines); 1528 int scr_page (enum page_dirn direction, int nlines);
1556 int scr_changeview (unsigned int oldviewstart); 1529 int scr_changeview (unsigned int oldviewstart);
1557 void scr_bell (); 1530 void scr_bell ();
1558 void scr_printscreen (int fullhist); 1531 void scr_printscreen (int fullhist);
1532 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1533 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1559 void scr_reverse_selection (); 1534 void scr_reverse_selection ();
1560 void scr_dump (int fd); 1535 void scr_dump (int fd);
1561 void selection_check (int check_more); 1536 void selection_check (int check_more);
1562 void selection_paste (Window win, Atom prop, bool delete_prop); 1537 void selection_paste (Window win, Atom prop, bool delete_prop);
1563 void selection_property (Window win, Atom prop); 1538 void selection_property (Window win, Atom prop);
1564 void selection_request (Time tm, int x, int y); 1539 void selection_request (Time tm, int x, int y);
1565 int selection_request_other (Atom target, int selnum); 1540 int selection_request_other (Atom target, int selnum);
1566 void selection_clear (); 1541 void selection_clear ();
1567 void selection_make (Time tm); 1542 void selection_make (Time tm);
1543 bool selection_grab (Time tm);
1568 void selection_start_colrow (int col, int row); 1544 void selection_start_colrow (int col, int row);
1569 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1545 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1570 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1546 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1571 void selection_remove_trailing_spaces (); 1547 void selection_remove_trailing_spaces ();
1572 void selection_send (const XSelectionRequestEvent &rq); 1548 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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