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.231 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.269 by root, Tue May 1 21:30:01 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 XPM_BACKGROUND
86# ifdef XPM_INC_X11 79# ifdef XPM_INC_X11
87# include <X11/xpm.h> 80# include <X11/xpm.h>
88# else 81# else
… …
95# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 89# define STDERR_FILENO 2
97#endif 90#endif
98 91
99/****************************************************************************/ 92/****************************************************************************/
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 93
122// exception thrown on fatal (per-instance) errors 94// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { }; 95class rxvt_failure_exception { };
124 96
125// exception thrown when the command parser runs out of input data 97// exception thrown when the command parser runs out of input data
… …
141// misc.C 113// misc.C
142char * rxvt_wcstombs (const wchar_t *str, int len = -1); 114char * rxvt_wcstombs (const wchar_t *str, int len = -1);
143wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 115wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 116char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
145wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 117wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
118char * rxvt_strdup_cpp (const char *str);
146 119
147#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 120#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148 121
149char * rxvt_r_basename (const char *str) NOTHROW; 122char * rxvt_r_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 123void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
158char * rxvt_Str_trim (char *str) NOTHROW; 131char * rxvt_Str_trim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW; 132int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 133char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 134void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW; 135char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163void rxvt_usleep (int usecs) NOTHROW;
164 136
165///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
166 138
167// temporarily replace the process environment 139// temporarily replace the process environment
168extern char **environ; 140extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 141extern char **rxvt_environ; // the original environ pointer
170 142
171inline void set_environ (stringvec *envv) 143inline void set_environ (stringvec *envv)
172{ 144{
145#if ENABLE_PERL
146 assert (envv);
147#else
173 if (envv) 148 if (envv)
149#endif
174 environ = (char **)envv->begin (); 150 environ = (char **)envv->begin ();
175} 151}
176 152
177inline void set_environ (char **envv) 153inline void set_environ (char **envv)
178{ 154{
155#if ENABLE_PERL
156 assert (envv);
157#else
179 if (envv) 158 if (envv)
159#endif
180 environ = envv; 160 environ = envv;
181} 161}
182 162
183/* 163/*
184 ***************************************************************************** 164 *****************************************************************************
… …
200typedef struct { 180typedef struct {
201 short w, h, x, y; 181 short w, h, x, y;
202 Pixmap pixmap; 182 Pixmap pixmap;
203} bgPixmap_t; 183} bgPixmap_t;
204#endif 184#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 185
232/* 186/*
233 * the 'essential' information for reporting Mouse Events 187 * the 'essential' information for reporting Mouse Events
234 * pared down from XButtonEvent 188 * pared down from XButtonEvent
235 */ 189 */
… …
448// fake styles 402// fake styles
449#define RS_Blink 0x00010000UL // blink 403#define RS_Blink 0x00010000UL // blink
450#define RS_RVid 0x00020000UL // reverse video 404#define RS_RVid 0x00020000UL // reverse video
451#define RS_Uline 0x00040000UL // underline 405#define RS_Uline 0x00040000UL // underline
452 406
407// toggle this to force redraw, must be != RS_Careful
408#define RS_redraw 0x01000000UL
409
453// 5 custom bits for extensions 410// 5 custom bits for extensions
454#define RS_customCount 32 411#define RS_customCount 32
455#define RS_customMask 0x00f80000UL 412#define RS_customMask 0x00f80000UL
456#define RS_customShift 19 413#define RS_customShift 19
457 414
… …
526 Rxvt_restoreFG = 39, // change default fg color 483 Rxvt_restoreFG = 39, // change default fg color
527 Rxvt_restoreBG = 49, // change default bg color 484 Rxvt_restoreBG = 49, // change default bg color
528 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 485 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
529 486
530 URxvt_locale = 701, // change locale 487 URxvt_locale = 701, // change locale
488 URxvt_version = 702, // request version
531 489
532 URxvt_Color_IT = 704, // change actual 'Italic' colour 490 URxvt_Color_IT = 704, // change actual 'Italic' colour
533 URxvt_Color_tint = 705, // change actual tint colour 491 URxvt_Color_tint = 705, // change actual tint colour
534 URxvt_Color_BD = 706, 492 URxvt_Color_BD = 706,
535 URxvt_Color_UL = 707, 493 URxvt_Color_UL = 707,
… …
551 * on the unnecessary items, e.g. Color_pointer, but won't bother 509 * 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 510 * until we need to. Also, be aware of usage in pixcolor_set
553 */ 511 */
554 512
555enum colour_list { 513enum colour_list {
514 Color_none = -2,
515 Color_transparent = -1,
556 Color_fg = 0, 516 Color_fg = 0,
557 Color_bg, 517 Color_bg,
558 minCOLOR, /* 2 */ 518 minCOLOR, /* 2 */
559 Color_Black = minCOLOR, 519 Color_Black = minCOLOR,
560 Color_Red3, 520 Color_Red3,
… …
620#endif 580#endif
621}; 581};
622 582
623#define Color_Bits 7 // 0 .. maxTermCOLOR 583#define Color_Bits 7 // 0 .. maxTermCOLOR
624 584
625#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
626#define NPIXCLR_BITS 32
627
628/* 585/*
629 * Resource list 586 * Resource list
630 */ 587 */
631enum { 588enum {
632# define def(name) Rs_ ## name, 589# define def(name) Rs_ ## name,
633# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 590# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
634# include "rsinc.h" 591# include "rsinc.h"
635# undef def 592# undef def
636# undef reserve 593# undef reserve
637 NUM_RESOURCES 594 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}; 595};
675 596
676/* DEC private modes */ 597/* DEC private modes */
677#define PrivMode_132 (1UL<<0) 598#define PrivMode_132 (1UL<<0)
678#define PrivMode_132OK (1UL<<1) 599#define PrivMode_132OK (1UL<<1)
… …
751 ***************************************************************************** 672 *****************************************************************************
752 * MACRO DEFINES 673 * MACRO DEFINES
753 ***************************************************************************** 674 *****************************************************************************
754 */ 675 */
755#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
756#define dDisp Display *disp = this->display->display 677
678// for speed reasons, we assume that all codepoints 32 to 126 are
679// single-width.
680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
757 681
758/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
759#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
760#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
763#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
764#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
765#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
766#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
767 691
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 692// for m >= -n, ensure remainder lies between 0..n-1
774#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
775 694
776#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
777#define ROW(n) row_buf [LINENO (n)] 696#define ROW(n) row_buf [LINENO (n)]
… …
795#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 714#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
796#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 715#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
797 716
798#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 717#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
799 718
800#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 719#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
801#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 720#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
802 721
803#if ENABLE_STYLES 722#if ENABLE_STYLES
804# define FONTSET(style) fontset[GET_STYLE (style)] 723# define FONTSET(style) fontset[GET_STYLE (style)]
805#else 724#else
806# define FONTSET(style) fontset[0] 725# define FONTSET(style) fontset[0]
… …
840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 759# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
841#else 760#else
842# define XPMClearArea(a, b, c, d, e, f, g) 761# define XPMClearArea(a, b, c, d, e, f, g)
843#endif 762#endif
844 763
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; 764typedef callback<void (const char *)> log_callback;
867typedef callback1<int, int> getfd_callback; 765typedef callback<int (int)> getfd_callback;
868 766
869#define SET_LOCALE(locale) rxvt_set_locale (locale) 767#define SET_LOCALE(locale) rxvt_set_locale (locale)
870extern bool rxvt_set_locale (const char *locale) NOTHROW; 768extern bool rxvt_set_locale (const char *locale) NOTHROW;
871extern void rxvt_push_locale (const char *locale) NOTHROW; 769extern void rxvt_push_locale (const char *locale) NOTHROW;
872extern void rxvt_pop_locale () NOTHROW; 770extern void rxvt_pop_locale () NOTHROW;
… …
874/****************************************************************************/ 772/****************************************************************************/
875 773
876#define LINE_LONGER 0x0001 // line is continued on the next row 774#define LINE_LONGER 0x0001 // line is continued on the next row
877#define LINE_FILTERED 0x0002 // line has been filtered 775#define LINE_FILTERED 0x0002 // line has been filtered
878#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 776#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
777#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
778#define LINE_BIDI 0x0010 // line needs bidi (NYI)
879 779
880struct line_t { 780struct line_t {
881 text_t *t; // terminal the text 781 text_t *t; // terminal the text
882 rend_t *r; // rendition, uses RS_ flags 782 rend_t *r; // rendition, uses RS_ flags
883 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 783 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
937# define COMPOSE_LO 0x40000000UL 837# define COMPOSE_LO 0x40000000UL
938# define COMPOSE_HI 0x400fffffUL 838# define COMPOSE_HI 0x400fffffUL
939# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 839# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
940#else 840#else
941# if ENABLE_PERL 841# if ENABLE_PERL
942# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 842# 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 843# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
944# else 844# else
945# define COMPOSE_LO 0xd800UL 845# define COMPOSE_LO 0xd800UL
946# define COMPOSE_HI 0xf8ffUL 846# define COMPOSE_HI 0xf8ffUL
947# endif 847# endif
… …
976#endif 876#endif
977 877
978/****************************************************************************/ 878/****************************************************************************/
979 879
980#ifdef KEYSYM_RESOURCE 880#ifdef KEYSYM_RESOURCE
981 class keyboard_manager; 881class keyboard_manager;
982#endif 882#endif
983 883
984struct rxvt_term : zero_initialized, rxvt_vars { 884struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
885
886 // special markers with magic addresses
887 static const char resval_undef []; // options specifically unset
888 static const char resval_on []; // boolean options switched on
889 static const char resval_off []; // or off
890
985 log_callback *log_hook; // log error messages through this hook, if != 0 891 log_callback *log_hook; // log error messages through this hook, if != 0
986 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 892 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
987#if ENABLE_PERL 893#if ENABLE_PERL
988 rxvt_perl_term perl; 894 rxvt_perl_term perl;
989#endif 895#endif
990 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
991 897
992 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
993#ifdef TRANSPARENT 899#ifdef TRANSPARENT
994 want_full_refresh:1, /* awaiting full screen refresh */ 900 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 */ 901 am_transparent:1, /* is a transparent term */
998 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
999#endif 903#endif
1000 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
1001 num_scr_allow:1, 905 num_scr_allow:1,
… …
1029 int num_scr; /* screen: number lines scrolled */ 933 int num_scr; /* screen: number lines scrolled */
1030 int prev_ncol, /* screen: previous number of columns */ 934 int prev_ncol, /* screen: previous number of columns */
1031 prev_nrow; /* screen: previous number of rows */ 935 prev_nrow; /* screen: previous number of rows */
1032/* ---------- */ 936/* ---------- */
1033 rend_t rstyle; 937 rend_t rstyle;
1034/* ---------- */
1035 uint32_t pixcolor_set[NPIXCLR_SETS];
1036/* ---------- */ 938/* ---------- */
1037#ifdef SELECTION_SCROLLING 939#ifdef SELECTION_SCROLLING
1038 int scroll_selection_lines; 940 int scroll_selection_lines;
1039 enum page_dirn scroll_selection_dir; 941 enum page_dirn scroll_selection_dir;
1040 int selection_save_x, 942 int selection_save_x,
… …
1067 int old_width, /* last used width in screen resize */ 969 int old_width, /* last used width in screen resize */
1068 old_height; /* last used height in screen resize */ 970 old_height; /* last used height in screen resize */
1069 unsigned long priv_modes, 971 unsigned long priv_modes,
1070 SavedModes; 972 SavedModes;
1071/* ---------- */ 973/* ---------- */
1072 Atom xa[NUM_XA]; 974 Atom *xa;
1073/* ---------- */ 975/* ---------- */
1074#ifdef RXVT_SCROLLBAR 976#ifdef RXVT_SCROLLBAR
1075 GC scrollbarGC, 977 GC scrollbarGC,
1076 topShadowGC, 978 topShadowGC,
1077 botShadowGC; 979 botShadowGC;
… …
1134 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1036 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1135#endif 1037#endif
1136 1038
1137 vector<void *> allocated; // free these memory blocks with free() 1039 vector<void *> allocated; // free these memory blocks with free()
1138 1040
1139 char *env_windowid; /* environmental variable WINDOWID */ 1041 char env_windowid[21]; /* environmental variable WINDOWID */
1042 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1140 char *env_display; /* environmental variable DISPLAY */ 1043 char *env_display; /* environmental variable DISPLAY */
1141 char *env_term; /* environmental variable TERM */ 1044 char *env_term; /* environmental variable TERM */
1142 char *env_colorfgbg; 1045
1143 char *locale; 1046 char *locale;
1144 char charsets[4]; 1047 char charsets[4];
1145 char *v_buffer; /* pointer to physical buffer */ 1048 char *v_buffer; /* pointer to physical buffer */
1146 unsigned int v_buflen; /* size of area to write */ 1049 unsigned int v_buflen; /* size of area to write */
1147 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1050 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1148 1051
1149#ifdef KEYSYM_RESOURCE 1052#ifdef KEYSYM_RESOURCE
1150 keyboard_manager *keyboard; 1053 keyboard_manager *keyboard;
1151#endif 1054#endif
1152 1055
1153 const char *rs[NUM_RESOURCES]; 1056 const char *rs[NUM_RESOURCES];
1154 /* command input buffering */ 1057 /* command input buffering */
1155 char *cmdbuf_ptr, *cmdbuf_endp; 1058 char *cmdbuf_ptr, *cmdbuf_endp;
1156 char cmdbuf_base[CBUFSIZ]; 1059 char cmdbuf_base[CBUFSIZ];
1157 1060
1158 rxvt_ptytty *pty; 1061 ptytty *pty;
1159 1062
1160 rxvt_salloc *talloc; // text line allocator 1063 rxvt_salloc *talloc; // text line allocator
1161 rxvt_salloc *ralloc; // rend line allocator 1064 rxvt_salloc *ralloc; // rend line allocator
1162 1065
1163 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1066 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1174#endif 1077#endif
1175 1078
1176 // modifies first argument(!) 1079 // modifies first argument(!)
1177 void paste (char *data, unsigned int len) NOTHROW; 1080 void paste (char *data, unsigned int len) NOTHROW;
1178 1081
1179 long vt_emask, vt_emask_perl; 1082 long vt_emask, vt_emask_perl, vt_emask_xim;
1180 1083
1181 void vt_select_input () const NOTHROW 1084 void vt_select_input () const NOTHROW
1182 { 1085 {
1183 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1184 } 1087 }
1185 1088
1186#if TRANSPARENT 1089#if TRANSPARENT || ENABLE_PERL
1187 void rootwin_cb (XEvent &xev); 1090 void rootwin_cb (XEvent &xev);
1188 xevent_watcher rootwin_ev; 1091 xevent_watcher rootwin_ev;
1189#endif 1092#endif
1190 1093
1191 void x_cb (XEvent &xev); 1094 void x_cb (XEvent &xev);
… …
1238 rxvt_term (); 1141 rxvt_term ();
1239 ~rxvt_term (); 1142 ~rxvt_term ();
1240 void destroy (); 1143 void destroy ();
1241 void emergency_cleanup (); 1144 void emergency_cleanup ();
1242 1145
1243 bool init (int argc, const char *const *argv); 1146 bool init (int argc, const char *const *argv, stringvec *envv);
1147
1148 bool init (stringvec *argv, stringvec *envv)
1149 {
1150 this->argv = argv;
1151 return init (argv->size (), argv->begin (), envv);
1152 }
1153
1244 bool init_vars (); 1154 bool init_vars ();
1245 1155
1246 bool pty_fill (); 1156 bool pty_fill ();
1247 1157
1248 void make_current () const // make this the "currently active" urxvt instance 1158 void make_current () const // make this the "currently active" urxvt instance
1249 { 1159 {
1250 SET_R (this); 1160 SET_R (this);
1161 set_environ (envv);
1251 rxvt_set_locale (locale); 1162 rxvt_set_locale (locale);
1252 set_environ (envv);
1253 } 1163 }
1254 1164
1255 void init_secondary (); 1165 void init_secondary ();
1256 const char **init_resources (int argc, const char *const *argv); 1166 const char **init_resources (int argc, const char *const *argv);
1257 const char *x_resource (const char *name); 1167 const char *x_resource (const char *name);
… …
1267 void create_windows (int argc, const char *const *argv); 1177 void create_windows (int argc, const char *const *argv);
1268 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1178 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1269 void window_calc (unsigned int newwidth, unsigned int newheight); 1179 void window_calc (unsigned int newwidth, unsigned int newheight);
1270 1180
1271#if USE_XIM 1181#if USE_XIM
1272 rxvt_xim *input_method; 1182 rxvt_xim *input_method;
1273 XIC Input_Context; 1183 XIC Input_Context;
1274 XIMStyle input_style; 1184 XIMStyle input_style;
1275 XPoint spot; // most recently sent spot position 1185 XPoint spot; // most recently sent spot position
1276 1186
1277 void im_destroy (); 1187 void im_destroy ();
1278 void im_cb (); im_watcher im_ev; 1188 void im_cb (); im_watcher im_ev;
1279 void im_set_size (XRectangle &size); 1189 void im_set_size (XRectangle &size);
1280 void im_set_position (XPoint &pos) NOTHROW; 1190 void im_set_position (XPoint &pos) NOTHROW;
… …
1282 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1192 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1283 1193
1284 bool IMisRunning (); 1194 bool IMisRunning ();
1285 void IMSendSpot (); 1195 void IMSendSpot ();
1286 bool IM_get_IC (const char *modifiers); 1196 bool IM_get_IC (const char *modifiers);
1287 void IMSetStatusPosition (); 1197 void IMSetPosition ();
1288#endif 1198#endif
1289 1199
1290 void resize_scrollbar (); 1200 void resize_scrollbar ();
1291 1201
1292 // command.C 1202 // command.C
1293 void lookup_key (XKeyEvent &ev); 1203 void key_press (XKeyEvent &ev);
1204 void key_release (XKeyEvent &ev);
1294 unsigned int cmd_write (const char *str, unsigned int count); 1205 unsigned int cmd_write (const char *str, unsigned int count);
1295 1206
1296 wchar_t next_char () NOTHROW; 1207 wchar_t next_char () NOTHROW;
1297 wchar_t cmd_getc () THROW ((class out_of_input)); 1208 wchar_t cmd_getc () THROW ((class out_of_input));
1298 uint32_t next_octet () NOTHROW; 1209 uint32_t next_octet () NOTHROW;
… …
1302 void mouse_report (XButtonEvent &ev); 1213 void mouse_report (XButtonEvent &ev);
1303 void button_press (XButtonEvent &ev); 1214 void button_press (XButtonEvent &ev);
1304 void button_release (XButtonEvent &ev); 1215 void button_release (XButtonEvent &ev);
1305 void focus_in (); 1216 void focus_in ();
1306 void focus_out (); 1217 void focus_out ();
1218 void update_fade_color (unsigned int idx);
1307 int check_our_parents (); 1219 int check_our_parents ();
1308#ifdef PRINTPIPE 1220#ifdef PRINTPIPE
1309 FILE *popen_printer (); 1221 FILE *popen_printer ();
1310 int pclose_printer (FILE *stream); 1222 int pclose_printer (FILE *stream);
1311#endif 1223#endif
… …
1333 void set_utf8_property (Atom prop, const char *str, int len = -1); 1245 void set_utf8_property (Atom prop, const char *str, int len = -1);
1334 void set_title (const char *str); 1246 void set_title (const char *str);
1335 void set_icon_name (const char *str); 1247 void set_icon_name (const char *str);
1336 void set_window_color (int idx, const char *color); 1248 void set_window_color (int idx, const char *color);
1337 void set_colorfgbg (); 1249 void set_colorfgbg ();
1338 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1250 bool set_color (rxvt_color &color, const char *name);
1251 void alias_color (int dst, int src);
1339 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1252 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1340 1253
1341 // screen.C 1254 // screen.C
1342 1255
1343 void lalloc (line_t &l) const NOTHROW 1256 void lalloc (line_t &l) const
1344 { 1257 {
1345 l.t = (text_t *)talloc->alloc (); 1258 l.t = (text_t *)talloc->alloc ();
1346 l.r = (rend_t *)ralloc->alloc (); 1259 l.r = (rend_t *)ralloc->alloc ();
1347 } 1260 }
1348 1261
… …
1352 talloc->free (l.t); 1265 talloc->free (l.t);
1353 ralloc->free (l.r); 1266 ralloc->free (l.r);
1354 } 1267 }
1355#endif 1268#endif
1356 1269
1357 void lresize (line_t &l) const NOTHROW 1270 void lresize (line_t &l) const
1358 { 1271 {
1359 if (!l.t) 1272 if (!l.t)
1360 return; 1273 return;
1361 1274
1362 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1275 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1372 { 1285 {
1373 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1374#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1375 if (r & RS_Bold 1288 if (r & RS_Bold
1376# if ENABLE_STYLES 1289# if ENABLE_STYLES
1377 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1378# endif 1291# endif
1379 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1380 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1381#endif 1294#endif
1382 return base; 1295 return base;
… …
1386 { 1299 {
1387 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1388#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1389 if (r & RS_Blink 1302 if (r & RS_Blink
1390# if ENABLE_STYLES 1303# if ENABLE_STYLES
1391 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1392# endif 1305# endif
1393 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1394 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1395#endif 1308#endif
1396 return base; 1309 return base;
1397 } 1310 }
1398 1311
1399 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1400 { 1313 {
1401 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1402 } 1315 }
1403 1316
1404 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1405 { 1318 {
1406 if (set) 1319 if (set)
1407 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1408 else 1321 else
1409 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1410 } 1323 }
1411 1324
1412 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1325 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1413 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1326 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1414 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1327 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1430 void scr_remap_chars () NOTHROW; 1343 void scr_remap_chars () NOTHROW;
1431 void scr_remap_chars (line_t &l) NOTHROW; 1344 void scr_remap_chars (line_t &l) NOTHROW;
1432 1345
1433 enum cursor_mode { SAVE, RESTORE }; 1346 enum cursor_mode { SAVE, RESTORE };
1434 1347
1435 void scr_poweron () NOTHROW; 1348 void scr_poweron ();
1436 void scr_cursor (cursor_mode mode) NOTHROW; 1349 void scr_cursor (cursor_mode mode) NOTHROW;
1437 void scr_do_wrap () NOTHROW; 1350 void scr_do_wrap () NOTHROW;
1351 void scr_swap_screen () NOTHROW;
1438 int scr_change_screen (int scrn) NOTHROW; 1352 void scr_change_screen (int scrn);
1439 void scr_color (unsigned int color, int fgbg) NOTHROW; 1353 void scr_color (unsigned int color, int fgbg) NOTHROW;
1440 void scr_rendition (int set, int style) NOTHROW; 1354 void scr_rendition (int set, int style) NOTHROW;
1441 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1355 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1442 void scr_backspace () NOTHROW; 1356 void scr_backspace () NOTHROW;
1443 void scr_tab (int count, bool ht = false) NOTHROW; 1357 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1535# define __PROTO(p) p 1449# define __PROTO(p) p
1536#else 1450#else
1537# define __PROTO(p) () 1451# define __PROTO(p) ()
1538#endif 1452#endif
1539 1453
1540#ifdef DEBUG_malloc
1541# include "dmalloc.h" /* This comes last */
1542#endif
1543
1544#endif /* _RXVT_H_ */ 1454#endif /* _RXVT_H_ */
1545 1455

Diff Legend

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