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.163 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.196 by root, Wed Jan 11 02:13:56 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
162 Time time; /* milliseconds */ 155 Time time; /* milliseconds */
163 unsigned int state; /* key or button mask */ 156 unsigned int state; /* key or button mask */
164 unsigned int button; /* detail */ 157 unsigned int button; /* detail */
165}; 158};
166 159
167#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
168#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
169#define SWAP_IT(one, two, typeof) \
170 do { \
171 typeof swapittmp; \
172 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
173 } while (/* CONSTCOND */ 0)
174#define BOUND_POSITIVE_INT16(val) \
175 (int16_t) ((val) <= 0 \
176 ? 0 \
177 : min ((val), (((uint16_t)-1)>>1)))
178
179#if ENABLE_FRILLS 160#if ENABLE_FRILLS
180typedef struct _mwmhints { 161typedef struct _mwmhints {
181 CARD32 flags; 162 CARD32 flags;
182 CARD32 functions; 163 CARD32 functions;
183 CARD32 decorations; 164 CARD32 decorations;
230 211
231#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
232# define NO_MOUSE_REPORT_SCROLLBAR 1 213# define NO_MOUSE_REPORT_SCROLLBAR 1
233#endif 214#endif
234 215
235#ifdef NO_RESOURCES 216#if defined (ISO_14755) || defined (ENABLE_PERL)
236# undef USE_XGETDEFAULT
237#endif
238
239#if ISO_14755
240# define ENABLE_OVERLAY 1 217# define ENABLE_OVERLAY 1
241#endif 218#endif
242 219
243/* now look for other badly set stuff */ 220/* now look for other badly set stuff */
244 221
259# define HAVE_SCROLLBARS 1 236# define HAVE_SCROLLBARS 1
260#endif 237#endif
261 238
262/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 239/* width of scrollBar, menuBar shadow, must be 1 or 2 */
263#ifdef HALFSHADOW 240#ifdef HALFSHADOW
264# define SHADOW 1 241# define MENU_SHADOW 1
265#else 242#else
266# define SHADOW 2 243# define MENU_SHADOW 2
267#endif 244#endif
268 245
269#define R_SB_ALIGN_CENTRE 0 246#define R_SB_ALIGN_CENTRE 0
270#define R_SB_ALIGN_TOP 1 247#define R_SB_ALIGN_TOP 1
271#define R_SB_ALIGN_BOTTOM 2 248#define R_SB_ALIGN_BOTTOM 2
363#define FONT_DN "#-" 340#define FONT_DN "#-"
364#define FONT_UP "#+" 341#define FONT_UP "#+"
365 342
366/* flags for rxvt_scr_gotorc () */ 343/* flags for rxvt_scr_gotorc () */
367enum { 344enum {
368 C_RELATIVE = 1 , /* col movement is relative */ 345 C_RELATIVE = 1, /* col movement is relative */
369 R_RELATIVE = 2, /* row movement is relative */ 346 R_RELATIVE = 2, /* row movement is relative */
370 RELATIVE = 1 | 2, 347 RELATIVE = C_RELATIVE | R_RELATIVE,
371}; 348};
372 349
373/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 350/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
374enum { 351enum {
375 INSERT = -1, /* don't change these values */ 352 INSERT = -1, /* don't change these values */
388enum { 365enum {
389 PRIMARY = 0, 366 PRIMARY = 0,
390 SECONDARY, 367 SECONDARY,
391}; 368};
392 369
393#define RS_None 0 /* Normal */ 370#define RS_None 0
394 371
395#define RS_fgMask 0x0000007fUL /* 128 colors */ 372#define RS_fgMask 0x0000007fUL // 128 colors
396#define RS_bgMask 0x00003f80UL /* 128 colors */ 373#define RS_bgMask 0x00003f80UL // 128 colors
397 374
398// font styles 375// font styles
399#define RS_Bold 0x00004000UL // value 1 376#define RS_Bold 0x00004000UL // value 1
400#define RS_Italic 0x00008000UL // value 2 377#define RS_Italic 0x00008000UL // value 2
401 378
402// fake styles 379// fake styles
403#define RS_Blink 0x00010000UL /* blink */ 380#define RS_Blink 0x00010000UL // blink
404#define RS_RVid 0x00020000UL /* reverse video */ 381#define RS_RVid 0x00020000UL // reverse video
405#define RS_Uline 0x00040000UL /* underline */ 382#define RS_Uline 0x00040000UL // underline
406 383
407// 5 bits still to go 384// 5 custom bits for extensions
385#define RS_customCount 32
386#define RS_customMask 0x00f80000UL
387#define RS_customShift 19
408 388
409// other flags 389// other flags
410#define RS_Careful 0x80000000UL /* be careful when drawing these */ 390#define RS_Careful 0x80000000UL /* be careful when drawing these */
411 391
412#define RS_styleCount 4 392#define RS_styleCount 4
487 URxvt_italicFont = 712, 467 URxvt_italicFont = 712,
488 URxvt_boldItalicFont = 713, 468 URxvt_boldItalicFont = 713,
489 469
490 URxvt_view_up = 720, 470 URxvt_view_up = 720,
491 URxvt_view_down = 721, 471 URxvt_view_down = 721,
472
473 URxvt_perl = 777,
492}; 474};
493 475
494/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
495/* 477/*
496 * The PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
573 555
574/* 556/*
575 * Resource list 557 * Resource list
576 */ 558 */
577enum { 559enum {
578 Rs_display_name = 0, 560# define def(name) Rs_ ## name,
579 Rs_term_name, 561# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
580 Rs_iconName, 562# include "rsinc.h"
581 Rs_geometry, 563# undef def
582 Rs_reverseVideo, 564# undef reserve
583 Rs_color,
584 _Rs_color = Rs_color + NRS_COLORS - 1,
585 Rs_font,
586#if ENABLE_STYLES
587 Rs_boldFont,
588 Rs_italicFont,
589 Rs_boldItalicFont,
590#endif
591 Rs_name,
592 Rs_title,
593#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
594 Rs_path,
595#endif
596#ifdef XPM_BACKGROUND
597 Rs_backgroundPixmap,
598#endif
599#if (MENUBAR_MAX)
600 Rs_menu,
601#endif
602 Rs_loginShell,
603 Rs_jumpScroll,
604#ifdef HAVE_SCROLLBARS
605 Rs_scrollBar,
606 Rs_scrollBar_right,
607 Rs_scrollBar_floating,
608 Rs_scrollBar_align,
609 Rs_scrollstyle, /* Rs_scrollBar_style */
610 Rs_scrollBar_thickness,
611#endif
612 Rs_scrollTtyOutput,
613 Rs_scrollTtyKeypress,
614 Rs_scrollWithBuffer,
615 Rs_saveLines,
616 Rs_utmpInhibit,
617 Rs_visualBell,
618#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
619 Rs_mapAlert,
620#endif
621#ifdef META8_OPTION
622 Rs_meta8,
623#endif
624#ifdef MOUSE_WHEEL
625 Rs_mouseWheelScrollPage,
626#endif
627#ifndef NO_BACKSPACE_KEY
628 Rs_backspace_key,
629#endif
630#ifndef NO_DELETE_KEY
631 Rs_delete_key,
632#endif
633 Rs_selectstyle,
634#ifdef PRINTPIPE
635 Rs_print_pipe,
636#endif
637#ifdef USE_XIM
638 Rs_preeditType,
639 Rs_inputMethod,
640#endif
641#ifdef TRANSPARENT
642 Rs_transparent,
643 Rs_transparent_all,
644#endif
645#if ENABLE_FRILLS
646 Rs_ext_bwidth,
647 Rs_int_bwidth,
648 Rs_borderLess,
649 Rs_lineSpace,
650 Rs_pty_fd,
651 Rs_cursorUnderline,
652#endif
653#if CURSOR_BLINK
654 Rs_cursorBlink,
655#endif
656#if ENABLE_XEMBED
657 Rs_embed,
658#endif
659 Rs_cutchars,
660 Rs_modifier,
661 Rs_answerbackstring,
662 Rs_tripleclickwords,
663 Rs_insecure,
664 Rs_pointerBlank,
665 Rs_pointerBlankDelay,
666 Rs_imLocale,
667 Rs_imFont,
668 Rs_pastableTabs,
669#ifndef NO_SECONDARY_SCREEN
670 Rs_secondaryScreen,
671 Rs_secondaryScroll,
672#endif
673#ifdef OFF_FOCUS_FADING
674 Rs_fade,
675#endif
676#ifdef TINTING
677 Rs_shade,
678#endif
679 NUM_RESOURCES 565 NUM_RESOURCES
680}; 566};
681 567
682// see init.C:xa_names, which must be kept in sync 568// see init.C:xa_names, which must be kept in sync
683enum { 569enum {
758#endif 644#endif
759 645
760// do not change these constants lightly, there are many interdependencies 646// do not change these constants lightly, there are many interdependencies
761#define IMBUFSIZ 128 // input modifier buffer sizes 647#define IMBUFSIZ 128 // input modifier buffer sizes
762#define KBUFSZ 512 // size of keyboard mapping buffer 648#define KBUFSZ 512 // size of keyboard mapping buffer
763#define CBUFSIZ 4096 // size of command buffer 649#define CBUFSIZ 2048 // size of command buffer
764#define UBUFSIZ 4096 // character buffer 650#define UBUFSIZ 2048 // character buffer
765 651
766#ifndef PATH_MAX 652#ifndef PATH_MAX
767# define PATH_MAX 16384 653# define PATH_MAX 16384
768#endif 654#endif
769 655
797/* 683/*
798 ***************************************************************************** 684 *****************************************************************************
799 * MACRO DEFINES 685 * MACRO DEFINES
800 ***************************************************************************** 686 *****************************************************************************
801 */ 687 */
802#define memset(x, y, z) memset((x), (y), (size_t)(z))
803#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
804#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
805#define strcasecmp(x, y) strcasecmp((x), (y))
806#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
807#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
808#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
809#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
810#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
811#define strcat(x, y) strcat((char *)(x), (const char *)(y))
812#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
813#define strdup(x) strdup((const char *)(x))
814#define strlen(x) strlen((const char *)(x))
815#define strchr(x, y) strchr((const char *)(x), (int)(y))
816#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
817
818#define dDisp Display *disp = display->display 688#define dDisp Display *disp = display->display
819 689
820/* convert pixel dimensions to row/column values. Everything as int32_t */ 690/* convert pixel dimensions to row/column values. Everything as int32_t */
821#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 691#define Pixel2Col(x) Pixel2Width((int32_t)(x))
822#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 692#define Pixel2Row(y) Pixel2Height((int32_t)(y))
825#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 695#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
826#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 696#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 697#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 698#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
829 699
830#define TermWin_TotalWidth() ((int32_t)width) 700#define TEMP_ENV temp_environ temp_environ (envv)
831#define TermWin_TotalHeight() ((int32_t)height) 701
702#define OPTION(opt) (options & (opt))
703#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
704 | Opt_jumpScroll | Opt_secondaryScreen \
705 | Opt_pastableTabs | Opt_intensityStyles)
706
707// for m >= -n, ensure remainder lies between 0..n-1
708#define MOD(m,n) (((m) + (n)) % (n))
709
710#define LINENO(n) MOD (term_start + int(n), total_rows)
711#define ROW(n) row_buf [LINENO (n)]
832 712
833/* how to build & extract colors and attributes */ 713/* how to build & extract colors and attributes */
834#define GET_BASEFG(x) (((x) & RS_fgMask)) 714#define GET_BASEFG(x) (((x) & RS_fgMask))
835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 715#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
836#ifndef NO_BRIGHTCOLOR
837# define GET_FGCOLOR(x) \
838 ((((x) & RS_Bold) == 0 \
839 || GET_BASEFG (x) < minCOLOR \
840 || GET_BASEFG (x) >= minBrightCOLOR) \
841 ? GET_BASEFG (x) \
842 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
843# define GET_BGCOLOR(x) \
844 ((((x) & RS_Blink) == 0 \
845 || GET_BASEBG (x) < minCOLOR \
846 || GET_BASEBG (x) >= minBrightCOLOR) \
847 ? GET_BASEBG (x) \
848 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
849#else
850# define GET_FGCOLOR(x) GET_BASEFG(x)
851# define GET_BGCOLOR(x) GET_BASEBG(x)
852#endif
853 716
854#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 717#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
855#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 718#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
856 719
857#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 720#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
907#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 770#define scrollbar_size() (scrollBar.end - scrollBar.beg \
908 - scrollbar_minheight ()) 771 - scrollbar_minheight ())
909 772
910#if (MENUBAR_MAX > 1) 773#if (MENUBAR_MAX > 1)
911/* rendition style flags */ 774/* rendition style flags */
912# define menuBar_height() (fheight + SHADOW) 775# define menuBar_height() (fheight + MENU_SHADOW)
913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 776# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
914# define isMenuBarWindow(w) ((w) == menuBar.win) 777# define isMenuBarWindow(w) ((w) == menuBar.win)
915#else 778#else
916# define menuBar_height() (0) 779# define menuBar_height() (0)
917# define menuBar_TotalHeight() (0) 780# define menuBar_TotalHeight() (0)
918# define isMenuBarWindow(w) (0) 781# define isMenuBarWindow(w) (0)
964#endif 827#endif
965 828
966extern class rxvt_failure_exception { } rxvt_failure_exception; 829extern class rxvt_failure_exception { } rxvt_failure_exception;
967 830
968typedef callback1<void, const char *> log_callback; 831typedef callback1<void, const char *> log_callback;
832typedef callback1<int, int> getfd_callback;
969 833
970extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 834extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
971extern void rxvt_log (const char *fmt, ...); 835extern void rxvt_log (const char *fmt, ...);
972extern void rxvt_warn (const char *fmt, ...); 836extern void rxvt_warn (const char *fmt, ...);
973extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 837extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
974extern void rxvt_exit_failure () __attribute__ ((noreturn)); 838extern void rxvt_exit_failure () __attribute__ ((noreturn));
975 839
976#define SET_LOCALE(locale) rxvt_set_locale (locale) 840#define SET_LOCALE(locale) rxvt_set_locale (locale)
977extern bool rxvt_set_locale (const char *locale); 841extern bool rxvt_set_locale (const char *locale);
842extern void rxvt_push_locale (const char *locale);
843extern void rxvt_pop_locale ();
978 844
979/*
980 ***************************************************************************** 845/****************************************************************************/
981 * VARIABLES 846
982 *****************************************************************************
983 */
984#ifdef MENUBAR 847#ifdef MENUBAR
985# include "menubar.h" 848# include "menubar.h"
986#endif 849#endif
987 850
988#define BLINK_INTERVAL 0.5 851#define BLINK_INTERVAL 0.5
995# endif 858# endif
996# endif 859# endif
997# define __attribute__(x) 860# define __attribute__(x)
998#endif 861#endif
999 862
863/****************************************************************************/
864
865#define LINE_LONGER 0x0001 // line is continued on the next row
866#define LINE_FILTERED 0x0002 // line has been filtered
867#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
868
869struct line_t {
870 text_t *t; // terminal the text
871 rend_t *r; // rendition, uses RS_ flags
872 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
873 uint32_t f; // flags
874
875 bool is_longer ()
876 {
877 return f & LINE_LONGER;
878 }
879
880 void is_longer (int set)
881 {
882 if (set)
883 f |= LINE_LONGER;
884 else
885 f &= ~LINE_LONGER;
886 }
887
888 void clear ()
889 {
890 t = 0;
891 r = 0;
892 l = 0;
893 f = 0;
894 }
895
896 void touch () // call whenever a line is changed/touched/updated
897 {
898#if ENABLE_PERL
899 f &= ~LINE_FILTERED;
900#endif
901 }
902
903 void touch (int col)
904 {
905 max_it (l, col);
906 touch ();
907 }
908};
909
910/****************************************************************************/
911
1000// primivite wrapper around mbstate_t to ensure initialisation 912// primivite wrapper around mbstate_t to ensure initialisation
1001struct mbstate { 913struct mbstate {
1002 mbstate_t mbs; 914 mbstate_t mbs;
1003 915
1004 operator mbstate_t *() { return &mbs; } 916 operator mbstate_t *() { return &mbs; }
1005 void reset () { memset (&mbs, 0, sizeof (mbs)); } 917 void reset () { memset (&mbs, 0, sizeof (mbs)); }
1006 mbstate () { reset (); } 918 mbstate () { reset (); }
1007}; 919};
1008 920
921/****************************************************************************/
922
1009#define UNICODE_MASK 0x1fffffUL 923#define UNICODE_MASK 0x1fffffUL
1010 924
1011#if UNICODE3 925#if UNICODE3
1012# define COMPOSE_LO 0x40000000UL 926# define COMPOSE_LO 0x40000000UL
1013# define COMPOSE_HI 0x400fffffUL 927# define COMPOSE_HI 0x400fffffUL
1014# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 928# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1015#else 929#else
930# if ENABLE_PERL
931# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
932# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
933# else
1016# define COMPOSE_LO 0xd800UL 934# define COMPOSE_LO 0xd800UL
1017# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 935# define COMPOSE_HI 0xf8ffUL
1018# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 936# endif
937# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1019#endif 938#endif
1020 939
1021#if ENABLE_COMBINING 940#if ENABLE_COMBINING
1022// compose chars are used to represent composite characters 941// compose chars are used to represent composite characters
1023// that are not representable in unicode, as well as characters 942// that are not representable in unicode, as well as characters
1043}; 962};
1044 963
1045extern class rxvt_composite_vec rxvt_composite; 964extern class rxvt_composite_vec rxvt_composite;
1046#endif 965#endif
1047 966
967/****************************************************************************/
1048 968
1049#ifdef KEYSYM_RESOURCE 969#ifdef KEYSYM_RESOURCE
1050 class keyboard_manager; 970 class keyboard_manager;
1051#endif 971#endif
1052 972
1053struct rxvt_term : zero_initialized, rxvt_vars { 973struct rxvt_term : zero_initialized, rxvt_vars {
1054 log_callback *log_hook; // log error messages through this hook, if != 0 974 log_callback *log_hook; // log error messages through this hook, if != 0
1055 975 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
976#if ENABLE_PERL
977 rxvt_perl_term perl;
978#endif
1056 struct mbstate mbstate; // current input multibyte state 979 struct mbstate mbstate; // current input multibyte state
1057 980
1058 unsigned char want_refresh:1, 981 unsigned char want_refresh:1,
1059#ifdef TRANSPARENT 982#ifdef TRANSPARENT
1060 want_full_refresh:1, /* awaiting full screen refresh */ 983 want_full_refresh:1, /* awaiting full screen refresh */
1210 bar_t *CurrentBar; 1133 bar_t *CurrentBar;
1211# if ! (MENUBAR_MAX > 1) 1134# if ! (MENUBAR_MAX > 1)
1212 bar_t BarList; 1135 bar_t BarList;
1213# endif /* (MENUBAR_MAX > 1) */ 1136# endif /* (MENUBAR_MAX > 1) */
1214#endif 1137#endif
1215#ifdef CURSOR_BLINK
1216 struct timeval lastcursorchange;
1217#endif
1218#ifdef POINTER_BLANK
1219 struct timeval lastmotion;
1220#endif
1221 1138
1222#if ENABLE_OVERLAY 1139#if ENABLE_OVERLAY
1223 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1140 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1224 text_t **ov_text; 1141 text_t **ov_text;
1225 rend_t **ov_rend; 1142 rend_t **ov_rend;
1240 char *env_display; /* environmental variable DISPLAY */ 1157 char *env_display; /* environmental variable DISPLAY */
1241 char *env_term; /* environmental variable TERM */ 1158 char *env_term; /* environmental variable TERM */
1242 char *env_colorfgbg; 1159 char *env_colorfgbg;
1243 char *locale; 1160 char *locale;
1244 char charsets[4]; 1161 char charsets[4];
1245 unsigned char *v_buffer; /* pointer to physical buffer */ 1162 char *v_buffer; /* pointer to physical buffer */
1246 unsigned int v_buflen; /* size of area to write */ 1163 unsigned int v_buflen; /* size of area to write */
1247 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1164 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1248 1165
1249#ifdef KEYSYM_RESOURCE 1166#ifdef KEYSYM_RESOURCE
1250 keyboard_manager *keyboard; 1167 keyboard_manager *keyboard;
1251#endif 1168#endif
1252 1169
1253 const char *rs[NUM_RESOURCES]; 1170 const char *rs[NUM_RESOURCES];
1254 /* command input buffering */ 1171 /* command input buffering */
1255 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1172 char *cmdbuf_ptr, *cmdbuf_endp;
1256 unsigned char cmdbuf_base[CBUFSIZ]; 1173 char cmdbuf_base[CBUFSIZ];
1257 1174
1258 rxvt_salloc *talloc; // text line allocator 1175 rxvt_salloc *talloc; // text line allocator
1259 rxvt_salloc *ralloc; // rend line allocator 1176 rxvt_salloc *ralloc; // rend line allocator
1260 1177
1261 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1178 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1264 // ISO 14755 entry support 1181 // ISO 14755 entry support
1265 unicode_t iso14755buf; 1182 unicode_t iso14755buf;
1266 void commit_iso14755 (); 1183 void commit_iso14755 ();
1267 int hex_keyval (XKeyEvent &ev); 1184 int hex_keyval (XKeyEvent &ev);
1268# if ISO_14755 1185# if ISO_14755
1269 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1186 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1270 void iso14755_54 (int x, int y); 1187 void iso14755_54 (int x, int y);
1271# endif 1188# endif
1272#endif 1189#endif
1273 1190
1274 // modifies first argument(!) 1191 // modifies first argument(!)
1275 void paste (unsigned char *data, unsigned int len); 1192 void paste (char *data, unsigned int len);
1276 1193
1277 void flush (); 1194 void flush ();
1278 1195
1279#if TRANSPARENT 1196#if TRANSPARENT
1280 void rootwin_cb (XEvent &xev); 1197 void rootwin_cb (XEvent &xev);
1321 void pointer_blank (); 1238 void pointer_blank ();
1322#endif 1239#endif
1323 void pointer_unblank (); 1240 void pointer_unblank ();
1324 1241
1325 void tt_printf (const char *fmt,...); 1242 void tt_printf (const char *fmt,...);
1326 void tt_write (const unsigned char *data, unsigned int len); 1243 void tt_write (const char *data, unsigned int len);
1327 void pty_write (); 1244 void pty_write ();
1328 1245
1329 void tt_winch (); 1246 void tt_winch ();
1330 1247
1331 rxvt_term (); 1248 rxvt_term ();
1332 ~rxvt_term (); 1249 ~rxvt_term ();
1250 void child_exit (); // child has exited, usually destroys
1333 void destroy (); 1251 void destroy ();
1334 void emergency_cleanup (); 1252 void emergency_cleanup ();
1335 1253
1336 bool init (int argc, const char *const *argv); 1254 bool init (int argc, const char *const *argv);
1337 bool init_vars (); 1255 bool init_vars ();
1338 1256
1339 bool pty_fill (); 1257 bool pty_fill ();
1340 1258
1341 void init_secondary (); 1259 void init_secondary ();
1342 const char **init_resources (int argc, const char *const *argv); 1260 const char **init_resources (int argc, const char *const *argv);
1261 const char *x_resource (const char *name);
1343 void init_env (); 1262 void init_env ();
1344 void set_locale (const char *locale); 1263 void set_locale (const char *locale);
1345 void init_xlocale (); 1264 void init_xlocale ();
1346 void init_command (const char *const *argv); 1265 void init_command (const char *const *argv);
1347 void run_command (const char *const *argv); 1266 void run_command (const char *const *argv);
1382 1301
1383 /* autoconvert */ 1302 /* autoconvert */
1384 1303
1385 // command.C 1304 // command.C
1386 void lookup_key (XKeyEvent &ev); 1305 void lookup_key (XKeyEvent &ev);
1387 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1306 unsigned int cmd_write (const char *str, unsigned int count);
1388 1307
1389 unicode_t next_char (); 1308 wchar_t next_char ();
1390 unicode_t cmd_getc (); 1309 wchar_t cmd_getc ();
1391 unicode_t next_octet (); 1310 uint32_t next_octet ();
1392 unicode_t cmd_get8 (); 1311 uint32_t cmd_get8 ();
1393 1312
1394 bool cmd_parse (); 1313 bool cmd_parse ();
1395 void mouse_report (XButtonEvent &ev); 1314 void mouse_report (XButtonEvent &ev);
1396 void button_press (XButtonEvent &ev); 1315 void button_press (XButtonEvent &ev);
1397 void button_release (XButtonEvent &ev); 1316 void button_release (XButtonEvent &ev);
1406 void process_nonprinting (unicode_t ch); 1325 void process_nonprinting (unicode_t ch);
1407 void process_escape_vt52 (unicode_t ch); 1326 void process_escape_vt52 (unicode_t ch);
1408 void process_escape_seq (); 1327 void process_escape_seq ();
1409 void process_csi_seq (); 1328 void process_csi_seq ();
1410 void process_window_ops (const int *args, unsigned int nargs); 1329 void process_window_ops (const int *args, unsigned int nargs);
1411 unsigned char *get_to_st (unicode_t &ends_how); 1330 char *get_to_st (unicode_t &ends_how);
1412 void process_dcs_seq (); 1331 void process_dcs_seq ();
1413 void process_osc_seq (); 1332 void process_osc_seq ();
1414 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1333 void process_color_seq (int report, int color, const char *str, char resp);
1415 void process_xterm_seq (int op, const char *str, unsigned char resp); 1334 void process_xterm_seq (int op, const char *str, char resp);
1416 int privcases (int mode, unsigned long bit); 1335 int privcases (int mode, unsigned long bit);
1417 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1336 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1418 void process_sgr_mode (unsigned int nargs, const int *arg); 1337 void process_sgr_mode (unsigned int nargs, const int *arg);
1419 void process_graphics (); 1338 void process_graphics ();
1420 // init.C 1339 // init.C
1474 { 1393 {
1475 l.t = (text_t *)talloc->alloc (); 1394 l.t = (text_t *)talloc->alloc ();
1476 l.r = (rend_t *)ralloc->alloc (); 1395 l.r = (rend_t *)ralloc->alloc ();
1477 } 1396 }
1478 1397
1398#if 0
1479 void lfree (line_t &l) 1399 void lfree (line_t &l)
1480 { 1400 {
1481 talloc->free (l.t); 1401 talloc->free (l.t);
1482 ralloc->free (l.r); 1402 ralloc->free (l.r);
1483 } 1403 }
1404#endif
1484 1405
1485 void lresize (line_t &l) 1406 void lresize (line_t &l)
1486 { 1407 {
1487 if (!l.t) 1408 if (!l.t)
1488 return; 1409 return;
1489 1410
1490 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1411 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1491 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t)); 1412 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1492 1413
1493 MIN_IT (l.l, (int16_t)ncol); 1414 l.l = min (l.l, ncol);
1494 1415
1495 if (ncol > prev_ncol) 1416 if (ncol > prev_ncol)
1496 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1417 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1497 } 1418 }
1498 1419
1420 int fgcolor_of (rend_t r)
1421 {
1422 int base = GET_BASEFG (r);
1423#ifndef NO_BRIGHTCOLOR
1424 if (r & RS_Bold
1425# if ENABLE_STYLES
1426 && OPTION (Opt_intensityStyles)
1427# endif
1428 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1429 base += minBrightCOLOR - minCOLOR;
1430#endif
1431 return base;
1432 }
1433
1434 int bgcolor_of (rend_t r)
1435 {
1436 int base = GET_BASEBG (r);
1437#ifndef NO_BRIGHTCOLOR
1438 if (r & RS_Blink
1439# if ENABLE_STYLES
1440 && OPTION (Opt_intensityStyles)
1441# endif
1442 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1443 base += minBrightCOLOR - minCOLOR;
1444#endif
1445 return base;
1446 }
1447
1448 bool option (uint32_t opt)
1449 {
1450 return OPTION (opt);
1451 }
1452
1453 void set_option (uint32_t opt, bool set)
1454 {
1455 if (set)
1456 options |= opt;
1457 else
1458 options &= ~opt;
1459 }
1460
1499 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1461 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1500 void scr_blank_screen_mem (line_t &l, rend_t efs); 1462 void scr_blank_screen_mem (line_t &l, rend_t efs);
1501 int scr_scroll_text (int row1, int row2, int count, int spec); 1463 int scr_scroll_text (int row1, int row2, int count);
1502 void scr_reset (); 1464 void scr_reset ();
1503 void scr_reset_realloc ();
1504 void scr_release (); 1465 void scr_release ();
1505 void scr_clear (bool really = false); 1466 void scr_clear (bool really = false);
1506 void scr_refresh (unsigned char refresh_type); 1467 void scr_refresh (unsigned char refresh_type);
1507 bool scr_refresh_rend (rend_t mask, rend_t value); 1468 bool scr_refresh_rend (rend_t mask, rend_t value);
1508 void scr_erase_screen (int mode); 1469 void scr_erase_screen (int mode);
1514 void scr_touch (bool refresh); 1475 void scr_touch (bool refresh);
1515 void scr_expose (int x, int y, int width, int height, bool refresh); 1476 void scr_expose (int x, int y, int width, int height, bool refresh);
1516 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1477 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1517 void scr_recolour (); 1478 void scr_recolour ();
1518 void scr_remap_chars (); 1479 void scr_remap_chars ();
1519 void scr_remap_chars (const line_t &l); 1480 void scr_remap_chars (line_t &l);
1520 1481
1521 void scr_poweron (); 1482 void scr_poweron ();
1522 void scr_cursor (int mode); 1483 void scr_cursor (int mode);
1523 void scr_do_wrap (); 1484 void scr_do_wrap ();
1524 int scr_change_screen (int scrn); 1485 int scr_change_screen (int scrn);
1525 void scr_color (unsigned int color, int fgbg); 1486 void scr_color (unsigned int color, int fgbg);
1526 void scr_rendition (int set, int style); 1487 void scr_rendition (int set, int style);
1527 void scr_add_lines (const unicode_t *str, int nlines, int len); 1488 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1528 void scr_backspace (); 1489 void scr_backspace ();
1529 void scr_tab (int count, bool ht = false); 1490 void scr_tab (int count, bool ht = false);
1530 void scr_gotorc (int row, int col, int relative); 1491 void scr_gotorc (int row, int col, int relative);
1531 void scr_index (enum page_dirn direction); 1492 void scr_index (enum page_dirn direction);
1532 void scr_erase_line (int mode); 1493 void scr_erase_line (int mode);
1547 int scr_move_to (int y, int len); 1508 int scr_move_to (int y, int len);
1548 int scr_page (enum page_dirn direction, int nlines); 1509 int scr_page (enum page_dirn direction, int nlines);
1549 int scr_changeview (unsigned int oldviewstart); 1510 int scr_changeview (unsigned int oldviewstart);
1550 void scr_bell (); 1511 void scr_bell ();
1551 void scr_printscreen (int fullhist); 1512 void scr_printscreen (int fullhist);
1513 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1514 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1552 void scr_reverse_selection (); 1515 void scr_reverse_selection ();
1553 void scr_dump (int fd); 1516 void scr_dump (int fd);
1554 void selection_check (int check_more); 1517 void selection_check (int check_more);
1555 void selection_paste (Window win, Atom prop, bool delete_prop); 1518 void selection_paste (Window win, Atom prop, bool delete_prop);
1556 void selection_property (Window win, Atom prop); 1519 void selection_property (Window win, Atom prop);
1557 void selection_request (Time tm, int x, int y); 1520 void selection_request (Time tm, int x, int y);
1558 int selection_request_other (Atom target, int selnum); 1521 int selection_request_other (Atom target, int selnum);
1559 void selection_clear (); 1522 void selection_clear ();
1560 void selection_make (Time tm); 1523 void selection_make (Time tm);
1524 bool selection_grab (Time tm);
1561 void selection_start_colrow (int col, int row); 1525 void selection_start_colrow (int col, int row);
1562 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1526 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1563 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1527 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1564 void selection_remove_trailing_spaces (); 1528 void selection_remove_trailing_spaces ();
1565 void selection_send (const XSelectionRequestEvent &rq); 1529 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines