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.245 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.270 by sasha, Fri Jun 8 20:04:12 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>
… …
32#if ENABLE_FRILLS 33#if ENABLE_FRILLS
33# include <X11/Xmd.h> 34# include <X11/Xmd.h>
34#endif 35#endif
35 36
36#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
37#include "rxvtfont.h" 39#include "rxvtfont.h"
38#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
39#include "iom.h" 41#include "iom.h"
40#include "salloc.h" 42#include "salloc.h"
41#include "libptytty.h" 43#include "libptytty.h"
… …
68 70
69#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
70typedef char *XPointer; 72typedef char *XPointer;
71#endif 73#endif
72 74
73#ifdef HAVE_TERMIOS_H
74# include <termios.h> 75#include <termios.h>
75typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
76#else
77# include <sgtty.h>
78typedef struct {
79 struct sgttyb sg;
80 struct tchars tc;
81 struct ltchars lc;
82 int line;
83 int local;
84} ttymode_t;
85#endif
86 77
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
87#ifdef XPM_BACKGROUND 82#elif defined(XPM_BACKGROUND)
88# ifdef XPM_INC_X11 83# ifdef XPM_INC_X11
89# include <X11/xpm.h> 84# include <X11/xpm.h>
90# else 85# else
91# include <xpm.h> 86# include <xpm.h>
92# endif 87# endif
… …
97# define STDOUT_FILENO 1 92# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 93# define STDERR_FILENO 2
99#endif 94#endif
100 95
101/****************************************************************************/ 96/****************************************************************************/
102
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123 97
124// exception thrown on fatal (per-instance) errors 98// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 99class rxvt_failure_exception { };
126 100
127// exception thrown when the command parser runs out of input data 101// exception thrown when the command parser runs out of input data
… …
207#endif 181#endif
208 182
209#ifdef XPM_BACKGROUND 183#ifdef XPM_BACKGROUND
210typedef struct { 184typedef struct {
211 short w, h, x, y; 185 short w, h, x, y;
186 bool auto_resize ;
212 Pixmap pixmap; 187 Pixmap pixmap;
213} bgPixmap_t; 188} bgPixmap_t;
214#endif 189#endif
215 190
216/* 191/*
… …
432// fake styles 407// fake styles
433#define RS_Blink 0x00010000UL // blink 408#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 409#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 410#define RS_Uline 0x00040000UL // underline
436 411
412// toggle this to force redraw, must be != RS_Careful
413#define RS_redraw 0x01000000UL
414
437// 5 custom bits for extensions 415// 5 custom bits for extensions
438#define RS_customCount 32 416#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 417#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 418#define RS_customShift 19
441 419
… …
510 Rxvt_restoreFG = 39, // change default fg color 488 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 489 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 490 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 491
514 URxvt_locale = 701, // change locale 492 URxvt_locale = 701, // change locale
493 URxvt_version = 702, // request version
515 494
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 495 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 496 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 497 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 498 URxvt_Color_UL = 707,
… …
535 * on the unnecessary items, e.g. Color_pointer, but won't bother 514 * on the unnecessary items, e.g. Color_pointer, but won't bother
536 * until we need to. Also, be aware of usage in pixcolor_set 515 * until we need to. Also, be aware of usage in pixcolor_set
537 */ 516 */
538 517
539enum colour_list { 518enum colour_list {
519 Color_none = -2,
520 Color_transparent = -1,
540 Color_fg = 0, 521 Color_fg = 0,
541 Color_bg, 522 Color_bg,
542 minCOLOR, /* 2 */ 523 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 524 Color_Black = minCOLOR,
544 Color_Red3, 525 Color_Red3,
… …
603 TOTAL_COLORS = NRS_COLORS 584 TOTAL_COLORS = NRS_COLORS
604#endif 585#endif
605}; 586};
606 587
607#define Color_Bits 7 // 0 .. maxTermCOLOR 588#define Color_Bits 7 // 0 .. maxTermCOLOR
608
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611 589
612/* 590/*
613 * Resource list 591 * Resource list
614 */ 592 */
615enum { 593enum {
… …
700 * MACRO DEFINES 678 * MACRO DEFINES
701 ***************************************************************************** 679 *****************************************************************************
702 */ 680 */
703#define dLocal(type,name) type const name = this->name 681#define dLocal(type,name) type const name = this->name
704 682
705// for speed reasons, we assume that all latin1 characters 683// for speed reasons, we assume that all codepoints 32 to 126 are
706// are single-width (the first unicode combining character 684// single-width.
707// is actually 0x300, but ascii is what matters most). 685#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
708#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
709 686
710/* convert pixel dimensions to row/column values. Everything as int32_t */ 687/* convert pixel dimensions to row/column values. Everything as int32_t */
711#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 688#define Pixel2Col(x) Pixel2Width((int32_t)(x))
712#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 689#define Pixel2Row(y) Pixel2Height((int32_t)(y))
713#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 690#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
715#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 692#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
716#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 693#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
717#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 694#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
718#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 695#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
719 696
720#define OPTION(opt) (options & (opt))
721#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
722 | Opt_jumpScroll | Opt_secondaryScreen \
723 | Opt_pastableTabs | Opt_intensityStyles)
724
725// for m >= -n, ensure remainder lies between 0..n-1 697// for m >= -n, ensure remainder lies between 0..n-1
726#define MOD(m,n) (((m) + (n)) % (n)) 698#define MOD(m,n) (((m) + (n)) % (n))
727 699
728#define LINENO(n) MOD (term_start + int(n), total_rows) 700#define LINENO(n) MOD (term_start + int(n), total_rows)
729#define ROW(n) row_buf [LINENO (n)] 701#define ROW(n) row_buf [LINENO (n)]
… …
747#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 719#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
748#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 720#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
749 721
750#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 722#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
751 723
752#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 724#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
753#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 725#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
754 726
755#if ENABLE_STYLES 727#if ENABLE_STYLES
756# define FONTSET(style) fontset[GET_STYLE (style)] 728# define FONTSET(style) fontset[GET_STYLE (style)]
757#else 729#else
758# define FONTSET(style) fontset[0] 730# define FONTSET(style) fontset[0]
… …
792# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 764# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
793#else 765#else
794# define XPMClearArea(a, b, c, d, e, f, g) 766# define XPMClearArea(a, b, c, d, e, f, g)
795#endif 767#endif
796 768
797typedef callback1<void, const char *> log_callback; 769typedef callback<void (const char *)> log_callback;
798typedef callback1<int, int> getfd_callback; 770typedef callback<int (int)> getfd_callback;
799 771
800#define SET_LOCALE(locale) rxvt_set_locale (locale) 772#define SET_LOCALE(locale) rxvt_set_locale (locale)
801extern bool rxvt_set_locale (const char *locale) NOTHROW; 773extern bool rxvt_set_locale (const char *locale) NOTHROW;
802extern void rxvt_push_locale (const char *locale) NOTHROW; 774extern void rxvt_push_locale (const char *locale) NOTHROW;
803extern void rxvt_pop_locale () NOTHROW; 775extern void rxvt_pop_locale () NOTHROW;
… …
805/****************************************************************************/ 777/****************************************************************************/
806 778
807#define LINE_LONGER 0x0001 // line is continued on the next row 779#define LINE_LONGER 0x0001 // line is continued on the next row
808#define LINE_FILTERED 0x0002 // line has been filtered 780#define LINE_FILTERED 0x0002 // line has been filtered
809#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 781#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
782#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
783#define LINE_BIDI 0x0010 // line needs bidi (NYI)
810 784
811struct line_t { 785struct line_t {
812 text_t *t; // terminal the text 786 text_t *t; // terminal the text
813 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
814 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 788 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
868# define COMPOSE_LO 0x40000000UL 842# define COMPOSE_LO 0x40000000UL
869# define COMPOSE_HI 0x400fffffUL 843# define COMPOSE_HI 0x400fffffUL
870# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 844# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
871#else 845#else
872# if ENABLE_PERL 846# if ENABLE_PERL
873# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 847# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
874# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 848# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
875# else 849# else
876# define COMPOSE_LO 0xd800UL 850# define COMPOSE_LO 0xd800UL
877# define COMPOSE_HI 0xf8ffUL 851# define COMPOSE_HI 0xf8ffUL
878# endif 852# endif
… …
907#endif 881#endif
908 882
909/****************************************************************************/ 883/****************************************************************************/
910 884
911#ifdef KEYSYM_RESOURCE 885#ifdef KEYSYM_RESOURCE
912 class keyboard_manager; 886class keyboard_manager;
913#endif 887#endif
914 888
915struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 889struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
890
891 // special markers with magic addresses
892 static const char resval_undef []; // options specifically unset
893 static const char resval_on []; // boolean options switched on
894 static const char resval_off []; // or off
895
916 log_callback *log_hook; // log error messages through this hook, if != 0 896 log_callback *log_hook; // log error messages through this hook, if != 0
917 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 897 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
918#if ENABLE_PERL 898#if ENABLE_PERL
919 rxvt_perl_term perl; 899 rxvt_perl_term perl;
920#endif 900#endif
921 struct mbstate mbstate; // current input multibyte state 901 struct mbstate mbstate; // current input multibyte state
922 902
923 unsigned char want_refresh:1, 903 unsigned char want_refresh:1,
924#ifdef TRANSPARENT 904#ifdef TRANSPARENT
925 want_full_refresh:1, /* awaiting full screen refresh */ 905 want_full_refresh:1, /* awaiting full screen refresh */
926#endif
927#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
928 am_transparent:1, /* is a transparent term */ 906 am_transparent:1, /* is a transparent term */
929 am_pixmap_trans:1, /* transparency w/known root pixmap */ 907 am_pixmap_trans:1, /* transparency w/known root pixmap */
930#endif 908#endif
931 current_screen:1, /* primary or secondary */ 909 current_screen:1, /* primary or secondary */
932 num_scr_allow:1, 910 num_scr_allow:1,
… …
960 int num_scr; /* screen: number lines scrolled */ 938 int num_scr; /* screen: number lines scrolled */
961 int prev_ncol, /* screen: previous number of columns */ 939 int prev_ncol, /* screen: previous number of columns */
962 prev_nrow; /* screen: previous number of rows */ 940 prev_nrow; /* screen: previous number of rows */
963/* ---------- */ 941/* ---------- */
964 rend_t rstyle; 942 rend_t rstyle;
965/* ---------- */
966 uint32_t pixcolor_set[NPIXCLR_SETS];
967/* ---------- */ 943/* ---------- */
968#ifdef SELECTION_SCROLLING 944#ifdef SELECTION_SCROLLING
969 int scroll_selection_lines; 945 int scroll_selection_lines;
970 enum page_dirn scroll_selection_dir; 946 enum page_dirn scroll_selection_dir;
971 int selection_save_x, 947 int selection_save_x,
… …
1045 XComposeStatus compose; 1021 XComposeStatus compose;
1046 ttymode_t tio; 1022 ttymode_t tio;
1047 row_col_t oldcursor; 1023 row_col_t oldcursor;
1048#ifdef XPM_BACKGROUND 1024#ifdef XPM_BACKGROUND
1049 bgPixmap_t bgPixmap; 1025 bgPixmap_t bgPixmap;
1026#ifdef HAVE_AFTERIMAGE
1027 ASImageManager *asimman;
1028 ASImage *original_asim;
1029 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1030#else
1050 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1031 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1032#endif
1051#endif 1033#endif
1052 1034
1053#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1054 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1055 text_t **ov_text; 1037 text_t **ov_text;
… …
1110 1092
1111 long vt_emask, vt_emask_perl, vt_emask_xim; 1093 long vt_emask, vt_emask_perl, vt_emask_xim;
1112 1094
1113 void vt_select_input () const NOTHROW 1095 void vt_select_input () const NOTHROW
1114 { 1096 {
1115 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1097 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1116 } 1098 }
1117 1099
1118#if TRANSPARENT 1100#if TRANSPARENT || ENABLE_PERL
1119 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1120 xevent_watcher rootwin_ev; 1102 xevent_watcher rootwin_ev;
1103 void check_our_parents_cb (time_watcher &w);
1104 time_watcher check_our_aprents_ev;
1121#endif 1105#endif
1122 1106
1123 void x_cb (XEvent &xev); 1107 void x_cb (XEvent &xev);
1124 void flush (); 1108 void flush ();
1125 xevent_watcher termwin_ev; 1109 xevent_watcher termwin_ev;
… …
1185 bool pty_fill (); 1169 bool pty_fill ();
1186 1170
1187 void make_current () const // make this the "currently active" urxvt instance 1171 void make_current () const // make this the "currently active" urxvt instance
1188 { 1172 {
1189 SET_R (this); 1173 SET_R (this);
1174 set_environ (envv);
1190 rxvt_set_locale (locale); 1175 rxvt_set_locale (locale);
1191 set_environ (envv);
1192 } 1176 }
1193 1177
1194 void init_secondary (); 1178 void init_secondary ();
1195 const char **init_resources (int argc, const char *const *argv); 1179 const char **init_resources (int argc, const char *const *argv);
1196 const char *x_resource (const char *name); 1180 const char *x_resource (const char *name);
… …
1221 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1222 1206
1223 bool IMisRunning (); 1207 bool IMisRunning ();
1224 void IMSendSpot (); 1208 void IMSendSpot ();
1225 bool IM_get_IC (const char *modifiers); 1209 bool IM_get_IC (const char *modifiers);
1226 void IMSetStatusPosition (); 1210 void IMSetPosition ();
1227#endif 1211#endif
1228 1212
1229 void resize_scrollbar (); 1213 void resize_scrollbar ();
1230 1214
1231 // command.C 1215 // command.C
1232 void lookup_key (XKeyEvent &ev); 1216 void key_press (XKeyEvent &ev);
1217 void key_release (XKeyEvent &ev);
1233 unsigned int cmd_write (const char *str, unsigned int count); 1218 unsigned int cmd_write (const char *str, unsigned int count);
1234 1219
1235 wchar_t next_char () NOTHROW; 1220 wchar_t next_char () NOTHROW;
1236 wchar_t cmd_getc () THROW ((class out_of_input)); 1221 wchar_t cmd_getc () THROW ((class out_of_input));
1237 uint32_t next_octet () NOTHROW; 1222 uint32_t next_octet () NOTHROW;
… …
1241 void mouse_report (XButtonEvent &ev); 1226 void mouse_report (XButtonEvent &ev);
1242 void button_press (XButtonEvent &ev); 1227 void button_press (XButtonEvent &ev);
1243 void button_release (XButtonEvent &ev); 1228 void button_release (XButtonEvent &ev);
1244 void focus_in (); 1229 void focus_in ();
1245 void focus_out (); 1230 void focus_out ();
1231 void update_fade_color (unsigned int idx);
1246 int check_our_parents (); 1232 int check_our_parents ();
1247#ifdef PRINTPIPE 1233#ifdef PRINTPIPE
1248 FILE *popen_printer (); 1234 FILE *popen_printer ();
1249 int pclose_printer (FILE *stream); 1235 int pclose_printer (FILE *stream);
1250#endif 1236#endif
… …
1272 void set_utf8_property (Atom prop, const char *str, int len = -1); 1258 void set_utf8_property (Atom prop, const char *str, int len = -1);
1273 void set_title (const char *str); 1259 void set_title (const char *str);
1274 void set_icon_name (const char *str); 1260 void set_icon_name (const char *str);
1275 void set_window_color (int idx, const char *color); 1261 void set_window_color (int idx, const char *color);
1276 void set_colorfgbg (); 1262 void set_colorfgbg ();
1277 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1263 bool set_color (rxvt_color &color, const char *name);
1264 void alias_color (int dst, int src);
1278 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1265 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1279 1266
1280 // screen.C 1267 // screen.C
1281 1268
1282 void lalloc (line_t &l) const 1269 void lalloc (line_t &l) const
… …
1311 { 1298 {
1312 int base = GET_BASEFG (r); 1299 int base = GET_BASEFG (r);
1313#ifndef NO_BRIGHTCOLOR 1300#ifndef NO_BRIGHTCOLOR
1314 if (r & RS_Bold 1301 if (r & RS_Bold
1315# if ENABLE_STYLES 1302# if ENABLE_STYLES
1316 && OPTION (Opt_intensityStyles) 1303 && option (Opt_intensityStyles)
1317# endif 1304# endif
1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1305 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1319 base += minBrightCOLOR - minCOLOR; 1306 base += minBrightCOLOR - minCOLOR;
1320#endif 1307#endif
1321 return base; 1308 return base;
… …
1325 { 1312 {
1326 int base = GET_BASEBG (r); 1313 int base = GET_BASEBG (r);
1327#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1328 if (r & RS_Blink 1315 if (r & RS_Blink
1329# if ENABLE_STYLES 1316# if ENABLE_STYLES
1330 && OPTION (Opt_intensityStyles) 1317 && option (Opt_intensityStyles)
1331# endif 1318# endif
1332 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1333 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1334#endif 1321#endif
1335 return base; 1322 return base;
1336 } 1323 }
1337 1324
1338 bool option (uint32_t opt) const NOTHROW 1325 bool option (uint8_t opt) const NOTHROW
1339 { 1326 {
1340 return OPTION (opt); 1327 return options[opt >> 3] & (1 << (opt & 7));
1341 } 1328 }
1342 1329
1343 void set_option (uint32_t opt, bool set) NOTHROW 1330 void set_option (uint8_t opt, bool set = true) NOTHROW
1344 { 1331 {
1345 if (set) 1332 if (set)
1346 options |= opt; 1333 options[opt >> 3] |= (1 << (opt & 7));
1347 else 1334 else
1348 options &= ~opt; 1335 options[opt >> 3] &= ~(1 << (opt & 7));
1349 } 1336 }
1350 1337
1351 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1338 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1352 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1339 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1353 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1340 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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