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.190 by root, Sat Jan 7 19:29:17 2006 UTC vs.
Revision 1.223 by root, Thu Jan 19 16:22:13 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#ifdef NO_RESOURCES
217# undef USE_XGETDEFAULT
218#endif
219
220#if defined (ISO_14755) || defined (ENABLE_PERL)
221# define ENABLE_OVERLAY 1
222#endif
223
224/* now look for other badly set stuff */ 268/* now look for other badly set stuff */
225 269
226#if !defined (EACCESS) && defined(EAGAIN) 270#if !defined (EACCESS) && defined(EAGAIN)
227# define EACCESS EAGAIN 271# define EACCESS EAGAIN
228#endif 272#endif
… …
230#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 274#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
231# define EXIT_SUCCESS 0 /* exit function success */ 275# define EXIT_SUCCESS 0 /* exit function success */
232# define EXIT_FAILURE 1 /* exit function failure */ 276# define EXIT_FAILURE 1 /* exit function failure */
233#endif 277#endif
234 278
235#define menuBar_esc 10
236#define scrollBar_esc 30 279#define scrollBar_esc 30
237#define menuBar_margin 2 /* margin below text */
238 280
239#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)
240# define HAVE_SCROLLBARS 1 282# define HAVE_SCROLLBARS 1
241#endif
242
243/* width of scrollBar, menuBar shadow, must be 1 or 2 */
244#ifdef HALFSHADOW
245# define MENU_SHADOW 1
246#else
247# define MENU_SHADOW 2
248#endif 283#endif
249 284
250#define R_SB_ALIGN_CENTRE 0 285#define R_SB_ALIGN_CENTRE 0
251#define R_SB_ALIGN_TOP 1 286#define R_SB_ALIGN_TOP 1
252#define R_SB_ALIGN_BOTTOM 2 287#define R_SB_ALIGN_BOTTOM 2
… …
325 * | 360 * |
326 * +---< SB_WIDTH_NEXT 361 * +---< SB_WIDTH_NEXT
327 */ 362 */
328 363
329enum { 364enum {
330 NO_REFRESH = 0 , /* Window not visible at all! */ 365 NO_REFRESH = 0, /* Window not visible at all! */
331 FAST_REFRESH = 1<<0, /* Fully exposed window */ 366 FAST_REFRESH = 1, /* Fully exposed window */
332 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 367 SLOW_REFRESH = 2, /* Partially exposed window */
333 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
334}; 368};
335 369
336#ifdef NO_SECONDARY_SCREEN 370#ifdef NO_SECONDARY_SCREEN
337# define NSCREENS 0 371# define NSCREENS 0
338#else 372#else
… …
438 XTerm_property = 3, // change X property 472 XTerm_property = 3, // change X property
439 XTerm_Color = 4, // change colors 473 XTerm_Color = 4, // change colors
440 XTerm_Color00 = 10, // not implemented, CLASH! 474 XTerm_Color00 = 10, // not implemented, CLASH!
441 XTerm_Color01 = 11, // not implemented 475 XTerm_Color01 = 11, // not implemented
442 XTerm_Color_cursor = 12, // change actual 'Cursor' color 476 XTerm_Color_cursor = 12, // change actual 'Cursor' color
443 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 477 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
444 XTerm_Color_pointer_bg = 14, // not implemented 478 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
445 XTerm_Color05 = 15, // not implemented 479 XTerm_Color05 = 15, // not implemented (tektronix fg)
446 XTerm_Color06 = 16, // not implemented 480 XTerm_Color06 = 16, // not implemented (tektronix bg)
447 XTerm_Color_RV = 17, // change actual 'Highlight' color 481 XTerm_Color_RV = 17, // change actual 'Highlight' color
448 XTerm_logfile = 46, // not implemented 482 XTerm_logfile = 46, // not implemented
449 XTerm_font = 50, 483 XTerm_font = 50,
450 484
451 XTerm_konsole30 = 30, // reserved for konsole 485 XTerm_konsole30 = 30, // reserved for konsole
452 XTerm_konsole31 = 31, // reserved for konsole 486 XTerm_konsole31 = 31, // reserved for konsole
453 XTerm_emacs51 = 51, // reserved for emacs shell 487 XTerm_emacs51 = 51, // reserved for emacs shell
454 /* 488 /*
455 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 489 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
490 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
456 */ 491 */
457 XTerm_Color_BD = 18, // change actual 'Bold' color 492 Rxvt_Color_BD = 18, // change actual 'Bold' color
458 XTerm_Color_UL = 19, // change actual 'Underline' color 493 Rxvt_Color_UL = 19, // change actual 'Underline' color
459 XTerm_Pixmap = 20, // new bg pixmap 494 Rxvt_Pixmap = 20, // new bg pixmap
460 XTerm_restoreFG = 39, // change default fg color 495 Rxvt_restoreFG = 39, // change default fg color
461 XTerm_restoreBG = 49, // change default bg color 496 Rxvt_restoreBG = 49, // change default bg color
462 XTerm_dumpscreen = 55, // dump scrollback and all of screen 497 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
463 498
464 URxvt_locale = 701, // change locale 499 URxvt_locale = 701, // change locale
465 URxvt_Menu = 703, // set menu item 500
466 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
467 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
503 URxvt_Color_BD = 706,
504 URxvt_Color_UL = 707,
468 505
469 URxvt_font = 710, 506 URxvt_font = 710,
470 URxvt_boldFont = 711, 507 URxvt_boldFont = 711,
471 URxvt_italicFont = 712, 508 URxvt_italicFont = 712,
472 URxvt_boldItalicFont = 713, 509 URxvt_boldItalicFont = 713,
… …
623#define PrivMode_ShiftKeys (1UL<<10) 660#define PrivMode_ShiftKeys (1UL<<10)
624#define PrivMode_VisibleCursor (1UL<<11) 661#define PrivMode_VisibleCursor (1UL<<11)
625#define PrivMode_MouseX10 (1UL<<12) 662#define PrivMode_MouseX10 (1UL<<12)
626#define PrivMode_MouseX11 (1UL<<13) 663#define PrivMode_MouseX11 (1UL<<13)
627#define PrivMode_scrollBar (1UL<<14) 664#define PrivMode_scrollBar (1UL<<14)
628#define PrivMode_menuBar (1UL<<15)
629#define PrivMode_TtyOutputInh (1UL<<16) 665#define PrivMode_TtyOutputInh (1UL<<15)
630#define PrivMode_Keypress (1UL<<17) 666#define PrivMode_Keypress (1UL<<16)
631#define PrivMode_smoothScroll (1UL<<18) 667#define PrivMode_smoothScroll (1UL<<17)
632#define PrivMode_vt52 (1UL<<19) 668#define PrivMode_vt52 (1UL<<18)
633#define PrivMode_LFNL (1UL<<20) 669#define PrivMode_LFNL (1UL<<19)
634/* too annoying to implement X11 highlight tracking */ 670/* too annoying to implement X11 highlight tracking */
635/* #define PrivMode_MouseX11Track (1LU<<21) */ 671/* #define PrivMode_MouseX11Track (1LU<<20) */
636 672
637#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 673#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
638#define PrivMode(test,bit) \ 674#define PrivMode(test,bit) \
639 if (test) \ 675 if (test) \
640 priv_modes |= (bit); \ 676 priv_modes |= (bit); \
… …
687/* 723/*
688 ***************************************************************************** 724 *****************************************************************************
689 * MACRO DEFINES 725 * MACRO DEFINES
690 ***************************************************************************** 726 *****************************************************************************
691 */ 727 */
728#define dLocal(type,name) type const name = this->name
692#define dDisp Display *disp = display->display 729#define dDisp Display *disp = this->display->display
693 730
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 731/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 732#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 733#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 734#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 736#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 737#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 738#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 739#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 740
741#define OPTION(opt) (options & (opt))
742#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
743 | Opt_jumpScroll | Opt_secondaryScreen \
744 | Opt_pastableTabs | Opt_intensityStyles)
745
704// for m >= -n, ensure remainder lies between 0..n-1 746// for m >= -n, ensure remainder lies between 0..n-1
705#define MOD(m,n) (((m) + (n)) % (n)) 747#define MOD(m,n) (((m) + (n)) % (n))
706 748
707#define LINENO(n) MOD (term_start + int(n), total_rows) 749#define LINENO(n) MOD (term_start + int(n), total_rows)
708#define ROW(n) row_buf [LINENO (n)] 750#define ROW(n) row_buf [LINENO (n)]
… …
765#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 807#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
766#define scrollbar_position(y) ((y) - scrollBar.beg) 808#define scrollbar_position(y) ((y) - scrollBar.beg)
767#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 809#define scrollbar_size() (scrollBar.end - scrollBar.beg \
768 - scrollbar_minheight ()) 810 - scrollbar_minheight ())
769 811
770#if (MENUBAR_MAX > 1)
771/* rendition style flags */
772# define menuBar_height() (fheight + MENU_SHADOW)
773# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
774# define isMenuBarWindow(w) ((w) == menuBar.win)
775#else
776# define menuBar_height() (0)
777# define menuBar_TotalHeight() (0)
778# define isMenuBarWindow(w) (0)
779#endif
780
781#ifdef XPM_BACKGROUND 812#ifdef XPM_BACKGROUND
782# 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))
783#else 814#else
784# define XPMClearArea(a, b, c, d, e, f, g) 815# define XPMClearArea(a, b, c, d, e, f, g)
785#endif
786
787#ifdef UTMP_SUPPORT
788# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
789# undef HAVE_UTMPX_H
790# undef HAVE_STRUCT_UTMPX
791# endif
792# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
793# undef HAVE_UTMP_H
794# undef HAVE_STRUCT_UTMP
795# endif
796
797# ifdef HAVE_UTMPX_H
798# include <utmpx.h>
799# endif
800# ifdef HAVE_UTMP_H
801# include <utmp.h>
802# endif
803#endif 816#endif
804 817
805#ifdef DEBUG_CMD 818#ifdef DEBUG_CMD
806# define D_CMD(x) fprintf x ; fputc('\n', stderr) 819# define D_CMD(x) fprintf x ; fputc('\n', stderr)
807#else 820#else
… …
834extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 847extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
835extern void rxvt_exit_failure () __attribute__ ((noreturn)); 848extern void rxvt_exit_failure () __attribute__ ((noreturn));
836 849
837#define SET_LOCALE(locale) rxvt_set_locale (locale) 850#define SET_LOCALE(locale) rxvt_set_locale (locale)
838extern bool rxvt_set_locale (const char *locale); 851extern bool rxvt_set_locale (const char *locale);
839extern bool rxvt_push_locale (const char *locale); 852extern void rxvt_push_locale (const char *locale);
840extern void rxvt_pop_locale (); 853extern void rxvt_pop_locale ();
841 854
842/****************************************************************************/ 855/****************************************************************************/
843
844#ifdef MENUBAR
845# include "menubar.h"
846#endif
847 856
848#define BLINK_INTERVAL 0.5 857#define BLINK_INTERVAL 0.5
849#define TEXT_BLINK_INTERVAL 0.5 858#define TEXT_BLINK_INTERVAL 0.5
850 859
851#ifndef __attribute__ 860#ifndef __attribute__
… …
968#endif 977#endif
969 978
970struct rxvt_term : zero_initialized, rxvt_vars { 979struct rxvt_term : zero_initialized, rxvt_vars {
971 log_callback *log_hook; // log error messages through this hook, if != 0 980 log_callback *log_hook; // log error messages through this hook, if != 0
972 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 981 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
973
974#if ENABLE_PERL 982#if ENABLE_PERL
975 rxvt_perl_term perl; 983 rxvt_perl_term perl;
976#endif 984#endif
977
978 struct mbstate mbstate; // current input multibyte state 985 struct mbstate mbstate; // current input multibyte state
979 986
980 unsigned char want_refresh:1, 987 unsigned char want_refresh:1,
981#ifdef TRANSPARENT 988#ifdef TRANSPARENT
982 want_full_refresh:1, /* awaiting full screen refresh */ 989 want_full_refresh:1, /* awaiting full screen refresh */
… …
1037 refresh_limit, 1044 refresh_limit,
1038 last_bot, /* scrollbar last bottom position */ 1045 last_bot, /* scrollbar last bottom position */
1039 last_top, /* scrollbar last top position */ 1046 last_top, /* scrollbar last top position */
1040 last_state, /* scrollbar last state */ 1047 last_state, /* scrollbar last state */
1041 scrollbar_len, 1048 scrollbar_len,
1042#ifdef MENUBAR
1043 menu_readonly, /* okay to alter menu? */
1044 Arrows_x,
1045#endif
1046#if MENUBAR_MAX > 1
1047 Nbars,
1048#endif
1049 window_vt_x, 1049 window_vt_x,
1050 window_vt_y, 1050 window_vt_y,
1051 window_sb_x, 1051 window_sb_x,
1052# ifdef POINTER_BLANK 1052# ifdef POINTER_BLANK
1053 pointerBlankDelay, 1053 pointerBlankDelay,
… …
1062 unsigned long priv_modes, 1062 unsigned long priv_modes,
1063 SavedModes; 1063 SavedModes;
1064/* ---------- */ 1064/* ---------- */
1065 Atom xa[NUM_XA]; 1065 Atom xa[NUM_XA];
1066/* ---------- */ 1066/* ---------- */
1067#ifdef MENUBAR 1067#ifdef RXVT_SCROLLBAR
1068 GC menubarGC;
1069#endif
1070#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1071 GC scrollbarGC, 1068 GC scrollbarGC,
1072 topShadowGC, 1069 topShadowGC,
1073 botShadowGC; 1070 botShadowGC;
1074#endif 1071#endif
1075#ifdef XTERM_SCROLLBAR 1072#ifdef XTERM_SCROLLBAR
… …
1107 const char *key_delete; 1104 const char *key_delete;
1108#endif 1105#endif
1109 struct mouse_event MEvent; 1106 struct mouse_event MEvent;
1110 XComposeStatus compose; 1107 XComposeStatus compose;
1111 ttymode_t tio; 1108 ttymode_t tio;
1112#ifdef UTMP_SUPPORT
1113# ifdef HAVE_STRUCT_UTMP
1114 struct utmp ut;
1115# endif
1116# ifdef HAVE_STRUCT_UTMPX
1117 struct utmpx utx;
1118# endif
1119# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1120 char ut_id[5];
1121# endif
1122 int utmp_pos;
1123#endif
1124 row_col_t oldcursor; 1109 row_col_t oldcursor;
1125#ifdef XPM_BACKGROUND 1110#ifdef XPM_BACKGROUND
1126 bgPixmap_t bgPixmap; 1111 bgPixmap_t bgPixmap;
1127 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1112 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1128#endif
1129#ifdef MENUBAR
1130 menu_t *ActiveMenu, /* currently active menu */
1131 *BuildMenu; /* the menu currently being built */
1132 bar_t *CurrentBar;
1133# if ! (MENUBAR_MAX > 1)
1134 bar_t BarList;
1135# endif /* (MENUBAR_MAX > 1) */
1136#endif 1113#endif
1137 1114
1138#if ENABLE_OVERLAY 1115#if ENABLE_OVERLAY
1139 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1116 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1140 text_t **ov_text; 1117 text_t **ov_text;
… …
1169 const char *rs[NUM_RESOURCES]; 1146 const char *rs[NUM_RESOURCES];
1170 /* command input buffering */ 1147 /* command input buffering */
1171 char *cmdbuf_ptr, *cmdbuf_endp; 1148 char *cmdbuf_ptr, *cmdbuf_endp;
1172 char cmdbuf_base[CBUFSIZ]; 1149 char cmdbuf_base[CBUFSIZ];
1173 1150
1151 rxvt_ptytty *pty;
1152
1174 rxvt_salloc *talloc; // text line allocator 1153 rxvt_salloc *talloc; // text line allocator
1175 rxvt_salloc *ralloc; // rend line allocator 1154 rxvt_salloc *ralloc; // rend line allocator
1176 1155
1177 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
1178 1157
… …
1188#endif 1167#endif
1189 1168
1190 // modifies first argument(!) 1169 // modifies first argument(!)
1191 void paste (char *data, unsigned int len); 1170 void paste (char *data, unsigned int len);
1192 1171
1193 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 }
1194 1178
1195#if TRANSPARENT 1179#if TRANSPARENT
1196 void rootwin_cb (XEvent &xev); 1180 void rootwin_cb (XEvent &xev);
1197 xevent_watcher rootwin_ev; 1181 xevent_watcher rootwin_ev;
1198#endif 1182#endif
1199 1183
1200 void x_cb (XEvent &xev); 1184 void x_cb (XEvent &xev);
1185 void flush ();
1201 xevent_watcher termwin_ev; 1186 xevent_watcher termwin_ev;
1202 xevent_watcher vt_ev; 1187 xevent_watcher vt_ev;
1203#ifdef HAVE_SCROLLBARS 1188#ifdef HAVE_SCROLLBARS
1204 xevent_watcher scrollbar_ev; 1189 xevent_watcher scrollbar_ev;
1205#endif 1190#endif
1206#ifdef MENUBAR
1207 xevent_watcher menubar_ev;
1208#endif
1209 1191
1192 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1210 void check_cb (check_watcher &w); check_watcher check_ev; 1193 void check_cb (check_watcher &w); check_watcher check_ev;
1211 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1194 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1212 void flush_cb (time_watcher &w); time_watcher flush_ev; 1195 void flush_cb (time_watcher &w); time_watcher flush_ev;
1213 1196
1214 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1197 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
… …
1244 1227
1245 void tt_winch (); 1228 void tt_winch ();
1246 1229
1247 rxvt_term (); 1230 rxvt_term ();
1248 ~rxvt_term (); 1231 ~rxvt_term ();
1249 void child_exit (); // child has exited, usually destroys
1250 void destroy (); 1232 void destroy ();
1251 void emergency_cleanup (); 1233 void emergency_cleanup ();
1252 1234
1253 bool init (int argc, const char *const *argv); 1235 bool init (int argc, const char *const *argv);
1254 bool init_vars (); 1236 bool init_vars ();
1255 1237
1256 bool pty_fill (); 1238 bool pty_fill ();
1257 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 }
1246
1258 void init_secondary (); 1247 void init_secondary ();
1259 const char **init_resources (int argc, const char *const *argv); 1248 const char **init_resources (int argc, const char *const *argv);
1249 const char *x_resource (const char *name);
1260 void init_env (); 1250 void init_env ();
1261 void set_locale (const char *locale); 1251 void set_locale (const char *locale);
1262 void init_xlocale (); 1252 void init_xlocale ();
1263 void init_command (const char *const *argv); 1253 void init_command (const char *const *argv);
1264 void run_command (const char *const *argv); 1254 void run_command (const char *const *argv);
… …
1335 void process_sgr_mode (unsigned int nargs, const int *arg); 1325 void process_sgr_mode (unsigned int nargs, const int *arg);
1336 void process_graphics (); 1326 void process_graphics ();
1337 // init.C 1327 // init.C
1338 void Get_Colours (); 1328 void Get_Colours ();
1339 void get_ourmods (); 1329 void get_ourmods ();
1340 // logging.C
1341 void makeutent (const char *pty, const char *hostname);
1342 void cleanutent ();
1343 // main.C 1330 // main.C
1344 void privileged_utmp (rxvt_privaction action); 1331 void privileged_utmp (rxvt_privaction action);
1345 bool set_fonts (); 1332 bool set_fonts ();
1346 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);
1347 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);
… …
1350 void set_window_color (int idx, const char *color); 1337 void set_window_color (int idx, const char *color);
1351 void set_colorfgbg (); 1338 void set_colorfgbg ();
1352 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1339 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1353 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1340 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1354 1341
1355#ifdef MENUBAR
1356 // menubar.C
1357 void menuitem_free (menu_t *menu, menuitem_t *item);
1358 int action_dispatch (action_t *action);
1359 void menuarrow_free (char name);
1360 void menuarrow_add (char *string);
1361 char *menu_find_base (menu_t **menu, char *path);
1362 menu_t *menu_delete (menu_t *menu);
1363 menu_t *menu_add (menu_t *parent, char *path);
1364 void drawbox_menubar (int x, int len, int state);
1365 void drawtriangle (int x, int y, int state);
1366 void drawbox_menuitem (int y, int state);
1367 void menu_show ();
1368 void menu_display (void (rxvt_term::*update) ());
1369 void menu_hide_all ();
1370 void menu_hide ();
1371 void menu_clear (menu_t *menu);
1372 void menubar_clear ();
1373 bar_t *menubar_find (const char *name);
1374 int menubar_push (const char *name);
1375 void menubar_remove (const char *name);
1376 void menubar_dump (FILE *fp);
1377 void menubar_read (const char *filename);
1378 void menubar_dispatch (char *str);
1379 void draw_Arrows (int name, int state);
1380 void menubar_expose ();
1381 int menubar_mapping (int map);
1382 int menu_select (XButtonEvent &ev);
1383 void menubar_select (XButtonEvent &ev);
1384 void menubar_control (XButtonEvent &ev);
1385 void map_menuBar (int map);
1386#endif
1387
1388 // screen.C 1342 // screen.C
1389 1343
1390 void lalloc (line_t &l) 1344 void lalloc (line_t &l) const
1391 { 1345 {
1392 l.t = (text_t *)talloc->alloc (); 1346 l.t = (text_t *)talloc->alloc ();
1393 l.r = (rend_t *)ralloc->alloc (); 1347 l.r = (rend_t *)ralloc->alloc ();
1394 } 1348 }
1395 1349
… …
1399 talloc->free (l.t); 1353 talloc->free (l.t);
1400 ralloc->free (l.r); 1354 ralloc->free (l.r);
1401 } 1355 }
1402#endif 1356#endif
1403 1357
1404 void lresize (line_t &l) 1358 void lresize (line_t &l) const
1405 { 1359 {
1406 if (!l.t) 1360 if (!l.t)
1407 return; 1361 return;
1408 1362
1409 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));
… …
1413 1367
1414 if (ncol > prev_ncol) 1368 if (ncol > prev_ncol)
1415 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1369 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1416 } 1370 }
1417 1371
1418 int fgcolor_of (rend_t r) 1372 int fgcolor_of (rend_t r) const
1419 { 1373 {
1420 int base = GET_BASEFG (r); 1374 int base = GET_BASEFG (r);
1421#ifndef NO_BRIGHTCOLOR 1375#ifndef NO_BRIGHTCOLOR
1422 if (r & RS_Bold 1376 if (r & RS_Bold
1423# if ENABLE_STYLES 1377# if ENABLE_STYLES
… …
1427 base += minBrightCOLOR - minCOLOR; 1381 base += minBrightCOLOR - minCOLOR;
1428#endif 1382#endif
1429 return base; 1383 return base;
1430 } 1384 }
1431 1385
1432 int bgcolor_of (rend_t r) 1386 int bgcolor_of (rend_t r) const
1433 { 1387 {
1434 int base = GET_BASEBG (r); 1388 int base = GET_BASEBG (r);
1435#ifndef NO_BRIGHTCOLOR 1389#ifndef NO_BRIGHTCOLOR
1436 if (r & RS_Blink 1390 if (r & RS_Blink
1437# if ENABLE_STYLES 1391# if ENABLE_STYLES
… …
1441 base += minBrightCOLOR - minCOLOR; 1395 base += minBrightCOLOR - minCOLOR;
1442#endif 1396#endif
1443 return base; 1397 return base;
1444 } 1398 }
1445 1399
1400 bool option (uint32_t opt) const
1401 {
1402 return OPTION (opt);
1403 }
1404
1405 void set_option (uint32_t opt, bool set)
1406 {
1407 if (set)
1408 options |= opt;
1409 else
1410 options &= ~opt;
1411 }
1412
1446 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;
1447 void scr_blank_screen_mem (line_t &l, rend_t efs); 1414 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1448 int scr_scroll_text (int row1, int row2, int count); 1415 int scr_scroll_text (int row1, int row2, int count);
1449 void scr_reset (); 1416 void scr_reset ();
1450 void scr_release (); 1417 void scr_release ();
1451 void scr_clear (bool really = false); 1418 void scr_clear (bool really = false);
1452 void scr_refresh (unsigned char refresh_type); 1419 void scr_refresh ();
1453 bool scr_refresh_rend (rend_t mask, rend_t value); 1420 bool scr_refresh_rend (rend_t mask, rend_t value);
1454 void scr_erase_screen (int mode); 1421 void scr_erase_screen (int mode);
1455#if ENABLE_FRILLS 1422#if ENABLE_FRILLS
1456 void scr_erase_savelines (); 1423 void scr_erase_savelines ();
1457 void scr_backindex (); 1424 void scr_backindex ();
… …
1488 void scr_rvideo_mode (int mode); 1455 void scr_rvideo_mode (int mode);
1489 void scr_report_position (); 1456 void scr_report_position ();
1490 void set_font_style (); 1457 void set_font_style ();
1491 void scr_charset_choose (int set); 1458 void scr_charset_choose (int set);
1492 void scr_charset_set (int set, unsigned int ch); 1459 void scr_charset_set (int set, unsigned int ch);
1493 int scr_move_to (int y, int len); 1460 void scr_move_to (int y, int len);
1494 int scr_page (enum page_dirn direction, int nlines); 1461 bool scr_page (enum page_dirn direction, int nlines);
1495 int scr_changeview (unsigned int oldviewstart); 1462 bool scr_changeview (int new_view_start);
1496 void scr_bell (); 1463 void scr_bell ();
1497 void scr_printscreen (int fullhist); 1464 void scr_printscreen (int fullhist);
1465 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_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1498 void scr_reverse_selection (); 1467 void scr_reverse_selection ();
1499 void scr_dump (int fd); 1468 void scr_dump (int fd);
1500 void selection_check (int check_more); 1469 void selection_check (int check_more);
1501 void selection_paste (Window win, Atom prop, bool delete_prop); 1470 void selection_paste (Window win, Atom prop, bool delete_prop);
1502 void selection_property (Window win, Atom prop); 1471 void selection_property (Window win, Atom prop);
1503 void selection_request (Time tm, int x, int y); 1472 void selection_request (Time tm);
1504 int selection_request_other (Atom target, int selnum); 1473 int selection_request_other (Atom target, int selnum);
1505 void selection_clear (); 1474 void selection_clear ();
1506 void selection_make (Time tm); 1475 void selection_make (Time tm);
1507 bool selection_grab (Time tm); 1476 bool selection_grab (Time tm);
1508 void selection_start_colrow (int col, int row); 1477 void selection_start_colrow (int col, int row);
… …
1519 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);
1520#endif 1489#endif
1521 1490
1522#if defined(RXVT_SCROLLBAR) 1491#if defined(RXVT_SCROLLBAR)
1523 // scrollbar-rxvt.C 1492 // scrollbar-rxvt.C
1524 void Draw_button (int x, int y, int state, int dirn);
1525 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);
1526#endif 1494#endif
1527 1495
1528#if defined(XTERM_SCROLLBAR) 1496#if defined(XTERM_SCROLLBAR)
1529 // scrollbar-xterm.C 1497 // scrollbar-xterm.C

Diff Legend

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