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

Diff Legend

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