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.181 by root, Mon Jan 2 17:17:02 2006 UTC vs.
Revision 1.201 by root, Fri Jan 13 04:59:04 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 */
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 232#endif
213 233
214#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT
216#endif
217
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
221 237
222/* now look for other badly set stuff */ 238/* now look for other badly set stuff */
238# define HAVE_SCROLLBARS 1 254# define HAVE_SCROLLBARS 1
239#endif 255#endif
240 256
241/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 257/* width of scrollBar, menuBar shadow, must be 1 or 2 */
242#ifdef HALFSHADOW 258#ifdef HALFSHADOW
243# define SHADOW 1 259# define MENU_SHADOW 1
244#else 260#else
245# define SHADOW 2 261# define MENU_SHADOW 2
246#endif 262#endif
247 263
248#define R_SB_ALIGN_CENTRE 0 264#define R_SB_ALIGN_CENTRE 0
249#define R_SB_ALIGN_TOP 1 265#define R_SB_ALIGN_TOP 1
250#define R_SB_ALIGN_BOTTOM 2 266#define R_SB_ALIGN_BOTTOM 2
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,
471 490
472 URxvt_view_up = 720, 491 URxvt_view_up = 720,
473 URxvt_view_down = 721, 492 URxvt_view_down = 721,
493
494 URxvt_perl = 777,
474}; 495};
475 496
476/* Words starting with `Color_' are colours. Others are counts */ 497/* Words starting with `Color_' are colours. Others are counts */
477/* 498/*
478 * The PixColor and rendition colour usage should probably be decoupled 499 * The PixColor and rendition colour usage should probably be decoupled
555 576
556/* 577/*
557 * Resource list 578 * Resource list
558 */ 579 */
559enum { 580enum {
560#define Rs_def(name) Rs_ ## name, 581# define def(name) Rs_ ## name,
561#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 582# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562#include "rsinc.h" 583# include "rsinc.h"
563#undef Rs_def 584# undef def
564#undef Rs_reserve 585# undef reserve
565 NUM_RESOURCES 586 NUM_RESOURCES
566}; 587};
567 588
568// see init.C:xa_names, which must be kept in sync 589// see init.C:xa_names, which must be kept in sync
569enum { 590enum {
683/* 704/*
684 ***************************************************************************** 705 *****************************************************************************
685 * MACRO DEFINES 706 * MACRO DEFINES
686 ***************************************************************************** 707 *****************************************************************************
687 */ 708 */
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 709#define dDisp Display *disp = display->display
705 710
706/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
707#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
708#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
711#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 716#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
712#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 717#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
713#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
714#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
715 720
716#define TermWin_TotalWidth() ((int32_t)this->width) 721#define OPTION(opt) (options & (opt))
717#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)
718 725
719// for m >= -n, ensure remainder lies between 0..n-1 726// for m >= -n, ensure remainder lies between 0..n-1
720#define MOD(m,n) (((m) + (n)) % (n)) 727#define MOD(m,n) (((m) + (n)) % (n))
721 728
722#define LINENO(n) MOD (term_start + int(n), total_rows) 729#define LINENO(n) MOD (term_start + int(n), total_rows)
782#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 789#define scrollbar_size() (scrollBar.end - scrollBar.beg \
783 - scrollbar_minheight ()) 790 - scrollbar_minheight ())
784 791
785#if (MENUBAR_MAX > 1) 792#if (MENUBAR_MAX > 1)
786/* rendition style flags */ 793/* rendition style flags */
787# define menuBar_height() (fheight + SHADOW) 794# define menuBar_height() (fheight + MENU_SHADOW)
788# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 795# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
789# define isMenuBarWindow(w) ((w) == menuBar.win) 796# define isMenuBarWindow(w) ((w) == menuBar.win)
790#else 797#else
791# define menuBar_height() (0) 798# define menuBar_height() (0)
792# define menuBar_TotalHeight() (0) 799# define menuBar_TotalHeight() (0)
793# define isMenuBarWindow(w) (0) 800# define isMenuBarWindow(w) (0)
849extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 856extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
850extern void rxvt_exit_failure () __attribute__ ((noreturn)); 857extern void rxvt_exit_failure () __attribute__ ((noreturn));
851 858
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 859#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale); 860extern bool rxvt_set_locale (const char *locale);
861extern void rxvt_push_locale (const char *locale);
862extern void rxvt_pop_locale ();
854 863
855/*
856 ***************************************************************************** 864/****************************************************************************/
857 * VARIABLES 865
858 *****************************************************************************
859 */
860#ifdef MENUBAR 866#ifdef MENUBAR
861# include "menubar.h" 867# include "menubar.h"
862#endif 868#endif
863 869
864#define BLINK_INTERVAL 0.5 870#define BLINK_INTERVAL 0.5
871# endif 877# endif
872# endif 878# endif
873# define __attribute__(x) 879# define __attribute__(x)
874#endif 880#endif
875 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
876// primivite wrapper around mbstate_t to ensure initialisation 931// primivite wrapper around mbstate_t to ensure initialisation
877struct mbstate { 932struct mbstate {
878 mbstate_t mbs; 933 mbstate_t mbs;
879 934
880 operator mbstate_t *() { return &mbs; } 935 operator mbstate_t *() { return &mbs; }
881 void reset () { memset (&mbs, 0, sizeof (mbs)); } 936 void reset () { memset (&mbs, 0, sizeof (mbs)); }
882 mbstate () { reset (); } 937 mbstate () { reset (); }
883}; 938};
884 939
940/****************************************************************************/
941
885#define UNICODE_MASK 0x1fffffUL 942#define UNICODE_MASK 0x1fffffUL
886 943
887#if UNICODE3 944#if UNICODE3
888# define COMPOSE_LO 0x40000000UL 945# define COMPOSE_LO 0x40000000UL
889# define COMPOSE_HI 0x400fffffUL 946# define COMPOSE_HI 0x400fffffUL
890# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 947# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
891#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
892# define COMPOSE_LO 0xd800UL 953# define COMPOSE_LO 0xd800UL
893# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 954# define COMPOSE_HI 0xf8ffUL
894# 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)
895#endif 957#endif
896 958
897#if ENABLE_COMBINING 959#if ENABLE_COMBINING
898// compose chars are used to represent composite characters 960// compose chars are used to represent composite characters
899// that are not representable in unicode, as well as characters 961// that are not representable in unicode, as well as characters
919}; 981};
920 982
921extern class rxvt_composite_vec rxvt_composite; 983extern class rxvt_composite_vec rxvt_composite;
922#endif 984#endif
923 985
986/****************************************************************************/
924 987
925#ifdef KEYSYM_RESOURCE 988#ifdef KEYSYM_RESOURCE
926 class keyboard_manager; 989 class keyboard_manager;
927#endif 990#endif
928 991
929struct rxvt_term : zero_initialized, rxvt_vars { 992struct rxvt_term : zero_initialized, rxvt_vars {
930 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
931 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 994 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
932
933#if ENABLE_PERL 995#if ENABLE_PERL
934 void *self; // perl's $self 996 rxvt_perl_term perl;
935#endif 997#endif
936
937 struct mbstate mbstate; // current input multibyte state 998 struct mbstate mbstate; // current input multibyte state
938 999
939 unsigned char want_refresh:1, 1000 unsigned char want_refresh:1,
940#ifdef TRANSPARENT 1001#ifdef TRANSPARENT
941 want_full_refresh:1, /* awaiting full screen refresh */ 1002 want_full_refresh:1, /* awaiting full screen refresh */
1091 bar_t *CurrentBar; 1152 bar_t *CurrentBar;
1092# if ! (MENUBAR_MAX > 1) 1153# if ! (MENUBAR_MAX > 1)
1093 bar_t BarList; 1154 bar_t BarList;
1094# endif /* (MENUBAR_MAX > 1) */ 1155# endif /* (MENUBAR_MAX > 1) */
1095#endif 1156#endif
1096#ifdef CURSOR_BLINK
1097 struct timeval lastcursorchange;
1098#endif
1099#ifdef POINTER_BLANK
1100 struct timeval lastmotion;
1101#endif
1102 1157
1103#if ENABLE_OVERLAY 1158#if ENABLE_OVERLAY
1104 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1159 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1105 text_t **ov_text; 1160 text_t **ov_text;
1106 rend_t **ov_rend; 1161 rend_t **ov_rend;
1121 char *env_display; /* environmental variable DISPLAY */ 1176 char *env_display; /* environmental variable DISPLAY */
1122 char *env_term; /* environmental variable TERM */ 1177 char *env_term; /* environmental variable TERM */
1123 char *env_colorfgbg; 1178 char *env_colorfgbg;
1124 char *locale; 1179 char *locale;
1125 char charsets[4]; 1180 char charsets[4];
1126 unsigned char *v_buffer; /* pointer to physical buffer */ 1181 char *v_buffer; /* pointer to physical buffer */
1127 unsigned int v_buflen; /* size of area to write */ 1182 unsigned int v_buflen; /* size of area to write */
1128 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1183 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1129 1184
1130#ifdef KEYSYM_RESOURCE 1185#ifdef KEYSYM_RESOURCE
1131 keyboard_manager *keyboard; 1186 keyboard_manager *keyboard;
1132#endif 1187#endif
1133 1188
1134 const char *rs[NUM_RESOURCES]; 1189 const char *rs[NUM_RESOURCES];
1135 /* command input buffering */ 1190 /* command input buffering */
1136 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1191 char *cmdbuf_ptr, *cmdbuf_endp;
1137 unsigned char cmdbuf_base[CBUFSIZ]; 1192 char cmdbuf_base[CBUFSIZ];
1138 1193
1139 rxvt_salloc *talloc; // text line allocator 1194 rxvt_salloc *talloc; // text line allocator
1140 rxvt_salloc *ralloc; // rend line allocator 1195 rxvt_salloc *ralloc; // rend line allocator
1141 1196
1142 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
1151 void iso14755_54 (int x, int y); 1206 void iso14755_54 (int x, int y);
1152# endif 1207# endif
1153#endif 1208#endif
1154 1209
1155 // modifies first argument(!) 1210 // modifies first argument(!)
1156 void paste (unsigned char *data, unsigned int len); 1211 void paste (char *data, unsigned int len);
1157 1212
1158 void flush (); 1213 long vt_emask, vt_emask_perl;
1214
1215 void vt_select_input ()
1216 {
1217 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1218 }
1159 1219
1160#if TRANSPARENT 1220#if TRANSPARENT
1161 void rootwin_cb (XEvent &xev); 1221 void rootwin_cb (XEvent &xev);
1162 xevent_watcher rootwin_ev; 1222 xevent_watcher rootwin_ev;
1163#endif 1223#endif
1164 1224
1165 void x_cb (XEvent &xev); 1225 void x_cb (XEvent &xev);
1226 void flush ();
1166 xevent_watcher termwin_ev; 1227 xevent_watcher termwin_ev;
1167 xevent_watcher vt_ev; 1228 xevent_watcher vt_ev;
1168#ifdef HAVE_SCROLLBARS 1229#ifdef HAVE_SCROLLBARS
1169 xevent_watcher scrollbar_ev; 1230 xevent_watcher scrollbar_ev;
1170#endif 1231#endif
1202 void pointer_blank (); 1263 void pointer_blank ();
1203#endif 1264#endif
1204 void pointer_unblank (); 1265 void pointer_unblank ();
1205 1266
1206 void tt_printf (const char *fmt,...); 1267 void tt_printf (const char *fmt,...);
1207 void tt_write (const unsigned char *data, unsigned int len); 1268 void tt_write (const char *data, unsigned int len);
1208 void pty_write (); 1269 void pty_write ();
1209 1270
1210 void tt_winch (); 1271 void tt_winch ();
1211 1272
1212 rxvt_term (); 1273 rxvt_term ();
1220 1281
1221 bool pty_fill (); 1282 bool pty_fill ();
1222 1283
1223 void init_secondary (); 1284 void init_secondary ();
1224 const char **init_resources (int argc, const char *const *argv); 1285 const char **init_resources (int argc, const char *const *argv);
1286 const char *x_resource (const char *name);
1225 void init_env (); 1287 void init_env ();
1226 void set_locale (const char *locale); 1288 void set_locale (const char *locale);
1227 void init_xlocale (); 1289 void init_xlocale ();
1228 void init_command (const char *const *argv); 1290 void init_command (const char *const *argv);
1229 void run_command (const char *const *argv); 1291 void run_command (const char *const *argv);
1264 1326
1265 /* autoconvert */ 1327 /* autoconvert */
1266 1328
1267 // command.C 1329 // command.C
1268 void lookup_key (XKeyEvent &ev); 1330 void lookup_key (XKeyEvent &ev);
1269 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1331 unsigned int cmd_write (const char *str, unsigned int count);
1270 1332
1271 unicode_t next_char (); 1333 wchar_t next_char ();
1272 unicode_t cmd_getc (); 1334 wchar_t cmd_getc ();
1273 unicode_t next_octet (); 1335 uint32_t next_octet ();
1274 unicode_t cmd_get8 (); 1336 uint32_t cmd_get8 ();
1275 1337
1276 bool cmd_parse (); 1338 bool cmd_parse ();
1277 void mouse_report (XButtonEvent &ev); 1339 void mouse_report (XButtonEvent &ev);
1278 void button_press (XButtonEvent &ev); 1340 void button_press (XButtonEvent &ev);
1279 void button_release (XButtonEvent &ev); 1341 void button_release (XButtonEvent &ev);
1288 void process_nonprinting (unicode_t ch); 1350 void process_nonprinting (unicode_t ch);
1289 void process_escape_vt52 (unicode_t ch); 1351 void process_escape_vt52 (unicode_t ch);
1290 void process_escape_seq (); 1352 void process_escape_seq ();
1291 void process_csi_seq (); 1353 void process_csi_seq ();
1292 void process_window_ops (const int *args, unsigned int nargs); 1354 void process_window_ops (const int *args, unsigned int nargs);
1293 unsigned char *get_to_st (unicode_t &ends_how); 1355 char *get_to_st (unicode_t &ends_how);
1294 void process_dcs_seq (); 1356 void process_dcs_seq ();
1295 void process_osc_seq (); 1357 void process_osc_seq ();
1296 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1358 void process_color_seq (int report, int color, const char *str, char resp);
1297 void process_xterm_seq (int op, const char *str, unsigned char resp); 1359 void process_xterm_seq (int op, const char *str, char resp);
1298 int privcases (int mode, unsigned long bit); 1360 int privcases (int mode, unsigned long bit);
1299 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1361 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1300 void process_sgr_mode (unsigned int nargs, const int *arg); 1362 void process_sgr_mode (unsigned int nargs, const int *arg);
1301 void process_graphics (); 1363 void process_graphics ();
1302 // init.C 1364 // init.C
1406 base += minBrightCOLOR - minCOLOR; 1468 base += minBrightCOLOR - minCOLOR;
1407#endif 1469#endif
1408 return base; 1470 return base;
1409 } 1471 }
1410 1472
1473 bool option (uint32_t opt)
1474 {
1475 return OPTION (opt);
1476 }
1477
1478 void set_option (uint32_t opt, bool set)
1479 {
1480 if (set)
1481 options |= opt;
1482 else
1483 options &= ~opt;
1484 }
1485
1411 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1486 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1412 void scr_blank_screen_mem (line_t &l, rend_t efs); 1487 void scr_blank_screen_mem (line_t &l, rend_t efs);
1413 int scr_scroll_text (int row1, int row2, int count); 1488 int scr_scroll_text (int row1, int row2, int count);
1414 void scr_reset (); 1489 void scr_reset ();
1415 void scr_release (); 1490 void scr_release ();
1425 void scr_touch (bool refresh); 1500 void scr_touch (bool refresh);
1426 void scr_expose (int x, int y, int width, int height, bool refresh); 1501 void scr_expose (int x, int y, int width, int height, bool refresh);
1427 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1502 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1428 void scr_recolour (); 1503 void scr_recolour ();
1429 void scr_remap_chars (); 1504 void scr_remap_chars ();
1430 void scr_remap_chars (const line_t &l); 1505 void scr_remap_chars (line_t &l);
1431 1506
1432 void scr_poweron (); 1507 void scr_poweron ();
1433 void scr_cursor (int mode); 1508 void scr_cursor (int mode);
1434 void scr_do_wrap (); 1509 void scr_do_wrap ();
1435 int scr_change_screen (int scrn); 1510 int scr_change_screen (int scrn);
1436 void scr_color (unsigned int color, int fgbg); 1511 void scr_color (unsigned int color, int fgbg);
1437 void scr_rendition (int set, int style); 1512 void scr_rendition (int set, int style);
1438 void scr_add_lines (const unicode_t *str, int nlines, int len); 1513 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1439 void scr_backspace (); 1514 void scr_backspace ();
1440 void scr_tab (int count, bool ht = false); 1515 void scr_tab (int count, bool ht = false);
1441 void scr_gotorc (int row, int col, int relative); 1516 void scr_gotorc (int row, int col, int relative);
1442 void scr_index (enum page_dirn direction); 1517 void scr_index (enum page_dirn direction);
1443 void scr_erase_line (int mode); 1518 void scr_erase_line (int mode);
1458 int scr_move_to (int y, int len); 1533 int scr_move_to (int y, int len);
1459 int scr_page (enum page_dirn direction, int nlines); 1534 int scr_page (enum page_dirn direction, int nlines);
1460 int scr_changeview (unsigned int oldviewstart); 1535 int scr_changeview (unsigned int oldviewstart);
1461 void scr_bell (); 1536 void scr_bell ();
1462 void scr_printscreen (int fullhist); 1537 void scr_printscreen (int fullhist);
1538 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1539 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1463 void scr_reverse_selection (); 1540 void scr_reverse_selection ();
1464 void scr_dump (int fd); 1541 void scr_dump (int fd);
1465 void selection_check (int check_more); 1542 void selection_check (int check_more);
1466 void selection_paste (Window win, Atom prop, bool delete_prop); 1543 void selection_paste (Window win, Atom prop, bool delete_prop);
1467 void selection_property (Window win, Atom prop); 1544 void selection_property (Window win, Atom prop);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines