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.183 by root, Tue Jan 3 02:43:33 2006 UTC vs.
Revision 1.202 by root, Fri Jan 13 05:13:09 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"
25
26#if defined (ISO_14755) || defined (ENABLE_PERL)
27# define ENABLE_OVERLAY 1
28#endif
29
30#if ENABLE_PERL
31# define ENABLE_FRILLS
32#endif
23 33
24#if ENABLE_FRILLS 34#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 35# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 36# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1 37# define CURSOR_BLINK 1
41#if defined (sun) && !defined (__sun__) 51#if defined (sun) && !defined (__sun__)
42# define __sun__ 1 52# define __sun__ 1
43#endif 53#endif
44 54
45#ifndef HAVE_XPOINTER 55#ifndef HAVE_XPOINTER
46typedef char *XPointer; 56typedef char *XPointer;
47#endif 57#endif
48 58
49#ifdef HAVE_TERMIOS_H 59#ifdef HAVE_TERMIOS_H
50# include <termios.h> 60# include <termios.h>
51typedef struct termios ttymode_t; 61typedef struct termios ttymode_t;
111char * rxvt_File_find (const char *file, const char *ext, const char *path); 121char * 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); 122void 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); 123void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs); 124void rxvt_usleep (int usecs);
115 125
126/////////////////////////////////////////////////////////////////////////////
127
128// temporarily replace the process environment
129extern char **environ;
130extern char **rxvt_environ; // the original environ pointer
131
132inline void set_environ (stringvec *envv)
133{
134 if (envv)
135 environ = (char **)envv->begin ();
136}
137
138inline void set_environ (char **envv)
139{
140 if (envv)
141 environ = envv;
142}
143
116/* 144/*
117 ***************************************************************************** 145 *****************************************************************************
118 * STRUCTURES AND TYPEDEFS 146 * STRUCTURES AND TYPEDEFS
119 ***************************************************************************** 147 *****************************************************************************
120 */ 148 */
207# define TERMENV "rxvt-unicode" 235# define TERMENV "rxvt-unicode"
208#endif 236#endif
209 237
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 238#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 239# define NO_MOUSE_REPORT_SCROLLBAR 1
212#endif
213
214#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT
216#endif
217
218#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1
220#endif 240#endif
221 241
222/* now look for other badly set stuff */ 242/* now look for other badly set stuff */
223 243
224#if !defined (EACCESS) && defined(EAGAIN) 244#if !defined (EACCESS) && defined(EAGAIN)
436 XTerm_property = 3, // change X property 456 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 457 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 458 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 459 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 460 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 461 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 462 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 463 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 464 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 465 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 466 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 467 XTerm_font = 50,
448 468
449 XTerm_konsole30 = 30, // reserved for konsole 469 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 470 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 471 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 472 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 473 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
474 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 475 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 476 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 477 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 478 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 479 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 480 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 481 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 482
462 URxvt_locale = 701, // change locale 483 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 484 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 485 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 486 URxvt_Color_tint = 705, // change actual tint colour
487 URxvt_Color_BD = 706,
488 URxvt_Color_UL = 707,
466 489
467 URxvt_font = 710, 490 URxvt_font = 710,
468 URxvt_boldFont = 711, 491 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 492 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 493 URxvt_boldItalicFont = 713,
471 494
472 URxvt_view_up = 720, 495 URxvt_view_up = 720,
473 URxvt_view_down = 721, 496 URxvt_view_down = 721,
497
498 URxvt_perl = 777,
474}; 499};
475 500
476/* Words starting with `Color_' are colours. Others are counts */ 501/* Words starting with `Color_' are colours. Others are counts */
477/* 502/*
478 * The PixColor and rendition colour usage should probably be decoupled 503 * The PixColor and rendition colour usage should probably be decoupled
555 580
556/* 581/*
557 * Resource list 582 * Resource list
558 */ 583 */
559enum { 584enum {
560#define Rs_def(name) Rs_ ## name, 585# define def(name) Rs_ ## name,
561#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 586# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562#include "rsinc.h" 587# include "rsinc.h"
563#undef Rs_def 588# undef def
564#undef Rs_reserve 589# undef reserve
565 NUM_RESOURCES 590 NUM_RESOURCES
566}; 591};
567 592
568// see init.C:xa_names, which must be kept in sync 593// see init.C:xa_names, which must be kept in sync
569enum { 594enum {
683/* 708/*
684 ***************************************************************************** 709 *****************************************************************************
685 * MACRO DEFINES 710 * MACRO DEFINES
686 ***************************************************************************** 711 *****************************************************************************
687 */ 712 */
688#define memset(x, y, z) memset((x), (y), (size_t)(z))
689#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
690#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
691#define strcasecmp(x, y) strcasecmp((x), (y))
692#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
693#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
694#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
695#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
696#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
697#define strcat(x, y) strcat((char *)(x), (const char *)(y))
698#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
699#define strdup(x) strdup((const char *)(x))
700#define strlen(x) strlen((const char *)(x))
701#define strchr(x, y) strchr((const char *)(x), (int)(y))
702#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
703
704#define dDisp Display *disp = display->display 713#define dDisp Display *disp = display->display
705 714
706/* convert pixel dimensions to row/column values. Everything as int32_t */ 715/* convert pixel dimensions to row/column values. Everything as int32_t */
707#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 716#define Pixel2Col(x) Pixel2Width((int32_t)(x))
708#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 717#define Pixel2Row(y) Pixel2Height((int32_t)(y))
711#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 720#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
712#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 721#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
713#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 722#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
714#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 723#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
715 724
716#define TermWin_TotalWidth() ((int32_t)this->width) 725#define OPTION(opt) (options & (opt))
717#define TermWin_TotalHeight() ((int32_t)this->height) 726#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
727 | Opt_jumpScroll | Opt_secondaryScreen \
728 | Opt_pastableTabs | Opt_intensityStyles)
718 729
719// for m >= -n, ensure remainder lies between 0..n-1 730// for m >= -n, ensure remainder lies between 0..n-1
720#define MOD(m,n) (((m) + (n)) % (n)) 731#define MOD(m,n) (((m) + (n)) % (n))
721 732
722#define LINENO(n) MOD (term_start + int(n), total_rows) 733#define LINENO(n) MOD (term_start + int(n), total_rows)
849extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 860extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
850extern void rxvt_exit_failure () __attribute__ ((noreturn)); 861extern void rxvt_exit_failure () __attribute__ ((noreturn));
851 862
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 863#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale); 864extern bool rxvt_set_locale (const char *locale);
854extern bool rxvt_push_locale (const char *locale); 865extern void rxvt_push_locale (const char *locale);
855extern void rxvt_pop_locale (); 866extern void rxvt_pop_locale ();
856 867
857/*
858 ***************************************************************************** 868/****************************************************************************/
859 * VARIABLES 869
860 *****************************************************************************
861 */
862#ifdef MENUBAR 870#ifdef MENUBAR
863# include "menubar.h" 871# include "menubar.h"
864#endif 872#endif
865 873
866#define BLINK_INTERVAL 0.5 874#define BLINK_INTERVAL 0.5
873# endif 881# endif
874# endif 882# endif
875# define __attribute__(x) 883# define __attribute__(x)
876#endif 884#endif
877 885
886/****************************************************************************/
887
888#define LINE_LONGER 0x0001 // line is continued on the next row
889#define LINE_FILTERED 0x0002 // line has been filtered
890#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
891
892struct line_t {
893 text_t *t; // terminal the text
894 rend_t *r; // rendition, uses RS_ flags
895 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
896 uint32_t f; // flags
897
898 bool is_longer ()
899 {
900 return f & LINE_LONGER;
901 }
902
903 void is_longer (int set)
904 {
905 if (set)
906 f |= LINE_LONGER;
907 else
908 f &= ~LINE_LONGER;
909 }
910
911 void clear ()
912 {
913 t = 0;
914 r = 0;
915 l = 0;
916 f = 0;
917 }
918
919 void touch () // call whenever a line is changed/touched/updated
920 {
921#if ENABLE_PERL
922 f &= ~LINE_FILTERED;
923#endif
924 }
925
926 void touch (int col)
927 {
928 max_it (l, col);
929 touch ();
930 }
931};
932
933/****************************************************************************/
934
878// primivite wrapper around mbstate_t to ensure initialisation 935// primivite wrapper around mbstate_t to ensure initialisation
879struct mbstate { 936struct mbstate {
880 mbstate_t mbs; 937 mbstate_t mbs;
881 938
882 operator mbstate_t *() { return &mbs; } 939 operator mbstate_t *() { return &mbs; }
883 void reset () { memset (&mbs, 0, sizeof (mbs)); } 940 void reset () { memset (&mbs, 0, sizeof (mbs)); }
884 mbstate () { reset (); } 941 mbstate () { reset (); }
885}; 942};
886 943
944/****************************************************************************/
945
887#define UNICODE_MASK 0x1fffffUL 946#define UNICODE_MASK 0x1fffffUL
888 947
889#if UNICODE3 948#if UNICODE3
890# define COMPOSE_LO 0x40000000UL 949# define COMPOSE_LO 0x40000000UL
891# define COMPOSE_HI 0x400fffffUL 950# define COMPOSE_HI 0x400fffffUL
892# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 951# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
893#else 952#else
953# if ENABLE_PERL
954# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
955# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
956# else
894# define COMPOSE_LO 0xd800UL 957# define COMPOSE_LO 0xd800UL
895# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 958# define COMPOSE_HI 0xf8ffUL
896# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 959# endif
960# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
897#endif 961#endif
898 962
899#if ENABLE_COMBINING 963#if ENABLE_COMBINING
900// compose chars are used to represent composite characters 964// compose chars are used to represent composite characters
901// that are not representable in unicode, as well as characters 965// that are not representable in unicode, as well as characters
921}; 985};
922 986
923extern class rxvt_composite_vec rxvt_composite; 987extern class rxvt_composite_vec rxvt_composite;
924#endif 988#endif
925 989
990/****************************************************************************/
926 991
927#ifdef KEYSYM_RESOURCE 992#ifdef KEYSYM_RESOURCE
928 class keyboard_manager; 993 class keyboard_manager;
929#endif 994#endif
930 995
931struct rxvt_term : zero_initialized, rxvt_vars { 996struct rxvt_term : zero_initialized, rxvt_vars {
932 log_callback *log_hook; // log error messages through this hook, if != 0 997 log_callback *log_hook; // log error messages through this hook, if != 0
933 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 998 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
934
935#if ENABLE_PERL 999#if ENABLE_PERL
936 void *self; // perl's $self 1000 rxvt_perl_term perl;
937#endif 1001#endif
938
939 struct mbstate mbstate; // current input multibyte state 1002 struct mbstate mbstate; // current input multibyte state
940 1003
941 unsigned char want_refresh:1, 1004 unsigned char want_refresh:1,
942#ifdef TRANSPARENT 1005#ifdef TRANSPARENT
943 want_full_refresh:1, /* awaiting full screen refresh */ 1006 want_full_refresh:1, /* awaiting full screen refresh */
1093 bar_t *CurrentBar; 1156 bar_t *CurrentBar;
1094# if ! (MENUBAR_MAX > 1) 1157# if ! (MENUBAR_MAX > 1)
1095 bar_t BarList; 1158 bar_t BarList;
1096# endif /* (MENUBAR_MAX > 1) */ 1159# endif /* (MENUBAR_MAX > 1) */
1097#endif 1160#endif
1098#ifdef CURSOR_BLINK
1099 struct timeval lastcursorchange;
1100#endif
1101#ifdef POINTER_BLANK
1102 struct timeval lastmotion;
1103#endif
1104 1161
1105#if ENABLE_OVERLAY 1162#if ENABLE_OVERLAY
1106 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1163 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1107 text_t **ov_text; 1164 text_t **ov_text;
1108 rend_t **ov_rend; 1165 rend_t **ov_rend;
1123 char *env_display; /* environmental variable DISPLAY */ 1180 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1181 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1182 char *env_colorfgbg;
1126 char *locale; 1183 char *locale;
1127 char charsets[4]; 1184 char charsets[4];
1128 unsigned char *v_buffer; /* pointer to physical buffer */ 1185 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1186 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1187 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1131 1188
1132#ifdef KEYSYM_RESOURCE 1189#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1190 keyboard_manager *keyboard;
1134#endif 1191#endif
1135 1192
1136 const char *rs[NUM_RESOURCES]; 1193 const char *rs[NUM_RESOURCES];
1137 /* command input buffering */ 1194 /* command input buffering */
1138 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1195 char *cmdbuf_ptr, *cmdbuf_endp;
1139 unsigned char cmdbuf_base[CBUFSIZ]; 1196 char cmdbuf_base[CBUFSIZ];
1140 1197
1141 rxvt_salloc *talloc; // text line allocator 1198 rxvt_salloc *talloc; // text line allocator
1142 rxvt_salloc *ralloc; // rend line allocator 1199 rxvt_salloc *ralloc; // rend line allocator
1143 1200
1144 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1201 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1153 void iso14755_54 (int x, int y); 1210 void iso14755_54 (int x, int y);
1154# endif 1211# endif
1155#endif 1212#endif
1156 1213
1157 // modifies first argument(!) 1214 // modifies first argument(!)
1158 void paste (unsigned char *data, unsigned int len); 1215 void paste (char *data, unsigned int len);
1159 1216
1160 void flush (); 1217 long vt_emask, vt_emask_perl;
1218
1219 void vt_select_input ()
1220 {
1221 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1222 }
1161 1223
1162#if TRANSPARENT 1224#if TRANSPARENT
1163 void rootwin_cb (XEvent &xev); 1225 void rootwin_cb (XEvent &xev);
1164 xevent_watcher rootwin_ev; 1226 xevent_watcher rootwin_ev;
1165#endif 1227#endif
1166 1228
1167 void x_cb (XEvent &xev); 1229 void x_cb (XEvent &xev);
1230 void flush ();
1168 xevent_watcher termwin_ev; 1231 xevent_watcher termwin_ev;
1169 xevent_watcher vt_ev; 1232 xevent_watcher vt_ev;
1170#ifdef HAVE_SCROLLBARS 1233#ifdef HAVE_SCROLLBARS
1171 xevent_watcher scrollbar_ev; 1234 xevent_watcher scrollbar_ev;
1172#endif 1235#endif
1204 void pointer_blank (); 1267 void pointer_blank ();
1205#endif 1268#endif
1206 void pointer_unblank (); 1269 void pointer_unblank ();
1207 1270
1208 void tt_printf (const char *fmt,...); 1271 void tt_printf (const char *fmt,...);
1209 void tt_write (const unsigned char *data, unsigned int len); 1272 void tt_write (const char *data, unsigned int len);
1210 void pty_write (); 1273 void pty_write ();
1211 1274
1212 void tt_winch (); 1275 void tt_winch ();
1213 1276
1214 rxvt_term (); 1277 rxvt_term ();
1222 1285
1223 bool pty_fill (); 1286 bool pty_fill ();
1224 1287
1225 void init_secondary (); 1288 void init_secondary ();
1226 const char **init_resources (int argc, const char *const *argv); 1289 const char **init_resources (int argc, const char *const *argv);
1290 const char *x_resource (const char *name);
1227 void init_env (); 1291 void init_env ();
1228 void set_locale (const char *locale); 1292 void set_locale (const char *locale);
1229 void init_xlocale (); 1293 void init_xlocale ();
1230 void init_command (const char *const *argv); 1294 void init_command (const char *const *argv);
1231 void run_command (const char *const *argv); 1295 void run_command (const char *const *argv);
1266 1330
1267 /* autoconvert */ 1331 /* autoconvert */
1268 1332
1269 // command.C 1333 // command.C
1270 void lookup_key (XKeyEvent &ev); 1334 void lookup_key (XKeyEvent &ev);
1271 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1335 unsigned int cmd_write (const char *str, unsigned int count);
1272 1336
1273 unicode_t next_char (); 1337 wchar_t next_char ();
1274 unicode_t cmd_getc (); 1338 wchar_t cmd_getc ();
1275 unicode_t next_octet (); 1339 uint32_t next_octet ();
1276 unicode_t cmd_get8 (); 1340 uint32_t cmd_get8 ();
1277 1341
1278 bool cmd_parse (); 1342 bool cmd_parse ();
1279 void mouse_report (XButtonEvent &ev); 1343 void mouse_report (XButtonEvent &ev);
1280 void button_press (XButtonEvent &ev); 1344 void button_press (XButtonEvent &ev);
1281 void button_release (XButtonEvent &ev); 1345 void button_release (XButtonEvent &ev);
1290 void process_nonprinting (unicode_t ch); 1354 void process_nonprinting (unicode_t ch);
1291 void process_escape_vt52 (unicode_t ch); 1355 void process_escape_vt52 (unicode_t ch);
1292 void process_escape_seq (); 1356 void process_escape_seq ();
1293 void process_csi_seq (); 1357 void process_csi_seq ();
1294 void process_window_ops (const int *args, unsigned int nargs); 1358 void process_window_ops (const int *args, unsigned int nargs);
1295 unsigned char *get_to_st (unicode_t &ends_how); 1359 char *get_to_st (unicode_t &ends_how);
1296 void process_dcs_seq (); 1360 void process_dcs_seq ();
1297 void process_osc_seq (); 1361 void process_osc_seq ();
1298 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1362 void process_color_seq (int report, int color, const char *str, char resp);
1299 void process_xterm_seq (int op, const char *str, unsigned char resp); 1363 void process_xterm_seq (int op, const char *str, char resp);
1300 int privcases (int mode, unsigned long bit); 1364 int privcases (int mode, unsigned long bit);
1301 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1365 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1302 void process_sgr_mode (unsigned int nargs, const int *arg); 1366 void process_sgr_mode (unsigned int nargs, const int *arg);
1303 void process_graphics (); 1367 void process_graphics ();
1304 // init.C 1368 // init.C
1408 base += minBrightCOLOR - minCOLOR; 1472 base += minBrightCOLOR - minCOLOR;
1409#endif 1473#endif
1410 return base; 1474 return base;
1411 } 1475 }
1412 1476
1477 bool option (uint32_t opt)
1478 {
1479 return OPTION (opt);
1480 }
1481
1482 void set_option (uint32_t opt, bool set)
1483 {
1484 if (set)
1485 options |= opt;
1486 else
1487 options &= ~opt;
1488 }
1489
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1490 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1414 void scr_blank_screen_mem (line_t &l, rend_t efs); 1491 void scr_blank_screen_mem (line_t &l, rend_t efs);
1415 int scr_scroll_text (int row1, int row2, int count); 1492 int scr_scroll_text (int row1, int row2, int count);
1416 void scr_reset (); 1493 void scr_reset ();
1417 void scr_release (); 1494 void scr_release ();
1427 void scr_touch (bool refresh); 1504 void scr_touch (bool refresh);
1428 void scr_expose (int x, int y, int width, int height, bool refresh); 1505 void scr_expose (int x, int y, int width, int height, bool refresh);
1429 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1506 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430 void scr_recolour (); 1507 void scr_recolour ();
1431 void scr_remap_chars (); 1508 void scr_remap_chars ();
1432 void scr_remap_chars (const line_t &l); 1509 void scr_remap_chars (line_t &l);
1433 1510
1434 void scr_poweron (); 1511 void scr_poweron ();
1435 void scr_cursor (int mode); 1512 void scr_cursor (int mode);
1436 void scr_do_wrap (); 1513 void scr_do_wrap ();
1437 int scr_change_screen (int scrn); 1514 int scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg); 1515 void scr_color (unsigned int color, int fgbg);
1439 void scr_rendition (int set, int style); 1516 void scr_rendition (int set, int style);
1440 void scr_add_lines (const unicode_t *str, int nlines, int len); 1517 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1441 void scr_backspace (); 1518 void scr_backspace ();
1442 void scr_tab (int count, bool ht = false); 1519 void scr_tab (int count, bool ht = false);
1443 void scr_gotorc (int row, int col, int relative); 1520 void scr_gotorc (int row, int col, int relative);
1444 void scr_index (enum page_dirn direction); 1521 void scr_index (enum page_dirn direction);
1445 void scr_erase_line (int mode); 1522 void scr_erase_line (int mode);
1460 int scr_move_to (int y, int len); 1537 int scr_move_to (int y, int len);
1461 int scr_page (enum page_dirn direction, int nlines); 1538 int scr_page (enum page_dirn direction, int nlines);
1462 int scr_changeview (unsigned int oldviewstart); 1539 int scr_changeview (unsigned int oldviewstart);
1463 void scr_bell (); 1540 void scr_bell ();
1464 void scr_printscreen (int fullhist); 1541 void scr_printscreen (int fullhist);
1542 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1543 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1465 void scr_reverse_selection (); 1544 void scr_reverse_selection ();
1466 void scr_dump (int fd); 1545 void scr_dump (int fd);
1467 void selection_check (int check_more); 1546 void selection_check (int check_more);
1468 void selection_paste (Window win, Atom prop, bool delete_prop); 1547 void selection_paste (Window win, Atom prop, bool delete_prop);
1469 void selection_property (Window win, Atom prop); 1548 void selection_property (Window win, Atom prop);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines