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

Diff Legend

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