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.254 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.300 by ayin, Mon Aug 27 20:53:16 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_r_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_Str_trim (char *str) NOTHROW;
142int rxvt_Str_escaped (char *str) NOTHROW; 124int rxvt_Str_escaped (char *str) NOTHROW;
143char ** rxvt_splitcommastring (const char *cs) NOTHROW; 125char ** rxvt_splitcommastring (const char *cs) NOTHROW;
144void rxvt_freecommastring (char **cs) NOTHROW; 126void rxvt_freecommastring (char **cs) NOTHROW;
145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
146 127
147///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
148 129
149// temporarily replace the process environment 130// temporarily replace the process environment
150extern char **environ; 131extern char **environ;
151extern char **rxvt_environ; // the original environ pointer 132extern char **rxvt_environ; // the original environ pointer
152 133
153inline void set_environ (stringvec *envv) 134static inline void set_environ (stringvec *envv)
154{ 135{
155#if ENABLE_PERL 136#if ENABLE_PERL
156 assert (envv); 137 assert (envv);
157#else 138#else
158 if (envv) 139 if (envv)
159#endif 140#endif
160 environ = (char **)envv->begin (); 141 environ = (char **)envv->begin ();
161} 142}
162 143
163inline void set_environ (char **envv) 144static inline void set_environ (char **envv)
164{ 145{
165#if ENABLE_PERL 146#if ENABLE_PERL
166 assert (envv); 147 assert (envv);
167#else 148#else
168 if (envv) 149 if (envv)
… …
184# define KEEP_SCROLLCOLOR 1 165# define KEEP_SCROLLCOLOR 1
185#else 166#else
186# undef KEEP_SCROLLCOLOR 167# undef KEEP_SCROLLCOLOR
187#endif 168#endif
188 169
170#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
171# define HAVE_BG_PIXMAP 1/* to simplify further usage */
172struct bgPixmap_t {
173
174 enum {
175 geometrySet = (1UL<<0),
176 propScale = (1UL<<1),
177 geometryFlags = (geometrySet|propScale),
178
179 tintSet = (1UL<<8),
180 tintNeeded = (1UL<<9),
181 tintWholesome = (1UL<<10),
182 tintServerSide = (1UL<<11),
183 tintFlags = (tintSet|tintServerSide|tintNeeded|tintWholesome),
184 blurNeeded = (1UL<<12),
185
186 isTransparent = (1UL<<16),
187 isInvalid = (1UL<<17)
188 };
189
190 unsigned long flags;
191
192 enum {
193 transpPmapTiled = (1UL<<0),
194 transpPmapTinted = tintNeeded,
195 transpPmapBlured = blurNeeded,
196 transpTransformations = (tintNeeded|blurNeeded)
197 }; /* this flags are returned by make_transparency_pixmap if called */
198
189#ifdef XPM_BACKGROUND 199# ifdef XPM_BACKGROUND
190typedef struct { 200# ifdef HAVE_AFTERIMAGE
191 short w, h, x, y; 201 ASImage *original_asim;
202 bool render_asim (ASImage *background, ARGB32 background_tint);
203# endif
204
205 enum { defaultScale = 100, defaultAlign = 50 };
206
207 unsigned int h_scale, v_scale;/* percents of the window size */
208 int h_align, v_align; /* percents of the window size:
209 0 - left align, 50 - center, 100 - right */
210 void unset_geometry () { flags = flags & ~geometryFlags; };
211 bool set_geometry (const char *geom);
212 void set_defaultGeometry ()
213 {
214 h_scale = v_scale = defaultScale;
215 h_align = v_align = defaultAlign;
216 flags |= geometrySet;
217 };
218
219 bool set_file (const char *file);
220# endif /* XPM_BACKGROUND */
221
222 rxvt_term *target;
223 bool set_target (rxvt_term *new_target);
224
225# ifdef ENABLE_TRANSPARENCY
226 int root_depth; /* obtained when target is set */
227 Pixmap root_pixmap; /* current root pixmap set */
228 rxvt_color tint;
229 int shade;
230 int h_blurRadius, v_blurRadius;
231
232 bool set_transparent ();
233 bool set_blur_radius (const char *geom);
234 bool set_tint (rxvt_color &new_tint);
235 bool unset_tint ();
236 bool set_shade (const char *shade_str);
237 bool set_root_pixmap ();
238
239 unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */
240# endif
241 double invalid_since;
242
192 Pixmap pixmap; 243 Pixmap pixmap;
193} bgPixmap_t; 244 unsigned int pmap_width, pmap_height;
245 unsigned int pmap_depth;
246
247 bool window_size_sensitive ();
248 bool need_client_side_rendering ();
249 void apply ();
250 bool render ();
251 void invalidate () {
252 if (!(flags & isInvalid))
253 {
254 flags |= isInvalid;
255 invalid_since = NOW;
256 }
257 };
258};
259#else
260# undef HAVE_BG_PIXMAP
194#endif 261#endif
195 262
196/* 263/*
197 * the 'essential' information for reporting Mouse Events 264 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 265 * pared down from XButtonEvent
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 586 * 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 587 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 588 */
522 589
523enum colour_list { 590enum colour_list {
591 Color_none = -2,
592 Color_transparent = -1,
524 Color_fg = 0, 593 Color_fg = 0,
525 Color_bg, 594 Color_bg,
526 minCOLOR, /* 2 */ 595 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 596 Color_Black = minCOLOR,
528 Color_Red3, 597 Color_Red3,
… …
570#endif 639#endif
571#ifdef KEEP_SCROLLCOLOR 640#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 641 Color_scroll,
573 Color_trough, 642 Color_trough,
574#endif 643#endif
575#if TINTING 644#if ENABLE_TRANSPARENCY
576 Color_tint, 645 Color_tint,
577#endif 646#endif
578#if OFF_FOCUS_FADING 647#if OFF_FOCUS_FADING
579 Color_fade, 648 Color_fade,
580#endif 649#endif
… …
625#define PrivMode_LFNL (1UL<<19) 694#define PrivMode_LFNL (1UL<<19)
626/* too annoying to implement X11 highlight tracking */ 695/* too annoying to implement X11 highlight tracking */
627/* #define PrivMode_MouseX11Track (1LU<<20) */ 696/* #define PrivMode_MouseX11Track (1LU<<20) */
628 697
629#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 698#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 699
636#ifdef ALLOW_132_MODE 700#ifdef ALLOW_132_MODE
637# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 701# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
638#else 702#else
639# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 703# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
681 * MACRO DEFINES 745 * MACRO DEFINES
682 ***************************************************************************** 746 *****************************************************************************
683 */ 747 */
684#define dLocal(type,name) type const name = this->name 748#define dLocal(type,name) type const name = this->name
685 749
686// for speed reasons, we assume that all latin1 characters 750// for speed reasons, we assume that all codepoints 32 to 126 are
687// are single-width (the first unicode combining character 751// single-width.
688// is actually 0x300, but ascii is what matters most). 752#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
690 753
691/* convert pixel dimensions to row/column values. Everything as int32_t */ 754/* convert pixel dimensions to row/column values. Everything as int32_t */
692#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 755#define Pixel2Col(x) Pixel2Width((int32_t)(x))
693#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 756#define Pixel2Row(y) Pixel2Height((int32_t)(y))
694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 757#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
696#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 759#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
697#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 760#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
698#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 761#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
699#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 762#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
700 763
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 764// for m >= -n, ensure remainder lies between 0..n-1
707#define MOD(m,n) (((m) + (n)) % (n)) 765#define MOD(m,n) (((m) + (n)) % (n))
708 766
709#define LINENO(n) MOD (term_start + int(n), total_rows) 767#define LINENO(n) MOD (term_start + int(n), total_rows)
710#define ROW(n) row_buf [LINENO (n)] 768#define ROW(n) row_buf [LINENO (n)]
… …
767#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 825#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
768#define scrollbar_position(y) ((y) - scrollBar.beg) 826#define scrollbar_position(y) ((y) - scrollBar.beg)
769#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 827#define scrollbar_size() (scrollBar.end - scrollBar.beg \
770 - scrollbar_minheight ()) 828 - scrollbar_minheight ())
771 829
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; 830typedef callback<void (const char *)> log_callback;
779typedef callback1<int, int> getfd_callback; 831typedef callback<int (int)> getfd_callback;
780 832
781#define SET_LOCALE(locale) rxvt_set_locale (locale) 833#define SET_LOCALE(locale) rxvt_set_locale (locale)
782extern bool rxvt_set_locale (const char *locale) NOTHROW; 834extern bool rxvt_set_locale (const char *locale) NOTHROW;
783extern void rxvt_push_locale (const char *locale) NOTHROW; 835extern void rxvt_push_locale (const char *locale) NOTHROW;
784extern void rxvt_pop_locale () NOTHROW; 836extern void rxvt_pop_locale () NOTHROW;
… …
786/****************************************************************************/ 838/****************************************************************************/
787 839
788#define LINE_LONGER 0x0001 // line is continued on the next row 840#define LINE_LONGER 0x0001 // line is continued on the next row
789#define LINE_FILTERED 0x0002 // line has been filtered 841#define LINE_FILTERED 0x0002 // line has been filtered
790#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 842#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
843#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
844#define LINE_BIDI 0x0010 // line needs bidi (NYI)
791 845
792struct line_t { 846struct line_t {
793 text_t *t; // terminal the text 847 text_t *t; // terminal the text
794 rend_t *r; // rendition, uses RS_ flags 848 rend_t *r; // rendition, uses RS_ flags
795 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 849 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
906 rxvt_perl_term perl; 960 rxvt_perl_term perl;
907#endif 961#endif
908 struct mbstate mbstate; // current input multibyte state 962 struct mbstate mbstate; // current input multibyte state
909 963
910 unsigned char want_refresh:1, 964 unsigned char want_refresh:1,
911#ifdef TRANSPARENT 965#ifdef ENABLE_TRANSPARENCY
912 want_full_refresh:1, /* awaiting full screen refresh */ 966 want_full_refresh:1, /* awaiting full screen refresh */
913#endif
914#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
915 am_transparent:1, /* is a transparent term */
916 am_pixmap_trans:1, /* transparency w/known root pixmap */
917#endif 967#endif
918 current_screen:1, /* primary or secondary */ 968 current_screen:1, /* primary or secondary */
919 num_scr_allow:1, 969 num_scr_allow:1,
920 bypass_keystate:1, 970 bypass_keystate:1,
921#ifdef CURSOR_BLINK 971#ifdef CURSOR_BLINK
… …
962 /* give proper Scroll behaviour */ 1012 /* give proper Scroll behaviour */
963#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1013#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
964 mouse_slip_wheel_speed, 1014 mouse_slip_wheel_speed,
965#endif 1015#endif
966 refresh_count, 1016 refresh_count,
967 refresh_limit,
968 last_bot, /* scrollbar last bottom position */ 1017 last_bot, /* scrollbar last bottom position */
969 last_top, /* scrollbar last top position */ 1018 last_top, /* scrollbar last top position */
970 last_state, /* scrollbar last state */ 1019 last_state, /* scrollbar last state */
971 scrollbar_len, 1020 scrollbar_len,
972 window_vt_x, 1021 window_vt_x,
… …
1028#endif 1077#endif
1029 struct mouse_event MEvent; 1078 struct mouse_event MEvent;
1030 XComposeStatus compose; 1079 XComposeStatus compose;
1031 ttymode_t tio; 1080 ttymode_t tio;
1032 row_col_t oldcursor; 1081 row_col_t oldcursor;
1033#ifdef XPM_BACKGROUND 1082#ifdef HAVE_BG_PIXMAP
1034 bgPixmap_t bgPixmap; 1083 bgPixmap_t bgPixmap;
1035 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1084#endif
1085#ifdef HAVE_AFTERIMAGE
1086 ASVisual *asv;
1087 ASImageManager *asimman;
1036#endif 1088#endif
1037 1089
1038#if ENABLE_OVERLAY 1090#if ENABLE_OVERLAY
1039 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1091 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1040 text_t **ov_text; 1092 text_t **ov_text;
… …
1098 void vt_select_input () const NOTHROW 1150 void vt_select_input () const NOTHROW
1099 { 1151 {
1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1152 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1101 } 1153 }
1102 1154
1103#if TRANSPARENT 1155#if ENABLE_TRANSPARENCY || ENABLE_PERL
1104 void rootwin_cb (XEvent &xev); 1156 void rootwin_cb (XEvent &xev);
1105 xevent_watcher rootwin_ev; 1157 xevent_watcher rootwin_ev;
1158#endif
1159#ifdef HAVE_BG_PIXMAP
1160 int update_background ();
1161 void update_background_cb (time_watcher &w);
1162 time_watcher update_background_ev;
1106#endif 1163#endif
1107 1164
1108 void x_cb (XEvent &xev); 1165 void x_cb (XEvent &xev);
1109 void flush (); 1166 void flush ();
1110 xevent_watcher termwin_ev; 1167 xevent_watcher termwin_ev;
… …
1170 bool pty_fill (); 1227 bool pty_fill ();
1171 1228
1172 void make_current () const // make this the "currently active" urxvt instance 1229 void make_current () const // make this the "currently active" urxvt instance
1173 { 1230 {
1174 SET_R (this); 1231 SET_R (this);
1232 set_environ (envv);
1175 rxvt_set_locale (locale); 1233 rxvt_set_locale (locale);
1176 set_environ (envv);
1177 } 1234 }
1178 1235
1179 void init_secondary (); 1236 void init_secondary ();
1180 const char **init_resources (int argc, const char *const *argv); 1237 const char **init_resources (int argc, const char *const *argv);
1181 const char *x_resource (const char *name); 1238 const char *x_resource (const char *name);
… …
1206 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1263 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1207 1264
1208 bool IMisRunning (); 1265 bool IMisRunning ();
1209 void IMSendSpot (); 1266 void IMSendSpot ();
1210 bool IM_get_IC (const char *modifiers); 1267 bool IM_get_IC (const char *modifiers);
1211 void IMSetStatusPosition (); 1268 void IMSetPosition ();
1212#endif 1269#endif
1213 1270
1214 void resize_scrollbar (); 1271 void resize_scrollbar ();
1215 1272
1216 // command.C 1273 // command.C
1217 void lookup_key (XKeyEvent &ev); 1274 void key_press (XKeyEvent &ev);
1275 void key_release (XKeyEvent &ev);
1218 unsigned int cmd_write (const char *str, unsigned int count); 1276 unsigned int cmd_write (const char *str, unsigned int count);
1219 1277
1220 wchar_t next_char () NOTHROW; 1278 wchar_t next_char () NOTHROW;
1221 wchar_t cmd_getc () THROW ((class out_of_input)); 1279 wchar_t cmd_getc () THROW ((class out_of_input));
1222 uint32_t next_octet () NOTHROW; 1280 uint32_t next_octet () NOTHROW;
… …
1226 void mouse_report (XButtonEvent &ev); 1284 void mouse_report (XButtonEvent &ev);
1227 void button_press (XButtonEvent &ev); 1285 void button_press (XButtonEvent &ev);
1228 void button_release (XButtonEvent &ev); 1286 void button_release (XButtonEvent &ev);
1229 void focus_in (); 1287 void focus_in ();
1230 void focus_out (); 1288 void focus_out ();
1231 int check_our_parents (); 1289 void update_fade_color (unsigned int idx);
1232#ifdef PRINTPIPE 1290#ifdef PRINTPIPE
1233 FILE *popen_printer (); 1291 FILE *popen_printer ();
1234 int pclose_printer (FILE *stream); 1292 int pclose_printer (FILE *stream);
1235#endif 1293#endif
1236 void process_print_pipe (); 1294 void process_print_pipe ();
… …
1297 { 1355 {
1298 int base = GET_BASEFG (r); 1356 int base = GET_BASEFG (r);
1299#ifndef NO_BRIGHTCOLOR 1357#ifndef NO_BRIGHTCOLOR
1300 if (r & RS_Bold 1358 if (r & RS_Bold
1301# if ENABLE_STYLES 1359# if ENABLE_STYLES
1302 && OPTION (Opt_intensityStyles) 1360 && option (Opt_intensityStyles)
1303# endif 1361# endif
1304 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1362 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1305 base += minBrightCOLOR - minCOLOR; 1363 base += minBrightCOLOR - minCOLOR;
1306#endif 1364#endif
1307 return base; 1365 return base;
… …
1311 { 1369 {
1312 int base = GET_BASEBG (r); 1370 int base = GET_BASEBG (r);
1313#ifndef NO_BRIGHTCOLOR 1371#ifndef NO_BRIGHTCOLOR
1314 if (r & RS_Blink 1372 if (r & RS_Blink
1315# if ENABLE_STYLES 1373# if ENABLE_STYLES
1316 && OPTION (Opt_intensityStyles) 1374 && option (Opt_intensityStyles)
1317# endif 1375# endif
1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1376 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1319 base += minBrightCOLOR - minCOLOR; 1377 base += minBrightCOLOR - minCOLOR;
1320#endif 1378#endif
1321 return base; 1379 return base;
1322 } 1380 }
1323 1381
1324 bool option (uint32_t opt) const NOTHROW 1382 bool option (uint8_t opt) const NOTHROW
1325 { 1383 {
1326 return OPTION (opt); 1384 return options[opt >> 3] & (1 << (opt & 7));
1327 } 1385 }
1328 1386
1329 void set_option (uint32_t opt, bool set) NOTHROW 1387 void set_option (uint8_t opt, bool set = true) NOTHROW
1330 { 1388 {
1331 if (set) 1389 if (set)
1332 options |= opt; 1390 options[opt >> 3] |= (1 << (opt & 7));
1333 else 1391 else
1334 options &= ~opt; 1392 options[opt >> 3] &= ~(1 << (opt & 7));
1393 }
1394
1395 void PrivMode (int set, unsigned bit) NOTHROW
1396 {
1397 if (set)
1398 priv_modes |= bit;
1399 else
1400 priv_modes &= ~bit;
1335 } 1401 }
1336 1402
1337 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1403 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1338 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1404 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1339 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1405 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1445 void get_options (int argc, const char *const *argv); 1511 void get_options (int argc, const char *const *argv);
1446 int parse_keysym (const char *str, const char *arg); 1512 int parse_keysym (const char *str, const char *arg);
1447 void get_xdefaults (FILE *stream, const char *name); 1513 void get_xdefaults (FILE *stream, const char *name);
1448 void extract_resources (); 1514 void extract_resources ();
1449 // xpm.C 1515 // xpm.C
1450 int scale_pixmap (const char *geom); 1516 void get_window_origin (int &x, int &y);
1451 void resize_pixmap (); 1517 Pixmap get_pixmap_property (int prop_id);
1452 Pixmap set_bgPixmap (const char *file);
1453}; 1518};
1454 1519
1455/*
1456 *****************************************************************************
1457 * PROTOTYPES
1458 *****************************************************************************
1459 */
1460#ifdef PROTOTYPES
1461# define __PROTO(p) p
1462#else
1463# define __PROTO(p) ()
1464#endif
1465
1466#endif /* _RXVT_H_ */ 1520#endif /* _RXVT_H_ */
1467 1521

Diff Legend

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