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.198 by root, Thu Jan 12 00:35:39 2006 UTC vs.
Revision 1.219 by root, Tue Jan 17 12:29:40 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
121extern char **environ; 141extern char **environ;
122extern char **rxvt_environ; // the original environ pointer 142extern char **rxvt_environ; // the original environ pointer
123 143
124struct temp_environ 144inline void set_environ (stringvec *envv)
125{ 145{
126 char **prev;
127
128 temp_environ (const stringvec *envv)
129 : prev(environ)
130 {
131 if (envv) 146 if (envv)
132 environ = (char **)envv->begin (); 147 environ = (char **)envv->begin ();
133 } 148}
134 149
135 temp_environ (char **env) 150inline void set_environ (char **envv)
136 : prev(environ) 151{
137 {
138 if (env) 152 if (envv)
139 environ = env; 153 environ = envv;
140 } 154}
141
142 ~temp_environ ()
143 {
144 environ = prev;
145 }
146};
147
148#define TEMP_ENV temp_environ temp_environ (envv)
149 155
150/* 156/*
151 ***************************************************************************** 157 *****************************************************************************
152 * STRUCTURES AND TYPEDEFS 158 * STRUCTURES AND TYPEDEFS
153 ***************************************************************************** 159 *****************************************************************************
154 */ 160 */
155struct grwin_t; 161struct grwin_t;
156 162
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 163/* If we're using either the rxvt scrollbar, keep the
166 * scrollColor resource. 164 * scrollColor resource.
167 */ 165 */
168#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 166#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
169# define KEEP_SCROLLCOLOR 1 167# define KEEP_SCROLLCOLOR 1
170#else 168#else
171# undef KEEP_SCROLLCOLOR 169# undef KEEP_SCROLLCOLOR
172#endif 170#endif
173 171
… …
175typedef struct { 173typedef struct {
176 short w, h, x, y; 174 short w, h, x, y;
177 Pixmap pixmap; 175 Pixmap pixmap;
178} bgPixmap_t; 176} bgPixmap_t;
179#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
190 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
191 virtual void logout () = 0;
192
193 void close_tty ();
194
195 bool make_controlling_tty ();
196 void set_utf8_mode (bool on);
197};
198
199// a "factory" *g*
200rxvt_ptytty *rxvt_new_ptytty ();
180 201
181/* 202/*
182 * the 'essential' information for reporting Mouse Events 203 * the 'essential' information for reporting Mouse Events
183 * pared down from XButtonEvent 204 * pared down from XButtonEvent
184 */ 205 */
… …
243 264
244#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 265#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
245# define NO_MOUSE_REPORT_SCROLLBAR 1 266# define NO_MOUSE_REPORT_SCROLLBAR 1
246#endif 267#endif
247 268
248#if defined (ISO_14755) || defined (ENABLE_PERL)
249# define ENABLE_OVERLAY 1
250#endif
251
252/* now look for other badly set stuff */ 269/* now look for other badly set stuff */
253 270
254#if !defined (EACCESS) && defined(EAGAIN) 271#if !defined (EACCESS) && defined(EAGAIN)
255# define EACCESS EAGAIN 272# define EACCESS EAGAIN
256#endif 273#endif
… …
258#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 275#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
259# define EXIT_SUCCESS 0 /* exit function success */ 276# define EXIT_SUCCESS 0 /* exit function success */
260# define EXIT_FAILURE 1 /* exit function failure */ 277# define EXIT_FAILURE 1 /* exit function failure */
261#endif 278#endif
262 279
263#define menuBar_esc 10
264#define scrollBar_esc 30 280#define scrollBar_esc 30
265#define menuBar_margin 2 /* margin below text */
266 281
267#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
268# define HAVE_SCROLLBARS 1 283# 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 284#endif
277 285
278#define R_SB_ALIGN_CENTRE 0 286#define R_SB_ALIGN_CENTRE 0
279#define R_SB_ALIGN_TOP 1 287#define R_SB_ALIGN_TOP 1
280#define R_SB_ALIGN_BOTTOM 2 288#define R_SB_ALIGN_BOTTOM 2
… …
353 * | 361 * |
354 * +---< SB_WIDTH_NEXT 362 * +---< SB_WIDTH_NEXT
355 */ 363 */
356 364
357enum { 365enum {
358 NO_REFRESH = 0 , /* Window not visible at all! */ 366 NO_REFRESH = 0, /* Window not visible at all! */
359 FAST_REFRESH = 1<<0, /* Fully exposed window */ 367 FAST_REFRESH = 1, /* Fully exposed window */
360 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 368 SLOW_REFRESH = 2, /* Partially exposed window */
361 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
362}; 369};
363 370
364#ifdef NO_SECONDARY_SCREEN 371#ifdef NO_SECONDARY_SCREEN
365# define NSCREENS 0 372# define NSCREENS 0
366#else 373#else
… …
489 Rxvt_restoreFG = 39, // change default fg color 496 Rxvt_restoreFG = 39, // change default fg color
490 Rxvt_restoreBG = 49, // change default bg color 497 Rxvt_restoreBG = 49, // change default bg color
491 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 498 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
492 499
493 URxvt_locale = 701, // change locale 500 URxvt_locale = 701, // change locale
494 URxvt_Menu = 703, // set menu item 501
495 URxvt_Color_IT = 704, // change actual 'Italic' colour 502 URxvt_Color_IT = 704, // change actual 'Italic' colour
496 URxvt_Color_tint = 705, // change actual tint colour 503 URxvt_Color_tint = 705, // change actual tint colour
497 URxvt_Color_BD = 706, 504 URxvt_Color_BD = 706,
498 URxvt_Color_UL = 707, 505 URxvt_Color_UL = 707,
499 506
… …
654#define PrivMode_ShiftKeys (1UL<<10) 661#define PrivMode_ShiftKeys (1UL<<10)
655#define PrivMode_VisibleCursor (1UL<<11) 662#define PrivMode_VisibleCursor (1UL<<11)
656#define PrivMode_MouseX10 (1UL<<12) 663#define PrivMode_MouseX10 (1UL<<12)
657#define PrivMode_MouseX11 (1UL<<13) 664#define PrivMode_MouseX11 (1UL<<13)
658#define PrivMode_scrollBar (1UL<<14) 665#define PrivMode_scrollBar (1UL<<14)
659#define PrivMode_menuBar (1UL<<15)
660#define PrivMode_TtyOutputInh (1UL<<16) 666#define PrivMode_TtyOutputInh (1UL<<15)
661#define PrivMode_Keypress (1UL<<17) 667#define PrivMode_Keypress (1UL<<16)
662#define PrivMode_smoothScroll (1UL<<18) 668#define PrivMode_smoothScroll (1UL<<17)
663#define PrivMode_vt52 (1UL<<19) 669#define PrivMode_vt52 (1UL<<18)
664#define PrivMode_LFNL (1UL<<20) 670#define PrivMode_LFNL (1UL<<19)
665/* too annoying to implement X11 highlight tracking */ 671/* too annoying to implement X11 highlight tracking */
666/* #define PrivMode_MouseX11Track (1LU<<21) */ 672/* #define PrivMode_MouseX11Track (1LU<<20) */
667 673
668#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 674#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
669#define PrivMode(test,bit) \ 675#define PrivMode(test,bit) \
670 if (test) \ 676 if (test) \
671 priv_modes |= (bit); \ 677 priv_modes |= (bit); \
… …
718/* 724/*
719 ***************************************************************************** 725 *****************************************************************************
720 * MACRO DEFINES 726 * MACRO DEFINES
721 ***************************************************************************** 727 *****************************************************************************
722 */ 728 */
729#define dLocal(type,name) type const name = this->name
723#define dDisp Display *disp = display->display 730#define dDisp Display *disp = this->display->display
724 731
725/* convert pixel dimensions to row/column values. Everything as int32_t */ 732/* convert pixel dimensions to row/column values. Everything as int32_t */
726#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 733#define Pixel2Col(x) Pixel2Width((int32_t)(x))
727#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 734#define Pixel2Row(y) Pixel2Height((int32_t)(y))
728#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 735#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
801#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 808#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
802#define scrollbar_position(y) ((y) - scrollBar.beg) 809#define scrollbar_position(y) ((y) - scrollBar.beg)
803#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 810#define scrollbar_size() (scrollBar.end - scrollBar.beg \
804 - scrollbar_minheight ()) 811 - scrollbar_minheight ())
805 812
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 813#ifdef XPM_BACKGROUND
818# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 814# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
819#else 815#else
820# define XPMClearArea(a, b, c, d, e, f, g) 816# 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 817#endif
840 818
841#ifdef DEBUG_CMD 819#ifdef DEBUG_CMD
842# define D_CMD(x) fprintf x ; fputc('\n', stderr) 820# define D_CMD(x) fprintf x ; fputc('\n', stderr)
843#else 821#else
… …
874extern bool rxvt_set_locale (const char *locale); 852extern bool rxvt_set_locale (const char *locale);
875extern void rxvt_push_locale (const char *locale); 853extern void rxvt_push_locale (const char *locale);
876extern void rxvt_pop_locale (); 854extern void rxvt_pop_locale ();
877 855
878/****************************************************************************/ 856/****************************************************************************/
879
880#ifdef MENUBAR
881# include "menubar.h"
882#endif
883 857
884#define BLINK_INTERVAL 0.5 858#define BLINK_INTERVAL 0.5
885#define TEXT_BLINK_INTERVAL 0.5 859#define TEXT_BLINK_INTERVAL 0.5
886 860
887#ifndef __attribute__ 861#ifndef __attribute__
… …
1071 refresh_limit, 1045 refresh_limit,
1072 last_bot, /* scrollbar last bottom position */ 1046 last_bot, /* scrollbar last bottom position */
1073 last_top, /* scrollbar last top position */ 1047 last_top, /* scrollbar last top position */
1074 last_state, /* scrollbar last state */ 1048 last_state, /* scrollbar last state */
1075 scrollbar_len, 1049 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, 1050 window_vt_x,
1084 window_vt_y, 1051 window_vt_y,
1085 window_sb_x, 1052 window_sb_x,
1086# ifdef POINTER_BLANK 1053# ifdef POINTER_BLANK
1087 pointerBlankDelay, 1054 pointerBlankDelay,
… …
1096 unsigned long priv_modes, 1063 unsigned long priv_modes,
1097 SavedModes; 1064 SavedModes;
1098/* ---------- */ 1065/* ---------- */
1099 Atom xa[NUM_XA]; 1066 Atom xa[NUM_XA];
1100/* ---------- */ 1067/* ---------- */
1101#ifdef MENUBAR 1068#ifdef RXVT_SCROLLBAR
1102 GC menubarGC;
1103#endif
1104#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1105 GC scrollbarGC, 1069 GC scrollbarGC,
1106 topShadowGC, 1070 topShadowGC,
1107 botShadowGC; 1071 botShadowGC;
1108#endif 1072#endif
1109#ifdef XTERM_SCROLLBAR 1073#ifdef XTERM_SCROLLBAR
… …
1141 const char *key_delete; 1105 const char *key_delete;
1142#endif 1106#endif
1143 struct mouse_event MEvent; 1107 struct mouse_event MEvent;
1144 XComposeStatus compose; 1108 XComposeStatus compose;
1145 ttymode_t tio; 1109 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; 1110 row_col_t oldcursor;
1159#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1160 bgPixmap_t bgPixmap; 1112 bgPixmap_t bgPixmap;
1161 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1113 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 1114#endif
1171 1115
1172#if ENABLE_OVERLAY 1116#if ENABLE_OVERLAY
1173 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1117 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1174 text_t **ov_text; 1118 text_t **ov_text;
… …
1203 const char *rs[NUM_RESOURCES]; 1147 const char *rs[NUM_RESOURCES];
1204 /* command input buffering */ 1148 /* command input buffering */
1205 char *cmdbuf_ptr, *cmdbuf_endp; 1149 char *cmdbuf_ptr, *cmdbuf_endp;
1206 char cmdbuf_base[CBUFSIZ]; 1150 char cmdbuf_base[CBUFSIZ];
1207 1151
1152 rxvt_ptytty *pty;
1153
1208 rxvt_salloc *talloc; // text line allocator 1154 rxvt_salloc *talloc; // text line allocator
1209 rxvt_salloc *ralloc; // rend line allocator 1155 rxvt_salloc *ralloc; // rend line allocator
1210 1156
1211 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1157 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1212 1158
… …
1222#endif 1168#endif
1223 1169
1224 // modifies first argument(!) 1170 // modifies first argument(!)
1225 void paste (char *data, unsigned int len); 1171 void paste (char *data, unsigned int len);
1226 1172
1227 void flush (); 1173 long vt_emask, vt_emask_perl;
1174
1175 void vt_select_input () const
1176 {
1177 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1178 }
1228 1179
1229#if TRANSPARENT 1180#if TRANSPARENT
1230 void rootwin_cb (XEvent &xev); 1181 void rootwin_cb (XEvent &xev);
1231 xevent_watcher rootwin_ev; 1182 xevent_watcher rootwin_ev;
1232#endif 1183#endif
1233 1184
1234 void x_cb (XEvent &xev); 1185 void x_cb (XEvent &xev);
1186 void flush ();
1235 xevent_watcher termwin_ev; 1187 xevent_watcher termwin_ev;
1236 xevent_watcher vt_ev; 1188 xevent_watcher vt_ev;
1237#ifdef HAVE_SCROLLBARS 1189#ifdef HAVE_SCROLLBARS
1238 xevent_watcher scrollbar_ev; 1190 xevent_watcher scrollbar_ev;
1239#endif
1240#ifdef MENUBAR
1241 xevent_watcher menubar_ev;
1242#endif 1191#endif
1243 1192
1244 void check_cb (check_watcher &w); check_watcher check_ev; 1193 void check_cb (check_watcher &w); check_watcher check_ev;
1245 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1194 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1246 void flush_cb (time_watcher &w); time_watcher flush_ev; 1195 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1286 1235
1287 bool init (int argc, const char *const *argv); 1236 bool init (int argc, const char *const *argv);
1288 bool init_vars (); 1237 bool init_vars ();
1289 1238
1290 bool pty_fill (); 1239 bool pty_fill ();
1240
1241 void make_current () const // make this the "currently active" urxvt instance
1242 {
1243 SET_R (this);
1244 rxvt_set_locale (locale);
1245 set_environ (envv);
1246 }
1291 1247
1292 void init_secondary (); 1248 void init_secondary ();
1293 const char **init_resources (int argc, const char *const *argv); 1249 const char **init_resources (int argc, const char *const *argv);
1294 const char *x_resource (const char *name); 1250 const char *x_resource (const char *name);
1295 void init_env (); 1251 void init_env ();
… …
1370 void process_sgr_mode (unsigned int nargs, const int *arg); 1326 void process_sgr_mode (unsigned int nargs, const int *arg);
1371 void process_graphics (); 1327 void process_graphics ();
1372 // init.C 1328 // init.C
1373 void Get_Colours (); 1329 void Get_Colours ();
1374 void get_ourmods (); 1330 void get_ourmods ();
1375 // logging.C
1376 void makeutent (const char *pty, const char *hostname);
1377 void cleanutent ();
1378 // main.C 1331 // main.C
1379 void privileged_utmp (rxvt_privaction action); 1332 void privileged_utmp (rxvt_privaction action);
1380 bool set_fonts (); 1333 bool set_fonts ();
1381 void set_string_property (Atom prop, const char *str, int len = -1); 1334 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); 1335 void set_utf8_property (Atom prop, const char *str, int len = -1);
… …
1385 void set_window_color (int idx, const char *color); 1338 void set_window_color (int idx, const char *color);
1386 void set_colorfgbg (); 1339 void set_colorfgbg ();
1387 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1340 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1388 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1341 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1389 1342
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 1343 // screen.C
1424 1344
1425 void lalloc (line_t &l) 1345 void lalloc (line_t &l) const
1426 { 1346 {
1427 l.t = (text_t *)talloc->alloc (); 1347 l.t = (text_t *)talloc->alloc ();
1428 l.r = (rend_t *)ralloc->alloc (); 1348 l.r = (rend_t *)ralloc->alloc ();
1429 } 1349 }
1430 1350
… …
1434 talloc->free (l.t); 1354 talloc->free (l.t);
1435 ralloc->free (l.r); 1355 ralloc->free (l.r);
1436 } 1356 }
1437#endif 1357#endif
1438 1358
1439 void lresize (line_t &l) 1359 void lresize (line_t &l) const
1440 { 1360 {
1441 if (!l.t) 1361 if (!l.t)
1442 return; 1362 return;
1443 1363
1444 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1364 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1448 1368
1449 if (ncol > prev_ncol) 1369 if (ncol > prev_ncol)
1450 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1370 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1451 } 1371 }
1452 1372
1453 int fgcolor_of (rend_t r) 1373 int fgcolor_of (rend_t r) const
1454 { 1374 {
1455 int base = GET_BASEFG (r); 1375 int base = GET_BASEFG (r);
1456#ifndef NO_BRIGHTCOLOR 1376#ifndef NO_BRIGHTCOLOR
1457 if (r & RS_Bold 1377 if (r & RS_Bold
1458# if ENABLE_STYLES 1378# if ENABLE_STYLES
… …
1462 base += minBrightCOLOR - minCOLOR; 1382 base += minBrightCOLOR - minCOLOR;
1463#endif 1383#endif
1464 return base; 1384 return base;
1465 } 1385 }
1466 1386
1467 int bgcolor_of (rend_t r) 1387 int bgcolor_of (rend_t r) const
1468 { 1388 {
1469 int base = GET_BASEBG (r); 1389 int base = GET_BASEBG (r);
1470#ifndef NO_BRIGHTCOLOR 1390#ifndef NO_BRIGHTCOLOR
1471 if (r & RS_Blink 1391 if (r & RS_Blink
1472# if ENABLE_STYLES 1392# if ENABLE_STYLES
… …
1476 base += minBrightCOLOR - minCOLOR; 1396 base += minBrightCOLOR - minCOLOR;
1477#endif 1397#endif
1478 return base; 1398 return base;
1479 } 1399 }
1480 1400
1481 bool option (uint32_t opt) 1401 bool option (uint32_t opt) const
1482 { 1402 {
1483 return OPTION (opt); 1403 return OPTION (opt);
1484 } 1404 }
1485 1405
1486 void set_option (uint32_t opt, bool set) 1406 void set_option (uint32_t opt, bool set)
… …
1489 options |= opt; 1409 options |= opt;
1490 else 1410 else
1491 options &= ~opt; 1411 options &= ~opt;
1492 } 1412 }
1493 1413
1494 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1414 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); 1415 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1496 int scr_scroll_text (int row1, int row2, int count); 1416 int scr_scroll_text (int row1, int row2, int count);
1497 void scr_reset (); 1417 void scr_reset ();
1498 void scr_release (); 1418 void scr_release ();
1499 void scr_clear (bool really = false); 1419 void scr_clear (bool really = false);
1500 void scr_refresh (unsigned char refresh_type); 1420 void scr_refresh ();
1501 bool scr_refresh_rend (rend_t mask, rend_t value); 1421 bool scr_refresh_rend (rend_t mask, rend_t value);
1502 void scr_erase_screen (int mode); 1422 void scr_erase_screen (int mode);
1503#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1504 void scr_erase_savelines (); 1424 void scr_erase_savelines ();
1505 void scr_backindex (); 1425 void scr_backindex ();
… …
1536 void scr_rvideo_mode (int mode); 1456 void scr_rvideo_mode (int mode);
1537 void scr_report_position (); 1457 void scr_report_position ();
1538 void set_font_style (); 1458 void set_font_style ();
1539 void scr_charset_choose (int set); 1459 void scr_charset_choose (int set);
1540 void scr_charset_set (int set, unsigned int ch); 1460 void scr_charset_set (int set, unsigned int ch);
1541 int scr_move_to (int y, int len); 1461 void scr_move_to (int y, int len);
1542 int scr_page (enum page_dirn direction, int nlines); 1462 bool scr_page (enum page_dirn direction, int nlines);
1543 int scr_changeview (unsigned int oldviewstart); 1463 bool scr_changeview (int new_view_start);
1544 void scr_bell (); 1464 void scr_bell ();
1545 void scr_printscreen (int fullhist); 1465 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); 1466 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); 1467 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1548 void scr_reverse_selection (); 1468 void scr_reverse_selection ();
… …
1569 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1489 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1570#endif 1490#endif
1571 1491
1572#if defined(RXVT_SCROLLBAR) 1492#if defined(RXVT_SCROLLBAR)
1573 // scrollbar-rxvt.C 1493 // 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); 1494 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1576#endif 1495#endif
1577 1496
1578#if defined(XTERM_SCROLLBAR) 1497#if defined(XTERM_SCROLLBAR)
1579 // scrollbar-xterm.C 1498 // scrollbar-xterm.C

Diff Legend

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