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.246 by root, Sat Jan 28 20:33:31 2006 UTC vs.
Revision 1.277 by sasha, Thu Jul 12 22:33:16 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
… …
160const char * rxvt_Str_skip_space (const char *str) NOTHROW; 134const char * rxvt_Str_skip_space (const char *str) NOTHROW;
161char * rxvt_Str_trim (char *str) NOTHROW; 135char * rxvt_Str_trim (char *str) NOTHROW;
162int rxvt_Str_escaped (char *str) NOTHROW; 136int rxvt_Str_escaped (char *str) NOTHROW;
163char ** rxvt_splitcommastring (const char *cs) NOTHROW; 137char ** rxvt_splitcommastring (const char *cs) NOTHROW;
164void rxvt_freecommastring (char **cs) NOTHROW; 138void rxvt_freecommastring (char **cs) NOTHROW;
165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
166 139
167///////////////////////////////////////////////////////////////////////////// 140/////////////////////////////////////////////////////////////////////////////
168 141
169// temporarily replace the process environment 142// temporarily replace the process environment
170extern char **environ; 143extern char **environ;
… …
207#endif 180#endif
208 181
209#ifdef XPM_BACKGROUND 182#ifdef XPM_BACKGROUND
210typedef struct { 183typedef struct {
211 short w, h, x, y; 184 short w, h, x, y;
185 bool auto_resize ;
212 Pixmap pixmap; 186 Pixmap pixmap;
213} bgPixmap_t; 187} bgPixmap_t;
214#endif 188#endif
215 189
216/* 190/*
… …
432// fake styles 406// fake styles
433#define RS_Blink 0x00010000UL // blink 407#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 408#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 409#define RS_Uline 0x00040000UL // underline
436 410
411// toggle this to force redraw, must be != RS_Careful
412#define RS_redraw 0x01000000UL
413
437// 5 custom bits for extensions 414// 5 custom bits for extensions
438#define RS_customCount 32 415#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 416#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 417#define RS_customShift 19
441 418
… …
536 * on the unnecessary items, e.g. Color_pointer, but won't bother 513 * on the unnecessary items, e.g. Color_pointer, but won't bother
537 * until we need to. Also, be aware of usage in pixcolor_set 514 * until we need to. Also, be aware of usage in pixcolor_set
538 */ 515 */
539 516
540enum colour_list { 517enum colour_list {
518 Color_none = -2,
519 Color_transparent = -1,
541 Color_fg = 0, 520 Color_fg = 0,
542 Color_bg, 521 Color_bg,
543 minCOLOR, /* 2 */ 522 minCOLOR, /* 2 */
544 Color_Black = minCOLOR, 523 Color_Black = minCOLOR,
545 Color_Red3, 524 Color_Red3,
… …
604 TOTAL_COLORS = NRS_COLORS 583 TOTAL_COLORS = NRS_COLORS
605#endif 584#endif
606}; 585};
607 586
608#define Color_Bits 7 // 0 .. maxTermCOLOR 587#define Color_Bits 7 // 0 .. maxTermCOLOR
609
610#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
611#define NPIXCLR_BITS 32
612 588
613/* 589/*
614 * Resource list 590 * Resource list
615 */ 591 */
616enum { 592enum {
… …
701 * MACRO DEFINES 677 * MACRO DEFINES
702 ***************************************************************************** 678 *****************************************************************************
703 */ 679 */
704#define dLocal(type,name) type const name = this->name 680#define dLocal(type,name) type const name = this->name
705 681
706// for speed reasons, we assume that all latin1 characters 682// for speed reasons, we assume that all codepoints 32 to 126 are
707// are single-width (the first unicode combining character 683// single-width.
708// is actually 0x300, but ascii is what matters most). 684#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
709#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
710 685
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 686/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 687#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 688#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 689#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
716#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 691#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
717#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 692#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 693#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 694#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
720 695
721#define OPTION(opt) (options & (opt))
722#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
723 | Opt_jumpScroll | Opt_secondaryScreen \
724 | Opt_pastableTabs | Opt_intensityStyles)
725
726// for m >= -n, ensure remainder lies between 0..n-1 696// for m >= -n, ensure remainder lies between 0..n-1
727#define MOD(m,n) (((m) + (n)) % (n)) 697#define MOD(m,n) (((m) + (n)) % (n))
728 698
729#define LINENO(n) MOD (term_start + int(n), total_rows) 699#define LINENO(n) MOD (term_start + int(n), total_rows)
730#define ROW(n) row_buf [LINENO (n)] 700#define ROW(n) row_buf [LINENO (n)]
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 718#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 719#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 720
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 721#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 722
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 723#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 724#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 725
756#if ENABLE_STYLES 726#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 727# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 728#else
759# define FONTSET(style) fontset[0] 729# define FONTSET(style) fontset[0]
… …
793# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 763# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
794#else 764#else
795# define XPMClearArea(a, b, c, d, e, f, g) 765# define XPMClearArea(a, b, c, d, e, f, g)
796#endif 766#endif
797 767
798typedef callback1<void, const char *> log_callback; 768typedef callback<void (const char *)> log_callback;
799typedef callback1<int, int> getfd_callback; 769typedef callback<int (int)> getfd_callback;
800 770
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 771#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern bool rxvt_set_locale (const char *locale) NOTHROW; 772extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW; 773extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW; 774extern void rxvt_pop_locale () NOTHROW;
… …
806/****************************************************************************/ 776/****************************************************************************/
807 777
808#define LINE_LONGER 0x0001 // line is continued on the next row 778#define LINE_LONGER 0x0001 // line is continued on the next row
809#define LINE_FILTERED 0x0002 // line has been filtered 779#define LINE_FILTERED 0x0002 // line has been filtered
810#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 780#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
781#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
782#define LINE_BIDI 0x0010 // line needs bidi (NYI)
811 783
812struct line_t { 784struct line_t {
813 text_t *t; // terminal the text 785 text_t *t; // terminal the text
814 rend_t *r; // rendition, uses RS_ flags 786 rend_t *r; // rendition, uses RS_ flags
815 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 787 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
869# define COMPOSE_LO 0x40000000UL 841# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 842# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 843# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 844#else
873# if ENABLE_PERL 845# if ENABLE_PERL
874# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 846# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
875# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 847# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
876# else 848# else
877# define COMPOSE_LO 0xd800UL 849# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 850# define COMPOSE_HI 0xf8ffUL
879# endif 851# endif
… …
908#endif 880#endif
909 881
910/****************************************************************************/ 882/****************************************************************************/
911 883
912#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 885class keyboard_manager;
914#endif 886#endif
915 887
916struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 888struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
889
890 // special markers with magic addresses
891 static const char resval_undef []; // options specifically unset
892 static const char resval_on []; // boolean options switched on
893 static const char resval_off []; // or off
894
917 log_callback *log_hook; // log error messages through this hook, if != 0 895 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 896 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 897#if ENABLE_PERL
920 rxvt_perl_term perl; 898 rxvt_perl_term perl;
921#endif 899#endif
922 struct mbstate mbstate; // current input multibyte state 900 struct mbstate mbstate; // current input multibyte state
923 901
924 unsigned char want_refresh:1, 902 unsigned char want_refresh:1,
925#ifdef TRANSPARENT 903#ifdef ENABLE_TRANSPARENCY
926 want_full_refresh:1, /* awaiting full screen refresh */ 904 want_full_refresh:1, /* awaiting full screen refresh */
927#endif
928#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
929 am_transparent:1, /* is a transparent term */ 905 am_transparent:1, /* is a transparent term */
930 am_pixmap_trans:1, /* transparency w/known root pixmap */ 906 am_pixmap_trans:1, /* transparency w/known root pixmap */
931#endif 907#endif
932 current_screen:1, /* primary or secondary */ 908 current_screen:1, /* primary or secondary */
933 num_scr_allow:1, 909 num_scr_allow:1,
… …
962 int prev_ncol, /* screen: previous number of columns */ 938 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 939 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 940/* ---------- */
965 rend_t rstyle; 941 rend_t rstyle;
966/* ---------- */ 942/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */
969#ifdef SELECTION_SCROLLING 943#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 944 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 945 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 946 int selection_save_x,
973 selection_save_y, 947 selection_save_y,
… …
978 /* give proper Scroll behaviour */ 952 /* give proper Scroll behaviour */
979#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 953#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
980 mouse_slip_wheel_speed, 954 mouse_slip_wheel_speed,
981#endif 955#endif
982 refresh_count, 956 refresh_count,
983 refresh_limit,
984 last_bot, /* scrollbar last bottom position */ 957 last_bot, /* scrollbar last bottom position */
985 last_top, /* scrollbar last top position */ 958 last_top, /* scrollbar last top position */
986 last_state, /* scrollbar last state */ 959 last_state, /* scrollbar last state */
987 scrollbar_len, 960 scrollbar_len,
988 window_vt_x, 961 window_vt_x,
… …
1046 XComposeStatus compose; 1019 XComposeStatus compose;
1047 ttymode_t tio; 1020 ttymode_t tio;
1048 row_col_t oldcursor; 1021 row_col_t oldcursor;
1049#ifdef XPM_BACKGROUND 1022#ifdef XPM_BACKGROUND
1050 bgPixmap_t bgPixmap; 1023 bgPixmap_t bgPixmap;
1024#ifdef HAVE_AFTERIMAGE
1025 struct ASVisual *asv;
1026 /* to get libAfterImage to work with multiple displays we use that hack : */
1027 /* should not need that with libAfterImage version >= 1.15 */
1028#define AFTERIMAGE_DPY_OP(_op) ({::dpy = dpy; _op;})
1029 ASImageManager *asimman;
1030 ASImage *original_asim;
1031 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1032#else
1051 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1033 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1034#endif
1052#endif 1035#endif
1053 1036
1054#if ENABLE_OVERLAY 1037#if ENABLE_OVERLAY
1055 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1056 text_t **ov_text; 1039 text_t **ov_text;
… …
1111 1094
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1095 long vt_emask, vt_emask_perl, vt_emask_xim;
1113 1096
1114 void vt_select_input () const NOTHROW 1097 void vt_select_input () const NOTHROW
1115 { 1098 {
1116 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1099 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 } 1100 }
1118 1101
1119#if TRANSPARENT 1102#if ENABLE_TRANSPARENCY || ENABLE_PERL
1120 void rootwin_cb (XEvent &xev); 1103 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1104 xevent_watcher rootwin_ev;
1105#endif
1106#if ENABLE_TRANSPARENCY
1107 int check_our_parents ();
1108 void check_our_parents_cb (time_watcher &w);
1109 time_watcher check_our_parents_ev;
1122#endif 1110#endif
1123 1111
1124 void x_cb (XEvent &xev); 1112 void x_cb (XEvent &xev);
1125 void flush (); 1113 void flush ();
1126 xevent_watcher termwin_ev; 1114 xevent_watcher termwin_ev;
… …
1186 bool pty_fill (); 1174 bool pty_fill ();
1187 1175
1188 void make_current () const // make this the "currently active" urxvt instance 1176 void make_current () const // make this the "currently active" urxvt instance
1189 { 1177 {
1190 SET_R (this); 1178 SET_R (this);
1179 set_environ (envv);
1191 rxvt_set_locale (locale); 1180 rxvt_set_locale (locale);
1192 set_environ (envv);
1193 } 1181 }
1194 1182
1195 void init_secondary (); 1183 void init_secondary ();
1196 const char **init_resources (int argc, const char *const *argv); 1184 const char **init_resources (int argc, const char *const *argv);
1197 const char *x_resource (const char *name); 1185 const char *x_resource (const char *name);
… …
1222 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1210 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1223 1211
1224 bool IMisRunning (); 1212 bool IMisRunning ();
1225 void IMSendSpot (); 1213 void IMSendSpot ();
1226 bool IM_get_IC (const char *modifiers); 1214 bool IM_get_IC (const char *modifiers);
1227 void IMSetStatusPosition (); 1215 void IMSetPosition ();
1228#endif 1216#endif
1229 1217
1230 void resize_scrollbar (); 1218 void resize_scrollbar ();
1231 1219
1232 // command.C 1220 // command.C
1233 void lookup_key (XKeyEvent &ev); 1221 void key_press (XKeyEvent &ev);
1222 void key_release (XKeyEvent &ev);
1234 unsigned int cmd_write (const char *str, unsigned int count); 1223 unsigned int cmd_write (const char *str, unsigned int count);
1235 1224
1236 wchar_t next_char () NOTHROW; 1225 wchar_t next_char () NOTHROW;
1237 wchar_t cmd_getc () THROW ((class out_of_input)); 1226 wchar_t cmd_getc () THROW ((class out_of_input));
1238 uint32_t next_octet () NOTHROW; 1227 uint32_t next_octet () NOTHROW;
… …
1242 void mouse_report (XButtonEvent &ev); 1231 void mouse_report (XButtonEvent &ev);
1243 void button_press (XButtonEvent &ev); 1232 void button_press (XButtonEvent &ev);
1244 void button_release (XButtonEvent &ev); 1233 void button_release (XButtonEvent &ev);
1245 void focus_in (); 1234 void focus_in ();
1246 void focus_out (); 1235 void focus_out ();
1247 int check_our_parents (); 1236 void update_fade_color (unsigned int idx);
1248#ifdef PRINTPIPE 1237#ifdef PRINTPIPE
1249 FILE *popen_printer (); 1238 FILE *popen_printer ();
1250 int pclose_printer (FILE *stream); 1239 int pclose_printer (FILE *stream);
1251#endif 1240#endif
1252 void process_print_pipe (); 1241 void process_print_pipe ();
… …
1273 void set_utf8_property (Atom prop, const char *str, int len = -1); 1262 void set_utf8_property (Atom prop, const char *str, int len = -1);
1274 void set_title (const char *str); 1263 void set_title (const char *str);
1275 void set_icon_name (const char *str); 1264 void set_icon_name (const char *str);
1276 void set_window_color (int idx, const char *color); 1265 void set_window_color (int idx, const char *color);
1277 void set_colorfgbg (); 1266 void set_colorfgbg ();
1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1267 bool set_color (rxvt_color &color, const char *name);
1268 void alias_color (int dst, int src);
1279 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1269 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1280 1270
1281 // screen.C 1271 // screen.C
1282 1272
1283 void lalloc (line_t &l) const 1273 void lalloc (line_t &l) const
… …
1312 { 1302 {
1313 int base = GET_BASEFG (r); 1303 int base = GET_BASEFG (r);
1314#ifndef NO_BRIGHTCOLOR 1304#ifndef NO_BRIGHTCOLOR
1315 if (r & RS_Bold 1305 if (r & RS_Bold
1316# if ENABLE_STYLES 1306# if ENABLE_STYLES
1317 && OPTION (Opt_intensityStyles) 1307 && option (Opt_intensityStyles)
1318# endif 1308# endif
1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1309 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1320 base += minBrightCOLOR - minCOLOR; 1310 base += minBrightCOLOR - minCOLOR;
1321#endif 1311#endif
1322 return base; 1312 return base;
… …
1326 { 1316 {
1327 int base = GET_BASEBG (r); 1317 int base = GET_BASEBG (r);
1328#ifndef NO_BRIGHTCOLOR 1318#ifndef NO_BRIGHTCOLOR
1329 if (r & RS_Blink 1319 if (r & RS_Blink
1330# if ENABLE_STYLES 1320# if ENABLE_STYLES
1331 && OPTION (Opt_intensityStyles) 1321 && option (Opt_intensityStyles)
1332# endif 1322# endif
1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1323 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1334 base += minBrightCOLOR - minCOLOR; 1324 base += minBrightCOLOR - minCOLOR;
1335#endif 1325#endif
1336 return base; 1326 return base;
1337 } 1327 }
1338 1328
1339 bool option (uint32_t opt) const NOTHROW 1329 bool option (uint8_t opt) const NOTHROW
1340 { 1330 {
1341 return OPTION (opt); 1331 return options[opt >> 3] & (1 << (opt & 7));
1342 } 1332 }
1343 1333
1344 void set_option (uint32_t opt, bool set) NOTHROW 1334 void set_option (uint8_t opt, bool set = true) NOTHROW
1345 { 1335 {
1346 if (set) 1336 if (set)
1347 options |= opt; 1337 options[opt >> 3] |= (1 << (opt & 7));
1348 else 1338 else
1349 options &= ~opt; 1339 options[opt >> 3] &= ~(1 << (opt & 7));
1350 } 1340 }
1351 1341
1352 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1342 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1353 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1343 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1354 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1344 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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