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.171 by root, Sat Dec 31 16:06:48 2005 UTC vs.
Revision 1.189 by root, Fri Jan 6 20:50:58 2006 UTC

… …
70 70
71#ifndef STDIN_FILENO 71#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 72# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 74# 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 75#endif
85 76
86/* 77/*
87 ***************************************************************************** 78 *****************************************************************************
88 * PROTOTYPES 79 * PROTOTYPES
… …
222 213
223#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
224# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
225#endif 216#endif
226 217
227#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
228# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
229#endif 220#endif
230 221
231/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
232 223
… …
247# define HAVE_SCROLLBARS 1 238# define HAVE_SCROLLBARS 1
248#endif 239#endif
249 240
250/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 241/* width of scrollBar, menuBar shadow, must be 1 or 2 */
251#ifdef HALFSHADOW 242#ifdef HALFSHADOW
252# define SHADOW 1 243# define MENU_SHADOW 1
253#else 244#else
254# define SHADOW 2 245# define MENU_SHADOW 2
255#endif 246#endif
256 247
257#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
258#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
259#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
… …
376enum { 367enum {
377 PRIMARY = 0, 368 PRIMARY = 0,
378 SECONDARY, 369 SECONDARY,
379}; 370};
380 371
381#define RS_None 0 /* Normal */ 372#define RS_None 0
382 373
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
385 376
386// font styles 377// font styles
387#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
389 380
390// fake styles 381// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
394 385
395// 5 bits still to go 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
389#define RS_customShift 19
396 390
397// other flags 391// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 393
400#define RS_styleCount 4 394#define RS_styleCount 4
… …
475 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
476 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
477 471
478 URxvt_view_up = 720, 472 URxvt_view_up = 720,
479 URxvt_view_down = 721, 473 URxvt_view_down = 721,
474
475 URxvt_perl = 777,
480}; 476};
481 477
482/* Words starting with `Color_' are colours. Others are counts */ 478/* Words starting with `Color_' are colours. Others are counts */
483/* 479/*
484 * The PixColor and rendition colour usage should probably be decoupled 480 * The PixColor and rendition colour usage should probably be decoupled
… …
561 557
562/* 558/*
563 * Resource list 559 * Resource list
564 */ 560 */
565enum { 561enum {
566 Rs_display_name = 0, 562# define def(name) Rs_ ## name,
567 Rs_term_name, 563# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
568 Rs_iconName, 564# include "rsinc.h"
569 Rs_geometry, 565# undef def
570 Rs_reverseVideo, 566# 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 567 NUM_RESOURCES
670}; 568};
671 569
672// see init.C:xa_names, which must be kept in sync 570// see init.C:xa_names, which must be kept in sync
673enum { 571enum {
… …
748#endif 646#endif
749 647
750// do not change these constants lightly, there are many interdependencies 648// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 649#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 650#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 651#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 652#define UBUFSIZ 2048 // character buffer
755 653
756#ifndef PATH_MAX 654#ifndef PATH_MAX
757# define PATH_MAX 16384 655# define PATH_MAX 16384
758#endif 656#endif
759 657
… …
787/* 685/*
788 ***************************************************************************** 686 *****************************************************************************
789 * MACRO DEFINES 687 * MACRO DEFINES
790 ***************************************************************************** 688 *****************************************************************************
791 */ 689 */
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 690#define dDisp Display *disp = display->display
809 691
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 697#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 698#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 701
820#define TermWin_TotalWidth() ((int32_t)this->width)
821#define TermWin_TotalHeight() ((int32_t)this->height)
822
823// for m >= -n, ensure remainder lies between 0..n-1 702// for m >= -n, ensure remainder lies between 0..n-1
824#define MOD(m,n) (((m) + (n)) % (n)) 703#define MOD(m,n) (((m) + (n)) % (n))
825 704
826#define LINENO(n) MOD (term_start + int(n), total_rows) 705#define LINENO(n) MOD (term_start + int(n), total_rows)
827#define ROW(n) row_buf [LINENO (n)] 706#define ROW(n) row_buf [LINENO (n)]
828 707
829/* how to build & extract colors and attributes */ 708/* how to build & extract colors and attributes */
830#define GET_BASEFG(x) (((x) & RS_fgMask)) 709#define GET_BASEFG(x) (((x) & RS_fgMask))
831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 710#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
832#ifndef NO_BRIGHTCOLOR
833# define GET_FGCOLOR(x) ( \
834 !((x) & RS_Bold) \
835 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
836 || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \
837 ? GET_BASEFG (x) \
838 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
839# define GET_BGCOLOR(x) ( \
840 !((x) & RS_Blink) \
841 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
842 || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \
843 ? GET_BASEBG (x) \
844 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
845#else
846# define GET_FGCOLOR(x) GET_BASEFG(x)
847# define GET_BGCOLOR(x) GET_BASEBG(x)
848#endif
849 711
850#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 712#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
851#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 713#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
852 714
853#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 715#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
903#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 765#define scrollbar_size() (scrollBar.end - scrollBar.beg \
904 - scrollbar_minheight ()) 766 - scrollbar_minheight ())
905 767
906#if (MENUBAR_MAX > 1) 768#if (MENUBAR_MAX > 1)
907/* rendition style flags */ 769/* rendition style flags */
908# define menuBar_height() (fheight + SHADOW) 770# define menuBar_height() (fheight + MENU_SHADOW)
909# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 771# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
910# define isMenuBarWindow(w) ((w) == menuBar.win) 772# define isMenuBarWindow(w) ((w) == menuBar.win)
911#else 773#else
912# define menuBar_height() (0) 774# define menuBar_height() (0)
913# define menuBar_TotalHeight() (0) 775# define menuBar_TotalHeight() (0)
914# define isMenuBarWindow(w) (0) 776# define isMenuBarWindow(w) (0)
… …
970extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 832extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
971extern void rxvt_exit_failure () __attribute__ ((noreturn)); 833extern void rxvt_exit_failure () __attribute__ ((noreturn));
972 834
973#define SET_LOCALE(locale) rxvt_set_locale (locale) 835#define SET_LOCALE(locale) rxvt_set_locale (locale)
974extern bool rxvt_set_locale (const char *locale); 836extern bool rxvt_set_locale (const char *locale);
837extern bool rxvt_push_locale (const char *locale);
838extern void rxvt_pop_locale ();
975 839
976/*
977 ***************************************************************************** 840/****************************************************************************/
978 * VARIABLES 841
979 *****************************************************************************
980 */
981#ifdef MENUBAR 842#ifdef MENUBAR
982# include "menubar.h" 843# include "menubar.h"
983#endif 844#endif
984 845
985#define BLINK_INTERVAL 0.5 846#define BLINK_INTERVAL 0.5
… …
992# endif 853# endif
993# endif 854# endif
994# define __attribute__(x) 855# define __attribute__(x)
995#endif 856#endif
996 857
858/****************************************************************************/
859
860#define LINE_LONGER 0x0001 // line is continued on the next row
861#define LINE_FILTERED 0x0002 // line has been filtered
862#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
863
864struct line_t {
865 text_t *t; // terminal the text
866 rend_t *r; // rendition, uses RS_ flags
867 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
868 uint32_t f; // flags
869
870 bool is_longer ()
871 {
872 return f & LINE_LONGER;
873 }
874
875 void is_longer (int set)
876 {
877 if (set)
878 f |= LINE_LONGER;
879 else
880 f &= ~LINE_LONGER;
881 }
882
883 void clear ()
884 {
885 t = 0;
886 r = 0;
887 l = 0;
888 f = 0;
889 }
890
891 void touch () // call whenever a line is changed/touched/updated
892 {
893#if ENABLE_PERL
894 f &= ~LINE_FILTERED;
895#endif
896 }
897
898 void touch (int col)
899 {
900 max_it (l, col);
901 touch ();
902 }
903};
904
905/****************************************************************************/
906
997// primivite wrapper around mbstate_t to ensure initialisation 907// primivite wrapper around mbstate_t to ensure initialisation
998struct mbstate { 908struct mbstate {
999 mbstate_t mbs; 909 mbstate_t mbs;
1000 910
1001 operator mbstate_t *() { return &mbs; } 911 operator mbstate_t *() { return &mbs; }
1002 void reset () { memset (&mbs, 0, sizeof (mbs)); } 912 void reset () { memset (&mbs, 0, sizeof (mbs)); }
1003 mbstate () { reset (); } 913 mbstate () { reset (); }
1004}; 914};
1005 915
916/****************************************************************************/
917
1006#define UNICODE_MASK 0x1fffffUL 918#define UNICODE_MASK 0x1fffffUL
1007 919
1008#if UNICODE3 920#if UNICODE3
1009# define COMPOSE_LO 0x40000000UL 921# define COMPOSE_LO 0x40000000UL
1010# define COMPOSE_HI 0x400fffffUL 922# define COMPOSE_HI 0x400fffffUL
1011# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 923# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1012#else 924#else
925# if ENABLE_PERL
926# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
927# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
928# else
1013# define COMPOSE_LO 0xd800UL 929# define COMPOSE_LO 0xd800UL
1014# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 930# define COMPOSE_HI 0xf8ffUL
1015# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 931# endif
932# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1016#endif 933#endif
1017 934
1018#if ENABLE_COMBINING 935#if ENABLE_COMBINING
1019// compose chars are used to represent composite characters 936// compose chars are used to represent composite characters
1020// that are not representable in unicode, as well as characters 937// that are not representable in unicode, as well as characters
… …
1040}; 957};
1041 958
1042extern class rxvt_composite_vec rxvt_composite; 959extern class rxvt_composite_vec rxvt_composite;
1043#endif 960#endif
1044 961
962/****************************************************************************/
1045 963
1046#ifdef KEYSYM_RESOURCE 964#ifdef KEYSYM_RESOURCE
1047 class keyboard_manager; 965 class keyboard_manager;
1048#endif 966#endif
1049 967
1050struct rxvt_term : zero_initialized, rxvt_vars { 968struct rxvt_term : zero_initialized, rxvt_vars {
1051 log_callback *log_hook; // log error messages through this hook, if != 0 969 log_callback *log_hook; // log error messages through this hook, if != 0
1052 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 970 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
971
972#if ENABLE_PERL
973 void *self; // perl's $self
974#endif
1053 975
1054 struct mbstate mbstate; // current input multibyte state 976 struct mbstate mbstate; // current input multibyte state
1055 977
1056 unsigned char want_refresh:1, 978 unsigned char want_refresh:1,
1057#ifdef TRANSPARENT 979#ifdef TRANSPARENT
… …
1208 bar_t *CurrentBar; 1130 bar_t *CurrentBar;
1209# if ! (MENUBAR_MAX > 1) 1131# if ! (MENUBAR_MAX > 1)
1210 bar_t BarList; 1132 bar_t BarList;
1211# endif /* (MENUBAR_MAX > 1) */ 1133# endif /* (MENUBAR_MAX > 1) */
1212#endif 1134#endif
1213#ifdef CURSOR_BLINK
1214 struct timeval lastcursorchange;
1215#endif
1216#ifdef POINTER_BLANK
1217 struct timeval lastmotion;
1218#endif
1219 1135
1220#if ENABLE_OVERLAY 1136#if ENABLE_OVERLAY
1221 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1137 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1222 text_t **ov_text; 1138 text_t **ov_text;
1223 rend_t **ov_rend; 1139 rend_t **ov_rend;
… …
1238 char *env_display; /* environmental variable DISPLAY */ 1154 char *env_display; /* environmental variable DISPLAY */
1239 char *env_term; /* environmental variable TERM */ 1155 char *env_term; /* environmental variable TERM */
1240 char *env_colorfgbg; 1156 char *env_colorfgbg;
1241 char *locale; 1157 char *locale;
1242 char charsets[4]; 1158 char charsets[4];
1243 unsigned char *v_buffer; /* pointer to physical buffer */ 1159 char *v_buffer; /* pointer to physical buffer */
1244 unsigned int v_buflen; /* size of area to write */ 1160 unsigned int v_buflen; /* size of area to write */
1245 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1161 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1246 1162
1247#ifdef KEYSYM_RESOURCE 1163#ifdef KEYSYM_RESOURCE
1248 keyboard_manager *keyboard; 1164 keyboard_manager *keyboard;
1249#endif 1165#endif
1250 1166
1251 const char *rs[NUM_RESOURCES]; 1167 const char *rs[NUM_RESOURCES];
1252 /* command input buffering */ 1168 /* command input buffering */
1253 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1169 char *cmdbuf_ptr, *cmdbuf_endp;
1254 unsigned char cmdbuf_base[CBUFSIZ]; 1170 char cmdbuf_base[CBUFSIZ];
1255 1171
1256 rxvt_salloc *talloc; // text line allocator 1172 rxvt_salloc *talloc; // text line allocator
1257 rxvt_salloc *ralloc; // rend line allocator 1173 rxvt_salloc *ralloc; // rend line allocator
1258 1174
1259 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1175 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1262 // ISO 14755 entry support 1178 // ISO 14755 entry support
1263 unicode_t iso14755buf; 1179 unicode_t iso14755buf;
1264 void commit_iso14755 (); 1180 void commit_iso14755 ();
1265 int hex_keyval (XKeyEvent &ev); 1181 int hex_keyval (XKeyEvent &ev);
1266# if ISO_14755 1182# if ISO_14755
1267 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1183 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1268 void iso14755_54 (int x, int y); 1184 void iso14755_54 (int x, int y);
1269# endif 1185# endif
1270#endif 1186#endif
1271 1187
1272 // modifies first argument(!) 1188 // modifies first argument(!)
1273 void paste (unsigned char *data, unsigned int len); 1189 void paste (char *data, unsigned int len);
1274 1190
1275 void flush (); 1191 void flush ();
1276 1192
1277#if TRANSPARENT 1193#if TRANSPARENT
1278 void rootwin_cb (XEvent &xev); 1194 void rootwin_cb (XEvent &xev);
… …
1319 void pointer_blank (); 1235 void pointer_blank ();
1320#endif 1236#endif
1321 void pointer_unblank (); 1237 void pointer_unblank ();
1322 1238
1323 void tt_printf (const char *fmt,...); 1239 void tt_printf (const char *fmt,...);
1324 void tt_write (const unsigned char *data, unsigned int len); 1240 void tt_write (const char *data, unsigned int len);
1325 void pty_write (); 1241 void pty_write ();
1326 1242
1327 void tt_winch (); 1243 void tt_winch ();
1328 1244
1329 rxvt_term (); 1245 rxvt_term ();
… …
1381 1297
1382 /* autoconvert */ 1298 /* autoconvert */
1383 1299
1384 // command.C 1300 // command.C
1385 void lookup_key (XKeyEvent &ev); 1301 void lookup_key (XKeyEvent &ev);
1386 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1302 unsigned int cmd_write (const char *str, unsigned int count);
1387 1303
1388 unicode_t next_char (); 1304 wchar_t next_char ();
1389 unicode_t cmd_getc (); 1305 wchar_t cmd_getc ();
1390 unicode_t next_octet (); 1306 uint32_t next_octet ();
1391 unicode_t cmd_get8 (); 1307 uint32_t cmd_get8 ();
1392 1308
1393 bool cmd_parse (); 1309 bool cmd_parse ();
1394 void mouse_report (XButtonEvent &ev); 1310 void mouse_report (XButtonEvent &ev);
1395 void button_press (XButtonEvent &ev); 1311 void button_press (XButtonEvent &ev);
1396 void button_release (XButtonEvent &ev); 1312 void button_release (XButtonEvent &ev);
… …
1405 void process_nonprinting (unicode_t ch); 1321 void process_nonprinting (unicode_t ch);
1406 void process_escape_vt52 (unicode_t ch); 1322 void process_escape_vt52 (unicode_t ch);
1407 void process_escape_seq (); 1323 void process_escape_seq ();
1408 void process_csi_seq (); 1324 void process_csi_seq ();
1409 void process_window_ops (const int *args, unsigned int nargs); 1325 void process_window_ops (const int *args, unsigned int nargs);
1410 unsigned char *get_to_st (unicode_t &ends_how); 1326 char *get_to_st (unicode_t &ends_how);
1411 void process_dcs_seq (); 1327 void process_dcs_seq ();
1412 void process_osc_seq (); 1328 void process_osc_seq ();
1413 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1329 void process_color_seq (int report, int color, const char *str, char resp);
1414 void process_xterm_seq (int op, const char *str, unsigned char resp); 1330 void process_xterm_seq (int op, const char *str, char resp);
1415 int privcases (int mode, unsigned long bit); 1331 int privcases (int mode, unsigned long bit);
1416 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1332 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1417 void process_sgr_mode (unsigned int nargs, const int *arg); 1333 void process_sgr_mode (unsigned int nargs, const int *arg);
1418 void process_graphics (); 1334 void process_graphics ();
1419 // init.C 1335 // init.C
… …
1495 1411
1496 if (ncol > prev_ncol) 1412 if (ncol > prev_ncol)
1497 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1413 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1498 } 1414 }
1499 1415
1416 int fgcolor_of (rend_t r)
1417 {
1418 int base = GET_BASEFG (r);
1419#ifndef NO_BRIGHTCOLOR
1420 if (r & RS_Bold
1421# if ENABLE_STYLES
1422 && OPTION (Opt_intensityStyles)
1423# endif
1424 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1425 base += minBrightCOLOR - minCOLOR;
1426#endif
1427 return base;
1428 }
1429
1430 int bgcolor_of (rend_t r)
1431 {
1432 int base = GET_BASEBG (r);
1433#ifndef NO_BRIGHTCOLOR
1434 if (r & RS_Blink
1435# if ENABLE_STYLES
1436 && OPTION (Opt_intensityStyles)
1437# endif
1438 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1439 base += minBrightCOLOR - minCOLOR;
1440#endif
1441 return base;
1442 }
1443
1500 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1444 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1501 void scr_blank_screen_mem (line_t &l, rend_t efs); 1445 void scr_blank_screen_mem (line_t &l, rend_t efs);
1502 int scr_scroll_text (int row1, int row2, int count); 1446 int scr_scroll_text (int row1, int row2, int count);
1503 void scr_reset (); 1447 void scr_reset ();
1504 void scr_release (); 1448 void scr_release ();
… …
1514 void scr_touch (bool refresh); 1458 void scr_touch (bool refresh);
1515 void scr_expose (int x, int y, int width, int height, bool refresh); 1459 void scr_expose (int x, int y, int width, int height, bool refresh);
1516 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1460 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1517 void scr_recolour (); 1461 void scr_recolour ();
1518 void scr_remap_chars (); 1462 void scr_remap_chars ();
1519 void scr_remap_chars (const line_t &l); 1463 void scr_remap_chars (line_t &l);
1520 1464
1521 void scr_poweron (); 1465 void scr_poweron ();
1522 void scr_cursor (int mode); 1466 void scr_cursor (int mode);
1523 void scr_do_wrap (); 1467 void scr_do_wrap ();
1524 int scr_change_screen (int scrn); 1468 int scr_change_screen (int scrn);
1525 void scr_color (unsigned int color, int fgbg); 1469 void scr_color (unsigned int color, int fgbg);
1526 void scr_rendition (int set, int style); 1470 void scr_rendition (int set, int style);
1527 void scr_add_lines (const unicode_t *str, int nlines, int len); 1471 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1528 void scr_backspace (); 1472 void scr_backspace ();
1529 void scr_tab (int count, bool ht = false); 1473 void scr_tab (int count, bool ht = false);
1530 void scr_gotorc (int row, int col, int relative); 1474 void scr_gotorc (int row, int col, int relative);
1531 void scr_index (enum page_dirn direction); 1475 void scr_index (enum page_dirn direction);
1532 void scr_erase_line (int mode); 1476 void scr_erase_line (int mode);
… …
1556 void selection_property (Window win, Atom prop); 1500 void selection_property (Window win, Atom prop);
1557 void selection_request (Time tm, int x, int y); 1501 void selection_request (Time tm, int x, int y);
1558 int selection_request_other (Atom target, int selnum); 1502 int selection_request_other (Atom target, int selnum);
1559 void selection_clear (); 1503 void selection_clear ();
1560 void selection_make (Time tm); 1504 void selection_make (Time tm);
1505 bool selection_grab (Time tm);
1561 void selection_start_colrow (int col, int row); 1506 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); 1507 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); 1508 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1564 void selection_remove_trailing_spaces (); 1509 void selection_remove_trailing_spaces ();
1565 void selection_send (const XSelectionRequestEvent &rq); 1510 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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