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

Diff Legend

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