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.194 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.210 by root, Mon Jan 16 17:11:12 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
438 XTerm_property = 3, // change X property 449 XTerm_property = 3, // change X property
439 XTerm_Color = 4, // change colors 450 XTerm_Color = 4, // change colors
440 XTerm_Color00 = 10, // not implemented, CLASH! 451 XTerm_Color00 = 10, // not implemented, CLASH!
441 XTerm_Color01 = 11, // not implemented 452 XTerm_Color01 = 11, // not implemented
442 XTerm_Color_cursor = 12, // change actual 'Cursor' color 453 XTerm_Color_cursor = 12, // change actual 'Cursor' color
443 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 454 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
444 XTerm_Color_pointer_bg = 14, // not implemented 455 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
445 XTerm_Color05 = 15, // not implemented 456 XTerm_Color05 = 15, // not implemented (tektronix fg)
446 XTerm_Color06 = 16, // not implemented 457 XTerm_Color06 = 16, // not implemented (tektronix bg)
447 XTerm_Color_RV = 17, // change actual 'Highlight' color 458 XTerm_Color_RV = 17, // change actual 'Highlight' color
448 XTerm_logfile = 46, // not implemented 459 XTerm_logfile = 46, // not implemented
449 XTerm_font = 50, 460 XTerm_font = 50,
450 461
451 XTerm_konsole30 = 30, // reserved for konsole 462 XTerm_konsole30 = 30, // reserved for konsole
452 XTerm_konsole31 = 31, // reserved for konsole 463 XTerm_konsole31 = 31, // reserved for konsole
453 XTerm_emacs51 = 51, // reserved for emacs shell 464 XTerm_emacs51 = 51, // reserved for emacs shell
454 /* 465 /*
455 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 466 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
467 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
456 */ 468 */
457 XTerm_Color_BD = 18, // change actual 'Bold' color 469 Rxvt_Color_BD = 18, // change actual 'Bold' color
458 XTerm_Color_UL = 19, // change actual 'Underline' color 470 Rxvt_Color_UL = 19, // change actual 'Underline' color
459 XTerm_Pixmap = 20, // new bg pixmap 471 Rxvt_Pixmap = 20, // new bg pixmap
460 XTerm_restoreFG = 39, // change default fg color 472 Rxvt_restoreFG = 39, // change default fg color
461 XTerm_restoreBG = 49, // change default bg color 473 Rxvt_restoreBG = 49, // change default bg color
462 XTerm_dumpscreen = 55, // dump scrollback and all of screen 474 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
463 475
464 URxvt_locale = 701, // change locale 476 URxvt_locale = 701, // change locale
465 URxvt_Menu = 703, // set menu item 477
466 URxvt_Color_IT = 704, // change actual 'Italic' colour 478 URxvt_Color_IT = 704, // change actual 'Italic' colour
467 URxvt_Color_tint = 705, // change actual tint colour 479 URxvt_Color_tint = 705, // change actual tint colour
480 URxvt_Color_BD = 706,
481 URxvt_Color_UL = 707,
468 482
469 URxvt_font = 710, 483 URxvt_font = 710,
470 URxvt_boldFont = 711, 484 URxvt_boldFont = 711,
471 URxvt_italicFont = 712, 485 URxvt_italicFont = 712,
472 URxvt_boldItalicFont = 713, 486 URxvt_boldItalicFont = 713,
623#define PrivMode_ShiftKeys (1UL<<10) 637#define PrivMode_ShiftKeys (1UL<<10)
624#define PrivMode_VisibleCursor (1UL<<11) 638#define PrivMode_VisibleCursor (1UL<<11)
625#define PrivMode_MouseX10 (1UL<<12) 639#define PrivMode_MouseX10 (1UL<<12)
626#define PrivMode_MouseX11 (1UL<<13) 640#define PrivMode_MouseX11 (1UL<<13)
627#define PrivMode_scrollBar (1UL<<14) 641#define PrivMode_scrollBar (1UL<<14)
628#define PrivMode_menuBar (1UL<<15)
629#define PrivMode_TtyOutputInh (1UL<<16) 642#define PrivMode_TtyOutputInh (1UL<<15)
630#define PrivMode_Keypress (1UL<<17) 643#define PrivMode_Keypress (1UL<<16)
631#define PrivMode_smoothScroll (1UL<<18) 644#define PrivMode_smoothScroll (1UL<<17)
632#define PrivMode_vt52 (1UL<<19) 645#define PrivMode_vt52 (1UL<<18)
633#define PrivMode_LFNL (1UL<<20) 646#define PrivMode_LFNL (1UL<<19)
634/* too annoying to implement X11 highlight tracking */ 647/* too annoying to implement X11 highlight tracking */
635/* #define PrivMode_MouseX11Track (1LU<<21) */ 648/* #define PrivMode_MouseX11Track (1LU<<20) */
636 649
637#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 650#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
638#define PrivMode(test,bit) \ 651#define PrivMode(test,bit) \
639 if (test) \ 652 if (test) \
640 priv_modes |= (bit); \ 653 priv_modes |= (bit); \
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
843extern bool rxvt_set_locale (const char *locale); 845extern bool rxvt_set_locale (const char *locale);
844extern void 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#if USE_XGETDEFAULT
983 XrmDatabase xrmdatabase;
984#endif
985
986 struct mbstate mbstate; // current input multibyte state 979 struct mbstate mbstate; // current input multibyte state
987 980
988 unsigned char want_refresh:1, 981 unsigned char want_refresh:1,
989#ifdef TRANSPARENT 982#ifdef TRANSPARENT
990 want_full_refresh:1, /* awaiting full screen refresh */ 983 want_full_refresh:1, /* awaiting full screen refresh */
1045 refresh_limit, 1038 refresh_limit,
1046 last_bot, /* scrollbar last bottom position */ 1039 last_bot, /* scrollbar last bottom position */
1047 last_top, /* scrollbar last top position */ 1040 last_top, /* scrollbar last top position */
1048 last_state, /* scrollbar last state */ 1041 last_state, /* scrollbar last state */
1049 scrollbar_len, 1042 scrollbar_len,
1050#ifdef MENUBAR
1051 menu_readonly, /* okay to alter menu? */
1052 Arrows_x,
1053#endif
1054#if MENUBAR_MAX > 1
1055 Nbars,
1056#endif
1057 window_vt_x, 1043 window_vt_x,
1058 window_vt_y, 1044 window_vt_y,
1059 window_sb_x, 1045 window_sb_x,
1060# ifdef POINTER_BLANK 1046# ifdef POINTER_BLANK
1061 pointerBlankDelay, 1047 pointerBlankDelay,
1070 unsigned long priv_modes, 1056 unsigned long priv_modes,
1071 SavedModes; 1057 SavedModes;
1072/* ---------- */ 1058/* ---------- */
1073 Atom xa[NUM_XA]; 1059 Atom xa[NUM_XA];
1074/* ---------- */ 1060/* ---------- */
1075#ifdef MENUBAR 1061#ifdef RXVT_SCROLLBAR
1076 GC menubarGC;
1077#endif
1078#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1079 GC scrollbarGC, 1062 GC scrollbarGC,
1080 topShadowGC, 1063 topShadowGC,
1081 botShadowGC; 1064 botShadowGC;
1082#endif 1065#endif
1083#ifdef XTERM_SCROLLBAR 1066#ifdef XTERM_SCROLLBAR
1132 row_col_t oldcursor; 1115 row_col_t oldcursor;
1133#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1134 bgPixmap_t bgPixmap; 1117 bgPixmap_t bgPixmap;
1135 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1118 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1136#endif 1119#endif
1137#ifdef MENUBAR
1138 menu_t *ActiveMenu, /* currently active menu */
1139 *BuildMenu; /* the menu currently being built */
1140 bar_t *CurrentBar;
1141# if ! (MENUBAR_MAX > 1)
1142 bar_t BarList;
1143# endif /* (MENUBAR_MAX > 1) */
1144#endif
1145 1120
1146#if ENABLE_OVERLAY 1121#if ENABLE_OVERLAY
1147 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1122 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1148 text_t **ov_text; 1123 text_t **ov_text;
1149 rend_t **ov_rend; 1124 rend_t **ov_rend;
1196#endif 1171#endif
1197 1172
1198 // modifies first argument(!) 1173 // modifies first argument(!)
1199 void paste (char *data, unsigned int len); 1174 void paste (char *data, unsigned int len);
1200 1175
1201 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 }
1202 1182
1203#if TRANSPARENT 1183#if TRANSPARENT
1204 void rootwin_cb (XEvent &xev); 1184 void rootwin_cb (XEvent &xev);
1205 xevent_watcher rootwin_ev; 1185 xevent_watcher rootwin_ev;
1206#endif 1186#endif
1207 1187
1208 void x_cb (XEvent &xev); 1188 void x_cb (XEvent &xev);
1189 void flush ();
1209 xevent_watcher termwin_ev; 1190 xevent_watcher termwin_ev;
1210 xevent_watcher vt_ev; 1191 xevent_watcher vt_ev;
1211#ifdef HAVE_SCROLLBARS 1192#ifdef HAVE_SCROLLBARS
1212 xevent_watcher scrollbar_ev; 1193 xevent_watcher scrollbar_ev;
1213#endif
1214#ifdef MENUBAR
1215 xevent_watcher menubar_ev;
1216#endif 1194#endif
1217 1195
1218 void check_cb (check_watcher &w); check_watcher check_ev; 1196 void check_cb (check_watcher &w); check_watcher check_ev;
1219 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1197 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1220 void flush_cb (time_watcher &w); time_watcher flush_ev; 1198 void flush_cb (time_watcher &w); time_watcher flush_ev;
1261 bool init (int argc, const char *const *argv); 1239 bool init (int argc, const char *const *argv);
1262 bool init_vars (); 1240 bool init_vars ();
1263 1241
1264 bool pty_fill (); 1242 bool pty_fill ();
1265 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
1266 void init_secondary (); 1251 void init_secondary ();
1267 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);
1268 void init_env (); 1254 void init_env ();
1269 void set_locale (const char *locale); 1255 void set_locale (const char *locale);
1270 void init_xlocale (); 1256 void init_xlocale ();
1271 void init_command (const char *const *argv); 1257 void init_command (const char *const *argv);
1272 void run_command (const char *const *argv); 1258 void run_command (const char *const *argv);
1358 void set_window_color (int idx, const char *color); 1344 void set_window_color (int idx, const char *color);
1359 void set_colorfgbg (); 1345 void set_colorfgbg ();
1360 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1346 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1361 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1347 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1362 1348
1363#ifdef MENUBAR
1364 // menubar.C
1365 void menuitem_free (menu_t *menu, menuitem_t *item);
1366 int action_dispatch (action_t *action);
1367 void menuarrow_free (char name);
1368 void menuarrow_add (char *string);
1369 char *menu_find_base (menu_t **menu, char *path);
1370 menu_t *menu_delete (menu_t *menu);
1371 menu_t *menu_add (menu_t *parent, char *path);
1372 void drawbox_menubar (int x, int len, int state);
1373 void drawtriangle (int x, int y, int state);
1374 void drawbox_menuitem (int y, int state);
1375 void menu_show ();
1376 void menu_display (void (rxvt_term::*update) ());
1377 void menu_hide_all ();
1378 void menu_hide ();
1379 void menu_clear (menu_t *menu);
1380 void menubar_clear ();
1381 bar_t *menubar_find (const char *name);
1382 int menubar_push (const char *name);
1383 void menubar_remove (const char *name);
1384 void menubar_dump (FILE *fp);
1385 void menubar_read (const char *filename);
1386 void menubar_dispatch (char *str);
1387 void draw_Arrows (int name, int state);
1388 void menubar_expose ();
1389 int menubar_mapping (int map);
1390 int menu_select (XButtonEvent &ev);
1391 void menubar_select (XButtonEvent &ev);
1392 void menubar_control (XButtonEvent &ev);
1393 void map_menuBar (int map);
1394#endif
1395
1396 // screen.C 1349 // screen.C
1397 1350
1398 void lalloc (line_t &l) 1351 void lalloc (line_t &l) const
1399 { 1352 {
1400 l.t = (text_t *)talloc->alloc (); 1353 l.t = (text_t *)talloc->alloc ();
1401 l.r = (rend_t *)ralloc->alloc (); 1354 l.r = (rend_t *)ralloc->alloc ();
1402 } 1355 }
1403 1356
1407 talloc->free (l.t); 1360 talloc->free (l.t);
1408 ralloc->free (l.r); 1361 ralloc->free (l.r);
1409 } 1362 }
1410#endif 1363#endif
1411 1364
1412 void lresize (line_t &l) 1365 void lresize (line_t &l) const
1413 { 1366 {
1414 if (!l.t) 1367 if (!l.t)
1415 return; 1368 return;
1416 1369
1417 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));
1421 1374
1422 if (ncol > prev_ncol) 1375 if (ncol > prev_ncol)
1423 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1376 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1424 } 1377 }
1425 1378
1426 int fgcolor_of (rend_t r) 1379 int fgcolor_of (rend_t r) const
1427 { 1380 {
1428 int base = GET_BASEFG (r); 1381 int base = GET_BASEFG (r);
1429#ifndef NO_BRIGHTCOLOR 1382#ifndef NO_BRIGHTCOLOR
1430 if (r & RS_Bold 1383 if (r & RS_Bold
1431# if ENABLE_STYLES 1384# if ENABLE_STYLES
1435 base += minBrightCOLOR - minCOLOR; 1388 base += minBrightCOLOR - minCOLOR;
1436#endif 1389#endif
1437 return base; 1390 return base;
1438 } 1391 }
1439 1392
1440 int bgcolor_of (rend_t r) 1393 int bgcolor_of (rend_t r) const
1441 { 1394 {
1442 int base = GET_BASEBG (r); 1395 int base = GET_BASEBG (r);
1443#ifndef NO_BRIGHTCOLOR 1396#ifndef NO_BRIGHTCOLOR
1444 if (r & RS_Blink 1397 if (r & RS_Blink
1445# if ENABLE_STYLES 1398# if ENABLE_STYLES
1449 base += minBrightCOLOR - minCOLOR; 1402 base += minBrightCOLOR - minCOLOR;
1450#endif 1403#endif
1451 return base; 1404 return base;
1452 } 1405 }
1453 1406
1454 bool option (uint32_t opt) 1407 bool option (uint32_t opt) const
1455 { 1408 {
1456 return OPTION (opt); 1409 return OPTION (opt);
1457 } 1410 }
1458 1411
1459 void set_option (uint32_t opt, bool set) 1412 void set_option (uint32_t opt, bool set)
1462 options |= opt; 1415 options |= opt;
1463 else 1416 else
1464 options &= ~opt; 1417 options &= ~opt;
1465 } 1418 }
1466 1419
1467 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;
1468 void scr_blank_screen_mem (line_t &l, rend_t efs); 1421 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1469 int scr_scroll_text (int row1, int row2, int count); 1422 int scr_scroll_text (int row1, int row2, int count);
1470 void scr_reset (); 1423 void scr_reset ();
1471 void scr_release (); 1424 void scr_release ();
1472 void scr_clear (bool really = false); 1425 void scr_clear (bool really = false);
1473 void scr_refresh (unsigned char refresh_type); 1426 void scr_refresh (unsigned char refresh_type);
1509 void scr_rvideo_mode (int mode); 1462 void scr_rvideo_mode (int mode);
1510 void scr_report_position (); 1463 void scr_report_position ();
1511 void set_font_style (); 1464 void set_font_style ();
1512 void scr_charset_choose (int set); 1465 void scr_charset_choose (int set);
1513 void scr_charset_set (int set, unsigned int ch); 1466 void scr_charset_set (int set, unsigned int ch);
1514 int scr_move_to (int y, int len); 1467 void scr_move_to (int y, int len);
1515 int scr_page (enum page_dirn direction, int nlines); 1468 bool scr_page (enum page_dirn direction, int nlines);
1516 int scr_changeview (unsigned int oldviewstart); 1469 bool scr_changeview (int new_view_start);
1517 void scr_bell (); 1470 void scr_bell ();
1518 void scr_printscreen (int fullhist); 1471 void scr_printscreen (int fullhist);
1519 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1472 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1520 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1473 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1521 void scr_reverse_selection (); 1474 void scr_reverse_selection ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines