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.197 by root, Wed Jan 11 05:29:40 2006 UTC vs.
Revision 1.221 by root, Tue Jan 17 16:50:42 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);
137
138/////////////////////////////////////////////////////////////////////////////
139
140// temporarily replace the process environment
141extern char **environ;
142extern char **rxvt_environ; // the original environ pointer
143
144inline void set_environ (stringvec *envv)
145{
146 if (envv)
147 environ = (char **)envv->begin ();
148}
149
150inline void set_environ (char **envv)
151{
152 if (envv)
153 environ = envv;
154}
117 155
118/* 156/*
119 ***************************************************************************** 157 *****************************************************************************
120 * STRUCTURES AND TYPEDEFS 158 * STRUCTURES AND TYPEDEFS
121 ***************************************************************************** 159 *****************************************************************************
122 */ 160 */
123struct grwin_t; 161struct grwin_t;
124 162
125/* Sanitize menubar info */
126#ifndef MENUBAR
127# undef MENUBAR_MAX
128#endif
129#ifndef MENUBAR_MAX
130# define MENUBAR_MAX 0
131#endif
132
133/* If we're using either the rxvt scrollbar or menu bars, keep the 163/* If we're using either the rxvt scrollbar, keep the
134 * scrollColor resource. 164 * scrollColor resource.
135 */ 165 */
136#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 166#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
137# define KEEP_SCROLLCOLOR 1 167# define KEEP_SCROLLCOLOR 1
138#else 168#else
139# undef KEEP_SCROLLCOLOR 169# undef KEEP_SCROLLCOLOR
140#endif 170#endif
141 171
… …
143typedef struct { 173typedef struct {
144 short w, h, x, y; 174 short w, h, x, y;
145 Pixmap pixmap; 175 Pixmap pixmap;
146} bgPixmap_t; 176} bgPixmap_t;
147#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#if UTMP_SUPPORT
190 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
191#endif
192
193 void close_tty ();
194 bool make_controlling_tty ();
195 void set_utf8_mode (bool on);
196};
197
198rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
199void rxvt_ptytty_server (); // start the ptytty server process
148 200
149/* 201/*
150 * the 'essential' information for reporting Mouse Events 202 * the 'essential' information for reporting Mouse Events
151 * pared down from XButtonEvent 203 * pared down from XButtonEvent
152 */ 204 */
… …
211 263
212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 264#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
213# define NO_MOUSE_REPORT_SCROLLBAR 1 265# define NO_MOUSE_REPORT_SCROLLBAR 1
214#endif 266#endif
215 267
216#if defined (ISO_14755) || defined (ENABLE_PERL)
217# define ENABLE_OVERLAY 1
218#endif
219
220/* now look for other badly set stuff */ 268/* now look for other badly set stuff */
221 269
222#if !defined (EACCESS) && defined(EAGAIN) 270#if !defined (EACCESS) && defined(EAGAIN)
223# define EACCESS EAGAIN 271# define EACCESS EAGAIN
224#endif 272#endif
… …
226#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 274#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
227# define EXIT_SUCCESS 0 /* exit function success */ 275# define EXIT_SUCCESS 0 /* exit function success */
228# define EXIT_FAILURE 1 /* exit function failure */ 276# define EXIT_FAILURE 1 /* exit function failure */
229#endif 277#endif
230 278
231#define menuBar_esc 10
232#define scrollBar_esc 30 279#define scrollBar_esc 30
233#define menuBar_margin 2 /* margin below text */
234 280
235#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 281#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
236# define HAVE_SCROLLBARS 1 282# define HAVE_SCROLLBARS 1
237#endif
238
239/* width of scrollBar, menuBar shadow, must be 1 or 2 */
240#ifdef HALFSHADOW
241# define MENU_SHADOW 1
242#else
243# define MENU_SHADOW 2
244#endif 283#endif
245 284
246#define R_SB_ALIGN_CENTRE 0 285#define R_SB_ALIGN_CENTRE 0
247#define R_SB_ALIGN_TOP 1 286#define R_SB_ALIGN_TOP 1
248#define R_SB_ALIGN_BOTTOM 2 287#define R_SB_ALIGN_BOTTOM 2
… …
321 * | 360 * |
322 * +---< SB_WIDTH_NEXT 361 * +---< SB_WIDTH_NEXT
323 */ 362 */
324 363
325enum { 364enum {
326 NO_REFRESH = 0 , /* Window not visible at all! */ 365 NO_REFRESH = 0, /* Window not visible at all! */
327 FAST_REFRESH = 1<<0, /* Fully exposed window */ 366 FAST_REFRESH = 1, /* Fully exposed window */
328 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 367 SLOW_REFRESH = 2, /* Partially exposed window */
329 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
330}; 368};
331 369
332#ifdef NO_SECONDARY_SCREEN 370#ifdef NO_SECONDARY_SCREEN
333# define NSCREENS 0 371# define NSCREENS 0
334#else 372#else
… …
457 Rxvt_restoreFG = 39, // change default fg color 495 Rxvt_restoreFG = 39, // change default fg color
458 Rxvt_restoreBG = 49, // change default bg color 496 Rxvt_restoreBG = 49, // change default bg color
459 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 497 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
460 498
461 URxvt_locale = 701, // change locale 499 URxvt_locale = 701, // change locale
462 URxvt_Menu = 703, // set menu item 500
463 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
464 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
465 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
466 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
467 505
… …
622#define PrivMode_ShiftKeys (1UL<<10) 660#define PrivMode_ShiftKeys (1UL<<10)
623#define PrivMode_VisibleCursor (1UL<<11) 661#define PrivMode_VisibleCursor (1UL<<11)
624#define PrivMode_MouseX10 (1UL<<12) 662#define PrivMode_MouseX10 (1UL<<12)
625#define PrivMode_MouseX11 (1UL<<13) 663#define PrivMode_MouseX11 (1UL<<13)
626#define PrivMode_scrollBar (1UL<<14) 664#define PrivMode_scrollBar (1UL<<14)
627#define PrivMode_menuBar (1UL<<15)
628#define PrivMode_TtyOutputInh (1UL<<16) 665#define PrivMode_TtyOutputInh (1UL<<15)
629#define PrivMode_Keypress (1UL<<17) 666#define PrivMode_Keypress (1UL<<16)
630#define PrivMode_smoothScroll (1UL<<18) 667#define PrivMode_smoothScroll (1UL<<17)
631#define PrivMode_vt52 (1UL<<19) 668#define PrivMode_vt52 (1UL<<18)
632#define PrivMode_LFNL (1UL<<20) 669#define PrivMode_LFNL (1UL<<19)
633/* too annoying to implement X11 highlight tracking */ 670/* too annoying to implement X11 highlight tracking */
634/* #define PrivMode_MouseX11Track (1LU<<21) */ 671/* #define PrivMode_MouseX11Track (1LU<<20) */
635 672
636#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 673#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
637#define PrivMode(test,bit) \ 674#define PrivMode(test,bit) \
638 if (test) \ 675 if (test) \
639 priv_modes |= (bit); \ 676 priv_modes |= (bit); \
… …
686/* 723/*
687 ***************************************************************************** 724 *****************************************************************************
688 * MACRO DEFINES 725 * MACRO DEFINES
689 ***************************************************************************** 726 *****************************************************************************
690 */ 727 */
728#define dLocal(type,name) type const name = this->name
691#define dDisp Display *disp = display->display 729#define dDisp Display *disp = this->display->display
692 730
693/* convert pixel dimensions to row/column values. Everything as int32_t */ 731/* convert pixel dimensions to row/column values. Everything as int32_t */
694#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 732#define Pixel2Col(x) Pixel2Width((int32_t)(x))
695#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 733#define Pixel2Row(y) Pixel2Height((int32_t)(y))
696#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 734#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
698#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 736#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
699#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 737#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
700#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 738#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
701#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 739#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
702 740
703#define TEMP_ENV temp_environ temp_environ (envv)
704
705#define OPTION(opt) (options & (opt)) 741#define OPTION(opt) (options & (opt))
706#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 742#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
707 | Opt_jumpScroll | Opt_secondaryScreen \ 743 | Opt_jumpScroll | Opt_secondaryScreen \
708 | Opt_pastableTabs | Opt_intensityStyles) 744 | Opt_pastableTabs | Opt_intensityStyles)
709 745
… …
771#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 807#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
772#define scrollbar_position(y) ((y) - scrollBar.beg) 808#define scrollbar_position(y) ((y) - scrollBar.beg)
773#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 809#define scrollbar_size() (scrollBar.end - scrollBar.beg \
774 - scrollbar_minheight ()) 810 - scrollbar_minheight ())
775 811
776#if (MENUBAR_MAX > 1)
777/* rendition style flags */
778# define menuBar_height() (fheight + MENU_SHADOW)
779# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
780# define isMenuBarWindow(w) ((w) == menuBar.win)
781#else
782# define menuBar_height() (0)
783# define menuBar_TotalHeight() (0)
784# define isMenuBarWindow(w) (0)
785#endif
786
787#ifdef XPM_BACKGROUND 812#ifdef XPM_BACKGROUND
788# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 813# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
789#else 814#else
790# define XPMClearArea(a, b, c, d, e, f, g) 815# define XPMClearArea(a, b, c, d, e, f, g)
791#endif
792
793#ifdef UTMP_SUPPORT
794# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
795# undef HAVE_UTMPX_H
796# undef HAVE_STRUCT_UTMPX
797# endif
798# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
799# undef HAVE_UTMP_H
800# undef HAVE_STRUCT_UTMP
801# endif
802
803# ifdef HAVE_UTMPX_H
804# include <utmpx.h>
805# endif
806# ifdef HAVE_UTMP_H
807# include <utmp.h>
808# endif
809#endif 816#endif
810 817
811#ifdef DEBUG_CMD 818#ifdef DEBUG_CMD
812# define D_CMD(x) fprintf x ; fputc('\n', stderr) 819# define D_CMD(x) fprintf x ; fputc('\n', stderr)
813#else 820#else
… …
844extern bool rxvt_set_locale (const char *locale); 851extern bool rxvt_set_locale (const char *locale);
845extern void rxvt_push_locale (const char *locale); 852extern void rxvt_push_locale (const char *locale);
846extern void rxvt_pop_locale (); 853extern void rxvt_pop_locale ();
847 854
848/****************************************************************************/ 855/****************************************************************************/
849
850#ifdef MENUBAR
851# include "menubar.h"
852#endif
853 856
854#define BLINK_INTERVAL 0.5 857#define BLINK_INTERVAL 0.5
855#define TEXT_BLINK_INTERVAL 0.5 858#define TEXT_BLINK_INTERVAL 0.5
856 859
857#ifndef __attribute__ 860#ifndef __attribute__
… …
1041 refresh_limit, 1044 refresh_limit,
1042 last_bot, /* scrollbar last bottom position */ 1045 last_bot, /* scrollbar last bottom position */
1043 last_top, /* scrollbar last top position */ 1046 last_top, /* scrollbar last top position */
1044 last_state, /* scrollbar last state */ 1047 last_state, /* scrollbar last state */
1045 scrollbar_len, 1048 scrollbar_len,
1046#ifdef MENUBAR
1047 menu_readonly, /* okay to alter menu? */
1048 Arrows_x,
1049#endif
1050#if MENUBAR_MAX > 1
1051 Nbars,
1052#endif
1053 window_vt_x, 1049 window_vt_x,
1054 window_vt_y, 1050 window_vt_y,
1055 window_sb_x, 1051 window_sb_x,
1056# ifdef POINTER_BLANK 1052# ifdef POINTER_BLANK
1057 pointerBlankDelay, 1053 pointerBlankDelay,
… …
1066 unsigned long priv_modes, 1062 unsigned long priv_modes,
1067 SavedModes; 1063 SavedModes;
1068/* ---------- */ 1064/* ---------- */
1069 Atom xa[NUM_XA]; 1065 Atom xa[NUM_XA];
1070/* ---------- */ 1066/* ---------- */
1071#ifdef MENUBAR 1067#ifdef RXVT_SCROLLBAR
1072 GC menubarGC;
1073#endif
1074#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1075 GC scrollbarGC, 1068 GC scrollbarGC,
1076 topShadowGC, 1069 topShadowGC,
1077 botShadowGC; 1070 botShadowGC;
1078#endif 1071#endif
1079#ifdef XTERM_SCROLLBAR 1072#ifdef XTERM_SCROLLBAR
… …
1111 const char *key_delete; 1104 const char *key_delete;
1112#endif 1105#endif
1113 struct mouse_event MEvent; 1106 struct mouse_event MEvent;
1114 XComposeStatus compose; 1107 XComposeStatus compose;
1115 ttymode_t tio; 1108 ttymode_t tio;
1116#ifdef UTMP_SUPPORT
1117# ifdef HAVE_STRUCT_UTMP
1118 struct utmp ut;
1119# endif
1120# ifdef HAVE_STRUCT_UTMPX
1121 struct utmpx utx;
1122# endif
1123# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1124 char ut_id[5];
1125# endif
1126 int utmp_pos;
1127#endif
1128 row_col_t oldcursor; 1109 row_col_t oldcursor;
1129#ifdef XPM_BACKGROUND 1110#ifdef XPM_BACKGROUND
1130 bgPixmap_t bgPixmap; 1111 bgPixmap_t bgPixmap;
1131 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1112 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1132#endif
1133#ifdef MENUBAR
1134 menu_t *ActiveMenu, /* currently active menu */
1135 *BuildMenu; /* the menu currently being built */
1136 bar_t *CurrentBar;
1137# if ! (MENUBAR_MAX > 1)
1138 bar_t BarList;
1139# endif /* (MENUBAR_MAX > 1) */
1140#endif 1113#endif
1141 1114
1142#if ENABLE_OVERLAY 1115#if ENABLE_OVERLAY
1143 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1116 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1144 text_t **ov_text; 1117 text_t **ov_text;
… …
1173 const char *rs[NUM_RESOURCES]; 1146 const char *rs[NUM_RESOURCES];
1174 /* command input buffering */ 1147 /* command input buffering */
1175 char *cmdbuf_ptr, *cmdbuf_endp; 1148 char *cmdbuf_ptr, *cmdbuf_endp;
1176 char cmdbuf_base[CBUFSIZ]; 1149 char cmdbuf_base[CBUFSIZ];
1177 1150
1151 rxvt_ptytty *pty;
1152
1178 rxvt_salloc *talloc; // text line allocator 1153 rxvt_salloc *talloc; // text line allocator
1179 rxvt_salloc *ralloc; // rend line allocator 1154 rxvt_salloc *ralloc; // rend line allocator
1180 1155
1181 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1156 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1182 1157
… …
1192#endif 1167#endif
1193 1168
1194 // modifies first argument(!) 1169 // modifies first argument(!)
1195 void paste (char *data, unsigned int len); 1170 void paste (char *data, unsigned int len);
1196 1171
1197 void flush (); 1172 long vt_emask, vt_emask_perl;
1173
1174 void vt_select_input () const
1175 {
1176 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1177 }
1198 1178
1199#if TRANSPARENT 1179#if TRANSPARENT
1200 void rootwin_cb (XEvent &xev); 1180 void rootwin_cb (XEvent &xev);
1201 xevent_watcher rootwin_ev; 1181 xevent_watcher rootwin_ev;
1202#endif 1182#endif
1203 1183
1204 void x_cb (XEvent &xev); 1184 void x_cb (XEvent &xev);
1185 void flush ();
1205 xevent_watcher termwin_ev; 1186 xevent_watcher termwin_ev;
1206 xevent_watcher vt_ev; 1187 xevent_watcher vt_ev;
1207#ifdef HAVE_SCROLLBARS 1188#ifdef HAVE_SCROLLBARS
1208 xevent_watcher scrollbar_ev; 1189 xevent_watcher scrollbar_ev;
1209#endif
1210#ifdef MENUBAR
1211 xevent_watcher menubar_ev;
1212#endif 1190#endif
1213 1191
1214 void check_cb (check_watcher &w); check_watcher check_ev; 1192 void check_cb (check_watcher &w); check_watcher check_ev;
1215 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1193 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1216 void flush_cb (time_watcher &w); time_watcher flush_ev; 1194 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1256 1234
1257 bool init (int argc, const char *const *argv); 1235 bool init (int argc, const char *const *argv);
1258 bool init_vars (); 1236 bool init_vars ();
1259 1237
1260 bool pty_fill (); 1238 bool pty_fill ();
1239
1240 void make_current () const // make this the "currently active" urxvt instance
1241 {
1242 SET_R (this);
1243 rxvt_set_locale (locale);
1244 set_environ (envv);
1245 }
1261 1246
1262 void init_secondary (); 1247 void init_secondary ();
1263 const char **init_resources (int argc, const char *const *argv); 1248 const char **init_resources (int argc, const char *const *argv);
1264 const char *x_resource (const char *name); 1249 const char *x_resource (const char *name);
1265 void init_env (); 1250 void init_env ();
… …
1340 void process_sgr_mode (unsigned int nargs, const int *arg); 1325 void process_sgr_mode (unsigned int nargs, const int *arg);
1341 void process_graphics (); 1326 void process_graphics ();
1342 // init.C 1327 // init.C
1343 void Get_Colours (); 1328 void Get_Colours ();
1344 void get_ourmods (); 1329 void get_ourmods ();
1345 // logging.C
1346 void makeutent (const char *pty, const char *hostname);
1347 void cleanutent ();
1348 // main.C 1330 // main.C
1349 void privileged_utmp (rxvt_privaction action); 1331 void privileged_utmp (rxvt_privaction action);
1350 bool set_fonts (); 1332 bool set_fonts ();
1351 void set_string_property (Atom prop, const char *str, int len = -1); 1333 void set_string_property (Atom prop, const char *str, int len = -1);
1352 void set_utf8_property (Atom prop, const char *str, int len = -1); 1334 void set_utf8_property (Atom prop, const char *str, int len = -1);
… …
1355 void set_window_color (int idx, const char *color); 1337 void set_window_color (int idx, const char *color);
1356 void set_colorfgbg (); 1338 void set_colorfgbg ();
1357 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1339 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1358 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1340 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1359 1341
1360#ifdef MENUBAR
1361 // menubar.C
1362 void menuitem_free (menu_t *menu, menuitem_t *item);
1363 int action_dispatch (action_t *action);
1364 void menuarrow_free (char name);
1365 void menuarrow_add (char *string);
1366 char *menu_find_base (menu_t **menu, char *path);
1367 menu_t *menu_delete (menu_t *menu);
1368 menu_t *menu_add (menu_t *parent, char *path);
1369 void drawbox_menubar (int x, int len, int state);
1370 void drawtriangle (int x, int y, int state);
1371 void drawbox_menuitem (int y, int state);
1372 void menu_show ();
1373 void menu_display (void (rxvt_term::*update) ());
1374 void menu_hide_all ();
1375 void menu_hide ();
1376 void menu_clear (menu_t *menu);
1377 void menubar_clear ();
1378 bar_t *menubar_find (const char *name);
1379 int menubar_push (const char *name);
1380 void menubar_remove (const char *name);
1381 void menubar_dump (FILE *fp);
1382 void menubar_read (const char *filename);
1383 void menubar_dispatch (char *str);
1384 void draw_Arrows (int name, int state);
1385 void menubar_expose ();
1386 int menubar_mapping (int map);
1387 int menu_select (XButtonEvent &ev);
1388 void menubar_select (XButtonEvent &ev);
1389 void menubar_control (XButtonEvent &ev);
1390 void map_menuBar (int map);
1391#endif
1392
1393 // screen.C 1342 // screen.C
1394 1343
1395 void lalloc (line_t &l) 1344 void lalloc (line_t &l) const
1396 { 1345 {
1397 l.t = (text_t *)talloc->alloc (); 1346 l.t = (text_t *)talloc->alloc ();
1398 l.r = (rend_t *)ralloc->alloc (); 1347 l.r = (rend_t *)ralloc->alloc ();
1399 } 1348 }
1400 1349
… …
1404 talloc->free (l.t); 1353 talloc->free (l.t);
1405 ralloc->free (l.r); 1354 ralloc->free (l.r);
1406 } 1355 }
1407#endif 1356#endif
1408 1357
1409 void lresize (line_t &l) 1358 void lresize (line_t &l) const
1410 { 1359 {
1411 if (!l.t) 1360 if (!l.t)
1412 return; 1361 return;
1413 1362
1414 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1363 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1418 1367
1419 if (ncol > prev_ncol) 1368 if (ncol > prev_ncol)
1420 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1369 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1421 } 1370 }
1422 1371
1423 int fgcolor_of (rend_t r) 1372 int fgcolor_of (rend_t r) const
1424 { 1373 {
1425 int base = GET_BASEFG (r); 1374 int base = GET_BASEFG (r);
1426#ifndef NO_BRIGHTCOLOR 1375#ifndef NO_BRIGHTCOLOR
1427 if (r & RS_Bold 1376 if (r & RS_Bold
1428# if ENABLE_STYLES 1377# if ENABLE_STYLES
… …
1432 base += minBrightCOLOR - minCOLOR; 1381 base += minBrightCOLOR - minCOLOR;
1433#endif 1382#endif
1434 return base; 1383 return base;
1435 } 1384 }
1436 1385
1437 int bgcolor_of (rend_t r) 1386 int bgcolor_of (rend_t r) const
1438 { 1387 {
1439 int base = GET_BASEBG (r); 1388 int base = GET_BASEBG (r);
1440#ifndef NO_BRIGHTCOLOR 1389#ifndef NO_BRIGHTCOLOR
1441 if (r & RS_Blink 1390 if (r & RS_Blink
1442# if ENABLE_STYLES 1391# if ENABLE_STYLES
… …
1446 base += minBrightCOLOR - minCOLOR; 1395 base += minBrightCOLOR - minCOLOR;
1447#endif 1396#endif
1448 return base; 1397 return base;
1449 } 1398 }
1450 1399
1451 bool option (uint32_t opt) 1400 bool option (uint32_t opt) const
1452 { 1401 {
1453 return OPTION (opt); 1402 return OPTION (opt);
1454 } 1403 }
1455 1404
1456 void set_option (uint32_t opt, bool set) 1405 void set_option (uint32_t opt, bool set)
… …
1459 options |= opt; 1408 options |= opt;
1460 else 1409 else
1461 options &= ~opt; 1410 options &= ~opt;
1462 } 1411 }
1463 1412
1464 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1465 void scr_blank_screen_mem (line_t &l, rend_t efs); 1414 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1466 int scr_scroll_text (int row1, int row2, int count); 1415 int scr_scroll_text (int row1, int row2, int count);
1467 void scr_reset (); 1416 void scr_reset ();
1468 void scr_release (); 1417 void scr_release ();
1469 void scr_clear (bool really = false); 1418 void scr_clear (bool really = false);
1470 void scr_refresh (unsigned char refresh_type); 1419 void scr_refresh ();
1471 bool scr_refresh_rend (rend_t mask, rend_t value); 1420 bool scr_refresh_rend (rend_t mask, rend_t value);
1472 void scr_erase_screen (int mode); 1421 void scr_erase_screen (int mode);
1473#if ENABLE_FRILLS 1422#if ENABLE_FRILLS
1474 void scr_erase_savelines (); 1423 void scr_erase_savelines ();
1475 void scr_backindex (); 1424 void scr_backindex ();
… …
1506 void scr_rvideo_mode (int mode); 1455 void scr_rvideo_mode (int mode);
1507 void scr_report_position (); 1456 void scr_report_position ();
1508 void set_font_style (); 1457 void set_font_style ();
1509 void scr_charset_choose (int set); 1458 void scr_charset_choose (int set);
1510 void scr_charset_set (int set, unsigned int ch); 1459 void scr_charset_set (int set, unsigned int ch);
1511 int scr_move_to (int y, int len); 1460 void scr_move_to (int y, int len);
1512 int scr_page (enum page_dirn direction, int nlines); 1461 bool scr_page (enum page_dirn direction, int nlines);
1513 int scr_changeview (unsigned int oldviewstart); 1462 bool scr_changeview (int new_view_start);
1514 void scr_bell (); 1463 void scr_bell ();
1515 void scr_printscreen (int fullhist); 1464 void scr_printscreen (int fullhist);
1516 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1465 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1517 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1466 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1518 void scr_reverse_selection (); 1467 void scr_reverse_selection ();
… …
1539 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1488 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1540#endif 1489#endif
1541 1490
1542#if defined(RXVT_SCROLLBAR) 1491#if defined(RXVT_SCROLLBAR)
1543 // scrollbar-rxvt.C 1492 // scrollbar-rxvt.C
1544 void Draw_button (int x, int y, int state, int dirn);
1545 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1493 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1546#endif 1494#endif
1547 1495
1548#if defined(XTERM_SCROLLBAR) 1496#if defined(XTERM_SCROLLBAR)
1549 // scrollbar-xterm.C 1497 // scrollbar-xterm.C

Diff Legend

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