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.191 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.212 by root, Tue Jan 17 05:47:42 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>
… …
21#include "iom.h" 38#include "iom.h"
22#include "salloc.h" 39#include "salloc.h"
23 40
24#include "rxvtperl.h" 41#include "rxvtperl.h"
25 42
26#if ENABLE_FRILLS 43// try to avoid some macros to decrease code size, on some systems
27# define ENABLE_XEMBED 1 44#if ENABLE_MINIMAL
28# define ENABLE_EWMH 1 45# define strcmp(a,b) (strcmp)(a,b)
29# define CURSOR_BLINK 1 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)
30#endif 50#endif
31 51
32/* 52/*
33 ***************************************************************************** 53 *****************************************************************************
34 * SYSTEM HACKS 54 * SYSTEM HACKS
… …
43#if defined (sun) && !defined (__sun__) 63#if defined (sun) && !defined (__sun__)
44# define __sun__ 1 64# define __sun__ 1
45#endif 65#endif
46 66
47#ifndef HAVE_XPOINTER 67#ifndef HAVE_XPOINTER
48typedef char *XPointer; 68typedef char *XPointer;
49#endif 69#endif
50 70
51#ifdef HAVE_TERMIOS_H 71#ifdef HAVE_TERMIOS_H
52# include <termios.h> 72# include <termios.h>
53typedef struct termios ttymode_t; 73typedef struct termios ttymode_t;
… …
109char * rxvt_Str_trim (char *str); 129char * rxvt_Str_trim (char *str);
110int rxvt_Str_escaped (char *str); 130int rxvt_Str_escaped (char *str);
111char ** rxvt_splitcommastring (const char *cs); 131char ** rxvt_splitcommastring (const char *cs);
112void rxvt_freecommastring (char **cs); 132void rxvt_freecommastring (char **cs);
113char * 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);
114void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
115void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
116void rxvt_usleep (int usecs); 134void rxvt_usleep (int usecs);
135
136/////////////////////////////////////////////////////////////////////////////
137
138// temporarily replace the process environment
139extern char **environ;
140extern char **rxvt_environ; // the original environ pointer
141
142inline void set_environ (stringvec *envv)
143{
144 if (envv)
145 environ = (char **)envv->begin ();
146}
147
148inline void set_environ (char **envv)
149{
150 if (envv)
151 environ = envv;
152}
117 153
118/* 154/*
119 ***************************************************************************** 155 *****************************************************************************
120 * STRUCTURES AND TYPEDEFS 156 * STRUCTURES AND TYPEDEFS
121 ***************************************************************************** 157 *****************************************************************************
122 */ 158 */
123struct grwin_t; 159struct grwin_t;
124 160
125/* Sanitize menubar info */
126#ifndef MENUBAR
127# undef MENUBAR_MAX
128#endif
129#ifndef MENUBAR_MAX
130# define MENUBAR_MAX 0
131#endif
132
133/* If we're using either the rxvt scrollbar or menu bars, keep the 161/* If we're using either the rxvt scrollbar, keep the
134 * scrollColor resource. 162 * scrollColor resource.
135 */ 163 */
136#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 164#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
137# define KEEP_SCROLLCOLOR 1 165# define KEEP_SCROLLCOLOR 1
138#else 166#else
139# undef KEEP_SCROLLCOLOR 167# undef KEEP_SCROLLCOLOR
140#endif 168#endif
141 169
… …
211 239
212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 240#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
213# define NO_MOUSE_REPORT_SCROLLBAR 1 241# define NO_MOUSE_REPORT_SCROLLBAR 1
214#endif 242#endif
215 243
216#ifdef NO_RESOURCES
217# undef USE_XGETDEFAULT
218#endif
219
220#if defined (ISO_14755) || defined (ENABLE_PERL)
221# define ENABLE_OVERLAY 1
222#endif
223
224/* now look for other badly set stuff */ 244/* now look for other badly set stuff */
225 245
226#if !defined (EACCESS) && defined(EAGAIN) 246#if !defined (EACCESS) && defined(EAGAIN)
227# define EACCESS EAGAIN 247# define EACCESS EAGAIN
228#endif 248#endif
… …
230#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 250#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
231# define EXIT_SUCCESS 0 /* exit function success */ 251# define EXIT_SUCCESS 0 /* exit function success */
232# define EXIT_FAILURE 1 /* exit function failure */ 252# define EXIT_FAILURE 1 /* exit function failure */
233#endif 253#endif
234 254
235#define menuBar_esc 10
236#define scrollBar_esc 30 255#define scrollBar_esc 30
237#define menuBar_margin 2 /* margin below text */
238 256
239#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 257#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
240# define HAVE_SCROLLBARS 1 258# define HAVE_SCROLLBARS 1
241#endif
242
243/* width of scrollBar, menuBar shadow, must be 1 or 2 */
244#ifdef HALFSHADOW
245# define MENU_SHADOW 1
246#else
247# define MENU_SHADOW 2
248#endif 259#endif
249 260
250#define R_SB_ALIGN_CENTRE 0 261#define R_SB_ALIGN_CENTRE 0
251#define R_SB_ALIGN_TOP 1 262#define R_SB_ALIGN_TOP 1
252#define R_SB_ALIGN_BOTTOM 2 263#define R_SB_ALIGN_BOTTOM 2
… …
325 * | 336 * |
326 * +---< SB_WIDTH_NEXT 337 * +---< SB_WIDTH_NEXT
327 */ 338 */
328 339
329enum { 340enum {
330 NO_REFRESH = 0 , /* Window not visible at all! */ 341 NO_REFRESH = 0, /* Window not visible at all! */
331 FAST_REFRESH = 1<<0, /* Fully exposed window */ 342 FAST_REFRESH = 1, /* Fully exposed window */
332 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 343 SLOW_REFRESH = 2, /* Partially exposed window */
333 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
334}; 344};
335 345
336#ifdef NO_SECONDARY_SCREEN 346#ifdef NO_SECONDARY_SCREEN
337# define NSCREENS 0 347# define NSCREENS 0
338#else 348#else
… …
438 XTerm_property = 3, // change X property 448 XTerm_property = 3, // change X property
439 XTerm_Color = 4, // change colors 449 XTerm_Color = 4, // change colors
440 XTerm_Color00 = 10, // not implemented, CLASH! 450 XTerm_Color00 = 10, // not implemented, CLASH!
441 XTerm_Color01 = 11, // not implemented 451 XTerm_Color01 = 11, // not implemented
442 XTerm_Color_cursor = 12, // change actual 'Cursor' color 452 XTerm_Color_cursor = 12, // change actual 'Cursor' color
443 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 453 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
444 XTerm_Color_pointer_bg = 14, // not implemented 454 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
445 XTerm_Color05 = 15, // not implemented 455 XTerm_Color05 = 15, // not implemented (tektronix fg)
446 XTerm_Color06 = 16, // not implemented 456 XTerm_Color06 = 16, // not implemented (tektronix bg)
447 XTerm_Color_RV = 17, // change actual 'Highlight' color 457 XTerm_Color_RV = 17, // change actual 'Highlight' color
448 XTerm_logfile = 46, // not implemented 458 XTerm_logfile = 46, // not implemented
449 XTerm_font = 50, 459 XTerm_font = 50,
450 460
451 XTerm_konsole30 = 30, // reserved for konsole 461 XTerm_konsole30 = 30, // reserved for konsole
452 XTerm_konsole31 = 31, // reserved for konsole 462 XTerm_konsole31 = 31, // reserved for konsole
453 XTerm_emacs51 = 51, // reserved for emacs shell 463 XTerm_emacs51 = 51, // reserved for emacs shell
454 /* 464 /*
455 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 465 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
466 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
456 */ 467 */
457 XTerm_Color_BD = 18, // change actual 'Bold' color 468 Rxvt_Color_BD = 18, // change actual 'Bold' color
458 XTerm_Color_UL = 19, // change actual 'Underline' color 469 Rxvt_Color_UL = 19, // change actual 'Underline' color
459 XTerm_Pixmap = 20, // new bg pixmap 470 Rxvt_Pixmap = 20, // new bg pixmap
460 XTerm_restoreFG = 39, // change default fg color 471 Rxvt_restoreFG = 39, // change default fg color
461 XTerm_restoreBG = 49, // change default bg color 472 Rxvt_restoreBG = 49, // change default bg color
462 XTerm_dumpscreen = 55, // dump scrollback and all of screen 473 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
463 474
464 URxvt_locale = 701, // change locale 475 URxvt_locale = 701, // change locale
465 URxvt_Menu = 703, // set menu item 476
466 URxvt_Color_IT = 704, // change actual 'Italic' colour 477 URxvt_Color_IT = 704, // change actual 'Italic' colour
467 URxvt_Color_tint = 705, // change actual tint colour 478 URxvt_Color_tint = 705, // change actual tint colour
479 URxvt_Color_BD = 706,
480 URxvt_Color_UL = 707,
468 481
469 URxvt_font = 710, 482 URxvt_font = 710,
470 URxvt_boldFont = 711, 483 URxvt_boldFont = 711,
471 URxvt_italicFont = 712, 484 URxvt_italicFont = 712,
472 URxvt_boldItalicFont = 713, 485 URxvt_boldItalicFont = 713,
… …
623#define PrivMode_ShiftKeys (1UL<<10) 636#define PrivMode_ShiftKeys (1UL<<10)
624#define PrivMode_VisibleCursor (1UL<<11) 637#define PrivMode_VisibleCursor (1UL<<11)
625#define PrivMode_MouseX10 (1UL<<12) 638#define PrivMode_MouseX10 (1UL<<12)
626#define PrivMode_MouseX11 (1UL<<13) 639#define PrivMode_MouseX11 (1UL<<13)
627#define PrivMode_scrollBar (1UL<<14) 640#define PrivMode_scrollBar (1UL<<14)
628#define PrivMode_menuBar (1UL<<15)
629#define PrivMode_TtyOutputInh (1UL<<16) 641#define PrivMode_TtyOutputInh (1UL<<15)
630#define PrivMode_Keypress (1UL<<17) 642#define PrivMode_Keypress (1UL<<16)
631#define PrivMode_smoothScroll (1UL<<18) 643#define PrivMode_smoothScroll (1UL<<17)
632#define PrivMode_vt52 (1UL<<19) 644#define PrivMode_vt52 (1UL<<18)
633#define PrivMode_LFNL (1UL<<20) 645#define PrivMode_LFNL (1UL<<19)
634/* too annoying to implement X11 highlight tracking */ 646/* too annoying to implement X11 highlight tracking */
635/* #define PrivMode_MouseX11Track (1LU<<21) */ 647/* #define PrivMode_MouseX11Track (1LU<<20) */
636 648
637#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 649#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
638#define PrivMode(test,bit) \ 650#define PrivMode(test,bit) \
639 if (test) \ 651 if (test) \
640 priv_modes |= (bit); \ 652 priv_modes |= (bit); \
… …
687/* 699/*
688 ***************************************************************************** 700 *****************************************************************************
689 * MACRO DEFINES 701 * MACRO DEFINES
690 ***************************************************************************** 702 *****************************************************************************
691 */ 703 */
704#define dLocal(type,name) type const name = this->name
692#define dDisp Display *disp = display->display 705#define dDisp Display *disp = this->display->display
693 706
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 707/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 708#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 709#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 710#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 712#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 713#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 714#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 715#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 716
704#define OPTION(opt) (options & (opt)) 717#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 718#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \ 719 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles) 720 | Opt_pastableTabs | Opt_intensityStyles)
708 721
709// for m >= -n, ensure remainder lies between 0..n-1 722// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 723#define MOD(m,n) (((m) + (n)) % (n))
711 724
712#define LINENO(n) MOD (term_start + int(n), total_rows) 725#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
770#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 783#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
771#define scrollbar_position(y) ((y) - scrollBar.beg) 784#define scrollbar_position(y) ((y) - scrollBar.beg)
772#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 785#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773 - scrollbar_minheight ()) 786 - scrollbar_minheight ())
774 787
775#if (MENUBAR_MAX > 1)
776/* rendition style flags */
777# define menuBar_height() (fheight + MENU_SHADOW)
778# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
779# define isMenuBarWindow(w) ((w) == menuBar.win)
780#else
781# define menuBar_height() (0)
782# define menuBar_TotalHeight() (0)
783# define isMenuBarWindow(w) (0)
784#endif
785
786#ifdef XPM_BACKGROUND 788#ifdef XPM_BACKGROUND
787# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 789# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
788#else 790#else
789# define XPMClearArea(a, b, c, d, e, f, g) 791# define XPMClearArea(a, b, c, d, e, f, g)
790#endif 792#endif
… …
839extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 841extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
840extern void rxvt_exit_failure () __attribute__ ((noreturn)); 842extern void rxvt_exit_failure () __attribute__ ((noreturn));
841 843
842#define SET_LOCALE(locale) rxvt_set_locale (locale) 844#define SET_LOCALE(locale) rxvt_set_locale (locale)
843extern bool rxvt_set_locale (const char *locale); 845extern bool rxvt_set_locale (const char *locale);
844extern bool rxvt_push_locale (const char *locale); 846extern void rxvt_push_locale (const char *locale);
845extern void rxvt_pop_locale (); 847extern void rxvt_pop_locale ();
846 848
847/****************************************************************************/ 849/****************************************************************************/
848
849#ifdef MENUBAR
850# include "menubar.h"
851#endif
852 850
853#define BLINK_INTERVAL 0.5 851#define BLINK_INTERVAL 0.5
854#define TEXT_BLINK_INTERVAL 0.5 852#define TEXT_BLINK_INTERVAL 0.5
855 853
856#ifndef __attribute__ 854#ifndef __attribute__
… …
973#endif 971#endif
974 972
975struct rxvt_term : zero_initialized, rxvt_vars { 973struct rxvt_term : zero_initialized, rxvt_vars {
976 log_callback *log_hook; // log error messages through this hook, if != 0 974 log_callback *log_hook; // log error messages through this hook, if != 0
977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 975 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
978
979#if ENABLE_PERL 976#if ENABLE_PERL
980 rxvt_perl_term perl; 977 rxvt_perl_term perl;
981#endif 978#endif
982
983 struct mbstate mbstate; // current input multibyte state 979 struct mbstate mbstate; // current input multibyte state
984 980
985 unsigned char want_refresh:1, 981 unsigned char want_refresh:1,
986#ifdef TRANSPARENT 982#ifdef TRANSPARENT
987 want_full_refresh:1, /* awaiting full screen refresh */ 983 want_full_refresh:1, /* awaiting full screen refresh */
… …
1042 refresh_limit, 1038 refresh_limit,
1043 last_bot, /* scrollbar last bottom position */ 1039 last_bot, /* scrollbar last bottom position */
1044 last_top, /* scrollbar last top position */ 1040 last_top, /* scrollbar last top position */
1045 last_state, /* scrollbar last state */ 1041 last_state, /* scrollbar last state */
1046 scrollbar_len, 1042 scrollbar_len,
1047#ifdef MENUBAR
1048 menu_readonly, /* okay to alter menu? */
1049 Arrows_x,
1050#endif
1051#if MENUBAR_MAX > 1
1052 Nbars,
1053#endif
1054 window_vt_x, 1043 window_vt_x,
1055 window_vt_y, 1044 window_vt_y,
1056 window_sb_x, 1045 window_sb_x,
1057# ifdef POINTER_BLANK 1046# ifdef POINTER_BLANK
1058 pointerBlankDelay, 1047 pointerBlankDelay,
… …
1067 unsigned long priv_modes, 1056 unsigned long priv_modes,
1068 SavedModes; 1057 SavedModes;
1069/* ---------- */ 1058/* ---------- */
1070 Atom xa[NUM_XA]; 1059 Atom xa[NUM_XA];
1071/* ---------- */ 1060/* ---------- */
1072#ifdef MENUBAR 1061#ifdef RXVT_SCROLLBAR
1073 GC menubarGC;
1074#endif
1075#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1076 GC scrollbarGC, 1062 GC scrollbarGC,
1077 topShadowGC, 1063 topShadowGC,
1078 botShadowGC; 1064 botShadowGC;
1079#endif 1065#endif
1080#ifdef XTERM_SCROLLBAR 1066#ifdef XTERM_SCROLLBAR
… …
1129 row_col_t oldcursor; 1115 row_col_t oldcursor;
1130#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1131 bgPixmap_t bgPixmap; 1117 bgPixmap_t bgPixmap;
1132 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1118 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1133#endif 1119#endif
1134#ifdef MENUBAR
1135 menu_t *ActiveMenu, /* currently active menu */
1136 *BuildMenu; /* the menu currently being built */
1137 bar_t *CurrentBar;
1138# if ! (MENUBAR_MAX > 1)
1139 bar_t BarList;
1140# endif /* (MENUBAR_MAX > 1) */
1141#endif
1142 1120
1143#if ENABLE_OVERLAY 1121#if ENABLE_OVERLAY
1144 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1122 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1145 text_t **ov_text; 1123 text_t **ov_text;
1146 rend_t **ov_rend; 1124 rend_t **ov_rend;
… …
1193#endif 1171#endif
1194 1172
1195 // modifies first argument(!) 1173 // modifies first argument(!)
1196 void paste (char *data, unsigned int len); 1174 void paste (char *data, unsigned int len);
1197 1175
1198 void flush (); 1176 long vt_emask, vt_emask_perl;
1177
1178 void vt_select_input () const
1179 {
1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1181 }
1199 1182
1200#if TRANSPARENT 1183#if TRANSPARENT
1201 void rootwin_cb (XEvent &xev); 1184 void rootwin_cb (XEvent &xev);
1202 xevent_watcher rootwin_ev; 1185 xevent_watcher rootwin_ev;
1203#endif 1186#endif
1204 1187
1205 void x_cb (XEvent &xev); 1188 void x_cb (XEvent &xev);
1189 void flush ();
1206 xevent_watcher termwin_ev; 1190 xevent_watcher termwin_ev;
1207 xevent_watcher vt_ev; 1191 xevent_watcher vt_ev;
1208#ifdef HAVE_SCROLLBARS 1192#ifdef HAVE_SCROLLBARS
1209 xevent_watcher scrollbar_ev; 1193 xevent_watcher scrollbar_ev;
1210#endif
1211#ifdef MENUBAR
1212 xevent_watcher menubar_ev;
1213#endif 1194#endif
1214 1195
1215 void check_cb (check_watcher &w); check_watcher check_ev; 1196 void check_cb (check_watcher &w); check_watcher check_ev;
1216 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1197 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1217 void flush_cb (time_watcher &w); time_watcher flush_ev; 1198 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1258 bool init (int argc, const char *const *argv); 1239 bool init (int argc, const char *const *argv);
1259 bool init_vars (); 1240 bool init_vars ();
1260 1241
1261 bool pty_fill (); 1242 bool pty_fill ();
1262 1243
1244 void make_current () const // make this the "currently active" urxvt instance
1245 {
1246 SET_R (this);
1247 rxvt_set_locale (locale);
1248 set_environ (envv);
1249 }
1250
1263 void init_secondary (); 1251 void init_secondary ();
1264 const char **init_resources (int argc, const char *const *argv); 1252 const char **init_resources (int argc, const char *const *argv);
1253 const char *x_resource (const char *name);
1265 void init_env (); 1254 void init_env ();
1266 void set_locale (const char *locale); 1255 void set_locale (const char *locale);
1267 void init_xlocale (); 1256 void init_xlocale ();
1268 void init_command (const char *const *argv); 1257 void init_command (const char *const *argv);
1269 void run_command (const char *const *argv); 1258 void run_command (const char *const *argv);
… …
1355 void set_window_color (int idx, const char *color); 1344 void set_window_color (int idx, const char *color);
1356 void set_colorfgbg (); 1345 void set_colorfgbg ();
1357 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1346 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1358 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1347 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1359 1348
1360#ifdef MENUBAR
1361 // menubar.C
1362 void menuitem_free (menu_t *menu, menuitem_t *item);
1363 int action_dispatch (action_t *action);
1364 void menuarrow_free (char name);
1365 void menuarrow_add (char *string);
1366 char *menu_find_base (menu_t **menu, char *path);
1367 menu_t *menu_delete (menu_t *menu);
1368 menu_t *menu_add (menu_t *parent, char *path);
1369 void drawbox_menubar (int x, int len, int state);
1370 void drawtriangle (int x, int y, int state);
1371 void drawbox_menuitem (int y, int state);
1372 void menu_show ();
1373 void menu_display (void (rxvt_term::*update) ());
1374 void menu_hide_all ();
1375 void menu_hide ();
1376 void menu_clear (menu_t *menu);
1377 void menubar_clear ();
1378 bar_t *menubar_find (const char *name);
1379 int menubar_push (const char *name);
1380 void menubar_remove (const char *name);
1381 void menubar_dump (FILE *fp);
1382 void menubar_read (const char *filename);
1383 void menubar_dispatch (char *str);
1384 void draw_Arrows (int name, int state);
1385 void menubar_expose ();
1386 int menubar_mapping (int map);
1387 int menu_select (XButtonEvent &ev);
1388 void menubar_select (XButtonEvent &ev);
1389 void menubar_control (XButtonEvent &ev);
1390 void map_menuBar (int map);
1391#endif
1392
1393 // screen.C 1349 // screen.C
1394 1350
1395 void lalloc (line_t &l) 1351 void lalloc (line_t &l) const
1396 { 1352 {
1397 l.t = (text_t *)talloc->alloc (); 1353 l.t = (text_t *)talloc->alloc ();
1398 l.r = (rend_t *)ralloc->alloc (); 1354 l.r = (rend_t *)ralloc->alloc ();
1399 } 1355 }
1400 1356
… …
1404 talloc->free (l.t); 1360 talloc->free (l.t);
1405 ralloc->free (l.r); 1361 ralloc->free (l.r);
1406 } 1362 }
1407#endif 1363#endif
1408 1364
1409 void lresize (line_t &l) 1365 void lresize (line_t &l) const
1410 { 1366 {
1411 if (!l.t) 1367 if (!l.t)
1412 return; 1368 return;
1413 1369
1414 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1370 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1418 1374
1419 if (ncol > prev_ncol) 1375 if (ncol > prev_ncol)
1420 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1376 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1421 } 1377 }
1422 1378
1423 int fgcolor_of (rend_t r) 1379 int fgcolor_of (rend_t r) const
1424 { 1380 {
1425 int base = GET_BASEFG (r); 1381 int base = GET_BASEFG (r);
1426#ifndef NO_BRIGHTCOLOR 1382#ifndef NO_BRIGHTCOLOR
1427 if (r & RS_Bold 1383 if (r & RS_Bold
1428# if ENABLE_STYLES 1384# if ENABLE_STYLES
… …
1432 base += minBrightCOLOR - minCOLOR; 1388 base += minBrightCOLOR - minCOLOR;
1433#endif 1389#endif
1434 return base; 1390 return base;
1435 } 1391 }
1436 1392
1437 int bgcolor_of (rend_t r) 1393 int bgcolor_of (rend_t r) const
1438 { 1394 {
1439 int base = GET_BASEBG (r); 1395 int base = GET_BASEBG (r);
1440#ifndef NO_BRIGHTCOLOR 1396#ifndef NO_BRIGHTCOLOR
1441 if (r & RS_Blink 1397 if (r & RS_Blink
1442# if ENABLE_STYLES 1398# if ENABLE_STYLES
… …
1446 base += minBrightCOLOR - minCOLOR; 1402 base += minBrightCOLOR - minCOLOR;
1447#endif 1403#endif
1448 return base; 1404 return base;
1449 } 1405 }
1450 1406
1451 bool option (uint32_t opt) 1407 bool option (uint32_t opt) const
1452 { 1408 {
1453 return OPTION (opt); 1409 return OPTION (opt);
1454 } 1410 }
1455 1411
1456 void set_option (uint32_t opt, bool set) 1412 void set_option (uint32_t opt, bool set)
… …
1459 options |= opt; 1415 options |= opt;
1460 else 1416 else
1461 options &= ~opt; 1417 options &= ~opt;
1462 } 1418 }
1463 1419
1464 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1420 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1465 void scr_blank_screen_mem (line_t &l, rend_t efs); 1421 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1466 int scr_scroll_text (int row1, int row2, int count); 1422 int scr_scroll_text (int row1, int row2, int count);
1467 void scr_reset (); 1423 void scr_reset ();
1468 void scr_release (); 1424 void scr_release ();
1469 void scr_clear (bool really = false); 1425 void scr_clear (bool really = false);
1470 void scr_refresh (unsigned char refresh_type); 1426 void scr_refresh ();
1471 bool scr_refresh_rend (rend_t mask, rend_t value); 1427 bool scr_refresh_rend (rend_t mask, rend_t value);
1472 void scr_erase_screen (int mode); 1428 void scr_erase_screen (int mode);
1473#if ENABLE_FRILLS 1429#if ENABLE_FRILLS
1474 void scr_erase_savelines (); 1430 void scr_erase_savelines ();
1475 void scr_backindex (); 1431 void scr_backindex ();
… …
1506 void scr_rvideo_mode (int mode); 1462 void scr_rvideo_mode (int mode);
1507 void scr_report_position (); 1463 void scr_report_position ();
1508 void set_font_style (); 1464 void set_font_style ();
1509 void scr_charset_choose (int set); 1465 void scr_charset_choose (int set);
1510 void scr_charset_set (int set, unsigned int ch); 1466 void scr_charset_set (int set, unsigned int ch);
1511 int scr_move_to (int y, int len); 1467 void scr_move_to (int y, int len);
1512 int scr_page (enum page_dirn direction, int nlines); 1468 bool scr_page (enum page_dirn direction, int nlines);
1513 int scr_changeview (unsigned int oldviewstart); 1469 bool scr_changeview (int new_view_start);
1514 void scr_bell (); 1470 void scr_bell ();
1515 void scr_printscreen (int fullhist); 1471 void scr_printscreen (int fullhist);
1472 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1473 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1516 void scr_reverse_selection (); 1474 void scr_reverse_selection ();
1517 void scr_dump (int fd); 1475 void scr_dump (int fd);
1518 void selection_check (int check_more); 1476 void selection_check (int check_more);
1519 void selection_paste (Window win, Atom prop, bool delete_prop); 1477 void selection_paste (Window win, Atom prop, bool delete_prop);
1520 void selection_property (Window win, Atom prop); 1478 void selection_property (Window win, Atom prop);
… …
1537 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1495 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1538#endif 1496#endif
1539 1497
1540#if defined(RXVT_SCROLLBAR) 1498#if defined(RXVT_SCROLLBAR)
1541 // scrollbar-rxvt.C 1499 // scrollbar-rxvt.C
1542 void Draw_button (int x, int y, int state, int dirn);
1543 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1500 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1544#endif 1501#endif
1545 1502
1546#if defined(XTERM_SCROLLBAR) 1503#if defined(XTERM_SCROLLBAR)
1547 // scrollbar-xterm.C 1504 // scrollbar-xterm.C

Diff Legend

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