ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.198 by root, Thu Jan 12 00:35:39 2006 UTC vs.
Revision 1.214 by ayin, Tue Jan 17 09:24:53 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>
… …
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#include "rxvtperl.h" 41#include "rxvtperl.h"
42#include "logging.h"
25 43
26#if ENABLE_FRILLS 44// try to avoid some macros to decrease code size, on some systems
27# define ENABLE_XEMBED 1 45#if ENABLE_MINIMAL
28# define ENABLE_EWMH 1 46# define strcmp(a,b) (strcmp)(a,b)
29# define CURSOR_BLINK 1 47# define strlen(a) (strlen)(a)
48# define strcpy(a,b) (strcpy)(a,b)
49# define memset(a,c,l) (memset)(a,c,l)
50# define memcpy(a,b,l) (memcpy)(a,b,l)
30#endif 51#endif
31 52
32/* 53/*
33 ***************************************************************************** 54 *****************************************************************************
34 * SYSTEM HACKS 55 * SYSTEM HACKS
… …
43#if defined (sun) && !defined (__sun__) 64#if defined (sun) && !defined (__sun__)
44# define __sun__ 1 65# define __sun__ 1
45#endif 66#endif
46 67
47#ifndef HAVE_XPOINTER 68#ifndef HAVE_XPOINTER
48typedef char *XPointer; 69typedef char *XPointer;
49#endif 70#endif
50 71
51#ifdef HAVE_TERMIOS_H 72#ifdef HAVE_TERMIOS_H
52# include <termios.h> 73# include <termios.h>
53typedef struct termios ttymode_t; 74typedef struct termios ttymode_t;
… …
109char * rxvt_Str_trim (char *str); 130char * rxvt_Str_trim (char *str);
110int rxvt_Str_escaped (char *str); 131int rxvt_Str_escaped (char *str);
111char ** rxvt_splitcommastring (const char *cs); 132char ** rxvt_splitcommastring (const char *cs);
112void rxvt_freecommastring (char **cs); 133void rxvt_freecommastring (char **cs);
113char * rxvt_File_find (const char *file, const char *ext, const char *path); 134char * 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); 135void rxvt_usleep (int usecs);
117 136
118///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
119 138
120// temporarily replace the process environment 139// temporarily replace the process environment
121extern char **environ; 140extern char **environ;
122extern char **rxvt_environ; // the original environ pointer 141extern char **rxvt_environ; // the original environ pointer
123 142
124struct temp_environ 143inline void set_environ (stringvec *envv)
125{ 144{
126 char **prev;
127
128 temp_environ (const stringvec *envv)
129 : prev(environ)
130 {
131 if (envv) 145 if (envv)
132 environ = (char **)envv->begin (); 146 environ = (char **)envv->begin ();
133 } 147}
134 148
135 temp_environ (char **env) 149inline void set_environ (char **envv)
136 : prev(environ) 150{
137 {
138 if (env) 151 if (envv)
139 environ = env; 152 environ = envv;
140 } 153}
141
142 ~temp_environ ()
143 {
144 environ = prev;
145 }
146};
147
148#define TEMP_ENV temp_environ temp_environ (envv)
149 154
150/* 155/*
151 ***************************************************************************** 156 *****************************************************************************
152 * STRUCTURES AND TYPEDEFS 157 * STRUCTURES AND TYPEDEFS
153 ***************************************************************************** 158 *****************************************************************************
154 */ 159 */
155struct grwin_t; 160struct grwin_t;
156 161
157/* Sanitize menubar info */
158#ifndef MENUBAR
159# undef MENUBAR_MAX
160#endif
161#ifndef MENUBAR_MAX
162# define MENUBAR_MAX 0
163#endif
164
165/* If we're using either the rxvt scrollbar or menu bars, keep the 162/* If we're using either the rxvt scrollbar, keep the
166 * scrollColor resource. 163 * scrollColor resource.
167 */ 164 */
168#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 165#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
169# define KEEP_SCROLLCOLOR 1 166# define KEEP_SCROLLCOLOR 1
170#else 167#else
171# undef KEEP_SCROLLCOLOR 168# undef KEEP_SCROLLCOLOR
172#endif 169#endif
173 170
… …
243 240
244#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 241#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
245# define NO_MOUSE_REPORT_SCROLLBAR 1 242# define NO_MOUSE_REPORT_SCROLLBAR 1
246#endif 243#endif
247 244
248#if defined (ISO_14755) || defined (ENABLE_PERL)
249# define ENABLE_OVERLAY 1
250#endif
251
252/* now look for other badly set stuff */ 245/* now look for other badly set stuff */
253 246
254#if !defined (EACCESS) && defined(EAGAIN) 247#if !defined (EACCESS) && defined(EAGAIN)
255# define EACCESS EAGAIN 248# define EACCESS EAGAIN
256#endif 249#endif
… …
258#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 251#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
259# define EXIT_SUCCESS 0 /* exit function success */ 252# define EXIT_SUCCESS 0 /* exit function success */
260# define EXIT_FAILURE 1 /* exit function failure */ 253# define EXIT_FAILURE 1 /* exit function failure */
261#endif 254#endif
262 255
263#define menuBar_esc 10
264#define scrollBar_esc 30 256#define scrollBar_esc 30
265#define menuBar_margin 2 /* margin below text */
266 257
267#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 258#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
268# define HAVE_SCROLLBARS 1 259# define HAVE_SCROLLBARS 1
269#endif
270
271/* width of scrollBar, menuBar shadow, must be 1 or 2 */
272#ifdef HALFSHADOW
273# define MENU_SHADOW 1
274#else
275# define MENU_SHADOW 2
276#endif 260#endif
277 261
278#define R_SB_ALIGN_CENTRE 0 262#define R_SB_ALIGN_CENTRE 0
279#define R_SB_ALIGN_TOP 1 263#define R_SB_ALIGN_TOP 1
280#define R_SB_ALIGN_BOTTOM 2 264#define R_SB_ALIGN_BOTTOM 2
… …
353 * | 337 * |
354 * +---< SB_WIDTH_NEXT 338 * +---< SB_WIDTH_NEXT
355 */ 339 */
356 340
357enum { 341enum {
358 NO_REFRESH = 0 , /* Window not visible at all! */ 342 NO_REFRESH = 0, /* Window not visible at all! */
359 FAST_REFRESH = 1<<0, /* Fully exposed window */ 343 FAST_REFRESH = 1, /* Fully exposed window */
360 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 344 SLOW_REFRESH = 2, /* Partially exposed window */
361 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
362}; 345};
363 346
364#ifdef NO_SECONDARY_SCREEN 347#ifdef NO_SECONDARY_SCREEN
365# define NSCREENS 0 348# define NSCREENS 0
366#else 349#else
… …
489 Rxvt_restoreFG = 39, // change default fg color 472 Rxvt_restoreFG = 39, // change default fg color
490 Rxvt_restoreBG = 49, // change default bg color 473 Rxvt_restoreBG = 49, // change default bg color
491 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 474 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
492 475
493 URxvt_locale = 701, // change locale 476 URxvt_locale = 701, // change locale
494 URxvt_Menu = 703, // set menu item 477
495 URxvt_Color_IT = 704, // change actual 'Italic' colour 478 URxvt_Color_IT = 704, // change actual 'Italic' colour
496 URxvt_Color_tint = 705, // change actual tint colour 479 URxvt_Color_tint = 705, // change actual tint colour
497 URxvt_Color_BD = 706, 480 URxvt_Color_BD = 706,
498 URxvt_Color_UL = 707, 481 URxvt_Color_UL = 707,
499 482
… …
654#define PrivMode_ShiftKeys (1UL<<10) 637#define PrivMode_ShiftKeys (1UL<<10)
655#define PrivMode_VisibleCursor (1UL<<11) 638#define PrivMode_VisibleCursor (1UL<<11)
656#define PrivMode_MouseX10 (1UL<<12) 639#define PrivMode_MouseX10 (1UL<<12)
657#define PrivMode_MouseX11 (1UL<<13) 640#define PrivMode_MouseX11 (1UL<<13)
658#define PrivMode_scrollBar (1UL<<14) 641#define PrivMode_scrollBar (1UL<<14)
659#define PrivMode_menuBar (1UL<<15)
660#define PrivMode_TtyOutputInh (1UL<<16) 642#define PrivMode_TtyOutputInh (1UL<<15)
661#define PrivMode_Keypress (1UL<<17) 643#define PrivMode_Keypress (1UL<<16)
662#define PrivMode_smoothScroll (1UL<<18) 644#define PrivMode_smoothScroll (1UL<<17)
663#define PrivMode_vt52 (1UL<<19) 645#define PrivMode_vt52 (1UL<<18)
664#define PrivMode_LFNL (1UL<<20) 646#define PrivMode_LFNL (1UL<<19)
665/* too annoying to implement X11 highlight tracking */ 647/* too annoying to implement X11 highlight tracking */
666/* #define PrivMode_MouseX11Track (1LU<<21) */ 648/* #define PrivMode_MouseX11Track (1LU<<20) */
667 649
668#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 650#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
669#define PrivMode(test,bit) \ 651#define PrivMode(test,bit) \
670 if (test) \ 652 if (test) \
671 priv_modes |= (bit); \ 653 priv_modes |= (bit); \
… …
718/* 700/*
719 ***************************************************************************** 701 *****************************************************************************
720 * MACRO DEFINES 702 * MACRO DEFINES
721 ***************************************************************************** 703 *****************************************************************************
722 */ 704 */
705#define dLocal(type,name) type const name = this->name
723#define dDisp Display *disp = display->display 706#define dDisp Display *disp = this->display->display
724 707
725/* convert pixel dimensions to row/column values. Everything as int32_t */ 708/* convert pixel dimensions to row/column values. Everything as int32_t */
726#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 709#define Pixel2Col(x) Pixel2Width((int32_t)(x))
727#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 710#define Pixel2Row(y) Pixel2Height((int32_t)(y))
728#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 711#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
801#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 784#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
802#define scrollbar_position(y) ((y) - scrollBar.beg) 785#define scrollbar_position(y) ((y) - scrollBar.beg)
803#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 786#define scrollbar_size() (scrollBar.end - scrollBar.beg \
804 - scrollbar_minheight ()) 787 - scrollbar_minheight ())
805 788
806#if (MENUBAR_MAX > 1)
807/* rendition style flags */
808# define menuBar_height() (fheight + MENU_SHADOW)
809# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
810# define isMenuBarWindow(w) ((w) == menuBar.win)
811#else
812# define menuBar_height() (0)
813# define menuBar_TotalHeight() (0)
814# define isMenuBarWindow(w) (0)
815#endif
816
817#ifdef XPM_BACKGROUND 789#ifdef XPM_BACKGROUND
818# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 790# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
819#else 791#else
820# define XPMClearArea(a, b, c, d, e, f, g) 792# define XPMClearArea(a, b, c, d, e, f, g)
821#endif
822
823#ifdef UTMP_SUPPORT
824# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
825# undef HAVE_UTMPX_H
826# undef HAVE_STRUCT_UTMPX
827# endif
828# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
829# undef HAVE_UTMP_H
830# undef HAVE_STRUCT_UTMP
831# endif
832
833# ifdef HAVE_UTMPX_H
834# include <utmpx.h>
835# endif
836# ifdef HAVE_UTMP_H
837# include <utmp.h>
838# endif
839#endif 793#endif
840 794
841#ifdef DEBUG_CMD 795#ifdef DEBUG_CMD
842# define D_CMD(x) fprintf x ; fputc('\n', stderr) 796# define D_CMD(x) fprintf x ; fputc('\n', stderr)
843#else 797#else
… …
874extern bool rxvt_set_locale (const char *locale); 828extern bool rxvt_set_locale (const char *locale);
875extern void rxvt_push_locale (const char *locale); 829extern void rxvt_push_locale (const char *locale);
876extern void rxvt_pop_locale (); 830extern void rxvt_pop_locale ();
877 831
878/****************************************************************************/ 832/****************************************************************************/
879
880#ifdef MENUBAR
881# include "menubar.h"
882#endif
883 833
884#define BLINK_INTERVAL 0.5 834#define BLINK_INTERVAL 0.5
885#define TEXT_BLINK_INTERVAL 0.5 835#define TEXT_BLINK_INTERVAL 0.5
886 836
887#ifndef __attribute__ 837#ifndef __attribute__
… …
1071 refresh_limit, 1021 refresh_limit,
1072 last_bot, /* scrollbar last bottom position */ 1022 last_bot, /* scrollbar last bottom position */
1073 last_top, /* scrollbar last top position */ 1023 last_top, /* scrollbar last top position */
1074 last_state, /* scrollbar last state */ 1024 last_state, /* scrollbar last state */
1075 scrollbar_len, 1025 scrollbar_len,
1076#ifdef MENUBAR
1077 menu_readonly, /* okay to alter menu? */
1078 Arrows_x,
1079#endif
1080#if MENUBAR_MAX > 1
1081 Nbars,
1082#endif
1083 window_vt_x, 1026 window_vt_x,
1084 window_vt_y, 1027 window_vt_y,
1085 window_sb_x, 1028 window_sb_x,
1086# ifdef POINTER_BLANK 1029# ifdef POINTER_BLANK
1087 pointerBlankDelay, 1030 pointerBlankDelay,
… …
1096 unsigned long priv_modes, 1039 unsigned long priv_modes,
1097 SavedModes; 1040 SavedModes;
1098/* ---------- */ 1041/* ---------- */
1099 Atom xa[NUM_XA]; 1042 Atom xa[NUM_XA];
1100/* ---------- */ 1043/* ---------- */
1101#ifdef MENUBAR 1044#ifdef RXVT_SCROLLBAR
1102 GC menubarGC;
1103#endif
1104#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1105 GC scrollbarGC, 1045 GC scrollbarGC,
1106 topShadowGC, 1046 topShadowGC,
1107 botShadowGC; 1047 botShadowGC;
1108#endif 1048#endif
1109#ifdef XTERM_SCROLLBAR 1049#ifdef XTERM_SCROLLBAR
… …
1141 const char *key_delete; 1081 const char *key_delete;
1142#endif 1082#endif
1143 struct mouse_event MEvent; 1083 struct mouse_event MEvent;
1144 XComposeStatus compose; 1084 XComposeStatus compose;
1145 ttymode_t tio; 1085 ttymode_t tio;
1146#ifdef UTMP_SUPPORT
1147# ifdef HAVE_STRUCT_UTMP
1148 struct utmp ut;
1149# endif
1150# ifdef HAVE_STRUCT_UTMPX
1151 struct utmpx utx;
1152# endif
1153# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1154 char ut_id[5];
1155# endif
1156 int utmp_pos;
1157#endif
1158 row_col_t oldcursor; 1086 row_col_t oldcursor;
1159#ifdef XPM_BACKGROUND 1087#ifdef XPM_BACKGROUND
1160 bgPixmap_t bgPixmap; 1088 bgPixmap_t bgPixmap;
1161 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1089 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1162#endif
1163#ifdef MENUBAR
1164 menu_t *ActiveMenu, /* currently active menu */
1165 *BuildMenu; /* the menu currently being built */
1166 bar_t *CurrentBar;
1167# if ! (MENUBAR_MAX > 1)
1168 bar_t BarList;
1169# endif /* (MENUBAR_MAX > 1) */
1170#endif 1090#endif
1171 1091
1172#if ENABLE_OVERLAY 1092#if ENABLE_OVERLAY
1173 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1093 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1174 text_t **ov_text; 1094 text_t **ov_text;
… …
1203 const char *rs[NUM_RESOURCES]; 1123 const char *rs[NUM_RESOURCES];
1204 /* command input buffering */ 1124 /* command input buffering */
1205 char *cmdbuf_ptr, *cmdbuf_endp; 1125 char *cmdbuf_ptr, *cmdbuf_endp;
1206 char cmdbuf_base[CBUFSIZ]; 1126 char cmdbuf_base[CBUFSIZ];
1207 1127
1128 rxvt_ptytty pty;
1129 rxvt_session session;
1130
1208 rxvt_salloc *talloc; // text line allocator 1131 rxvt_salloc *talloc; // text line allocator
1209 rxvt_salloc *ralloc; // rend line allocator 1132 rxvt_salloc *ralloc; // rend line allocator
1210 1133
1211 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1134 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1212 1135
… …
1222#endif 1145#endif
1223 1146
1224 // modifies first argument(!) 1147 // modifies first argument(!)
1225 void paste (char *data, unsigned int len); 1148 void paste (char *data, unsigned int len);
1226 1149
1227 void flush (); 1150 long vt_emask, vt_emask_perl;
1151
1152 void vt_select_input () const
1153 {
1154 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1155 }
1228 1156
1229#if TRANSPARENT 1157#if TRANSPARENT
1230 void rootwin_cb (XEvent &xev); 1158 void rootwin_cb (XEvent &xev);
1231 xevent_watcher rootwin_ev; 1159 xevent_watcher rootwin_ev;
1232#endif 1160#endif
1233 1161
1234 void x_cb (XEvent &xev); 1162 void x_cb (XEvent &xev);
1163 void flush ();
1235 xevent_watcher termwin_ev; 1164 xevent_watcher termwin_ev;
1236 xevent_watcher vt_ev; 1165 xevent_watcher vt_ev;
1237#ifdef HAVE_SCROLLBARS 1166#ifdef HAVE_SCROLLBARS
1238 xevent_watcher scrollbar_ev; 1167 xevent_watcher scrollbar_ev;
1239#endif
1240#ifdef MENUBAR
1241 xevent_watcher menubar_ev;
1242#endif 1168#endif
1243 1169
1244 void check_cb (check_watcher &w); check_watcher check_ev; 1170 void check_cb (check_watcher &w); check_watcher check_ev;
1245 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1171 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1246 void flush_cb (time_watcher &w); time_watcher flush_ev; 1172 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1286 1212
1287 bool init (int argc, const char *const *argv); 1213 bool init (int argc, const char *const *argv);
1288 bool init_vars (); 1214 bool init_vars ();
1289 1215
1290 bool pty_fill (); 1216 bool pty_fill ();
1217
1218 void make_current () const // make this the "currently active" urxvt instance
1219 {
1220 SET_R (this);
1221 rxvt_set_locale (locale);
1222 set_environ (envv);
1223 }
1291 1224
1292 void init_secondary (); 1225 void init_secondary ();
1293 const char **init_resources (int argc, const char *const *argv); 1226 const char **init_resources (int argc, const char *const *argv);
1294 const char *x_resource (const char *name); 1227 const char *x_resource (const char *name);
1295 void init_env (); 1228 void init_env ();
… …
1370 void process_sgr_mode (unsigned int nargs, const int *arg); 1303 void process_sgr_mode (unsigned int nargs, const int *arg);
1371 void process_graphics (); 1304 void process_graphics ();
1372 // init.C 1305 // init.C
1373 void Get_Colours (); 1306 void Get_Colours ();
1374 void get_ourmods (); 1307 void get_ourmods ();
1375 // logging.C
1376 void makeutent (const char *pty, const char *hostname);
1377 void cleanutent ();
1378 // main.C 1308 // main.C
1379 void privileged_utmp (rxvt_privaction action); 1309 void privileged_utmp (rxvt_privaction action);
1380 bool set_fonts (); 1310 bool set_fonts ();
1381 void set_string_property (Atom prop, const char *str, int len = -1); 1311 void set_string_property (Atom prop, const char *str, int len = -1);
1382 void set_utf8_property (Atom prop, const char *str, int len = -1); 1312 void set_utf8_property (Atom prop, const char *str, int len = -1);
… …
1385 void set_window_color (int idx, const char *color); 1315 void set_window_color (int idx, const char *color);
1386 void set_colorfgbg (); 1316 void set_colorfgbg ();
1387 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1317 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1388 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1318 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1389 1319
1390#ifdef MENUBAR
1391 // menubar.C
1392 void menuitem_free (menu_t *menu, menuitem_t *item);
1393 int action_dispatch (action_t *action);
1394 void menuarrow_free (char name);
1395 void menuarrow_add (char *string);
1396 char *menu_find_base (menu_t **menu, char *path);
1397 menu_t *menu_delete (menu_t *menu);
1398 menu_t *menu_add (menu_t *parent, char *path);
1399 void drawbox_menubar (int x, int len, int state);
1400 void drawtriangle (int x, int y, int state);
1401 void drawbox_menuitem (int y, int state);
1402 void menu_show ();
1403 void menu_display (void (rxvt_term::*update) ());
1404 void menu_hide_all ();
1405 void menu_hide ();
1406 void menu_clear (menu_t *menu);
1407 void menubar_clear ();
1408 bar_t *menubar_find (const char *name);
1409 int menubar_push (const char *name);
1410 void menubar_remove (const char *name);
1411 void menubar_dump (FILE *fp);
1412 void menubar_read (const char *filename);
1413 void menubar_dispatch (char *str);
1414 void draw_Arrows (int name, int state);
1415 void menubar_expose ();
1416 int menubar_mapping (int map);
1417 int menu_select (XButtonEvent &ev);
1418 void menubar_select (XButtonEvent &ev);
1419 void menubar_control (XButtonEvent &ev);
1420 void map_menuBar (int map);
1421#endif
1422
1423 // screen.C 1320 // screen.C
1424 1321
1425 void lalloc (line_t &l) 1322 void lalloc (line_t &l) const
1426 { 1323 {
1427 l.t = (text_t *)talloc->alloc (); 1324 l.t = (text_t *)talloc->alloc ();
1428 l.r = (rend_t *)ralloc->alloc (); 1325 l.r = (rend_t *)ralloc->alloc ();
1429 } 1326 }
1430 1327
… …
1434 talloc->free (l.t); 1331 talloc->free (l.t);
1435 ralloc->free (l.r); 1332 ralloc->free (l.r);
1436 } 1333 }
1437#endif 1334#endif
1438 1335
1439 void lresize (line_t &l) 1336 void lresize (line_t &l) const
1440 { 1337 {
1441 if (!l.t) 1338 if (!l.t)
1442 return; 1339 return;
1443 1340
1444 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1341 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1448 1345
1449 if (ncol > prev_ncol) 1346 if (ncol > prev_ncol)
1450 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1347 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1451 } 1348 }
1452 1349
1453 int fgcolor_of (rend_t r) 1350 int fgcolor_of (rend_t r) const
1454 { 1351 {
1455 int base = GET_BASEFG (r); 1352 int base = GET_BASEFG (r);
1456#ifndef NO_BRIGHTCOLOR 1353#ifndef NO_BRIGHTCOLOR
1457 if (r & RS_Bold 1354 if (r & RS_Bold
1458# if ENABLE_STYLES 1355# if ENABLE_STYLES
… …
1462 base += minBrightCOLOR - minCOLOR; 1359 base += minBrightCOLOR - minCOLOR;
1463#endif 1360#endif
1464 return base; 1361 return base;
1465 } 1362 }
1466 1363
1467 int bgcolor_of (rend_t r) 1364 int bgcolor_of (rend_t r) const
1468 { 1365 {
1469 int base = GET_BASEBG (r); 1366 int base = GET_BASEBG (r);
1470#ifndef NO_BRIGHTCOLOR 1367#ifndef NO_BRIGHTCOLOR
1471 if (r & RS_Blink 1368 if (r & RS_Blink
1472# if ENABLE_STYLES 1369# if ENABLE_STYLES
… …
1476 base += minBrightCOLOR - minCOLOR; 1373 base += minBrightCOLOR - minCOLOR;
1477#endif 1374#endif
1478 return base; 1375 return base;
1479 } 1376 }
1480 1377
1481 bool option (uint32_t opt) 1378 bool option (uint32_t opt) const
1482 { 1379 {
1483 return OPTION (opt); 1380 return OPTION (opt);
1484 } 1381 }
1485 1382
1486 void set_option (uint32_t opt, bool set) 1383 void set_option (uint32_t opt, bool set)
… …
1489 options |= opt; 1386 options |= opt;
1490 else 1387 else
1491 options &= ~opt; 1388 options &= ~opt;
1492 } 1389 }
1493 1390
1494 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1391 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1495 void scr_blank_screen_mem (line_t &l, rend_t efs); 1392 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1496 int scr_scroll_text (int row1, int row2, int count); 1393 int scr_scroll_text (int row1, int row2, int count);
1497 void scr_reset (); 1394 void scr_reset ();
1498 void scr_release (); 1395 void scr_release ();
1499 void scr_clear (bool really = false); 1396 void scr_clear (bool really = false);
1500 void scr_refresh (unsigned char refresh_type); 1397 void scr_refresh ();
1501 bool scr_refresh_rend (rend_t mask, rend_t value); 1398 bool scr_refresh_rend (rend_t mask, rend_t value);
1502 void scr_erase_screen (int mode); 1399 void scr_erase_screen (int mode);
1503#if ENABLE_FRILLS 1400#if ENABLE_FRILLS
1504 void scr_erase_savelines (); 1401 void scr_erase_savelines ();
1505 void scr_backindex (); 1402 void scr_backindex ();
… …
1536 void scr_rvideo_mode (int mode); 1433 void scr_rvideo_mode (int mode);
1537 void scr_report_position (); 1434 void scr_report_position ();
1538 void set_font_style (); 1435 void set_font_style ();
1539 void scr_charset_choose (int set); 1436 void scr_charset_choose (int set);
1540 void scr_charset_set (int set, unsigned int ch); 1437 void scr_charset_set (int set, unsigned int ch);
1541 int scr_move_to (int y, int len); 1438 void scr_move_to (int y, int len);
1542 int scr_page (enum page_dirn direction, int nlines); 1439 bool scr_page (enum page_dirn direction, int nlines);
1543 int scr_changeview (unsigned int oldviewstart); 1440 bool scr_changeview (int new_view_start);
1544 void scr_bell (); 1441 void scr_bell ();
1545 void scr_printscreen (int fullhist); 1442 void scr_printscreen (int fullhist);
1546 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1443 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1547 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1444 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1548 void scr_reverse_selection (); 1445 void scr_reverse_selection ();
… …
1569 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1466 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1570#endif 1467#endif
1571 1468
1572#if defined(RXVT_SCROLLBAR) 1469#if defined(RXVT_SCROLLBAR)
1573 // scrollbar-rxvt.C 1470 // scrollbar-rxvt.C
1574 void Draw_button (int x, int y, int state, int dirn);
1575 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1471 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1576#endif 1472#endif
1577 1473
1578#if defined(XTERM_SCROLLBAR) 1474#if defined(XTERM_SCROLLBAR)
1579 // scrollbar-xterm.C 1475 // scrollbar-xterm.C

Diff Legend

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