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.251 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.304 by sasha, Wed Sep 12 19:51:41 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 ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
22#else 23#else
23# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
24#endif 25#endif
25 26
26#include <limits.h> 27#include <limits.h>
… …
69 70
70#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
71typedef char *XPointer; 72typedef char *XPointer;
72#endif 73#endif
73 74
74#ifdef HAVE_TERMIOS_H
75# include <termios.h> 75#include <termios.h>
76typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
77#else
78# include <sgtty.h>
79typedef struct {
80 struct sgttyb sg;
81 struct tchars tc;
82 struct ltchars lc;
83 int line;
84 int local;
85} ttymode_t;
86#endif
87 77
88#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
89# ifdef XPM_INC_X11 79# include <afterimage.h>
90# include <X11/xpm.h> 80#undef min
91# else 81#undef max
92# include <xpm.h>
93# endif
94#endif 82#endif
95 83
96#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
97# define STDIN_FILENO 0 85# define STDIN_FILENO 0
98# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
… …
111 ***************************************************************************** 99 *****************************************************************************
112 * PROTOTYPES 100 * PROTOTYPES
113 ***************************************************************************** 101 *****************************************************************************
114 */ 102 */
115// main.C 103// main.C
116RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
117RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
118void rxvt_clean_exit () NOTHROW;
119void * rxvt_malloc (size_t size); 104void * rxvt_malloc (size_t size);
120void * rxvt_calloc (size_t number, size_t size); 105void * rxvt_calloc (size_t number, size_t size);
121void * rxvt_realloc (void *ptr, size_t size); 106void * rxvt_realloc (void *ptr, size_t size);
122 107
123// misc.C 108// misc.C
124char * rxvt_wcstombs (const wchar_t *str, int len = -1); 109char * rxvt_wcstombs (const wchar_t *str, int len = -1);
125wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 110wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
126char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 111char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
127wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 112wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
128char * rxvt_strdup_cpp (const char *str);
129 113
130#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 114#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
131 115
132char * rxvt_r_basename (const char *str) NOTHROW; 116char * rxvt_basename (const char *str) NOTHROW;
133void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 117void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
134void rxvt_log (const char *fmt,...) NOTHROW; 118void rxvt_log (const char *fmt,...) NOTHROW;
135void rxvt_warn (const char *fmt,...) NOTHROW; 119void rxvt_warn (const char *fmt,...) NOTHROW;
136void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 120void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
137void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 121void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
138 122
139int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
140const char * rxvt_Str_skip_space (const char *str) NOTHROW;
141char * rxvt_Str_trim (char *str) NOTHROW; 123char * rxvt_strtrim (char *str) NOTHROW;
142int rxvt_Str_escaped (char *str) NOTHROW;
143char ** rxvt_splitcommastring (const char *cs) NOTHROW; 124char ** rxvt_splitcommastring (const char *cs) NOTHROW;
144void rxvt_freecommastring (char **cs) NOTHROW; 125void rxvt_freecommastring (char **cs) NOTHROW;
145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
146 126
147///////////////////////////////////////////////////////////////////////////// 127/////////////////////////////////////////////////////////////////////////////
148 128
149// temporarily replace the process environment 129// temporarily replace the process environment
150extern char **environ; 130extern char **environ;
151extern char **rxvt_environ; // the original environ pointer 131extern char **rxvt_environ; // the original environ pointer
152 132
153inline void set_environ (stringvec *envv) 133static inline void set_environ (stringvec *envv)
154{ 134{
155#if ENABLE_PERL 135#if ENABLE_PERL
156 assert (envv); 136 assert (envv);
157#else 137#else
158 if (envv) 138 if (envv)
159#endif 139#endif
160 environ = (char **)envv->begin (); 140 environ = (char **)envv->begin ();
161} 141}
162 142
163inline void set_environ (char **envv) 143static inline void set_environ (char **envv)
164{ 144{
165#if ENABLE_PERL 145#if ENABLE_PERL
166 assert (envv); 146 assert (envv);
167#else 147#else
168 if (envv) 148 if (envv)
… …
184# define KEEP_SCROLLCOLOR 1 164# define KEEP_SCROLLCOLOR 1
185#else 165#else
186# undef KEEP_SCROLLCOLOR 166# undef KEEP_SCROLLCOLOR
187#endif 167#endif
188 168
169#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
170# define HAVE_BG_PIXMAP 1/* to simplify further usage */
171struct bgPixmap_t {
172
173 enum {
174 geometrySet = (1UL<<0),
175 propScale = (1UL<<1),
176 geometryFlags = (geometrySet|propScale),
177
178 tintSet = (1UL<<8),
179 tintNeeded = (1UL<<9),
180 tintWholesome = (1UL<<10),
181 tintServerSide = (1UL<<11),
182 tintFlags = (tintSet|tintServerSide|tintNeeded|tintWholesome),
183 blurNeeded = (1UL<<12),
184 blurServerSide = (1UL<<13), /* this don't work yet */
185
186 isTransparent = (1UL<<16),
187 isInvalid = (1UL<<17),
188 isVtOrigin = (1UL<<18) /* if set pixmap has origin at corner of
189 vt window instead of parent[0]! */
190 };
191
192 unsigned long flags;
193
194 enum {
195 transpPmapTiled = (1UL<<0),
196 transpPmapTinted = tintNeeded,
197 transpPmapBlured = blurNeeded,
198 transpTransformations = (tintNeeded|blurNeeded)
199 }; /* this flags are returned by make_transparency_pixmap if called */
200
189#ifdef XPM_BACKGROUND 201# ifdef XPM_BACKGROUND
190typedef struct { 202# ifdef HAVE_AFTERIMAGE
191 short w, h, x, y; 203 ASImage *original_asim;
204 bool render_asim (ASImage *background, ARGB32 background_tint);
205# endif
206
207 enum { defaultScale = 100, defaultAlign = 50 };
208
209 unsigned int h_scale, v_scale;/* percents of the window size */
210 int h_align, v_align; /* percents of the window size:
211 0 - left align, 50 - center, 100 - right */
212 void unset_geometry () { flags = flags & ~geometryFlags; };
213 bool set_geometry (const char *geom);
214 void set_defaultGeometry ()
215 {
216 h_scale = v_scale = defaultScale;
217 h_align = v_align = defaultAlign;
218 flags |= geometrySet;
219 };
220
221 bool set_file (const char *file);
222# endif /* XPM_BACKGROUND */
223
224 rxvt_term *target;
225 bool set_target (rxvt_term *new_target);
226
227# ifdef ENABLE_TRANSPARENCY
228 int root_depth; /* obtained when target is set */
229 Pixmap root_pixmap; /* current root pixmap set */
230 rxvt_color tint;
231 int shade;
232 int h_blurRadius, v_blurRadius;
233
234 bool set_transparent ();
235 bool set_blur_radius (const char *geom);
236 bool set_tint (rxvt_color &new_tint);
237 bool unset_tint ();
238 bool set_shade (const char *shade_str);
239 bool set_root_pixmap ();
240
241 unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */
242# endif
243 double invalid_since;
244
192 Pixmap pixmap; 245 Pixmap pixmap;
193} bgPixmap_t; 246 unsigned int pmap_width, pmap_height;
247 unsigned int pmap_depth;
248
249 bool window_size_sensitive ();
250 bool window_position_sensitive () {
251 return (flags & isTransparent);
252 };
253
254 bool is_parentOrigin () {
255 return !(flags & isVtOrigin);
256 };
257
258 bool need_client_side_rendering ();
259 void apply ();
260 bool render ();
261 void invalidate () {
262 if (!(flags & isInvalid))
263 {
264 flags |= isInvalid;
265 invalid_since = NOW;
266 }
267 };
268};
269#else
270# undef HAVE_BG_PIXMAP
194#endif 271#endif
195 272
196/* 273/*
197 * the 'essential' information for reporting Mouse Events 274 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 275 * pared down from XButtonEvent
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 596 * on the unnecessary items, e.g. Color_pointer, but won't bother
520 * until we need to. Also, be aware of usage in pixcolor_set 597 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 598 */
522 599
523enum colour_list { 600enum colour_list {
601 Color_none = -2,
602 Color_transparent = -1,
524 Color_fg = 0, 603 Color_fg = 0,
525 Color_bg, 604 Color_bg,
526 minCOLOR, /* 2 */ 605 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 606 Color_Black = minCOLOR,
528 Color_Red3, 607 Color_Red3,
… …
570#endif 649#endif
571#ifdef KEEP_SCROLLCOLOR 650#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 651 Color_scroll,
573 Color_trough, 652 Color_trough,
574#endif 653#endif
575#if TINTING 654#if ENABLE_TRANSPARENCY
576 Color_tint, 655 Color_tint,
577#endif 656#endif
578#if OFF_FOCUS_FADING 657#if OFF_FOCUS_FADING
579 Color_fade, 658 Color_fade,
580#endif 659#endif
… …
625#define PrivMode_LFNL (1UL<<19) 704#define PrivMode_LFNL (1UL<<19)
626/* too annoying to implement X11 highlight tracking */ 705/* too annoying to implement X11 highlight tracking */
627/* #define PrivMode_MouseX11Track (1LU<<20) */ 706/* #define PrivMode_MouseX11Track (1LU<<20) */
628 707
629#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 708#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
630#define PrivMode(test,bit) \
631 if (test) \
632 priv_modes |= (bit); \
633 else \
634 priv_modes &= ~(bit)
635 709
636#ifdef ALLOW_132_MODE 710#ifdef ALLOW_132_MODE
637# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 711# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
638#else 712#else
639# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 713# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
681 * MACRO DEFINES 755 * MACRO DEFINES
682 ***************************************************************************** 756 *****************************************************************************
683 */ 757 */
684#define dLocal(type,name) type const name = this->name 758#define dLocal(type,name) type const name = this->name
685 759
686// for speed reasons, we assume that all latin1 characters 760// for speed reasons, we assume that all codepoints 32 to 126 are
687// are single-width (the first unicode combining character 761// single-width.
688// is actually 0x300, but ascii is what matters most). 762#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
690 763
691/* convert pixel dimensions to row/column values. Everything as int32_t */ 764/* convert pixel dimensions to row/column values. Everything as int32_t */
692#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 765#define Pixel2Col(x) Pixel2Width((int32_t)(x))
693#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 766#define Pixel2Row(y) Pixel2Height((int32_t)(y))
694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 767#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
696#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 769#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
697#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 770#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
698#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 771#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
699#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 772#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
700 773
701#define OPTION(opt) (options & (opt))
702#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
703 | Opt_jumpScroll | Opt_secondaryScreen \
704 | Opt_pastableTabs | Opt_intensityStyles)
705
706// for m >= -n, ensure remainder lies between 0..n-1 774// for m >= -n, ensure remainder lies between 0..n-1
707#define MOD(m,n) (((m) + (n)) % (n)) 775#define MOD(m,n) (((m) + (n)) % (n))
708 776
709#define LINENO(n) MOD (term_start + int(n), total_rows) 777#define LINENO(n) MOD (term_start + int(n), total_rows)
710#define ROW(n) row_buf [LINENO (n)] 778#define ROW(n) row_buf [LINENO (n)]
… …
767#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 835#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
768#define scrollbar_position(y) ((y) - scrollBar.beg) 836#define scrollbar_position(y) ((y) - scrollBar.beg)
769#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 837#define scrollbar_size() (scrollBar.end - scrollBar.beg \
770 - scrollbar_minheight ()) 838 - scrollbar_minheight ())
771 839
772#ifdef XPM_BACKGROUND
773# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
774#else
775# define XPMClearArea(a, b, c, d, e, f, g)
776#endif
777
778typedef callback1<void, const char *> log_callback; 840typedef callback<void (const char *)> log_callback;
779typedef callback1<int, int> getfd_callback; 841typedef callback<int (int)> getfd_callback;
780 842
781#define SET_LOCALE(locale) rxvt_set_locale (locale) 843#define SET_LOCALE(locale) rxvt_set_locale (locale)
782extern bool rxvt_set_locale (const char *locale) NOTHROW; 844extern bool rxvt_set_locale (const char *locale) NOTHROW;
783extern void rxvt_push_locale (const char *locale) NOTHROW; 845extern void rxvt_push_locale (const char *locale) NOTHROW;
784extern void rxvt_pop_locale () NOTHROW; 846extern void rxvt_pop_locale () NOTHROW;
… …
786/****************************************************************************/ 848/****************************************************************************/
787 849
788#define LINE_LONGER 0x0001 // line is continued on the next row 850#define LINE_LONGER 0x0001 // line is continued on the next row
789#define LINE_FILTERED 0x0002 // line has been filtered 851#define LINE_FILTERED 0x0002 // line has been filtered
790#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 852#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
853#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
854#define LINE_BIDI 0x0010 // line needs bidi (NYI)
791 855
792struct line_t { 856struct line_t {
793 text_t *t; // terminal the text 857 text_t *t; // terminal the text
794 rend_t *r; // rendition, uses RS_ flags 858 rend_t *r; // rendition, uses RS_ flags
795 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 859 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
888#endif 952#endif
889 953
890/****************************************************************************/ 954/****************************************************************************/
891 955
892#ifdef KEYSYM_RESOURCE 956#ifdef KEYSYM_RESOURCE
893 class keyboard_manager; 957class keyboard_manager;
894#endif 958#endif
895 959
896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 960struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
961
962 // special markers with magic addresses
963 static const char resval_undef []; // options specifically unset
964 static const char resval_on []; // boolean options switched on
965 static const char resval_off []; // or off
966
897 log_callback *log_hook; // log error messages through this hook, if != 0 967 log_callback *log_hook; // log error messages through this hook, if != 0
898 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 968 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
899#if ENABLE_PERL 969#if ENABLE_PERL
900 rxvt_perl_term perl; 970 rxvt_perl_term perl;
901#endif 971#endif
902 struct mbstate mbstate; // current input multibyte state 972 struct mbstate mbstate; // current input multibyte state
903 973
904 unsigned char want_refresh:1, 974 unsigned char want_refresh:1,
905#ifdef TRANSPARENT
906 want_full_refresh:1, /* awaiting full screen refresh */
907#endif
908#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
909 am_transparent:1, /* is a transparent term */
910 am_pixmap_trans:1, /* transparency w/known root pixmap */
911#endif
912 current_screen:1, /* primary or secondary */ 975 current_screen:1, /* primary or secondary */
913 num_scr_allow:1, 976 num_scr_allow:1,
914 bypass_keystate:1, 977 bypass_keystate:1,
915#ifdef CURSOR_BLINK 978#ifdef CURSOR_BLINK
916 hidden_cursor:1, 979 hidden_cursor:1,
… …
956 /* give proper Scroll behaviour */ 1019 /* give proper Scroll behaviour */
957#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1020#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
958 mouse_slip_wheel_speed, 1021 mouse_slip_wheel_speed,
959#endif 1022#endif
960 refresh_count, 1023 refresh_count,
961 refresh_limit,
962 last_bot, /* scrollbar last bottom position */ 1024 last_bot, /* scrollbar last bottom position */
963 last_top, /* scrollbar last top position */ 1025 last_top, /* scrollbar last top position */
964 last_state, /* scrollbar last state */ 1026 last_state, /* scrollbar last state */
965 scrollbar_len, 1027 scrollbar_len,
966 window_vt_x, 1028 window_vt_x,
… …
1012 char * incr_buf; 1074 char * incr_buf;
1013 size_t incr_buf_size, incr_buf_fill; 1075 size_t incr_buf_size, incr_buf_fill;
1014/* ---------- */ 1076/* ---------- */
1015 Cursor leftptr_cursor; 1077 Cursor leftptr_cursor;
1016/* ---------- */ 1078/* ---------- */
1017#ifndef NO_BACKSPACE_KEY
1018 const char *key_backspace;
1019#endif
1020#ifndef NO_DELETE_KEY
1021 const char *key_delete;
1022#endif
1023 struct mouse_event MEvent; 1079 struct mouse_event MEvent;
1024 XComposeStatus compose; 1080 XComposeStatus compose;
1025 ttymode_t tio; 1081 ttymode_t tio;
1026 row_col_t oldcursor; 1082 row_col_t oldcursor;
1027#ifdef XPM_BACKGROUND 1083#ifdef HAVE_BG_PIXMAP
1028 bgPixmap_t bgPixmap; 1084 bgPixmap_t bgPixmap;
1029 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1085#endif
1086#ifdef HAVE_AFTERIMAGE
1087 ASVisual *asv;
1088 ASImageManager *asimman;
1030#endif 1089#endif
1031 1090
1032#if ENABLE_OVERLAY 1091#if ENABLE_OVERLAY
1033 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1092 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1034 text_t **ov_text; 1093 text_t **ov_text;
… …
1089 1148
1090 long vt_emask, vt_emask_perl, vt_emask_xim; 1149 long vt_emask, vt_emask_perl, vt_emask_xim;
1091 1150
1092 void vt_select_input () const NOTHROW 1151 void vt_select_input () const NOTHROW
1093 { 1152 {
1094 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1153 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1095 } 1154 }
1096 1155
1097#if TRANSPARENT 1156#if ENABLE_TRANSPARENCY || ENABLE_PERL
1098 void rootwin_cb (XEvent &xev); 1157 void rootwin_cb (XEvent &xev);
1099 xevent_watcher rootwin_ev; 1158 xevent_watcher rootwin_ev;
1159#endif
1160#ifdef HAVE_BG_PIXMAP
1161 int update_background ();
1162 void update_background_cb (time_watcher &w);
1163 time_watcher update_background_ev;
1100#endif 1164#endif
1101 1165
1102 void x_cb (XEvent &xev); 1166 void x_cb (XEvent &xev);
1103 void flush (); 1167 void flush ();
1104 xevent_watcher termwin_ev; 1168 xevent_watcher termwin_ev;
… …
1164 bool pty_fill (); 1228 bool pty_fill ();
1165 1229
1166 void make_current () const // make this the "currently active" urxvt instance 1230 void make_current () const // make this the "currently active" urxvt instance
1167 { 1231 {
1168 SET_R (this); 1232 SET_R (this);
1233 set_environ (envv);
1169 rxvt_set_locale (locale); 1234 rxvt_set_locale (locale);
1170 set_environ (envv);
1171 } 1235 }
1172 1236
1173 void init_secondary (); 1237 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv); 1238 const char **init_resources (int argc, const char *const *argv);
1175 const char *x_resource (const char *name); 1239 const char *x_resource (const char *name);
… …
1200 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1264 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1201 1265
1202 bool IMisRunning (); 1266 bool IMisRunning ();
1203 void IMSendSpot (); 1267 void IMSendSpot ();
1204 bool IM_get_IC (const char *modifiers); 1268 bool IM_get_IC (const char *modifiers);
1205 void IMSetStatusPosition (); 1269 void IMSetPosition ();
1206#endif 1270#endif
1207 1271
1208 void resize_scrollbar (); 1272 void resize_scrollbar ();
1209 1273
1210 // command.C 1274 // command.C
1211 void lookup_key (XKeyEvent &ev); 1275 void key_press (XKeyEvent &ev);
1276 void key_release (XKeyEvent &ev);
1212 unsigned int cmd_write (const char *str, unsigned int count); 1277 unsigned int cmd_write (const char *str, unsigned int count);
1213 1278
1214 wchar_t next_char () NOTHROW; 1279 wchar_t next_char () NOTHROW;
1215 wchar_t cmd_getc () THROW ((class out_of_input)); 1280 wchar_t cmd_getc () THROW ((class out_of_input));
1216 uint32_t next_octet () NOTHROW; 1281 uint32_t next_octet () NOTHROW;
… …
1220 void mouse_report (XButtonEvent &ev); 1285 void mouse_report (XButtonEvent &ev);
1221 void button_press (XButtonEvent &ev); 1286 void button_press (XButtonEvent &ev);
1222 void button_release (XButtonEvent &ev); 1287 void button_release (XButtonEvent &ev);
1223 void focus_in (); 1288 void focus_in ();
1224 void focus_out (); 1289 void focus_out ();
1225 int check_our_parents (); 1290 void update_fade_color (unsigned int idx);
1226#ifdef PRINTPIPE 1291#ifdef PRINTPIPE
1227 FILE *popen_printer (); 1292 FILE *popen_printer ();
1228 int pclose_printer (FILE *stream); 1293 int pclose_printer (FILE *stream);
1229#endif 1294#endif
1230 void process_print_pipe (); 1295 void process_print_pipe ();
… …
1252 void set_title (const char *str); 1317 void set_title (const char *str);
1253 void set_icon_name (const char *str); 1318 void set_icon_name (const char *str);
1254 void set_window_color (int idx, const char *color); 1319 void set_window_color (int idx, const char *color);
1255 void set_colorfgbg (); 1320 void set_colorfgbg ();
1256 bool set_color (rxvt_color &color, const char *name); 1321 bool set_color (rxvt_color &color, const char *name);
1322 void alias_color (int dst, int src);
1257 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1323 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1258 1324
1259 // screen.C 1325 // screen.C
1260 1326
1261 void lalloc (line_t &l) const 1327 void lalloc (line_t &l) const
… …
1290 { 1356 {
1291 int base = GET_BASEFG (r); 1357 int base = GET_BASEFG (r);
1292#ifndef NO_BRIGHTCOLOR 1358#ifndef NO_BRIGHTCOLOR
1293 if (r & RS_Bold 1359 if (r & RS_Bold
1294# if ENABLE_STYLES 1360# if ENABLE_STYLES
1295 && OPTION (Opt_intensityStyles) 1361 && option (Opt_intensityStyles)
1296# endif 1362# endif
1297 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1363 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1298 base += minBrightCOLOR - minCOLOR; 1364 base += minBrightCOLOR - minCOLOR;
1299#endif 1365#endif
1300 return base; 1366 return base;
… …
1304 { 1370 {
1305 int base = GET_BASEBG (r); 1371 int base = GET_BASEBG (r);
1306#ifndef NO_BRIGHTCOLOR 1372#ifndef NO_BRIGHTCOLOR
1307 if (r & RS_Blink 1373 if (r & RS_Blink
1308# if ENABLE_STYLES 1374# if ENABLE_STYLES
1309 && OPTION (Opt_intensityStyles) 1375 && option (Opt_intensityStyles)
1310# endif 1376# endif
1311 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1377 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1312 base += minBrightCOLOR - minCOLOR; 1378 base += minBrightCOLOR - minCOLOR;
1313#endif 1379#endif
1314 return base; 1380 return base;
1315 } 1381 }
1316 1382
1317 bool option (uint32_t opt) const NOTHROW 1383 bool option (uint8_t opt) const NOTHROW
1318 { 1384 {
1319 return OPTION (opt); 1385 return options[opt >> 3] & (1 << (opt & 7));
1320 } 1386 }
1321 1387
1322 void set_option (uint32_t opt, bool set) NOTHROW 1388 void set_option (uint8_t opt, bool set = true) NOTHROW
1323 { 1389 {
1324 if (set) 1390 if (set)
1325 options |= opt; 1391 options[opt >> 3] |= (1 << (opt & 7));
1326 else 1392 else
1327 options &= ~opt; 1393 options[opt >> 3] &= ~(1 << (opt & 7));
1394 }
1395
1396 void PrivMode (int set, unsigned bit) NOTHROW
1397 {
1398 if (set)
1399 priv_modes |= bit;
1400 else
1401 priv_modes &= ~bit;
1328 } 1402 }
1329 1403
1330 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1404 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1331 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1405 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1332 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1406 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1438 void get_options (int argc, const char *const *argv); 1512 void get_options (int argc, const char *const *argv);
1439 int parse_keysym (const char *str, const char *arg); 1513 int parse_keysym (const char *str, const char *arg);
1440 void get_xdefaults (FILE *stream, const char *name); 1514 void get_xdefaults (FILE *stream, const char *name);
1441 void extract_resources (); 1515 void extract_resources ();
1442 // xpm.C 1516 // xpm.C
1443 int scale_pixmap (const char *geom); 1517 void get_window_origin (int &x, int &y);
1444 void resize_pixmap (); 1518 Pixmap get_pixmap_property (int prop_id);
1445 Pixmap set_bgPixmap (const char *file);
1446}; 1519};
1447 1520
1448/*
1449 *****************************************************************************
1450 * PROTOTYPES
1451 *****************************************************************************
1452 */
1453#ifdef PROTOTYPES
1454# define __PROTO(p) p
1455#else
1456# define __PROTO(p) ()
1457#endif
1458
1459#endif /* _RXVT_H_ */ 1521#endif /* _RXVT_H_ */
1460 1522

Diff Legend

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