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.199 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.218 by root, Tue Jan 17 12:22:59 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 put () = 0;
190
191 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
192 virtual void logout () = 0;
193
194 void close_tty ();
195
196 bool make_controlling_tty ();
197 void set_utf8_mode (bool on);
198};
199
200// a "factory" *g*
201rxvt_ptytty *rxvt_new_ptytty ();
166 202
167/* 203/*
168 * the 'essential' information for reporting Mouse Events 204 * the 'essential' information for reporting Mouse Events
169 * pared down from XButtonEvent 205 * pared down from XButtonEvent
170 */ 206 */
… …
229 265
230#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 266#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
231# define NO_MOUSE_REPORT_SCROLLBAR 1 267# define NO_MOUSE_REPORT_SCROLLBAR 1
232#endif 268#endif
233 269
234#if defined (ISO_14755) || defined (ENABLE_PERL)
235# define ENABLE_OVERLAY 1
236#endif
237
238/* now look for other badly set stuff */ 270/* now look for other badly set stuff */
239 271
240#if !defined (EACCESS) && defined(EAGAIN) 272#if !defined (EACCESS) && defined(EAGAIN)
241# define EACCESS EAGAIN 273# define EACCESS EAGAIN
242#endif 274#endif
… …
244#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 276#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
245# define EXIT_SUCCESS 0 /* exit function success */ 277# define EXIT_SUCCESS 0 /* exit function success */
246# define EXIT_FAILURE 1 /* exit function failure */ 278# define EXIT_FAILURE 1 /* exit function failure */
247#endif 279#endif
248 280
249#define menuBar_esc 10
250#define scrollBar_esc 30 281#define scrollBar_esc 30
251#define menuBar_margin 2 /* margin below text */
252 282
253#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 283#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
254# define HAVE_SCROLLBARS 1 284# 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 285#endif
263 286
264#define R_SB_ALIGN_CENTRE 0 287#define R_SB_ALIGN_CENTRE 0
265#define R_SB_ALIGN_TOP 1 288#define R_SB_ALIGN_TOP 1
266#define R_SB_ALIGN_BOTTOM 2 289#define R_SB_ALIGN_BOTTOM 2
… …
339 * | 362 * |
340 * +---< SB_WIDTH_NEXT 363 * +---< SB_WIDTH_NEXT
341 */ 364 */
342 365
343enum { 366enum {
344 NO_REFRESH = 0 , /* Window not visible at all! */ 367 NO_REFRESH = 0, /* Window not visible at all! */
345 FAST_REFRESH = 1<<0, /* Fully exposed window */ 368 FAST_REFRESH = 1, /* Fully exposed window */
346 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 369 SLOW_REFRESH = 2, /* Partially exposed window */
347 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
348}; 370};
349 371
350#ifdef NO_SECONDARY_SCREEN 372#ifdef NO_SECONDARY_SCREEN
351# define NSCREENS 0 373# define NSCREENS 0
352#else 374#else
… …
475 Rxvt_restoreFG = 39, // change default fg color 497 Rxvt_restoreFG = 39, // change default fg color
476 Rxvt_restoreBG = 49, // change default bg color 498 Rxvt_restoreBG = 49, // change default bg color
477 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 499 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
478 500
479 URxvt_locale = 701, // change locale 501 URxvt_locale = 701, // change locale
480 URxvt_Menu = 703, // set menu item 502
481 URxvt_Color_IT = 704, // change actual 'Italic' colour 503 URxvt_Color_IT = 704, // change actual 'Italic' colour
482 URxvt_Color_tint = 705, // change actual tint colour 504 URxvt_Color_tint = 705, // change actual tint colour
483 URxvt_Color_BD = 706, 505 URxvt_Color_BD = 706,
484 URxvt_Color_UL = 707, 506 URxvt_Color_UL = 707,
485 507
… …
640#define PrivMode_ShiftKeys (1UL<<10) 662#define PrivMode_ShiftKeys (1UL<<10)
641#define PrivMode_VisibleCursor (1UL<<11) 663#define PrivMode_VisibleCursor (1UL<<11)
642#define PrivMode_MouseX10 (1UL<<12) 664#define PrivMode_MouseX10 (1UL<<12)
643#define PrivMode_MouseX11 (1UL<<13) 665#define PrivMode_MouseX11 (1UL<<13)
644#define PrivMode_scrollBar (1UL<<14) 666#define PrivMode_scrollBar (1UL<<14)
645#define PrivMode_menuBar (1UL<<15)
646#define PrivMode_TtyOutputInh (1UL<<16) 667#define PrivMode_TtyOutputInh (1UL<<15)
647#define PrivMode_Keypress (1UL<<17) 668#define PrivMode_Keypress (1UL<<16)
648#define PrivMode_smoothScroll (1UL<<18) 669#define PrivMode_smoothScroll (1UL<<17)
649#define PrivMode_vt52 (1UL<<19) 670#define PrivMode_vt52 (1UL<<18)
650#define PrivMode_LFNL (1UL<<20) 671#define PrivMode_LFNL (1UL<<19)
651/* too annoying to implement X11 highlight tracking */ 672/* too annoying to implement X11 highlight tracking */
652/* #define PrivMode_MouseX11Track (1LU<<21) */ 673/* #define PrivMode_MouseX11Track (1LU<<20) */
653 674
654#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 675#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
655#define PrivMode(test,bit) \ 676#define PrivMode(test,bit) \
656 if (test) \ 677 if (test) \
657 priv_modes |= (bit); \ 678 priv_modes |= (bit); \
… …
704/* 725/*
705 ***************************************************************************** 726 *****************************************************************************
706 * MACRO DEFINES 727 * MACRO DEFINES
707 ***************************************************************************** 728 *****************************************************************************
708 */ 729 */
730#define dLocal(type,name) type const name = this->name
709#define dDisp Display *disp = display->display 731#define dDisp Display *disp = this->display->display
710 732
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 733/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 734#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 735#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 736#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
787#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 809#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788#define scrollbar_position(y) ((y) - scrollBar.beg) 810#define scrollbar_position(y) ((y) - scrollBar.beg)
789#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 811#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790 - scrollbar_minheight ()) 812 - scrollbar_minheight ())
791 813
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 814#ifdef XPM_BACKGROUND
804# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 815# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
805#else 816#else
806# define XPMClearArea(a, b, c, d, e, f, g) 817# 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 818#endif
826 819
827#ifdef DEBUG_CMD 820#ifdef DEBUG_CMD
828# define D_CMD(x) fprintf x ; fputc('\n', stderr) 821# define D_CMD(x) fprintf x ; fputc('\n', stderr)
829#else 822#else
… …
860extern bool rxvt_set_locale (const char *locale); 853extern bool rxvt_set_locale (const char *locale);
861extern void rxvt_push_locale (const char *locale); 854extern void rxvt_push_locale (const char *locale);
862extern void rxvt_pop_locale (); 855extern void rxvt_pop_locale ();
863 856
864/****************************************************************************/ 857/****************************************************************************/
865
866#ifdef MENUBAR
867# include "menubar.h"
868#endif
869 858
870#define BLINK_INTERVAL 0.5 859#define BLINK_INTERVAL 0.5
871#define TEXT_BLINK_INTERVAL 0.5 860#define TEXT_BLINK_INTERVAL 0.5
872 861
873#ifndef __attribute__ 862#ifndef __attribute__
… …
1057 refresh_limit, 1046 refresh_limit,
1058 last_bot, /* scrollbar last bottom position */ 1047 last_bot, /* scrollbar last bottom position */
1059 last_top, /* scrollbar last top position */ 1048 last_top, /* scrollbar last top position */
1060 last_state, /* scrollbar last state */ 1049 last_state, /* scrollbar last state */
1061 scrollbar_len, 1050 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, 1051 window_vt_x,
1070 window_vt_y, 1052 window_vt_y,
1071 window_sb_x, 1053 window_sb_x,
1072# ifdef POINTER_BLANK 1054# ifdef POINTER_BLANK
1073 pointerBlankDelay, 1055 pointerBlankDelay,
… …
1082 unsigned long priv_modes, 1064 unsigned long priv_modes,
1083 SavedModes; 1065 SavedModes;
1084/* ---------- */ 1066/* ---------- */
1085 Atom xa[NUM_XA]; 1067 Atom xa[NUM_XA];
1086/* ---------- */ 1068/* ---------- */
1087#ifdef MENUBAR 1069#ifdef RXVT_SCROLLBAR
1088 GC menubarGC;
1089#endif
1090#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1091 GC scrollbarGC, 1070 GC scrollbarGC,
1092 topShadowGC, 1071 topShadowGC,
1093 botShadowGC; 1072 botShadowGC;
1094#endif 1073#endif
1095#ifdef XTERM_SCROLLBAR 1074#ifdef XTERM_SCROLLBAR
… …
1127 const char *key_delete; 1106 const char *key_delete;
1128#endif 1107#endif
1129 struct mouse_event MEvent; 1108 struct mouse_event MEvent;
1130 XComposeStatus compose; 1109 XComposeStatus compose;
1131 ttymode_t tio; 1110 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; 1111 row_col_t oldcursor;
1145#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1146 bgPixmap_t bgPixmap; 1113 bgPixmap_t bgPixmap;
1147 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1114 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 1115#endif
1157 1116
1158#if ENABLE_OVERLAY 1117#if ENABLE_OVERLAY
1159 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1118 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1160 text_t **ov_text; 1119 text_t **ov_text;
… …
1189 const char *rs[NUM_RESOURCES]; 1148 const char *rs[NUM_RESOURCES];
1190 /* command input buffering */ 1149 /* command input buffering */
1191 char *cmdbuf_ptr, *cmdbuf_endp; 1150 char *cmdbuf_ptr, *cmdbuf_endp;
1192 char cmdbuf_base[CBUFSIZ]; 1151 char cmdbuf_base[CBUFSIZ];
1193 1152
1153 rxvt_ptytty *pty;
1154
1194 rxvt_salloc *talloc; // text line allocator 1155 rxvt_salloc *talloc; // text line allocator
1195 rxvt_salloc *ralloc; // rend line allocator 1156 rxvt_salloc *ralloc; // rend line allocator
1196 1157
1197 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1158 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1198 1159
… …
1208#endif 1169#endif
1209 1170
1210 // modifies first argument(!) 1171 // modifies first argument(!)
1211 void paste (char *data, unsigned int len); 1172 void paste (char *data, unsigned int len);
1212 1173
1213 void flush (); 1174 long vt_emask, vt_emask_perl;
1175
1176 void vt_select_input () const
1177 {
1178 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1179 }
1214 1180
1215#if TRANSPARENT 1181#if TRANSPARENT
1216 void rootwin_cb (XEvent &xev); 1182 void rootwin_cb (XEvent &xev);
1217 xevent_watcher rootwin_ev; 1183 xevent_watcher rootwin_ev;
1218#endif 1184#endif
1219 1185
1220 void x_cb (XEvent &xev); 1186 void x_cb (XEvent &xev);
1187 void flush ();
1221 xevent_watcher termwin_ev; 1188 xevent_watcher termwin_ev;
1222 xevent_watcher vt_ev; 1189 xevent_watcher vt_ev;
1223#ifdef HAVE_SCROLLBARS 1190#ifdef HAVE_SCROLLBARS
1224 xevent_watcher scrollbar_ev; 1191 xevent_watcher scrollbar_ev;
1225#endif
1226#ifdef MENUBAR
1227 xevent_watcher menubar_ev;
1228#endif 1192#endif
1229 1193
1230 void check_cb (check_watcher &w); check_watcher check_ev; 1194 void check_cb (check_watcher &w); check_watcher check_ev;
1231 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1195 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1232 void flush_cb (time_watcher &w); time_watcher flush_ev; 1196 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1272 1236
1273 bool init (int argc, const char *const *argv); 1237 bool init (int argc, const char *const *argv);
1274 bool init_vars (); 1238 bool init_vars ();
1275 1239
1276 bool pty_fill (); 1240 bool pty_fill ();
1241
1242 void make_current () const // make this the "currently active" urxvt instance
1243 {
1244 SET_R (this);
1245 rxvt_set_locale (locale);
1246 set_environ (envv);
1247 }
1277 1248
1278 void init_secondary (); 1249 void init_secondary ();
1279 const char **init_resources (int argc, const char *const *argv); 1250 const char **init_resources (int argc, const char *const *argv);
1280 const char *x_resource (const char *name); 1251 const char *x_resource (const char *name);
1281 void init_env (); 1252 void init_env ();
… …
1356 void process_sgr_mode (unsigned int nargs, const int *arg); 1327 void process_sgr_mode (unsigned int nargs, const int *arg);
1357 void process_graphics (); 1328 void process_graphics ();
1358 // init.C 1329 // init.C
1359 void Get_Colours (); 1330 void Get_Colours ();
1360 void get_ourmods (); 1331 void get_ourmods ();
1361 // logging.C
1362 void makeutent (const char *pty, const char *hostname);
1363 void cleanutent ();
1364 // main.C 1332 // main.C
1365 void privileged_utmp (rxvt_privaction action); 1333 void privileged_utmp (rxvt_privaction action);
1366 bool set_fonts (); 1334 bool set_fonts ();
1367 void set_string_property (Atom prop, const char *str, int len = -1); 1335 void set_string_property (Atom prop, const char *str, int len = -1);
1368 void set_utf8_property (Atom prop, const char *str, int len = -1); 1336 void set_utf8_property (Atom prop, const char *str, int len = -1);
… …
1371 void set_window_color (int idx, const char *color); 1339 void set_window_color (int idx, const char *color);
1372 void set_colorfgbg (); 1340 void set_colorfgbg ();
1373 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1341 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1374 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1342 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1375 1343
1376#ifdef MENUBAR
1377 // menubar.C
1378 void menuitem_free (menu_t *menu, menuitem_t *item);
1379 int action_dispatch (action_t *action);
1380 void menuarrow_free (char name);
1381 void menuarrow_add (char *string);
1382 char *menu_find_base (menu_t **menu, char *path);
1383 menu_t *menu_delete (menu_t *menu);
1384 menu_t *menu_add (menu_t *parent, char *path);
1385 void drawbox_menubar (int x, int len, int state);
1386 void drawtriangle (int x, int y, int state);
1387 void drawbox_menuitem (int y, int state);
1388 void menu_show ();
1389 void menu_display (void (rxvt_term::*update) ());
1390 void menu_hide_all ();
1391 void menu_hide ();
1392 void menu_clear (menu_t *menu);
1393 void menubar_clear ();
1394 bar_t *menubar_find (const char *name);
1395 int menubar_push (const char *name);
1396 void menubar_remove (const char *name);
1397 void menubar_dump (FILE *fp);
1398 void menubar_read (const char *filename);
1399 void menubar_dispatch (char *str);
1400 void draw_Arrows (int name, int state);
1401 void menubar_expose ();
1402 int menubar_mapping (int map);
1403 int menu_select (XButtonEvent &ev);
1404 void menubar_select (XButtonEvent &ev);
1405 void menubar_control (XButtonEvent &ev);
1406 void map_menuBar (int map);
1407#endif
1408
1409 // screen.C 1344 // screen.C
1410 1345
1411 void lalloc (line_t &l) 1346 void lalloc (line_t &l) const
1412 { 1347 {
1413 l.t = (text_t *)talloc->alloc (); 1348 l.t = (text_t *)talloc->alloc ();
1414 l.r = (rend_t *)ralloc->alloc (); 1349 l.r = (rend_t *)ralloc->alloc ();
1415 } 1350 }
1416 1351
… …
1420 talloc->free (l.t); 1355 talloc->free (l.t);
1421 ralloc->free (l.r); 1356 ralloc->free (l.r);
1422 } 1357 }
1423#endif 1358#endif
1424 1359
1425 void lresize (line_t &l) 1360 void lresize (line_t &l) const
1426 { 1361 {
1427 if (!l.t) 1362 if (!l.t)
1428 return; 1363 return;
1429 1364
1430 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1365 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1434 1369
1435 if (ncol > prev_ncol) 1370 if (ncol > prev_ncol)
1436 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1371 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1437 } 1372 }
1438 1373
1439 int fgcolor_of (rend_t r) 1374 int fgcolor_of (rend_t r) const
1440 { 1375 {
1441 int base = GET_BASEFG (r); 1376 int base = GET_BASEFG (r);
1442#ifndef NO_BRIGHTCOLOR 1377#ifndef NO_BRIGHTCOLOR
1443 if (r & RS_Bold 1378 if (r & RS_Bold
1444# if ENABLE_STYLES 1379# if ENABLE_STYLES
… …
1448 base += minBrightCOLOR - minCOLOR; 1383 base += minBrightCOLOR - minCOLOR;
1449#endif 1384#endif
1450 return base; 1385 return base;
1451 } 1386 }
1452 1387
1453 int bgcolor_of (rend_t r) 1388 int bgcolor_of (rend_t r) const
1454 { 1389 {
1455 int base = GET_BASEBG (r); 1390 int base = GET_BASEBG (r);
1456#ifndef NO_BRIGHTCOLOR 1391#ifndef NO_BRIGHTCOLOR
1457 if (r & RS_Blink 1392 if (r & RS_Blink
1458# if ENABLE_STYLES 1393# if ENABLE_STYLES
… …
1462 base += minBrightCOLOR - minCOLOR; 1397 base += minBrightCOLOR - minCOLOR;
1463#endif 1398#endif
1464 return base; 1399 return base;
1465 } 1400 }
1466 1401
1467 bool option (uint32_t opt) 1402 bool option (uint32_t opt) const
1468 { 1403 {
1469 return OPTION (opt); 1404 return OPTION (opt);
1470 } 1405 }
1471 1406
1472 void set_option (uint32_t opt, bool set) 1407 void set_option (uint32_t opt, bool set)
… …
1475 options |= opt; 1410 options |= opt;
1476 else 1411 else
1477 options &= ~opt; 1412 options &= ~opt;
1478 } 1413 }
1479 1414
1480 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1481 void scr_blank_screen_mem (line_t &l, rend_t efs); 1416 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1482 int scr_scroll_text (int row1, int row2, int count); 1417 int scr_scroll_text (int row1, int row2, int count);
1483 void scr_reset (); 1418 void scr_reset ();
1484 void scr_release (); 1419 void scr_release ();
1485 void scr_clear (bool really = false); 1420 void scr_clear (bool really = false);
1486 void scr_refresh (unsigned char refresh_type); 1421 void scr_refresh ();
1487 bool scr_refresh_rend (rend_t mask, rend_t value); 1422 bool scr_refresh_rend (rend_t mask, rend_t value);
1488 void scr_erase_screen (int mode); 1423 void scr_erase_screen (int mode);
1489#if ENABLE_FRILLS 1424#if ENABLE_FRILLS
1490 void scr_erase_savelines (); 1425 void scr_erase_savelines ();
1491 void scr_backindex (); 1426 void scr_backindex ();
… …
1522 void scr_rvideo_mode (int mode); 1457 void scr_rvideo_mode (int mode);
1523 void scr_report_position (); 1458 void scr_report_position ();
1524 void set_font_style (); 1459 void set_font_style ();
1525 void scr_charset_choose (int set); 1460 void scr_charset_choose (int set);
1526 void scr_charset_set (int set, unsigned int ch); 1461 void scr_charset_set (int set, unsigned int ch);
1527 int scr_move_to (int y, int len); 1462 void scr_move_to (int y, int len);
1528 int scr_page (enum page_dirn direction, int nlines); 1463 bool scr_page (enum page_dirn direction, int nlines);
1529 int scr_changeview (unsigned int oldviewstart); 1464 bool scr_changeview (int new_view_start);
1530 void scr_bell (); 1465 void scr_bell ();
1531 void scr_printscreen (int fullhist); 1466 void scr_printscreen (int fullhist);
1532 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1467 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1533 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1468 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1534 void scr_reverse_selection (); 1469 void scr_reverse_selection ();
… …
1555 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1490 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1556#endif 1491#endif
1557 1492
1558#if defined(RXVT_SCROLLBAR) 1493#if defined(RXVT_SCROLLBAR)
1559 // scrollbar-rxvt.C 1494 // scrollbar-rxvt.C
1560 void Draw_button (int x, int y, int state, int dirn);
1561 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1495 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1562#endif 1496#endif
1563 1497
1564#if defined(XTERM_SCROLLBAR) 1498#if defined(XTERM_SCROLLBAR)
1565 // scrollbar-xterm.C 1499 // scrollbar-xterm.C

Diff Legend

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