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

Diff Legend

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