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.292 by sasha, Mon Aug 13 22:41:34 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
… …
123// misc.C 111// misc.C
124char * rxvt_wcstombs (const wchar_t *str, int len = -1); 112char * rxvt_wcstombs (const wchar_t *str, int len = -1);
125wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 113wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
126char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 114char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
127wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 115wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
128char * rxvt_strdup_cpp (const char *str);
129 116
130#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 117#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
131 118
132char * rxvt_r_basename (const char *str) NOTHROW; 119char * rxvt_r_basename (const char *str) NOTHROW;
133void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 120void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
140const char * rxvt_Str_skip_space (const char *str) NOTHROW; 127const char * rxvt_Str_skip_space (const char *str) NOTHROW;
141char * rxvt_Str_trim (char *str) NOTHROW; 128char * rxvt_Str_trim (char *str) NOTHROW;
142int rxvt_Str_escaped (char *str) NOTHROW; 129int rxvt_Str_escaped (char *str) NOTHROW;
143char ** rxvt_splitcommastring (const char *cs) NOTHROW; 130char ** rxvt_splitcommastring (const char *cs) NOTHROW;
144void rxvt_freecommastring (char **cs) NOTHROW; 131void rxvt_freecommastring (char **cs) NOTHROW;
145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
146 132
147///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
148 134
149// temporarily replace the process environment 135// temporarily replace the process environment
150extern char **environ; 136extern char **environ;
… …
184# define KEEP_SCROLLCOLOR 1 170# define KEEP_SCROLLCOLOR 1
185#else 171#else
186# undef KEEP_SCROLLCOLOR 172# undef KEEP_SCROLLCOLOR
187#endif 173#endif
188 174
175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
176# define HAVE_BG_PIXMAP 1/* to simplify further usage */
177struct bgPixmap_t {
178
179 enum {
180 geometrySet = (1UL<<0),
181 propScale = (1UL<<1),
182 geometryFlags = (geometrySet|propScale),
183
184 tintSet = (1UL<<8),
185 tintNeeded = (1UL<<9),
186 tintServerSide = (1UL<<10),
187 tintFlags = (tintSet|tintServerSide|tintNeeded),
188 blurNeeded = (1UL<<11),
189
190 isTransparent = (1UL<<16),
191 isInvalid = (1UL<<17)
192 };
193
194 unsigned long flags;
195
189#ifdef XPM_BACKGROUND 196# ifdef XPM_BACKGROUND
190typedef struct { 197# ifdef HAVE_AFTERIMAGE
191 short w, h, x, y; 198 ASImage *original_asim;
199 bool render_asim (ASImage *background, ARGB32 background_tint);
200# endif
201
202 enum { defaultScale = 100, defaultAlign = 50 };
203
204 unsigned int h_scale, v_scale;/* percents of the window size */
205 int h_align, v_align; /* percents of the window size:
206 0 - left align, 50 - center, 100 - right */
207 void unset_geometry () { flags = flags & ~geometryFlags; };
208 bool set_geometry (const char *geom);
209 void set_defaultGeometry ()
210 {
211 h_scale = v_scale = defaultScale;
212 h_align = v_align = defaultAlign;
213 flags |= geometrySet;
214 };
215
216 bool set_file (const char *file);
217# endif /* XPM_BACKGROUND */
218
219 rxvt_term *target;
220 bool set_target (rxvt_term *new_target);
221
222# ifdef ENABLE_TRANSPARENCY
223 int root_depth; /* obtained when target is set */
224 Pixmap root_pixmap; /* current root pixmap set */
225 rxvt_color tint;
226 int shade;
227 int h_blurRadius, v_blurRadius;
228
229 bool set_transparent ();
230 bool set_blur_radius (const char *geom);
231 bool set_tint (rxvt_color &new_tint);
232 bool unset_tint ();
233 bool set_shade (const char *shade_str);
234 bool set_root_pixmap ();
235
236 enum {
237 transpPmapTiled = (1UL<<0),
238 transpPmapTinted = tintNeeded,
239 transpPmapBlured = blurNeeded,
240 transpTransformations = (tintNeeded|blurNeeded)
241 };
242 unsigned long make_transparency_pixmap ();/* returns combination of the above flags */
243# endif
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 void apply ();
251 bool render ();
252 void invalidate () { flags |= isInvalid; };
253};
254#else
255# undef HAVE_BG_PIXMAP
194#endif 256#endif
195 257
196/* 258/*
197 * the 'essential' information for reporting Mouse Events 259 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 260 * pared down from XButtonEvent
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 581 * 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 582 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 583 */
522 584
523enum colour_list { 585enum colour_list {
586 Color_none = -2,
587 Color_transparent = -1,
524 Color_fg = 0, 588 Color_fg = 0,
525 Color_bg, 589 Color_bg,
526 minCOLOR, /* 2 */ 590 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 591 Color_Black = minCOLOR,
528 Color_Red3, 592 Color_Red3,
… …
570#endif 634#endif
571#ifdef KEEP_SCROLLCOLOR 635#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 636 Color_scroll,
573 Color_trough, 637 Color_trough,
574#endif 638#endif
575#if TINTING 639#if ENABLE_TRANSPARENCY
576 Color_tint, 640 Color_tint,
577#endif 641#endif
578#if OFF_FOCUS_FADING 642#if OFF_FOCUS_FADING
579 Color_fade, 643 Color_fade,
580#endif 644#endif
… …
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
… …
888#endif 942#endif
889 943
890/****************************************************************************/ 944/****************************************************************************/
891 945
892#ifdef KEYSYM_RESOURCE 946#ifdef KEYSYM_RESOURCE
893 class keyboard_manager; 947class keyboard_manager;
894#endif 948#endif
895 949
896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 950struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
951
952 // special markers with magic addresses
953 static const char resval_undef []; // options specifically unset
954 static const char resval_on []; // boolean options switched on
955 static const char resval_off []; // or off
956
897 log_callback *log_hook; // log error messages through this hook, if != 0 957 log_callback *log_hook; // log error messages through this hook, if != 0
898 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 958 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
899#if ENABLE_PERL 959#if ENABLE_PERL
900 rxvt_perl_term perl; 960 rxvt_perl_term perl;
901#endif 961#endif
902 struct mbstate mbstate; // current input multibyte state 962 struct mbstate mbstate; // current input multibyte state
903 963
904 unsigned char want_refresh:1, 964 unsigned char want_refresh:1,
905#ifdef TRANSPARENT 965#ifdef ENABLE_TRANSPARENCY
906 want_full_refresh:1, /* awaiting full screen refresh */ 966 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 */ 967 am_transparent:1, /* is a transparent term */
910 am_pixmap_trans:1, /* transparency w/known root pixmap */ 968 am_pixmap_trans:1, /* transparency w/known root pixmap */
911#endif 969#endif
912 current_screen:1, /* primary or secondary */ 970 current_screen:1, /* primary or secondary */
913 num_scr_allow:1, 971 num_scr_allow:1,
… …
956 /* give proper Scroll behaviour */ 1014 /* give proper Scroll behaviour */
957#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1015#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
958 mouse_slip_wheel_speed, 1016 mouse_slip_wheel_speed,
959#endif 1017#endif
960 refresh_count, 1018 refresh_count,
961 refresh_limit,
962 last_bot, /* scrollbar last bottom position */ 1019 last_bot, /* scrollbar last bottom position */
963 last_top, /* scrollbar last top position */ 1020 last_top, /* scrollbar last top position */
964 last_state, /* scrollbar last state */ 1021 last_state, /* scrollbar last state */
965 scrollbar_len, 1022 scrollbar_len,
966 window_vt_x, 1023 window_vt_x,
… …
1022#endif 1079#endif
1023 struct mouse_event MEvent; 1080 struct mouse_event MEvent;
1024 XComposeStatus compose; 1081 XComposeStatus compose;
1025 ttymode_t tio; 1082 ttymode_t tio;
1026 row_col_t oldcursor; 1083 row_col_t oldcursor;
1027#ifdef XPM_BACKGROUND 1084#ifdef HAVE_BG_PIXMAP
1028 bgPixmap_t bgPixmap; 1085 bgPixmap_t bgPixmap;
1029 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1086#endif
1087#ifdef HAVE_AFTERIMAGE
1088 ASVisual *asv;
1089 ASImageManager *asimman;
1030#endif 1090#endif
1031 1091
1032#if ENABLE_OVERLAY 1092#if ENABLE_OVERLAY
1033 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1093 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1034 text_t **ov_text; 1094 text_t **ov_text;
… …
1089 1149
1090 long vt_emask, vt_emask_perl, vt_emask_xim; 1150 long vt_emask, vt_emask_perl, vt_emask_xim;
1091 1151
1092 void vt_select_input () const NOTHROW 1152 void vt_select_input () const NOTHROW
1093 { 1153 {
1094 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1154 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1095 } 1155 }
1096 1156
1097#if TRANSPARENT 1157#if ENABLE_TRANSPARENCY || ENABLE_PERL
1098 void rootwin_cb (XEvent &xev); 1158 void rootwin_cb (XEvent &xev);
1099 xevent_watcher rootwin_ev; 1159 xevent_watcher rootwin_ev;
1160#endif
1161#if ENABLE_TRANSPARENCY
1162 int check_our_parents ();
1163 void check_our_parents_cb (time_watcher &w);
1164 time_watcher check_our_parents_ev;
1100#endif 1165#endif
1101 1166
1102 void x_cb (XEvent &xev); 1167 void x_cb (XEvent &xev);
1103 void flush (); 1168 void flush ();
1104 xevent_watcher termwin_ev; 1169 xevent_watcher termwin_ev;
… …
1164 bool pty_fill (); 1229 bool pty_fill ();
1165 1230
1166 void make_current () const // make this the "currently active" urxvt instance 1231 void make_current () const // make this the "currently active" urxvt instance
1167 { 1232 {
1168 SET_R (this); 1233 SET_R (this);
1234 set_environ (envv);
1169 rxvt_set_locale (locale); 1235 rxvt_set_locale (locale);
1170 set_environ (envv);
1171 } 1236 }
1172 1237
1173 void init_secondary (); 1238 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv); 1239 const char **init_resources (int argc, const char *const *argv);
1175 const char *x_resource (const char *name); 1240 const char *x_resource (const char *name);
… …
1200 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);
1201 1266
1202 bool IMisRunning (); 1267 bool IMisRunning ();
1203 void IMSendSpot (); 1268 void IMSendSpot ();
1204 bool IM_get_IC (const char *modifiers); 1269 bool IM_get_IC (const char *modifiers);
1205 void IMSetStatusPosition (); 1270 void IMSetPosition ();
1206#endif 1271#endif
1207 1272
1208 void resize_scrollbar (); 1273 void resize_scrollbar ();
1209 1274
1210 // command.C 1275 // command.C
1211 void lookup_key (XKeyEvent &ev); 1276 void key_press (XKeyEvent &ev);
1277 void key_release (XKeyEvent &ev);
1212 unsigned int cmd_write (const char *str, unsigned int count); 1278 unsigned int cmd_write (const char *str, unsigned int count);
1213 1279
1214 wchar_t next_char () NOTHROW; 1280 wchar_t next_char () NOTHROW;
1215 wchar_t cmd_getc () THROW ((class out_of_input)); 1281 wchar_t cmd_getc () THROW ((class out_of_input));
1216 uint32_t next_octet () NOTHROW; 1282 uint32_t next_octet () NOTHROW;
… …
1220 void mouse_report (XButtonEvent &ev); 1286 void mouse_report (XButtonEvent &ev);
1221 void button_press (XButtonEvent &ev); 1287 void button_press (XButtonEvent &ev);
1222 void button_release (XButtonEvent &ev); 1288 void button_release (XButtonEvent &ev);
1223 void focus_in (); 1289 void focus_in ();
1224 void focus_out (); 1290 void focus_out ();
1225 int check_our_parents (); 1291 void update_fade_color (unsigned int idx);
1226#ifdef PRINTPIPE 1292#ifdef PRINTPIPE
1227 FILE *popen_printer (); 1293 FILE *popen_printer ();
1228 int pclose_printer (FILE *stream); 1294 int pclose_printer (FILE *stream);
1229#endif 1295#endif
1230 void process_print_pipe (); 1296 void process_print_pipe ();
… …
1252 void set_title (const char *str); 1318 void set_title (const char *str);
1253 void set_icon_name (const char *str); 1319 void set_icon_name (const char *str);
1254 void set_window_color (int idx, const char *color); 1320 void set_window_color (int idx, const char *color);
1255 void set_colorfgbg (); 1321 void set_colorfgbg ();
1256 bool set_color (rxvt_color &color, const char *name); 1322 bool set_color (rxvt_color &color, const char *name);
1323 void alias_color (int dst, int src);
1257 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1324 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1258 1325
1259 // screen.C 1326 // screen.C
1260 1327
1261 void lalloc (line_t &l) const 1328 void lalloc (line_t &l) const
… …
1290 { 1357 {
1291 int base = GET_BASEFG (r); 1358 int base = GET_BASEFG (r);
1292#ifndef NO_BRIGHTCOLOR 1359#ifndef NO_BRIGHTCOLOR
1293 if (r & RS_Bold 1360 if (r & RS_Bold
1294# if ENABLE_STYLES 1361# if ENABLE_STYLES
1295 && OPTION (Opt_intensityStyles) 1362 && option (Opt_intensityStyles)
1296# endif 1363# endif
1297 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1364 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1298 base += minBrightCOLOR - minCOLOR; 1365 base += minBrightCOLOR - minCOLOR;
1299#endif 1366#endif
1300 return base; 1367 return base;
… …
1304 { 1371 {
1305 int base = GET_BASEBG (r); 1372 int base = GET_BASEBG (r);
1306#ifndef NO_BRIGHTCOLOR 1373#ifndef NO_BRIGHTCOLOR
1307 if (r & RS_Blink 1374 if (r & RS_Blink
1308# if ENABLE_STYLES 1375# if ENABLE_STYLES
1309 && OPTION (Opt_intensityStyles) 1376 && option (Opt_intensityStyles)
1310# endif 1377# endif
1311 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1378 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1312 base += minBrightCOLOR - minCOLOR; 1379 base += minBrightCOLOR - minCOLOR;
1313#endif 1380#endif
1314 return base; 1381 return base;
1315 } 1382 }
1316 1383
1317 bool option (uint32_t opt) const NOTHROW 1384 bool option (uint8_t opt) const NOTHROW
1318 { 1385 {
1319 return OPTION (opt); 1386 return options[opt >> 3] & (1 << (opt & 7));
1320 } 1387 }
1321 1388
1322 void set_option (uint32_t opt, bool set) NOTHROW 1389 void set_option (uint8_t opt, bool set = true) NOTHROW
1323 { 1390 {
1324 if (set) 1391 if (set)
1325 options |= opt; 1392 options[opt >> 3] |= (1 << (opt & 7));
1326 else 1393 else
1327 options &= ~opt; 1394 options[opt >> 3] &= ~(1 << (opt & 7));
1328 } 1395 }
1329 1396
1330 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1397 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; 1398 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; 1399 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1438 void get_options (int argc, const char *const *argv); 1505 void get_options (int argc, const char *const *argv);
1439 int parse_keysym (const char *str, const char *arg); 1506 int parse_keysym (const char *str, const char *arg);
1440 void get_xdefaults (FILE *stream, const char *name); 1507 void get_xdefaults (FILE *stream, const char *name);
1441 void extract_resources (); 1508 void extract_resources ();
1442 // xpm.C 1509 // xpm.C
1443 int scale_pixmap (const char *geom); 1510 void get_window_origin (int &x, int &y);
1444 void resize_pixmap (); 1511 Pixmap get_pixmap_property (int prop_id);
1445 Pixmap set_bgPixmap (const char *file);
1446}; 1512};
1447 1513
1448/* 1514/*
1449 ***************************************************************************** 1515 *****************************************************************************
1450 * PROTOTYPES 1516 * PROTOTYPES

Diff Legend

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