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.182 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.198 by root, Thu Jan 12 00:35:39 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
124struct temp_environ
125{
126 char **prev;
127
128 temp_environ (const stringvec *envv)
129 : prev(environ)
130 {
131 if (envv)
132 environ = (char **)envv->begin ();
133 }
134
135 temp_environ (char **env)
136 : prev(environ)
137 {
138 if (env)
139 environ = env;
140 }
141
142 ~temp_environ ()
143 {
144 environ = prev;
145 }
146};
147
148#define TEMP_ENV temp_environ temp_environ (envv)
149
116/* 150/*
117 ***************************************************************************** 151 *****************************************************************************
118 * STRUCTURES AND TYPEDEFS 152 * STRUCTURES AND TYPEDEFS
119 ***************************************************************************** 153 *****************************************************************************
120 */ 154 */
209 243
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 244#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 245# define NO_MOUSE_REPORT_SCROLLBAR 1
212#endif 246#endif
213 247
214#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT
216#endif
217
218#if defined (ISO_14755) || defined (ENABLE_PERL) 248#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1 249# define ENABLE_OVERLAY 1
220#endif 250#endif
221 251
222/* now look for other badly set stuff */ 252/* now look for other badly set stuff */
238# define HAVE_SCROLLBARS 1 268# define HAVE_SCROLLBARS 1
239#endif 269#endif
240 270
241/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 271/* width of scrollBar, menuBar shadow, must be 1 or 2 */
242#ifdef HALFSHADOW 272#ifdef HALFSHADOW
243# define SHADOW 1 273# define MENU_SHADOW 1
244#else 274#else
245# define SHADOW 2 275# define MENU_SHADOW 2
246#endif 276#endif
247 277
248#define R_SB_ALIGN_CENTRE 0 278#define R_SB_ALIGN_CENTRE 0
249#define R_SB_ALIGN_TOP 1 279#define R_SB_ALIGN_TOP 1
250#define R_SB_ALIGN_BOTTOM 2 280#define R_SB_ALIGN_BOTTOM 2
436 XTerm_property = 3, // change X property 466 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 467 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 468 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 469 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 470 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 471 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 472 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 473 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 474 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 475 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 476 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 477 XTerm_font = 50,
448 478
449 XTerm_konsole30 = 30, // reserved for konsole 479 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 480 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 481 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 482 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 483 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
484 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 485 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 486 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 487 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 488 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 489 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 490 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 491 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 492
462 URxvt_locale = 701, // change locale 493 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 494 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 495 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 496 URxvt_Color_tint = 705, // change actual tint colour
497 URxvt_Color_BD = 706,
498 URxvt_Color_UL = 707,
466 499
467 URxvt_font = 710, 500 URxvt_font = 710,
468 URxvt_boldFont = 711, 501 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 502 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 503 URxvt_boldItalicFont = 713,
471 504
472 URxvt_view_up = 720, 505 URxvt_view_up = 720,
473 URxvt_view_down = 721, 506 URxvt_view_down = 721,
507
508 URxvt_perl = 777,
474}; 509};
475 510
476/* Words starting with `Color_' are colours. Others are counts */ 511/* Words starting with `Color_' are colours. Others are counts */
477/* 512/*
478 * The PixColor and rendition colour usage should probably be decoupled 513 * The PixColor and rendition colour usage should probably be decoupled
555 590
556/* 591/*
557 * Resource list 592 * Resource list
558 */ 593 */
559enum { 594enum {
560#define Rs_def(name) Rs_ ## name, 595# define def(name) Rs_ ## name,
561#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 596# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562#include "rsinc.h" 597# include "rsinc.h"
563#undef Rs_def 598# undef def
564#undef Rs_reserve 599# undef reserve
565 NUM_RESOURCES 600 NUM_RESOURCES
566}; 601};
567 602
568// see init.C:xa_names, which must be kept in sync 603// see init.C:xa_names, which must be kept in sync
569enum { 604enum {
683/* 718/*
684 ***************************************************************************** 719 *****************************************************************************
685 * MACRO DEFINES 720 * MACRO DEFINES
686 ***************************************************************************** 721 *****************************************************************************
687 */ 722 */
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 723#define dDisp Display *disp = display->display
705 724
706/* convert pixel dimensions to row/column values. Everything as int32_t */ 725/* convert pixel dimensions to row/column values. Everything as int32_t */
707#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 726#define Pixel2Col(x) Pixel2Width((int32_t)(x))
708#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 727#define Pixel2Row(y) Pixel2Height((int32_t)(y))
711#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 730#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
712#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 731#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
713#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 732#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
714#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 733#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
715 734
716#define TermWin_TotalWidth() ((int32_t)this->width) 735#define OPTION(opt) (options & (opt))
717#define TermWin_TotalHeight() ((int32_t)this->height) 736#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
737 | Opt_jumpScroll | Opt_secondaryScreen \
738 | Opt_pastableTabs | Opt_intensityStyles)
718 739
719// for m >= -n, ensure remainder lies between 0..n-1 740// for m >= -n, ensure remainder lies between 0..n-1
720#define MOD(m,n) (((m) + (n)) % (n)) 741#define MOD(m,n) (((m) + (n)) % (n))
721 742
722#define LINENO(n) MOD (term_start + int(n), total_rows) 743#define LINENO(n) MOD (term_start + int(n), total_rows)
782#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 803#define scrollbar_size() (scrollBar.end - scrollBar.beg \
783 - scrollbar_minheight ()) 804 - scrollbar_minheight ())
784 805
785#if (MENUBAR_MAX > 1) 806#if (MENUBAR_MAX > 1)
786/* rendition style flags */ 807/* rendition style flags */
787# define menuBar_height() (fheight + SHADOW) 808# define menuBar_height() (fheight + MENU_SHADOW)
788# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 809# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
789# define isMenuBarWindow(w) ((w) == menuBar.win) 810# define isMenuBarWindow(w) ((w) == menuBar.win)
790#else 811#else
791# define menuBar_height() (0) 812# define menuBar_height() (0)
792# define menuBar_TotalHeight() (0) 813# define menuBar_TotalHeight() (0)
793# define isMenuBarWindow(w) (0) 814# define isMenuBarWindow(w) (0)
849extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 870extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
850extern void rxvt_exit_failure () __attribute__ ((noreturn)); 871extern void rxvt_exit_failure () __attribute__ ((noreturn));
851 872
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 873#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale); 874extern bool rxvt_set_locale (const char *locale);
854extern bool rxvt_push_locale (const char *locale); 875extern void rxvt_push_locale (const char *locale);
855extern void rxvt_pop_locale (); 876extern void rxvt_pop_locale ();
856 877
857/*
858 ***************************************************************************** 878/****************************************************************************/
859 * VARIABLES 879
860 *****************************************************************************
861 */
862#ifdef MENUBAR 880#ifdef MENUBAR
863# include "menubar.h" 881# include "menubar.h"
864#endif 882#endif
865 883
866#define BLINK_INTERVAL 0.5 884#define BLINK_INTERVAL 0.5
873# endif 891# endif
874# endif 892# endif
875# define __attribute__(x) 893# define __attribute__(x)
876#endif 894#endif
877 895
896/****************************************************************************/
897
898#define LINE_LONGER 0x0001 // line is continued on the next row
899#define LINE_FILTERED 0x0002 // line has been filtered
900#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
901
902struct line_t {
903 text_t *t; // terminal the text
904 rend_t *r; // rendition, uses RS_ flags
905 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
906 uint32_t f; // flags
907
908 bool is_longer ()
909 {
910 return f & LINE_LONGER;
911 }
912
913 void is_longer (int set)
914 {
915 if (set)
916 f |= LINE_LONGER;
917 else
918 f &= ~LINE_LONGER;
919 }
920
921 void clear ()
922 {
923 t = 0;
924 r = 0;
925 l = 0;
926 f = 0;
927 }
928
929 void touch () // call whenever a line is changed/touched/updated
930 {
931#if ENABLE_PERL
932 f &= ~LINE_FILTERED;
933#endif
934 }
935
936 void touch (int col)
937 {
938 max_it (l, col);
939 touch ();
940 }
941};
942
943/****************************************************************************/
944
878// primivite wrapper around mbstate_t to ensure initialisation 945// primivite wrapper around mbstate_t to ensure initialisation
879struct mbstate { 946struct mbstate {
880 mbstate_t mbs; 947 mbstate_t mbs;
881 948
882 operator mbstate_t *() { return &mbs; } 949 operator mbstate_t *() { return &mbs; }
883 void reset () { memset (&mbs, 0, sizeof (mbs)); } 950 void reset () { memset (&mbs, 0, sizeof (mbs)); }
884 mbstate () { reset (); } 951 mbstate () { reset (); }
885}; 952};
886 953
954/****************************************************************************/
955
887#define UNICODE_MASK 0x1fffffUL 956#define UNICODE_MASK 0x1fffffUL
888 957
889#if UNICODE3 958#if UNICODE3
890# define COMPOSE_LO 0x40000000UL 959# define COMPOSE_LO 0x40000000UL
891# define COMPOSE_HI 0x400fffffUL 960# define COMPOSE_HI 0x400fffffUL
892# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 961# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
893#else 962#else
963# if ENABLE_PERL
964# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
965# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
966# else
894# define COMPOSE_LO 0xd800UL 967# define COMPOSE_LO 0xd800UL
895# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 968# define COMPOSE_HI 0xf8ffUL
896# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 969# endif
970# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
897#endif 971#endif
898 972
899#if ENABLE_COMBINING 973#if ENABLE_COMBINING
900// compose chars are used to represent composite characters 974// compose chars are used to represent composite characters
901// that are not representable in unicode, as well as characters 975// that are not representable in unicode, as well as characters
921}; 995};
922 996
923extern class rxvt_composite_vec rxvt_composite; 997extern class rxvt_composite_vec rxvt_composite;
924#endif 998#endif
925 999
1000/****************************************************************************/
926 1001
927#ifdef KEYSYM_RESOURCE 1002#ifdef KEYSYM_RESOURCE
928 class keyboard_manager; 1003 class keyboard_manager;
929#endif 1004#endif
930 1005
931struct rxvt_term : zero_initialized, rxvt_vars { 1006struct rxvt_term : zero_initialized, rxvt_vars {
932 log_callback *log_hook; // log error messages through this hook, if != 0 1007 log_callback *log_hook; // log error messages through this hook, if != 0
933 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 1008 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
934
935#if ENABLE_PERL 1009#if ENABLE_PERL
936 void *self; // perl's $self 1010 rxvt_perl_term perl;
937#endif 1011#endif
938
939 struct mbstate mbstate; // current input multibyte state 1012 struct mbstate mbstate; // current input multibyte state
940 1013
941 unsigned char want_refresh:1, 1014 unsigned char want_refresh:1,
942#ifdef TRANSPARENT 1015#ifdef TRANSPARENT
943 want_full_refresh:1, /* awaiting full screen refresh */ 1016 want_full_refresh:1, /* awaiting full screen refresh */
1093 bar_t *CurrentBar; 1166 bar_t *CurrentBar;
1094# if ! (MENUBAR_MAX > 1) 1167# if ! (MENUBAR_MAX > 1)
1095 bar_t BarList; 1168 bar_t BarList;
1096# endif /* (MENUBAR_MAX > 1) */ 1169# endif /* (MENUBAR_MAX > 1) */
1097#endif 1170#endif
1098#ifdef CURSOR_BLINK
1099 struct timeval lastcursorchange;
1100#endif
1101#ifdef POINTER_BLANK
1102 struct timeval lastmotion;
1103#endif
1104 1171
1105#if ENABLE_OVERLAY 1172#if ENABLE_OVERLAY
1106 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1173 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1107 text_t **ov_text; 1174 text_t **ov_text;
1108 rend_t **ov_rend; 1175 rend_t **ov_rend;
1123 char *env_display; /* environmental variable DISPLAY */ 1190 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1191 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1192 char *env_colorfgbg;
1126 char *locale; 1193 char *locale;
1127 char charsets[4]; 1194 char charsets[4];
1128 unsigned char *v_buffer; /* pointer to physical buffer */ 1195 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1196 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1197 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1131 1198
1132#ifdef KEYSYM_RESOURCE 1199#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1200 keyboard_manager *keyboard;
1134#endif 1201#endif
1135 1202
1136 const char *rs[NUM_RESOURCES]; 1203 const char *rs[NUM_RESOURCES];
1137 /* command input buffering */ 1204 /* command input buffering */
1138 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1205 char *cmdbuf_ptr, *cmdbuf_endp;
1139 unsigned char cmdbuf_base[CBUFSIZ]; 1206 char cmdbuf_base[CBUFSIZ];
1140 1207
1141 rxvt_salloc *talloc; // text line allocator 1208 rxvt_salloc *talloc; // text line allocator
1142 rxvt_salloc *ralloc; // rend line allocator 1209 rxvt_salloc *ralloc; // rend line allocator
1143 1210
1144 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1211 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1153 void iso14755_54 (int x, int y); 1220 void iso14755_54 (int x, int y);
1154# endif 1221# endif
1155#endif 1222#endif
1156 1223
1157 // modifies first argument(!) 1224 // modifies first argument(!)
1158 void paste (unsigned char *data, unsigned int len); 1225 void paste (char *data, unsigned int len);
1159 1226
1160 void flush (); 1227 void flush ();
1161 1228
1162#if TRANSPARENT 1229#if TRANSPARENT
1163 void rootwin_cb (XEvent &xev); 1230 void rootwin_cb (XEvent &xev);
1204 void pointer_blank (); 1271 void pointer_blank ();
1205#endif 1272#endif
1206 void pointer_unblank (); 1273 void pointer_unblank ();
1207 1274
1208 void tt_printf (const char *fmt,...); 1275 void tt_printf (const char *fmt,...);
1209 void tt_write (const unsigned char *data, unsigned int len); 1276 void tt_write (const char *data, unsigned int len);
1210 void pty_write (); 1277 void pty_write ();
1211 1278
1212 void tt_winch (); 1279 void tt_winch ();
1213 1280
1214 rxvt_term (); 1281 rxvt_term ();
1222 1289
1223 bool pty_fill (); 1290 bool pty_fill ();
1224 1291
1225 void init_secondary (); 1292 void init_secondary ();
1226 const char **init_resources (int argc, const char *const *argv); 1293 const char **init_resources (int argc, const char *const *argv);
1294 const char *x_resource (const char *name);
1227 void init_env (); 1295 void init_env ();
1228 void set_locale (const char *locale); 1296 void set_locale (const char *locale);
1229 void init_xlocale (); 1297 void init_xlocale ();
1230 void init_command (const char *const *argv); 1298 void init_command (const char *const *argv);
1231 void run_command (const char *const *argv); 1299 void run_command (const char *const *argv);
1266 1334
1267 /* autoconvert */ 1335 /* autoconvert */
1268 1336
1269 // command.C 1337 // command.C
1270 void lookup_key (XKeyEvent &ev); 1338 void lookup_key (XKeyEvent &ev);
1271 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1339 unsigned int cmd_write (const char *str, unsigned int count);
1272 1340
1273 unicode_t next_char (); 1341 wchar_t next_char ();
1274 unicode_t cmd_getc (); 1342 wchar_t cmd_getc ();
1275 unicode_t next_octet (); 1343 uint32_t next_octet ();
1276 unicode_t cmd_get8 (); 1344 uint32_t cmd_get8 ();
1277 1345
1278 bool cmd_parse (); 1346 bool cmd_parse ();
1279 void mouse_report (XButtonEvent &ev); 1347 void mouse_report (XButtonEvent &ev);
1280 void button_press (XButtonEvent &ev); 1348 void button_press (XButtonEvent &ev);
1281 void button_release (XButtonEvent &ev); 1349 void button_release (XButtonEvent &ev);
1290 void process_nonprinting (unicode_t ch); 1358 void process_nonprinting (unicode_t ch);
1291 void process_escape_vt52 (unicode_t ch); 1359 void process_escape_vt52 (unicode_t ch);
1292 void process_escape_seq (); 1360 void process_escape_seq ();
1293 void process_csi_seq (); 1361 void process_csi_seq ();
1294 void process_window_ops (const int *args, unsigned int nargs); 1362 void process_window_ops (const int *args, unsigned int nargs);
1295 unsigned char *get_to_st (unicode_t &ends_how); 1363 char *get_to_st (unicode_t &ends_how);
1296 void process_dcs_seq (); 1364 void process_dcs_seq ();
1297 void process_osc_seq (); 1365 void process_osc_seq ();
1298 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1366 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); 1367 void process_xterm_seq (int op, const char *str, char resp);
1300 int privcases (int mode, unsigned long bit); 1368 int privcases (int mode, unsigned long bit);
1301 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1369 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); 1370 void process_sgr_mode (unsigned int nargs, const int *arg);
1303 void process_graphics (); 1371 void process_graphics ();
1304 // init.C 1372 // init.C
1408 base += minBrightCOLOR - minCOLOR; 1476 base += minBrightCOLOR - minCOLOR;
1409#endif 1477#endif
1410 return base; 1478 return base;
1411 } 1479 }
1412 1480
1481 bool option (uint32_t opt)
1482 {
1483 return OPTION (opt);
1484 }
1485
1486 void set_option (uint32_t opt, bool set)
1487 {
1488 if (set)
1489 options |= opt;
1490 else
1491 options &= ~opt;
1492 }
1493
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1494 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); 1495 void scr_blank_screen_mem (line_t &l, rend_t efs);
1415 int scr_scroll_text (int row1, int row2, int count); 1496 int scr_scroll_text (int row1, int row2, int count);
1416 void scr_reset (); 1497 void scr_reset ();
1417 void scr_release (); 1498 void scr_release ();
1427 void scr_touch (bool refresh); 1508 void scr_touch (bool refresh);
1428 void scr_expose (int x, int y, int width, int height, bool refresh); 1509 void scr_expose (int x, int y, int width, int height, bool refresh);
1429 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1510 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430 void scr_recolour (); 1511 void scr_recolour ();
1431 void scr_remap_chars (); 1512 void scr_remap_chars ();
1432 void scr_remap_chars (const line_t &l); 1513 void scr_remap_chars (line_t &l);
1433 1514
1434 void scr_poweron (); 1515 void scr_poweron ();
1435 void scr_cursor (int mode); 1516 void scr_cursor (int mode);
1436 void scr_do_wrap (); 1517 void scr_do_wrap ();
1437 int scr_change_screen (int scrn); 1518 int scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg); 1519 void scr_color (unsigned int color, int fgbg);
1439 void scr_rendition (int set, int style); 1520 void scr_rendition (int set, int style);
1440 void scr_add_lines (const unicode_t *str, int nlines, int len); 1521 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1441 void scr_backspace (); 1522 void scr_backspace ();
1442 void scr_tab (int count, bool ht = false); 1523 void scr_tab (int count, bool ht = false);
1443 void scr_gotorc (int row, int col, int relative); 1524 void scr_gotorc (int row, int col, int relative);
1444 void scr_index (enum page_dirn direction); 1525 void scr_index (enum page_dirn direction);
1445 void scr_erase_line (int mode); 1526 void scr_erase_line (int mode);
1460 int scr_move_to (int y, int len); 1541 int scr_move_to (int y, int len);
1461 int scr_page (enum page_dirn direction, int nlines); 1542 int scr_page (enum page_dirn direction, int nlines);
1462 int scr_changeview (unsigned int oldviewstart); 1543 int scr_changeview (unsigned int oldviewstart);
1463 void scr_bell (); 1544 void scr_bell ();
1464 void scr_printscreen (int fullhist); 1545 void scr_printscreen (int fullhist);
1546 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1547 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1465 void scr_reverse_selection (); 1548 void scr_reverse_selection ();
1466 void scr_dump (int fd); 1549 void scr_dump (int fd);
1467 void selection_check (int check_more); 1550 void selection_check (int check_more);
1468 void selection_paste (Window win, Atom prop, bool delete_prop); 1551 void selection_paste (Window win, Atom prop, bool delete_prop);
1469 void selection_property (Window win, Atom prop); 1552 void selection_property (Window win, Atom prop);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines