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

Diff Legend

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