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.207 by root, Mon Jan 16 09:51:57 2006 UTC

… …
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include "rxvtlib.h" 4#include "rxvtlib.h"
5 5
6#include "feature.h" 6#include "feature.h"
7
8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1
10#endif
11
12#if ENABLE_PERL
13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1
15#endif
16
17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1
20# define CURSOR_BLINK 1
21#else
22# define ENABLE_MINIMAL 1
23#endif
7 24
8#include <limits.h> 25#include <limits.h>
9 26
10#include <X11/cursorfont.h> 27#include <X11/cursorfont.h>
11#include <X11/keysym.h> 28#include <X11/keysym.h>
… …
19#include "rxvtfont.h" 36#include "rxvtfont.h"
20#include "rxvttoolkit.h" 37#include "rxvttoolkit.h"
21#include "iom.h" 38#include "iom.h"
22#include "salloc.h" 39#include "salloc.h"
23 40
24#if ENABLE_FRILLS 41#include "rxvtperl.h"
25# define ENABLE_XEMBED 1 42
26# define ENABLE_EWMH 1 43// try to avoid some macros to decrease code size, on some systems
27# define CURSOR_BLINK 1 44#if ENABLE_MINIMAL
45# define strcmp(a,b) (strcmp)(a,b)
46# define strlen(a) (strlen)(a)
47# define strcpy(a,b) (strcpy)(a,b)
48# define memset(a,c,l) (memset)(a,c,l)
49# define memcpy(a,b,l) (memcpy)(a,b,l)
28#endif 50#endif
29 51
30/* 52/*
31 ***************************************************************************** 53 *****************************************************************************
32 * SYSTEM HACKS 54 * SYSTEM HACKS
… …
41#if defined (sun) && !defined (__sun__) 63#if defined (sun) && !defined (__sun__)
42# define __sun__ 1 64# define __sun__ 1
43#endif 65#endif
44 66
45#ifndef HAVE_XPOINTER 67#ifndef HAVE_XPOINTER
46typedef char *XPointer; 68typedef char *XPointer;
47#endif 69#endif
48 70
49#ifdef HAVE_TERMIOS_H 71#ifdef HAVE_TERMIOS_H
50# include <termios.h> 72# include <termios.h>
51typedef struct termios ttymode_t; 73typedef struct termios ttymode_t;
… …
111char * rxvt_File_find (const char *file, const char *ext, const char *path); 133char * 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); 134void 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); 135void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs); 136void rxvt_usleep (int usecs);
115 137
138/////////////////////////////////////////////////////////////////////////////
139
140// temporarily replace the process environment
141extern char **environ;
142extern char **rxvt_environ; // the original environ pointer
143
144inline void set_environ (stringvec *envv)
145{
146 if (envv)
147 environ = (char **)envv->begin ();
148}
149
150inline void set_environ (char **envv)
151{
152 if (envv)
153 environ = envv;
154}
155
116/* 156/*
117 ***************************************************************************** 157 *****************************************************************************
118 * STRUCTURES AND TYPEDEFS 158 * STRUCTURES AND TYPEDEFS
119 ***************************************************************************** 159 *****************************************************************************
120 */ 160 */
… …
207# define TERMENV "rxvt-unicode" 247# define TERMENV "rxvt-unicode"
208#endif 248#endif
209 249
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 250#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 251# 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 252#endif
221 253
222/* now look for other badly set stuff */ 254/* now look for other badly set stuff */
223 255
224#if !defined (EACCESS) && defined(EAGAIN) 256#if !defined (EACCESS) && defined(EAGAIN)
… …
436 XTerm_property = 3, // change X property 468 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 469 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 470 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 471 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 472 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 473 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 474 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 475 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 476 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 477 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 478 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 479 XTerm_font = 50,
448 480
449 XTerm_konsole30 = 30, // reserved for konsole 481 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 482 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 483 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 484 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 485 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
486 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 487 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 488 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 489 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 490 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 491 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 492 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 493 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 494
462 URxvt_locale = 701, // change locale 495 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 496 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 497 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 498 URxvt_Color_tint = 705, // change actual tint colour
499 URxvt_Color_BD = 706,
500 URxvt_Color_UL = 707,
466 501
467 URxvt_font = 710, 502 URxvt_font = 710,
468 URxvt_boldFont = 711, 503 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 504 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 505 URxvt_boldItalicFont = 713,
… …
557 592
558/* 593/*
559 * Resource list 594 * Resource list
560 */ 595 */
561enum { 596enum {
562#define Rs_def(name) Rs_ ## name, 597# define def(name) Rs_ ## name,
563#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 598# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
564#include "rsinc.h" 599# include "rsinc.h"
565#undef Rs_def 600# undef def
566#undef Rs_reserve 601# undef reserve
567 NUM_RESOURCES 602 NUM_RESOURCES
568}; 603};
569 604
570// see init.C:xa_names, which must be kept in sync 605// see init.C:xa_names, which must be kept in sync
571enum { 606enum {
… …
685/* 720/*
686 ***************************************************************************** 721 *****************************************************************************
687 * MACRO DEFINES 722 * MACRO DEFINES
688 ***************************************************************************** 723 *****************************************************************************
689 */ 724 */
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 725#define dDisp Display *disp = display->display
707 726
708/* convert pixel dimensions to row/column values. Everything as int32_t */ 727/* convert pixel dimensions to row/column values. Everything as int32_t */
709#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 728#define Pixel2Col(x) Pixel2Width((int32_t)(x))
710#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 729#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
713#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 732#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
714#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 733#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 734#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 735#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
717 736
718#define TermWin_TotalWidth() ((int32_t)this->width) 737#define OPTION(opt) (options & (opt))
719#define TermWin_TotalHeight() ((int32_t)this->height) 738#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
739 | Opt_jumpScroll | Opt_secondaryScreen \
740 | Opt_pastableTabs | Opt_intensityStyles)
720 741
721// for m >= -n, ensure remainder lies between 0..n-1 742// for m >= -n, ensure remainder lies between 0..n-1
722#define MOD(m,n) (((m) + (n)) % (n)) 743#define MOD(m,n) (((m) + (n)) % (n))
723 744
724#define LINENO(n) MOD (term_start + int(n), total_rows) 745#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
851extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 872extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
852extern void rxvt_exit_failure () __attribute__ ((noreturn)); 873extern void rxvt_exit_failure () __attribute__ ((noreturn));
853 874
854#define SET_LOCALE(locale) rxvt_set_locale (locale) 875#define SET_LOCALE(locale) rxvt_set_locale (locale)
855extern bool rxvt_set_locale (const char *locale); 876extern bool rxvt_set_locale (const char *locale);
856extern bool rxvt_push_locale (const char *locale); 877extern void rxvt_push_locale (const char *locale);
857extern void rxvt_pop_locale (); 878extern void rxvt_pop_locale ();
858 879
859/*
860 ***************************************************************************** 880/****************************************************************************/
861 * VARIABLES 881
862 *****************************************************************************
863 */
864#ifdef MENUBAR 882#ifdef MENUBAR
865# include "menubar.h" 883# include "menubar.h"
866#endif 884#endif
867 885
868#define BLINK_INTERVAL 0.5 886#define BLINK_INTERVAL 0.5
… …
875# endif 893# endif
876# endif 894# endif
877# define __attribute__(x) 895# define __attribute__(x)
878#endif 896#endif
879 897
898/****************************************************************************/
899
900#define LINE_LONGER 0x0001 // line is continued on the next row
901#define LINE_FILTERED 0x0002 // line has been filtered
902#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
903
904struct line_t {
905 text_t *t; // terminal the text
906 rend_t *r; // rendition, uses RS_ flags
907 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
908 uint32_t f; // flags
909
910 bool is_longer ()
911 {
912 return f & LINE_LONGER;
913 }
914
915 void is_longer (int set)
916 {
917 if (set)
918 f |= LINE_LONGER;
919 else
920 f &= ~LINE_LONGER;
921 }
922
923 void clear ()
924 {
925 t = 0;
926 r = 0;
927 l = 0;
928 f = 0;
929 }
930
931 void touch () // call whenever a line is changed/touched/updated
932 {
933#if ENABLE_PERL
934 f &= ~LINE_FILTERED;
935#endif
936 }
937
938 void touch (int col)
939 {
940 max_it (l, col);
941 touch ();
942 }
943};
944
945/****************************************************************************/
946
880// primivite wrapper around mbstate_t to ensure initialisation 947// primivite wrapper around mbstate_t to ensure initialisation
881struct mbstate { 948struct mbstate {
882 mbstate_t mbs; 949 mbstate_t mbs;
883 950
884 operator mbstate_t *() { return &mbs; } 951 operator mbstate_t *() { return &mbs; }
885 void reset () { memset (&mbs, 0, sizeof (mbs)); } 952 void reset () { memset (&mbs, 0, sizeof (mbs)); }
886 mbstate () { reset (); } 953 mbstate () { reset (); }
887}; 954};
888 955
956/****************************************************************************/
957
889#define UNICODE_MASK 0x1fffffUL 958#define UNICODE_MASK 0x1fffffUL
890 959
891#if UNICODE3 960#if UNICODE3
892# define COMPOSE_LO 0x40000000UL 961# define COMPOSE_LO 0x40000000UL
893# define COMPOSE_HI 0x400fffffUL 962# define COMPOSE_HI 0x400fffffUL
894# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 963# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
895#else 964#else
965# if ENABLE_PERL
966# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
967# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
968# else
896# define COMPOSE_LO 0xd800UL 969# define COMPOSE_LO 0xd800UL
897# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 970# define COMPOSE_HI 0xf8ffUL
898# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 971# endif
972# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
899#endif 973#endif
900 974
901#if ENABLE_COMBINING 975#if ENABLE_COMBINING
902// compose chars are used to represent composite characters 976// compose chars are used to represent composite characters
903// that are not representable in unicode, as well as characters 977// that are not representable in unicode, as well as characters
… …
923}; 997};
924 998
925extern class rxvt_composite_vec rxvt_composite; 999extern class rxvt_composite_vec rxvt_composite;
926#endif 1000#endif
927 1001
1002/****************************************************************************/
928 1003
929#ifdef KEYSYM_RESOURCE 1004#ifdef KEYSYM_RESOURCE
930 class keyboard_manager; 1005 class keyboard_manager;
931#endif 1006#endif
932 1007
933struct rxvt_term : zero_initialized, rxvt_vars { 1008struct rxvt_term : zero_initialized, rxvt_vars {
934 log_callback *log_hook; // log error messages through this hook, if != 0 1009 log_callback *log_hook; // log error messages through this hook, if != 0
935 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 1010 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
936
937#if ENABLE_PERL 1011#if ENABLE_PERL
938 void *self; // perl's $self 1012 rxvt_perl_term perl;
939#endif 1013#endif
940
941 struct mbstate mbstate; // current input multibyte state 1014 struct mbstate mbstate; // current input multibyte state
942 1015
943 unsigned char want_refresh:1, 1016 unsigned char want_refresh:1,
944#ifdef TRANSPARENT 1017#ifdef TRANSPARENT
945 want_full_refresh:1, /* awaiting full screen refresh */ 1018 want_full_refresh:1, /* awaiting full screen refresh */
… …
1095 bar_t *CurrentBar; 1168 bar_t *CurrentBar;
1096# if ! (MENUBAR_MAX > 1) 1169# if ! (MENUBAR_MAX > 1)
1097 bar_t BarList; 1170 bar_t BarList;
1098# endif /* (MENUBAR_MAX > 1) */ 1171# endif /* (MENUBAR_MAX > 1) */
1099#endif 1172#endif
1100#ifdef CURSOR_BLINK
1101 struct timeval lastcursorchange;
1102#endif
1103#ifdef POINTER_BLANK
1104 struct timeval lastmotion;
1105#endif
1106 1173
1107#if ENABLE_OVERLAY 1174#if ENABLE_OVERLAY
1108 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1175 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1109 text_t **ov_text; 1176 text_t **ov_text;
1110 rend_t **ov_rend; 1177 rend_t **ov_rend;
… …
1125 char *env_display; /* environmental variable DISPLAY */ 1192 char *env_display; /* environmental variable DISPLAY */
1126 char *env_term; /* environmental variable TERM */ 1193 char *env_term; /* environmental variable TERM */
1127 char *env_colorfgbg; 1194 char *env_colorfgbg;
1128 char *locale; 1195 char *locale;
1129 char charsets[4]; 1196 char charsets[4];
1130 unsigned char *v_buffer; /* pointer to physical buffer */ 1197 char *v_buffer; /* pointer to physical buffer */
1131 unsigned int v_buflen; /* size of area to write */ 1198 unsigned int v_buflen; /* size of area to write */
1132 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1199 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1133 1200
1134#ifdef KEYSYM_RESOURCE 1201#ifdef KEYSYM_RESOURCE
1135 keyboard_manager *keyboard; 1202 keyboard_manager *keyboard;
1136#endif 1203#endif
1137 1204
1138 const char *rs[NUM_RESOURCES]; 1205 const char *rs[NUM_RESOURCES];
1139 /* command input buffering */ 1206 /* command input buffering */
1140 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1207 char *cmdbuf_ptr, *cmdbuf_endp;
1141 unsigned char cmdbuf_base[CBUFSIZ]; 1208 char cmdbuf_base[CBUFSIZ];
1142 1209
1143 rxvt_salloc *talloc; // text line allocator 1210 rxvt_salloc *talloc; // text line allocator
1144 rxvt_salloc *ralloc; // rend line allocator 1211 rxvt_salloc *ralloc; // rend line allocator
1145 1212
1146 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1213 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1155 void iso14755_54 (int x, int y); 1222 void iso14755_54 (int x, int y);
1156# endif 1223# endif
1157#endif 1224#endif
1158 1225
1159 // modifies first argument(!) 1226 // modifies first argument(!)
1160 void paste (unsigned char *data, unsigned int len); 1227 void paste (char *data, unsigned int len);
1161 1228
1162 void flush (); 1229 long vt_emask, vt_emask_perl;
1230
1231 void vt_select_input () const
1232 {
1233 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1234 }
1163 1235
1164#if TRANSPARENT 1236#if TRANSPARENT
1165 void rootwin_cb (XEvent &xev); 1237 void rootwin_cb (XEvent &xev);
1166 xevent_watcher rootwin_ev; 1238 xevent_watcher rootwin_ev;
1167#endif 1239#endif
1168 1240
1169 void x_cb (XEvent &xev); 1241 void x_cb (XEvent &xev);
1242 void flush ();
1170 xevent_watcher termwin_ev; 1243 xevent_watcher termwin_ev;
1171 xevent_watcher vt_ev; 1244 xevent_watcher vt_ev;
1172#ifdef HAVE_SCROLLBARS 1245#ifdef HAVE_SCROLLBARS
1173 xevent_watcher scrollbar_ev; 1246 xevent_watcher scrollbar_ev;
1174#endif 1247#endif
… …
1206 void pointer_blank (); 1279 void pointer_blank ();
1207#endif 1280#endif
1208 void pointer_unblank (); 1281 void pointer_unblank ();
1209 1282
1210 void tt_printf (const char *fmt,...); 1283 void tt_printf (const char *fmt,...);
1211 void tt_write (const unsigned char *data, unsigned int len); 1284 void tt_write (const char *data, unsigned int len);
1212 void pty_write (); 1285 void pty_write ();
1213 1286
1214 void tt_winch (); 1287 void tt_winch ();
1215 1288
1216 rxvt_term (); 1289 rxvt_term ();
… …
1222 bool init (int argc, const char *const *argv); 1295 bool init (int argc, const char *const *argv);
1223 bool init_vars (); 1296 bool init_vars ();
1224 1297
1225 bool pty_fill (); 1298 bool pty_fill ();
1226 1299
1300 void make_current () const // make this the "currently active" urxvt instance
1301 {
1302 SET_R (this);
1303 rxvt_set_locale (locale);
1304 set_environ (envv);
1305 }
1306
1227 void init_secondary (); 1307 void init_secondary ();
1228 const char **init_resources (int argc, const char *const *argv); 1308 const char **init_resources (int argc, const char *const *argv);
1309 const char *x_resource (const char *name);
1229 void init_env (); 1310 void init_env ();
1230 void set_locale (const char *locale); 1311 void set_locale (const char *locale);
1231 void init_xlocale (); 1312 void init_xlocale ();
1232 void init_command (const char *const *argv); 1313 void init_command (const char *const *argv);
1233 void run_command (const char *const *argv); 1314 void run_command (const char *const *argv);
… …
1268 1349
1269 /* autoconvert */ 1350 /* autoconvert */
1270 1351
1271 // command.C 1352 // command.C
1272 void lookup_key (XKeyEvent &ev); 1353 void lookup_key (XKeyEvent &ev);
1273 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1354 unsigned int cmd_write (const char *str, unsigned int count);
1274 1355
1275 unicode_t next_char (); 1356 wchar_t next_char ();
1276 unicode_t cmd_getc (); 1357 wchar_t cmd_getc ();
1277 unicode_t next_octet (); 1358 uint32_t next_octet ();
1278 unicode_t cmd_get8 (); 1359 uint32_t cmd_get8 ();
1279 1360
1280 bool cmd_parse (); 1361 bool cmd_parse ();
1281 void mouse_report (XButtonEvent &ev); 1362 void mouse_report (XButtonEvent &ev);
1282 void button_press (XButtonEvent &ev); 1363 void button_press (XButtonEvent &ev);
1283 void button_release (XButtonEvent &ev); 1364 void button_release (XButtonEvent &ev);
… …
1292 void process_nonprinting (unicode_t ch); 1373 void process_nonprinting (unicode_t ch);
1293 void process_escape_vt52 (unicode_t ch); 1374 void process_escape_vt52 (unicode_t ch);
1294 void process_escape_seq (); 1375 void process_escape_seq ();
1295 void process_csi_seq (); 1376 void process_csi_seq ();
1296 void process_window_ops (const int *args, unsigned int nargs); 1377 void process_window_ops (const int *args, unsigned int nargs);
1297 unsigned char *get_to_st (unicode_t &ends_how); 1378 char *get_to_st (unicode_t &ends_how);
1298 void process_dcs_seq (); 1379 void process_dcs_seq ();
1299 void process_osc_seq (); 1380 void process_osc_seq ();
1300 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1381 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); 1382 void process_xterm_seq (int op, const char *str, char resp);
1302 int privcases (int mode, unsigned long bit); 1383 int privcases (int mode, unsigned long bit);
1303 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1384 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); 1385 void process_sgr_mode (unsigned int nargs, const int *arg);
1305 void process_graphics (); 1386 void process_graphics ();
1306 // init.C 1387 // init.C
… …
1354 void map_menuBar (int map); 1435 void map_menuBar (int map);
1355#endif 1436#endif
1356 1437
1357 // screen.C 1438 // screen.C
1358 1439
1359 void lalloc (line_t &l) 1440 void lalloc (line_t &l) const
1360 { 1441 {
1361 l.t = (text_t *)talloc->alloc (); 1442 l.t = (text_t *)talloc->alloc ();
1362 l.r = (rend_t *)ralloc->alloc (); 1443 l.r = (rend_t *)ralloc->alloc ();
1363 } 1444 }
1364 1445
… …
1368 talloc->free (l.t); 1449 talloc->free (l.t);
1369 ralloc->free (l.r); 1450 ralloc->free (l.r);
1370 } 1451 }
1371#endif 1452#endif
1372 1453
1373 void lresize (line_t &l) 1454 void lresize (line_t &l) const
1374 { 1455 {
1375 if (!l.t) 1456 if (!l.t)
1376 return; 1457 return;
1377 1458
1378 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1459 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1382 1463
1383 if (ncol > prev_ncol) 1464 if (ncol > prev_ncol)
1384 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1465 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1385 } 1466 }
1386 1467
1387 int fgcolor_of (rend_t r) 1468 int fgcolor_of (rend_t r) const
1388 { 1469 {
1389 int base = GET_BASEFG (r); 1470 int base = GET_BASEFG (r);
1390#ifndef NO_BRIGHTCOLOR 1471#ifndef NO_BRIGHTCOLOR
1391 if (r & RS_Bold 1472 if (r & RS_Bold
1392# if ENABLE_STYLES 1473# if ENABLE_STYLES
… …
1396 base += minBrightCOLOR - minCOLOR; 1477 base += minBrightCOLOR - minCOLOR;
1397#endif 1478#endif
1398 return base; 1479 return base;
1399 } 1480 }
1400 1481
1401 int bgcolor_of (rend_t r) 1482 int bgcolor_of (rend_t r) const
1402 { 1483 {
1403 int base = GET_BASEBG (r); 1484 int base = GET_BASEBG (r);
1404#ifndef NO_BRIGHTCOLOR 1485#ifndef NO_BRIGHTCOLOR
1405 if (r & RS_Blink 1486 if (r & RS_Blink
1406# if ENABLE_STYLES 1487# if ENABLE_STYLES
… …
1410 base += minBrightCOLOR - minCOLOR; 1491 base += minBrightCOLOR - minCOLOR;
1411#endif 1492#endif
1412 return base; 1493 return base;
1413 } 1494 }
1414 1495
1496 bool option (uint32_t opt) const
1497 {
1498 return OPTION (opt);
1499 }
1500
1501 void set_option (uint32_t opt, bool set)
1502 {
1503 if (set)
1504 options |= opt;
1505 else
1506 options &= ~opt;
1507 }
1508
1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1509 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1416 void scr_blank_screen_mem (line_t &l, rend_t efs); 1510 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1417 int scr_scroll_text (int row1, int row2, int count); 1511 int scr_scroll_text (int row1, int row2, int count);
1418 void scr_reset (); 1512 void scr_reset ();
1419 void scr_release (); 1513 void scr_release ();
1420 void scr_clear (bool really = false); 1514 void scr_clear (bool really = false);
1421 void scr_refresh (unsigned char refresh_type); 1515 void scr_refresh (unsigned char refresh_type);
… …
1429 void scr_touch (bool refresh); 1523 void scr_touch (bool refresh);
1430 void scr_expose (int x, int y, int width, int height, bool refresh); 1524 void scr_expose (int x, int y, int width, int height, bool refresh);
1431 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1525 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1432 void scr_recolour (); 1526 void scr_recolour ();
1433 void scr_remap_chars (); 1527 void scr_remap_chars ();
1434 void scr_remap_chars (const line_t &l); 1528 void scr_remap_chars (line_t &l);
1435 1529
1436 void scr_poweron (); 1530 void scr_poweron ();
1437 void scr_cursor (int mode); 1531 void scr_cursor (int mode);
1438 void scr_do_wrap (); 1532 void scr_do_wrap ();
1439 int scr_change_screen (int scrn); 1533 int scr_change_screen (int scrn);
1440 void scr_color (unsigned int color, int fgbg); 1534 void scr_color (unsigned int color, int fgbg);
1441 void scr_rendition (int set, int style); 1535 void scr_rendition (int set, int style);
1442 void scr_add_lines (const unicode_t *str, int nlines, int len); 1536 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1443 void scr_backspace (); 1537 void scr_backspace ();
1444 void scr_tab (int count, bool ht = false); 1538 void scr_tab (int count, bool ht = false);
1445 void scr_gotorc (int row, int col, int relative); 1539 void scr_gotorc (int row, int col, int relative);
1446 void scr_index (enum page_dirn direction); 1540 void scr_index (enum page_dirn direction);
1447 void scr_erase_line (int mode); 1541 void scr_erase_line (int mode);
… …
1457 void scr_rvideo_mode (int mode); 1551 void scr_rvideo_mode (int mode);
1458 void scr_report_position (); 1552 void scr_report_position ();
1459 void set_font_style (); 1553 void set_font_style ();
1460 void scr_charset_choose (int set); 1554 void scr_charset_choose (int set);
1461 void scr_charset_set (int set, unsigned int ch); 1555 void scr_charset_set (int set, unsigned int ch);
1462 int scr_move_to (int y, int len); 1556 void scr_move_to (int y, int len);
1463 int scr_page (enum page_dirn direction, int nlines); 1557 bool scr_page (enum page_dirn direction, int nlines);
1464 int scr_changeview (unsigned int oldviewstart); 1558 bool scr_changeview (int new_view_start);
1465 void scr_bell (); 1559 void scr_bell ();
1466 void scr_printscreen (int fullhist); 1560 void scr_printscreen (int fullhist);
1561 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1562 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1467 void scr_reverse_selection (); 1563 void scr_reverse_selection ();
1468 void scr_dump (int fd); 1564 void scr_dump (int fd);
1469 void selection_check (int check_more); 1565 void selection_check (int check_more);
1470 void selection_paste (Window win, Atom prop, bool delete_prop); 1566 void selection_paste (Window win, Atom prop, bool delete_prop);
1471 void selection_property (Window win, Atom prop); 1567 void selection_property (Window win, Atom prop);

Diff Legend

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