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.196 by root, Wed Jan 11 02:13:56 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);
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 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 ();
148 202
149/* 203/*
150 * the 'essential' information for reporting Mouse Events 204 * the 'essential' information for reporting Mouse Events
151 * pared down from XButtonEvent 205 * pared down from XButtonEvent
152 */ 206 */
… …
211 265
212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 266#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
213# define NO_MOUSE_REPORT_SCROLLBAR 1 267# define NO_MOUSE_REPORT_SCROLLBAR 1
214#endif 268#endif
215 269
216#if defined (ISO_14755) || defined (ENABLE_PERL)
217# define ENABLE_OVERLAY 1
218#endif
219
220/* now look for other badly set stuff */ 270/* now look for other badly set stuff */
221 271
222#if !defined (EACCESS) && defined(EAGAIN) 272#if !defined (EACCESS) && defined(EAGAIN)
223# define EACCESS EAGAIN 273# define EACCESS EAGAIN
224#endif 274#endif
… …
226#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 276#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
227# define EXIT_SUCCESS 0 /* exit function success */ 277# define EXIT_SUCCESS 0 /* exit function success */
228# define EXIT_FAILURE 1 /* exit function failure */ 278# define EXIT_FAILURE 1 /* exit function failure */
229#endif 279#endif
230 280
231#define menuBar_esc 10
232#define scrollBar_esc 30 281#define scrollBar_esc 30
233#define menuBar_margin 2 /* margin below text */
234 282
235#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)
236# define HAVE_SCROLLBARS 1 284# 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 285#endif
245 286
246#define R_SB_ALIGN_CENTRE 0 287#define R_SB_ALIGN_CENTRE 0
247#define R_SB_ALIGN_TOP 1 288#define R_SB_ALIGN_TOP 1
248#define R_SB_ALIGN_BOTTOM 2 289#define R_SB_ALIGN_BOTTOM 2
… …
321 * | 362 * |
322 * +---< SB_WIDTH_NEXT 363 * +---< SB_WIDTH_NEXT
323 */ 364 */
324 365
325enum { 366enum {
326 NO_REFRESH = 0 , /* Window not visible at all! */ 367 NO_REFRESH = 0, /* Window not visible at all! */
327 FAST_REFRESH = 1<<0, /* Fully exposed window */ 368 FAST_REFRESH = 1, /* Fully exposed window */
328 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 369 SLOW_REFRESH = 2, /* Partially exposed window */
329 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
330}; 370};
331 371
332#ifdef NO_SECONDARY_SCREEN 372#ifdef NO_SECONDARY_SCREEN
333# define NSCREENS 0 373# define NSCREENS 0
334#else 374#else
… …
434 XTerm_property = 3, // change X property 474 XTerm_property = 3, // change X property
435 XTerm_Color = 4, // change colors 475 XTerm_Color = 4, // change colors
436 XTerm_Color00 = 10, // not implemented, CLASH! 476 XTerm_Color00 = 10, // not implemented, CLASH!
437 XTerm_Color01 = 11, // not implemented 477 XTerm_Color01 = 11, // not implemented
438 XTerm_Color_cursor = 12, // change actual 'Cursor' color 478 XTerm_Color_cursor = 12, // change actual 'Cursor' color
439 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 479 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
440 XTerm_Color_pointer_bg = 14, // not implemented 480 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
441 XTerm_Color05 = 15, // not implemented 481 XTerm_Color05 = 15, // not implemented (tektronix fg)
442 XTerm_Color06 = 16, // not implemented 482 XTerm_Color06 = 16, // not implemented (tektronix bg)
443 XTerm_Color_RV = 17, // change actual 'Highlight' color 483 XTerm_Color_RV = 17, // change actual 'Highlight' color
444 XTerm_logfile = 46, // not implemented 484 XTerm_logfile = 46, // not implemented
445 XTerm_font = 50, 485 XTerm_font = 50,
446 486
447 XTerm_konsole30 = 30, // reserved for konsole 487 XTerm_konsole30 = 30, // reserved for konsole
448 XTerm_konsole31 = 31, // reserved for konsole 488 XTerm_konsole31 = 31, // reserved for konsole
449 XTerm_emacs51 = 51, // reserved for emacs shell 489 XTerm_emacs51 = 51, // reserved for emacs shell
450 /* 490 /*
451 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 491 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
492 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
452 */ 493 */
453 XTerm_Color_BD = 18, // change actual 'Bold' color 494 Rxvt_Color_BD = 18, // change actual 'Bold' color
454 XTerm_Color_UL = 19, // change actual 'Underline' color 495 Rxvt_Color_UL = 19, // change actual 'Underline' color
455 XTerm_Pixmap = 20, // new bg pixmap 496 Rxvt_Pixmap = 20, // new bg pixmap
456 XTerm_restoreFG = 39, // change default fg color 497 Rxvt_restoreFG = 39, // change default fg color
457 XTerm_restoreBG = 49, // change default bg color 498 Rxvt_restoreBG = 49, // change default bg color
458 XTerm_dumpscreen = 55, // dump scrollback and all of screen 499 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
459 500
460 URxvt_locale = 701, // change locale 501 URxvt_locale = 701, // change locale
461 URxvt_Menu = 703, // set menu item 502
462 URxvt_Color_IT = 704, // change actual 'Italic' colour 503 URxvt_Color_IT = 704, // change actual 'Italic' colour
463 URxvt_Color_tint = 705, // change actual tint colour 504 URxvt_Color_tint = 705, // change actual tint colour
505 URxvt_Color_BD = 706,
506 URxvt_Color_UL = 707,
464 507
465 URxvt_font = 710, 508 URxvt_font = 710,
466 URxvt_boldFont = 711, 509 URxvt_boldFont = 711,
467 URxvt_italicFont = 712, 510 URxvt_italicFont = 712,
468 URxvt_boldItalicFont = 713, 511 URxvt_boldItalicFont = 713,
… …
619#define PrivMode_ShiftKeys (1UL<<10) 662#define PrivMode_ShiftKeys (1UL<<10)
620#define PrivMode_VisibleCursor (1UL<<11) 663#define PrivMode_VisibleCursor (1UL<<11)
621#define PrivMode_MouseX10 (1UL<<12) 664#define PrivMode_MouseX10 (1UL<<12)
622#define PrivMode_MouseX11 (1UL<<13) 665#define PrivMode_MouseX11 (1UL<<13)
623#define PrivMode_scrollBar (1UL<<14) 666#define PrivMode_scrollBar (1UL<<14)
624#define PrivMode_menuBar (1UL<<15)
625#define PrivMode_TtyOutputInh (1UL<<16) 667#define PrivMode_TtyOutputInh (1UL<<15)
626#define PrivMode_Keypress (1UL<<17) 668#define PrivMode_Keypress (1UL<<16)
627#define PrivMode_smoothScroll (1UL<<18) 669#define PrivMode_smoothScroll (1UL<<17)
628#define PrivMode_vt52 (1UL<<19) 670#define PrivMode_vt52 (1UL<<18)
629#define PrivMode_LFNL (1UL<<20) 671#define PrivMode_LFNL (1UL<<19)
630/* too annoying to implement X11 highlight tracking */ 672/* too annoying to implement X11 highlight tracking */
631/* #define PrivMode_MouseX11Track (1LU<<21) */ 673/* #define PrivMode_MouseX11Track (1LU<<20) */
632 674
633#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 675#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
634#define PrivMode(test,bit) \ 676#define PrivMode(test,bit) \
635 if (test) \ 677 if (test) \
636 priv_modes |= (bit); \ 678 priv_modes |= (bit); \
… …
683/* 725/*
684 ***************************************************************************** 726 *****************************************************************************
685 * MACRO DEFINES 727 * MACRO DEFINES
686 ***************************************************************************** 728 *****************************************************************************
687 */ 729 */
730#define dLocal(type,name) type const name = this->name
688#define dDisp Display *disp = display->display 731#define dDisp Display *disp = this->display->display
689 732
690/* convert pixel dimensions to row/column values. Everything as int32_t */ 733/* convert pixel dimensions to row/column values. Everything as int32_t */
691#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 734#define Pixel2Col(x) Pixel2Width((int32_t)(x))
692#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 735#define Pixel2Row(y) Pixel2Height((int32_t)(y))
693#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 736#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
695#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 738#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
696#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 739#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
697#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 740#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
698#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 741#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
699 742
700#define TEMP_ENV temp_environ temp_environ (envv)
701
702#define OPTION(opt) (options & (opt)) 743#define OPTION(opt) (options & (opt))
703#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 744#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
704 | Opt_jumpScroll | Opt_secondaryScreen \ 745 | Opt_jumpScroll | Opt_secondaryScreen \
705 | Opt_pastableTabs | Opt_intensityStyles) 746 | Opt_pastableTabs | Opt_intensityStyles)
706 747
… …
768#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 809#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
769#define scrollbar_position(y) ((y) - scrollBar.beg) 810#define scrollbar_position(y) ((y) - scrollBar.beg)
770#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 811#define scrollbar_size() (scrollBar.end - scrollBar.beg \
771 - scrollbar_minheight ()) 812 - scrollbar_minheight ())
772 813
773#if (MENUBAR_MAX > 1)
774/* rendition style flags */
775# define menuBar_height() (fheight + MENU_SHADOW)
776# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
777# define isMenuBarWindow(w) ((w) == menuBar.win)
778#else
779# define menuBar_height() (0)
780# define menuBar_TotalHeight() (0)
781# define isMenuBarWindow(w) (0)
782#endif
783
784#ifdef XPM_BACKGROUND 814#ifdef XPM_BACKGROUND
785# 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))
786#else 816#else
787# define XPMClearArea(a, b, c, d, e, f, g) 817# define XPMClearArea(a, b, c, d, e, f, g)
788#endif
789
790#ifdef UTMP_SUPPORT
791# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
792# undef HAVE_UTMPX_H
793# undef HAVE_STRUCT_UTMPX
794# endif
795# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
796# undef HAVE_UTMP_H
797# undef HAVE_STRUCT_UTMP
798# endif
799
800# ifdef HAVE_UTMPX_H
801# include <utmpx.h>
802# endif
803# ifdef HAVE_UTMP_H
804# include <utmp.h>
805# endif
806#endif 818#endif
807 819
808#ifdef DEBUG_CMD 820#ifdef DEBUG_CMD
809# define D_CMD(x) fprintf x ; fputc('\n', stderr) 821# define D_CMD(x) fprintf x ; fputc('\n', stderr)
810#else 822#else
… …
841extern bool rxvt_set_locale (const char *locale); 853extern bool rxvt_set_locale (const char *locale);
842extern void rxvt_push_locale (const char *locale); 854extern void rxvt_push_locale (const char *locale);
843extern void rxvt_pop_locale (); 855extern void rxvt_pop_locale ();
844 856
845/****************************************************************************/ 857/****************************************************************************/
846
847#ifdef MENUBAR
848# include "menubar.h"
849#endif
850 858
851#define BLINK_INTERVAL 0.5 859#define BLINK_INTERVAL 0.5
852#define TEXT_BLINK_INTERVAL 0.5 860#define TEXT_BLINK_INTERVAL 0.5
853 861
854#ifndef __attribute__ 862#ifndef __attribute__
… …
1038 refresh_limit, 1046 refresh_limit,
1039 last_bot, /* scrollbar last bottom position */ 1047 last_bot, /* scrollbar last bottom position */
1040 last_top, /* scrollbar last top position */ 1048 last_top, /* scrollbar last top position */
1041 last_state, /* scrollbar last state */ 1049 last_state, /* scrollbar last state */
1042 scrollbar_len, 1050 scrollbar_len,
1043#ifdef MENUBAR
1044 menu_readonly, /* okay to alter menu? */
1045 Arrows_x,
1046#endif
1047#if MENUBAR_MAX > 1
1048 Nbars,
1049#endif
1050 window_vt_x, 1051 window_vt_x,
1051 window_vt_y, 1052 window_vt_y,
1052 window_sb_x, 1053 window_sb_x,
1053# ifdef POINTER_BLANK 1054# ifdef POINTER_BLANK
1054 pointerBlankDelay, 1055 pointerBlankDelay,
… …
1063 unsigned long priv_modes, 1064 unsigned long priv_modes,
1064 SavedModes; 1065 SavedModes;
1065/* ---------- */ 1066/* ---------- */
1066 Atom xa[NUM_XA]; 1067 Atom xa[NUM_XA];
1067/* ---------- */ 1068/* ---------- */
1068#ifdef MENUBAR 1069#ifdef RXVT_SCROLLBAR
1069 GC menubarGC;
1070#endif
1071#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1072 GC scrollbarGC, 1070 GC scrollbarGC,
1073 topShadowGC, 1071 topShadowGC,
1074 botShadowGC; 1072 botShadowGC;
1075#endif 1073#endif
1076#ifdef XTERM_SCROLLBAR 1074#ifdef XTERM_SCROLLBAR
… …
1108 const char *key_delete; 1106 const char *key_delete;
1109#endif 1107#endif
1110 struct mouse_event MEvent; 1108 struct mouse_event MEvent;
1111 XComposeStatus compose; 1109 XComposeStatus compose;
1112 ttymode_t tio; 1110 ttymode_t tio;
1113#ifdef UTMP_SUPPORT
1114# ifdef HAVE_STRUCT_UTMP
1115 struct utmp ut;
1116# endif
1117# ifdef HAVE_STRUCT_UTMPX
1118 struct utmpx utx;
1119# endif
1120# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1121 char ut_id[5];
1122# endif
1123 int utmp_pos;
1124#endif
1125 row_col_t oldcursor; 1111 row_col_t oldcursor;
1126#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1127 bgPixmap_t bgPixmap; 1113 bgPixmap_t bgPixmap;
1128 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1114 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1129#endif
1130#ifdef MENUBAR
1131 menu_t *ActiveMenu, /* currently active menu */
1132 *BuildMenu; /* the menu currently being built */
1133 bar_t *CurrentBar;
1134# if ! (MENUBAR_MAX > 1)
1135 bar_t BarList;
1136# endif /* (MENUBAR_MAX > 1) */
1137#endif 1115#endif
1138 1116
1139#if ENABLE_OVERLAY 1117#if ENABLE_OVERLAY
1140 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1118 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1141 text_t **ov_text; 1119 text_t **ov_text;
… …
1170 const char *rs[NUM_RESOURCES]; 1148 const char *rs[NUM_RESOURCES];
1171 /* command input buffering */ 1149 /* command input buffering */
1172 char *cmdbuf_ptr, *cmdbuf_endp; 1150 char *cmdbuf_ptr, *cmdbuf_endp;
1173 char cmdbuf_base[CBUFSIZ]; 1151 char cmdbuf_base[CBUFSIZ];
1174 1152
1153 rxvt_ptytty *pty;
1154
1175 rxvt_salloc *talloc; // text line allocator 1155 rxvt_salloc *talloc; // text line allocator
1176 rxvt_salloc *ralloc; // rend line allocator 1156 rxvt_salloc *ralloc; // rend line allocator
1177 1157
1178 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
1179 1159
… …
1189#endif 1169#endif
1190 1170
1191 // modifies first argument(!) 1171 // modifies first argument(!)
1192 void paste (char *data, unsigned int len); 1172 void paste (char *data, unsigned int len);
1193 1173
1194 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 }
1195 1180
1196#if TRANSPARENT 1181#if TRANSPARENT
1197 void rootwin_cb (XEvent &xev); 1182 void rootwin_cb (XEvent &xev);
1198 xevent_watcher rootwin_ev; 1183 xevent_watcher rootwin_ev;
1199#endif 1184#endif
1200 1185
1201 void x_cb (XEvent &xev); 1186 void x_cb (XEvent &xev);
1187 void flush ();
1202 xevent_watcher termwin_ev; 1188 xevent_watcher termwin_ev;
1203 xevent_watcher vt_ev; 1189 xevent_watcher vt_ev;
1204#ifdef HAVE_SCROLLBARS 1190#ifdef HAVE_SCROLLBARS
1205 xevent_watcher scrollbar_ev; 1191 xevent_watcher scrollbar_ev;
1206#endif
1207#ifdef MENUBAR
1208 xevent_watcher menubar_ev;
1209#endif 1192#endif
1210 1193
1211 void check_cb (check_watcher &w); check_watcher check_ev; 1194 void check_cb (check_watcher &w); check_watcher check_ev;
1212 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1195 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1213 void flush_cb (time_watcher &w); time_watcher flush_ev; 1196 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1253 1236
1254 bool init (int argc, const char *const *argv); 1237 bool init (int argc, const char *const *argv);
1255 bool init_vars (); 1238 bool init_vars ();
1256 1239
1257 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 }
1258 1248
1259 void init_secondary (); 1249 void init_secondary ();
1260 const char **init_resources (int argc, const char *const *argv); 1250 const char **init_resources (int argc, const char *const *argv);
1261 const char *x_resource (const char *name); 1251 const char *x_resource (const char *name);
1262 void init_env (); 1252 void init_env ();
… …
1337 void process_sgr_mode (unsigned int nargs, const int *arg); 1327 void process_sgr_mode (unsigned int nargs, const int *arg);
1338 void process_graphics (); 1328 void process_graphics ();
1339 // init.C 1329 // init.C
1340 void Get_Colours (); 1330 void Get_Colours ();
1341 void get_ourmods (); 1331 void get_ourmods ();
1342 // logging.C
1343 void makeutent (const char *pty, const char *hostname);
1344 void cleanutent ();
1345 // main.C 1332 // main.C
1346 void privileged_utmp (rxvt_privaction action); 1333 void privileged_utmp (rxvt_privaction action);
1347 bool set_fonts (); 1334 bool set_fonts ();
1348 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);
1349 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);
… …
1352 void set_window_color (int idx, const char *color); 1339 void set_window_color (int idx, const char *color);
1353 void set_colorfgbg (); 1340 void set_colorfgbg ();
1354 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1341 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1355 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1342 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1356 1343
1357#ifdef MENUBAR
1358 // menubar.C
1359 void menuitem_free (menu_t *menu, menuitem_t *item);
1360 int action_dispatch (action_t *action);
1361 void menuarrow_free (char name);
1362 void menuarrow_add (char *string);
1363 char *menu_find_base (menu_t **menu, char *path);
1364 menu_t *menu_delete (menu_t *menu);
1365 menu_t *menu_add (menu_t *parent, char *path);
1366 void drawbox_menubar (int x, int len, int state);
1367 void drawtriangle (int x, int y, int state);
1368 void drawbox_menuitem (int y, int state);
1369 void menu_show ();
1370 void menu_display (void (rxvt_term::*update) ());
1371 void menu_hide_all ();
1372 void menu_hide ();
1373 void menu_clear (menu_t *menu);
1374 void menubar_clear ();
1375 bar_t *menubar_find (const char *name);
1376 int menubar_push (const char *name);
1377 void menubar_remove (const char *name);
1378 void menubar_dump (FILE *fp);
1379 void menubar_read (const char *filename);
1380 void menubar_dispatch (char *str);
1381 void draw_Arrows (int name, int state);
1382 void menubar_expose ();
1383 int menubar_mapping (int map);
1384 int menu_select (XButtonEvent &ev);
1385 void menubar_select (XButtonEvent &ev);
1386 void menubar_control (XButtonEvent &ev);
1387 void map_menuBar (int map);
1388#endif
1389
1390 // screen.C 1344 // screen.C
1391 1345
1392 void lalloc (line_t &l) 1346 void lalloc (line_t &l) const
1393 { 1347 {
1394 l.t = (text_t *)talloc->alloc (); 1348 l.t = (text_t *)talloc->alloc ();
1395 l.r = (rend_t *)ralloc->alloc (); 1349 l.r = (rend_t *)ralloc->alloc ();
1396 } 1350 }
1397 1351
… …
1401 talloc->free (l.t); 1355 talloc->free (l.t);
1402 ralloc->free (l.r); 1356 ralloc->free (l.r);
1403 } 1357 }
1404#endif 1358#endif
1405 1359
1406 void lresize (line_t &l) 1360 void lresize (line_t &l) const
1407 { 1361 {
1408 if (!l.t) 1362 if (!l.t)
1409 return; 1363 return;
1410 1364
1411 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));
… …
1415 1369
1416 if (ncol > prev_ncol) 1370 if (ncol > prev_ncol)
1417 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1371 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1418 } 1372 }
1419 1373
1420 int fgcolor_of (rend_t r) 1374 int fgcolor_of (rend_t r) const
1421 { 1375 {
1422 int base = GET_BASEFG (r); 1376 int base = GET_BASEFG (r);
1423#ifndef NO_BRIGHTCOLOR 1377#ifndef NO_BRIGHTCOLOR
1424 if (r & RS_Bold 1378 if (r & RS_Bold
1425# if ENABLE_STYLES 1379# if ENABLE_STYLES
… …
1429 base += minBrightCOLOR - minCOLOR; 1383 base += minBrightCOLOR - minCOLOR;
1430#endif 1384#endif
1431 return base; 1385 return base;
1432 } 1386 }
1433 1387
1434 int bgcolor_of (rend_t r) 1388 int bgcolor_of (rend_t r) const
1435 { 1389 {
1436 int base = GET_BASEBG (r); 1390 int base = GET_BASEBG (r);
1437#ifndef NO_BRIGHTCOLOR 1391#ifndef NO_BRIGHTCOLOR
1438 if (r & RS_Blink 1392 if (r & RS_Blink
1439# if ENABLE_STYLES 1393# if ENABLE_STYLES
… …
1443 base += minBrightCOLOR - minCOLOR; 1397 base += minBrightCOLOR - minCOLOR;
1444#endif 1398#endif
1445 return base; 1399 return base;
1446 } 1400 }
1447 1401
1448 bool option (uint32_t opt) 1402 bool option (uint32_t opt) const
1449 { 1403 {
1450 return OPTION (opt); 1404 return OPTION (opt);
1451 } 1405 }
1452 1406
1453 void set_option (uint32_t opt, bool set) 1407 void set_option (uint32_t opt, bool set)
… …
1456 options |= opt; 1410 options |= opt;
1457 else 1411 else
1458 options &= ~opt; 1412 options &= ~opt;
1459 } 1413 }
1460 1414
1461 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;
1462 void scr_blank_screen_mem (line_t &l, rend_t efs); 1416 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1463 int scr_scroll_text (int row1, int row2, int count); 1417 int scr_scroll_text (int row1, int row2, int count);
1464 void scr_reset (); 1418 void scr_reset ();
1465 void scr_release (); 1419 void scr_release ();
1466 void scr_clear (bool really = false); 1420 void scr_clear (bool really = false);
1467 void scr_refresh (unsigned char refresh_type); 1421 void scr_refresh ();
1468 bool scr_refresh_rend (rend_t mask, rend_t value); 1422 bool scr_refresh_rend (rend_t mask, rend_t value);
1469 void scr_erase_screen (int mode); 1423 void scr_erase_screen (int mode);
1470#if ENABLE_FRILLS 1424#if ENABLE_FRILLS
1471 void scr_erase_savelines (); 1425 void scr_erase_savelines ();
1472 void scr_backindex (); 1426 void scr_backindex ();
… …
1503 void scr_rvideo_mode (int mode); 1457 void scr_rvideo_mode (int mode);
1504 void scr_report_position (); 1458 void scr_report_position ();
1505 void set_font_style (); 1459 void set_font_style ();
1506 void scr_charset_choose (int set); 1460 void scr_charset_choose (int set);
1507 void scr_charset_set (int set, unsigned int ch); 1461 void scr_charset_set (int set, unsigned int ch);
1508 int scr_move_to (int y, int len); 1462 void scr_move_to (int y, int len);
1509 int scr_page (enum page_dirn direction, int nlines); 1463 bool scr_page (enum page_dirn direction, int nlines);
1510 int scr_changeview (unsigned int oldviewstart); 1464 bool scr_changeview (int new_view_start);
1511 void scr_bell (); 1465 void scr_bell ();
1512 void scr_printscreen (int fullhist); 1466 void scr_printscreen (int fullhist);
1513 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);
1514 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);
1515 void scr_reverse_selection (); 1469 void scr_reverse_selection ();
… …
1536 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);
1537#endif 1491#endif
1538 1492
1539#if defined(RXVT_SCROLLBAR) 1493#if defined(RXVT_SCROLLBAR)
1540 // scrollbar-rxvt.C 1494 // scrollbar-rxvt.C
1541 void Draw_button (int x, int y, int state, int dirn);
1542 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);
1543#endif 1496#endif
1544 1497
1545#if defined(XTERM_SCROLLBAR) 1498#if defined(XTERM_SCROLLBAR)
1546 // scrollbar-xterm.C 1499 // scrollbar-xterm.C

Diff Legend

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