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.230 by root, Fri Jan 20 22:49:34 2006 UTC vs.
Revision 1.281 by ayin, Thu Aug 2 15:01:30 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
43#include "libptytty.h"
40 44
41#include "rxvtperl.h" 45#include "rxvtperl.h"
42 46
43// try to avoid some macros to decrease code size, on some systems 47// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 48#if ENABLE_MINIMAL
… …
66 70
67#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
68typedef char *XPointer; 72typedef char *XPointer;
69#endif 73#endif
70 74
71#ifdef HAVE_TERMIOS_H
72# include <termios.h> 75#include <termios.h>
73typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
74#else
75# include <sgtty.h>
76typedef struct {
77 struct sgttyb sg;
78 struct tchars tc;
79 struct ltchars lc;
80 int line;
81 int local;
82} ttymode_t;
83#endif
84 77
85#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
86# ifdef XPM_INC_X11 79# include <afterimage.h>
87# include <X11/xpm.h> 80#undef min
88# else 81#undef max
89# include <xpm.h>
90# endif
91#endif 82#endif
92 83
93#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
94# define STDIN_FILENO 0 85# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 87# define STDERR_FILENO 2
97#endif 88#endif
98 89
99/****************************************************************************/ 90/****************************************************************************/
100
101#ifndef __attribute__
102# if __GNUC__
103# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
104# define __attribute__(x)
105# endif
106# endif
107# define __attribute__(x)
108#endif
109
110#define NORETURN __attribute__ ((noreturn))
111#define UNUSED __attribute__ ((unused))
112
113// increases code size unless -fno-enforce-eh-specs
114#if __GNUC__
115# define NOTHROW
116# define THROW(x)
117#else
118# define NOTHROW throw()
119# define THROW(x) throw x
120#endif
121 91
122// exception thrown on fatal (per-instance) errors 92// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { }; 93class rxvt_failure_exception { };
124 94
125// exception thrown when the command parser runs out of input data 95// exception thrown when the command parser runs out of input data
… …
157const char * rxvt_Str_skip_space (const char *str) NOTHROW; 127const char * rxvt_Str_skip_space (const char *str) NOTHROW;
158char * rxvt_Str_trim (char *str) NOTHROW; 128char * rxvt_Str_trim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW; 129int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 130char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 131void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163void rxvt_usleep (int usecs) NOTHROW;
164 132
165///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
166 134
167// temporarily replace the process environment 135// temporarily replace the process environment
168extern char **environ; 136extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 137extern char **rxvt_environ; // the original environ pointer
170 138
171inline void set_environ (stringvec *envv) 139inline void set_environ (stringvec *envv)
172{ 140{
141#if ENABLE_PERL
142 assert (envv);
143#else
173 if (envv) 144 if (envv)
145#endif
174 environ = (char **)envv->begin (); 146 environ = (char **)envv->begin ();
175} 147}
176 148
177inline void set_environ (char **envv) 149inline void set_environ (char **envv)
178{ 150{
151#if ENABLE_PERL
152 assert (envv);
153#else
179 if (envv) 154 if (envv)
155#endif
180 environ = envv; 156 environ = envv;
181} 157}
182 158
183/* 159/*
184 ***************************************************************************** 160 *****************************************************************************
… …
197#endif 173#endif
198 174
199#ifdef XPM_BACKGROUND 175#ifdef XPM_BACKGROUND
200typedef struct { 176typedef struct {
201 short w, h, x, y; 177 short w, h, x, y;
178 bool auto_resize ;
202 Pixmap pixmap; 179 Pixmap pixmap;
203} bgPixmap_t; 180} bgPixmap_t;
204#endif 181#endif
205
206struct rxvt_ptytty {
207 int pty; // pty file descriptor; connected to rxvt
208 int tty; // tty file descriptor; connected to child
209
210 rxvt_ptytty ()
211 : pty(-1), tty(-1)
212 {
213 }
214
215 virtual ~rxvt_ptytty ()
216 {
217 }
218
219 virtual bool get () = 0;
220#if UTMP_SUPPORT
221 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
222#endif
223
224 void close_tty ();
225 bool make_controlling_tty ();
226 void set_utf8_mode (bool on);
227};
228
229rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
230void rxvt_ptytty_server (); // start the ptytty server process
231 182
232/* 183/*
233 * the 'essential' information for reporting Mouse Events 184 * the 'essential' information for reporting Mouse Events
234 * pared down from XButtonEvent 185 * pared down from XButtonEvent
235 */ 186 */
… …
448// fake styles 399// fake styles
449#define RS_Blink 0x00010000UL // blink 400#define RS_Blink 0x00010000UL // blink
450#define RS_RVid 0x00020000UL // reverse video 401#define RS_RVid 0x00020000UL // reverse video
451#define RS_Uline 0x00040000UL // underline 402#define RS_Uline 0x00040000UL // underline
452 403
404// toggle this to force redraw, must be != RS_Careful
405#define RS_redraw 0x01000000UL
406
453// 5 custom bits for extensions 407// 5 custom bits for extensions
454#define RS_customCount 32 408#define RS_customCount 32
455#define RS_customMask 0x00f80000UL 409#define RS_customMask 0x00f80000UL
456#define RS_customShift 19 410#define RS_customShift 19
457 411
… …
526 Rxvt_restoreFG = 39, // change default fg color 480 Rxvt_restoreFG = 39, // change default fg color
527 Rxvt_restoreBG = 49, // change default bg color 481 Rxvt_restoreBG = 49, // change default bg color
528 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 482 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
529 483
530 URxvt_locale = 701, // change locale 484 URxvt_locale = 701, // change locale
485 URxvt_version = 702, // request version
531 486
532 URxvt_Color_IT = 704, // change actual 'Italic' colour 487 URxvt_Color_IT = 704, // change actual 'Italic' colour
533 URxvt_Color_tint = 705, // change actual tint colour 488 URxvt_Color_tint = 705, // change actual tint colour
534 URxvt_Color_BD = 706, 489 URxvt_Color_BD = 706,
535 URxvt_Color_UL = 707, 490 URxvt_Color_UL = 707,
… …
551 * on the unnecessary items, e.g. Color_pointer, but won't bother 506 * on the unnecessary items, e.g. Color_pointer, but won't bother
552 * until we need to. Also, be aware of usage in pixcolor_set 507 * until we need to. Also, be aware of usage in pixcolor_set
553 */ 508 */
554 509
555enum colour_list { 510enum colour_list {
511 Color_none = -2,
512 Color_transparent = -1,
556 Color_fg = 0, 513 Color_fg = 0,
557 Color_bg, 514 Color_bg,
558 minCOLOR, /* 2 */ 515 minCOLOR, /* 2 */
559 Color_Black = minCOLOR, 516 Color_Black = minCOLOR,
560 Color_Red3, 517 Color_Red3,
… …
620#endif 577#endif
621}; 578};
622 579
623#define Color_Bits 7 // 0 .. maxTermCOLOR 580#define Color_Bits 7 // 0 .. maxTermCOLOR
624 581
625#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
626#define NPIXCLR_BITS 32
627
628/* 582/*
629 * Resource list 583 * Resource list
630 */ 584 */
631enum { 585enum {
632# define def(name) Rs_ ## name, 586# define def(name) Rs_ ## name,
633# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 587# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
634# include "rsinc.h" 588# include "rsinc.h"
635# undef def 589# undef def
636# undef reserve 590# undef reserve
637 NUM_RESOURCES 591 NUM_RESOURCES
638};
639
640// see init.C:xa_names, which must be kept in sync
641enum {
642 XA_TEXT = 0,
643 XA_COMPOUND_TEXT,
644 XA_UTF8_STRING,
645 XA_MULTIPLE,
646 XA_TARGETS,
647 XA_TIMESTAMP,
648 XA_VT_SELECTION,
649 XA_INCR,
650 XA_WM_PROTOCOLS,
651 XA_WM_DELETE_WINDOW,
652 XA_CLIPBOARD,
653#if ENABLE_FRILLS
654 XA_MOTIF_WM_HINTS,
655#endif
656#if ENABLE_EWMH
657 XA_NET_WM_PID,
658 XA_NET_WM_NAME,
659 XA_NET_WM_ICON_NAME,
660 XA_NET_WM_PING,
661#endif
662#if USE_XIM
663 XA_WM_LOCALE_NAME,
664#endif
665#if TRANSPARENT
666 XA_XROOTPMAP_ID,
667 XA_ESETROOT_PMAP_ID,
668#endif
669#if ENABLE_XEMBED
670 XA_XEMBED,
671 XA_XEMBED_INFO,
672#endif
673 NUM_XA
674}; 592};
675 593
676/* DEC private modes */ 594/* DEC private modes */
677#define PrivMode_132 (1UL<<0) 595#define PrivMode_132 (1UL<<0)
678#define PrivMode_132OK (1UL<<1) 596#define PrivMode_132OK (1UL<<1)
… …
751 ***************************************************************************** 669 *****************************************************************************
752 * MACRO DEFINES 670 * MACRO DEFINES
753 ***************************************************************************** 671 *****************************************************************************
754 */ 672 */
755#define dLocal(type,name) type const name = this->name 673#define dLocal(type,name) type const name = this->name
756#define dDisp Display *disp = this->display->display 674
675// for speed reasons, we assume that all codepoints 32 to 126 are
676// single-width.
677#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
757 678
758/* convert pixel dimensions to row/column values. Everything as int32_t */ 679/* convert pixel dimensions to row/column values. Everything as int32_t */
759#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 680#define Pixel2Col(x) Pixel2Width((int32_t)(x))
760#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 681#define Pixel2Row(y) Pixel2Height((int32_t)(y))
761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 682#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
763#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 684#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
764#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 685#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
765#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 686#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
766#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 687#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
767 688
768#define OPTION(opt) (options & (opt))
769#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
770 | Opt_jumpScroll | Opt_secondaryScreen \
771 | Opt_pastableTabs | Opt_intensityStyles)
772
773// for m >= -n, ensure remainder lies between 0..n-1 689// for m >= -n, ensure remainder lies between 0..n-1
774#define MOD(m,n) (((m) + (n)) % (n)) 690#define MOD(m,n) (((m) + (n)) % (n))
775 691
776#define LINENO(n) MOD (term_start + int(n), total_rows) 692#define LINENO(n) MOD (term_start + int(n), total_rows)
777#define ROW(n) row_buf [LINENO (n)] 693#define ROW(n) row_buf [LINENO (n)]
… …
795#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 711#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
796#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 712#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
797 713
798#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 714#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
799 715
800#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 716#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
801#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 717#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
802 718
803#if ENABLE_STYLES 719#if ENABLE_STYLES
804# define FONTSET(style) fontset[GET_STYLE (style)] 720# define FONTSET(style) fontset[GET_STYLE (style)]
805#else 721#else
806# define FONTSET(style) fontset[0] 722# define FONTSET(style) fontset[0]
… …
834#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 750#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
835#define scrollbar_position(y) ((y) - scrollBar.beg) 751#define scrollbar_position(y) ((y) - scrollBar.beg)
836#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 752#define scrollbar_size() (scrollBar.end - scrollBar.beg \
837 - scrollbar_minheight ()) 753 - scrollbar_minheight ())
838 754
839#ifdef XPM_BACKGROUND
840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
841#else
842# define XPMClearArea(a, b, c, d, e, f, g)
843#endif
844
845#ifdef DEBUG_CMD
846# define D_CMD(x) fprintf x ; fputc('\n', stderr)
847#else
848# define D_CMD(x)
849#endif
850#ifdef DEBUG_INIT
851# define D_INIT(x) fprintf x ; fputc('\n', stderr)
852#else
853# define D_INIT(x)
854#endif
855#ifdef DEBUG_MAIN
856# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
857#else
858# define D_MAIN(x)
859#endif
860#ifdef DEBUG_SIZE
861# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
862#else
863# define D_SIZE(x)
864#endif
865
866typedef callback1<void, const char *> log_callback; 755typedef callback<void (const char *)> log_callback;
867typedef callback1<int, int> getfd_callback; 756typedef callback<int (int)> getfd_callback;
868 757
869#define SET_LOCALE(locale) rxvt_set_locale (locale) 758#define SET_LOCALE(locale) rxvt_set_locale (locale)
870extern bool rxvt_set_locale (const char *locale) NOTHROW; 759extern bool rxvt_set_locale (const char *locale) NOTHROW;
871extern void rxvt_push_locale (const char *locale) NOTHROW; 760extern void rxvt_push_locale (const char *locale) NOTHROW;
872extern void rxvt_pop_locale () NOTHROW; 761extern void rxvt_pop_locale () NOTHROW;
… …
874/****************************************************************************/ 763/****************************************************************************/
875 764
876#define LINE_LONGER 0x0001 // line is continued on the next row 765#define LINE_LONGER 0x0001 // line is continued on the next row
877#define LINE_FILTERED 0x0002 // line has been filtered 766#define LINE_FILTERED 0x0002 // line has been filtered
878#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 767#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
768#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
769#define LINE_BIDI 0x0010 // line needs bidi (NYI)
879 770
880struct line_t { 771struct line_t {
881 text_t *t; // terminal the text 772 text_t *t; // terminal the text
882 rend_t *r; // rendition, uses RS_ flags 773 rend_t *r; // rendition, uses RS_ flags
883 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 774 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
937# define COMPOSE_LO 0x40000000UL 828# define COMPOSE_LO 0x40000000UL
938# define COMPOSE_HI 0x400fffffUL 829# define COMPOSE_HI 0x400fffffUL
939# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 830# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
940#else 831#else
941# if ENABLE_PERL 832# if ENABLE_PERL
942# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 833# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
943# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 834# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
944# else 835# else
945# define COMPOSE_LO 0xd800UL 836# define COMPOSE_LO 0xd800UL
946# define COMPOSE_HI 0xf8ffUL 837# define COMPOSE_HI 0xf8ffUL
947# endif 838# endif
… …
976#endif 867#endif
977 868
978/****************************************************************************/ 869/****************************************************************************/
979 870
980#ifdef KEYSYM_RESOURCE 871#ifdef KEYSYM_RESOURCE
981 class keyboard_manager; 872class keyboard_manager;
982#endif 873#endif
983 874
984struct rxvt_term : zero_initialized, rxvt_vars { 875struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
876
877 // special markers with magic addresses
878 static const char resval_undef []; // options specifically unset
879 static const char resval_on []; // boolean options switched on
880 static const char resval_off []; // or off
881
985 log_callback *log_hook; // log error messages through this hook, if != 0 882 log_callback *log_hook; // log error messages through this hook, if != 0
986 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 883 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
987#if ENABLE_PERL 884#if ENABLE_PERL
988 rxvt_perl_term perl; 885 rxvt_perl_term perl;
989#endif 886#endif
990 struct mbstate mbstate; // current input multibyte state 887 struct mbstate mbstate; // current input multibyte state
991 888
992 unsigned char want_refresh:1, 889 unsigned char want_refresh:1,
993#ifdef TRANSPARENT 890#ifdef ENABLE_TRANSPARENCY
994 want_full_refresh:1, /* awaiting full screen refresh */ 891 want_full_refresh:1, /* awaiting full screen refresh */
995#endif
996#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
997 am_transparent:1, /* is a transparent term */ 892 am_transparent:1, /* is a transparent term */
998 am_pixmap_trans:1, /* transparency w/known root pixmap */ 893 am_pixmap_trans:1, /* transparency w/known root pixmap */
999#endif 894#endif
1000 current_screen:1, /* primary or secondary */ 895 current_screen:1, /* primary or secondary */
1001 num_scr_allow:1, 896 num_scr_allow:1,
… …
1020#endif 915#endif
1021 scrollbar_align, 916 scrollbar_align,
1022 selection_wait, 917 selection_wait,
1023 selection_type; 918 selection_type;
1024/* ---------- */ 919/* ---------- */
920 bool rvideo_state, rvideo_mode;
921#ifndef NO_BELL
1025 short rvideo; 922 bool rvideo_bell;
923#endif
1026 int num_scr; /* screen: number lines scrolled */ 924 int num_scr; /* screen: number lines scrolled */
1027 int prev_ncol, /* screen: previous number of columns */ 925 int prev_ncol, /* screen: previous number of columns */
1028 prev_nrow; /* screen: previous number of rows */ 926 prev_nrow; /* screen: previous number of rows */
1029/* ---------- */ 927/* ---------- */
1030 rend_t rstyle; 928 rend_t rstyle;
1031/* ---------- */
1032 uint32_t pixcolor_set[NPIXCLR_SETS];
1033/* ---------- */ 929/* ---------- */
1034#ifdef SELECTION_SCROLLING 930#ifdef SELECTION_SCROLLING
1035 int scroll_selection_lines; 931 int scroll_selection_lines;
1036 enum page_dirn scroll_selection_dir; 932 enum page_dirn scroll_selection_dir;
1037 int selection_save_x, 933 int selection_save_x,
… …
1043 /* give proper Scroll behaviour */ 939 /* give proper Scroll behaviour */
1044#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 940#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1045 mouse_slip_wheel_speed, 941 mouse_slip_wheel_speed,
1046#endif 942#endif
1047 refresh_count, 943 refresh_count,
1048 refresh_limit,
1049 last_bot, /* scrollbar last bottom position */ 944 last_bot, /* scrollbar last bottom position */
1050 last_top, /* scrollbar last top position */ 945 last_top, /* scrollbar last top position */
1051 last_state, /* scrollbar last state */ 946 last_state, /* scrollbar last state */
1052 scrollbar_len, 947 scrollbar_len,
1053 window_vt_x, 948 window_vt_x,
… …
1064 int old_width, /* last used width in screen resize */ 959 int old_width, /* last used width in screen resize */
1065 old_height; /* last used height in screen resize */ 960 old_height; /* last used height in screen resize */
1066 unsigned long priv_modes, 961 unsigned long priv_modes,
1067 SavedModes; 962 SavedModes;
1068/* ---------- */ 963/* ---------- */
1069 Atom xa[NUM_XA]; 964 Atom *xa;
1070/* ---------- */ 965/* ---------- */
1071#ifdef RXVT_SCROLLBAR 966#ifdef RXVT_SCROLLBAR
1072 GC scrollbarGC, 967 GC scrollbarGC,
1073 topShadowGC, 968 topShadowGC,
1074 botShadowGC; 969 botShadowGC;
… …
1111 XComposeStatus compose; 1006 XComposeStatus compose;
1112 ttymode_t tio; 1007 ttymode_t tio;
1113 row_col_t oldcursor; 1008 row_col_t oldcursor;
1114#ifdef XPM_BACKGROUND 1009#ifdef XPM_BACKGROUND
1115 bgPixmap_t bgPixmap; 1010 bgPixmap_t bgPixmap;
1116 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1011 struct ASVisual *asv;
1012 ASImageManager *asimman;
1013 ASImage *original_asim;
1014 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1117#endif 1015#endif
1118 1016
1119#if ENABLE_OVERLAY 1017#if ENABLE_OVERLAY
1120 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1018 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1121 text_t **ov_text; 1019 text_t **ov_text;
… …
1131 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1029 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1132#endif 1030#endif
1133 1031
1134 vector<void *> allocated; // free these memory blocks with free() 1032 vector<void *> allocated; // free these memory blocks with free()
1135 1033
1136 char *env_windowid; /* environmental variable WINDOWID */ 1034 char env_windowid[21]; /* environmental variable WINDOWID */
1035 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1137 char *env_display; /* environmental variable DISPLAY */ 1036 char *env_display; /* environmental variable DISPLAY */
1138 char *env_term; /* environmental variable TERM */ 1037 char *env_term; /* environmental variable TERM */
1139 char *env_colorfgbg; 1038
1140 char *locale; 1039 char *locale;
1141 char charsets[4]; 1040 char charsets[4];
1142 char *v_buffer; /* pointer to physical buffer */ 1041 char *v_buffer; /* pointer to physical buffer */
1143 unsigned int v_buflen; /* size of area to write */ 1042 unsigned int v_buflen; /* size of area to write */
1144 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1043 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1145 1044
1146#ifdef KEYSYM_RESOURCE 1045#ifdef KEYSYM_RESOURCE
1147 keyboard_manager *keyboard; 1046 keyboard_manager *keyboard;
1148#endif 1047#endif
1149 1048
1150 const char *rs[NUM_RESOURCES]; 1049 const char *rs[NUM_RESOURCES];
1151 /* command input buffering */ 1050 /* command input buffering */
1152 char *cmdbuf_ptr, *cmdbuf_endp; 1051 char *cmdbuf_ptr, *cmdbuf_endp;
1153 char cmdbuf_base[CBUFSIZ]; 1052 char cmdbuf_base[CBUFSIZ];
1154 1053
1155 rxvt_ptytty *pty; 1054 ptytty *pty;
1156 1055
1157 rxvt_salloc *talloc; // text line allocator 1056 rxvt_salloc *talloc; // text line allocator
1158 rxvt_salloc *ralloc; // rend line allocator 1057 rxvt_salloc *ralloc; // rend line allocator
1159 1058
1160 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1059 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1171#endif 1070#endif
1172 1071
1173 // modifies first argument(!) 1072 // modifies first argument(!)
1174 void paste (char *data, unsigned int len) NOTHROW; 1073 void paste (char *data, unsigned int len) NOTHROW;
1175 1074
1176 long vt_emask, vt_emask_perl; 1075 long vt_emask, vt_emask_perl, vt_emask_xim;
1177 1076
1178 void vt_select_input () const NOTHROW 1077 void vt_select_input () const NOTHROW
1179 { 1078 {
1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1079 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1181 } 1080 }
1182 1081
1183#if TRANSPARENT 1082#if ENABLE_TRANSPARENCY || ENABLE_PERL
1184 void rootwin_cb (XEvent &xev); 1083 void rootwin_cb (XEvent &xev);
1185 xevent_watcher rootwin_ev; 1084 xevent_watcher rootwin_ev;
1085#endif
1086#if ENABLE_TRANSPARENCY
1087 int check_our_parents ();
1088 void check_our_parents_cb (time_watcher &w);
1089 time_watcher check_our_parents_ev;
1186#endif 1090#endif
1187 1091
1188 void x_cb (XEvent &xev); 1092 void x_cb (XEvent &xev);
1189 void flush (); 1093 void flush ();
1190 xevent_watcher termwin_ev; 1094 xevent_watcher termwin_ev;
… …
1195 1099
1196 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1100 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1197 void check_cb (check_watcher &w); check_watcher check_ev; 1101 void check_cb (check_watcher &w); check_watcher check_ev;
1198 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1102 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1199 void flush_cb (time_watcher &w); time_watcher flush_ev; 1103 void flush_cb (time_watcher &w); time_watcher flush_ev;
1200
1201 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1104 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1202
1203 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1105 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1204 1106
1205#ifdef CURSOR_BLINK 1107#ifdef CURSOR_BLINK
1206 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1108 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1207#endif 1109#endif
1208#ifdef TEXT_BLINK 1110#ifdef TEXT_BLINK
1209 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1111 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1112#endif
1113#ifndef NO_BELL
1114 void bell_cb (time_watcher &w); time_watcher bell_ev;
1210#endif 1115#endif
1211 1116
1212#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1117#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1213 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1118 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1214#endif 1119#endif
… …
1234 rxvt_term (); 1139 rxvt_term ();
1235 ~rxvt_term (); 1140 ~rxvt_term ();
1236 void destroy (); 1141 void destroy ();
1237 void emergency_cleanup (); 1142 void emergency_cleanup ();
1238 1143
1239 bool init (int argc, const char *const *argv); 1144 bool init (int argc, const char *const *argv, stringvec *envv);
1145
1146 bool init (stringvec *argv, stringvec *envv)
1147 {
1148 this->argv = argv;
1149 return init (argv->size (), argv->begin (), envv);
1150 }
1151
1240 bool init_vars (); 1152 bool init_vars ();
1241 1153
1242 bool pty_fill (); 1154 bool pty_fill ();
1243 1155
1244 void make_current () const // make this the "currently active" urxvt instance 1156 void make_current () const // make this the "currently active" urxvt instance
1245 { 1157 {
1246 SET_R (this); 1158 SET_R (this);
1159 set_environ (envv);
1247 rxvt_set_locale (locale); 1160 rxvt_set_locale (locale);
1248 set_environ (envv);
1249 } 1161 }
1250 1162
1251 void init_secondary (); 1163 void init_secondary ();
1252 const char **init_resources (int argc, const char *const *argv); 1164 const char **init_resources (int argc, const char *const *argv);
1253 const char *x_resource (const char *name); 1165 const char *x_resource (const char *name);
… …
1263 void create_windows (int argc, const char *const *argv); 1175 void create_windows (int argc, const char *const *argv);
1264 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1176 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1265 void window_calc (unsigned int newwidth, unsigned int newheight); 1177 void window_calc (unsigned int newwidth, unsigned int newheight);
1266 1178
1267#if USE_XIM 1179#if USE_XIM
1268 rxvt_xim *input_method; 1180 rxvt_xim *input_method;
1269 XIC Input_Context; 1181 XIC Input_Context;
1270 XIMStyle input_style; 1182 XIMStyle input_style;
1271 XPoint spot; // most recently sent spot position 1183 XPoint spot; // most recently sent spot position
1272 1184
1273 void im_destroy (); 1185 void im_destroy ();
1274 void im_cb (); im_watcher im_ev; 1186 void im_cb (); im_watcher im_ev;
1275 void im_set_size (XRectangle &size); 1187 void im_set_size (XRectangle &size);
1276 void im_set_position (XPoint &pos) NOTHROW; 1188 void im_set_position (XPoint &pos) NOTHROW;
… …
1278 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1190 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1279 1191
1280 bool IMisRunning (); 1192 bool IMisRunning ();
1281 void IMSendSpot (); 1193 void IMSendSpot ();
1282 bool IM_get_IC (const char *modifiers); 1194 bool IM_get_IC (const char *modifiers);
1283 void IMSetStatusPosition (); 1195 void IMSetPosition ();
1284#endif 1196#endif
1285 1197
1286 void resize_scrollbar (); 1198 void resize_scrollbar ();
1287 1199
1288 // command.C 1200 // command.C
1289 void lookup_key (XKeyEvent &ev); 1201 void key_press (XKeyEvent &ev);
1202 void key_release (XKeyEvent &ev);
1290 unsigned int cmd_write (const char *str, unsigned int count); 1203 unsigned int cmd_write (const char *str, unsigned int count);
1291 1204
1292 wchar_t next_char () NOTHROW; 1205 wchar_t next_char () NOTHROW;
1293 wchar_t cmd_getc () THROW ((class out_of_input)); 1206 wchar_t cmd_getc () THROW ((class out_of_input));
1294 uint32_t next_octet () NOTHROW; 1207 uint32_t next_octet () NOTHROW;
… …
1298 void mouse_report (XButtonEvent &ev); 1211 void mouse_report (XButtonEvent &ev);
1299 void button_press (XButtonEvent &ev); 1212 void button_press (XButtonEvent &ev);
1300 void button_release (XButtonEvent &ev); 1213 void button_release (XButtonEvent &ev);
1301 void focus_in (); 1214 void focus_in ();
1302 void focus_out (); 1215 void focus_out ();
1303 int check_our_parents (); 1216 void update_fade_color (unsigned int idx);
1304#ifdef PRINTPIPE 1217#ifdef PRINTPIPE
1305 FILE *popen_printer (); 1218 FILE *popen_printer ();
1306 int pclose_printer (FILE *stream); 1219 int pclose_printer (FILE *stream);
1307#endif 1220#endif
1308 void process_print_pipe (); 1221 void process_print_pipe ();
… …
1329 void set_utf8_property (Atom prop, const char *str, int len = -1); 1242 void set_utf8_property (Atom prop, const char *str, int len = -1);
1330 void set_title (const char *str); 1243 void set_title (const char *str);
1331 void set_icon_name (const char *str); 1244 void set_icon_name (const char *str);
1332 void set_window_color (int idx, const char *color); 1245 void set_window_color (int idx, const char *color);
1333 void set_colorfgbg (); 1246 void set_colorfgbg ();
1334 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1247 bool set_color (rxvt_color &color, const char *name);
1248 void alias_color (int dst, int src);
1335 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1249 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1336 1250
1337 // screen.C 1251 // screen.C
1338 1252
1339 void lalloc (line_t &l) const NOTHROW 1253 void lalloc (line_t &l) const
1340 { 1254 {
1341 l.t = (text_t *)talloc->alloc (); 1255 l.t = (text_t *)talloc->alloc ();
1342 l.r = (rend_t *)ralloc->alloc (); 1256 l.r = (rend_t *)ralloc->alloc ();
1343 } 1257 }
1344 1258
… …
1348 talloc->free (l.t); 1262 talloc->free (l.t);
1349 ralloc->free (l.r); 1263 ralloc->free (l.r);
1350 } 1264 }
1351#endif 1265#endif
1352 1266
1353 void lresize (line_t &l) const NOTHROW 1267 void lresize (line_t &l) const
1354 { 1268 {
1355 if (!l.t) 1269 if (!l.t)
1356 return; 1270 return;
1357 1271
1358 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1272 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1368 { 1282 {
1369 int base = GET_BASEFG (r); 1283 int base = GET_BASEFG (r);
1370#ifndef NO_BRIGHTCOLOR 1284#ifndef NO_BRIGHTCOLOR
1371 if (r & RS_Bold 1285 if (r & RS_Bold
1372# if ENABLE_STYLES 1286# if ENABLE_STYLES
1373 && OPTION (Opt_intensityStyles) 1287 && option (Opt_intensityStyles)
1374# endif 1288# endif
1375 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1289 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1376 base += minBrightCOLOR - minCOLOR; 1290 base += minBrightCOLOR - minCOLOR;
1377#endif 1291#endif
1378 return base; 1292 return base;
… …
1382 { 1296 {
1383 int base = GET_BASEBG (r); 1297 int base = GET_BASEBG (r);
1384#ifndef NO_BRIGHTCOLOR 1298#ifndef NO_BRIGHTCOLOR
1385 if (r & RS_Blink 1299 if (r & RS_Blink
1386# if ENABLE_STYLES 1300# if ENABLE_STYLES
1387 && OPTION (Opt_intensityStyles) 1301 && option (Opt_intensityStyles)
1388# endif 1302# endif
1389 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1303 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1390 base += minBrightCOLOR - minCOLOR; 1304 base += minBrightCOLOR - minCOLOR;
1391#endif 1305#endif
1392 return base; 1306 return base;
1393 } 1307 }
1394 1308
1395 bool option (uint32_t opt) const NOTHROW 1309 bool option (uint8_t opt) const NOTHROW
1396 { 1310 {
1397 return OPTION (opt); 1311 return options[opt >> 3] & (1 << (opt & 7));
1398 } 1312 }
1399 1313
1400 void set_option (uint32_t opt, bool set) NOTHROW 1314 void set_option (uint8_t opt, bool set = true) NOTHROW
1401 { 1315 {
1402 if (set) 1316 if (set)
1403 options |= opt; 1317 options[opt >> 3] |= (1 << (opt & 7));
1404 else 1318 else
1405 options &= ~opt; 1319 options[opt >> 3] &= ~(1 << (opt & 7));
1406 } 1320 }
1407 1321
1408 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1322 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1409 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1323 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1410 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1324 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1426 void scr_remap_chars () NOTHROW; 1340 void scr_remap_chars () NOTHROW;
1427 void scr_remap_chars (line_t &l) NOTHROW; 1341 void scr_remap_chars (line_t &l) NOTHROW;
1428 1342
1429 enum cursor_mode { SAVE, RESTORE }; 1343 enum cursor_mode { SAVE, RESTORE };
1430 1344
1431 void scr_poweron () NOTHROW; 1345 void scr_poweron ();
1432 void scr_cursor (cursor_mode mode) NOTHROW; 1346 void scr_cursor (cursor_mode mode) NOTHROW;
1433 void scr_do_wrap () NOTHROW; 1347 void scr_do_wrap () NOTHROW;
1348 void scr_swap_screen () NOTHROW;
1434 int scr_change_screen (int scrn) NOTHROW; 1349 void scr_change_screen (int scrn);
1435 void scr_color (unsigned int color, int fgbg) NOTHROW; 1350 void scr_color (unsigned int color, int fgbg) NOTHROW;
1436 void scr_rendition (int set, int style) NOTHROW; 1351 void scr_rendition (int set, int style) NOTHROW;
1437 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1352 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1438 void scr_backspace () NOTHROW; 1353 void scr_backspace () NOTHROW;
1439 void scr_tab (int count, bool ht = false) NOTHROW; 1354 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1447 void scr_cursor_visible (int mode) NOTHROW; 1362 void scr_cursor_visible (int mode) NOTHROW;
1448 void scr_autowrap (int mode) NOTHROW; 1363 void scr_autowrap (int mode) NOTHROW;
1449 void scr_relative_origin (int mode) NOTHROW; 1364 void scr_relative_origin (int mode) NOTHROW;
1450 void scr_insert_mode (int mode) NOTHROW; 1365 void scr_insert_mode (int mode) NOTHROW;
1451 void scr_set_tab (int mode) NOTHROW; 1366 void scr_set_tab (int mode) NOTHROW;
1452 void scr_rvideo_mode (int mode) NOTHROW; 1367 void scr_rvideo_mode (bool on) NOTHROW;
1453 void scr_report_position () NOTHROW; 1368 void scr_report_position () NOTHROW;
1454 void set_font_style () NOTHROW; 1369 void set_font_style () NOTHROW;
1455 void scr_charset_choose (int set) NOTHROW; 1370 void scr_charset_choose (int set) NOTHROW;
1456 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1371 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1457 void scr_move_to (int y, int len) NOTHROW; 1372 void scr_move_to (int y, int len) NOTHROW;
… …
1531# define __PROTO(p) p 1446# define __PROTO(p) p
1532#else 1447#else
1533# define __PROTO(p) () 1448# define __PROTO(p) ()
1534#endif 1449#endif
1535 1450
1536#ifdef DEBUG_malloc
1537# include "dmalloc.h" /* This comes last */
1538#endif
1539
1540#endif /* _RXVT_H_ */ 1451#endif /* _RXVT_H_ */
1541 1452

Diff Legend

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