… | |
… | |
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 |
71 | typedef char *XPointer; |
72 | typedef char *XPointer; |
72 | #endif |
73 | #endif |
73 | |
74 | |
74 | #ifdef HAVE_TERMIOS_H |
|
|
75 | # include <termios.h> |
75 | #include <termios.h> |
76 | typedef struct termios ttymode_t; |
76 | typedef struct termios ttymode_t; |
77 | #else |
|
|
78 | # include <sgtty.h> |
|
|
79 | typedef 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 | |
|
|
78 | #ifdef HAVE_AFTERIMAGE |
|
|
79 | # include <afterimage.h> |
|
|
80 | #undef min |
|
|
81 | #undef max |
88 | #ifdef XPM_BACKGROUND |
82 | #elif defined(XPM_BACKGROUND) |
89 | # ifdef XPM_INC_X11 |
83 | # ifdef XPM_INC_X11 |
90 | # include <X11/xpm.h> |
84 | # include <X11/xpm.h> |
91 | # else |
85 | # else |
92 | # include <xpm.h> |
86 | # include <xpm.h> |
93 | # endif |
87 | # endif |
… | |
… | |
187 | #endif |
181 | #endif |
188 | |
182 | |
189 | #ifdef XPM_BACKGROUND |
183 | #ifdef XPM_BACKGROUND |
190 | typedef struct { |
184 | typedef struct { |
191 | short w, h, x, y; |
185 | short w, h, x, y; |
|
|
186 | bool auto_resize ; |
192 | Pixmap pixmap; |
187 | Pixmap pixmap; |
193 | } bgPixmap_t; |
188 | } bgPixmap_t; |
194 | #endif |
189 | #endif |
195 | |
190 | |
196 | /* |
191 | /* |
… | |
… | |
519 | * 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 |
520 | * 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 |
521 | */ |
516 | */ |
522 | |
517 | |
523 | enum colour_list { |
518 | enum colour_list { |
|
|
519 | Color_none = -2, |
|
|
520 | Color_transparent = -1, |
524 | Color_fg = 0, |
521 | Color_fg = 0, |
525 | Color_bg, |
522 | Color_bg, |
526 | minCOLOR, /* 2 */ |
523 | minCOLOR, /* 2 */ |
527 | Color_Black = minCOLOR, |
524 | Color_Black = minCOLOR, |
528 | Color_Red3, |
525 | Color_Red3, |
… | |
… | |
587 | TOTAL_COLORS = NRS_COLORS |
584 | TOTAL_COLORS = NRS_COLORS |
588 | #endif |
585 | #endif |
589 | }; |
586 | }; |
590 | |
587 | |
591 | #define Color_Bits 7 // 0 .. maxTermCOLOR |
588 | #define Color_Bits 7 // 0 .. maxTermCOLOR |
592 | |
|
|
593 | #define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) |
|
|
594 | #define NPIXCLR_BITS 32 |
|
|
595 | |
589 | |
596 | /* |
590 | /* |
597 | * Resource list |
591 | * Resource list |
598 | */ |
592 | */ |
599 | enum { |
593 | enum { |
… | |
… | |
684 | * MACRO DEFINES |
678 | * MACRO DEFINES |
685 | ***************************************************************************** |
679 | ***************************************************************************** |
686 | */ |
680 | */ |
687 | #define dLocal(type,name) type const name = this->name |
681 | #define dLocal(type,name) type const name = this->name |
688 | |
682 | |
689 | // for speed reasons, we assume that all latin1 characters |
683 | // for speed reasons, we assume that all codepoints 32 to 126 are |
690 | // are single-width (the first unicode combining character |
684 | // single-width. |
691 | // is actually 0x300, but ascii is what matters most). |
685 | #define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) |
692 | #define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1) |
|
|
693 | |
686 | |
694 | /* convert pixel dimensions to row/column values. Everything as int32_t */ |
687 | /* convert pixel dimensions to row/column values. Everything as int32_t */ |
695 | #define Pixel2Col(x) Pixel2Width((int32_t)(x)) |
688 | #define Pixel2Col(x) Pixel2Width((int32_t)(x)) |
696 | #define Pixel2Row(y) Pixel2Height((int32_t)(y)) |
689 | #define Pixel2Row(y) Pixel2Height((int32_t)(y)) |
697 | #define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) |
690 | #define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) |
… | |
… | |
699 | #define Col2Pixel(col) ((int32_t)Width2Pixel(col)) |
692 | #define Col2Pixel(col) ((int32_t)Width2Pixel(col)) |
700 | #define Row2Pixel(row) ((int32_t)Height2Pixel(row)) |
693 | #define Row2Pixel(row) ((int32_t)Height2Pixel(row)) |
701 | #define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) |
694 | #define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) |
702 | #define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) |
695 | #define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) |
703 | |
696 | |
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 |
697 | // for m >= -n, ensure remainder lies between 0..n-1 |
710 | #define MOD(m,n) (((m) + (n)) % (n)) |
698 | #define MOD(m,n) (((m) + (n)) % (n)) |
711 | |
699 | |
712 | #define LINENO(n) MOD (term_start + int(n), total_rows) |
700 | #define LINENO(n) MOD (term_start + int(n), total_rows) |
713 | #define ROW(n) row_buf [LINENO (n)] |
701 | #define ROW(n) row_buf [LINENO (n)] |
… | |
… | |
731 | #define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) |
719 | #define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) |
732 | #define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) |
720 | #define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) |
733 | |
721 | |
734 | #define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) |
722 | #define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) |
735 | |
723 | |
736 | #define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) |
724 | #define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] |
737 | #define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) |
725 | #define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) |
738 | |
726 | |
739 | #if ENABLE_STYLES |
727 | #if ENABLE_STYLES |
740 | # define FONTSET(style) fontset[GET_STYLE (style)] |
728 | # define FONTSET(style) fontset[GET_STYLE (style)] |
741 | #else |
729 | #else |
742 | # define FONTSET(style) fontset[0] |
730 | # define FONTSET(style) fontset[0] |
… | |
… | |
776 | # 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)) |
777 | #else |
765 | #else |
778 | # define XPMClearArea(a, b, c, d, e, f, g) |
766 | # define XPMClearArea(a, b, c, d, e, f, g) |
779 | #endif |
767 | #endif |
780 | |
768 | |
781 | typedef callback1<void, const char *> log_callback; |
769 | typedef callback<void (const char *)> log_callback; |
782 | typedef callback1<int, int> getfd_callback; |
770 | typedef callback<int (int)> getfd_callback; |
783 | |
771 | |
784 | #define SET_LOCALE(locale) rxvt_set_locale (locale) |
772 | #define SET_LOCALE(locale) rxvt_set_locale (locale) |
785 | extern bool rxvt_set_locale (const char *locale) NOTHROW; |
773 | extern bool rxvt_set_locale (const char *locale) NOTHROW; |
786 | extern void rxvt_push_locale (const char *locale) NOTHROW; |
774 | extern void rxvt_push_locale (const char *locale) NOTHROW; |
787 | extern void rxvt_pop_locale () NOTHROW; |
775 | extern void rxvt_pop_locale () NOTHROW; |
… | |
… | |
789 | /****************************************************************************/ |
777 | /****************************************************************************/ |
790 | |
778 | |
791 | #define LINE_LONGER 0x0001 // line is continued on the next row |
779 | #define LINE_LONGER 0x0001 // line is continued on the next row |
792 | #define LINE_FILTERED 0x0002 // line has been filtered |
780 | #define LINE_FILTERED 0x0002 // line has been filtered |
793 | #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) |
794 | |
784 | |
795 | struct line_t { |
785 | struct line_t { |
796 | text_t *t; // terminal the text |
786 | text_t *t; // terminal the text |
797 | rend_t *r; // rendition, uses RS_ flags |
787 | rend_t *r; // rendition, uses RS_ flags |
798 | 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 |
… | |
… | |
852 | # define COMPOSE_LO 0x40000000UL |
842 | # define COMPOSE_LO 0x40000000UL |
853 | # define COMPOSE_HI 0x400fffffUL |
843 | # define COMPOSE_HI 0x400fffffUL |
854 | # define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) |
844 | # define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) |
855 | #else |
845 | #else |
856 | # if ENABLE_PERL |
846 | # if ENABLE_PERL |
857 | # 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 |
858 | # 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 |
859 | # else |
849 | # else |
860 | # define COMPOSE_LO 0xd800UL |
850 | # define COMPOSE_LO 0xd800UL |
861 | # define COMPOSE_HI 0xf8ffUL |
851 | # define COMPOSE_HI 0xf8ffUL |
862 | # endif |
852 | # endif |
… | |
… | |
891 | #endif |
881 | #endif |
892 | |
882 | |
893 | /****************************************************************************/ |
883 | /****************************************************************************/ |
894 | |
884 | |
895 | #ifdef KEYSYM_RESOURCE |
885 | #ifdef KEYSYM_RESOURCE |
896 | class keyboard_manager; |
886 | class keyboard_manager; |
897 | #endif |
887 | #endif |
898 | |
888 | |
899 | struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { |
889 | struct 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 | |
900 | 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 |
901 | getfd_callback *getfd_hook; // convert remote to local fd, if != 0 |
897 | getfd_callback *getfd_hook; // convert remote to local fd, if != 0 |
902 | #if ENABLE_PERL |
898 | #if ENABLE_PERL |
903 | rxvt_perl_term perl; |
899 | rxvt_perl_term perl; |
904 | #endif |
900 | #endif |
905 | struct mbstate mbstate; // current input multibyte state |
901 | struct mbstate mbstate; // current input multibyte state |
906 | |
902 | |
907 | unsigned char want_refresh:1, |
903 | unsigned char want_refresh:1, |
908 | #ifdef TRANSPARENT |
904 | #ifdef TRANSPARENT |
909 | want_full_refresh:1, /* awaiting full screen refresh */ |
905 | 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 */ |
906 | am_transparent:1, /* is a transparent term */ |
913 | am_pixmap_trans:1, /* transparency w/known root pixmap */ |
907 | am_pixmap_trans:1, /* transparency w/known root pixmap */ |
914 | #endif |
908 | #endif |
915 | current_screen:1, /* primary or secondary */ |
909 | current_screen:1, /* primary or secondary */ |
916 | num_scr_allow:1, |
910 | num_scr_allow:1, |
… | |
… | |
944 | int num_scr; /* screen: number lines scrolled */ |
938 | int num_scr; /* screen: number lines scrolled */ |
945 | int prev_ncol, /* screen: previous number of columns */ |
939 | int prev_ncol, /* screen: previous number of columns */ |
946 | prev_nrow; /* screen: previous number of rows */ |
940 | prev_nrow; /* screen: previous number of rows */ |
947 | /* ---------- */ |
941 | /* ---------- */ |
948 | rend_t rstyle; |
942 | rend_t rstyle; |
949 | /* ---------- */ |
|
|
950 | uint32_t pixcolor_set[NPIXCLR_SETS]; |
|
|
951 | /* ---------- */ |
943 | /* ---------- */ |
952 | #ifdef SELECTION_SCROLLING |
944 | #ifdef SELECTION_SCROLLING |
953 | int scroll_selection_lines; |
945 | int scroll_selection_lines; |
954 | enum page_dirn scroll_selection_dir; |
946 | enum page_dirn scroll_selection_dir; |
955 | int selection_save_x, |
947 | int selection_save_x, |
… | |
… | |
1029 | XComposeStatus compose; |
1021 | XComposeStatus compose; |
1030 | ttymode_t tio; |
1022 | ttymode_t tio; |
1031 | row_col_t oldcursor; |
1023 | row_col_t oldcursor; |
1032 | #ifdef XPM_BACKGROUND |
1024 | #ifdef XPM_BACKGROUND |
1033 | 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 |
1034 | XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ |
1031 | XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ |
|
|
1032 | #endif |
1035 | #endif |
1033 | #endif |
1036 | |
1034 | |
1037 | #if ENABLE_OVERLAY |
1035 | #if ENABLE_OVERLAY |
1038 | int ov_x, ov_y, ov_w, ov_h; // overlay dimensions |
1036 | int ov_x, ov_y, ov_w, ov_h; // overlay dimensions |
1039 | text_t **ov_text; |
1037 | text_t **ov_text; |
… | |
… | |
1094 | |
1092 | |
1095 | long vt_emask, vt_emask_perl, vt_emask_xim; |
1093 | long vt_emask, vt_emask_perl, vt_emask_xim; |
1096 | |
1094 | |
1097 | void vt_select_input () const NOTHROW |
1095 | void vt_select_input () const NOTHROW |
1098 | { |
1096 | { |
1099 | XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); |
1097 | XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); |
1100 | } |
1098 | } |
1101 | |
1099 | |
1102 | #if TRANSPARENT |
1100 | #if TRANSPARENT || ENABLE_PERL |
1103 | void rootwin_cb (XEvent &xev); |
1101 | void rootwin_cb (XEvent &xev); |
1104 | 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; |
1105 | #endif |
1105 | #endif |
1106 | |
1106 | |
1107 | void x_cb (XEvent &xev); |
1107 | void x_cb (XEvent &xev); |
1108 | void flush (); |
1108 | void flush (); |
1109 | xevent_watcher termwin_ev; |
1109 | xevent_watcher termwin_ev; |
… | |
… | |
1169 | bool pty_fill (); |
1169 | bool pty_fill (); |
1170 | |
1170 | |
1171 | void make_current () const // make this the "currently active" urxvt instance |
1171 | void make_current () const // make this the "currently active" urxvt instance |
1172 | { |
1172 | { |
1173 | SET_R (this); |
1173 | SET_R (this); |
|
|
1174 | set_environ (envv); |
1174 | rxvt_set_locale (locale); |
1175 | rxvt_set_locale (locale); |
1175 | set_environ (envv); |
|
|
1176 | } |
1176 | } |
1177 | |
1177 | |
1178 | void init_secondary (); |
1178 | void init_secondary (); |
1179 | const char **init_resources (int argc, const char *const *argv); |
1179 | const char **init_resources (int argc, const char *const *argv); |
1180 | const char *x_resource (const char *name); |
1180 | const char *x_resource (const char *name); |
… | |
… | |
1205 | 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); |
1206 | |
1206 | |
1207 | bool IMisRunning (); |
1207 | bool IMisRunning (); |
1208 | void IMSendSpot (); |
1208 | void IMSendSpot (); |
1209 | bool IM_get_IC (const char *modifiers); |
1209 | bool IM_get_IC (const char *modifiers); |
1210 | void IMSetStatusPosition (); |
1210 | void IMSetPosition (); |
1211 | #endif |
1211 | #endif |
1212 | |
1212 | |
1213 | void resize_scrollbar (); |
1213 | void resize_scrollbar (); |
1214 | |
1214 | |
1215 | // command.C |
1215 | // command.C |
1216 | void lookup_key (XKeyEvent &ev); |
1216 | void key_press (XKeyEvent &ev); |
|
|
1217 | void key_release (XKeyEvent &ev); |
1217 | unsigned int cmd_write (const char *str, unsigned int count); |
1218 | unsigned int cmd_write (const char *str, unsigned int count); |
1218 | |
1219 | |
1219 | wchar_t next_char () NOTHROW; |
1220 | wchar_t next_char () NOTHROW; |
1220 | wchar_t cmd_getc () THROW ((class out_of_input)); |
1221 | wchar_t cmd_getc () THROW ((class out_of_input)); |
1221 | uint32_t next_octet () NOTHROW; |
1222 | uint32_t next_octet () NOTHROW; |
… | |
… | |
1225 | void mouse_report (XButtonEvent &ev); |
1226 | void mouse_report (XButtonEvent &ev); |
1226 | void button_press (XButtonEvent &ev); |
1227 | void button_press (XButtonEvent &ev); |
1227 | void button_release (XButtonEvent &ev); |
1228 | void button_release (XButtonEvent &ev); |
1228 | void focus_in (); |
1229 | void focus_in (); |
1229 | void focus_out (); |
1230 | void focus_out (); |
|
|
1231 | void update_fade_color (unsigned int idx); |
1230 | int check_our_parents (); |
1232 | int check_our_parents (); |
1231 | #ifdef PRINTPIPE |
1233 | #ifdef PRINTPIPE |
1232 | FILE *popen_printer (); |
1234 | FILE *popen_printer (); |
1233 | int pclose_printer (FILE *stream); |
1235 | int pclose_printer (FILE *stream); |
1234 | #endif |
1236 | #endif |
… | |
… | |
1257 | void set_title (const char *str); |
1259 | void set_title (const char *str); |
1258 | void set_icon_name (const char *str); |
1260 | void set_icon_name (const char *str); |
1259 | void set_window_color (int idx, const char *color); |
1261 | void set_window_color (int idx, const char *color); |
1260 | void set_colorfgbg (); |
1262 | void set_colorfgbg (); |
1261 | bool set_color (rxvt_color &color, const char *name); |
1263 | bool set_color (rxvt_color &color, const char *name); |
|
|
1264 | void alias_color (int dst, int src); |
1262 | void set_widthheight (unsigned int newwidth, unsigned int newheight); |
1265 | void set_widthheight (unsigned int newwidth, unsigned int newheight); |
1263 | |
1266 | |
1264 | // screen.C |
1267 | // screen.C |
1265 | |
1268 | |
1266 | void lalloc (line_t &l) const |
1269 | void lalloc (line_t &l) const |
… | |
… | |
1295 | { |
1298 | { |
1296 | int base = GET_BASEFG (r); |
1299 | int base = GET_BASEFG (r); |
1297 | #ifndef NO_BRIGHTCOLOR |
1300 | #ifndef NO_BRIGHTCOLOR |
1298 | if (r & RS_Bold |
1301 | if (r & RS_Bold |
1299 | # if ENABLE_STYLES |
1302 | # if ENABLE_STYLES |
1300 | && OPTION (Opt_intensityStyles) |
1303 | && option (Opt_intensityStyles) |
1301 | # endif |
1304 | # endif |
1302 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1305 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1303 | base += minBrightCOLOR - minCOLOR; |
1306 | base += minBrightCOLOR - minCOLOR; |
1304 | #endif |
1307 | #endif |
1305 | return base; |
1308 | return base; |
… | |
… | |
1309 | { |
1312 | { |
1310 | int base = GET_BASEBG (r); |
1313 | int base = GET_BASEBG (r); |
1311 | #ifndef NO_BRIGHTCOLOR |
1314 | #ifndef NO_BRIGHTCOLOR |
1312 | if (r & RS_Blink |
1315 | if (r & RS_Blink |
1313 | # if ENABLE_STYLES |
1316 | # if ENABLE_STYLES |
1314 | && OPTION (Opt_intensityStyles) |
1317 | && option (Opt_intensityStyles) |
1315 | # endif |
1318 | # endif |
1316 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1319 | && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) |
1317 | base += minBrightCOLOR - minCOLOR; |
1320 | base += minBrightCOLOR - minCOLOR; |
1318 | #endif |
1321 | #endif |
1319 | return base; |
1322 | return base; |
1320 | } |
1323 | } |
1321 | |
1324 | |
1322 | bool option (uint32_t opt) const NOTHROW |
1325 | bool option (uint8_t opt) const NOTHROW |
1323 | { |
1326 | { |
1324 | return OPTION (opt); |
1327 | return options[opt >> 3] & (1 << (opt & 7)); |
1325 | } |
1328 | } |
1326 | |
1329 | |
1327 | void set_option (uint32_t opt, bool set) NOTHROW |
1330 | void set_option (uint8_t opt, bool set = true) NOTHROW |
1328 | { |
1331 | { |
1329 | if (set) |
1332 | if (set) |
1330 | options |= opt; |
1333 | options[opt >> 3] |= (1 << (opt & 7)); |
1331 | else |
1334 | else |
1332 | options &= ~opt; |
1335 | options[opt >> 3] &= ~(1 << (opt & 7)); |
1333 | } |
1336 | } |
1334 | |
1337 | |
1335 | 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; |
1336 | 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; |
1337 | int scr_scroll_text (int row1, int row2, int count) NOTHROW; |
1340 | int scr_scroll_text (int row1, int row2, int count) NOTHROW; |