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.232 by root, Sat Jan 21 23:50:33 2006 UTC vs.
Revision 1.282 by sasha, Fri Aug 3 05:33:04 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;
163 132
164///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
165 134
166// temporarily replace the process environment 135// temporarily replace the process environment
167extern char **environ; 136extern char **environ;
168extern char **rxvt_environ; // the original environ pointer 137extern char **rxvt_environ; // the original environ pointer
169 138
170inline void set_environ (stringvec *envv) 139inline void set_environ (stringvec *envv)
171{ 140{
141#if ENABLE_PERL
142 assert (envv);
143#else
172 if (envv) 144 if (envv)
145#endif
173 environ = (char **)envv->begin (); 146 environ = (char **)envv->begin ();
174} 147}
175 148
176inline void set_environ (char **envv) 149inline void set_environ (char **envv)
177{ 150{
151#if ENABLE_PERL
152 assert (envv);
153#else
178 if (envv) 154 if (envv)
155#endif
179 environ = envv; 156 environ = envv;
180} 157}
181 158
182/* 159/*
183 ***************************************************************************** 160 *****************************************************************************
… …
193# define KEEP_SCROLLCOLOR 1 170# define KEEP_SCROLLCOLOR 1
194#else 171#else
195# undef KEEP_SCROLLCOLOR 172# undef KEEP_SCROLLCOLOR
196#endif 173#endif
197 174
198#ifdef XPM_BACKGROUND 175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
199typedef struct { 176typedef struct {
177#ifdef XPM_BACKGROUND
178 ASImage *original_asim;
200 short w, h, x, y; 179 short w, h, x, y;
180 bool auto_resize;
181#endif
201 Pixmap pixmap; 182 Pixmap pixmap;
183 unsigned int pmap_width, pmap_height;
184 unsigned int pmap_depth;
202} bgPixmap_t; 185} bgPixmap_t;
203#endif 186#endif
204
205struct rxvt_ptytty {
206 int pty; // pty file descriptor; connected to rxvt
207 int tty; // tty file descriptor; connected to child
208
209 rxvt_ptytty ()
210 : pty(-1), tty(-1)
211 {
212 }
213
214 virtual ~rxvt_ptytty ()
215 {
216 }
217
218 virtual bool get () = 0;
219#if UTMP_SUPPORT
220 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
221#endif
222
223 void close_tty ();
224 bool make_controlling_tty ();
225 void set_utf8_mode (bool on);
226};
227
228rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
229void rxvt_ptytty_server (); // start the ptytty server process
230 187
231/* 188/*
232 * the 'essential' information for reporting Mouse Events 189 * the 'essential' information for reporting Mouse Events
233 * pared down from XButtonEvent 190 * pared down from XButtonEvent
234 */ 191 */
… …
447// fake styles 404// fake styles
448#define RS_Blink 0x00010000UL // blink 405#define RS_Blink 0x00010000UL // blink
449#define RS_RVid 0x00020000UL // reverse video 406#define RS_RVid 0x00020000UL // reverse video
450#define RS_Uline 0x00040000UL // underline 407#define RS_Uline 0x00040000UL // underline
451 408
409// toggle this to force redraw, must be != RS_Careful
410#define RS_redraw 0x01000000UL
411
452// 5 custom bits for extensions 412// 5 custom bits for extensions
453#define RS_customCount 32 413#define RS_customCount 32
454#define RS_customMask 0x00f80000UL 414#define RS_customMask 0x00f80000UL
455#define RS_customShift 19 415#define RS_customShift 19
456 416
… …
525 Rxvt_restoreFG = 39, // change default fg color 485 Rxvt_restoreFG = 39, // change default fg color
526 Rxvt_restoreBG = 49, // change default bg color 486 Rxvt_restoreBG = 49, // change default bg color
527 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 487 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
528 488
529 URxvt_locale = 701, // change locale 489 URxvt_locale = 701, // change locale
490 URxvt_version = 702, // request version
530 491
531 URxvt_Color_IT = 704, // change actual 'Italic' colour 492 URxvt_Color_IT = 704, // change actual 'Italic' colour
532 URxvt_Color_tint = 705, // change actual tint colour 493 URxvt_Color_tint = 705, // change actual tint colour
533 URxvt_Color_BD = 706, 494 URxvt_Color_BD = 706,
534 URxvt_Color_UL = 707, 495 URxvt_Color_UL = 707,
… …
550 * on the unnecessary items, e.g. Color_pointer, but won't bother 511 * on the unnecessary items, e.g. Color_pointer, but won't bother
551 * until we need to. Also, be aware of usage in pixcolor_set 512 * until we need to. Also, be aware of usage in pixcolor_set
552 */ 513 */
553 514
554enum colour_list { 515enum colour_list {
516 Color_none = -2,
517 Color_transparent = -1,
555 Color_fg = 0, 518 Color_fg = 0,
556 Color_bg, 519 Color_bg,
557 minCOLOR, /* 2 */ 520 minCOLOR, /* 2 */
558 Color_Black = minCOLOR, 521 Color_Black = minCOLOR,
559 Color_Red3, 522 Color_Red3,
… …
619#endif 582#endif
620}; 583};
621 584
622#define Color_Bits 7 // 0 .. maxTermCOLOR 585#define Color_Bits 7 // 0 .. maxTermCOLOR
623 586
624#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
625#define NPIXCLR_BITS 32
626
627/* 587/*
628 * Resource list 588 * Resource list
629 */ 589 */
630enum { 590enum {
631# define def(name) Rs_ ## name, 591# define def(name) Rs_ ## name,
632# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 592# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
633# include "rsinc.h" 593# include "rsinc.h"
634# undef def 594# undef def
635# undef reserve 595# undef reserve
636 NUM_RESOURCES 596 NUM_RESOURCES
637};
638
639// see init.C:xa_names, which must be kept in sync
640enum {
641 XA_TEXT = 0,
642 XA_COMPOUND_TEXT,
643 XA_UTF8_STRING,
644 XA_MULTIPLE,
645 XA_TARGETS,
646 XA_TIMESTAMP,
647 XA_VT_SELECTION,
648 XA_INCR,
649 XA_WM_PROTOCOLS,
650 XA_WM_DELETE_WINDOW,
651 XA_CLIPBOARD,
652#if ENABLE_FRILLS
653 XA_MOTIF_WM_HINTS,
654#endif
655#if ENABLE_EWMH
656 XA_NET_WM_PID,
657 XA_NET_WM_NAME,
658 XA_NET_WM_ICON_NAME,
659 XA_NET_WM_PING,
660#endif
661#if USE_XIM
662 XA_WM_LOCALE_NAME,
663#endif
664#if TRANSPARENT
665 XA_XROOTPMAP_ID,
666 XA_ESETROOT_PMAP_ID,
667#endif
668#if ENABLE_XEMBED
669 XA_XEMBED,
670 XA_XEMBED_INFO,
671#endif
672 NUM_XA
673}; 597};
674 598
675/* DEC private modes */ 599/* DEC private modes */
676#define PrivMode_132 (1UL<<0) 600#define PrivMode_132 (1UL<<0)
677#define PrivMode_132OK (1UL<<1) 601#define PrivMode_132OK (1UL<<1)
… …
750 ***************************************************************************** 674 *****************************************************************************
751 * MACRO DEFINES 675 * MACRO DEFINES
752 ***************************************************************************** 676 *****************************************************************************
753 */ 677 */
754#define dLocal(type,name) type const name = this->name 678#define dLocal(type,name) type const name = this->name
755#define dDisp Display *disp = this->display->display 679
680// for speed reasons, we assume that all codepoints 32 to 126 are
681// single-width.
682#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
756 683
757/* convert pixel dimensions to row/column values. Everything as int32_t */ 684/* convert pixel dimensions to row/column values. Everything as int32_t */
758#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 685#define Pixel2Col(x) Pixel2Width((int32_t)(x))
759#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 686#define Pixel2Row(y) Pixel2Height((int32_t)(y))
760#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 687#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
762#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 689#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
763#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 690#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
764#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 691#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
765#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 692#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
766 693
767#define OPTION(opt) (options & (opt))
768#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
769 | Opt_jumpScroll | Opt_secondaryScreen \
770 | Opt_pastableTabs | Opt_intensityStyles)
771
772// for m >= -n, ensure remainder lies between 0..n-1 694// for m >= -n, ensure remainder lies between 0..n-1
773#define MOD(m,n) (((m) + (n)) % (n)) 695#define MOD(m,n) (((m) + (n)) % (n))
774 696
775#define LINENO(n) MOD (term_start + int(n), total_rows) 697#define LINENO(n) MOD (term_start + int(n), total_rows)
776#define ROW(n) row_buf [LINENO (n)] 698#define ROW(n) row_buf [LINENO (n)]
… …
794#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 716#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
795#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 717#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
796 718
797#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 719#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
798 720
799#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 721#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
800#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 722#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
801 723
802#if ENABLE_STYLES 724#if ENABLE_STYLES
803# define FONTSET(style) fontset[GET_STYLE (style)] 725# define FONTSET(style) fontset[GET_STYLE (style)]
804#else 726#else
805# define FONTSET(style) fontset[0] 727# define FONTSET(style) fontset[0]
… …
833#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 755#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
834#define scrollbar_position(y) ((y) - scrollBar.beg) 756#define scrollbar_position(y) ((y) - scrollBar.beg)
835#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 757#define scrollbar_size() (scrollBar.end - scrollBar.beg \
836 - scrollbar_minheight ()) 758 - scrollbar_minheight ())
837 759
838#ifdef XPM_BACKGROUND
839# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
840#else
841# define XPMClearArea(a, b, c, d, e, f, g)
842#endif
843
844#ifdef DEBUG_CMD
845# define D_CMD(x) fprintf x ; fputc('\n', stderr)
846#else
847# define D_CMD(x)
848#endif
849#ifdef DEBUG_INIT
850# define D_INIT(x) fprintf x ; fputc('\n', stderr)
851#else
852# define D_INIT(x)
853#endif
854#ifdef DEBUG_MAIN
855# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
856#else
857# define D_MAIN(x)
858#endif
859#ifdef DEBUG_SIZE
860# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
861#else
862# define D_SIZE(x)
863#endif
864
865typedef callback1<void, const char *> log_callback; 760typedef callback<void (const char *)> log_callback;
866typedef callback1<int, int> getfd_callback; 761typedef callback<int (int)> getfd_callback;
867 762
868#define SET_LOCALE(locale) rxvt_set_locale (locale) 763#define SET_LOCALE(locale) rxvt_set_locale (locale)
869extern bool rxvt_set_locale (const char *locale) NOTHROW; 764extern bool rxvt_set_locale (const char *locale) NOTHROW;
870extern void rxvt_push_locale (const char *locale) NOTHROW; 765extern void rxvt_push_locale (const char *locale) NOTHROW;
871extern void rxvt_pop_locale () NOTHROW; 766extern void rxvt_pop_locale () NOTHROW;
… …
873/****************************************************************************/ 768/****************************************************************************/
874 769
875#define LINE_LONGER 0x0001 // line is continued on the next row 770#define LINE_LONGER 0x0001 // line is continued on the next row
876#define LINE_FILTERED 0x0002 // line has been filtered 771#define LINE_FILTERED 0x0002 // line has been filtered
877#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 772#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
773#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
774#define LINE_BIDI 0x0010 // line needs bidi (NYI)
878 775
879struct line_t { 776struct line_t {
880 text_t *t; // terminal the text 777 text_t *t; // terminal the text
881 rend_t *r; // rendition, uses RS_ flags 778 rend_t *r; // rendition, uses RS_ flags
882 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 779 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
936# define COMPOSE_LO 0x40000000UL 833# define COMPOSE_LO 0x40000000UL
937# define COMPOSE_HI 0x400fffffUL 834# define COMPOSE_HI 0x400fffffUL
938# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 835# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
939#else 836#else
940# if ENABLE_PERL 837# if ENABLE_PERL
941# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 838# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
942# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 839# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
943# else 840# else
944# define COMPOSE_LO 0xd800UL 841# define COMPOSE_LO 0xd800UL
945# define COMPOSE_HI 0xf8ffUL 842# define COMPOSE_HI 0xf8ffUL
946# endif 843# endif
… …
975#endif 872#endif
976 873
977/****************************************************************************/ 874/****************************************************************************/
978 875
979#ifdef KEYSYM_RESOURCE 876#ifdef KEYSYM_RESOURCE
980 class keyboard_manager; 877class keyboard_manager;
981#endif 878#endif
982 879
983struct rxvt_term : zero_initialized, rxvt_vars { 880struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
881
882 // special markers with magic addresses
883 static const char resval_undef []; // options specifically unset
884 static const char resval_on []; // boolean options switched on
885 static const char resval_off []; // or off
886
984 log_callback *log_hook; // log error messages through this hook, if != 0 887 log_callback *log_hook; // log error messages through this hook, if != 0
985 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 888 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
986#if ENABLE_PERL 889#if ENABLE_PERL
987 rxvt_perl_term perl; 890 rxvt_perl_term perl;
988#endif 891#endif
989 struct mbstate mbstate; // current input multibyte state 892 struct mbstate mbstate; // current input multibyte state
990 893
991 unsigned char want_refresh:1, 894 unsigned char want_refresh:1,
992#ifdef TRANSPARENT 895#ifdef ENABLE_TRANSPARENCY
993 want_full_refresh:1, /* awaiting full screen refresh */ 896 want_full_refresh:1, /* awaiting full screen refresh */
994#endif
995#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
996 am_transparent:1, /* is a transparent term */ 897 am_transparent:1, /* is a transparent term */
997 am_pixmap_trans:1, /* transparency w/known root pixmap */ 898 am_pixmap_trans:1, /* transparency w/known root pixmap */
998#endif 899#endif
999 current_screen:1, /* primary or secondary */ 900 current_screen:1, /* primary or secondary */
1000 num_scr_allow:1, 901 num_scr_allow:1,
… …
1029 int prev_ncol, /* screen: previous number of columns */ 930 int prev_ncol, /* screen: previous number of columns */
1030 prev_nrow; /* screen: previous number of rows */ 931 prev_nrow; /* screen: previous number of rows */
1031/* ---------- */ 932/* ---------- */
1032 rend_t rstyle; 933 rend_t rstyle;
1033/* ---------- */ 934/* ---------- */
1034 uint32_t pixcolor_set[NPIXCLR_SETS];
1035/* ---------- */
1036#ifdef SELECTION_SCROLLING 935#ifdef SELECTION_SCROLLING
1037 int scroll_selection_lines; 936 int scroll_selection_lines;
1038 enum page_dirn scroll_selection_dir; 937 enum page_dirn scroll_selection_dir;
1039 int selection_save_x, 938 int selection_save_x,
1040 selection_save_y, 939 selection_save_y,
… …
1045 /* give proper Scroll behaviour */ 944 /* give proper Scroll behaviour */
1046#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 945#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1047 mouse_slip_wheel_speed, 946 mouse_slip_wheel_speed,
1048#endif 947#endif
1049 refresh_count, 948 refresh_count,
1050 refresh_limit,
1051 last_bot, /* scrollbar last bottom position */ 949 last_bot, /* scrollbar last bottom position */
1052 last_top, /* scrollbar last top position */ 950 last_top, /* scrollbar last top position */
1053 last_state, /* scrollbar last state */ 951 last_state, /* scrollbar last state */
1054 scrollbar_len, 952 scrollbar_len,
1055 window_vt_x, 953 window_vt_x,
… …
1066 int old_width, /* last used width in screen resize */ 964 int old_width, /* last used width in screen resize */
1067 old_height; /* last used height in screen resize */ 965 old_height; /* last used height in screen resize */
1068 unsigned long priv_modes, 966 unsigned long priv_modes,
1069 SavedModes; 967 SavedModes;
1070/* ---------- */ 968/* ---------- */
1071 Atom xa[NUM_XA]; 969 Atom *xa;
1072/* ---------- */ 970/* ---------- */
1073#ifdef RXVT_SCROLLBAR 971#ifdef RXVT_SCROLLBAR
1074 GC scrollbarGC, 972 GC scrollbarGC,
1075 topShadowGC, 973 topShadowGC,
1076 botShadowGC; 974 botShadowGC;
… …
1111#endif 1009#endif
1112 struct mouse_event MEvent; 1010 struct mouse_event MEvent;
1113 XComposeStatus compose; 1011 XComposeStatus compose;
1114 ttymode_t tio; 1012 ttymode_t tio;
1115 row_col_t oldcursor; 1013 row_col_t oldcursor;
1014#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
1015 bgPixmap_t bgPixmap;
1016#endif
1116#ifdef XPM_BACKGROUND 1017#ifdef XPM_BACKGROUND
1117 bgPixmap_t bgPixmap; 1018 struct ASVisual *asv;
1118 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1019 ASImageManager *asimman;
1119#endif 1020#endif
1120 1021
1121#if ENABLE_OVERLAY 1022#if ENABLE_OVERLAY
1122 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1023 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1123 text_t **ov_text; 1024 text_t **ov_text;
… …
1133 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1034 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1134#endif 1035#endif
1135 1036
1136 vector<void *> allocated; // free these memory blocks with free() 1037 vector<void *> allocated; // free these memory blocks with free()
1137 1038
1138 char *env_windowid; /* environmental variable WINDOWID */ 1039 char env_windowid[21]; /* environmental variable WINDOWID */
1040 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1139 char *env_display; /* environmental variable DISPLAY */ 1041 char *env_display; /* environmental variable DISPLAY */
1140 char *env_term; /* environmental variable TERM */ 1042 char *env_term; /* environmental variable TERM */
1141 char *env_colorfgbg; 1043
1142 char *locale; 1044 char *locale;
1143 char charsets[4]; 1045 char charsets[4];
1144 char *v_buffer; /* pointer to physical buffer */ 1046 char *v_buffer; /* pointer to physical buffer */
1145 unsigned int v_buflen; /* size of area to write */ 1047 unsigned int v_buflen; /* size of area to write */
1146 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1048 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1147 1049
1148#ifdef KEYSYM_RESOURCE 1050#ifdef KEYSYM_RESOURCE
1149 keyboard_manager *keyboard; 1051 keyboard_manager *keyboard;
1150#endif 1052#endif
1151 1053
1152 const char *rs[NUM_RESOURCES]; 1054 const char *rs[NUM_RESOURCES];
1153 /* command input buffering */ 1055 /* command input buffering */
1154 char *cmdbuf_ptr, *cmdbuf_endp; 1056 char *cmdbuf_ptr, *cmdbuf_endp;
1155 char cmdbuf_base[CBUFSIZ]; 1057 char cmdbuf_base[CBUFSIZ];
1156 1058
1157 rxvt_ptytty *pty; 1059 ptytty *pty;
1158 1060
1159 rxvt_salloc *talloc; // text line allocator 1061 rxvt_salloc *talloc; // text line allocator
1160 rxvt_salloc *ralloc; // rend line allocator 1062 rxvt_salloc *ralloc; // rend line allocator
1161 1063
1162 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1064 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1173#endif 1075#endif
1174 1076
1175 // modifies first argument(!) 1077 // modifies first argument(!)
1176 void paste (char *data, unsigned int len) NOTHROW; 1078 void paste (char *data, unsigned int len) NOTHROW;
1177 1079
1178 long vt_emask, vt_emask_perl; 1080 long vt_emask, vt_emask_perl, vt_emask_xim;
1179 1081
1180 void vt_select_input () const NOTHROW 1082 void vt_select_input () const NOTHROW
1181 { 1083 {
1182 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1084 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1183 } 1085 }
1184 1086
1185#if TRANSPARENT 1087#if ENABLE_TRANSPARENCY || ENABLE_PERL
1186 void rootwin_cb (XEvent &xev); 1088 void rootwin_cb (XEvent &xev);
1187 xevent_watcher rootwin_ev; 1089 xevent_watcher rootwin_ev;
1090#endif
1091#if ENABLE_TRANSPARENCY
1092 int check_our_parents ();
1093 void check_our_parents_cb (time_watcher &w);
1094 time_watcher check_our_parents_ev;
1188#endif 1095#endif
1189 1096
1190 void x_cb (XEvent &xev); 1097 void x_cb (XEvent &xev);
1191 void flush (); 1098 void flush ();
1192 xevent_watcher termwin_ev; 1099 xevent_watcher termwin_ev;
… …
1237 rxvt_term (); 1144 rxvt_term ();
1238 ~rxvt_term (); 1145 ~rxvt_term ();
1239 void destroy (); 1146 void destroy ();
1240 void emergency_cleanup (); 1147 void emergency_cleanup ();
1241 1148
1242 bool init (int argc, const char *const *argv); 1149 bool init (int argc, const char *const *argv, stringvec *envv);
1150
1151 bool init (stringvec *argv, stringvec *envv)
1152 {
1153 this->argv = argv;
1154 return init (argv->size (), argv->begin (), envv);
1155 }
1156
1243 bool init_vars (); 1157 bool init_vars ();
1244 1158
1245 bool pty_fill (); 1159 bool pty_fill ();
1246 1160
1247 void make_current () const // make this the "currently active" urxvt instance 1161 void make_current () const // make this the "currently active" urxvt instance
1248 { 1162 {
1249 SET_R (this); 1163 SET_R (this);
1164 set_environ (envv);
1250 rxvt_set_locale (locale); 1165 rxvt_set_locale (locale);
1251 set_environ (envv);
1252 } 1166 }
1253 1167
1254 void init_secondary (); 1168 void init_secondary ();
1255 const char **init_resources (int argc, const char *const *argv); 1169 const char **init_resources (int argc, const char *const *argv);
1256 const char *x_resource (const char *name); 1170 const char *x_resource (const char *name);
… …
1266 void create_windows (int argc, const char *const *argv); 1180 void create_windows (int argc, const char *const *argv);
1267 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1181 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1268 void window_calc (unsigned int newwidth, unsigned int newheight); 1182 void window_calc (unsigned int newwidth, unsigned int newheight);
1269 1183
1270#if USE_XIM 1184#if USE_XIM
1271 rxvt_xim *input_method; 1185 rxvt_xim *input_method;
1272 XIC Input_Context; 1186 XIC Input_Context;
1273 XIMStyle input_style; 1187 XIMStyle input_style;
1274 XPoint spot; // most recently sent spot position 1188 XPoint spot; // most recently sent spot position
1275 1189
1276 void im_destroy (); 1190 void im_destroy ();
1277 void im_cb (); im_watcher im_ev; 1191 void im_cb (); im_watcher im_ev;
1278 void im_set_size (XRectangle &size); 1192 void im_set_size (XRectangle &size);
1279 void im_set_position (XPoint &pos) NOTHROW; 1193 void im_set_position (XPoint &pos) NOTHROW;
… …
1281 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1195 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1282 1196
1283 bool IMisRunning (); 1197 bool IMisRunning ();
1284 void IMSendSpot (); 1198 void IMSendSpot ();
1285 bool IM_get_IC (const char *modifiers); 1199 bool IM_get_IC (const char *modifiers);
1286 void IMSetStatusPosition (); 1200 void IMSetPosition ();
1287#endif 1201#endif
1288 1202
1289 void resize_scrollbar (); 1203 void resize_scrollbar ();
1290 1204
1291 // command.C 1205 // command.C
1292 void lookup_key (XKeyEvent &ev); 1206 void key_press (XKeyEvent &ev);
1207 void key_release (XKeyEvent &ev);
1293 unsigned int cmd_write (const char *str, unsigned int count); 1208 unsigned int cmd_write (const char *str, unsigned int count);
1294 1209
1295 wchar_t next_char () NOTHROW; 1210 wchar_t next_char () NOTHROW;
1296 wchar_t cmd_getc () THROW ((class out_of_input)); 1211 wchar_t cmd_getc () THROW ((class out_of_input));
1297 uint32_t next_octet () NOTHROW; 1212 uint32_t next_octet () NOTHROW;
… …
1301 void mouse_report (XButtonEvent &ev); 1216 void mouse_report (XButtonEvent &ev);
1302 void button_press (XButtonEvent &ev); 1217 void button_press (XButtonEvent &ev);
1303 void button_release (XButtonEvent &ev); 1218 void button_release (XButtonEvent &ev);
1304 void focus_in (); 1219 void focus_in ();
1305 void focus_out (); 1220 void focus_out ();
1306 int check_our_parents (); 1221 void update_fade_color (unsigned int idx);
1307#ifdef PRINTPIPE 1222#ifdef PRINTPIPE
1308 FILE *popen_printer (); 1223 FILE *popen_printer ();
1309 int pclose_printer (FILE *stream); 1224 int pclose_printer (FILE *stream);
1310#endif 1225#endif
1311 void process_print_pipe (); 1226 void process_print_pipe ();
… …
1332 void set_utf8_property (Atom prop, const char *str, int len = -1); 1247 void set_utf8_property (Atom prop, const char *str, int len = -1);
1333 void set_title (const char *str); 1248 void set_title (const char *str);
1334 void set_icon_name (const char *str); 1249 void set_icon_name (const char *str);
1335 void set_window_color (int idx, const char *color); 1250 void set_window_color (int idx, const char *color);
1336 void set_colorfgbg (); 1251 void set_colorfgbg ();
1337 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1252 bool set_color (rxvt_color &color, const char *name);
1253 void alias_color (int dst, int src);
1338 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1254 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1339 1255
1340 // screen.C 1256 // screen.C
1341 1257
1342 void lalloc (line_t &l) const NOTHROW 1258 void lalloc (line_t &l) const
1343 { 1259 {
1344 l.t = (text_t *)talloc->alloc (); 1260 l.t = (text_t *)talloc->alloc ();
1345 l.r = (rend_t *)ralloc->alloc (); 1261 l.r = (rend_t *)ralloc->alloc ();
1346 } 1262 }
1347 1263
… …
1351 talloc->free (l.t); 1267 talloc->free (l.t);
1352 ralloc->free (l.r); 1268 ralloc->free (l.r);
1353 } 1269 }
1354#endif 1270#endif
1355 1271
1356 void lresize (line_t &l) const NOTHROW 1272 void lresize (line_t &l) const
1357 { 1273 {
1358 if (!l.t) 1274 if (!l.t)
1359 return; 1275 return;
1360 1276
1361 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1277 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1371 { 1287 {
1372 int base = GET_BASEFG (r); 1288 int base = GET_BASEFG (r);
1373#ifndef NO_BRIGHTCOLOR 1289#ifndef NO_BRIGHTCOLOR
1374 if (r & RS_Bold 1290 if (r & RS_Bold
1375# if ENABLE_STYLES 1291# if ENABLE_STYLES
1376 && OPTION (Opt_intensityStyles) 1292 && option (Opt_intensityStyles)
1377# endif 1293# endif
1378 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1294 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1379 base += minBrightCOLOR - minCOLOR; 1295 base += minBrightCOLOR - minCOLOR;
1380#endif 1296#endif
1381 return base; 1297 return base;
… …
1385 { 1301 {
1386 int base = GET_BASEBG (r); 1302 int base = GET_BASEBG (r);
1387#ifndef NO_BRIGHTCOLOR 1303#ifndef NO_BRIGHTCOLOR
1388 if (r & RS_Blink 1304 if (r & RS_Blink
1389# if ENABLE_STYLES 1305# if ENABLE_STYLES
1390 && OPTION (Opt_intensityStyles) 1306 && option (Opt_intensityStyles)
1391# endif 1307# endif
1392 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1308 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1393 base += minBrightCOLOR - minCOLOR; 1309 base += minBrightCOLOR - minCOLOR;
1394#endif 1310#endif
1395 return base; 1311 return base;
1396 } 1312 }
1397 1313
1398 bool option (uint32_t opt) const NOTHROW 1314 bool option (uint8_t opt) const NOTHROW
1399 { 1315 {
1400 return OPTION (opt); 1316 return options[opt >> 3] & (1 << (opt & 7));
1401 } 1317 }
1402 1318
1403 void set_option (uint32_t opt, bool set) NOTHROW 1319 void set_option (uint8_t opt, bool set = true) NOTHROW
1404 { 1320 {
1405 if (set) 1321 if (set)
1406 options |= opt; 1322 options[opt >> 3] |= (1 << (opt & 7));
1407 else 1323 else
1408 options &= ~opt; 1324 options[opt >> 3] &= ~(1 << (opt & 7));
1409 } 1325 }
1410 1326
1411 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1327 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1412 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1328 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1329 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1429 void scr_remap_chars () NOTHROW; 1345 void scr_remap_chars () NOTHROW;
1430 void scr_remap_chars (line_t &l) NOTHROW; 1346 void scr_remap_chars (line_t &l) NOTHROW;
1431 1347
1432 enum cursor_mode { SAVE, RESTORE }; 1348 enum cursor_mode { SAVE, RESTORE };
1433 1349
1434 void scr_poweron () NOTHROW; 1350 void scr_poweron ();
1435 void scr_cursor (cursor_mode mode) NOTHROW; 1351 void scr_cursor (cursor_mode mode) NOTHROW;
1436 void scr_do_wrap () NOTHROW; 1352 void scr_do_wrap () NOTHROW;
1353 void scr_swap_screen () NOTHROW;
1437 int scr_change_screen (int scrn) NOTHROW; 1354 void scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg) NOTHROW; 1355 void scr_color (unsigned int color, int fgbg) NOTHROW;
1439 void scr_rendition (int set, int style) NOTHROW; 1356 void scr_rendition (int set, int style) NOTHROW;
1440 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1357 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1441 void scr_backspace () NOTHROW; 1358 void scr_backspace () NOTHROW;
1442 void scr_tab (int count, bool ht = false) NOTHROW; 1359 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1520 void get_xdefaults (FILE *stream, const char *name); 1437 void get_xdefaults (FILE *stream, const char *name);
1521 void extract_resources (); 1438 void extract_resources ();
1522 // xpm.C 1439 // xpm.C
1523 int scale_pixmap (const char *geom); 1440 int scale_pixmap (const char *geom);
1524 void resize_pixmap (); 1441 void resize_pixmap ();
1525 Pixmap set_bgPixmap (const char *file); 1442 void set_bgPixmap (const char *file);
1526}; 1443};
1527 1444
1528/* 1445/*
1529 ***************************************************************************** 1446 *****************************************************************************
1530 * PROTOTYPES 1447 * PROTOTYPES
… …
1534# define __PROTO(p) p 1451# define __PROTO(p) p
1535#else 1452#else
1536# define __PROTO(p) () 1453# define __PROTO(p) ()
1537#endif 1454#endif
1538 1455
1539#ifdef DEBUG_malloc
1540# include "dmalloc.h" /* This comes last */
1541#endif
1542
1543#endif /* _RXVT_H_ */ 1456#endif /* _RXVT_H_ */
1544 1457

Diff Legend

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