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.170 by root, Fri Dec 23 14:46:35 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
… …
218 211
219#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
220# define NO_MOUSE_REPORT_SCROLLBAR 1 213# define NO_MOUSE_REPORT_SCROLLBAR 1
221#endif 214#endif
222 215
223#ifdef NO_RESOURCES 216#if defined (ISO_14755) || defined (ENABLE_PERL)
224# undef USE_XGETDEFAULT
225#endif
226
227#if ISO_14755
228# define ENABLE_OVERLAY 1 217# define ENABLE_OVERLAY 1
229#endif 218#endif
230 219
231/* now look for other badly set stuff */ 220/* now look for other badly set stuff */
232 221
… …
247# define HAVE_SCROLLBARS 1 236# define HAVE_SCROLLBARS 1
248#endif 237#endif
249 238
250/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 239/* width of scrollBar, menuBar shadow, must be 1 or 2 */
251#ifdef HALFSHADOW 240#ifdef HALFSHADOW
252# define SHADOW 1 241# define MENU_SHADOW 1
253#else 242#else
254# define SHADOW 2 243# define MENU_SHADOW 2
255#endif 244#endif
256 245
257#define R_SB_ALIGN_CENTRE 0 246#define R_SB_ALIGN_CENTRE 0
258#define R_SB_ALIGN_TOP 1 247#define R_SB_ALIGN_TOP 1
259#define R_SB_ALIGN_BOTTOM 2 248#define R_SB_ALIGN_BOTTOM 2
… …
376enum { 365enum {
377 PRIMARY = 0, 366 PRIMARY = 0,
378 SECONDARY, 367 SECONDARY,
379}; 368};
380 369
381#define RS_None 0 /* Normal */ 370#define RS_None 0
382 371
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 372#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 373#define RS_bgMask 0x00003f80UL // 128 colors
385 374
386// font styles 375// font styles
387#define RS_Bold 0x00004000UL // value 1 376#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 377#define RS_Italic 0x00008000UL // value 2
389 378
390// fake styles 379// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 380#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 381#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 382#define RS_Uline 0x00040000UL // underline
394 383
395// 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
396 388
397// other flags 389// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 390#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 391
400#define RS_styleCount 4 392#define RS_styleCount 4
… …
475 URxvt_italicFont = 712, 467 URxvt_italicFont = 712,
476 URxvt_boldItalicFont = 713, 468 URxvt_boldItalicFont = 713,
477 469
478 URxvt_view_up = 720, 470 URxvt_view_up = 720,
479 URxvt_view_down = 721, 471 URxvt_view_down = 721,
472
473 URxvt_perl = 777,
480}; 474};
481 475
482/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
483/* 477/*
484 * The PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
… …
561 555
562/* 556/*
563 * Resource list 557 * Resource list
564 */ 558 */
565enum { 559enum {
566 Rs_display_name = 0, 560# define def(name) Rs_ ## name,
567 Rs_term_name, 561# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
568 Rs_iconName, 562# include "rsinc.h"
569 Rs_geometry, 563# undef def
570 Rs_reverseVideo, 564# 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#endif
642#if CURSOR_BLINK
643 Rs_cursorBlink,
644#endif
645#if ENABLE_XEMBED
646 Rs_embed,
647#endif
648 Rs_cutchars,
649 Rs_modifier,
650 Rs_answerbackstring,
651 Rs_tripleclickwords,
652 Rs_insecure,
653 Rs_pointerBlank,
654 Rs_pointerBlankDelay,
655 Rs_imLocale,
656 Rs_imFont,
657 Rs_pastableTabs,
658#ifndef NO_SECONDARY_SCREEN
659 Rs_secondaryScreen,
660 Rs_secondaryScroll,
661#endif
662#ifdef OFF_FOCUS_FADING
663 Rs_fade,
664#endif
665#ifdef TINTING
666 Rs_shade,
667#endif
668 NUM_RESOURCES 565 NUM_RESOURCES
669}; 566};
670 567
671// see init.C:xa_names, which must be kept in sync 568// see init.C:xa_names, which must be kept in sync
672enum { 569enum {
… …
747#endif 644#endif
748 645
749// do not change these constants lightly, there are many interdependencies 646// do not change these constants lightly, there are many interdependencies
750#define IMBUFSIZ 128 // input modifier buffer sizes 647#define IMBUFSIZ 128 // input modifier buffer sizes
751#define KBUFSZ 512 // size of keyboard mapping buffer 648#define KBUFSZ 512 // size of keyboard mapping buffer
752#define CBUFSIZ 4096 // size of command buffer 649#define CBUFSIZ 2048 // size of command buffer
753#define UBUFSIZ 4096 // character buffer 650#define UBUFSIZ 2048 // character buffer
754 651
755#ifndef PATH_MAX 652#ifndef PATH_MAX
756# define PATH_MAX 16384 653# define PATH_MAX 16384
757#endif 654#endif
758 655
… …
786/* 683/*
787 ***************************************************************************** 684 *****************************************************************************
788 * MACRO DEFINES 685 * MACRO DEFINES
789 ***************************************************************************** 686 *****************************************************************************
790 */ 687 */
791#define memset(x, y, z) memset((x), (y), (size_t)(z))
792#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
793#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
794#define strcasecmp(x, y) strcasecmp((x), (y))
795#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
796#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
797#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
798#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
799#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
800#define strcat(x, y) strcat((char *)(x), (const char *)(y))
801#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
802#define strdup(x) strdup((const char *)(x))
803#define strlen(x) strlen((const char *)(x))
804#define strchr(x, y) strchr((const char *)(x), (int)(y))
805#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
806
807#define dDisp Display *disp = display->display 688#define dDisp Display *disp = display->display
808 689
809/* convert pixel dimensions to row/column values. Everything as int32_t */ 690/* convert pixel dimensions to row/column values. Everything as int32_t */
810#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 691#define Pixel2Col(x) Pixel2Width((int32_t)(x))
811#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 692#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
814#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 695#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
815#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 696#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
816#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 697#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
817#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 698#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
818 699
819#define TermWin_TotalWidth() ((int32_t)this->width) 700#define TEMP_ENV temp_environ temp_environ (envv)
820#define TermWin_TotalHeight() ((int32_t)this->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)
821 706
822// for m >= -n, ensure remainder lies between 0..n-1 707// for m >= -n, ensure remainder lies between 0..n-1
823#define MOD(m,n) (((m) + (n)) % (n)) 708#define MOD(m,n) (((m) + (n)) % (n))
824 709
825#define LINENO(n) MOD (term_start + int(n), total_rows) 710#define LINENO(n) MOD (term_start + int(n), total_rows)
826#define ROW(n) row_buf [LINENO (n)] 711#define ROW(n) row_buf [LINENO (n)]
827 712
828/* how to build & extract colors and attributes */ 713/* how to build & extract colors and attributes */
829#define GET_BASEFG(x) (((x) & RS_fgMask)) 714#define GET_BASEFG(x) (((x) & RS_fgMask))
830#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 715#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
831#ifndef NO_BRIGHTCOLOR
832# define GET_FGCOLOR(x) \
833 ((((x) & RS_Bold) == 0 \
834 || GET_BASEFG (x) < minCOLOR \
835 || GET_BASEFG (x) >= minBrightCOLOR) \
836 ? GET_BASEFG (x) \
837 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
838# define GET_BGCOLOR(x) \
839 ((((x) & RS_Blink) == 0 \
840 || GET_BASEBG (x) < minCOLOR \
841 || GET_BASEBG (x) >= minBrightCOLOR) \
842 ? GET_BASEBG (x) \
843 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
844#else
845# define GET_FGCOLOR(x) GET_BASEFG(x)
846# define GET_BGCOLOR(x) GET_BASEBG(x)
847#endif
848 716
849#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 717#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
850#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 718#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
851 719
852#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 720#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
902#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 770#define scrollbar_size() (scrollBar.end - scrollBar.beg \
903 - scrollbar_minheight ()) 771 - scrollbar_minheight ())
904 772
905#if (MENUBAR_MAX > 1) 773#if (MENUBAR_MAX > 1)
906/* rendition style flags */ 774/* rendition style flags */
907# define menuBar_height() (fheight + SHADOW) 775# define menuBar_height() (fheight + MENU_SHADOW)
908# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 776# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
909# define isMenuBarWindow(w) ((w) == menuBar.win) 777# define isMenuBarWindow(w) ((w) == menuBar.win)
910#else 778#else
911# define menuBar_height() (0) 779# define menuBar_height() (0)
912# define menuBar_TotalHeight() (0) 780# define menuBar_TotalHeight() (0)
913# define isMenuBarWindow(w) (0) 781# define isMenuBarWindow(w) (0)
… …
969extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 837extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
970extern void rxvt_exit_failure () __attribute__ ((noreturn)); 838extern void rxvt_exit_failure () __attribute__ ((noreturn));
971 839
972#define SET_LOCALE(locale) rxvt_set_locale (locale) 840#define SET_LOCALE(locale) rxvt_set_locale (locale)
973extern 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 ();
974 844
975/*
976 ***************************************************************************** 845/****************************************************************************/
977 * VARIABLES 846
978 *****************************************************************************
979 */
980#ifdef MENUBAR 847#ifdef MENUBAR
981# include "menubar.h" 848# include "menubar.h"
982#endif 849#endif
983 850
984#define BLINK_INTERVAL 0.5 851#define BLINK_INTERVAL 0.5
… …
991# endif 858# endif
992# endif 859# endif
993# define __attribute__(x) 860# define __attribute__(x)
994#endif 861#endif
995 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
996// primivite wrapper around mbstate_t to ensure initialisation 912// primivite wrapper around mbstate_t to ensure initialisation
997struct mbstate { 913struct mbstate {
998 mbstate_t mbs; 914 mbstate_t mbs;
999 915
1000 operator mbstate_t *() { return &mbs; } 916 operator mbstate_t *() { return &mbs; }
1001 void reset () { memset (&mbs, 0, sizeof (mbs)); } 917 void reset () { memset (&mbs, 0, sizeof (mbs)); }
1002 mbstate () { reset (); } 918 mbstate () { reset (); }
1003}; 919};
1004 920
921/****************************************************************************/
922
1005#define UNICODE_MASK 0x1fffffUL 923#define UNICODE_MASK 0x1fffffUL
1006 924
1007#if UNICODE3 925#if UNICODE3
1008# define COMPOSE_LO 0x40000000UL 926# define COMPOSE_LO 0x40000000UL
1009# define COMPOSE_HI 0x400fffffUL 927# define COMPOSE_HI 0x400fffffUL
1010# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 928# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1011#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
1012# define COMPOSE_LO 0xd800UL 934# define COMPOSE_LO 0xd800UL
1013# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 935# define COMPOSE_HI 0xf8ffUL
1014# 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)
1015#endif 938#endif
1016 939
1017#if ENABLE_COMBINING 940#if ENABLE_COMBINING
1018// compose chars are used to represent composite characters 941// compose chars are used to represent composite characters
1019// that are not representable in unicode, as well as characters 942// that are not representable in unicode, as well as characters
… …
1039}; 962};
1040 963
1041extern class rxvt_composite_vec rxvt_composite; 964extern class rxvt_composite_vec rxvt_composite;
1042#endif 965#endif
1043 966
967/****************************************************************************/
1044 968
1045#ifdef KEYSYM_RESOURCE 969#ifdef KEYSYM_RESOURCE
1046 class keyboard_manager; 970 class keyboard_manager;
1047#endif 971#endif
1048 972
1049struct rxvt_term : zero_initialized, rxvt_vars { 973struct rxvt_term : zero_initialized, rxvt_vars {
1050 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
1051 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 975 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1052 976#if ENABLE_PERL
977 rxvt_perl_term perl;
978#endif
1053 struct mbstate mbstate; // current input multibyte state 979 struct mbstate mbstate; // current input multibyte state
1054 980
1055 unsigned char want_refresh:1, 981 unsigned char want_refresh:1,
1056#ifdef TRANSPARENT 982#ifdef TRANSPARENT
1057 want_full_refresh:1, /* awaiting full screen refresh */ 983 want_full_refresh:1, /* awaiting full screen refresh */
… …
1207 bar_t *CurrentBar; 1133 bar_t *CurrentBar;
1208# if ! (MENUBAR_MAX > 1) 1134# if ! (MENUBAR_MAX > 1)
1209 bar_t BarList; 1135 bar_t BarList;
1210# endif /* (MENUBAR_MAX > 1) */ 1136# endif /* (MENUBAR_MAX > 1) */
1211#endif 1137#endif
1212#ifdef CURSOR_BLINK
1213 struct timeval lastcursorchange;
1214#endif
1215#ifdef POINTER_BLANK
1216 struct timeval lastmotion;
1217#endif
1218 1138
1219#if ENABLE_OVERLAY 1139#if ENABLE_OVERLAY
1220 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1140 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1221 text_t **ov_text; 1141 text_t **ov_text;
1222 rend_t **ov_rend; 1142 rend_t **ov_rend;
… …
1237 char *env_display; /* environmental variable DISPLAY */ 1157 char *env_display; /* environmental variable DISPLAY */
1238 char *env_term; /* environmental variable TERM */ 1158 char *env_term; /* environmental variable TERM */
1239 char *env_colorfgbg; 1159 char *env_colorfgbg;
1240 char *locale; 1160 char *locale;
1241 char charsets[4]; 1161 char charsets[4];
1242 unsigned char *v_buffer; /* pointer to physical buffer */ 1162 char *v_buffer; /* pointer to physical buffer */
1243 unsigned int v_buflen; /* size of area to write */ 1163 unsigned int v_buflen; /* size of area to write */
1244 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1164 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1245 1165
1246#ifdef KEYSYM_RESOURCE 1166#ifdef KEYSYM_RESOURCE
1247 keyboard_manager *keyboard; 1167 keyboard_manager *keyboard;
1248#endif 1168#endif
1249 1169
1250 const char *rs[NUM_RESOURCES]; 1170 const char *rs[NUM_RESOURCES];
1251 /* command input buffering */ 1171 /* command input buffering */
1252 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1172 char *cmdbuf_ptr, *cmdbuf_endp;
1253 unsigned char cmdbuf_base[CBUFSIZ]; 1173 char cmdbuf_base[CBUFSIZ];
1254 1174
1255 rxvt_salloc *talloc; // text line allocator 1175 rxvt_salloc *talloc; // text line allocator
1256 rxvt_salloc *ralloc; // rend line allocator 1176 rxvt_salloc *ralloc; // rend line allocator
1257 1177
1258 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
… …
1261 // ISO 14755 entry support 1181 // ISO 14755 entry support
1262 unicode_t iso14755buf; 1182 unicode_t iso14755buf;
1263 void commit_iso14755 (); 1183 void commit_iso14755 ();
1264 int hex_keyval (XKeyEvent &ev); 1184 int hex_keyval (XKeyEvent &ev);
1265# if ISO_14755 1185# if ISO_14755
1266 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);
1267 void iso14755_54 (int x, int y); 1187 void iso14755_54 (int x, int y);
1268# endif 1188# endif
1269#endif 1189#endif
1270 1190
1271 // modifies first argument(!) 1191 // modifies first argument(!)
1272 void paste (unsigned char *data, unsigned int len); 1192 void paste (char *data, unsigned int len);
1273 1193
1274 void flush (); 1194 void flush ();
1275 1195
1276#if TRANSPARENT 1196#if TRANSPARENT
1277 void rootwin_cb (XEvent &xev); 1197 void rootwin_cb (XEvent &xev);
… …
1318 void pointer_blank (); 1238 void pointer_blank ();
1319#endif 1239#endif
1320 void pointer_unblank (); 1240 void pointer_unblank ();
1321 1241
1322 void tt_printf (const char *fmt,...); 1242 void tt_printf (const char *fmt,...);
1323 void tt_write (const unsigned char *data, unsigned int len); 1243 void tt_write (const char *data, unsigned int len);
1324 void pty_write (); 1244 void pty_write ();
1325 1245
1326 void tt_winch (); 1246 void tt_winch ();
1327 1247
1328 rxvt_term (); 1248 rxvt_term ();
… …
1336 1256
1337 bool pty_fill (); 1257 bool pty_fill ();
1338 1258
1339 void init_secondary (); 1259 void init_secondary ();
1340 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);
1341 void init_env (); 1262 void init_env ();
1342 void set_locale (const char *locale); 1263 void set_locale (const char *locale);
1343 void init_xlocale (); 1264 void init_xlocale ();
1344 void init_command (const char *const *argv); 1265 void init_command (const char *const *argv);
1345 void run_command (const char *const *argv); 1266 void run_command (const char *const *argv);
… …
1380 1301
1381 /* autoconvert */ 1302 /* autoconvert */
1382 1303
1383 // command.C 1304 // command.C
1384 void lookup_key (XKeyEvent &ev); 1305 void lookup_key (XKeyEvent &ev);
1385 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1306 unsigned int cmd_write (const char *str, unsigned int count);
1386 1307
1387 unicode_t next_char (); 1308 wchar_t next_char ();
1388 unicode_t cmd_getc (); 1309 wchar_t cmd_getc ();
1389 unicode_t next_octet (); 1310 uint32_t next_octet ();
1390 unicode_t cmd_get8 (); 1311 uint32_t cmd_get8 ();
1391 1312
1392 bool cmd_parse (); 1313 bool cmd_parse ();
1393 void mouse_report (XButtonEvent &ev); 1314 void mouse_report (XButtonEvent &ev);
1394 void button_press (XButtonEvent &ev); 1315 void button_press (XButtonEvent &ev);
1395 void button_release (XButtonEvent &ev); 1316 void button_release (XButtonEvent &ev);
… …
1404 void process_nonprinting (unicode_t ch); 1325 void process_nonprinting (unicode_t ch);
1405 void process_escape_vt52 (unicode_t ch); 1326 void process_escape_vt52 (unicode_t ch);
1406 void process_escape_seq (); 1327 void process_escape_seq ();
1407 void process_csi_seq (); 1328 void process_csi_seq ();
1408 void process_window_ops (const int *args, unsigned int nargs); 1329 void process_window_ops (const int *args, unsigned int nargs);
1409 unsigned char *get_to_st (unicode_t &ends_how); 1330 char *get_to_st (unicode_t &ends_how);
1410 void process_dcs_seq (); 1331 void process_dcs_seq ();
1411 void process_osc_seq (); 1332 void process_osc_seq ();
1412 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);
1413 void process_xterm_seq (int op, const char *str, unsigned char resp); 1334 void process_xterm_seq (int op, const char *str, char resp);
1414 int privcases (int mode, unsigned long bit); 1335 int privcases (int mode, unsigned long bit);
1415 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);
1416 void process_sgr_mode (unsigned int nargs, const int *arg); 1337 void process_sgr_mode (unsigned int nargs, const int *arg);
1417 void process_graphics (); 1338 void process_graphics ();
1418 // init.C 1339 // init.C
… …
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); 1463 int scr_scroll_text (int row1, int row2, int count);
1502 void scr_reset (); 1464 void scr_reset ();
1503 void scr_release (); 1465 void scr_release ();
… …
1513 void scr_touch (bool refresh); 1475 void scr_touch (bool refresh);
1514 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);
1515 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1477 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1516 void scr_recolour (); 1478 void scr_recolour ();
1517 void scr_remap_chars (); 1479 void scr_remap_chars ();
1518 void scr_remap_chars (const line_t &l); 1480 void scr_remap_chars (line_t &l);
1519 1481
1520 void scr_poweron (); 1482 void scr_poweron ();
1521 void scr_cursor (int mode); 1483 void scr_cursor (int mode);
1522 void scr_do_wrap (); 1484 void scr_do_wrap ();
1523 int scr_change_screen (int scrn); 1485 int scr_change_screen (int scrn);
1524 void scr_color (unsigned int color, int fgbg); 1486 void scr_color (unsigned int color, int fgbg);
1525 void scr_rendition (int set, int style); 1487 void scr_rendition (int set, int style);
1526 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);
1527 void scr_backspace (); 1489 void scr_backspace ();
1528 void scr_tab (int count, bool ht = false); 1490 void scr_tab (int count, bool ht = false);
1529 void scr_gotorc (int row, int col, int relative); 1491 void scr_gotorc (int row, int col, int relative);
1530 void scr_index (enum page_dirn direction); 1492 void scr_index (enum page_dirn direction);
1531 void scr_erase_line (int mode); 1493 void scr_erase_line (int mode);
… …
1546 int scr_move_to (int y, int len); 1508 int scr_move_to (int y, int len);
1547 int scr_page (enum page_dirn direction, int nlines); 1509 int scr_page (enum page_dirn direction, int nlines);
1548 int scr_changeview (unsigned int oldviewstart); 1510 int scr_changeview (unsigned int oldviewstart);
1549 void scr_bell (); 1511 void scr_bell ();
1550 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);
1551 void scr_reverse_selection (); 1515 void scr_reverse_selection ();
1552 void scr_dump (int fd); 1516 void scr_dump (int fd);
1553 void selection_check (int check_more); 1517 void selection_check (int check_more);
1554 void selection_paste (Window win, Atom prop, bool delete_prop); 1518 void selection_paste (Window win, Atom prop, bool delete_prop);
1555 void selection_property (Window win, Atom prop); 1519 void selection_property (Window win, Atom prop);
1556 void selection_request (Time tm, int x, int y); 1520 void selection_request (Time tm, int x, int y);
1557 int selection_request_other (Atom target, int selnum); 1521 int selection_request_other (Atom target, int selnum);
1558 void selection_clear (); 1522 void selection_clear ();
1559 void selection_make (Time tm); 1523 void selection_make (Time tm);
1524 bool selection_grab (Time tm);
1560 void selection_start_colrow (int col, int row); 1525 void selection_start_colrow (int col, int row);
1561 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);
1562 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);
1563 void selection_remove_trailing_spaces (); 1528 void selection_remove_trailing_spaces ();
1564 void selection_send (const XSelectionRequestEvent &rq); 1529 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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