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.184 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.199 by root, Thu Jan 12 01:30:53 2006 UTC

… …
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#include "rxvtperl.h"
23 25
24#if ENABLE_FRILLS 26#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 27# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 28# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1 29# define CURSOR_BLINK 1
… …
111char * rxvt_File_find (const char *file, const char *ext, const char *path); 113char * rxvt_File_find (const char *file, const char *ext, const char *path);
112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 114void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 115void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs); 116void rxvt_usleep (int usecs);
115 117
118/////////////////////////////////////////////////////////////////////////////
119
120// temporarily replace the process environment
121extern char **environ;
122extern char **rxvt_environ; // the original environ pointer
123
124inline void set_environ (stringvec *envv)
125{
126 if (envv)
127 environ = (char **)envv->begin ();
128}
129
130inline void set_environ (char **envv)
131{
132 if (envv)
133 environ = envv;
134}
135
116/* 136/*
117 ***************************************************************************** 137 *****************************************************************************
118 * STRUCTURES AND TYPEDEFS 138 * STRUCTURES AND TYPEDEFS
119 ***************************************************************************** 139 *****************************************************************************
120 */ 140 */
… …
207# define TERMENV "rxvt-unicode" 227# define TERMENV "rxvt-unicode"
208#endif 228#endif
209 229
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 230#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 231# define NO_MOUSE_REPORT_SCROLLBAR 1
212#endif
213
214#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT
216#endif 232#endif
217 233
218#if defined (ISO_14755) || defined (ENABLE_PERL) 234#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1 235# define ENABLE_OVERLAY 1
220#endif 236#endif
… …
436 XTerm_property = 3, // change X property 452 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 453 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 454 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 455 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 456 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 457 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 458 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 459 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 460 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 461 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 462 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 463 XTerm_font = 50,
448 464
449 XTerm_konsole30 = 30, // reserved for konsole 465 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 466 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 467 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 468 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 469 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
470 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 471 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 472 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 473 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 474 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 475 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 476 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 477 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 478
462 URxvt_locale = 701, // change locale 479 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 480 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 481 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 482 URxvt_Color_tint = 705, // change actual tint colour
483 URxvt_Color_BD = 706,
484 URxvt_Color_UL = 707,
466 485
467 URxvt_font = 710, 486 URxvt_font = 710,
468 URxvt_boldFont = 711, 487 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 488 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 489 URxvt_boldItalicFont = 713,
… …
557 576
558/* 577/*
559 * Resource list 578 * Resource list
560 */ 579 */
561enum { 580enum {
562#define Rs_def(name) Rs_ ## name, 581# define def(name) Rs_ ## name,
563#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 582# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
564#include "rsinc.h" 583# include "rsinc.h"
565#undef Rs_def 584# undef def
566#undef Rs_reserve 585# undef reserve
567 NUM_RESOURCES 586 NUM_RESOURCES
568}; 587};
569 588
570// see init.C:xa_names, which must be kept in sync 589// see init.C:xa_names, which must be kept in sync
571enum { 590enum {
… …
685/* 704/*
686 ***************************************************************************** 705 *****************************************************************************
687 * MACRO DEFINES 706 * MACRO DEFINES
688 ***************************************************************************** 707 *****************************************************************************
689 */ 708 */
690#define memset(x, y, z) memset((x), (y), (size_t)(z))
691#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
692#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
693#define strcasecmp(x, y) strcasecmp((x), (y))
694#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
695#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
696#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
697#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
698#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
699#define strcat(x, y) strcat((char *)(x), (const char *)(y))
700#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
701#define strdup(x) strdup((const char *)(x))
702#define strlen(x) strlen((const char *)(x))
703#define strchr(x, y) strchr((const char *)(x), (int)(y))
704#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
705
706#define dDisp Display *disp = display->display 709#define dDisp Display *disp = display->display
707 710
708/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
709#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
710#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
713#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 716#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
714#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 717#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
717 720
718#define TermWin_TotalWidth() ((int32_t)this->width) 721#define OPTION(opt) (options & (opt))
719#define TermWin_TotalHeight() ((int32_t)this->height) 722#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
723 | Opt_jumpScroll | Opt_secondaryScreen \
724 | Opt_pastableTabs | Opt_intensityStyles)
720 725
721// for m >= -n, ensure remainder lies between 0..n-1 726// for m >= -n, ensure remainder lies between 0..n-1
722#define MOD(m,n) (((m) + (n)) % (n)) 727#define MOD(m,n) (((m) + (n)) % (n))
723 728
724#define LINENO(n) MOD (term_start + int(n), total_rows) 729#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
851extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 856extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
852extern void rxvt_exit_failure () __attribute__ ((noreturn)); 857extern void rxvt_exit_failure () __attribute__ ((noreturn));
853 858
854#define SET_LOCALE(locale) rxvt_set_locale (locale) 859#define SET_LOCALE(locale) rxvt_set_locale (locale)
855extern bool rxvt_set_locale (const char *locale); 860extern bool rxvt_set_locale (const char *locale);
856extern bool rxvt_push_locale (const char *locale); 861extern void rxvt_push_locale (const char *locale);
857extern void rxvt_pop_locale (); 862extern void rxvt_pop_locale ();
858 863
859/*
860 ***************************************************************************** 864/****************************************************************************/
861 * VARIABLES 865
862 *****************************************************************************
863 */
864#ifdef MENUBAR 866#ifdef MENUBAR
865# include "menubar.h" 867# include "menubar.h"
866#endif 868#endif
867 869
868#define BLINK_INTERVAL 0.5 870#define BLINK_INTERVAL 0.5
… …
875# endif 877# endif
876# endif 878# endif
877# define __attribute__(x) 879# define __attribute__(x)
878#endif 880#endif
879 881
882/****************************************************************************/
883
884#define LINE_LONGER 0x0001 // line is continued on the next row
885#define LINE_FILTERED 0x0002 // line has been filtered
886#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
887
888struct line_t {
889 text_t *t; // terminal the text
890 rend_t *r; // rendition, uses RS_ flags
891 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
892 uint32_t f; // flags
893
894 bool is_longer ()
895 {
896 return f & LINE_LONGER;
897 }
898
899 void is_longer (int set)
900 {
901 if (set)
902 f |= LINE_LONGER;
903 else
904 f &= ~LINE_LONGER;
905 }
906
907 void clear ()
908 {
909 t = 0;
910 r = 0;
911 l = 0;
912 f = 0;
913 }
914
915 void touch () // call whenever a line is changed/touched/updated
916 {
917#if ENABLE_PERL
918 f &= ~LINE_FILTERED;
919#endif
920 }
921
922 void touch (int col)
923 {
924 max_it (l, col);
925 touch ();
926 }
927};
928
929/****************************************************************************/
930
880// primivite wrapper around mbstate_t to ensure initialisation 931// primivite wrapper around mbstate_t to ensure initialisation
881struct mbstate { 932struct mbstate {
882 mbstate_t mbs; 933 mbstate_t mbs;
883 934
884 operator mbstate_t *() { return &mbs; } 935 operator mbstate_t *() { return &mbs; }
885 void reset () { memset (&mbs, 0, sizeof (mbs)); } 936 void reset () { memset (&mbs, 0, sizeof (mbs)); }
886 mbstate () { reset (); } 937 mbstate () { reset (); }
887}; 938};
888 939
940/****************************************************************************/
941
889#define UNICODE_MASK 0x1fffffUL 942#define UNICODE_MASK 0x1fffffUL
890 943
891#if UNICODE3 944#if UNICODE3
892# define COMPOSE_LO 0x40000000UL 945# define COMPOSE_LO 0x40000000UL
893# define COMPOSE_HI 0x400fffffUL 946# define COMPOSE_HI 0x400fffffUL
894# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 947# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
895#else 948#else
949# if ENABLE_PERL
950# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
951# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
952# else
896# define COMPOSE_LO 0xd800UL 953# define COMPOSE_LO 0xd800UL
897# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 954# define COMPOSE_HI 0xf8ffUL
898# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 955# endif
956# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
899#endif 957#endif
900 958
901#if ENABLE_COMBINING 959#if ENABLE_COMBINING
902// compose chars are used to represent composite characters 960// compose chars are used to represent composite characters
903// that are not representable in unicode, as well as characters 961// that are not representable in unicode, as well as characters
… …
923}; 981};
924 982
925extern class rxvt_composite_vec rxvt_composite; 983extern class rxvt_composite_vec rxvt_composite;
926#endif 984#endif
927 985
986/****************************************************************************/
928 987
929#ifdef KEYSYM_RESOURCE 988#ifdef KEYSYM_RESOURCE
930 class keyboard_manager; 989 class keyboard_manager;
931#endif 990#endif
932 991
933struct rxvt_term : zero_initialized, rxvt_vars { 992struct rxvt_term : zero_initialized, rxvt_vars {
934 log_callback *log_hook; // log error messages through this hook, if != 0 993 log_callback *log_hook; // log error messages through this hook, if != 0
935 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 994 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
936
937#if ENABLE_PERL 995#if ENABLE_PERL
938 void *self; // perl's $self 996 rxvt_perl_term perl;
939#endif 997#endif
940
941 struct mbstate mbstate; // current input multibyte state 998 struct mbstate mbstate; // current input multibyte state
942 999
943 unsigned char want_refresh:1, 1000 unsigned char want_refresh:1,
944#ifdef TRANSPARENT 1001#ifdef TRANSPARENT
945 want_full_refresh:1, /* awaiting full screen refresh */ 1002 want_full_refresh:1, /* awaiting full screen refresh */
… …
1095 bar_t *CurrentBar; 1152 bar_t *CurrentBar;
1096# if ! (MENUBAR_MAX > 1) 1153# if ! (MENUBAR_MAX > 1)
1097 bar_t BarList; 1154 bar_t BarList;
1098# endif /* (MENUBAR_MAX > 1) */ 1155# endif /* (MENUBAR_MAX > 1) */
1099#endif 1156#endif
1100#ifdef CURSOR_BLINK
1101 struct timeval lastcursorchange;
1102#endif
1103#ifdef POINTER_BLANK
1104 struct timeval lastmotion;
1105#endif
1106 1157
1107#if ENABLE_OVERLAY 1158#if ENABLE_OVERLAY
1108 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1159 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1109 text_t **ov_text; 1160 text_t **ov_text;
1110 rend_t **ov_rend; 1161 rend_t **ov_rend;
… …
1125 char *env_display; /* environmental variable DISPLAY */ 1176 char *env_display; /* environmental variable DISPLAY */
1126 char *env_term; /* environmental variable TERM */ 1177 char *env_term; /* environmental variable TERM */
1127 char *env_colorfgbg; 1178 char *env_colorfgbg;
1128 char *locale; 1179 char *locale;
1129 char charsets[4]; 1180 char charsets[4];
1130 unsigned char *v_buffer; /* pointer to physical buffer */ 1181 char *v_buffer; /* pointer to physical buffer */
1131 unsigned int v_buflen; /* size of area to write */ 1182 unsigned int v_buflen; /* size of area to write */
1132 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1183 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1133 1184
1134#ifdef KEYSYM_RESOURCE 1185#ifdef KEYSYM_RESOURCE
1135 keyboard_manager *keyboard; 1186 keyboard_manager *keyboard;
1136#endif 1187#endif
1137 1188
1138 const char *rs[NUM_RESOURCES]; 1189 const char *rs[NUM_RESOURCES];
1139 /* command input buffering */ 1190 /* command input buffering */
1140 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1191 char *cmdbuf_ptr, *cmdbuf_endp;
1141 unsigned char cmdbuf_base[CBUFSIZ]; 1192 char cmdbuf_base[CBUFSIZ];
1142 1193
1143 rxvt_salloc *talloc; // text line allocator 1194 rxvt_salloc *talloc; // text line allocator
1144 rxvt_salloc *ralloc; // rend line allocator 1195 rxvt_salloc *ralloc; // rend line allocator
1145 1196
1146 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1197 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1155 void iso14755_54 (int x, int y); 1206 void iso14755_54 (int x, int y);
1156# endif 1207# endif
1157#endif 1208#endif
1158 1209
1159 // modifies first argument(!) 1210 // modifies first argument(!)
1160 void paste (unsigned char *data, unsigned int len); 1211 void paste (char *data, unsigned int len);
1161 1212
1162 void flush (); 1213 void flush ();
1163 1214
1164#if TRANSPARENT 1215#if TRANSPARENT
1165 void rootwin_cb (XEvent &xev); 1216 void rootwin_cb (XEvent &xev);
… …
1206 void pointer_blank (); 1257 void pointer_blank ();
1207#endif 1258#endif
1208 void pointer_unblank (); 1259 void pointer_unblank ();
1209 1260
1210 void tt_printf (const char *fmt,...); 1261 void tt_printf (const char *fmt,...);
1211 void tt_write (const unsigned char *data, unsigned int len); 1262 void tt_write (const char *data, unsigned int len);
1212 void pty_write (); 1263 void pty_write ();
1213 1264
1214 void tt_winch (); 1265 void tt_winch ();
1215 1266
1216 rxvt_term (); 1267 rxvt_term ();
… …
1224 1275
1225 bool pty_fill (); 1276 bool pty_fill ();
1226 1277
1227 void init_secondary (); 1278 void init_secondary ();
1228 const char **init_resources (int argc, const char *const *argv); 1279 const char **init_resources (int argc, const char *const *argv);
1280 const char *x_resource (const char *name);
1229 void init_env (); 1281 void init_env ();
1230 void set_locale (const char *locale); 1282 void set_locale (const char *locale);
1231 void init_xlocale (); 1283 void init_xlocale ();
1232 void init_command (const char *const *argv); 1284 void init_command (const char *const *argv);
1233 void run_command (const char *const *argv); 1285 void run_command (const char *const *argv);
… …
1268 1320
1269 /* autoconvert */ 1321 /* autoconvert */
1270 1322
1271 // command.C 1323 // command.C
1272 void lookup_key (XKeyEvent &ev); 1324 void lookup_key (XKeyEvent &ev);
1273 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1325 unsigned int cmd_write (const char *str, unsigned int count);
1274 1326
1275 unicode_t next_char (); 1327 wchar_t next_char ();
1276 unicode_t cmd_getc (); 1328 wchar_t cmd_getc ();
1277 unicode_t next_octet (); 1329 uint32_t next_octet ();
1278 unicode_t cmd_get8 (); 1330 uint32_t cmd_get8 ();
1279 1331
1280 bool cmd_parse (); 1332 bool cmd_parse ();
1281 void mouse_report (XButtonEvent &ev); 1333 void mouse_report (XButtonEvent &ev);
1282 void button_press (XButtonEvent &ev); 1334 void button_press (XButtonEvent &ev);
1283 void button_release (XButtonEvent &ev); 1335 void button_release (XButtonEvent &ev);
… …
1292 void process_nonprinting (unicode_t ch); 1344 void process_nonprinting (unicode_t ch);
1293 void process_escape_vt52 (unicode_t ch); 1345 void process_escape_vt52 (unicode_t ch);
1294 void process_escape_seq (); 1346 void process_escape_seq ();
1295 void process_csi_seq (); 1347 void process_csi_seq ();
1296 void process_window_ops (const int *args, unsigned int nargs); 1348 void process_window_ops (const int *args, unsigned int nargs);
1297 unsigned char *get_to_st (unicode_t &ends_how); 1349 char *get_to_st (unicode_t &ends_how);
1298 void process_dcs_seq (); 1350 void process_dcs_seq ();
1299 void process_osc_seq (); 1351 void process_osc_seq ();
1300 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1352 void process_color_seq (int report, int color, const char *str, char resp);
1301 void process_xterm_seq (int op, const char *str, unsigned char resp); 1353 void process_xterm_seq (int op, const char *str, char resp);
1302 int privcases (int mode, unsigned long bit); 1354 int privcases (int mode, unsigned long bit);
1303 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1355 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1304 void process_sgr_mode (unsigned int nargs, const int *arg); 1356 void process_sgr_mode (unsigned int nargs, const int *arg);
1305 void process_graphics (); 1357 void process_graphics ();
1306 // init.C 1358 // init.C
… …
1410 base += minBrightCOLOR - minCOLOR; 1462 base += minBrightCOLOR - minCOLOR;
1411#endif 1463#endif
1412 return base; 1464 return base;
1413 } 1465 }
1414 1466
1467 bool option (uint32_t opt)
1468 {
1469 return OPTION (opt);
1470 }
1471
1472 void set_option (uint32_t opt, bool set)
1473 {
1474 if (set)
1475 options |= opt;
1476 else
1477 options &= ~opt;
1478 }
1479
1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1480 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1416 void scr_blank_screen_mem (line_t &l, rend_t efs); 1481 void scr_blank_screen_mem (line_t &l, rend_t efs);
1417 int scr_scroll_text (int row1, int row2, int count); 1482 int scr_scroll_text (int row1, int row2, int count);
1418 void scr_reset (); 1483 void scr_reset ();
1419 void scr_release (); 1484 void scr_release ();
… …
1429 void scr_touch (bool refresh); 1494 void scr_touch (bool refresh);
1430 void scr_expose (int x, int y, int width, int height, bool refresh); 1495 void scr_expose (int x, int y, int width, int height, bool refresh);
1431 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1496 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1432 void scr_recolour (); 1497 void scr_recolour ();
1433 void scr_remap_chars (); 1498 void scr_remap_chars ();
1434 void scr_remap_chars (const line_t &l); 1499 void scr_remap_chars (line_t &l);
1435 1500
1436 void scr_poweron (); 1501 void scr_poweron ();
1437 void scr_cursor (int mode); 1502 void scr_cursor (int mode);
1438 void scr_do_wrap (); 1503 void scr_do_wrap ();
1439 int scr_change_screen (int scrn); 1504 int scr_change_screen (int scrn);
1440 void scr_color (unsigned int color, int fgbg); 1505 void scr_color (unsigned int color, int fgbg);
1441 void scr_rendition (int set, int style); 1506 void scr_rendition (int set, int style);
1442 void scr_add_lines (const unicode_t *str, int nlines, int len); 1507 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1443 void scr_backspace (); 1508 void scr_backspace ();
1444 void scr_tab (int count, bool ht = false); 1509 void scr_tab (int count, bool ht = false);
1445 void scr_gotorc (int row, int col, int relative); 1510 void scr_gotorc (int row, int col, int relative);
1446 void scr_index (enum page_dirn direction); 1511 void scr_index (enum page_dirn direction);
1447 void scr_erase_line (int mode); 1512 void scr_erase_line (int mode);
… …
1462 int scr_move_to (int y, int len); 1527 int scr_move_to (int y, int len);
1463 int scr_page (enum page_dirn direction, int nlines); 1528 int scr_page (enum page_dirn direction, int nlines);
1464 int scr_changeview (unsigned int oldviewstart); 1529 int scr_changeview (unsigned int oldviewstart);
1465 void scr_bell (); 1530 void scr_bell ();
1466 void scr_printscreen (int fullhist); 1531 void scr_printscreen (int fullhist);
1532 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1533 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1467 void scr_reverse_selection (); 1534 void scr_reverse_selection ();
1468 void scr_dump (int fd); 1535 void scr_dump (int fd);
1469 void selection_check (int check_more); 1536 void selection_check (int check_more);
1470 void selection_paste (Window win, Atom prop, bool delete_prop); 1537 void selection_paste (Window win, Atom prop, bool delete_prop);
1471 void selection_property (Window win, Atom prop); 1538 void selection_property (Window win, Atom prop);

Diff Legend

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