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.293 by sasha, Thu Aug 16 21:26:20 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 {
178
179 enum {
180 geometrySet = (1UL<<0),
181 propScale = (1UL<<1),
182 geometryFlags = (geometrySet|propScale),
183
184 tintSet = (1UL<<8),
185 tintNeeded = (1UL<<9),
186 tintServerSide = (1UL<<10),
187 tintFlags = (tintSet|tintServerSide|tintNeeded),
188 blurNeeded = (1UL<<11),
189
190 isTransparent = (1UL<<16),
191 isInvalid = (1UL<<17)
192 };
193
194 unsigned long flags;
195
189#ifdef XPM_BACKGROUND 196# ifdef XPM_BACKGROUND
190typedef struct { 197# ifdef HAVE_AFTERIMAGE
191 short w, h, x, y; 198 ASImage *original_asim;
199 bool render_asim (ASImage *background, ARGB32 background_tint);
200# endif
201
202 enum { defaultScale = 100, defaultAlign = 50 };
203
204 unsigned int h_scale, v_scale;/* percents of the window size */
205 int h_align, v_align; /* percents of the window size:
206 0 - left align, 50 - center, 100 - right */
207 void unset_geometry () { flags = flags & ~geometryFlags; };
208 bool set_geometry (const char *geom);
209 void set_defaultGeometry ()
210 {
211 h_scale = v_scale = defaultScale;
212 h_align = v_align = defaultAlign;
213 flags |= geometrySet;
214 };
215
216 bool set_file (const char *file);
217# endif /* XPM_BACKGROUND */
218
219 rxvt_term *target;
220 bool set_target (rxvt_term *new_target);
221
222# ifdef ENABLE_TRANSPARENCY
223 int root_depth; /* obtained when target is set */
224 Pixmap root_pixmap; /* current root pixmap set */
225 rxvt_color tint;
226 int shade;
227 int h_blurRadius, v_blurRadius;
228
229 bool set_transparent ();
230 bool set_blur_radius (const char *geom);
231 bool set_tint (rxvt_color &new_tint);
232 bool unset_tint ();
233 bool set_shade (const char *shade_str);
234 bool set_root_pixmap ();
235
236 enum {
237 transpPmapTiled = (1UL<<0),
238 transpPmapTinted = tintNeeded,
239 transpPmapBlured = blurNeeded,
240 transpTransformations = (tintNeeded|blurNeeded)
241 };
242 unsigned long make_transparency_pixmap ();/* returns combination of the above flags */
243# endif
244 double invalid_since;
245
192 Pixmap pixmap; 246 Pixmap pixmap;
193} bgPixmap_t; 247 unsigned int pmap_width, pmap_height;
248 unsigned int pmap_depth;
249
250 bool window_size_sensitive ();
251 bool need_client_side_rendering ();
252 void apply ();
253 bool render ();
254 void invalidate () {
255 if (!(flags & isInvalid))
256 {
257 flags |= isInvalid;
258 invalid_since = NOW;
259 }
260 };
261};
262#else
263# undef HAVE_BG_PIXMAP
194#endif 264#endif
195 265
196/* 266/*
197 * the 'essential' information for reporting Mouse Events 267 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 268 * pared down from XButtonEvent
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 589 * 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 590 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 591 */
522 592
523enum colour_list { 593enum colour_list {
594 Color_none = -2,
595 Color_transparent = -1,
524 Color_fg = 0, 596 Color_fg = 0,
525 Color_bg, 597 Color_bg,
526 minCOLOR, /* 2 */ 598 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 599 Color_Black = minCOLOR,
528 Color_Red3, 600 Color_Red3,
… …
570#endif 642#endif
571#ifdef KEEP_SCROLLCOLOR 643#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 644 Color_scroll,
573 Color_trough, 645 Color_trough,
574#endif 646#endif
575#if TINTING 647#if ENABLE_TRANSPARENCY
576 Color_tint, 648 Color_tint,
577#endif 649#endif
578#if OFF_FOCUS_FADING 650#if OFF_FOCUS_FADING
579 Color_fade, 651 Color_fade,
580#endif 652#endif
… …
587 TOTAL_COLORS = NRS_COLORS 659 TOTAL_COLORS = NRS_COLORS
588#endif 660#endif
589}; 661};
590 662
591#define Color_Bits 7 // 0 .. maxTermCOLOR 663#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 664
596/* 665/*
597 * Resource list 666 * Resource list
598 */ 667 */
599enum { 668enum {
… …
684 * MACRO DEFINES 753 * MACRO DEFINES
685 ***************************************************************************** 754 *****************************************************************************
686 */ 755 */
687#define dLocal(type,name) type const name = this->name 756#define dLocal(type,name) type const name = this->name
688 757
689// for speed reasons, we assume that all latin1 characters 758// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 759// single-width.
691// is actually 0x300, but ascii is what matters most). 760#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 761
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 762/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 763#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 764#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 765#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 767#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 768#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 769#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 770#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 771
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 772// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 773#define MOD(m,n) (((m) + (n)) % (n))
711 774
712#define LINENO(n) MOD (term_start + int(n), total_rows) 775#define LINENO(n) MOD (term_start + int(n), total_rows)
713#define ROW(n) row_buf [LINENO (n)] 776#define ROW(n) row_buf [LINENO (n)]
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 794#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 795#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 796
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 797#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 798
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 799#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 800#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 801
739#if ENABLE_STYLES 802#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 803# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 804#else
742# define FONTSET(style) fontset[0] 805# define FONTSET(style) fontset[0]
… …
770#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 833#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
771#define scrollbar_position(y) ((y) - scrollBar.beg) 834#define scrollbar_position(y) ((y) - scrollBar.beg)
772#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 835#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773 - scrollbar_minheight ()) 836 - scrollbar_minheight ())
774 837
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; 838typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 839typedef callback<int (int)> getfd_callback;
783 840
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 841#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 842extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 843extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 844extern void rxvt_pop_locale () NOTHROW;
… …
789/****************************************************************************/ 846/****************************************************************************/
790 847
791#define LINE_LONGER 0x0001 // line is continued on the next row 848#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 849#define LINE_FILTERED 0x0002 // line has been filtered
793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 850#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
851#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
852#define LINE_BIDI 0x0010 // line needs bidi (NYI)
794 853
795struct line_t { 854struct line_t {
796 text_t *t; // terminal the text 855 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 856 rend_t *r; // rendition, uses RS_ flags
798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 857 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
852# define COMPOSE_LO 0x40000000UL 911# define COMPOSE_LO 0x40000000UL
853# define COMPOSE_HI 0x400fffffUL 912# define COMPOSE_HI 0x400fffffUL
854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 913# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
855#else 914#else
856# if ENABLE_PERL 915# if ENABLE_PERL
857# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 916# 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 917# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
859# else 918# else
860# define COMPOSE_LO 0xd800UL 919# define COMPOSE_LO 0xd800UL
861# define COMPOSE_HI 0xf8ffUL 920# define COMPOSE_HI 0xf8ffUL
862# endif 921# endif
… …
891#endif 950#endif
892 951
893/****************************************************************************/ 952/****************************************************************************/
894 953
895#ifdef KEYSYM_RESOURCE 954#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 955class keyboard_manager;
897#endif 956#endif
898 957
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 958struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
959
960 // special markers with magic addresses
961 static const char resval_undef []; // options specifically unset
962 static const char resval_on []; // boolean options switched on
963 static const char resval_off []; // or off
964
900 log_callback *log_hook; // log error messages through this hook, if != 0 965 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 966 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 967#if ENABLE_PERL
903 rxvt_perl_term perl; 968 rxvt_perl_term perl;
904#endif 969#endif
905 struct mbstate mbstate; // current input multibyte state 970 struct mbstate mbstate; // current input multibyte state
906 971
907 unsigned char want_refresh:1, 972 unsigned char want_refresh:1,
908#ifdef TRANSPARENT 973#ifdef ENABLE_TRANSPARENCY
909 want_full_refresh:1, /* awaiting full screen refresh */ 974 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 */ 975 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */ 976 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif 977#endif
915 current_screen:1, /* primary or secondary */ 978 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 979 num_scr_allow:1,
… …
945 int prev_ncol, /* screen: previous number of columns */ 1008 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 1009 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 1010/* ---------- */
948 rend_t rstyle; 1011 rend_t rstyle;
949/* ---------- */ 1012/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */
952#ifdef SELECTION_SCROLLING 1013#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 1014 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 1015 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 1016 int selection_save_x,
956 selection_save_y, 1017 selection_save_y,
… …
961 /* give proper Scroll behaviour */ 1022 /* give proper Scroll behaviour */
962#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1023#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
963 mouse_slip_wheel_speed, 1024 mouse_slip_wheel_speed,
964#endif 1025#endif
965 refresh_count, 1026 refresh_count,
966 refresh_limit,
967 last_bot, /* scrollbar last bottom position */ 1027 last_bot, /* scrollbar last bottom position */
968 last_top, /* scrollbar last top position */ 1028 last_top, /* scrollbar last top position */
969 last_state, /* scrollbar last state */ 1029 last_state, /* scrollbar last state */
970 scrollbar_len, 1030 scrollbar_len,
971 window_vt_x, 1031 window_vt_x,
… …
1027#endif 1087#endif
1028 struct mouse_event MEvent; 1088 struct mouse_event MEvent;
1029 XComposeStatus compose; 1089 XComposeStatus compose;
1030 ttymode_t tio; 1090 ttymode_t tio;
1031 row_col_t oldcursor; 1091 row_col_t oldcursor;
1032#ifdef XPM_BACKGROUND 1092#ifdef HAVE_BG_PIXMAP
1033 bgPixmap_t bgPixmap; 1093 bgPixmap_t bgPixmap;
1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1094#endif
1095#ifdef HAVE_AFTERIMAGE
1096 ASVisual *asv;
1097 ASImageManager *asimman;
1035#endif 1098#endif
1036 1099
1037#if ENABLE_OVERLAY 1100#if ENABLE_OVERLAY
1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1101 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1039 text_t **ov_text; 1102 text_t **ov_text;
… …
1094 1157
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1158 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1159
1097 void vt_select_input () const NOTHROW 1160 void vt_select_input () const NOTHROW
1098 { 1161 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1162 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1163 }
1101 1164
1102#if TRANSPARENT 1165#if ENABLE_TRANSPARENCY || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1166 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1167 xevent_watcher rootwin_ev;
1168#endif
1169#ifdef HAVE_BG_PIXMAP
1170 int update_background ();
1171 void update_background_cb (time_watcher &w);
1172 time_watcher update_background_ev;
1105#endif 1173#endif
1106 1174
1107 void x_cb (XEvent &xev); 1175 void x_cb (XEvent &xev);
1108 void flush (); 1176 void flush ();
1109 xevent_watcher termwin_ev; 1177 xevent_watcher termwin_ev;
… …
1169 bool pty_fill (); 1237 bool pty_fill ();
1170 1238
1171 void make_current () const // make this the "currently active" urxvt instance 1239 void make_current () const // make this the "currently active" urxvt instance
1172 { 1240 {
1173 SET_R (this); 1241 SET_R (this);
1242 set_environ (envv);
1174 rxvt_set_locale (locale); 1243 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1244 }
1177 1245
1178 void init_secondary (); 1246 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1247 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name); 1248 const char *x_resource (const char *name);
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1273 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1274
1207 bool IMisRunning (); 1275 bool IMisRunning ();
1208 void IMSendSpot (); 1276 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1277 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1278 void IMSetPosition ();
1211#endif 1279#endif
1212 1280
1213 void resize_scrollbar (); 1281 void resize_scrollbar ();
1214 1282
1215 // command.C 1283 // command.C
1216 void lookup_key (XKeyEvent &ev); 1284 void key_press (XKeyEvent &ev);
1285 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1286 unsigned int cmd_write (const char *str, unsigned int count);
1218 1287
1219 wchar_t next_char () NOTHROW; 1288 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1289 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1290 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1294 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1295 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1296 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1297 void focus_in ();
1229 void focus_out (); 1298 void focus_out ();
1230 int check_our_parents (); 1299 void update_fade_color (unsigned int idx);
1231#ifdef PRINTPIPE 1300#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1301 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1302 int pclose_printer (FILE *stream);
1234#endif 1303#endif
1235 void process_print_pipe (); 1304 void process_print_pipe ();
… …
1256 void set_utf8_property (Atom prop, const char *str, int len = -1); 1325 void set_utf8_property (Atom prop, const char *str, int len = -1);
1257 void set_title (const char *str); 1326 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1327 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1328 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1329 void set_colorfgbg ();
1261 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1330 bool set_color (rxvt_color &color, const char *name);
1331 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1332 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1263 1333
1264 // screen.C 1334 // screen.C
1265 1335
1266 void lalloc (line_t &l) const 1336 void lalloc (line_t &l) const
… …
1295 { 1365 {
1296 int base = GET_BASEFG (r); 1366 int base = GET_BASEFG (r);
1297#ifndef NO_BRIGHTCOLOR 1367#ifndef NO_BRIGHTCOLOR
1298 if (r & RS_Bold 1368 if (r & RS_Bold
1299# if ENABLE_STYLES 1369# if ENABLE_STYLES
1300 && OPTION (Opt_intensityStyles) 1370 && option (Opt_intensityStyles)
1301# endif 1371# endif
1302 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1372 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1303 base += minBrightCOLOR - minCOLOR; 1373 base += minBrightCOLOR - minCOLOR;
1304#endif 1374#endif
1305 return base; 1375 return base;
… …
1309 { 1379 {
1310 int base = GET_BASEBG (r); 1380 int base = GET_BASEBG (r);
1311#ifndef NO_BRIGHTCOLOR 1381#ifndef NO_BRIGHTCOLOR
1312 if (r & RS_Blink 1382 if (r & RS_Blink
1313# if ENABLE_STYLES 1383# if ENABLE_STYLES
1314 && OPTION (Opt_intensityStyles) 1384 && option (Opt_intensityStyles)
1315# endif 1385# endif
1316 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1386 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1317 base += minBrightCOLOR - minCOLOR; 1387 base += minBrightCOLOR - minCOLOR;
1318#endif 1388#endif
1319 return base; 1389 return base;
1320 } 1390 }
1321 1391
1322 bool option (uint32_t opt) const NOTHROW 1392 bool option (uint8_t opt) const NOTHROW
1323 { 1393 {
1324 return OPTION (opt); 1394 return options[opt >> 3] & (1 << (opt & 7));
1325 } 1395 }
1326 1396
1327 void set_option (uint32_t opt, bool set) NOTHROW 1397 void set_option (uint8_t opt, bool set = true) NOTHROW
1328 { 1398 {
1329 if (set) 1399 if (set)
1330 options |= opt; 1400 options[opt >> 3] |= (1 << (opt & 7));
1331 else 1401 else
1332 options &= ~opt; 1402 options[opt >> 3] &= ~(1 << (opt & 7));
1333 } 1403 }
1334 1404
1335 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1405 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; 1406 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; 1407 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1443 void get_options (int argc, const char *const *argv); 1513 void get_options (int argc, const char *const *argv);
1444 int parse_keysym (const char *str, const char *arg); 1514 int parse_keysym (const char *str, const char *arg);
1445 void get_xdefaults (FILE *stream, const char *name); 1515 void get_xdefaults (FILE *stream, const char *name);
1446 void extract_resources (); 1516 void extract_resources ();
1447 // xpm.C 1517 // xpm.C
1448 int scale_pixmap (const char *geom); 1518 void get_window_origin (int &x, int &y);
1449 void resize_pixmap (); 1519 Pixmap get_pixmap_property (int prop_id);
1450 Pixmap set_bgPixmap (const char *file);
1451}; 1520};
1452 1521
1453/* 1522/*
1454 ***************************************************************************** 1523 *****************************************************************************
1455 * PROTOTYPES 1524 * PROTOTYPES

Diff Legend

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