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.200 by root, Fri Jan 13 04:19:41 2006 UTC vs.
Revision 1.220 by root, Tue Jan 17 15:17:39 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;
… …
73#ifndef STDIN_FILENO 93#ifndef STDIN_FILENO
74# define STDIN_FILENO 0 94# define STDIN_FILENO 0
75# define STDOUT_FILENO 1 95# define STDOUT_FILENO 1
76# define STDERR_FILENO 2 96# define STDERR_FILENO 2
77#endif 97#endif
98
99enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };//TODO
78 100
79/* 101/*
80 ***************************************************************************** 102 *****************************************************************************
81 * PROTOTYPES 103 * PROTOTYPES
82 ***************************************************************************** 104 *****************************************************************************
… …
109char * rxvt_Str_trim (char *str); 131char * rxvt_Str_trim (char *str);
110int rxvt_Str_escaped (char *str); 132int rxvt_Str_escaped (char *str);
111char ** rxvt_splitcommastring (const char *cs); 133char ** rxvt_splitcommastring (const char *cs);
112void rxvt_freecommastring (char **cs); 134void rxvt_freecommastring (char **cs);
113char * rxvt_File_find (const char *file, const char *ext, const char *path); 135char * 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); 136void rxvt_usleep (int usecs);
117 137
118///////////////////////////////////////////////////////////////////////////// 138/////////////////////////////////////////////////////////////////////////////
119 139
120// temporarily replace the process environment 140// temporarily replace the process environment
… …
138 * STRUCTURES AND TYPEDEFS 158 * STRUCTURES AND TYPEDEFS
139 ***************************************************************************** 159 *****************************************************************************
140 */ 160 */
141struct grwin_t; 161struct grwin_t;
142 162
143/* Sanitize menubar info */
144#ifndef MENUBAR
145# undef MENUBAR_MAX
146#endif
147#ifndef MENUBAR_MAX
148# define MENUBAR_MAX 0
149#endif
150
151/* If we're using either the rxvt scrollbar or menu bars, keep the 163/* If we're using either the rxvt scrollbar, keep the
152 * scrollColor resource. 164 * scrollColor resource.
153 */ 165 */
154#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 166#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
155# define KEEP_SCROLLCOLOR 1 167# define KEEP_SCROLLCOLOR 1
156#else 168#else
157# undef KEEP_SCROLLCOLOR 169# undef KEEP_SCROLLCOLOR
158#endif 170#endif
159 171
… …
161typedef struct { 173typedef struct {
162 short w, h, x, y; 174 short w, h, x, y;
163 Pixmap pixmap; 175 Pixmap pixmap;
164} bgPixmap_t; 176} bgPixmap_t;
165#endif 177#endif
178
179struct rxvt_ptytty {
180 int pty; // pty file descriptor; connected to rxvt
181 int tty; // tty file descriptor; connected to child
182
183 virtual ~rxvt_ptytty ()
184 {
185 //
186 }
187
188 virtual bool get () = 0;
189 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
190
191 void close_tty ();
192 bool make_controlling_tty ();
193 void set_utf8_mode (bool on);
194};
195
196rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
197void rxvt_ptytty_server (); // start the ptytty server process
166 198
167/* 199/*
168 * the 'essential' information for reporting Mouse Events 200 * the 'essential' information for reporting Mouse Events
169 * pared down from XButtonEvent 201 * pared down from XButtonEvent
170 */ 202 */
… …
229 261
230#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 262#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
231# define NO_MOUSE_REPORT_SCROLLBAR 1 263# define NO_MOUSE_REPORT_SCROLLBAR 1
232#endif 264#endif
233 265
234#if defined (ISO_14755) || defined (ENABLE_PERL)
235# define ENABLE_OVERLAY 1
236#endif
237
238/* now look for other badly set stuff */ 266/* now look for other badly set stuff */
239 267
240#if !defined (EACCESS) && defined(EAGAIN) 268#if !defined (EACCESS) && defined(EAGAIN)
241# define EACCESS EAGAIN 269# define EACCESS EAGAIN
242#endif 270#endif
… …
244#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 272#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
245# define EXIT_SUCCESS 0 /* exit function success */ 273# define EXIT_SUCCESS 0 /* exit function success */
246# define EXIT_FAILURE 1 /* exit function failure */ 274# define EXIT_FAILURE 1 /* exit function failure */
247#endif 275#endif
248 276
249#define menuBar_esc 10
250#define scrollBar_esc 30 277#define scrollBar_esc 30
251#define menuBar_margin 2 /* margin below text */
252 278
253#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 279#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
254# define HAVE_SCROLLBARS 1 280# define HAVE_SCROLLBARS 1
255#endif
256
257/* width of scrollBar, menuBar shadow, must be 1 or 2 */
258#ifdef HALFSHADOW
259# define MENU_SHADOW 1
260#else
261# define MENU_SHADOW 2
262#endif 281#endif
263 282
264#define R_SB_ALIGN_CENTRE 0 283#define R_SB_ALIGN_CENTRE 0
265#define R_SB_ALIGN_TOP 1 284#define R_SB_ALIGN_TOP 1
266#define R_SB_ALIGN_BOTTOM 2 285#define R_SB_ALIGN_BOTTOM 2
… …
339 * | 358 * |
340 * +---< SB_WIDTH_NEXT 359 * +---< SB_WIDTH_NEXT
341 */ 360 */
342 361
343enum { 362enum {
344 NO_REFRESH = 0 , /* Window not visible at all! */ 363 NO_REFRESH = 0, /* Window not visible at all! */
345 FAST_REFRESH = 1<<0, /* Fully exposed window */ 364 FAST_REFRESH = 1, /* Fully exposed window */
346 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 365 SLOW_REFRESH = 2, /* Partially exposed window */
347 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
348}; 366};
349 367
350#ifdef NO_SECONDARY_SCREEN 368#ifdef NO_SECONDARY_SCREEN
351# define NSCREENS 0 369# define NSCREENS 0
352#else 370#else
… …
475 Rxvt_restoreFG = 39, // change default fg color 493 Rxvt_restoreFG = 39, // change default fg color
476 Rxvt_restoreBG = 49, // change default bg color 494 Rxvt_restoreBG = 49, // change default bg color
477 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 495 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
478 496
479 URxvt_locale = 701, // change locale 497 URxvt_locale = 701, // change locale
480 URxvt_Menu = 703, // set menu item 498
481 URxvt_Color_IT = 704, // change actual 'Italic' colour 499 URxvt_Color_IT = 704, // change actual 'Italic' colour
482 URxvt_Color_tint = 705, // change actual tint colour 500 URxvt_Color_tint = 705, // change actual tint colour
483 URxvt_Color_BD = 706, 501 URxvt_Color_BD = 706,
484 URxvt_Color_UL = 707, 502 URxvt_Color_UL = 707,
485 503
… …
640#define PrivMode_ShiftKeys (1UL<<10) 658#define PrivMode_ShiftKeys (1UL<<10)
641#define PrivMode_VisibleCursor (1UL<<11) 659#define PrivMode_VisibleCursor (1UL<<11)
642#define PrivMode_MouseX10 (1UL<<12) 660#define PrivMode_MouseX10 (1UL<<12)
643#define PrivMode_MouseX11 (1UL<<13) 661#define PrivMode_MouseX11 (1UL<<13)
644#define PrivMode_scrollBar (1UL<<14) 662#define PrivMode_scrollBar (1UL<<14)
645#define PrivMode_menuBar (1UL<<15)
646#define PrivMode_TtyOutputInh (1UL<<16) 663#define PrivMode_TtyOutputInh (1UL<<15)
647#define PrivMode_Keypress (1UL<<17) 664#define PrivMode_Keypress (1UL<<16)
648#define PrivMode_smoothScroll (1UL<<18) 665#define PrivMode_smoothScroll (1UL<<17)
649#define PrivMode_vt52 (1UL<<19) 666#define PrivMode_vt52 (1UL<<18)
650#define PrivMode_LFNL (1UL<<20) 667#define PrivMode_LFNL (1UL<<19)
651/* too annoying to implement X11 highlight tracking */ 668/* too annoying to implement X11 highlight tracking */
652/* #define PrivMode_MouseX11Track (1LU<<21) */ 669/* #define PrivMode_MouseX11Track (1LU<<20) */
653 670
654#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 671#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
655#define PrivMode(test,bit) \ 672#define PrivMode(test,bit) \
656 if (test) \ 673 if (test) \
657 priv_modes |= (bit); \ 674 priv_modes |= (bit); \
… …
704/* 721/*
705 ***************************************************************************** 722 *****************************************************************************
706 * MACRO DEFINES 723 * MACRO DEFINES
707 ***************************************************************************** 724 *****************************************************************************
708 */ 725 */
726#define dLocal(type,name) type const name = this->name
709#define dDisp Display *disp = display->display 727#define dDisp Display *disp = this->display->display
710 728
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 729/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 730#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 731#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 732#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
787#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 805#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788#define scrollbar_position(y) ((y) - scrollBar.beg) 806#define scrollbar_position(y) ((y) - scrollBar.beg)
789#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 807#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790 - scrollbar_minheight ()) 808 - scrollbar_minheight ())
791 809
792#if (MENUBAR_MAX > 1)
793/* rendition style flags */
794# define menuBar_height() (fheight + MENU_SHADOW)
795# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
796# define isMenuBarWindow(w) ((w) == menuBar.win)
797#else
798# define menuBar_height() (0)
799# define menuBar_TotalHeight() (0)
800# define isMenuBarWindow(w) (0)
801#endif
802
803#ifdef XPM_BACKGROUND 810#ifdef XPM_BACKGROUND
804# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 811# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
805#else 812#else
806# define XPMClearArea(a, b, c, d, e, f, g) 813# define XPMClearArea(a, b, c, d, e, f, g)
807#endif
808
809#ifdef UTMP_SUPPORT
810# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
811# undef HAVE_UTMPX_H
812# undef HAVE_STRUCT_UTMPX
813# endif
814# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
815# undef HAVE_UTMP_H
816# undef HAVE_STRUCT_UTMP
817# endif
818
819# ifdef HAVE_UTMPX_H
820# include <utmpx.h>
821# endif
822# ifdef HAVE_UTMP_H
823# include <utmp.h>
824# endif
825#endif 814#endif
826 815
827#ifdef DEBUG_CMD 816#ifdef DEBUG_CMD
828# define D_CMD(x) fprintf x ; fputc('\n', stderr) 817# define D_CMD(x) fprintf x ; fputc('\n', stderr)
829#else 818#else
… …
860extern bool rxvt_set_locale (const char *locale); 849extern bool rxvt_set_locale (const char *locale);
861extern void rxvt_push_locale (const char *locale); 850extern void rxvt_push_locale (const char *locale);
862extern void rxvt_pop_locale (); 851extern void rxvt_pop_locale ();
863 852
864/****************************************************************************/ 853/****************************************************************************/
865
866#ifdef MENUBAR
867# include "menubar.h"
868#endif
869 854
870#define BLINK_INTERVAL 0.5 855#define BLINK_INTERVAL 0.5
871#define TEXT_BLINK_INTERVAL 0.5 856#define TEXT_BLINK_INTERVAL 0.5
872 857
873#ifndef __attribute__ 858#ifndef __attribute__
… …
1057 refresh_limit, 1042 refresh_limit,
1058 last_bot, /* scrollbar last bottom position */ 1043 last_bot, /* scrollbar last bottom position */
1059 last_top, /* scrollbar last top position */ 1044 last_top, /* scrollbar last top position */
1060 last_state, /* scrollbar last state */ 1045 last_state, /* scrollbar last state */
1061 scrollbar_len, 1046 scrollbar_len,
1062#ifdef MENUBAR
1063 menu_readonly, /* okay to alter menu? */
1064 Arrows_x,
1065#endif
1066#if MENUBAR_MAX > 1
1067 Nbars,
1068#endif
1069 window_vt_x, 1047 window_vt_x,
1070 window_vt_y, 1048 window_vt_y,
1071 window_sb_x, 1049 window_sb_x,
1072# ifdef POINTER_BLANK 1050# ifdef POINTER_BLANK
1073 pointerBlankDelay, 1051 pointerBlankDelay,
… …
1082 unsigned long priv_modes, 1060 unsigned long priv_modes,
1083 SavedModes; 1061 SavedModes;
1084/* ---------- */ 1062/* ---------- */
1085 Atom xa[NUM_XA]; 1063 Atom xa[NUM_XA];
1086/* ---------- */ 1064/* ---------- */
1087#ifdef MENUBAR 1065#ifdef RXVT_SCROLLBAR
1088 GC menubarGC;
1089#endif
1090#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1091 GC scrollbarGC, 1066 GC scrollbarGC,
1092 topShadowGC, 1067 topShadowGC,
1093 botShadowGC; 1068 botShadowGC;
1094#endif 1069#endif
1095#ifdef XTERM_SCROLLBAR 1070#ifdef XTERM_SCROLLBAR
… …
1127 const char *key_delete; 1102 const char *key_delete;
1128#endif 1103#endif
1129 struct mouse_event MEvent; 1104 struct mouse_event MEvent;
1130 XComposeStatus compose; 1105 XComposeStatus compose;
1131 ttymode_t tio; 1106 ttymode_t tio;
1132#ifdef UTMP_SUPPORT
1133# ifdef HAVE_STRUCT_UTMP
1134 struct utmp ut;
1135# endif
1136# ifdef HAVE_STRUCT_UTMPX
1137 struct utmpx utx;
1138# endif
1139# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1140 char ut_id[5];
1141# endif
1142 int utmp_pos;
1143#endif
1144 row_col_t oldcursor; 1107 row_col_t oldcursor;
1145#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1146 bgPixmap_t bgPixmap; 1109 bgPixmap_t bgPixmap;
1147 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1110 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1148#endif
1149#ifdef MENUBAR
1150 menu_t *ActiveMenu, /* currently active menu */
1151 *BuildMenu; /* the menu currently being built */
1152 bar_t *CurrentBar;
1153# if ! (MENUBAR_MAX > 1)
1154 bar_t BarList;
1155# endif /* (MENUBAR_MAX > 1) */
1156#endif 1111#endif
1157 1112
1158#if ENABLE_OVERLAY 1113#if ENABLE_OVERLAY
1159 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1114 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1160 text_t **ov_text; 1115 text_t **ov_text;
… …
1189 const char *rs[NUM_RESOURCES]; 1144 const char *rs[NUM_RESOURCES];
1190 /* command input buffering */ 1145 /* command input buffering */
1191 char *cmdbuf_ptr, *cmdbuf_endp; 1146 char *cmdbuf_ptr, *cmdbuf_endp;
1192 char cmdbuf_base[CBUFSIZ]; 1147 char cmdbuf_base[CBUFSIZ];
1193 1148
1149 rxvt_ptytty *pty;
1150
1194 rxvt_salloc *talloc; // text line allocator 1151 rxvt_salloc *talloc; // text line allocator
1195 rxvt_salloc *ralloc; // rend line allocator 1152 rxvt_salloc *ralloc; // rend line allocator
1196 1153
1197 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1154 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1198 1155
… …
1208#endif 1165#endif
1209 1166
1210 // modifies first argument(!) 1167 // modifies first argument(!)
1211 void paste (char *data, unsigned int len); 1168 void paste (char *data, unsigned int len);
1212 1169
1213 long vt_emask; 1170 long vt_emask, vt_emask_perl;
1214 void flush (); 1171
1172 void vt_select_input () const
1173 {
1174 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1175 }
1215 1176
1216#if TRANSPARENT 1177#if TRANSPARENT
1217 void rootwin_cb (XEvent &xev); 1178 void rootwin_cb (XEvent &xev);
1218 xevent_watcher rootwin_ev; 1179 xevent_watcher rootwin_ev;
1219#endif 1180#endif
1220 1181
1221 void x_cb (XEvent &xev); 1182 void x_cb (XEvent &xev);
1183 void flush ();
1222 xevent_watcher termwin_ev; 1184 xevent_watcher termwin_ev;
1223 xevent_watcher vt_ev; 1185 xevent_watcher vt_ev;
1224#ifdef HAVE_SCROLLBARS 1186#ifdef HAVE_SCROLLBARS
1225 xevent_watcher scrollbar_ev; 1187 xevent_watcher scrollbar_ev;
1226#endif
1227#ifdef MENUBAR
1228 xevent_watcher menubar_ev;
1229#endif 1188#endif
1230 1189
1231 void check_cb (check_watcher &w); check_watcher check_ev; 1190 void check_cb (check_watcher &w); check_watcher check_ev;
1232 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1191 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1233 void flush_cb (time_watcher &w); time_watcher flush_ev; 1192 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1273 1232
1274 bool init (int argc, const char *const *argv); 1233 bool init (int argc, const char *const *argv);
1275 bool init_vars (); 1234 bool init_vars ();
1276 1235
1277 bool pty_fill (); 1236 bool pty_fill ();
1237
1238 void make_current () const // make this the "currently active" urxvt instance
1239 {
1240 SET_R (this);
1241 rxvt_set_locale (locale);
1242 set_environ (envv);
1243 }
1278 1244
1279 void init_secondary (); 1245 void init_secondary ();
1280 const char **init_resources (int argc, const char *const *argv); 1246 const char **init_resources (int argc, const char *const *argv);
1281 const char *x_resource (const char *name); 1247 const char *x_resource (const char *name);
1282 void init_env (); 1248 void init_env ();
… …
1357 void process_sgr_mode (unsigned int nargs, const int *arg); 1323 void process_sgr_mode (unsigned int nargs, const int *arg);
1358 void process_graphics (); 1324 void process_graphics ();
1359 // init.C 1325 // init.C
1360 void Get_Colours (); 1326 void Get_Colours ();
1361 void get_ourmods (); 1327 void get_ourmods ();
1362 // logging.C
1363 void makeutent (const char *pty, const char *hostname);
1364 void cleanutent ();
1365 // main.C 1328 // main.C
1366 void privileged_utmp (rxvt_privaction action); 1329 void privileged_utmp (rxvt_privaction action);
1367 bool set_fonts (); 1330 bool set_fonts ();
1368 void set_string_property (Atom prop, const char *str, int len = -1); 1331 void set_string_property (Atom prop, const char *str, int len = -1);
1369 void set_utf8_property (Atom prop, const char *str, int len = -1); 1332 void set_utf8_property (Atom prop, const char *str, int len = -1);
… …
1372 void set_window_color (int idx, const char *color); 1335 void set_window_color (int idx, const char *color);
1373 void set_colorfgbg (); 1336 void set_colorfgbg ();
1374 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1337 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1375 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1338 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1376 1339
1377#ifdef MENUBAR
1378 // menubar.C
1379 void menuitem_free (menu_t *menu, menuitem_t *item);
1380 int action_dispatch (action_t *action);
1381 void menuarrow_free (char name);
1382 void menuarrow_add (char *string);
1383 char *menu_find_base (menu_t **menu, char *path);
1384 menu_t *menu_delete (menu_t *menu);
1385 menu_t *menu_add (menu_t *parent, char *path);
1386 void drawbox_menubar (int x, int len, int state);
1387 void drawtriangle (int x, int y, int state);
1388 void drawbox_menuitem (int y, int state);
1389 void menu_show ();
1390 void menu_display (void (rxvt_term::*update) ());
1391 void menu_hide_all ();
1392 void menu_hide ();
1393 void menu_clear (menu_t *menu);
1394 void menubar_clear ();
1395 bar_t *menubar_find (const char *name);
1396 int menubar_push (const char *name);
1397 void menubar_remove (const char *name);
1398 void menubar_dump (FILE *fp);
1399 void menubar_read (const char *filename);
1400 void menubar_dispatch (char *str);
1401 void draw_Arrows (int name, int state);
1402 void menubar_expose ();
1403 int menubar_mapping (int map);
1404 int menu_select (XButtonEvent &ev);
1405 void menubar_select (XButtonEvent &ev);
1406 void menubar_control (XButtonEvent &ev);
1407 void map_menuBar (int map);
1408#endif
1409
1410 // screen.C 1340 // screen.C
1411 1341
1412 void lalloc (line_t &l) 1342 void lalloc (line_t &l) const
1413 { 1343 {
1414 l.t = (text_t *)talloc->alloc (); 1344 l.t = (text_t *)talloc->alloc ();
1415 l.r = (rend_t *)ralloc->alloc (); 1345 l.r = (rend_t *)ralloc->alloc ();
1416 } 1346 }
1417 1347
… …
1421 talloc->free (l.t); 1351 talloc->free (l.t);
1422 ralloc->free (l.r); 1352 ralloc->free (l.r);
1423 } 1353 }
1424#endif 1354#endif
1425 1355
1426 void lresize (line_t &l) 1356 void lresize (line_t &l) const
1427 { 1357 {
1428 if (!l.t) 1358 if (!l.t)
1429 return; 1359 return;
1430 1360
1431 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1361 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1435 1365
1436 if (ncol > prev_ncol) 1366 if (ncol > prev_ncol)
1437 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1367 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1438 } 1368 }
1439 1369
1440 int fgcolor_of (rend_t r) 1370 int fgcolor_of (rend_t r) const
1441 { 1371 {
1442 int base = GET_BASEFG (r); 1372 int base = GET_BASEFG (r);
1443#ifndef NO_BRIGHTCOLOR 1373#ifndef NO_BRIGHTCOLOR
1444 if (r & RS_Bold 1374 if (r & RS_Bold
1445# if ENABLE_STYLES 1375# if ENABLE_STYLES
… …
1449 base += minBrightCOLOR - minCOLOR; 1379 base += minBrightCOLOR - minCOLOR;
1450#endif 1380#endif
1451 return base; 1381 return base;
1452 } 1382 }
1453 1383
1454 int bgcolor_of (rend_t r) 1384 int bgcolor_of (rend_t r) const
1455 { 1385 {
1456 int base = GET_BASEBG (r); 1386 int base = GET_BASEBG (r);
1457#ifndef NO_BRIGHTCOLOR 1387#ifndef NO_BRIGHTCOLOR
1458 if (r & RS_Blink 1388 if (r & RS_Blink
1459# if ENABLE_STYLES 1389# if ENABLE_STYLES
… …
1463 base += minBrightCOLOR - minCOLOR; 1393 base += minBrightCOLOR - minCOLOR;
1464#endif 1394#endif
1465 return base; 1395 return base;
1466 } 1396 }
1467 1397
1468 bool option (uint32_t opt) 1398 bool option (uint32_t opt) const
1469 { 1399 {
1470 return OPTION (opt); 1400 return OPTION (opt);
1471 } 1401 }
1472 1402
1473 void set_option (uint32_t opt, bool set) 1403 void set_option (uint32_t opt, bool set)
… …
1476 options |= opt; 1406 options |= opt;
1477 else 1407 else
1478 options &= ~opt; 1408 options &= ~opt;
1479 } 1409 }
1480 1410
1481 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1411 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1482 void scr_blank_screen_mem (line_t &l, rend_t efs); 1412 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1483 int scr_scroll_text (int row1, int row2, int count); 1413 int scr_scroll_text (int row1, int row2, int count);
1484 void scr_reset (); 1414 void scr_reset ();
1485 void scr_release (); 1415 void scr_release ();
1486 void scr_clear (bool really = false); 1416 void scr_clear (bool really = false);
1487 void scr_refresh (unsigned char refresh_type); 1417 void scr_refresh ();
1488 bool scr_refresh_rend (rend_t mask, rend_t value); 1418 bool scr_refresh_rend (rend_t mask, rend_t value);
1489 void scr_erase_screen (int mode); 1419 void scr_erase_screen (int mode);
1490#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1491 void scr_erase_savelines (); 1421 void scr_erase_savelines ();
1492 void scr_backindex (); 1422 void scr_backindex ();
… …
1523 void scr_rvideo_mode (int mode); 1453 void scr_rvideo_mode (int mode);
1524 void scr_report_position (); 1454 void scr_report_position ();
1525 void set_font_style (); 1455 void set_font_style ();
1526 void scr_charset_choose (int set); 1456 void scr_charset_choose (int set);
1527 void scr_charset_set (int set, unsigned int ch); 1457 void scr_charset_set (int set, unsigned int ch);
1528 int scr_move_to (int y, int len); 1458 void scr_move_to (int y, int len);
1529 int scr_page (enum page_dirn direction, int nlines); 1459 bool scr_page (enum page_dirn direction, int nlines);
1530 int scr_changeview (unsigned int oldviewstart); 1460 bool scr_changeview (int new_view_start);
1531 void scr_bell (); 1461 void scr_bell ();
1532 void scr_printscreen (int fullhist); 1462 void scr_printscreen (int fullhist);
1533 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1463 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1534 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1464 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1535 void scr_reverse_selection (); 1465 void scr_reverse_selection ();
… …
1556 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1486 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1557#endif 1487#endif
1558 1488
1559#if defined(RXVT_SCROLLBAR) 1489#if defined(RXVT_SCROLLBAR)
1560 // scrollbar-rxvt.C 1490 // scrollbar-rxvt.C
1561 void Draw_button (int x, int y, int state, int dirn);
1562 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1491 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1563#endif 1492#endif
1564 1493
1565#if defined(XTERM_SCROLLBAR) 1494#if defined(XTERM_SCROLLBAR)
1566 // scrollbar-xterm.C 1495 // scrollbar-xterm.C

Diff Legend

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