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.250 by root, Tue Jan 31 01:21:21 2006 UTC vs.
Revision 1.285 by sasha, Sat Aug 4 07:05:31 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 {
189#ifdef XPM_BACKGROUND 178# ifdef XPM_BACKGROUND
190typedef struct { 179
191 short w, h, x, y; 180# ifdef HAVE_AFTERIMAGE
181 ASImage *original_asim;
182# endif
183
184#define bgPmap_defaultScale 100
185#define bgPmap_defaultAlign 50
186 unsigned int h_scale, v_scale;/* percents of the window size */
187 int h_align, v_align; /* percents of the window size:
188 0 - left align, 50 - center, 100 - right */
189
190 bool handle_geometry (const char *geom);
191
192# endif
193
194# define bgPmap_geometrySet (1UL<<0)
195# define bgPmap_propScale (1UL<<1)
196# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_propScale)
197
198# define bgPmap_Transparent (1UL<<16)
199 unsigned long flags;
200
192 Pixmap pixmap; 201 Pixmap pixmap;
193} bgPixmap_t; 202 unsigned int pmap_width, pmap_height;
203 unsigned int pmap_depth;
204
205 bool window_size_sensitive();
206
207};
208#else
209# undef HAVE_BG_PIXMAP
194#endif 210#endif
195 211
196/* 212/*
197 * the 'essential' information for reporting Mouse Events 213 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 214 * pared down from XButtonEvent
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 535 * 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 536 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 537 */
522 538
523enum colour_list { 539enum colour_list {
540 Color_none = -2,
541 Color_transparent = -1,
524 Color_fg = 0, 542 Color_fg = 0,
525 Color_bg, 543 Color_bg,
526 minCOLOR, /* 2 */ 544 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 545 Color_Black = minCOLOR,
528 Color_Red3, 546 Color_Red3,
… …
570#endif 588#endif
571#ifdef KEEP_SCROLLCOLOR 589#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 590 Color_scroll,
573 Color_trough, 591 Color_trough,
574#endif 592#endif
575#if TINTING 593#if ENABLE_TRANSPARENCY
576 Color_tint, 594 Color_tint,
577#endif 595#endif
578#if OFF_FOCUS_FADING 596#if OFF_FOCUS_FADING
579 Color_fade, 597 Color_fade,
580#endif 598#endif
… …
587 TOTAL_COLORS = NRS_COLORS 605 TOTAL_COLORS = NRS_COLORS
588#endif 606#endif
589}; 607};
590 608
591#define Color_Bits 7 // 0 .. maxTermCOLOR 609#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 610
596/* 611/*
597 * Resource list 612 * Resource list
598 */ 613 */
599enum { 614enum {
… …
684 * MACRO DEFINES 699 * MACRO DEFINES
685 ***************************************************************************** 700 *****************************************************************************
686 */ 701 */
687#define dLocal(type,name) type const name = this->name 702#define dLocal(type,name) type const name = this->name
688 703
689// for speed reasons, we assume that all latin1 characters 704// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 705// single-width.
691// is actually 0x300, but ascii is what matters most). 706#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 707
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 708/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 709#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 710#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 711#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 713#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 714#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 717
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 718// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 719#define MOD(m,n) (((m) + (n)) % (n))
711 720
712#define LINENO(n) MOD (term_start + int(n), total_rows) 721#define LINENO(n) MOD (term_start + int(n), total_rows)
713#define ROW(n) row_buf [LINENO (n)] 722#define ROW(n) row_buf [LINENO (n)]
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 740#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 741#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 742
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 743#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 744
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 745#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 746#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 747
739#if ENABLE_STYLES 748#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 749# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 750#else
742# define FONTSET(style) fontset[0] 751# define FONTSET(style) fontset[0]
… …
770#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 779#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
771#define scrollbar_position(y) ((y) - scrollBar.beg) 780#define scrollbar_position(y) ((y) - scrollBar.beg)
772#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 781#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773 - scrollbar_minheight ()) 782 - scrollbar_minheight ())
774 783
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; 784typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 785typedef callback<int (int)> getfd_callback;
783 786
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 787#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 788extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 789extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 790extern void rxvt_pop_locale () NOTHROW;
… …
789/****************************************************************************/ 792/****************************************************************************/
790 793
791#define LINE_LONGER 0x0001 // line is continued on the next row 794#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 795#define LINE_FILTERED 0x0002 // line has been filtered
793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 796#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
797#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
798#define LINE_BIDI 0x0010 // line needs bidi (NYI)
794 799
795struct line_t { 800struct line_t {
796 text_t *t; // terminal the text 801 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 802 rend_t *r; // rendition, uses RS_ flags
798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 803 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
891#endif 896#endif
892 897
893/****************************************************************************/ 898/****************************************************************************/
894 899
895#ifdef KEYSYM_RESOURCE 900#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 901class keyboard_manager;
897#endif 902#endif
898 903
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 904struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
905
906 // special markers with magic addresses
907 static const char resval_undef []; // options specifically unset
908 static const char resval_on []; // boolean options switched on
909 static const char resval_off []; // or off
910
900 log_callback *log_hook; // log error messages through this hook, if != 0 911 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 912 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 913#if ENABLE_PERL
903 rxvt_perl_term perl; 914 rxvt_perl_term perl;
904#endif 915#endif
905 struct mbstate mbstate; // current input multibyte state 916 struct mbstate mbstate; // current input multibyte state
906 917
907 unsigned char want_refresh:1, 918 unsigned char want_refresh:1,
908#ifdef TRANSPARENT 919#ifdef ENABLE_TRANSPARENCY
909 want_full_refresh:1, /* awaiting full screen refresh */ 920 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 */ 921 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */ 922 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif 923#endif
915 current_screen:1, /* primary or secondary */ 924 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 925 num_scr_allow:1,
… …
945 int prev_ncol, /* screen: previous number of columns */ 954 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 955 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 956/* ---------- */
948 rend_t rstyle; 957 rend_t rstyle;
949/* ---------- */ 958/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */
952#ifdef SELECTION_SCROLLING 959#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 960 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 961 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 962 int selection_save_x,
956 selection_save_y, 963 selection_save_y,
… …
961 /* give proper Scroll behaviour */ 968 /* give proper Scroll behaviour */
962#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 969#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
963 mouse_slip_wheel_speed, 970 mouse_slip_wheel_speed,
964#endif 971#endif
965 refresh_count, 972 refresh_count,
966 refresh_limit,
967 last_bot, /* scrollbar last bottom position */ 973 last_bot, /* scrollbar last bottom position */
968 last_top, /* scrollbar last top position */ 974 last_top, /* scrollbar last top position */
969 last_state, /* scrollbar last state */ 975 last_state, /* scrollbar last state */
970 scrollbar_len, 976 scrollbar_len,
971 window_vt_x, 977 window_vt_x,
… …
1027#endif 1033#endif
1028 struct mouse_event MEvent; 1034 struct mouse_event MEvent;
1029 XComposeStatus compose; 1035 XComposeStatus compose;
1030 ttymode_t tio; 1036 ttymode_t tio;
1031 row_col_t oldcursor; 1037 row_col_t oldcursor;
1032#ifdef XPM_BACKGROUND 1038#ifdef HAVE_BG_PIXMAP
1033 bgPixmap_t bgPixmap; 1039 bgPixmap_t bgPixmap;
1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1040#endif
1041#ifdef HAVE_AFTERIMAGE
1042 ASVisual *asv;
1043 ASImageManager *asimman;
1035#endif 1044#endif
1036 1045
1037#if ENABLE_OVERLAY 1046#if ENABLE_OVERLAY
1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1047 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1039 text_t **ov_text; 1048 text_t **ov_text;
… …
1094 1103
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1104 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1105
1097 void vt_select_input () const NOTHROW 1106 void vt_select_input () const NOTHROW
1098 { 1107 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1108 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1109 }
1101 1110
1102#if TRANSPARENT 1111#if ENABLE_TRANSPARENCY || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1112 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1113 xevent_watcher rootwin_ev;
1114#endif
1115#if ENABLE_TRANSPARENCY
1116 int check_our_parents ();
1117 void check_our_parents_cb (time_watcher &w);
1118 time_watcher check_our_parents_ev;
1105#endif 1119#endif
1106 1120
1107 void x_cb (XEvent &xev); 1121 void x_cb (XEvent &xev);
1108 void flush (); 1122 void flush ();
1109 xevent_watcher termwin_ev; 1123 xevent_watcher termwin_ev;
… …
1169 bool pty_fill (); 1183 bool pty_fill ();
1170 1184
1171 void make_current () const // make this the "currently active" urxvt instance 1185 void make_current () const // make this the "currently active" urxvt instance
1172 { 1186 {
1173 SET_R (this); 1187 SET_R (this);
1188 set_environ (envv);
1174 rxvt_set_locale (locale); 1189 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1190 }
1177 1191
1178 void init_secondary (); 1192 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1193 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name); 1194 const char *x_resource (const char *name);
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1219 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1220
1207 bool IMisRunning (); 1221 bool IMisRunning ();
1208 void IMSendSpot (); 1222 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1223 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1224 void IMSetPosition ();
1211#endif 1225#endif
1212 1226
1213 void resize_scrollbar (); 1227 void resize_scrollbar ();
1214 1228
1215 // command.C 1229 // command.C
1216 void lookup_key (XKeyEvent &ev); 1230 void key_press (XKeyEvent &ev);
1231 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1232 unsigned int cmd_write (const char *str, unsigned int count);
1218 1233
1219 wchar_t next_char () NOTHROW; 1234 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1235 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1236 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1240 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1241 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1242 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1243 void focus_in ();
1229 void focus_out (); 1244 void focus_out ();
1230 int check_our_parents (); 1245 void update_fade_color (unsigned int idx);
1231#ifdef PRINTPIPE 1246#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1247 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1248 int pclose_printer (FILE *stream);
1234#endif 1249#endif
1235 void process_print_pipe (); 1250 void process_print_pipe ();
… …
1257 void set_title (const char *str); 1272 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1273 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1274 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1275 void set_colorfgbg ();
1261 bool set_color (rxvt_color &color, const char *name); 1276 bool set_color (rxvt_color &color, const char *name);
1277 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1278 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1263 1279
1264 // screen.C 1280 // screen.C
1265 1281
1266 void lalloc (line_t &l) const 1282 void lalloc (line_t &l) const
… …
1295 { 1311 {
1296 int base = GET_BASEFG (r); 1312 int base = GET_BASEFG (r);
1297#ifndef NO_BRIGHTCOLOR 1313#ifndef NO_BRIGHTCOLOR
1298 if (r & RS_Bold 1314 if (r & RS_Bold
1299# if ENABLE_STYLES 1315# if ENABLE_STYLES
1300 && OPTION (Opt_intensityStyles) 1316 && option (Opt_intensityStyles)
1301# endif 1317# endif
1302 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1303 base += minBrightCOLOR - minCOLOR; 1319 base += minBrightCOLOR - minCOLOR;
1304#endif 1320#endif
1305 return base; 1321 return base;
… …
1309 { 1325 {
1310 int base = GET_BASEBG (r); 1326 int base = GET_BASEBG (r);
1311#ifndef NO_BRIGHTCOLOR 1327#ifndef NO_BRIGHTCOLOR
1312 if (r & RS_Blink 1328 if (r & RS_Blink
1313# if ENABLE_STYLES 1329# if ENABLE_STYLES
1314 && OPTION (Opt_intensityStyles) 1330 && option (Opt_intensityStyles)
1315# endif 1331# endif
1316 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1332 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1317 base += minBrightCOLOR - minCOLOR; 1333 base += minBrightCOLOR - minCOLOR;
1318#endif 1334#endif
1319 return base; 1335 return base;
1320 } 1336 }
1321 1337
1322 bool option (uint32_t opt) const NOTHROW 1338 bool option (uint8_t opt) const NOTHROW
1323 { 1339 {
1324 return OPTION (opt); 1340 return options[opt >> 3] & (1 << (opt & 7));
1325 } 1341 }
1326 1342
1327 void set_option (uint32_t opt, bool set) NOTHROW 1343 void set_option (uint8_t opt, bool set = true) NOTHROW
1328 { 1344 {
1329 if (set) 1345 if (set)
1330 options |= opt; 1346 options[opt >> 3] |= (1 << (opt & 7));
1331 else 1347 else
1332 options &= ~opt; 1348 options[opt >> 3] &= ~(1 << (opt & 7));
1333 } 1349 }
1334 1350
1335 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1351 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; 1352 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; 1353 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1443 void get_options (int argc, const char *const *argv); 1459 void get_options (int argc, const char *const *argv);
1444 int parse_keysym (const char *str, const char *arg); 1460 int parse_keysym (const char *str, const char *arg);
1445 void get_xdefaults (FILE *stream, const char *name); 1461 void get_xdefaults (FILE *stream, const char *name);
1446 void extract_resources (); 1462 void extract_resources ();
1447 // xpm.C 1463 // xpm.C
1448 int scale_pixmap (const char *geom); 1464//int scale_pixmap (const char *geom);
1449 void resize_pixmap (); 1465 void resize_pixmap ();
1450 Pixmap set_bgPixmap (const char *file); 1466 void set_bgPixmap (const char *file);
1451}; 1467};
1452 1468
1453/* 1469/*
1454 ***************************************************************************** 1470 *****************************************************************************
1455 * PROTOTYPES 1471 * PROTOTYPES

Diff Legend

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