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.248 by root, Mon Jan 30 16:12:58 2006 UTC vs.
Revision 1.281 by ayin, Thu Aug 2 15:01:30 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;
… …
187#endif 173#endif
188 174
189#ifdef XPM_BACKGROUND 175#ifdef XPM_BACKGROUND
190typedef struct { 176typedef struct {
191 short w, h, x, y; 177 short w, h, x, y;
178 bool auto_resize ;
192 Pixmap pixmap; 179 Pixmap pixmap;
193} bgPixmap_t; 180} bgPixmap_t;
194#endif 181#endif
195 182
196/* 183/*
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 506 * 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 507 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 508 */
522 509
523enum colour_list { 510enum colour_list {
511 Color_none = -2,
512 Color_transparent = -1,
524 Color_fg = 0, 513 Color_fg = 0,
525 Color_bg, 514 Color_bg,
526 minCOLOR, /* 2 */ 515 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 516 Color_Black = minCOLOR,
528 Color_Red3, 517 Color_Red3,
… …
587 TOTAL_COLORS = NRS_COLORS 576 TOTAL_COLORS = NRS_COLORS
588#endif 577#endif
589}; 578};
590 579
591#define Color_Bits 7 // 0 .. maxTermCOLOR 580#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 581
596/* 582/*
597 * Resource list 583 * Resource list
598 */ 584 */
599enum { 585enum {
… …
684 * MACRO DEFINES 670 * MACRO DEFINES
685 ***************************************************************************** 671 *****************************************************************************
686 */ 672 */
687#define dLocal(type,name) type const name = this->name 673#define dLocal(type,name) type const name = this->name
688 674
689// for speed reasons, we assume that all latin1 characters 675// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 676// single-width.
691// is actually 0x300, but ascii is what matters most). 677#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 678
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 679/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 680#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 681#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 682#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 684#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 685#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 686#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 687#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 688
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
708
709// for m >= -n, ensure remainder lies between 0..n-1 689// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 690#define MOD(m,n) (((m) + (n)) % (n))
711 691
712#define LINENO(n) MOD (term_start + int(n), total_rows) 692#define LINENO(n) MOD (term_start + int(n), total_rows)
713#define ROW(n) row_buf [LINENO (n)] 693#define ROW(n) row_buf [LINENO (n)]
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 711#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 712#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 713
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 714#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 715
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 716#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 717#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 718
739#if ENABLE_STYLES 719#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 720# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 721#else
742# define FONTSET(style) fontset[0] 722# define FONTSET(style) fontset[0]
… …
770#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 750#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
771#define scrollbar_position(y) ((y) - scrollBar.beg) 751#define scrollbar_position(y) ((y) - scrollBar.beg)
772#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 752#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773 - scrollbar_minheight ()) 753 - scrollbar_minheight ())
774 754
775#ifdef XPM_BACKGROUND
776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
777#else
778# define XPMClearArea(a, b, c, d, e, f, g)
779#endif
780
781typedef callback1<void, const char *> log_callback; 755typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 756typedef callback<int (int)> getfd_callback;
783 757
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 758#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 759extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 760extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 761extern void rxvt_pop_locale () NOTHROW;
… …
789/****************************************************************************/ 763/****************************************************************************/
790 764
791#define LINE_LONGER 0x0001 // line is continued on the next row 765#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 766#define LINE_FILTERED 0x0002 // line has been filtered
793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 767#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
768#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
769#define LINE_BIDI 0x0010 // line needs bidi (NYI)
794 770
795struct line_t { 771struct line_t {
796 text_t *t; // terminal the text 772 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 773 rend_t *r; // rendition, uses RS_ flags
798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 774 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
852# define COMPOSE_LO 0x40000000UL 828# define COMPOSE_LO 0x40000000UL
853# define COMPOSE_HI 0x400fffffUL 829# define COMPOSE_HI 0x400fffffUL
854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 830# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
855#else 831#else
856# if ENABLE_PERL 832# if ENABLE_PERL
857# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 833# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
858# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 834# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
859# else 835# else
860# define COMPOSE_LO 0xd800UL 836# define COMPOSE_LO 0xd800UL
861# define COMPOSE_HI 0xf8ffUL 837# define COMPOSE_HI 0xf8ffUL
862# endif 838# endif
… …
891#endif 867#endif
892 868
893/****************************************************************************/ 869/****************************************************************************/
894 870
895#ifdef KEYSYM_RESOURCE 871#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 872class keyboard_manager;
897#endif 873#endif
898 874
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 875struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
876
877 // special markers with magic addresses
878 static const char resval_undef []; // options specifically unset
879 static const char resval_on []; // boolean options switched on
880 static const char resval_off []; // or off
881
900 log_callback *log_hook; // log error messages through this hook, if != 0 882 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 883 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 884#if ENABLE_PERL
903 rxvt_perl_term perl; 885 rxvt_perl_term perl;
904#endif 886#endif
905 struct mbstate mbstate; // current input multibyte state 887 struct mbstate mbstate; // current input multibyte state
906 888
907 unsigned char want_refresh:1, 889 unsigned char want_refresh:1,
908#ifdef TRANSPARENT 890#ifdef ENABLE_TRANSPARENCY
909 want_full_refresh:1, /* awaiting full screen refresh */ 891 want_full_refresh:1, /* awaiting full screen refresh */
910#endif
911#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
912 am_transparent:1, /* is a transparent term */ 892 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */ 893 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif 894#endif
915 current_screen:1, /* primary or secondary */ 895 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 896 num_scr_allow:1,
… …
945 int prev_ncol, /* screen: previous number of columns */ 925 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 926 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 927/* ---------- */
948 rend_t rstyle; 928 rend_t rstyle;
949/* ---------- */ 929/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */
952#ifdef SELECTION_SCROLLING 930#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 931 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 932 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 933 int selection_save_x,
956 selection_save_y, 934 selection_save_y,
… …
961 /* give proper Scroll behaviour */ 939 /* give proper Scroll behaviour */
962#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 940#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
963 mouse_slip_wheel_speed, 941 mouse_slip_wheel_speed,
964#endif 942#endif
965 refresh_count, 943 refresh_count,
966 refresh_limit,
967 last_bot, /* scrollbar last bottom position */ 944 last_bot, /* scrollbar last bottom position */
968 last_top, /* scrollbar last top position */ 945 last_top, /* scrollbar last top position */
969 last_state, /* scrollbar last state */ 946 last_state, /* scrollbar last state */
970 scrollbar_len, 947 scrollbar_len,
971 window_vt_x, 948 window_vt_x,
… …
1029 XComposeStatus compose; 1006 XComposeStatus compose;
1030 ttymode_t tio; 1007 ttymode_t tio;
1031 row_col_t oldcursor; 1008 row_col_t oldcursor;
1032#ifdef XPM_BACKGROUND 1009#ifdef XPM_BACKGROUND
1033 bgPixmap_t bgPixmap; 1010 bgPixmap_t bgPixmap;
1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1011 struct ASVisual *asv;
1012 ASImageManager *asimman;
1013 ASImage *original_asim;
1014 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1035#endif 1015#endif
1036 1016
1037#if ENABLE_OVERLAY 1017#if ENABLE_OVERLAY
1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1018 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1039 text_t **ov_text; 1019 text_t **ov_text;
… …
1094 1074
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1075 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1076
1097 void vt_select_input () const NOTHROW 1077 void vt_select_input () const NOTHROW
1098 { 1078 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1079 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1080 }
1101 1081
1102#if TRANSPARENT 1082#if ENABLE_TRANSPARENCY || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1083 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1084 xevent_watcher rootwin_ev;
1085#endif
1086#if ENABLE_TRANSPARENCY
1087 int check_our_parents ();
1088 void check_our_parents_cb (time_watcher &w);
1089 time_watcher check_our_parents_ev;
1105#endif 1090#endif
1106 1091
1107 void x_cb (XEvent &xev); 1092 void x_cb (XEvent &xev);
1108 void flush (); 1093 void flush ();
1109 xevent_watcher termwin_ev; 1094 xevent_watcher termwin_ev;
… …
1169 bool pty_fill (); 1154 bool pty_fill ();
1170 1155
1171 void make_current () const // make this the "currently active" urxvt instance 1156 void make_current () const // make this the "currently active" urxvt instance
1172 { 1157 {
1173 SET_R (this); 1158 SET_R (this);
1159 set_environ (envv);
1174 rxvt_set_locale (locale); 1160 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1161 }
1177 1162
1178 void init_secondary (); 1163 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1164 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name); 1165 const char *x_resource (const char *name);
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1190 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1191
1207 bool IMisRunning (); 1192 bool IMisRunning ();
1208 void IMSendSpot (); 1193 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1194 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1195 void IMSetPosition ();
1211#endif 1196#endif
1212 1197
1213 void resize_scrollbar (); 1198 void resize_scrollbar ();
1214 1199
1215 // command.C 1200 // command.C
1216 void lookup_key (XKeyEvent &ev); 1201 void key_press (XKeyEvent &ev);
1202 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1203 unsigned int cmd_write (const char *str, unsigned int count);
1218 1204
1219 wchar_t next_char () NOTHROW; 1205 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1206 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1207 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1211 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1212 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1213 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1214 void focus_in ();
1229 void focus_out (); 1215 void focus_out ();
1230 int check_our_parents (); 1216 void update_fade_color (unsigned int idx);
1231#ifdef PRINTPIPE 1217#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1218 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1219 int pclose_printer (FILE *stream);
1234#endif 1220#endif
1235 void process_print_pipe (); 1221 void process_print_pipe ();
… …
1256 void set_utf8_property (Atom prop, const char *str, int len = -1); 1242 void set_utf8_property (Atom prop, const char *str, int len = -1);
1257 void set_title (const char *str); 1243 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1244 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1245 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1246 void set_colorfgbg ();
1261 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1247 bool set_color (rxvt_color &color, const char *name);
1248 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1249 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1263 1250
1264 // screen.C 1251 // screen.C
1265 1252
1266 void lalloc (line_t &l) const 1253 void lalloc (line_t &l) const
… …
1295 { 1282 {
1296 int base = GET_BASEFG (r); 1283 int base = GET_BASEFG (r);
1297#ifndef NO_BRIGHTCOLOR 1284#ifndef NO_BRIGHTCOLOR
1298 if (r & RS_Bold 1285 if (r & RS_Bold
1299# if ENABLE_STYLES 1286# if ENABLE_STYLES
1300 && OPTION (Opt_intensityStyles) 1287 && option (Opt_intensityStyles)
1301# endif 1288# endif
1302 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1289 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1303 base += minBrightCOLOR - minCOLOR; 1290 base += minBrightCOLOR - minCOLOR;
1304#endif 1291#endif
1305 return base; 1292 return base;
… …
1309 { 1296 {
1310 int base = GET_BASEBG (r); 1297 int base = GET_BASEBG (r);
1311#ifndef NO_BRIGHTCOLOR 1298#ifndef NO_BRIGHTCOLOR
1312 if (r & RS_Blink 1299 if (r & RS_Blink
1313# if ENABLE_STYLES 1300# if ENABLE_STYLES
1314 && OPTION (Opt_intensityStyles) 1301 && option (Opt_intensityStyles)
1315# endif 1302# endif
1316 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1303 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1317 base += minBrightCOLOR - minCOLOR; 1304 base += minBrightCOLOR - minCOLOR;
1318#endif 1305#endif
1319 return base; 1306 return base;
1320 } 1307 }
1321 1308
1322 bool option (uint32_t opt) const NOTHROW 1309 bool option (uint8_t opt) const NOTHROW
1323 { 1310 {
1324 return OPTION (opt); 1311 return options[opt >> 3] & (1 << (opt & 7));
1325 } 1312 }
1326 1313
1327 void set_option (uint32_t opt, bool set) NOTHROW 1314 void set_option (uint8_t opt, bool set = true) NOTHROW
1328 { 1315 {
1329 if (set) 1316 if (set)
1330 options |= opt; 1317 options[opt >> 3] |= (1 << (opt & 7));
1331 else 1318 else
1332 options &= ~opt; 1319 options[opt >> 3] &= ~(1 << (opt & 7));
1333 } 1320 }
1334 1321
1335 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1322 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1336 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1323 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1337 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1324 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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