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.220 by root, Tue Jan 17 15:17:39 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 login (int cmd_pid, bool login_shell, const char *hostname) = 0;
190
191 void close_tty ();
192 bool make_controlling_tty ();
193 void set_utf8_mode (bool on);
194};
195
196rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
197void rxvt_ptytty_server (); // start the ptytty server process
148 198
149/* 199/*
150 * the 'essential' information for reporting Mouse Events 200 * the 'essential' information for reporting Mouse Events
151 * pared down from XButtonEvent 201 * pared down from XButtonEvent
152 */ 202 */
… …
211 261
212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 262#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
213# define NO_MOUSE_REPORT_SCROLLBAR 1 263# define NO_MOUSE_REPORT_SCROLLBAR 1
214#endif 264#endif
215 265
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 */ 266/* now look for other badly set stuff */
225 267
226#if !defined (EACCESS) && defined(EAGAIN) 268#if !defined (EACCESS) && defined(EAGAIN)
227# define EACCESS EAGAIN 269# define EACCESS EAGAIN
228#endif 270#endif
… …
230#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 272#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
231# define EXIT_SUCCESS 0 /* exit function success */ 273# define EXIT_SUCCESS 0 /* exit function success */
232# define EXIT_FAILURE 1 /* exit function failure */ 274# define EXIT_FAILURE 1 /* exit function failure */
233#endif 275#endif
234 276
235#define menuBar_esc 10
236#define scrollBar_esc 30 277#define scrollBar_esc 30
237#define menuBar_margin 2 /* margin below text */
238 278
239#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 279#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
240# define HAVE_SCROLLBARS 1 280# 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 281#endif
249 282
250#define R_SB_ALIGN_CENTRE 0 283#define R_SB_ALIGN_CENTRE 0
251#define R_SB_ALIGN_TOP 1 284#define R_SB_ALIGN_TOP 1
252#define R_SB_ALIGN_BOTTOM 2 285#define R_SB_ALIGN_BOTTOM 2
… …
325 * | 358 * |
326 * +---< SB_WIDTH_NEXT 359 * +---< SB_WIDTH_NEXT
327 */ 360 */
328 361
329enum { 362enum {
330 NO_REFRESH = 0 , /* Window not visible at all! */ 363 NO_REFRESH = 0, /* Window not visible at all! */
331 FAST_REFRESH = 1<<0, /* Fully exposed window */ 364 FAST_REFRESH = 1, /* Fully exposed window */
332 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 365 SLOW_REFRESH = 2, /* Partially exposed window */
333 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
334}; 366};
335 367
336#ifdef NO_SECONDARY_SCREEN 368#ifdef NO_SECONDARY_SCREEN
337# define NSCREENS 0 369# define NSCREENS 0
338#else 370#else
… …
438 XTerm_property = 3, // change X property 470 XTerm_property = 3, // change X property
439 XTerm_Color = 4, // change colors 471 XTerm_Color = 4, // change colors
440 XTerm_Color00 = 10, // not implemented, CLASH! 472 XTerm_Color00 = 10, // not implemented, CLASH!
441 XTerm_Color01 = 11, // not implemented 473 XTerm_Color01 = 11, // not implemented
442 XTerm_Color_cursor = 12, // change actual 'Cursor' color 474 XTerm_Color_cursor = 12, // change actual 'Cursor' color
443 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 475 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
444 XTerm_Color_pointer_bg = 14, // not implemented 476 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
445 XTerm_Color05 = 15, // not implemented 477 XTerm_Color05 = 15, // not implemented (tektronix fg)
446 XTerm_Color06 = 16, // not implemented 478 XTerm_Color06 = 16, // not implemented (tektronix bg)
447 XTerm_Color_RV = 17, // change actual 'Highlight' color 479 XTerm_Color_RV = 17, // change actual 'Highlight' color
448 XTerm_logfile = 46, // not implemented 480 XTerm_logfile = 46, // not implemented
449 XTerm_font = 50, 481 XTerm_font = 50,
450 482
451 XTerm_konsole30 = 30, // reserved for konsole 483 XTerm_konsole30 = 30, // reserved for konsole
452 XTerm_konsole31 = 31, // reserved for konsole 484 XTerm_konsole31 = 31, // reserved for konsole
453 XTerm_emacs51 = 51, // reserved for emacs shell 485 XTerm_emacs51 = 51, // reserved for emacs shell
454 /* 486 /*
455 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 487 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
488 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
456 */ 489 */
457 XTerm_Color_BD = 18, // change actual 'Bold' color 490 Rxvt_Color_BD = 18, // change actual 'Bold' color
458 XTerm_Color_UL = 19, // change actual 'Underline' color 491 Rxvt_Color_UL = 19, // change actual 'Underline' color
459 XTerm_Pixmap = 20, // new bg pixmap 492 Rxvt_Pixmap = 20, // new bg pixmap
460 XTerm_restoreFG = 39, // change default fg color 493 Rxvt_restoreFG = 39, // change default fg color
461 XTerm_restoreBG = 49, // change default bg color 494 Rxvt_restoreBG = 49, // change default bg color
462 XTerm_dumpscreen = 55, // dump scrollback and all of screen 495 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
463 496
464 URxvt_locale = 701, // change locale 497 URxvt_locale = 701, // change locale
465 URxvt_Menu = 703, // set menu item 498
466 URxvt_Color_IT = 704, // change actual 'Italic' colour 499 URxvt_Color_IT = 704, // change actual 'Italic' colour
467 URxvt_Color_tint = 705, // change actual tint colour 500 URxvt_Color_tint = 705, // change actual tint colour
501 URxvt_Color_BD = 706,
502 URxvt_Color_UL = 707,
468 503
469 URxvt_font = 710, 504 URxvt_font = 710,
470 URxvt_boldFont = 711, 505 URxvt_boldFont = 711,
471 URxvt_italicFont = 712, 506 URxvt_italicFont = 712,
472 URxvt_boldItalicFont = 713, 507 URxvt_boldItalicFont = 713,
… …
623#define PrivMode_ShiftKeys (1UL<<10) 658#define PrivMode_ShiftKeys (1UL<<10)
624#define PrivMode_VisibleCursor (1UL<<11) 659#define PrivMode_VisibleCursor (1UL<<11)
625#define PrivMode_MouseX10 (1UL<<12) 660#define PrivMode_MouseX10 (1UL<<12)
626#define PrivMode_MouseX11 (1UL<<13) 661#define PrivMode_MouseX11 (1UL<<13)
627#define PrivMode_scrollBar (1UL<<14) 662#define PrivMode_scrollBar (1UL<<14)
628#define PrivMode_menuBar (1UL<<15)
629#define PrivMode_TtyOutputInh (1UL<<16) 663#define PrivMode_TtyOutputInh (1UL<<15)
630#define PrivMode_Keypress (1UL<<17) 664#define PrivMode_Keypress (1UL<<16)
631#define PrivMode_smoothScroll (1UL<<18) 665#define PrivMode_smoothScroll (1UL<<17)
632#define PrivMode_vt52 (1UL<<19) 666#define PrivMode_vt52 (1UL<<18)
633#define PrivMode_LFNL (1UL<<20) 667#define PrivMode_LFNL (1UL<<19)
634/* too annoying to implement X11 highlight tracking */ 668/* too annoying to implement X11 highlight tracking */
635/* #define PrivMode_MouseX11Track (1LU<<21) */ 669/* #define PrivMode_MouseX11Track (1LU<<20) */
636 670
637#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 671#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
638#define PrivMode(test,bit) \ 672#define PrivMode(test,bit) \
639 if (test) \ 673 if (test) \
640 priv_modes |= (bit); \ 674 priv_modes |= (bit); \
… …
687/* 721/*
688 ***************************************************************************** 722 *****************************************************************************
689 * MACRO DEFINES 723 * MACRO DEFINES
690 ***************************************************************************** 724 *****************************************************************************
691 */ 725 */
726#define dLocal(type,name) type const name = this->name
692#define dDisp Display *disp = display->display 727#define dDisp Display *disp = this->display->display
693 728
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 729/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 730#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 731#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 732#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 734#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 735#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 736#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 737#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 738
739#define OPTION(opt) (options & (opt))
740#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
741 | Opt_jumpScroll | Opt_secondaryScreen \
742 | Opt_pastableTabs | Opt_intensityStyles)
743
704// for m >= -n, ensure remainder lies between 0..n-1 744// for m >= -n, ensure remainder lies between 0..n-1
705#define MOD(m,n) (((m) + (n)) % (n)) 745#define MOD(m,n) (((m) + (n)) % (n))
706 746
707#define LINENO(n) MOD (term_start + int(n), total_rows) 747#define LINENO(n) MOD (term_start + int(n), total_rows)
708#define ROW(n) row_buf [LINENO (n)] 748#define ROW(n) row_buf [LINENO (n)]
… …
765#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 805#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
766#define scrollbar_position(y) ((y) - scrollBar.beg) 806#define scrollbar_position(y) ((y) - scrollBar.beg)
767#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 807#define scrollbar_size() (scrollBar.end - scrollBar.beg \
768 - scrollbar_minheight ()) 808 - scrollbar_minheight ())
769 809
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 810#ifdef XPM_BACKGROUND
782# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 811# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
783#else 812#else
784# define XPMClearArea(a, b, c, d, e, f, g) 813# 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 814#endif
804 815
805#ifdef DEBUG_CMD 816#ifdef DEBUG_CMD
806# define D_CMD(x) fprintf x ; fputc('\n', stderr) 817# define D_CMD(x) fprintf x ; fputc('\n', stderr)
807#else 818#else
… …
834extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 845extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
835extern void rxvt_exit_failure () __attribute__ ((noreturn)); 846extern void rxvt_exit_failure () __attribute__ ((noreturn));
836 847
837#define SET_LOCALE(locale) rxvt_set_locale (locale) 848#define SET_LOCALE(locale) rxvt_set_locale (locale)
838extern bool rxvt_set_locale (const char *locale); 849extern bool rxvt_set_locale (const char *locale);
839extern bool rxvt_push_locale (const char *locale); 850extern void rxvt_push_locale (const char *locale);
840extern void rxvt_pop_locale (); 851extern void rxvt_pop_locale ();
841 852
842/****************************************************************************/ 853/****************************************************************************/
843
844#ifdef MENUBAR
845# include "menubar.h"
846#endif
847 854
848#define BLINK_INTERVAL 0.5 855#define BLINK_INTERVAL 0.5
849#define TEXT_BLINK_INTERVAL 0.5 856#define TEXT_BLINK_INTERVAL 0.5
850 857
851#ifndef __attribute__ 858#ifndef __attribute__
… …
968#endif 975#endif
969 976
970struct rxvt_term : zero_initialized, rxvt_vars { 977struct rxvt_term : zero_initialized, rxvt_vars {
971 log_callback *log_hook; // log error messages through this hook, if != 0 978 log_callback *log_hook; // log error messages through this hook, if != 0
972 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 979 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
973
974#if ENABLE_PERL 980#if ENABLE_PERL
975 rxvt_perl_term perl; 981 rxvt_perl_term perl;
976#endif 982#endif
977
978 struct mbstate mbstate; // current input multibyte state 983 struct mbstate mbstate; // current input multibyte state
979 984
980 unsigned char want_refresh:1, 985 unsigned char want_refresh:1,
981#ifdef TRANSPARENT 986#ifdef TRANSPARENT
982 want_full_refresh:1, /* awaiting full screen refresh */ 987 want_full_refresh:1, /* awaiting full screen refresh */
… …
1037 refresh_limit, 1042 refresh_limit,
1038 last_bot, /* scrollbar last bottom position */ 1043 last_bot, /* scrollbar last bottom position */
1039 last_top, /* scrollbar last top position */ 1044 last_top, /* scrollbar last top position */
1040 last_state, /* scrollbar last state */ 1045 last_state, /* scrollbar last state */
1041 scrollbar_len, 1046 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, 1047 window_vt_x,
1050 window_vt_y, 1048 window_vt_y,
1051 window_sb_x, 1049 window_sb_x,
1052# ifdef POINTER_BLANK 1050# ifdef POINTER_BLANK
1053 pointerBlankDelay, 1051 pointerBlankDelay,
… …
1062 unsigned long priv_modes, 1060 unsigned long priv_modes,
1063 SavedModes; 1061 SavedModes;
1064/* ---------- */ 1062/* ---------- */
1065 Atom xa[NUM_XA]; 1063 Atom xa[NUM_XA];
1066/* ---------- */ 1064/* ---------- */
1067#ifdef MENUBAR 1065#ifdef RXVT_SCROLLBAR
1068 GC menubarGC;
1069#endif
1070#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1071 GC scrollbarGC, 1066 GC scrollbarGC,
1072 topShadowGC, 1067 topShadowGC,
1073 botShadowGC; 1068 botShadowGC;
1074#endif 1069#endif
1075#ifdef XTERM_SCROLLBAR 1070#ifdef XTERM_SCROLLBAR
… …
1107 const char *key_delete; 1102 const char *key_delete;
1108#endif 1103#endif
1109 struct mouse_event MEvent; 1104 struct mouse_event MEvent;
1110 XComposeStatus compose; 1105 XComposeStatus compose;
1111 ttymode_t tio; 1106 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; 1107 row_col_t oldcursor;
1125#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1126 bgPixmap_t bgPixmap; 1109 bgPixmap_t bgPixmap;
1127 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1110 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 1111#endif
1137 1112
1138#if ENABLE_OVERLAY 1113#if ENABLE_OVERLAY
1139 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1114 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1140 text_t **ov_text; 1115 text_t **ov_text;
… …
1169 const char *rs[NUM_RESOURCES]; 1144 const char *rs[NUM_RESOURCES];
1170 /* command input buffering */ 1145 /* command input buffering */
1171 char *cmdbuf_ptr, *cmdbuf_endp; 1146 char *cmdbuf_ptr, *cmdbuf_endp;
1172 char cmdbuf_base[CBUFSIZ]; 1147 char cmdbuf_base[CBUFSIZ];
1173 1148
1149 rxvt_ptytty *pty;
1150
1174 rxvt_salloc *talloc; // text line allocator 1151 rxvt_salloc *talloc; // text line allocator
1175 rxvt_salloc *ralloc; // rend line allocator 1152 rxvt_salloc *ralloc; // rend line allocator
1176 1153
1177 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1154 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1178 1155
… …
1188#endif 1165#endif
1189 1166
1190 // modifies first argument(!) 1167 // modifies first argument(!)
1191 void paste (char *data, unsigned int len); 1168 void paste (char *data, unsigned int len);
1192 1169
1193 void flush (); 1170 long vt_emask, vt_emask_perl;
1171
1172 void vt_select_input () const
1173 {
1174 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1175 }
1194 1176
1195#if TRANSPARENT 1177#if TRANSPARENT
1196 void rootwin_cb (XEvent &xev); 1178 void rootwin_cb (XEvent &xev);
1197 xevent_watcher rootwin_ev; 1179 xevent_watcher rootwin_ev;
1198#endif 1180#endif
1199 1181
1200 void x_cb (XEvent &xev); 1182 void x_cb (XEvent &xev);
1183 void flush ();
1201 xevent_watcher termwin_ev; 1184 xevent_watcher termwin_ev;
1202 xevent_watcher vt_ev; 1185 xevent_watcher vt_ev;
1203#ifdef HAVE_SCROLLBARS 1186#ifdef HAVE_SCROLLBARS
1204 xevent_watcher scrollbar_ev; 1187 xevent_watcher scrollbar_ev;
1205#endif
1206#ifdef MENUBAR
1207 xevent_watcher menubar_ev;
1208#endif 1188#endif
1209 1189
1210 void check_cb (check_watcher &w); check_watcher check_ev; 1190 void check_cb (check_watcher &w); check_watcher check_ev;
1211 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1191 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1212 void flush_cb (time_watcher &w); time_watcher flush_ev; 1192 void flush_cb (time_watcher &w); time_watcher flush_ev;
… …
1253 bool init (int argc, const char *const *argv); 1233 bool init (int argc, const char *const *argv);
1254 bool init_vars (); 1234 bool init_vars ();
1255 1235
1256 bool pty_fill (); 1236 bool pty_fill ();
1257 1237
1238 void make_current () const // make this the "currently active" urxvt instance
1239 {
1240 SET_R (this);
1241 rxvt_set_locale (locale);
1242 set_environ (envv);
1243 }
1244
1258 void init_secondary (); 1245 void init_secondary ();
1259 const char **init_resources (int argc, const char *const *argv); 1246 const char **init_resources (int argc, const char *const *argv);
1247 const char *x_resource (const char *name);
1260 void init_env (); 1248 void init_env ();
1261 void set_locale (const char *locale); 1249 void set_locale (const char *locale);
1262 void init_xlocale (); 1250 void init_xlocale ();
1263 void init_command (const char *const *argv); 1251 void init_command (const char *const *argv);
1264 void run_command (const char *const *argv); 1252 void run_command (const char *const *argv);
… …
1335 void process_sgr_mode (unsigned int nargs, const int *arg); 1323 void process_sgr_mode (unsigned int nargs, const int *arg);
1336 void process_graphics (); 1324 void process_graphics ();
1337 // init.C 1325 // init.C
1338 void Get_Colours (); 1326 void Get_Colours ();
1339 void get_ourmods (); 1327 void get_ourmods ();
1340 // logging.C
1341 void makeutent (const char *pty, const char *hostname);
1342 void cleanutent ();
1343 // main.C 1328 // main.C
1344 void privileged_utmp (rxvt_privaction action); 1329 void privileged_utmp (rxvt_privaction action);
1345 bool set_fonts (); 1330 bool set_fonts ();
1346 void set_string_property (Atom prop, const char *str, int len = -1); 1331 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); 1332 void set_utf8_property (Atom prop, const char *str, int len = -1);
… …
1350 void set_window_color (int idx, const char *color); 1335 void set_window_color (int idx, const char *color);
1351 void set_colorfgbg (); 1336 void set_colorfgbg ();
1352 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1337 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1353 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1338 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1354 1339
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 1340 // screen.C
1389 1341
1390 void lalloc (line_t &l) 1342 void lalloc (line_t &l) const
1391 { 1343 {
1392 l.t = (text_t *)talloc->alloc (); 1344 l.t = (text_t *)talloc->alloc ();
1393 l.r = (rend_t *)ralloc->alloc (); 1345 l.r = (rend_t *)ralloc->alloc ();
1394 } 1346 }
1395 1347
… …
1399 talloc->free (l.t); 1351 talloc->free (l.t);
1400 ralloc->free (l.r); 1352 ralloc->free (l.r);
1401 } 1353 }
1402#endif 1354#endif
1403 1355
1404 void lresize (line_t &l) 1356 void lresize (line_t &l) const
1405 { 1357 {
1406 if (!l.t) 1358 if (!l.t)
1407 return; 1359 return;
1408 1360
1409 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1361 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1413 1365
1414 if (ncol > prev_ncol) 1366 if (ncol > prev_ncol)
1415 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1367 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1416 } 1368 }
1417 1369
1418 int fgcolor_of (rend_t r) 1370 int fgcolor_of (rend_t r) const
1419 { 1371 {
1420 int base = GET_BASEFG (r); 1372 int base = GET_BASEFG (r);
1421#ifndef NO_BRIGHTCOLOR 1373#ifndef NO_BRIGHTCOLOR
1422 if (r & RS_Bold 1374 if (r & RS_Bold
1423# if ENABLE_STYLES 1375# if ENABLE_STYLES
… …
1427 base += minBrightCOLOR - minCOLOR; 1379 base += minBrightCOLOR - minCOLOR;
1428#endif 1380#endif
1429 return base; 1381 return base;
1430 } 1382 }
1431 1383
1432 int bgcolor_of (rend_t r) 1384 int bgcolor_of (rend_t r) const
1433 { 1385 {
1434 int base = GET_BASEBG (r); 1386 int base = GET_BASEBG (r);
1435#ifndef NO_BRIGHTCOLOR 1387#ifndef NO_BRIGHTCOLOR
1436 if (r & RS_Blink 1388 if (r & RS_Blink
1437# if ENABLE_STYLES 1389# if ENABLE_STYLES
… …
1441 base += minBrightCOLOR - minCOLOR; 1393 base += minBrightCOLOR - minCOLOR;
1442#endif 1394#endif
1443 return base; 1395 return base;
1444 } 1396 }
1445 1397
1398 bool option (uint32_t opt) const
1399 {
1400 return OPTION (opt);
1401 }
1402
1403 void set_option (uint32_t opt, bool set)
1404 {
1405 if (set)
1406 options |= opt;
1407 else
1408 options &= ~opt;
1409 }
1410
1446 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1411 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); 1412 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1448 int scr_scroll_text (int row1, int row2, int count); 1413 int scr_scroll_text (int row1, int row2, int count);
1449 void scr_reset (); 1414 void scr_reset ();
1450 void scr_release (); 1415 void scr_release ();
1451 void scr_clear (bool really = false); 1416 void scr_clear (bool really = false);
1452 void scr_refresh (unsigned char refresh_type); 1417 void scr_refresh ();
1453 bool scr_refresh_rend (rend_t mask, rend_t value); 1418 bool scr_refresh_rend (rend_t mask, rend_t value);
1454 void scr_erase_screen (int mode); 1419 void scr_erase_screen (int mode);
1455#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1456 void scr_erase_savelines (); 1421 void scr_erase_savelines ();
1457 void scr_backindex (); 1422 void scr_backindex ();
… …
1488 void scr_rvideo_mode (int mode); 1453 void scr_rvideo_mode (int mode);
1489 void scr_report_position (); 1454 void scr_report_position ();
1490 void set_font_style (); 1455 void set_font_style ();
1491 void scr_charset_choose (int set); 1456 void scr_charset_choose (int set);
1492 void scr_charset_set (int set, unsigned int ch); 1457 void scr_charset_set (int set, unsigned int ch);
1493 int scr_move_to (int y, int len); 1458 void scr_move_to (int y, int len);
1494 int scr_page (enum page_dirn direction, int nlines); 1459 bool scr_page (enum page_dirn direction, int nlines);
1495 int scr_changeview (unsigned int oldviewstart); 1460 bool scr_changeview (int new_view_start);
1496 void scr_bell (); 1461 void scr_bell ();
1497 void scr_printscreen (int fullhist); 1462 void scr_printscreen (int fullhist);
1463 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1464 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1498 void scr_reverse_selection (); 1465 void scr_reverse_selection ();
1499 void scr_dump (int fd); 1466 void scr_dump (int fd);
1500 void selection_check (int check_more); 1467 void selection_check (int check_more);
1501 void selection_paste (Window win, Atom prop, bool delete_prop); 1468 void selection_paste (Window win, Atom prop, bool delete_prop);
1502 void selection_property (Window win, Atom prop); 1469 void selection_property (Window win, Atom prop);
… …
1519 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1486 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1520#endif 1487#endif
1521 1488
1522#if defined(RXVT_SCROLLBAR) 1489#if defined(RXVT_SCROLLBAR)
1523 // scrollbar-rxvt.C 1490 // 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); 1491 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1526#endif 1492#endif
1527 1493
1528#if defined(XTERM_SCROLLBAR) 1494#if defined(XTERM_SCROLLBAR)
1529 // scrollbar-xterm.C 1495 // scrollbar-xterm.C

Diff Legend

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