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.288 by sasha, Tue Aug 7 22:43:33 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
183 bool render_asim (rxvt_term *target, ASImage *background, ARGB32 background_tint);
184# endif
185
186#define bgPmap_defaultScale 100
187#define bgPmap_defaultAlign 50
188 unsigned int h_scale, v_scale;/* percents of the window size */
189 int h_align, v_align; /* percents of the window size:
190 0 - left align, 50 - center, 100 - right */
191
192 bool handle_geometry (const char *geom);
193 void set_defaultGeometry ()
194 {
195 h_scale = v_scale = bgPmap_defaultScale;
196 h_align = v_align = bgPmap_defaultAlign;
197 };
198
199# endif
200
201# define bgPmap_geometrySet (1UL<<0)
202# define bgPmap_propScale (1UL<<1)
203# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_propScale)
204
205# define bgPmap_Transparent (1UL<<16)
206 unsigned long flags;
207
192 Pixmap pixmap; 208 Pixmap pixmap;
193} bgPixmap_t; 209 unsigned int pmap_width, pmap_height;
210 unsigned int pmap_depth;
211
212 bool window_size_sensitive();
213
214};
215#else
216# undef HAVE_BG_PIXMAP
194#endif 217#endif
195 218
196/* 219/*
197 * the 'essential' information for reporting Mouse Events 220 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 221 * pared down from XButtonEvent
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 542 * 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 543 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 544 */
522 545
523enum colour_list { 546enum colour_list {
547 Color_none = -2,
548 Color_transparent = -1,
524 Color_fg = 0, 549 Color_fg = 0,
525 Color_bg, 550 Color_bg,
526 minCOLOR, /* 2 */ 551 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 552 Color_Black = minCOLOR,
528 Color_Red3, 553 Color_Red3,
… …
570#endif 595#endif
571#ifdef KEEP_SCROLLCOLOR 596#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 597 Color_scroll,
573 Color_trough, 598 Color_trough,
574#endif 599#endif
575#if TINTING 600#if ENABLE_TRANSPARENCY
576 Color_tint, 601 Color_tint,
577#endif 602#endif
578#if OFF_FOCUS_FADING 603#if OFF_FOCUS_FADING
579 Color_fade, 604 Color_fade,
580#endif 605#endif
… …
587 TOTAL_COLORS = NRS_COLORS 612 TOTAL_COLORS = NRS_COLORS
588#endif 613#endif
589}; 614};
590 615
591#define Color_Bits 7 // 0 .. maxTermCOLOR 616#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 617
596/* 618/*
597 * Resource list 619 * Resource list
598 */ 620 */
599enum { 621enum {
… …
684 * MACRO DEFINES 706 * MACRO DEFINES
685 ***************************************************************************** 707 *****************************************************************************
686 */ 708 */
687#define dLocal(type,name) type const name = this->name 709#define dLocal(type,name) type const name = this->name
688 710
689// for speed reasons, we assume that all latin1 characters 711// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 712// single-width.
691// is actually 0x300, but ascii is what matters most). 713#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 714
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 715/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 716#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 717#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 718#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 720#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 721#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 722#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 723#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 724
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 725// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 726#define MOD(m,n) (((m) + (n)) % (n))
711 727
712#define LINENO(n) MOD (term_start + int(n), total_rows) 728#define LINENO(n) MOD (term_start + int(n), total_rows)
713#define ROW(n) row_buf [LINENO (n)] 729#define ROW(n) row_buf [LINENO (n)]
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 747#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 748#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 749
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 750#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 751
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 752#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 753#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 754
739#if ENABLE_STYLES 755#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 756# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 757#else
742# define FONTSET(style) fontset[0] 758# define FONTSET(style) fontset[0]
… …
770#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 786#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
771#define scrollbar_position(y) ((y) - scrollBar.beg) 787#define scrollbar_position(y) ((y) - scrollBar.beg)
772#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 788#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773 - scrollbar_minheight ()) 789 - scrollbar_minheight ())
774 790
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; 791typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 792typedef callback<int (int)> getfd_callback;
783 793
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 794#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 795extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 796extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 797extern void rxvt_pop_locale () NOTHROW;
… …
789/****************************************************************************/ 799/****************************************************************************/
790 800
791#define LINE_LONGER 0x0001 // line is continued on the next row 801#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 802#define LINE_FILTERED 0x0002 // line has been filtered
793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 803#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
804#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
805#define LINE_BIDI 0x0010 // line needs bidi (NYI)
794 806
795struct line_t { 807struct line_t {
796 text_t *t; // terminal the text 808 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 809 rend_t *r; // rendition, uses RS_ flags
798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 810 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
852# define COMPOSE_LO 0x40000000UL 864# define COMPOSE_LO 0x40000000UL
853# define COMPOSE_HI 0x400fffffUL 865# define COMPOSE_HI 0x400fffffUL
854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 866# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
855#else 867#else
856# if ENABLE_PERL 868# if ENABLE_PERL
857# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 869# 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 870# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
859# else 871# else
860# define COMPOSE_LO 0xd800UL 872# define COMPOSE_LO 0xd800UL
861# define COMPOSE_HI 0xf8ffUL 873# define COMPOSE_HI 0xf8ffUL
862# endif 874# endif
… …
891#endif 903#endif
892 904
893/****************************************************************************/ 905/****************************************************************************/
894 906
895#ifdef KEYSYM_RESOURCE 907#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 908class keyboard_manager;
897#endif 909#endif
898 910
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 911struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
912
913 // special markers with magic addresses
914 static const char resval_undef []; // options specifically unset
915 static const char resval_on []; // boolean options switched on
916 static const char resval_off []; // or off
917
900 log_callback *log_hook; // log error messages through this hook, if != 0 918 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 919 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 920#if ENABLE_PERL
903 rxvt_perl_term perl; 921 rxvt_perl_term perl;
904#endif 922#endif
905 struct mbstate mbstate; // current input multibyte state 923 struct mbstate mbstate; // current input multibyte state
906 924
907 unsigned char want_refresh:1, 925 unsigned char want_refresh:1,
908#ifdef TRANSPARENT 926#ifdef ENABLE_TRANSPARENCY
909 want_full_refresh:1, /* awaiting full screen refresh */ 927 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 */ 928 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */ 929 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif 930#endif
915 current_screen:1, /* primary or secondary */ 931 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 932 num_scr_allow:1,
… …
945 int prev_ncol, /* screen: previous number of columns */ 961 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 962 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 963/* ---------- */
948 rend_t rstyle; 964 rend_t rstyle;
949/* ---------- */ 965/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */
952#ifdef SELECTION_SCROLLING 966#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 967 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 968 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 969 int selection_save_x,
956 selection_save_y, 970 selection_save_y,
… …
961 /* give proper Scroll behaviour */ 975 /* give proper Scroll behaviour */
962#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 976#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
963 mouse_slip_wheel_speed, 977 mouse_slip_wheel_speed,
964#endif 978#endif
965 refresh_count, 979 refresh_count,
966 refresh_limit,
967 last_bot, /* scrollbar last bottom position */ 980 last_bot, /* scrollbar last bottom position */
968 last_top, /* scrollbar last top position */ 981 last_top, /* scrollbar last top position */
969 last_state, /* scrollbar last state */ 982 last_state, /* scrollbar last state */
970 scrollbar_len, 983 scrollbar_len,
971 window_vt_x, 984 window_vt_x,
… …
1027#endif 1040#endif
1028 struct mouse_event MEvent; 1041 struct mouse_event MEvent;
1029 XComposeStatus compose; 1042 XComposeStatus compose;
1030 ttymode_t tio; 1043 ttymode_t tio;
1031 row_col_t oldcursor; 1044 row_col_t oldcursor;
1032#ifdef XPM_BACKGROUND 1045#ifdef HAVE_BG_PIXMAP
1033 bgPixmap_t bgPixmap; 1046 bgPixmap_t bgPixmap;
1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1047#endif
1048#ifdef HAVE_AFTERIMAGE
1049 ASVisual *asv;
1050 ASImageManager *asimman;
1035#endif 1051#endif
1036 1052
1037#if ENABLE_OVERLAY 1053#if ENABLE_OVERLAY
1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1054 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1039 text_t **ov_text; 1055 text_t **ov_text;
… …
1094 1110
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1111 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1112
1097 void vt_select_input () const NOTHROW 1113 void vt_select_input () const NOTHROW
1098 { 1114 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1115 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1116 }
1101 1117
1102#if TRANSPARENT 1118#if ENABLE_TRANSPARENCY || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1119 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1120 xevent_watcher rootwin_ev;
1121#endif
1122#if ENABLE_TRANSPARENCY
1123 int check_our_parents ();
1124 void check_our_parents_cb (time_watcher &w);
1125 time_watcher check_our_parents_ev;
1105#endif 1126#endif
1106 1127
1107 void x_cb (XEvent &xev); 1128 void x_cb (XEvent &xev);
1108 void flush (); 1129 void flush ();
1109 xevent_watcher termwin_ev; 1130 xevent_watcher termwin_ev;
… …
1169 bool pty_fill (); 1190 bool pty_fill ();
1170 1191
1171 void make_current () const // make this the "currently active" urxvt instance 1192 void make_current () const // make this the "currently active" urxvt instance
1172 { 1193 {
1173 SET_R (this); 1194 SET_R (this);
1195 set_environ (envv);
1174 rxvt_set_locale (locale); 1196 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1197 }
1177 1198
1178 void init_secondary (); 1199 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1200 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name); 1201 const char *x_resource (const char *name);
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1226 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1227
1207 bool IMisRunning (); 1228 bool IMisRunning ();
1208 void IMSendSpot (); 1229 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1230 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1231 void IMSetPosition ();
1211#endif 1232#endif
1212 1233
1213 void resize_scrollbar (); 1234 void resize_scrollbar ();
1214 1235
1215 // command.C 1236 // command.C
1216 void lookup_key (XKeyEvent &ev); 1237 void key_press (XKeyEvent &ev);
1238 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1239 unsigned int cmd_write (const char *str, unsigned int count);
1218 1240
1219 wchar_t next_char () NOTHROW; 1241 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1242 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1243 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1247 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1248 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1249 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1250 void focus_in ();
1229 void focus_out (); 1251 void focus_out ();
1230 int check_our_parents (); 1252 void update_fade_color (unsigned int idx);
1231#ifdef PRINTPIPE 1253#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1254 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1255 int pclose_printer (FILE *stream);
1234#endif 1256#endif
1235 void process_print_pipe (); 1257 void process_print_pipe ();
… …
1256 void set_utf8_property (Atom prop, const char *str, int len = -1); 1278 void set_utf8_property (Atom prop, const char *str, int len = -1);
1257 void set_title (const char *str); 1279 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1280 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1281 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1282 void set_colorfgbg ();
1261 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1283 bool set_color (rxvt_color &color, const char *name);
1284 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1285 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1263 1286
1264 // screen.C 1287 // screen.C
1265 1288
1266 void lalloc (line_t &l) const 1289 void lalloc (line_t &l) const
… …
1295 { 1318 {
1296 int base = GET_BASEFG (r); 1319 int base = GET_BASEFG (r);
1297#ifndef NO_BRIGHTCOLOR 1320#ifndef NO_BRIGHTCOLOR
1298 if (r & RS_Bold 1321 if (r & RS_Bold
1299# if ENABLE_STYLES 1322# if ENABLE_STYLES
1300 && OPTION (Opt_intensityStyles) 1323 && option (Opt_intensityStyles)
1301# endif 1324# endif
1302 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1325 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1303 base += minBrightCOLOR - minCOLOR; 1326 base += minBrightCOLOR - minCOLOR;
1304#endif 1327#endif
1305 return base; 1328 return base;
… …
1309 { 1332 {
1310 int base = GET_BASEBG (r); 1333 int base = GET_BASEBG (r);
1311#ifndef NO_BRIGHTCOLOR 1334#ifndef NO_BRIGHTCOLOR
1312 if (r & RS_Blink 1335 if (r & RS_Blink
1313# if ENABLE_STYLES 1336# if ENABLE_STYLES
1314 && OPTION (Opt_intensityStyles) 1337 && option (Opt_intensityStyles)
1315# endif 1338# endif
1316 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1339 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1317 base += minBrightCOLOR - minCOLOR; 1340 base += minBrightCOLOR - minCOLOR;
1318#endif 1341#endif
1319 return base; 1342 return base;
1320 } 1343 }
1321 1344
1322 bool option (uint32_t opt) const NOTHROW 1345 bool option (uint8_t opt) const NOTHROW
1323 { 1346 {
1324 return OPTION (opt); 1347 return options[opt >> 3] & (1 << (opt & 7));
1325 } 1348 }
1326 1349
1327 void set_option (uint32_t opt, bool set) NOTHROW 1350 void set_option (uint8_t opt, bool set = true) NOTHROW
1328 { 1351 {
1329 if (set) 1352 if (set)
1330 options |= opt; 1353 options[opt >> 3] |= (1 << (opt & 7));
1331 else 1354 else
1332 options &= ~opt; 1355 options[opt >> 3] &= ~(1 << (opt & 7));
1333 } 1356 }
1334 1357
1335 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1358 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; 1359 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; 1360 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1443 void get_options (int argc, const char *const *argv); 1466 void get_options (int argc, const char *const *argv);
1444 int parse_keysym (const char *str, const char *arg); 1467 int parse_keysym (const char *str, const char *arg);
1445 void get_xdefaults (FILE *stream, const char *name); 1468 void get_xdefaults (FILE *stream, const char *name);
1446 void extract_resources (); 1469 void extract_resources ();
1447 // xpm.C 1470 // xpm.C
1448 int scale_pixmap (const char *geom); 1471//int scale_pixmap (const char *geom);
1449 void resize_pixmap (); 1472 void resize_pixmap ();
1450 Pixmap set_bgPixmap (const char *file); 1473 void set_bgPixmap (const char *file);
1451}; 1474};
1452 1475
1453/* 1476/*
1454 ***************************************************************************** 1477 *****************************************************************************
1455 * PROTOTYPES 1478 * PROTOTYPES

Diff Legend

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