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.417 by root, Tue Nov 23 22:58:09 2010 UTC vs.
Revision 1.530 by sf-exg, Fri May 2 20:34:24 2014 UTC

1#ifndef RXVT_H_ /* include once only */ 1#ifndef RXVT_H_ /* include once only */
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include <cstdio> 4#include <stdio.h>
5#include <cctype> 5#include <ctype.h>
6#include <cerrno> 6#include <errno.h>
7#include <cstdarg> 7#include <stdarg.h>
8#include <cstdlib> 8#include <stdlib.h>
9#ifdef HAVE_STDINT_H 9#ifdef HAVE_STDINT_H
10#include <stdint.h> 10#include <stdint.h>
11#endif 11#endif
12#include <sys/types.h> 12#include <sys/types.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <cstring> 14#include <string.h>
15#include <assert.h> 15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H 16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h> 17#include <sys/ioctl.h>
18#endif 18#endif
19#ifdef HAVE_SYS_STRREDIR_H 19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h> 20#include <sys/strredir.h>
21#endif 21#endif
22 22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H 23#if HAVE_WCHAR_H
26# include <wchar.h> 24# include <wchar.h>
27#else 25#else
28// stdlib.h might provide it 26// stdlib.h might provide it
29#endif 27#endif
30 28
31using namespace std; 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 30
33extern "C" { 31extern "C" {
34#include <X11/Xlib.h> 32#include <X11/Xlib.h>
35#include <X11/Xutil.h> 33#include <X11/Xutil.h>
36#include <X11/Xresource.h> 34#include <X11/Xresource.h>
… …
47 45
48#include "feature.h" 46#include "feature.h"
49 47
50#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
51# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
52#endif 51#endif
53 52
54#if ENABLE_PERL 53#if ENABLE_PERL
55# define ENABLE_FRILLS 1 54# define ENABLE_FRILLS 1
56# define ENABLE_COMBINING 1 55# define ENABLE_COMBINING 1
… …
72#include <X11/cursorfont.h> 71#include <X11/cursorfont.h>
73#include <X11/keysym.h> 72#include <X11/keysym.h>
74#include <X11/keysymdef.h> 73#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 74#include <X11/Xatom.h>
76 75
76#if HAVE_PIXBUF
77# include <gdk-pixbuf/gdk-pixbuf.h>
78#endif
79
80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
81# define HAVE_BG_PIXMAP 1
82# define HAVE_IMG 1
83#endif
84
85#if HAVE_BG_PIXMAP
86# if HAVE_PIXBUF
87# define BG_IMAGE_FROM_FILE 1
88# endif
89# if ENABLE_TRANSPARENCY
90# define BG_IMAGE_FROM_ROOT 1
91# endif
92#endif
93
94#include <ecb.h>
77#include "encoding.h" 95#include "encoding.h"
78#include "rxvtutil.h" 96#include "rxvtutil.h"
79#include "rxvtfont.h" 97#include "rxvtfont.h"
80#include "rxvttoolkit.h" 98#include "rxvttoolkit.h"
99#include "rxvtimg.h"
81#include "scrollbar.h" 100#include "scrollbar.h"
82#include "ev_cpp.h" 101#include "ev_cpp.h"
83#include "salloc.h"
84#include "libptytty.h" 102#include "libptytty.h"
85 103
86#include "rxvtperl.h" 104#include "rxvtperl.h"
87 105
88// try to avoid some macros to decrease code size, on some systems 106// try to avoid some macros to decrease code size, on some systems
… …
98 ***************************************************************************** 116 *****************************************************************************
99 * SYSTEM HACKS 117 * SYSTEM HACKS
100 ***************************************************************************** 118 *****************************************************************************
101 */ 119 */
102 120
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 121#include <termios.h>
108
109#include "background.h"
110 122
111#ifndef STDIN_FILENO 123#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 124# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 125# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 126# define STDERR_FILENO 2
115#endif 127#endif
116 128
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 129#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 130# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 131# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 132#endif
125 133
126/****************************************************************************/ 134/****************************************************************************/
127 135
128// exception thrown on fatal (per-instance) errors 136// exception thrown on fatal (per-instance) errors
… …
151 159
152const char * rxvt_basename (const char *str) NOTHROW; 160const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 161void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 162void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 163void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 164void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 165void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
158 166
159char * rxvt_strtrim (char *str) NOTHROW; 167char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 168char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 169
170static inline void
171rxvt_free_strsplit (char **ptr) NOTHROW
172{
173 free (ptr[0]);
174 free (ptr);
175}
162 176
163void * rxvt_malloc (size_t size); 177void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 178void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 179void * rxvt_realloc (void *ptr, size_t size);
166 180
… …
189#else 203#else
190 if (envv) 204 if (envv)
191#endif 205#endif
192 environ = envv; 206 environ = envv;
193} 207}
208
209struct localise_env
210{
211 char **orig_env;
212
213 localise_env (char **new_env)
214 {
215 orig_env = environ;
216 environ = new_env;
217 }
218
219 ~localise_env ()
220 {
221 environ = orig_env;
222 }
223};
224
225#ifdef HAVE_BG_PIXMAP
226struct image_effects
227{
228 bool tint_set;
229 rxvt_color tint;
230 int shade;
231 int h_blurRadius, v_blurRadius;
232
233 image_effects ()
234 {
235 tint_set =
236 h_blurRadius =
237 v_blurRadius = 0;
238 shade = 100;
239 }
240
241 bool need_tint ()
242 {
243 return shade != 100 || tint_set;
244 }
245
246 bool need_blur ()
247 {
248 return h_blurRadius && v_blurRadius;
249 }
250
251 bool set_tint (const rxvt_color &new_tint);
252 bool set_shade (const char *shade_str);
253 bool set_blur (const char *geom);
254};
255
256# if BG_IMAGE_FROM_FILE
257enum {
258 IM_IS_SIZE_SENSITIVE = 1 << 1,
259 IM_KEEP_ASPECT = 1 << 2,
260 IM_ROOT_ALIGN = 1 << 3,
261 IM_TILE = 1 << 4,
262 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
263};
264
265enum {
266 noScale = 0,
267 windowScale = 100,
268 defaultScale = windowScale,
269 centerAlign = 50,
270 defaultAlign = centerAlign,
271};
272
273struct rxvt_image : image_effects
274{
275 unsigned short alpha;
276 uint8_t flags;
277 unsigned int h_scale, v_scale; /* percents of the window size */
278 int h_align, v_align; /* percents of the window size:
279 0 - left align, 50 - center, 100 - right */
280
281 bool is_size_sensitive ()
282 {
283 return (!(flags & IM_TILE)
284 || h_scale || v_scale
285 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
286 }
287
288 rxvt_img *img;
289
290 void destroy ()
291 {
292 delete img;
293 img = 0;
294 }
295
296 rxvt_image ();
297 void set_file_geometry (rxvt_screen *s, const char *file);
298 void set_file (rxvt_screen *s, const char *file);
299 bool set_geometry (const char *geom, bool update = false);
300};
301# endif
302#endif
194 303
195/* 304/*
196 ***************************************************************************** 305 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 306 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 307 *****************************************************************************
… …
241 ***************************************************************************** 350 *****************************************************************************
242 */ 351 */
243 352
244/* COLORTERM, TERM environment variables */ 353/* COLORTERM, TERM environment variables */
245#define COLORTERMENV "rxvt" 354#define COLORTERMENV "rxvt"
246#ifdef BG_IMAGE_FROM_FILE 355#if BG_IMAGE_FROM_FILE
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 356# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 357#else
249# define COLORTERMENVFULL COLORTERMENV 358# define COLORTERMENVFULL COLORTERMENV
250#endif 359#endif
251#ifndef TERMENV 360#ifndef TERMENV
… …
276# define NSCREENS 0 385# define NSCREENS 0
277#else 386#else
278# define NSCREENS 1 387# define NSCREENS 1
279#endif 388#endif
280 389
281/* special (internal) prefix for font commands */
282#define FONT_CMD '#'
283#define FONT_DN "#-"
284#define FONT_UP "#+"
285
286/* flags for rxvt_scr_gotorc () */ 390/* flags for rxvt_term::scr_gotorc () */
287enum { 391enum {
288 C_RELATIVE = 1, /* col movement is relative */ 392 C_RELATIVE = 1, /* col movement is relative */
289 R_RELATIVE = 2, /* row movement is relative */ 393 R_RELATIVE = 2, /* row movement is relative */
290 RELATIVE = C_RELATIVE | R_RELATIVE, 394 RELATIVE = C_RELATIVE | R_RELATIVE,
291}; 395};
292 396
293/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 397/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294enum { 398enum {
295 INSERT = -1, /* don't change these values */ 399 INSERT = -1, /* don't change these values */
296 DELETE = +1, 400 DELETE = +1,
297 ERASE = +2, 401 ERASE = +2,
298}; 402};
299 403
300/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 404/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301enum page_dirn { 405enum page_dirn {
302 UP, 406 DN = -1,
303 DN,
304 NO_DIR, 407 NO_DIR = 0,
408 UP = 1,
305}; 409};
306 410
307/* arguments for rxvt_scr_change_screen () */ 411/* arguments for rxvt_term::scr_change_screen () */
308enum { 412enum {
309 PRIMARY = 0, 413 PRIMARY = 0,
310 SECONDARY, 414 SECONDARY,
311}; 415};
312 416
… …
354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 458#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
355#define RS_attrMask (RS_baseattrMask | RS_fontMask) 459#define RS_attrMask (RS_baseattrMask | RS_fontMask)
356 460
357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 461#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
358#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 462#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
359
360#define Sel_none 0 /* Not waiting */
361#define Sel_normal 0x01 /* normal selection */
362#define Sel_incr 0x02 /* incremental selection */
363#define Sel_direct 0x00
364#define Sel_Primary 0x01
365#define Sel_Secondary 0x02
366#define Sel_Clipboard 0x03
367#define Sel_whereMask 0x0f
368#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
369#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
370 463
371enum { 464enum {
372 C0_NUL = 0x00, 465 C0_NUL = 0x00,
373 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 466 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
374 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 467 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
497#endif 590#endif
498 Color_scroll, 591 Color_scroll,
499#ifdef RXVT_SCROLLBAR 592#ifdef RXVT_SCROLLBAR
500 Color_trough, 593 Color_trough,
501#endif 594#endif
502#if ENABLE_TRANSPARENCY 595#if BG_IMAGE_FROM_ROOT
503 Color_tint, 596 Color_tint,
504#endif 597#endif
505#if OFF_FOCUS_FADING 598#if OFF_FOCUS_FADING
506 Color_fade, 599 Color_fade,
507#endif 600#endif
… …
569#endif 662#endif
570 663
571// do not change these constants lightly, there are many interdependencies 664// do not change these constants lightly, there are many interdependencies
572#define IMBUFSIZ 128 // input modifier buffer sizes 665#define IMBUFSIZ 128 // input modifier buffer sizes
573#define KBUFSZ 512 // size of keyboard mapping buffer 666#define KBUFSZ 512 // size of keyboard mapping buffer
574#define CBUFSIZ 2048 // size of command buffer 667#define CBUFSIZ 32768 // size of command buffer (longest command sequence possible)
575#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 668#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
576#define UBUFSIZ 2048 // character buffer 669#define UBUFSIZ 2048 // character buffer
577 670
578#if ENABLE_FRILLS 671#if ENABLE_FRILLS
579# include <X11/Xmd.h> 672# include <X11/Xmd.h>
… …
655 748
656#define GET_ATTR(x) (((x) & RS_attrMask)) 749#define GET_ATTR(x) (((x) & RS_attrMask))
657// return attributes defining the background, encoding doesn't matter 750// return attributes defining the background, encoding doesn't matter
658// depends on RS_fgShift > RS_bgShift 751// depends on RS_fgShift > RS_bgShift
659#define GET_BGATTR(x) \ 752#define GET_BGATTR(x) \
660 (expect_false ((x) & RS_RVid) \ 753 (ecb_unlikely ((x) & RS_RVid) \
661 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 754 ? (((x) & (RS_attrMask & ~RS_RVid)) \
662 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 755 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
663 : ((x) & (RS_attrMask | RS_bgMask))) 756 : ((x) & (RS_attrMask | RS_bgMask)))
664#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 757#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
665#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 758#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
693{ 786{
694 text_t *t; // terminal the text 787 text_t *t; // terminal the text
695 rend_t *r; // rendition, uses RS_ flags 788 rend_t *r; // rendition, uses RS_ flags
696 tlen_t_ l; // length of each text line 789 tlen_t_ l; // length of each text line
697 uint32_t f; // flags 790 uint32_t f; // flags
791
792 bool valid ()
793 {
794 return l >= 0;
795 }
796
797 void alloc ()
798 {
799 l = 0;
800 }
698 801
699 bool is_longer () 802 bool is_longer ()
700 { 803 {
701 return f & LINE_LONGER; 804 return f & LINE_LONGER;
702 } 805 }
… …
767// that are not representable in unicode, as well as characters 870// that are not representable in unicode, as well as characters
768// not fitting in the BMP. 871// not fitting in the BMP.
769struct compose_char 872struct compose_char
770{ 873{
771 unicode_t c1, c2; // any chars != NOCHAR are valid 874 unicode_t c1, c2; // any chars != NOCHAR are valid
875 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
876 compose_char () = default;
877 #endif
772 compose_char (unicode_t c1, unicode_t c2) 878 compose_char (unicode_t c1, unicode_t c2)
773 : c1(c1), c2(c2) 879 : c1(c1), c2(c2)
774 { } 880 { }
775}; 881};
776 882
… …
858 * END······················= total_rows 964 * END······················= total_rows
859 */ 965 */
860 966
861struct TermWin_t 967struct TermWin_t
862{ 968{
969 int vt_width; /* actual window width [pixels] */
970 int vt_height; /* actual window height [pixels] */
863 int width; /* window width [pixels] */ 971 int width; /* window width [pixels] */
864 int height; /* window height [pixels] */ 972 int height; /* window height [pixels] */
865 int fwidth; /* font width [pixels] */ 973 int fwidth; /* font width [pixels] */
866 int fheight; /* font height [pixels] */ 974 int fheight; /* font height [pixels] */
867 int fbase; /* font ascent (baseline) [pixels] */ 975 int fbase; /* font ascent (baseline) [pixels] */
… …
876 int saveLines; /* number of lines that fit in scrollback */ 984 int saveLines; /* number of lines that fit in scrollback */
877 int total_rows; /* total number of rows in this terminal */ 985 int total_rows; /* total number of rows in this terminal */
878 int term_start; /* term lines start here */ 986 int term_start; /* term lines start here */
879 int view_start; /* scrollback view starts here */ 987 int view_start; /* scrollback view starts here */
880 int top_row; /* topmost row index of scrollback */ 988 int top_row; /* topmost row index of scrollback */
881 Window parent[6]; /* parent identifiers - we're parent[0] */ 989 Window parent; /* parent identifier */
882 Window vt; /* vt100 window */ 990 Window vt; /* vt100 window */
883 GC gc; /* GC for drawing */ 991 GC gc; /* GC for drawing */
884 Pixmap pixmap;
885 rxvt_drawable *drawable; 992 rxvt_drawable *drawable;
886 rxvt_fontset *fontset[4]; 993 rxvt_fontset *fontset[4];
887}; 994};
888 995
889/* 996/*
… …
951#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1058#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
952#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1059#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
953 1060
954/* rxvt_vars.options */ 1061/* rxvt_vars.options */
955enum { 1062enum {
956# define def(name,idx) Opt_ ## name = idx,
957# define nodef(name) Opt_ ## name = 0, 1063# define def(name) Opt_ ## name,
1064# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1065 Opt_0,
958# include "optinc.h" 1066# include "optinc.h"
959# undef nodef 1067# undef nodef
960# undef def 1068# undef def
961Opt_count 1069 Opt_count
962}; 1070};
963 1071
964/* ------------------------------------------------------------------------- */ 1072/* ------------------------------------------------------------------------- */
965 1073
966struct rxvt_vars : TermWin_t 1074struct rxvt_vars : TermWin_t
… …
968 scrollBar_t scrollBar; 1076 scrollBar_t scrollBar;
969 uint8_t options[(Opt_count + 7) >> 3]; 1077 uint8_t options[(Opt_count + 7) >> 3];
970 XSizeHints szHint; 1078 XSizeHints szHint;
971 rxvt_color *pix_colors; 1079 rxvt_color *pix_colors;
972 Cursor TermWin_cursor; /* cursor for vt window */ 1080 Cursor TermWin_cursor; /* cursor for vt window */
1081
973 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1082 line_t *row_buf; // all lines, scrollback + terminal, circular
974 line_t *drawn_buf; // text on screen 1083 line_t *drawn_buf; // text on screen
975 line_t *swap_buf; // lines for swap buffer 1084 line_t *swap_buf; // lines for swap buffer
976 char *tabs; /* per location: 1 == tab-stop */ 1085 char *tabs; /* per location: 1 == tab-stop */
977 screen_t screen; 1086 screen_t screen;
978 screen_t swap; 1087 screen_t swap;
… …
1015 hidden_pointer:1, 1124 hidden_pointer:1,
1016#endif 1125#endif
1017 enc_utf8:1, /* whether locale uses utf-8 */ 1126 enc_utf8:1, /* whether locale uses utf-8 */
1018 seen_input:1, /* whether we have seen some program output yet */ 1127 seen_input:1, /* whether we have seen some program output yet */
1019 seen_resize:1, /* whether we had a resize event */ 1128 seen_resize:1, /* whether we had a resize event */
1129 init_done:1,
1020 parsed_geometry:1; 1130 parsed_geometry:1;
1021 1131
1022 unsigned char refresh_type, 1132 unsigned char refresh_type,
1023#ifdef META8_OPTION 1133#ifdef META8_OPTION
1024 meta_char, /* Alt-key prefix */ 1134 meta_char; /* Alt-key prefix */
1025#endif 1135#endif
1026 selection_wait,
1027 selection_type;
1028/* ---------- */ 1136/* ---------- */
1029 bool rvideo_state, rvideo_mode; 1137 bool rvideo_state, rvideo_mode;
1030#ifndef NO_BELL 1138#ifndef NO_BELL
1031 bool rvideo_bell; 1139 bool rvideo_bell;
1032#endif 1140#endif
… …
1036/* ---------- */ 1144/* ---------- */
1037 rend_t rstyle; 1145 rend_t rstyle;
1038/* ---------- */ 1146/* ---------- */
1039#ifdef SELECTION_SCROLLING 1147#ifdef SELECTION_SCROLLING
1040 int scroll_selection_lines; 1148 int scroll_selection_lines;
1041 enum page_dirn scroll_selection_dir;
1042 int selection_save_x, 1149 int selection_save_x,
1043 selection_save_y, 1150 selection_save_y,
1044 selection_save_state; 1151 selection_save_state;
1045#endif 1152#endif
1046/* ---------- */ 1153/* ---------- */
… …
1060 allowedxerror; 1167 allowedxerror;
1061/* ---------- */ 1168/* ---------- */
1062 unsigned int ModLevel3Mask, 1169 unsigned int ModLevel3Mask,
1063 ModMetaMask, 1170 ModMetaMask,
1064 ModNumLockMask; 1171 ModNumLockMask;
1065 int old_width, /* last used width in screen resize */
1066 old_height; /* last used height in screen resize */
1067 unsigned long priv_modes, 1172 unsigned long priv_modes,
1068 SavedModes; 1173 SavedModes;
1069/* ---------- */ 1174/* ---------- */
1070 Atom *xa; 1175 Atom *xa;
1071/* ---------- */ 1176/* ---------- */
1072 Time selection_time, 1177 Time selection_time,
1073 selection_request_time,
1074 clipboard_time; 1178 clipboard_time;
1179 rxvt_selection *selection_req;
1075 pid_t cmd_pid; /* process id of child */ 1180 pid_t cmd_pid; /* process id of child */
1076 char * incr_buf;
1077 size_t incr_buf_size, incr_buf_fill;
1078/* ---------- */ 1181/* ---------- */
1079 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1080 XComposeStatus compose; 1183 XComposeStatus compose;
1081 static struct termios def_tio; 1184 static struct termios def_tio;
1082 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1083#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1084 bgPixmap_t bgPixmap; 1188 void bg_init ();
1189 void bg_destroy ();
1190
1191# if BG_IMAGE_FROM_FILE
1192 rxvt_image fimage;
1193 void render_image (rxvt_image &image);
1085#endif 1194# endif
1195
1196# if BG_IMAGE_FROM_ROOT
1197 rxvt_img *root_img;
1198 image_effects root_effects;
1199
1200 void render_root_image ();
1201# endif
1202
1203 ev_tstamp bg_valid_since;
1204
1205 bool bg_window_size_sensitive ();
1206 bool bg_window_position_sensitive ();
1207
1208 void bg_render ();
1209#endif
1210
1086#ifdef HAVE_AFTERIMAGE 1211#ifdef HAVE_IMG
1087 ASVisual *asv; 1212 enum {
1088 ASImageManager *asimman; 1213 BG_IS_TRANSPARENT = 1 << 1,
1089 1214 BG_NEEDS_REFRESH = 1 << 2,
1090 void init_asv () 1215 BG_INHIBIT_RENDER = 1 << 3,
1091 {
1092 if (!asv)
1093 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1094 } 1216 };
1217
1218 uint8_t bg_flags;
1219
1220 rxvt_img *bg_img;
1095#endif 1221#endif
1096 1222
1097#if ENABLE_OVERLAY 1223#if ENABLE_OVERLAY
1098 overlay_base ov; 1224 overlay_base ov;
1099 1225
… …
1107 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1233 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1108#endif 1234#endif
1109 1235
1110 vector<void *> allocated; // free these memory blocks with free() 1236 vector<void *> allocated; // free these memory blocks with free()
1111 1237
1112 char env_windowid[21]; /* environmental variable WINDOWID */ 1238 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1113 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1114 char *env_display; /* environmental variable DISPLAY */
1115 char *env_term; /* environmental variable TERM */
1116 1239
1117 char *locale; 1240 char *locale;
1118 char charsets[4]; 1241 char charsets[4];
1119 char *v_buffer; /* pointer to physical buffer */ 1242 char *v_buffer; /* pointer to physical buffer */
1120 unsigned int v_buflen; /* size of area to write */ 1243 unsigned int v_buflen; /* size of area to write */
… …
1132 char *cmdbuf_ptr, *cmdbuf_endp; 1255 char *cmdbuf_ptr, *cmdbuf_endp;
1133 char cmdbuf_base[CBUFSIZ]; 1256 char cmdbuf_base[CBUFSIZ];
1134 1257
1135 ptytty *pty; 1258 ptytty *pty;
1136 1259
1137 rxvt_salloc *talloc; // text line allocator 1260 // chunk contains all line_t's as well as rend_t and text_t buffers
1138 rxvt_salloc *ralloc; // rend line allocator 1261 // for drawn_buf, swap_buf and row_buf, in this order
1262 void *chunk;
1263 size_t chunk_size;
1139 1264
1140 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1265 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1141 1266
1142#if ENABLE_FRILLS || ISO_14755 1267#if ENABLE_FRILLS || ISO_14755
1143 // ISO 14755 entry support 1268 // ISO 14755 entry support
1144 unicode_t iso14755buf; 1269 unicode_t iso14755buf;
1145 void commit_iso14755 (); 1270 void commit_iso14755 ();
1146# if ISO_14755 1271# if ISO_14755
1147 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1272 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1148 void iso14755_54 (int x, int y); 1273 void iso14755_54 (int x, int y);
1149# endif 1274# endif
1150#endif 1275#endif
1151 1276
1152 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1277 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1154 void vt_select_input () const NOTHROW 1279 void vt_select_input () const NOTHROW
1155 { 1280 {
1156 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1281 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1157 } 1282 }
1158 1283
1159#if ENABLE_TRANSPARENCY || ENABLE_PERL 1284#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1160 void rootwin_cb (XEvent &xev); 1285 void rootwin_cb (XEvent &xev);
1161 xevent_watcher rootwin_ev; 1286 xevent_watcher rootwin_ev;
1162#endif 1287#endif
1163#ifdef HAVE_BG_PIXMAP 1288#ifdef HAVE_BG_PIXMAP
1164 void update_background (); 1289 void update_background ();
… …
1174 void child_cb (ev::child &w, int revents); ev::child child_ev; 1299 void child_cb (ev::child &w, int revents); ev::child child_ev;
1175 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1300 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1176 void refresh_check (); 1301 void refresh_check ();
1177 void flush (); 1302 void flush ();
1178 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1303 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1304 void cmdbuf_reify ();
1305 void cmdbuf_append (const char *str, size_t count);
1179 bool pty_fill (); 1306 bool pty_fill ();
1180 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1307 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1181 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1182 1308
1183#ifdef CURSOR_BLINK 1309#ifdef CURSOR_BLINK
1310 void cursor_blink_reset ();
1184 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1311 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1185#endif 1312#endif
1186#ifdef TEXT_BLINK 1313#ifdef TEXT_BLINK
1187 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1314 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1188#endif 1315#endif
… …
1205 void pointer_blank (); 1332 void pointer_blank ();
1206#endif 1333#endif
1207 void pointer_unblank (); 1334 void pointer_unblank ();
1208 1335
1209 void tt_printf (const char *fmt,...); 1336 void tt_printf (const char *fmt,...);
1337 void tt_write_user_input (const char *data, unsigned int len);
1210 void tt_write (const char *data, unsigned int len); 1338 void tt_write (const char *data, unsigned int len);
1211 void pty_write (); 1339 void pty_write ();
1212
1213 void init (stringvec *argv, stringvec *envv)
1214 {
1215 this->argv = argv;
1216 init (argv->size (), argv->begin (), envv);
1217 }
1218 1340
1219 void make_current () const // make this the "currently active" urxvt instance 1341 void make_current () const // make this the "currently active" urxvt instance
1220 { 1342 {
1221 SET_R (this); 1343 SET_R (this);
1222 set_environ (envv); 1344 set_environ (envv);
… …
1234 void im_set_size (XRectangle &size); 1356 void im_set_size (XRectangle &size);
1235 void im_set_position (XPoint &pos) NOTHROW; 1357 void im_set_position (XPoint &pos) NOTHROW;
1236 void im_set_color (unsigned long &fg, unsigned long &bg); 1358 void im_set_color (unsigned long &fg, unsigned long &bg);
1237 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1359 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1238 1360
1239 bool IMisRunning (); 1361 bool im_is_running ();
1240 void IMSendSpot (); 1362 void im_send_spot ();
1241 bool IM_get_IC (const char *modifiers); 1363 bool im_get_ic (const char *modifiers);
1242 void IMSetPosition (); 1364 void im_set_position ();
1243#endif 1365#endif
1244 1366
1245 // command.C 1367 // command.C
1246 void key_press (XKeyEvent &ev); 1368 void key_press (XKeyEvent &ev);
1247 void key_release (XKeyEvent &ev); 1369 void key_release (XKeyEvent &ev);
1248 unsigned int cmd_write (const char *str, unsigned int count);
1249 1370
1250 wchar_t next_char () NOTHROW; 1371 wchar_t next_char () NOTHROW;
1251 wchar_t cmd_getc () THROW ((class out_of_input)); 1372 wchar_t cmd_getc () THROW ((class out_of_input));
1252 uint32_t next_octet () NOTHROW; 1373 uint32_t next_octet () NOTHROW;
1253 uint32_t cmd_get8 () THROW ((class out_of_input)); 1374 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1280 void process_color_seq (int report, int color, const char *str, char resp); 1401 void process_color_seq (int report, int color, const char *str, char resp);
1281 void process_xterm_seq (int op, char *str, char resp); 1402 void process_xterm_seq (int op, char *str, char resp);
1282 int privcases (int mode, unsigned long bit); 1403 int privcases (int mode, unsigned long bit);
1283 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1404 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1284 void process_sgr_mode (unsigned int nargs, const int *arg); 1405 void process_sgr_mode (unsigned int nargs, const int *arg);
1285 void process_graphics (); 1406 void set_cursor_style (int style);
1286 // init.C 1407 // init.C
1408 void init (stringvec *argv, stringvec *envv);
1409 void init (int argc, const char *const *argv, const char *const *envv);
1410 void init2 (int argc, const char *const *argv);
1287 void init_vars (); 1411 void init_vars ();
1288 const char **init_resources (int argc, const char *const *argv); 1412 const char **init_resources (int argc, const char *const *argv);
1289 void init (int argc, const char *const *argv, stringvec *envv);
1290 void init_env (); 1413 void init_env ();
1291 void set_locale (const char *locale); 1414 void set_locale (const char *locale);
1292 void init_xlocale (); 1415 void init_xlocale ();
1293 void init_command (const char *const *argv); 1416 void init_command (const char *const *argv);
1294 void run_command (const char *const *argv); 1417 void run_command (const char *const *argv);
… …
1312 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1435 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1313 void set_utf8_property (Atom prop, const char *str, int len = -1); 1436 void set_utf8_property (Atom prop, const char *str, int len = -1);
1314 void set_title (const char *str); 1437 void set_title (const char *str);
1315 void set_icon_name (const char *str); 1438 void set_icon_name (const char *str);
1316 void set_window_color (int idx, const char *color); 1439 void set_window_color (int idx, const char *color);
1317 void set_colorfgbg (); 1440 char *get_colorfgbg ();
1318 bool set_color (rxvt_color &color, const char *name); 1441 bool set_color (rxvt_color &color, const char *name);
1319 void alias_color (int dst, int src); 1442 void alias_color (int dst, int src);
1320 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1443 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1321 void get_window_origin (int &x, int &y); 1444 void get_window_origin (int &x, int &y);
1322 Pixmap get_pixmap_property (int prop_id);
1323 1445
1324 // screen.C 1446 // screen.C
1325 1447
1326 void lalloc (line_t &l) const 1448 bool option (uint8_t opt) const NOTHROW
1327 { 1449 {
1328 l.t = (text_t *)talloc->alloc (); 1450 return options[opt >> 3] & (1 << (opt & 7));
1329 l.r = (rend_t *)ralloc->alloc ();
1330 } 1451 }
1331 1452
1332#if 0 1453 void set_option (uint8_t opt, bool set = true) NOTHROW;
1333 void lfree (line_t &l)
1334 {
1335 talloc->free (l.t);
1336 ralloc->free (l.r);
1337 }
1338#endif
1339
1340 void lresize (line_t &l) const
1341 {
1342 if (!l.t)
1343 return;
1344
1345 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1346 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1347
1348 l.l = min (l.l, ncol);
1349
1350 if (ncol > prev_ncol)
1351 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1352 }
1353 1454
1354 int fgcolor_of (rend_t r) const NOTHROW 1455 int fgcolor_of (rend_t r) const NOTHROW
1355 { 1456 {
1356 int base = GET_BASEFG (r); 1457 int base = GET_BASEFG (r);
1357#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
1358 if (r & RS_Bold 1459 if (r & RS_Bold
1359# if ENABLE_STYLES 1460# if ENABLE_STYLES
1360 && option (Opt_intensityStyles) 1461 && option (Opt_intensityStyles)
1361# endif 1462# endif
1362 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1463 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1363 base += minBrightCOLOR - minCOLOR; 1464 base += minBrightCOLOR - minCOLOR;
1364#endif 1465#endif
1365 return base; 1466 return base;
1366 } 1467 }
1367 1468
… …
1371#ifndef NO_BRIGHTCOLOR 1472#ifndef NO_BRIGHTCOLOR
1372 if (r & RS_Blink 1473 if (r & RS_Blink
1373# if ENABLE_STYLES 1474# if ENABLE_STYLES
1374 && option (Opt_intensityStyles) 1475 && option (Opt_intensityStyles)
1375# endif 1476# endif
1376 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1477 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1377 base += minBrightCOLOR - minCOLOR; 1478 base += minBrightCOLOR - minCOLOR;
1378#endif 1479#endif
1379 return base; 1480 return base;
1380 }
1381
1382 bool option (uint8_t opt) const NOTHROW
1383 {
1384 if (!opt)
1385 return 0;
1386
1387 --opt;
1388 return options[opt >> 3] & (1 << (opt & 7));
1389 }
1390
1391 void set_option (uint8_t opt, bool set = true) NOTHROW
1392 {
1393 if (!opt)
1394 return;
1395
1396 --opt;
1397 if (set)
1398 options[opt >> 3] |= (1 << (opt & 7));
1399 else
1400 options[opt >> 3] &= ~(1 << (opt & 7));
1401 }
1402
1403 void set_privmode (unsigned bit, int set) NOTHROW
1404 {
1405 if (set)
1406 priv_modes |= bit;
1407 else
1408 priv_modes &= ~bit;
1409 } 1481 }
1410 1482
1411 // modifies first argument(!) 1483 // modifies first argument(!)
1412 void tt_paste (char *data, unsigned int len) NOTHROW; 1484 void tt_paste (char *data, unsigned int len) NOTHROW;
1413 void paste (char *data, unsigned int len) NOTHROW; 1485 void paste (char *data, unsigned int len) NOTHROW;
1486 void scr_alloc () NOTHROW;
1414 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1487 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1415 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1488 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1416 void scr_kill_char (line_t &l, int col) const NOTHROW; 1489 void scr_kill_char (line_t &l, int col) const NOTHROW;
1490 void scr_set_char_rend (line_t &l, int col, rend_t rend);
1417 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1491 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1492 void copy_line (line_t &dst, line_t &src);
1418 void scr_reset (); 1493 void scr_reset ();
1419 void scr_release () NOTHROW; 1494 void scr_release () NOTHROW;
1420 void scr_clear (bool really = false) NOTHROW; 1495 void scr_clear (bool really = false) NOTHROW;
1421 void scr_refresh () NOTHROW; 1496 void scr_refresh () NOTHROW;
1422 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1497 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
… …
1426 void scr_backindex () NOTHROW; 1501 void scr_backindex () NOTHROW;
1427 void scr_forwardindex () NOTHROW; 1502 void scr_forwardindex () NOTHROW;
1428#endif 1503#endif
1429 void scr_touch (bool refresh) NOTHROW; 1504 void scr_touch (bool refresh) NOTHROW;
1430 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1505 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1431 void scr_recolour () NOTHROW; 1506 void scr_recolour (bool refresh = true) NOTHROW;
1432 void scr_remap_chars () NOTHROW; 1507 void scr_remap_chars () NOTHROW;
1433 void scr_remap_chars (line_t &l) NOTHROW; 1508 void scr_remap_chars (line_t &l) NOTHROW;
1434 1509
1435 enum cursor_mode { SAVE, RESTORE }; 1510 enum cursor_mode { SAVE, RESTORE };
1436 1511
… …
1461 void scr_report_position () NOTHROW; 1536 void scr_report_position () NOTHROW;
1462 void set_font_style () NOTHROW; 1537 void set_font_style () NOTHROW;
1463 void scr_charset_choose (int set) NOTHROW; 1538 void scr_charset_choose (int set) NOTHROW;
1464 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1539 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1465 void scr_move_to (int y, int len) NOTHROW; 1540 void scr_move_to (int y, int len) NOTHROW;
1541 bool scr_page (int nlines) NOTHROW;
1466 bool scr_page (enum page_dirn direction, int nlines) NOTHROW; 1542 bool scr_page (enum page_dirn direction, int nlines) NOTHROW
1543 {
1544 return scr_page (direction * nlines);
1545 }
1467 bool scr_changeview (int new_view_start) NOTHROW; 1546 bool scr_changeview (int new_view_start) NOTHROW;
1468 void scr_bell () NOTHROW; 1547 void scr_bell () NOTHROW;
1469 void scr_printscreen (int fullhist) NOTHROW; 1548 void scr_printscreen (int fullhist) NOTHROW;
1470 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW; 1549 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1471 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1550 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1472 void scr_reverse_selection () NOTHROW; 1551 void scr_reverse_selection () NOTHROW;
1473 void scr_dump (int fd) NOTHROW; 1552 void scr_dump (int fd) NOTHROW;
1474 1553
1475 void selection_check (int check_more) NOTHROW; 1554 void selection_check (int check_more) NOTHROW;
1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1555 void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
1477 void selection_property (Window win, Atom prop) NOTHROW;
1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1556 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1479 int selection_request_other (Atom target, int selnum) NOTHROW;
1480 void selection_clear (bool clipboard = false) NOTHROW; 1557 void selection_clear (bool clipboard = false) NOTHROW;
1481 void selection_make (Time tm); 1558 void selection_make (Time tm);
1482 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1559 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1483 void selection_start_colrow (int col, int row) NOTHROW; 1560 void selection_start_colrow (int col, int row) NOTHROW;
1484 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1561 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
… …
1488 void selection_click (int clicks, int x, int y) NOTHROW; 1565 void selection_click (int clicks, int x, int y) NOTHROW;
1489 void selection_extend (int x, int y, int flag) NOTHROW; 1566 void selection_extend (int x, int y, int flag) NOTHROW;
1490 void selection_rotate (int x, int y) NOTHROW; 1567 void selection_rotate (int x, int y) NOTHROW;
1491 1568
1492 // xdefaults.C 1569 // xdefaults.C
1570 void rxvt_usage (int type);
1493 void get_options (int argc, const char *const *argv); 1571 const char **get_options (int argc, const char *const *argv);
1494 int parse_keysym (const char *str, const char *arg); 1572 int bind_action (const char *str, const char *arg);
1495 const char *x_resource (const char *name); 1573 const char *x_resource (const char *name);
1496 void extract_resources (); 1574 void extract_resources ();
1575 void extract_keysym_resources ();
1497}; 1576};
1498 1577
1499#endif /* _RXVT_H_ */ 1578#endif /* _RXVT_H_ */
1500 1579

Diff Legend

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