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.193 by root, Mon Jan 9 23:00:07 2006 UTC vs.
Revision 1.208 by root, Mon Jan 16 15:00:20 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;
… …
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); 134void 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); 135void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
116void rxvt_usleep (int usecs); 136void rxvt_usleep (int usecs);
117 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
118/* 156/*
119 ***************************************************************************** 157 *****************************************************************************
120 * STRUCTURES AND TYPEDEFS 158 * STRUCTURES AND TYPEDEFS
121 ***************************************************************************** 159 *****************************************************************************
122 */ 160 */
123struct grwin_t; 161struct grwin_t;
124 162
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 163/* If we're using either the rxvt scrollbar or menu bars, keep the
134 * scrollColor resource. 164 * scrollColor resource.
135 */ 165 */
136#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 166#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
137# define KEEP_SCROLLCOLOR 1 167# define KEEP_SCROLLCOLOR 1
138#else 168#else
139# undef KEEP_SCROLLCOLOR 169# undef KEEP_SCROLLCOLOR
140#endif 170#endif
141 171
… …
211 241
212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 242#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
213# define NO_MOUSE_REPORT_SCROLLBAR 1 243# define NO_MOUSE_REPORT_SCROLLBAR 1
214#endif 244#endif
215 245
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 */ 246/* now look for other badly set stuff */
225 247
226#if !defined (EACCESS) && defined(EAGAIN) 248#if !defined (EACCESS) && defined(EAGAIN)
227# define EACCESS EAGAIN 249# define EACCESS EAGAIN
228#endif 250#endif
… …
230#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 252#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
231# define EXIT_SUCCESS 0 /* exit function success */ 253# define EXIT_SUCCESS 0 /* exit function success */
232# define EXIT_FAILURE 1 /* exit function failure */ 254# define EXIT_FAILURE 1 /* exit function failure */
233#endif 255#endif
234 256
235#define menuBar_esc 10
236#define scrollBar_esc 30 257#define scrollBar_esc 30
237#define menuBar_margin 2 /* margin below text */
238 258
239#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 259#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
240# define HAVE_SCROLLBARS 1 260# define HAVE_SCROLLBARS 1
241#endif 261#endif
242 262
243/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 263/* width of scrollBar shadow, must be 1 or 2 */
244#ifdef HALFSHADOW 264#ifdef HALFSHADOW
245# define MENU_SHADOW 1 265# define MENU_SHADOW 1
246#else 266#else
247# define MENU_SHADOW 2 267# define MENU_SHADOW 2
248#endif 268#endif
… …
438 XTerm_property = 3, // change X property 458 XTerm_property = 3, // change X property
439 XTerm_Color = 4, // change colors 459 XTerm_Color = 4, // change colors
440 XTerm_Color00 = 10, // not implemented, CLASH! 460 XTerm_Color00 = 10, // not implemented, CLASH!
441 XTerm_Color01 = 11, // not implemented 461 XTerm_Color01 = 11, // not implemented
442 XTerm_Color_cursor = 12, // change actual 'Cursor' color 462 XTerm_Color_cursor = 12, // change actual 'Cursor' color
443 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 463 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
444 XTerm_Color_pointer_bg = 14, // not implemented 464 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
445 XTerm_Color05 = 15, // not implemented 465 XTerm_Color05 = 15, // not implemented (tektronix fg)
446 XTerm_Color06 = 16, // not implemented 466 XTerm_Color06 = 16, // not implemented (tektronix bg)
447 XTerm_Color_RV = 17, // change actual 'Highlight' color 467 XTerm_Color_RV = 17, // change actual 'Highlight' color
448 XTerm_logfile = 46, // not implemented 468 XTerm_logfile = 46, // not implemented
449 XTerm_font = 50, 469 XTerm_font = 50,
450 470
451 XTerm_konsole30 = 30, // reserved for konsole 471 XTerm_konsole30 = 30, // reserved for konsole
452 XTerm_konsole31 = 31, // reserved for konsole 472 XTerm_konsole31 = 31, // reserved for konsole
453 XTerm_emacs51 = 51, // reserved for emacs shell 473 XTerm_emacs51 = 51, // reserved for emacs shell
454 /* 474 /*
455 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 475 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
476 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
456 */ 477 */
457 XTerm_Color_BD = 18, // change actual 'Bold' color 478 Rxvt_Color_BD = 18, // change actual 'Bold' color
458 XTerm_Color_UL = 19, // change actual 'Underline' color 479 Rxvt_Color_UL = 19, // change actual 'Underline' color
459 XTerm_Pixmap = 20, // new bg pixmap 480 Rxvt_Pixmap = 20, // new bg pixmap
460 XTerm_restoreFG = 39, // change default fg color 481 Rxvt_restoreFG = 39, // change default fg color
461 XTerm_restoreBG = 49, // change default bg color 482 Rxvt_restoreBG = 49, // change default bg color
462 XTerm_dumpscreen = 55, // dump scrollback and all of screen 483 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
463 484
464 URxvt_locale = 701, // change locale 485 URxvt_locale = 701, // change locale
465 URxvt_Menu = 703, // set menu item 486 URxvt_Menu = 703, // set menu item
466 URxvt_Color_IT = 704, // change actual 'Italic' colour 487 URxvt_Color_IT = 704, // change actual 'Italic' colour
467 URxvt_Color_tint = 705, // change actual tint colour 488 URxvt_Color_tint = 705, // change actual tint colour
489 URxvt_Color_BD = 706,
490 URxvt_Color_UL = 707,
468 491
469 URxvt_font = 710, 492 URxvt_font = 710,
470 URxvt_boldFont = 711, 493 URxvt_boldFont = 711,
471 URxvt_italicFont = 712, 494 URxvt_italicFont = 712,
472 URxvt_boldItalicFont = 713, 495 URxvt_boldItalicFont = 713,
… …
623#define PrivMode_ShiftKeys (1UL<<10) 646#define PrivMode_ShiftKeys (1UL<<10)
624#define PrivMode_VisibleCursor (1UL<<11) 647#define PrivMode_VisibleCursor (1UL<<11)
625#define PrivMode_MouseX10 (1UL<<12) 648#define PrivMode_MouseX10 (1UL<<12)
626#define PrivMode_MouseX11 (1UL<<13) 649#define PrivMode_MouseX11 (1UL<<13)
627#define PrivMode_scrollBar (1UL<<14) 650#define PrivMode_scrollBar (1UL<<14)
628#define PrivMode_menuBar (1UL<<15)
629#define PrivMode_TtyOutputInh (1UL<<16) 651#define PrivMode_TtyOutputInh (1UL<<15)
630#define PrivMode_Keypress (1UL<<17) 652#define PrivMode_Keypress (1UL<<16)
631#define PrivMode_smoothScroll (1UL<<18) 653#define PrivMode_smoothScroll (1UL<<17)
632#define PrivMode_vt52 (1UL<<19) 654#define PrivMode_vt52 (1UL<<18)
633#define PrivMode_LFNL (1UL<<20) 655#define PrivMode_LFNL (1UL<<19)
634/* too annoying to implement X11 highlight tracking */ 656/* too annoying to implement X11 highlight tracking */
635/* #define PrivMode_MouseX11Track (1LU<<21) */ 657/* #define PrivMode_MouseX11Track (1LU<<20) */
636 658
637#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 659#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
638#define PrivMode(test,bit) \ 660#define PrivMode(test,bit) \
639 if (test) \ 661 if (test) \
640 priv_modes |= (bit); \ 662 priv_modes |= (bit); \
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 721#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 722#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 723#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 724#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 725
704#define OPTION(opt) (options & (opt)) 726#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 727#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \ 728 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles) 729 | Opt_pastableTabs | Opt_intensityStyles)
708 730
709// for m >= -n, ensure remainder lies between 0..n-1 731// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 732#define MOD(m,n) (((m) + (n)) % (n))
711 733
712#define LINENO(n) MOD (term_start + int(n), total_rows) 734#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
770#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 792#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
771#define scrollbar_position(y) ((y) - scrollBar.beg) 793#define scrollbar_position(y) ((y) - scrollBar.beg)
772#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 794#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773 - scrollbar_minheight ()) 795 - scrollbar_minheight ())
774 796
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 797#ifdef XPM_BACKGROUND
787# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 798# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
788#else 799#else
789# define XPMClearArea(a, b, c, d, e, f, g) 800# define XPMClearArea(a, b, c, d, e, f, g)
790#endif 801#endif
… …
839extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 850extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
840extern void rxvt_exit_failure () __attribute__ ((noreturn)); 851extern void rxvt_exit_failure () __attribute__ ((noreturn));
841 852
842#define SET_LOCALE(locale) rxvt_set_locale (locale) 853#define SET_LOCALE(locale) rxvt_set_locale (locale)
843extern bool rxvt_set_locale (const char *locale); 854extern bool rxvt_set_locale (const char *locale);
844extern bool rxvt_push_locale (const char *locale); 855extern void rxvt_push_locale (const char *locale);
845extern void rxvt_pop_locale (); 856extern void rxvt_pop_locale ();
846 857
847/****************************************************************************/ 858/****************************************************************************/
848
849#ifdef MENUBAR
850# include "menubar.h"
851#endif
852 859
853#define BLINK_INTERVAL 0.5 860#define BLINK_INTERVAL 0.5
854#define TEXT_BLINK_INTERVAL 0.5 861#define TEXT_BLINK_INTERVAL 0.5
855 862
856#ifndef __attribute__ 863#ifndef __attribute__
… …
973#endif 980#endif
974 981
975struct rxvt_term : zero_initialized, rxvt_vars { 982struct rxvt_term : zero_initialized, rxvt_vars {
976 log_callback *log_hook; // log error messages through this hook, if != 0 983 log_callback *log_hook; // log error messages through this hook, if != 0
977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 984 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
978
979#if ENABLE_PERL 985#if ENABLE_PERL
980 rxvt_perl_term perl; 986 rxvt_perl_term perl;
981#endif 987#endif
982#if USE_XGETDEFAULT
983 XrmDatabase xrmdatabase;
984#endif
985
986 struct mbstate mbstate; // current input multibyte state 988 struct mbstate mbstate; // current input multibyte state
987 989
988 unsigned char want_refresh:1, 990 unsigned char want_refresh:1,
989#ifdef TRANSPARENT 991#ifdef TRANSPARENT
990 want_full_refresh:1, /* awaiting full screen refresh */ 992 want_full_refresh:1, /* awaiting full screen refresh */
… …
1045 refresh_limit, 1047 refresh_limit,
1046 last_bot, /* scrollbar last bottom position */ 1048 last_bot, /* scrollbar last bottom position */
1047 last_top, /* scrollbar last top position */ 1049 last_top, /* scrollbar last top position */
1048 last_state, /* scrollbar last state */ 1050 last_state, /* scrollbar last state */
1049 scrollbar_len, 1051 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, 1052 window_vt_x,
1058 window_vt_y, 1053 window_vt_y,
1059 window_sb_x, 1054 window_sb_x,
1060# ifdef POINTER_BLANK 1055# ifdef POINTER_BLANK
1061 pointerBlankDelay, 1056 pointerBlankDelay,
… …
1070 unsigned long priv_modes, 1065 unsigned long priv_modes,
1071 SavedModes; 1066 SavedModes;
1072/* ---------- */ 1067/* ---------- */
1073 Atom xa[NUM_XA]; 1068 Atom xa[NUM_XA];
1074/* ---------- */ 1069/* ---------- */
1075#ifdef MENUBAR 1070#ifdef RXVT_SCROLLBAR
1076 GC menubarGC;
1077#endif
1078#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1079 GC scrollbarGC, 1071 GC scrollbarGC,
1080 topShadowGC, 1072 topShadowGC,
1081 botShadowGC; 1073 botShadowGC;
1082#endif 1074#endif
1083#ifdef XTERM_SCROLLBAR 1075#ifdef XTERM_SCROLLBAR
… …
1132 row_col_t oldcursor; 1124 row_col_t oldcursor;
1133#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1134 bgPixmap_t bgPixmap; 1126 bgPixmap_t bgPixmap;
1135 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1127 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1136#endif 1128#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 1129
1146#if ENABLE_OVERLAY 1130#if ENABLE_OVERLAY
1147 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1131 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1148 text_t **ov_text; 1132 text_t **ov_text;
1149 rend_t **ov_rend; 1133 rend_t **ov_rend;
… …
1196#endif 1180#endif
1197 1181
1198 // modifies first argument(!) 1182 // modifies first argument(!)
1199 void paste (char *data, unsigned int len); 1183 void paste (char *data, unsigned int len);
1200 1184
1201 void flush (); 1185 long vt_emask, vt_emask_perl;
1186
1187 void vt_select_input () const
1188 {
1189 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1190 }
1202 1191
1203#if TRANSPARENT 1192#if TRANSPARENT
1204 void rootwin_cb (XEvent &xev); 1193 void rootwin_cb (XEvent &xev);
1205 xevent_watcher rootwin_ev; 1194 xevent_watcher rootwin_ev;
1206#endif 1195#endif
1207 1196
1208 void x_cb (XEvent &xev); 1197 void x_cb (XEvent &xev);
1198 void flush ();
1209 xevent_watcher termwin_ev; 1199 xevent_watcher termwin_ev;
1210 xevent_watcher vt_ev; 1200 xevent_watcher vt_ev;
1211#ifdef HAVE_SCROLLBARS 1201#ifdef HAVE_SCROLLBARS
1212 xevent_watcher scrollbar_ev; 1202 xevent_watcher scrollbar_ev;
1213#endif
1214#ifdef MENUBAR
1215 xevent_watcher menubar_ev;
1216#endif 1203#endif
1217 1204
1218 void check_cb (check_watcher &w); check_watcher check_ev; 1205 void check_cb (check_watcher &w); check_watcher check_ev;
1219 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1206 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1220 void flush_cb (time_watcher &w); time_watcher flush_ev; 1207 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1261 bool init (int argc, const char *const *argv); 1248 bool init (int argc, const char *const *argv);
1262 bool init_vars (); 1249 bool init_vars ();
1263 1250
1264 bool pty_fill (); 1251 bool pty_fill ();
1265 1252
1253 void make_current () const // make this the "currently active" urxvt instance
1254 {
1255 SET_R (this);
1256 rxvt_set_locale (locale);
1257 set_environ (envv);
1258 }
1259
1266 void init_secondary (); 1260 void init_secondary ();
1267 const char **init_resources (int argc, const char *const *argv); 1261 const char **init_resources (int argc, const char *const *argv);
1262 const char *x_resource (const char *name);
1268 void init_env (); 1263 void init_env ();
1269 void set_locale (const char *locale); 1264 void set_locale (const char *locale);
1270 void init_xlocale (); 1265 void init_xlocale ();
1271 void init_command (const char *const *argv); 1266 void init_command (const char *const *argv);
1272 void run_command (const char *const *argv); 1267 void run_command (const char *const *argv);
… …
1358 void set_window_color (int idx, const char *color); 1353 void set_window_color (int idx, const char *color);
1359 void set_colorfgbg (); 1354 void set_colorfgbg ();
1360 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1355 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1361 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1356 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1362 1357
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 1358 // screen.C
1397 1359
1398 void lalloc (line_t &l) 1360 void lalloc (line_t &l) const
1399 { 1361 {
1400 l.t = (text_t *)talloc->alloc (); 1362 l.t = (text_t *)talloc->alloc ();
1401 l.r = (rend_t *)ralloc->alloc (); 1363 l.r = (rend_t *)ralloc->alloc ();
1402 } 1364 }
1403 1365
… …
1407 talloc->free (l.t); 1369 talloc->free (l.t);
1408 ralloc->free (l.r); 1370 ralloc->free (l.r);
1409 } 1371 }
1410#endif 1372#endif
1411 1373
1412 void lresize (line_t &l) 1374 void lresize (line_t &l) const
1413 { 1375 {
1414 if (!l.t) 1376 if (!l.t)
1415 return; 1377 return;
1416 1378
1417 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1379 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1421 1383
1422 if (ncol > prev_ncol) 1384 if (ncol > prev_ncol)
1423 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1385 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1424 } 1386 }
1425 1387
1426 int fgcolor_of (rend_t r) 1388 int fgcolor_of (rend_t r) const
1427 { 1389 {
1428 int base = GET_BASEFG (r); 1390 int base = GET_BASEFG (r);
1429#ifndef NO_BRIGHTCOLOR 1391#ifndef NO_BRIGHTCOLOR
1430 if (r & RS_Bold 1392 if (r & RS_Bold
1431# if ENABLE_STYLES 1393# if ENABLE_STYLES
… …
1435 base += minBrightCOLOR - minCOLOR; 1397 base += minBrightCOLOR - minCOLOR;
1436#endif 1398#endif
1437 return base; 1399 return base;
1438 } 1400 }
1439 1401
1440 int bgcolor_of (rend_t r) 1402 int bgcolor_of (rend_t r) const
1441 { 1403 {
1442 int base = GET_BASEBG (r); 1404 int base = GET_BASEBG (r);
1443#ifndef NO_BRIGHTCOLOR 1405#ifndef NO_BRIGHTCOLOR
1444 if (r & RS_Blink 1406 if (r & RS_Blink
1445# if ENABLE_STYLES 1407# if ENABLE_STYLES
… …
1449 base += minBrightCOLOR - minCOLOR; 1411 base += minBrightCOLOR - minCOLOR;
1450#endif 1412#endif
1451 return base; 1413 return base;
1452 } 1414 }
1453 1415
1454 bool option (uint32_t opt) 1416 bool option (uint32_t opt) const
1455 { 1417 {
1456 return OPTION (opt); 1418 return OPTION (opt);
1457 } 1419 }
1458 1420
1459 void set_option (uint32_t opt, bool set) 1421 void set_option (uint32_t opt, bool set)
… …
1462 options |= opt; 1424 options |= opt;
1463 else 1425 else
1464 options &= ~opt; 1426 options &= ~opt;
1465 } 1427 }
1466 1428
1467 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1429 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); 1430 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1469 int scr_scroll_text (int row1, int row2, int count); 1431 int scr_scroll_text (int row1, int row2, int count);
1470 void scr_reset (); 1432 void scr_reset ();
1471 void scr_release (); 1433 void scr_release ();
1472 void scr_clear (bool really = false); 1434 void scr_clear (bool really = false);
1473 void scr_refresh (unsigned char refresh_type); 1435 void scr_refresh (unsigned char refresh_type);
… …
1509 void scr_rvideo_mode (int mode); 1471 void scr_rvideo_mode (int mode);
1510 void scr_report_position (); 1472 void scr_report_position ();
1511 void set_font_style (); 1473 void set_font_style ();
1512 void scr_charset_choose (int set); 1474 void scr_charset_choose (int set);
1513 void scr_charset_set (int set, unsigned int ch); 1475 void scr_charset_set (int set, unsigned int ch);
1514 int scr_move_to (int y, int len); 1476 void scr_move_to (int y, int len);
1515 int scr_page (enum page_dirn direction, int nlines); 1477 bool scr_page (enum page_dirn direction, int nlines);
1516 int scr_changeview (unsigned int oldviewstart); 1478 bool scr_changeview (int new_view_start);
1517 void scr_bell (); 1479 void scr_bell ();
1518 void scr_printscreen (int fullhist); 1480 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); 1481 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); 1482 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1521 void scr_reverse_selection (); 1483 void scr_reverse_selection ();

Diff Legend

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