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.410 by sf-exg, Mon Jul 19 16:43:21 2010 UTC vs.
Revision 1.511 by sf-exg, Sat Dec 29 14:23:35 2012 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#endif
83
84#if HAVE_BG_PIXMAP
85# if HAVE_PIXBUF
86# define BG_IMAGE_FROM_FILE 1
87# endif
88# if ENABLE_TRANSPARENCY
89# define BG_IMAGE_FROM_ROOT 1
90# endif
91#endif
92
93#include <ecb.h>
77#include "encoding.h" 94#include "encoding.h"
78#include "rxvtutil.h" 95#include "rxvtutil.h"
79#include "rxvtfont.h" 96#include "rxvtfont.h"
80#include "rxvttoolkit.h" 97#include "rxvttoolkit.h"
98#include "rxvtimg.h"
81#include "scrollbar.h" 99#include "scrollbar.h"
82#include "ev_cpp.h" 100#include "ev_cpp.h"
83#include "salloc.h"
84#include "libptytty.h" 101#include "libptytty.h"
85 102
86#include "rxvtperl.h" 103#include "rxvtperl.h"
87 104
88// try to avoid some macros to decrease code size, on some systems 105// try to avoid some macros to decrease code size, on some systems
… …
98 ***************************************************************************** 115 *****************************************************************************
99 * SYSTEM HACKS 116 * SYSTEM HACKS
100 ***************************************************************************** 117 *****************************************************************************
101 */ 118 */
102 119
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 120#include <termios.h>
108
109#include "background.h"
110 121
111#ifndef STDIN_FILENO 122#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 123# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 124# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 125# define STDERR_FILENO 2
115#endif 126#endif
116 127
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 128#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 129# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 130# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 131#endif
125 132
126/****************************************************************************/ 133/****************************************************************************/
127 134
128// exception thrown on fatal (per-instance) errors 135// exception thrown on fatal (per-instance) errors
… …
151 158
152const char * rxvt_basename (const char *str) NOTHROW; 159const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 160void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 161void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 162void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 163void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 164void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
158 165
159char * rxvt_strtrim (char *str) NOTHROW; 166char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 167char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 168
169static inline void
170rxvt_free_strsplit (char **ptr) NOTHROW
171{
172 free (ptr[0]);
173 free (ptr);
174}
162 175
163void * rxvt_malloc (size_t size); 176void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 177void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 178void * rxvt_realloc (void *ptr, size_t size);
166 179
… …
189#else 202#else
190 if (envv) 203 if (envv)
191#endif 204#endif
192 environ = envv; 205 environ = envv;
193} 206}
207
208struct localise_env
209{
210 char **orig_env;
211
212 localise_env (char **new_env)
213 {
214 orig_env = environ;
215 environ = new_env;
216 }
217
218 ~localise_env ()
219 {
220 environ = orig_env;
221 }
222};
223
224#ifdef HAVE_BG_PIXMAP
225struct image_effects
226{
227 bool tint_set;
228 rxvt_color tint;
229 int shade;
230 int h_blurRadius, v_blurRadius;
231
232 image_effects ()
233 {
234 tint_set =
235 h_blurRadius =
236 v_blurRadius = 0;
237 shade = 100;
238 }
239
240 bool need_tint ()
241 {
242 return shade != 100 || tint_set;
243 }
244
245 bool need_blur ()
246 {
247 return h_blurRadius && v_blurRadius;
248 }
249
250 bool set_tint (const rxvt_color &new_tint);
251 bool set_shade (const char *shade_str);
252 bool set_blur (const char *geom);
253};
254
255# if BG_IMAGE_FROM_FILE
256enum {
257 IM_IS_SIZE_SENSITIVE = 1 << 1,
258 IM_KEEP_ASPECT = 1 << 2,
259 IM_ROOT_ALIGN = 1 << 3,
260 IM_TILE = 1 << 4,
261 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
262};
263
264enum {
265 noScale = 0,
266 windowScale = 100,
267 defaultScale = windowScale,
268 centerAlign = 50,
269 defaultAlign = centerAlign,
270};
271
272struct rxvt_image : image_effects
273{
274 unsigned short alpha;
275 uint8_t flags;
276 unsigned int h_scale, v_scale; /* percents of the window size */
277 int h_align, v_align; /* percents of the window size:
278 0 - left align, 50 - center, 100 - right */
279
280 bool is_size_sensitive ()
281 {
282 return (!(flags & IM_TILE)
283 || h_scale || v_scale
284 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
285 }
286
287 rxvt_img *img;
288
289 void destroy ()
290 {
291 delete img;
292 img = 0;
293 }
294
295 rxvt_image ();
296 void set_file_geometry (rxvt_screen *s, const char *file);
297 void set_file (rxvt_screen *s, const char *file);
298 bool set_geometry (const char *geom, bool update = false);
299};
300# endif
301#endif
194 302
195/* 303/*
196 ***************************************************************************** 304 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 305 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 306 *****************************************************************************
… …
241 ***************************************************************************** 349 *****************************************************************************
242 */ 350 */
243 351
244/* COLORTERM, TERM environment variables */ 352/* COLORTERM, TERM environment variables */
245#define COLORTERMENV "rxvt" 353#define COLORTERMENV "rxvt"
246#ifdef BG_IMAGE_FROM_FILE 354#if BG_IMAGE_FROM_FILE
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 355# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 356#else
249# define COLORTERMENVFULL COLORTERMENV 357# define COLORTERMENVFULL COLORTERMENV
250#endif 358#endif
251#ifndef TERMENV 359#ifndef TERMENV
… …
276# define NSCREENS 0 384# define NSCREENS 0
277#else 385#else
278# define NSCREENS 1 386# define NSCREENS 1
279#endif 387#endif
280 388
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 () */ 389/* flags for rxvt_term::scr_gotorc () */
287enum { 390enum {
288 C_RELATIVE = 1, /* col movement is relative */ 391 C_RELATIVE = 1, /* col movement is relative */
289 R_RELATIVE = 2, /* row movement is relative */ 392 R_RELATIVE = 2, /* row movement is relative */
290 RELATIVE = C_RELATIVE | R_RELATIVE, 393 RELATIVE = C_RELATIVE | R_RELATIVE,
291}; 394};
292 395
293/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 396/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294enum { 397enum {
295 INSERT = -1, /* don't change these values */ 398 INSERT = -1, /* don't change these values */
296 DELETE = +1, 399 DELETE = +1,
297 ERASE = +2, 400 ERASE = +2,
298}; 401};
299 402
300/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 403/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301enum page_dirn { 404enum page_dirn {
302 UP, 405 UP,
303 DN, 406 DN,
304 NO_DIR, 407 NO_DIR,
305}; 408};
306 409
307/* arguments for rxvt_scr_change_screen () */ 410/* arguments for rxvt_term::scr_change_screen () */
308enum { 411enum {
309 PRIMARY = 0, 412 PRIMARY = 0,
310 SECONDARY, 413 SECONDARY,
311}; 414};
312 415
… …
354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 457#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
355#define RS_attrMask (RS_baseattrMask | RS_fontMask) 458#define RS_attrMask (RS_baseattrMask | RS_fontMask)
356 459
357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 460#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)) 461#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 462
371enum { 463enum {
372 C0_NUL = 0x00, 464 C0_NUL = 0x00,
373 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 465 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 , 466 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
497#endif 589#endif
498 Color_scroll, 590 Color_scroll,
499#ifdef RXVT_SCROLLBAR 591#ifdef RXVT_SCROLLBAR
500 Color_trough, 592 Color_trough,
501#endif 593#endif
502#if ENABLE_TRANSPARENCY 594#if BG_IMAGE_FROM_ROOT
503 Color_tint, 595 Color_tint,
504#endif 596#endif
505#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
506 Color_fade, 598 Color_fade,
507#endif 599#endif
… …
555#define PrivMode_vt52 (1UL<<18) 647#define PrivMode_vt52 (1UL<<18)
556#define PrivMode_LFNL (1UL<<19) 648#define PrivMode_LFNL (1UL<<19)
557#define PrivMode_MouseBtnEvent (1UL<<20) 649#define PrivMode_MouseBtnEvent (1UL<<20)
558#define PrivMode_MouseAnyEvent (1UL<<21) 650#define PrivMode_MouseAnyEvent (1UL<<21)
559#define PrivMode_BracketPaste (1UL<<22) 651#define PrivMode_BracketPaste (1UL<<22)
652#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
653#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
560 654
561#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 655#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
562 656
563#ifdef ALLOW_132_MODE 657#ifdef ALLOW_132_MODE
564# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 658# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
653 747
654#define GET_ATTR(x) (((x) & RS_attrMask)) 748#define GET_ATTR(x) (((x) & RS_attrMask))
655// return attributes defining the background, encoding doesn't matter 749// return attributes defining the background, encoding doesn't matter
656// depends on RS_fgShift > RS_bgShift 750// depends on RS_fgShift > RS_bgShift
657#define GET_BGATTR(x) \ 751#define GET_BGATTR(x) \
658 (expect_false ((x) & RS_RVid) \ 752 (ecb_unlikely ((x) & RS_RVid) \
659 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 753 ? (((x) & (RS_attrMask & ~RS_RVid)) \
660 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 754 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
661 : ((x) & (RS_attrMask | RS_bgMask))) 755 : ((x) & (RS_attrMask | RS_bgMask)))
662#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 756#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
663#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 757#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
691{ 785{
692 text_t *t; // terminal the text 786 text_t *t; // terminal the text
693 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
694 tlen_t_ l; // length of each text line 788 tlen_t_ l; // length of each text line
695 uint32_t f; // flags 789 uint32_t f; // flags
790
791 bool valid ()
792 {
793 return l >= 0;
794 }
795
796 void alloc ()
797 {
798 l = 0;
799 }
696 800
697 bool is_longer () 801 bool is_longer ()
698 { 802 {
699 return f & LINE_LONGER; 803 return f & LINE_LONGER;
700 } 804 }
… …
765// that are not representable in unicode, as well as characters 869// that are not representable in unicode, as well as characters
766// not fitting in the BMP. 870// not fitting in the BMP.
767struct compose_char 871struct compose_char
768{ 872{
769 unicode_t c1, c2; // any chars != NOCHAR are valid 873 unicode_t c1, c2; // any chars != NOCHAR are valid
874 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
875 compose_char () = default;
876 #endif
770 compose_char (unicode_t c1, unicode_t c2) 877 compose_char (unicode_t c1, unicode_t c2)
771 : c1(c1), c2(c2) 878 : c1(c1), c2(c2)
772 { } 879 { }
773}; 880};
774 881
… …
807{ 914{
808 int x, y, w, h; // overlay dimensions 915 int x, y, w, h; // overlay dimensions
809 text_t **text; 916 text_t **text;
810 rend_t **rend; 917 rend_t **rend;
811 918
812 // while tempting to add swap() etc. here, it effetcively only increases code size 919 // while tempting to add swap() etc. here, it effectively only increases code size
813}; 920};
814 921
815/* ------------------------------------------------------------------------- */ 922/* ------------------------------------------------------------------------- */
816 923
817typedef struct 924typedef struct
… …
856 * END······················= total_rows 963 * END······················= total_rows
857 */ 964 */
858 965
859struct TermWin_t 966struct TermWin_t
860{ 967{
968 int vt_width; /* actual window width [pixels] */
969 int vt_height; /* actual window height [pixels] */
861 int width; /* window width [pixels] */ 970 int width; /* window width [pixels] */
862 int height; /* window height [pixels] */ 971 int height; /* window height [pixels] */
863 int fwidth; /* font width [pixels] */ 972 int fwidth; /* font width [pixels] */
864 int fheight; /* font height [pixels] */ 973 int fheight; /* font height [pixels] */
865 int fbase; /* font ascent (baseline) [pixels] */ 974 int fbase; /* font ascent (baseline) [pixels] */
… …
874 int saveLines; /* number of lines that fit in scrollback */ 983 int saveLines; /* number of lines that fit in scrollback */
875 int total_rows; /* total number of rows in this terminal */ 984 int total_rows; /* total number of rows in this terminal */
876 int term_start; /* term lines start here */ 985 int term_start; /* term lines start here */
877 int view_start; /* scrollback view starts here */ 986 int view_start; /* scrollback view starts here */
878 int top_row; /* topmost row index of scrollback */ 987 int top_row; /* topmost row index of scrollback */
879 Window parent[6]; /* parent identifiers - we're parent[0] */ 988 Window parent; /* parent identifier */
880 Window vt; /* vt100 window */ 989 Window vt; /* vt100 window */
881 GC gc; /* GC for drawing */ 990 GC gc; /* GC for drawing */
882 Pixmap pixmap;
883 rxvt_drawable *drawable; 991 rxvt_drawable *drawable;
884 rxvt_fontset *fontset[4]; 992 rxvt_fontset *fontset[4];
885}; 993};
886 994
887/* 995/*
… …
949#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1057#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
950#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1058#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
951 1059
952/* rxvt_vars.options */ 1060/* rxvt_vars.options */
953enum { 1061enum {
954# define def(name,idx) Opt_ ## name = idx,
955# define nodef(name) Opt_ ## name = 0, 1062# define def(name) Opt_ ## name,
1063# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1064 Opt_0,
956# include "optinc.h" 1065# include "optinc.h"
957# undef nodef 1066# undef nodef
958# undef def 1067# undef def
959Opt_count 1068 Opt_count
960}; 1069};
961 1070
962/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
963 1072
964struct rxvt_vars : TermWin_t 1073struct rxvt_vars : TermWin_t
… …
966 scrollBar_t scrollBar; 1075 scrollBar_t scrollBar;
967 uint8_t options[(Opt_count + 7) >> 3]; 1076 uint8_t options[(Opt_count + 7) >> 3];
968 XSizeHints szHint; 1077 XSizeHints szHint;
969 rxvt_color *pix_colors; 1078 rxvt_color *pix_colors;
970 Cursor TermWin_cursor; /* cursor for vt window */ 1079 Cursor TermWin_cursor; /* cursor for vt window */
1080
971 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1081 line_t *row_buf; // all lines, scrollback + terminal, circular
972 line_t *drawn_buf; // text on screen 1082 line_t *drawn_buf; // text on screen
973 line_t *swap_buf; // lines for swap buffer 1083 line_t *swap_buf; // lines for swap buffer
974 char *tabs; /* per location: 1 == tab-stop */ 1084 char *tabs; /* per location: 1 == tab-stop */
975 screen_t screen; 1085 screen_t screen;
976 screen_t swap; 1086 screen_t swap;
… …
1013 hidden_pointer:1, 1123 hidden_pointer:1,
1014#endif 1124#endif
1015 enc_utf8:1, /* whether locale uses utf-8 */ 1125 enc_utf8:1, /* whether locale uses utf-8 */
1016 seen_input:1, /* whether we have seen some program output yet */ 1126 seen_input:1, /* whether we have seen some program output yet */
1017 seen_resize:1, /* whether we had a resize event */ 1127 seen_resize:1, /* whether we had a resize event */
1128 init_done:1,
1018 parsed_geometry:1; 1129 parsed_geometry:1;
1019 1130
1020 unsigned char refresh_type, 1131 unsigned char refresh_type,
1021#ifdef META8_OPTION 1132#ifdef META8_OPTION
1022 meta_char, /* Alt-key prefix */ 1133 meta_char; /* Alt-key prefix */
1023#endif 1134#endif
1024 selection_wait,
1025 selection_type;
1026/* ---------- */ 1135/* ---------- */
1027 bool rvideo_state, rvideo_mode; 1136 bool rvideo_state, rvideo_mode;
1028#ifndef NO_BELL 1137#ifndef NO_BELL
1029 bool rvideo_bell; 1138 bool rvideo_bell;
1030#endif 1139#endif
… …
1058 allowedxerror; 1167 allowedxerror;
1059/* ---------- */ 1168/* ---------- */
1060 unsigned int ModLevel3Mask, 1169 unsigned int ModLevel3Mask,
1061 ModMetaMask, 1170 ModMetaMask,
1062 ModNumLockMask; 1171 ModNumLockMask;
1063 int old_width, /* last used width in screen resize */
1064 old_height; /* last used height in screen resize */
1065 unsigned long priv_modes, 1172 unsigned long priv_modes,
1066 SavedModes; 1173 SavedModes;
1067/* ---------- */ 1174/* ---------- */
1068 Atom *xa; 1175 Atom *xa;
1069/* ---------- */ 1176/* ---------- */
1070 Time selection_time, 1177 Time selection_time,
1071 selection_request_time,
1072 clipboard_time; 1178 clipboard_time;
1179 rxvt_selection *selection_req;
1073 pid_t cmd_pid; /* process id of child */ 1180 pid_t cmd_pid; /* process id of child */
1074 char * incr_buf;
1075 size_t incr_buf_size, incr_buf_fill;
1076/* ---------- */ 1181/* ---------- */
1077 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1078 XComposeStatus compose; 1183 XComposeStatus compose;
1079 struct termios tio; 1184 static struct termios def_tio;
1080 row_col_t oldcursor; 1185 row_col_t oldcursor;
1081#ifdef HAVE_BG_PIXMAP 1186#ifdef HAVE_BG_PIXMAP
1082 bgPixmap_t bgPixmap; 1187 void bg_init ();
1188 void bg_destroy ();
1189
1190 enum {
1191 BG_IS_VALID = 1 << 0,
1192
1193 BG_IS_TRANSPARENT = 1 << 1,
1194 BG_NEEDS_REFRESH = 1 << 2,
1195 BG_INHIBIT_RENDER = 1 << 3,
1196 };
1197
1198 uint8_t bg_flags;
1199
1200# if BG_IMAGE_FROM_FILE
1201 rxvt_image fimage;
1202 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1203 bool render_image (rxvt_image &image);
1083#endif 1204# endif
1084#ifdef HAVE_AFTERIMAGE
1085 ASVisual *asv;
1086 ASImageManager *asimman;
1087 1205
1088 void init_asv () 1206# if BG_IMAGE_FROM_ROOT
1207 rxvt_img *root_img;
1208 image_effects root_effects;
1209
1210 void bg_set_transparent ()
1089 { 1211 {
1090 if (!asv) 1212 bg_flags |= BG_IS_TRANSPARENT;
1091 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1213 }
1214 void bg_set_root_pixmap ();
1215 bool render_root_image ();
1216# endif
1217
1218 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1219
1220 ev_tstamp bg_valid_since;
1221
1222 rxvt_img *bg_img;
1223
1224 bool bg_window_size_sensitive ();
1225 bool bg_window_position_sensitive ();
1226
1227 void bg_render ();
1228 void bg_invalidate ()
1229 {
1230 bg_flags &= ~BG_IS_VALID;
1092 } 1231 }
1093#endif 1232#endif
1094 1233
1095#if ENABLE_OVERLAY 1234#if ENABLE_OVERLAY
1096 overlay_base ov; 1235 overlay_base ov;
… …
1105 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1244 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1106#endif 1245#endif
1107 1246
1108 vector<void *> allocated; // free these memory blocks with free() 1247 vector<void *> allocated; // free these memory blocks with free()
1109 1248
1110 char env_windowid[21]; /* environmental variable WINDOWID */ 1249 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1111 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1112 char *env_display; /* environmental variable DISPLAY */
1113 char *env_term; /* environmental variable TERM */
1114 1250
1115 char *locale; 1251 char *locale;
1116 char charsets[4]; 1252 char charsets[4];
1117 char *v_buffer; /* pointer to physical buffer */ 1253 char *v_buffer; /* pointer to physical buffer */
1118 unsigned int v_buflen; /* size of area to write */ 1254 unsigned int v_buflen; /* size of area to write */
… …
1130 char *cmdbuf_ptr, *cmdbuf_endp; 1266 char *cmdbuf_ptr, *cmdbuf_endp;
1131 char cmdbuf_base[CBUFSIZ]; 1267 char cmdbuf_base[CBUFSIZ];
1132 1268
1133 ptytty *pty; 1269 ptytty *pty;
1134 1270
1135 rxvt_salloc *talloc; // text line allocator 1271 // chunk contains all line_t's as well as rend_t and text_t buffers
1136 rxvt_salloc *ralloc; // rend line allocator 1272 // for drawn_buf, swap_buf and row_buf, in this order
1273 void *chunk;
1274 size_t chunk_size;
1137 1275
1138 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1276 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1139 1277
1140#if ENABLE_FRILLS || ISO_14755 1278#if ENABLE_FRILLS || ISO_14755
1141 // ISO 14755 entry support 1279 // ISO 14755 entry support
1142 unicode_t iso14755buf; 1280 unicode_t iso14755buf;
1143 void commit_iso14755 (); 1281 void commit_iso14755 ();
1144# if ISO_14755 1282# if ISO_14755
1145 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1283 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1146 void iso14755_54 (int x, int y); 1284 void iso14755_54 (int x, int y);
1147# endif 1285# endif
1148#endif 1286#endif
1149 1287
1150 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1288 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1152 void vt_select_input () const NOTHROW 1290 void vt_select_input () const NOTHROW
1153 { 1291 {
1154 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1292 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1155 } 1293 }
1156 1294
1157#if ENABLE_TRANSPARENCY || ENABLE_PERL 1295#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1158 void rootwin_cb (XEvent &xev); 1296 void rootwin_cb (XEvent &xev);
1159 xevent_watcher rootwin_ev; 1297 xevent_watcher rootwin_ev;
1160#endif 1298#endif
1161#ifdef HAVE_BG_PIXMAP 1299#ifdef HAVE_BG_PIXMAP
1162 void update_background (); 1300 void update_background ();
1163#if TRACE_PIXMAPS
1164 void trace_update_background (const char *file, int line);
1165# define update_background() trace_update_background (__FILE__, __LINE__)
1166#endif
1167 void update_background_cb (ev::timer &w, int revents); 1301 void update_background_cb (ev::timer &w, int revents);
1168 ev::timer update_background_ev; 1302 ev::timer update_background_ev;
1169#endif 1303#endif
1170 1304
1171 void x_cb (XEvent &xev); 1305 void x_cb (XEvent &xev);
… …
1176 void child_cb (ev::child &w, int revents); ev::child child_ev; 1310 void child_cb (ev::child &w, int revents); ev::child child_ev;
1177 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1311 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1178 void refresh_check (); 1312 void refresh_check ();
1179 void flush (); 1313 void flush ();
1180 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1314 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1315 void cmdbuf_reify ();
1316 void cmdbuf_append (const char *str, size_t count);
1181 bool pty_fill (); 1317 bool pty_fill ();
1182 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1318 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1183 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1184 1319
1185#ifdef CURSOR_BLINK 1320#ifdef CURSOR_BLINK
1321 void cursor_blink_reset ();
1186 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1322 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1187#endif 1323#endif
1188#ifdef TEXT_BLINK 1324#ifdef TEXT_BLINK
1189 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1325 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1190#endif 1326#endif
… …
1209 void pointer_unblank (); 1345 void pointer_unblank ();
1210 1346
1211 void tt_printf (const char *fmt,...); 1347 void tt_printf (const char *fmt,...);
1212 void tt_write (const char *data, unsigned int len); 1348 void tt_write (const char *data, unsigned int len);
1213 void pty_write (); 1349 void pty_write ();
1214
1215 void init (stringvec *argv, stringvec *envv)
1216 {
1217 this->argv = argv;
1218 init (argv->size (), argv->begin (), envv);
1219 }
1220 1350
1221 void make_current () const // make this the "currently active" urxvt instance 1351 void make_current () const // make this the "currently active" urxvt instance
1222 { 1352 {
1223 SET_R (this); 1353 SET_R (this);
1224 set_environ (envv); 1354 set_environ (envv);
… …
1236 void im_set_size (XRectangle &size); 1366 void im_set_size (XRectangle &size);
1237 void im_set_position (XPoint &pos) NOTHROW; 1367 void im_set_position (XPoint &pos) NOTHROW;
1238 void im_set_color (unsigned long &fg, unsigned long &bg); 1368 void im_set_color (unsigned long &fg, unsigned long &bg);
1239 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1369 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1240 1370
1241 bool IMisRunning (); 1371 bool im_is_running ();
1242 void IMSendSpot (); 1372 void im_send_spot ();
1243 bool IM_get_IC (const char *modifiers); 1373 bool im_get_ic (const char *modifiers);
1244 void IMSetPosition (); 1374 void im_set_position ();
1245#endif 1375#endif
1246 1376
1247 // command.C 1377 // command.C
1248 void key_press (XKeyEvent &ev); 1378 void key_press (XKeyEvent &ev);
1249 void key_release (XKeyEvent &ev); 1379 void key_release (XKeyEvent &ev);
1250 unsigned int cmd_write (const char *str, unsigned int count);
1251 1380
1252 wchar_t next_char () NOTHROW; 1381 wchar_t next_char () NOTHROW;
1253 wchar_t cmd_getc () THROW ((class out_of_input)); 1382 wchar_t cmd_getc () THROW ((class out_of_input));
1254 uint32_t next_octet () NOTHROW; 1383 uint32_t next_octet () NOTHROW;
1255 uint32_t cmd_get8 () THROW ((class out_of_input)); 1384 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1282 void process_color_seq (int report, int color, const char *str, char resp); 1411 void process_color_seq (int report, int color, const char *str, char resp);
1283 void process_xterm_seq (int op, char *str, char resp); 1412 void process_xterm_seq (int op, char *str, char resp);
1284 int privcases (int mode, unsigned long bit); 1413 int privcases (int mode, unsigned long bit);
1285 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1414 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1286 void process_sgr_mode (unsigned int nargs, const int *arg); 1415 void process_sgr_mode (unsigned int nargs, const int *arg);
1287 void process_graphics ();
1288 // init.C 1416 // init.C
1417 void init (stringvec *argv, stringvec *envv);
1418 void init (int argc, const char *const *argv, const char *const *envv);
1419 void init2 (int argc, const char *const *argv);
1289 void init_vars (); 1420 void init_vars ();
1290 const char **init_resources (int argc, const char *const *argv); 1421 const char **init_resources (int argc, const char *const *argv);
1291 void init (int argc, const char *const *argv, stringvec *envv);
1292 void init_env (); 1422 void init_env ();
1293 void set_locale (const char *locale); 1423 void set_locale (const char *locale);
1294 void init_xlocale (); 1424 void init_xlocale ();
1295 void init_command (const char *const *argv); 1425 void init_command (const char *const *argv);
1296 void run_command (const char *const *argv); 1426 void run_command (const char *const *argv);
1297 int run_child (const char *const *argv); 1427 int run_child (const char *const *argv);
1298 void color_aliases (int idx); 1428 void color_aliases (int idx);
1299 void create_windows (int argc, const char *const *argv); 1429 void create_windows (int argc, const char *const *argv);
1300 void get_colours (); 1430 void get_colours ();
1301 void get_ourmods (); 1431 void get_ourmods ();
1432 void set_icon (const char *file);
1302 // main.C 1433 // main.C
1303 void tt_winch (); 1434 void tt_winch ();
1304 rxvt_term (); 1435 rxvt_term ();
1305 ~rxvt_term (); 1436 ~rxvt_term ();
1306 void destroy (); 1437 void destroy ();
… …
1313 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1444 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1314 void set_utf8_property (Atom prop, const char *str, int len = -1); 1445 void set_utf8_property (Atom prop, const char *str, int len = -1);
1315 void set_title (const char *str); 1446 void set_title (const char *str);
1316 void set_icon_name (const char *str); 1447 void set_icon_name (const char *str);
1317 void set_window_color (int idx, const char *color); 1448 void set_window_color (int idx, const char *color);
1318 void set_colorfgbg (); 1449 char *get_colorfgbg ();
1319 bool set_color (rxvt_color &color, const char *name); 1450 bool set_color (rxvt_color &color, const char *name);
1320 void alias_color (int dst, int src); 1451 void alias_color (int dst, int src);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1452 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 void get_window_origin (int &x, int &y); 1453 void get_window_origin (int &x, int &y);
1323 Pixmap get_pixmap_property (int prop_id);
1324 1454
1325 // screen.C 1455 // screen.C
1326 1456
1327 void lalloc (line_t &l) const 1457 bool option (uint8_t opt) const NOTHROW
1328 { 1458 {
1329 l.t = (text_t *)talloc->alloc (); 1459 return options[opt >> 3] & (1 << (opt & 7));
1330 l.r = (rend_t *)ralloc->alloc ();
1331 } 1460 }
1332 1461
1333#if 0 1462 void set_option (uint8_t opt, bool set = true) NOTHROW;
1334 void lfree (line_t &l)
1335 {
1336 talloc->free (l.t);
1337 ralloc->free (l.r);
1338 }
1339#endif
1340
1341 void lresize (line_t &l) const
1342 {
1343 if (!l.t)
1344 return;
1345
1346 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1347 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1348
1349 l.l = min (l.l, ncol);
1350
1351 if (ncol > prev_ncol)
1352 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1353 }
1354 1463
1355 int fgcolor_of (rend_t r) const NOTHROW 1464 int fgcolor_of (rend_t r) const NOTHROW
1356 { 1465 {
1357 int base = GET_BASEFG (r); 1466 int base = GET_BASEFG (r);
1358#ifndef NO_BRIGHTCOLOR 1467#ifndef NO_BRIGHTCOLOR
1359 if (r & RS_Bold 1468 if (r & RS_Bold
1360# if ENABLE_STYLES 1469# if ENABLE_STYLES
1361 && option (Opt_intensityStyles) 1470 && option (Opt_intensityStyles)
1362# endif 1471# endif
1363 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1472 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1364 base += minBrightCOLOR - minCOLOR; 1473 base += minBrightCOLOR - minCOLOR;
1365#endif 1474#endif
1366 return base; 1475 return base;
1367 } 1476 }
1368 1477
… …
1372#ifndef NO_BRIGHTCOLOR 1481#ifndef NO_BRIGHTCOLOR
1373 if (r & RS_Blink 1482 if (r & RS_Blink
1374# if ENABLE_STYLES 1483# if ENABLE_STYLES
1375 && option (Opt_intensityStyles) 1484 && option (Opt_intensityStyles)
1376# endif 1485# endif
1377 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1486 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1378 base += minBrightCOLOR - minCOLOR; 1487 base += minBrightCOLOR - minCOLOR;
1379#endif 1488#endif
1380 return base; 1489 return base;
1381 } 1490 }
1382 1491
1383 bool option (uint8_t opt) const NOTHROW
1384 {
1385 if (!opt)
1386 return 0;
1387
1388 --opt;
1389 return options[opt >> 3] & (1 << (opt & 7));
1390 }
1391
1392 void set_option (uint8_t opt, bool set = true) NOTHROW
1393 {
1394 if (!opt)
1395 return;
1396
1397 --opt;
1398 if (set)
1399 options[opt >> 3] |= (1 << (opt & 7));
1400 else
1401 options[opt >> 3] &= ~(1 << (opt & 7));
1402 }
1403
1404 void set_privmode (unsigned bit, int set) NOTHROW
1405 {
1406 if (set)
1407 priv_modes |= bit;
1408 else
1409 priv_modes &= ~bit;
1410 }
1411
1412 // modifies first argument(!) 1492 // modifies first argument(!)
1493 void tt_paste (char *data, unsigned int len) NOTHROW;
1413 void paste (char *data, unsigned int len) NOTHROW; 1494 void paste (char *data, unsigned int len) NOTHROW;
1495 void scr_alloc () NOTHROW;
1414 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1496 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; 1497 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; 1498 void scr_kill_char (line_t &l, int col) const NOTHROW;
1417 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1499 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1418 void scr_reset (); 1500 void scr_reset ();
… …
1426 void scr_backindex () NOTHROW; 1508 void scr_backindex () NOTHROW;
1427 void scr_forwardindex () NOTHROW; 1509 void scr_forwardindex () NOTHROW;
1428#endif 1510#endif
1429 void scr_touch (bool refresh) NOTHROW; 1511 void scr_touch (bool refresh) NOTHROW;
1430 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1512 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1431 void scr_recolour () NOTHROW; 1513 void scr_recolour (bool refresh = true) NOTHROW;
1432 void scr_remap_chars () NOTHROW; 1514 void scr_remap_chars () NOTHROW;
1433 void scr_remap_chars (line_t &l) NOTHROW; 1515 void scr_remap_chars (line_t &l) NOTHROW;
1434 1516
1435 enum cursor_mode { SAVE, RESTORE }; 1517 enum cursor_mode { SAVE, RESTORE };
1436 1518
… …
1471 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1553 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; 1554 void scr_reverse_selection () NOTHROW;
1473 void scr_dump (int fd) NOTHROW; 1555 void scr_dump (int fd) NOTHROW;
1474 1556
1475 void selection_check (int check_more) NOTHROW; 1557 void selection_check (int check_more) NOTHROW;
1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1477 void selection_property (Window win, Atom prop) NOTHROW;
1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1558 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; 1559 void selection_clear (bool clipboard = false) NOTHROW;
1481 void clipboard_copy (Time tm);
1482 void selection_make (Time tm); 1560 void selection_make (Time tm);
1483 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1561 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1484 void selection_start_colrow (int col, int row) NOTHROW; 1562 void selection_start_colrow (int col, int row) NOTHROW;
1485 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1563 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1486 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1564 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1489 void selection_click (int clicks, int x, int y) NOTHROW; 1567 void selection_click (int clicks, int x, int y) NOTHROW;
1490 void selection_extend (int x, int y, int flag) NOTHROW; 1568 void selection_extend (int x, int y, int flag) NOTHROW;
1491 void selection_rotate (int x, int y) NOTHROW; 1569 void selection_rotate (int x, int y) NOTHROW;
1492 1570
1493 // xdefaults.C 1571 // xdefaults.C
1572 void rxvt_usage (int type);
1494 void get_options (int argc, const char *const *argv); 1573 const char **get_options (int argc, const char *const *argv);
1495 int parse_keysym (const char *str, const char *arg); 1574 int parse_keysym (const char *str, const char *arg);
1496 const char *x_resource (const char *name); 1575 const char *x_resource (const char *name);
1497 void extract_resources (); 1576 void extract_resources ();
1577 void extract_keysym_resources ();
1498}; 1578};
1499 1579
1500#endif /* _RXVT_H_ */ 1580#endif /* _RXVT_H_ */
1501 1581

Diff Legend

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