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

Diff Legend

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