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.420 by root, Tue Dec 7 19:05:35 2010 UTC vs.
Revision 1.546 by sf-exg, Sat May 14 08:31:26 2016 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>
… …
72#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
73#include <X11/keysym.h> 71#include <X11/keysym.h>
74#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 73#include <X11/Xatom.h>
76 74
75#if HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif
78
79#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1
81# define HAVE_IMG 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;
163ecb_noreturn ecb_cold
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 164void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception));
165ecb_noreturn ecb_cold
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 166void rxvt_exit_failure () THROW ((class rxvt_failure_exception));
158 167
159char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW;
162
163void * rxvt_malloc (size_t size); 168void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 169void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 170void * rxvt_realloc (void *ptr, size_t size);
171
172char * rxvt_strtrim (char *str) NOTHROW;
173char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
174
175static inline void
176rxvt_free_strsplit (char **ptr) NOTHROW
177{
178 free (ptr[0]);
179 free (ptr);
180}
181
182KeySym rxvt_XKeycodeToKeysym (Display *dpy, KeyCode keycode, int index);
166 183
167///////////////////////////////////////////////////////////////////////////// 184/////////////////////////////////////////////////////////////////////////////
168 185
169// temporarily replace the process environment 186// temporarily replace the process environment
170extern char **environ; 187extern char **environ;
171extern char **rxvt_environ; // the original environ pointer 188extern char **rxvt_environ; // the original environ pointer
172 189
173static inline void 190static inline void
174set_environ (stringvec *envv) 191set_environ (char **envv)
175{ 192{
176#if ENABLE_PERL 193#if ENABLE_PERL
177 assert (envv); 194 assert (envv);
178#else 195#else
179 if (envv) 196 if (envv)
180#endif 197#endif
181 environ = (char **)envv->begin ();
182}
183
184static inline void
185set_environ (char **envv)
186{
187#if ENABLE_PERL
188 assert (envv);
189#else
190 if (envv)
191#endif
192 environ = envv; 198 environ = envv;
193} 199}
200
201struct localise_env
202{
203 char **orig_env;
204
205 localise_env (char **new_env)
206 {
207 orig_env = environ;
208 environ = new_env;
209 }
210
211 ~localise_env ()
212 {
213 environ = orig_env;
214 }
215};
216
217#ifdef HAVE_BG_PIXMAP
218struct image_effects
219{
220 bool tint_set;
221 rxvt_color tint;
222 int shade;
223 int h_blurRadius, v_blurRadius;
224
225 image_effects ()
226 {
227 tint_set =
228 h_blurRadius =
229 v_blurRadius = 0;
230 shade = 100;
231 }
232
233 bool need_tint ()
234 {
235 return shade != 100 || tint_set;
236 }
237
238 bool need_blur ()
239 {
240 return h_blurRadius && v_blurRadius;
241 }
242
243 bool set_tint (const rxvt_color &new_tint);
244 bool set_shade (const char *shade_str);
245 bool set_blur (const char *geom);
246};
247
248# if BG_IMAGE_FROM_FILE
249enum {
250 IM_IS_SIZE_SENSITIVE = 1 << 1,
251 IM_KEEP_ASPECT = 1 << 2,
252 IM_ROOT_ALIGN = 1 << 3,
253 IM_TILE = 1 << 4,
254 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
255};
256
257enum {
258 noScale = 0,
259 windowScale = 100,
260 defaultScale = windowScale,
261 centerAlign = 50,
262 defaultAlign = centerAlign,
263};
264
265struct rxvt_image : image_effects
266{
267 unsigned short alpha;
268 uint8_t flags;
269 unsigned int h_scale, v_scale; /* percents of the window size */
270 int h_align, v_align; /* percents of the window size:
271 0 - left align, 50 - center, 100 - right */
272
273 bool is_size_sensitive ()
274 {
275 return (!(flags & IM_TILE)
276 || h_scale || v_scale
277 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
278 }
279
280 rxvt_img *img;
281
282 void destroy ()
283 {
284 delete img;
285 img = 0;
286 }
287
288 rxvt_image ();
289 void set_file_geometry (rxvt_screen *s, const char *file);
290 void set_file (rxvt_screen *s, const char *file);
291 bool set_geometry (const char *geom, bool update = false);
292};
293# endif
294#endif
194 295
195/* 296/*
196 ***************************************************************************** 297 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 298 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 299 *****************************************************************************
… …
241 ***************************************************************************** 342 *****************************************************************************
242 */ 343 */
243 344
244/* COLORTERM, TERM environment variables */ 345/* COLORTERM, TERM environment variables */
245#define COLORTERMENV "rxvt" 346#define COLORTERMENV "rxvt"
246#ifdef BG_IMAGE_FROM_FILE 347#if BG_IMAGE_FROM_FILE
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 348# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 349#else
249# define COLORTERMENVFULL COLORTERMENV 350# define COLORTERMENVFULL COLORTERMENV
250#endif 351#endif
251#ifndef TERMENV 352#ifndef TERMENV
… …
276# define NSCREENS 0 377# define NSCREENS 0
277#else 378#else
278# define NSCREENS 1 379# define NSCREENS 1
279#endif 380#endif
280 381
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 () */ 382/* flags for rxvt_term::scr_gotorc () */
287enum { 383enum {
288 C_RELATIVE = 1, /* col movement is relative */ 384 C_RELATIVE = 1, /* col movement is relative */
289 R_RELATIVE = 2, /* row movement is relative */ 385 R_RELATIVE = 2, /* row movement is relative */
290 RELATIVE = C_RELATIVE | R_RELATIVE, 386 RELATIVE = C_RELATIVE | R_RELATIVE,
291}; 387};
292 388
293/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 389/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294enum { 390enum {
295 INSERT = -1, /* don't change these values */ 391 INSERT = -1, /* don't change these values */
296 DELETE = +1, 392 DELETE = +1,
297 ERASE = +2, 393 ERASE = +2,
298}; 394};
299 395
300/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 396/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301enum page_dirn { 397enum page_dirn {
302 UP, 398 DN = -1,
303 DN,
304 NO_DIR, 399 NO_DIR = 0,
400 UP = 1,
305}; 401};
306 402
307/* arguments for rxvt_scr_change_screen () */ 403/* arguments for rxvt_term::scr_change_screen () */
308enum { 404enum {
309 PRIMARY = 0, 405 PRIMARY = 0,
310 SECONDARY, 406 SECONDARY,
311}; 407};
312 408
… …
354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 450#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
355#define RS_attrMask (RS_baseattrMask | RS_fontMask) 451#define RS_attrMask (RS_baseattrMask | RS_fontMask)
356 452
357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 453#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)) 454#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 455
371enum { 456enum {
372 C0_NUL = 0x00, 457 C0_NUL = 0x00,
373 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 458 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 , 459 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
497#endif 582#endif
498 Color_scroll, 583 Color_scroll,
499#ifdef RXVT_SCROLLBAR 584#ifdef RXVT_SCROLLBAR
500 Color_trough, 585 Color_trough,
501#endif 586#endif
502#if ENABLE_TRANSPARENCY 587#if BG_IMAGE_FROM_ROOT
503 Color_tint, 588 Color_tint,
504#endif 589#endif
505#if OFF_FOCUS_FADING 590#if OFF_FOCUS_FADING
506 Color_fade, 591 Color_fade,
507#endif 592#endif
… …
557#define PrivMode_MouseBtnEvent (1UL<<20) 642#define PrivMode_MouseBtnEvent (1UL<<20)
558#define PrivMode_MouseAnyEvent (1UL<<21) 643#define PrivMode_MouseAnyEvent (1UL<<21)
559#define PrivMode_BracketPaste (1UL<<22) 644#define PrivMode_BracketPaste (1UL<<22)
560#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack 645#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
561#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales 646#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
647#define PrivMode_BlinkingCursor (1UL<<25)
648#define PrivMode_FocusEvent (1UL<<26)
562 649
563#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 650#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
564 651
565#ifdef ALLOW_132_MODE 652#ifdef ALLOW_132_MODE
566# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 653# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
569#endif 656#endif
570 657
571// do not change these constants lightly, there are many interdependencies 658// do not change these constants lightly, there are many interdependencies
572#define IMBUFSIZ 128 // input modifier buffer sizes 659#define IMBUFSIZ 128 // input modifier buffer sizes
573#define KBUFSZ 512 // size of keyboard mapping buffer 660#define KBUFSZ 512 // size of keyboard mapping buffer
574#define CBUFSIZ 2048 // size of command buffer 661#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 662#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
576#define UBUFSIZ 2048 // character buffer 663#define UBUFSIZ 2048 // character buffer
577 664
578#if ENABLE_FRILLS 665#if ENABLE_FRILLS
579# include <X11/Xmd.h> 666# include <X11/Xmd.h>
… …
652 739
653#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 740#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
654#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 741#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
655 742
656#define GET_ATTR(x) (((x) & RS_attrMask)) 743#define GET_ATTR(x) (((x) & RS_attrMask))
657// return attributes defining the background, encoding doesn't matter
658// depends on RS_fgShift > RS_bgShift
659#define GET_BGATTR(x) \
660 (expect_false ((x) & RS_RVid) \
661 ? (((x) & (RS_attrMask & ~RS_RVid)) \
662 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
663 : ((x) & (RS_attrMask | RS_bgMask)))
664#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 744#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
665#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 745#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
666#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 746#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
667 747
668#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 748#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
… …
693{ 773{
694 text_t *t; // terminal the text 774 text_t *t; // terminal the text
695 rend_t *r; // rendition, uses RS_ flags 775 rend_t *r; // rendition, uses RS_ flags
696 tlen_t_ l; // length of each text line 776 tlen_t_ l; // length of each text line
697 uint32_t f; // flags 777 uint32_t f; // flags
778
779 bool valid ()
780 {
781 return l >= 0;
782 }
783
784 void alloc ()
785 {
786 l = 0;
787 }
698 788
699 bool is_longer () 789 bool is_longer ()
700 { 790 {
701 return f & LINE_LONGER; 791 return f & LINE_LONGER;
702 } 792 }
… …
767// that are not representable in unicode, as well as characters 857// that are not representable in unicode, as well as characters
768// not fitting in the BMP. 858// not fitting in the BMP.
769struct compose_char 859struct compose_char
770{ 860{
771 unicode_t c1, c2; // any chars != NOCHAR are valid 861 unicode_t c1, c2; // any chars != NOCHAR are valid
862
772 compose_char (unicode_t c1, unicode_t c2) 863 compose_char (unicode_t c1, unicode_t c2)
773 : c1(c1), c2(c2) 864 : c1(c1), c2(c2)
774 { } 865 { }
775}; 866};
776 867
… …
858 * END······················= total_rows 949 * END······················= total_rows
859 */ 950 */
860 951
861struct TermWin_t 952struct TermWin_t
862{ 953{
954 int vt_width; /* actual window width [pixels] */
955 int vt_height; /* actual window height [pixels] */
863 int width; /* window width [pixels] */ 956 int width; /* window width [pixels] */
864 int height; /* window height [pixels] */ 957 int height; /* window height [pixels] */
865 int fwidth; /* font width [pixels] */ 958 int fwidth; /* font width [pixels] */
866 int fheight; /* font height [pixels] */ 959 int fheight; /* font height [pixels] */
867 int fbase; /* font ascent (baseline) [pixels] */ 960 int fbase; /* font ascent (baseline) [pixels] */
… …
876 int saveLines; /* number of lines that fit in scrollback */ 969 int saveLines; /* number of lines that fit in scrollback */
877 int total_rows; /* total number of rows in this terminal */ 970 int total_rows; /* total number of rows in this terminal */
878 int term_start; /* term lines start here */ 971 int term_start; /* term lines start here */
879 int view_start; /* scrollback view starts here */ 972 int view_start; /* scrollback view starts here */
880 int top_row; /* topmost row index of scrollback */ 973 int top_row; /* topmost row index of scrollback */
881 Window parent[6]; /* parent identifiers - we're parent[0] */ 974 Window parent; /* parent identifier */
882 Window vt; /* vt100 window */ 975 Window vt; /* vt100 window */
883 GC gc; /* GC for drawing */ 976 GC gc; /* GC for drawing */
884 Pixmap pixmap;
885 rxvt_drawable *drawable; 977 rxvt_drawable *drawable;
886 rxvt_fontset *fontset[4]; 978 rxvt_fontset *fontset[4];
887}; 979};
888 980
889/* 981/*
… …
969 scrollBar_t scrollBar; 1061 scrollBar_t scrollBar;
970 uint8_t options[(Opt_count + 7) >> 3]; 1062 uint8_t options[(Opt_count + 7) >> 3];
971 XSizeHints szHint; 1063 XSizeHints szHint;
972 rxvt_color *pix_colors; 1064 rxvt_color *pix_colors;
973 Cursor TermWin_cursor; /* cursor for vt window */ 1065 Cursor TermWin_cursor; /* cursor for vt window */
1066
974 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1067 line_t *row_buf; // all lines, scrollback + terminal, circular
975 line_t *drawn_buf; // text on screen 1068 line_t *drawn_buf; // text on screen
976 line_t *swap_buf; // lines for swap buffer 1069 line_t *swap_buf; // lines for swap buffer
977 char *tabs; /* per location: 1 == tab-stop */ 1070 char *tabs; /* per location: 1 == tab-stop */
978 screen_t screen; 1071 screen_t screen;
979 screen_t swap; 1072 screen_t swap;
… …
1016 hidden_pointer:1, 1109 hidden_pointer:1,
1017#endif 1110#endif
1018 enc_utf8:1, /* whether locale uses utf-8 */ 1111 enc_utf8:1, /* whether locale uses utf-8 */
1019 seen_input:1, /* whether we have seen some program output yet */ 1112 seen_input:1, /* whether we have seen some program output yet */
1020 seen_resize:1, /* whether we had a resize event */ 1113 seen_resize:1, /* whether we had a resize event */
1114 init_done:1,
1021 parsed_geometry:1; 1115 parsed_geometry:1;
1022 1116
1023 unsigned char refresh_type, 1117 unsigned char refresh_type,
1024#ifdef META8_OPTION 1118#ifdef META8_OPTION
1025 meta_char, /* Alt-key prefix */ 1119 meta_char; /* Alt-key prefix */
1026#endif 1120#endif
1027 selection_wait,
1028 selection_type;
1029/* ---------- */ 1121/* ---------- */
1030 bool rvideo_state, rvideo_mode; 1122 bool rvideo_state, rvideo_mode;
1031#ifndef NO_BELL 1123#ifndef NO_BELL
1032 bool rvideo_bell; 1124 bool rvideo_bell;
1033#endif 1125#endif
… …
1037/* ---------- */ 1129/* ---------- */
1038 rend_t rstyle; 1130 rend_t rstyle;
1039/* ---------- */ 1131/* ---------- */
1040#ifdef SELECTION_SCROLLING 1132#ifdef SELECTION_SCROLLING
1041 int scroll_selection_lines; 1133 int scroll_selection_lines;
1042 enum page_dirn scroll_selection_dir;
1043 int selection_save_x, 1134 int selection_save_x,
1044 selection_save_y, 1135 selection_save_y,
1045 selection_save_state; 1136 selection_save_state;
1046#endif 1137#endif
1047/* ---------- */ 1138/* ---------- */
… …
1056 mouse_row, 1147 mouse_row,
1057 mouse_col, 1148 mouse_col,
1058# ifdef POINTER_BLANK 1149# ifdef POINTER_BLANK
1059 pointerBlankDelay, 1150 pointerBlankDelay,
1060# endif 1151# endif
1152 multiClickTime,
1153 cursor_type,
1061 allowedxerror; 1154 allowedxerror;
1062/* ---------- */ 1155/* ---------- */
1063 unsigned int ModLevel3Mask, 1156 unsigned int ModLevel3Mask,
1064 ModMetaMask, 1157 ModMetaMask,
1065 ModNumLockMask; 1158 ModNumLockMask;
1066 int old_width, /* last used width in screen resize */
1067 old_height; /* last used height in screen resize */
1068 unsigned long priv_modes, 1159 unsigned long priv_modes,
1069 SavedModes; 1160 SavedModes;
1070/* ---------- */ 1161/* ---------- */
1071 Atom *xa; 1162 Atom *xa;
1072/* ---------- */ 1163/* ---------- */
1073 Time selection_time, 1164 Time selection_time,
1074 selection_request_time,
1075 clipboard_time; 1165 clipboard_time;
1166 rxvt_selection *selection_req;
1076 pid_t cmd_pid; /* process id of child */ 1167 pid_t cmd_pid; /* process id of child */
1077 char * incr_buf;
1078 size_t incr_buf_size, incr_buf_fill;
1079/* ---------- */ 1168/* ---------- */
1080 struct mouse_event MEvent; 1169 struct mouse_event MEvent;
1081 XComposeStatus compose; 1170 XComposeStatus compose;
1082 static struct termios def_tio; 1171 static struct termios def_tio;
1083 row_col_t oldcursor; 1172 row_col_t oldcursor;
1173
1084#ifdef HAVE_BG_PIXMAP 1174#ifdef HAVE_BG_PIXMAP
1085 bgPixmap_t bgPixmap; 1175 void bg_init ();
1176 void bg_destroy ();
1177
1178# if BG_IMAGE_FROM_FILE
1179 rxvt_image fimage;
1180 void render_image (rxvt_image &image);
1086#endif 1181# endif
1182
1183# if BG_IMAGE_FROM_ROOT
1184 rxvt_img *root_img;
1185 image_effects root_effects;
1186
1187 void render_root_image ();
1188# endif
1189
1190 ev_tstamp bg_valid_since;
1191
1192 bool bg_window_size_sensitive ();
1193 bool bg_window_position_sensitive ();
1194
1195 void bg_render ();
1196#endif
1197
1087#ifdef HAVE_AFTERIMAGE 1198#ifdef HAVE_IMG
1088 ASVisual *asv; 1199 enum {
1089 ASImageManager *asimman; 1200 BG_IS_TRANSPARENT = 1 << 1,
1090 1201 BG_NEEDS_REFRESH = 1 << 2,
1091 void init_asv () 1202 BG_INHIBIT_RENDER = 1 << 3,
1092 {
1093 if (!asv)
1094 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1095 } 1203 };
1204
1205 uint8_t bg_flags;
1206
1207 rxvt_img *bg_img;
1096#endif 1208#endif
1097 1209
1098#if ENABLE_OVERLAY 1210#if ENABLE_OVERLAY
1099 overlay_base ov; 1211 overlay_base ov;
1100 1212
… …
1108 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1220 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1109#endif 1221#endif
1110 1222
1111 vector<void *> allocated; // free these memory blocks with free() 1223 vector<void *> allocated; // free these memory blocks with free()
1112 1224
1113 char env_windowid[21]; /* environmental variable WINDOWID */ 1225 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1114 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1115 char *env_display; /* environmental variable DISPLAY */
1116 char *env_term; /* environmental variable TERM */
1117 1226
1118 char *locale; 1227 char *locale;
1119 char charsets[4]; 1228 char charsets[4];
1120 char *v_buffer; /* pointer to physical buffer */ 1229 char *v_buffer; /* pointer to physical buffer */
1121 unsigned int v_buflen; /* size of area to write */ 1230 unsigned int v_buflen; /* size of area to write */
1122 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1231 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1232 char **env;
1123 1233
1124#ifdef KEYSYM_RESOURCE 1234#ifdef KEYSYM_RESOURCE
1125 keyboard_manager *keyboard; 1235 keyboard_manager *keyboard;
1126#endif 1236#endif
1127#ifndef NO_RESOURCES 1237#ifndef NO_RESOURCES
… …
1133 char *cmdbuf_ptr, *cmdbuf_endp; 1243 char *cmdbuf_ptr, *cmdbuf_endp;
1134 char cmdbuf_base[CBUFSIZ]; 1244 char cmdbuf_base[CBUFSIZ];
1135 1245
1136 ptytty *pty; 1246 ptytty *pty;
1137 1247
1138 rxvt_salloc *talloc; // text line allocator 1248 // chunk contains all line_t's as well as rend_t and text_t buffers
1139 rxvt_salloc *ralloc; // rend line allocator 1249 // for drawn_buf, swap_buf and row_buf, in this order
1250 void *chunk;
1251 size_t chunk_size;
1140 1252
1141 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1253 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1142 1254
1143#if ENABLE_FRILLS || ISO_14755 1255#if ENABLE_FRILLS || ISO_14755
1144 // ISO 14755 entry support 1256 // ISO 14755 entry support
1145 unicode_t iso14755buf; 1257 unicode_t iso14755buf;
1146 void commit_iso14755 (); 1258 void commit_iso14755 ();
1147# if ISO_14755 1259# if ISO_14755
1148 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1260 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1149 void iso14755_54 (int x, int y); 1261 void iso14755_54 (int x, int y);
1150# endif 1262# endif
1151#endif 1263#endif
1152 1264
1153 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1265 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1155 void vt_select_input () const NOTHROW 1267 void vt_select_input () const NOTHROW
1156 { 1268 {
1157 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1269 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1158 } 1270 }
1159 1271
1160#if ENABLE_TRANSPARENCY || ENABLE_PERL 1272#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1161 void rootwin_cb (XEvent &xev); 1273 void rootwin_cb (XEvent &xev);
1162 xevent_watcher rootwin_ev; 1274 xevent_watcher rootwin_ev;
1163#endif 1275#endif
1164#ifdef HAVE_BG_PIXMAP 1276#ifdef HAVE_BG_PIXMAP
1165 void update_background (); 1277 void update_background ();
… …
1175 void child_cb (ev::child &w, int revents); ev::child child_ev; 1287 void child_cb (ev::child &w, int revents); ev::child child_ev;
1176 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1288 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1177 void refresh_check (); 1289 void refresh_check ();
1178 void flush (); 1290 void flush ();
1179 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1291 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1292 void cmdbuf_reify ();
1293 void cmdbuf_append (const char *str, size_t count);
1180 bool pty_fill (); 1294 bool pty_fill ();
1181 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1295 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1182 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1183 1296
1184#ifdef CURSOR_BLINK 1297#ifdef CURSOR_BLINK
1298 void cursor_blink_reset ();
1185 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1299 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1186#endif 1300#endif
1187#ifdef TEXT_BLINK 1301#ifdef TEXT_BLINK
1188 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1302 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1189#endif 1303#endif
… …
1206 void pointer_blank (); 1320 void pointer_blank ();
1207#endif 1321#endif
1208 void pointer_unblank (); 1322 void pointer_unblank ();
1209 1323
1210 void tt_printf (const char *fmt,...); 1324 void tt_printf (const char *fmt,...);
1325 void tt_write_ (const char *data, unsigned int len);
1211 void tt_write (const char *data, unsigned int len); 1326 void tt_write (const char *data, unsigned int len);
1327 void tt_write_user_input (const char *data, unsigned int len);
1212 void pty_write (); 1328 void pty_write ();
1213
1214 void init (stringvec *argv, stringvec *envv)
1215 {
1216 this->argv = argv;
1217 init (argv->size (), argv->begin (), envv);
1218 }
1219 1329
1220 void make_current () const // make this the "currently active" urxvt instance 1330 void make_current () const // make this the "currently active" urxvt instance
1221 { 1331 {
1222 SET_R (this); 1332 SET_R (this);
1223 set_environ (envv); 1333 set_environ (env);
1224 rxvt_set_locale (locale); 1334 rxvt_set_locale (locale);
1225 } 1335 }
1226 1336
1227#if USE_XIM 1337#if USE_XIM
1228 rxvt_xim *input_method; 1338 rxvt_xim *input_method;
… …
1235 void im_set_size (XRectangle &size); 1345 void im_set_size (XRectangle &size);
1236 void im_set_position (XPoint &pos) NOTHROW; 1346 void im_set_position (XPoint &pos) NOTHROW;
1237 void im_set_color (unsigned long &fg, unsigned long &bg); 1347 void im_set_color (unsigned long &fg, unsigned long &bg);
1238 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1348 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1239 1349
1240 bool IMisRunning (); 1350 bool im_is_running ();
1241 void IMSendSpot (); 1351 void im_send_spot ();
1242 bool IM_get_IC (const char *modifiers); 1352 bool im_get_ic (const char *modifiers);
1243 void IMSetPosition (); 1353 void im_set_position ();
1244#endif 1354#endif
1245 1355
1246 // command.C 1356 // command.C
1247 void key_press (XKeyEvent &ev); 1357 void key_press (XKeyEvent &ev);
1248 void key_release (XKeyEvent &ev); 1358 void key_release (XKeyEvent &ev);
1249 unsigned int cmd_write (const char *str, unsigned int count);
1250 1359
1251 wchar_t next_char () NOTHROW; 1360 wchar_t next_char () NOTHROW;
1252 wchar_t cmd_getc () THROW ((class out_of_input)); 1361 wchar_t cmd_getc () THROW ((class out_of_input));
1253 uint32_t next_octet () NOTHROW; 1362 uint32_t next_octet () NOTHROW;
1254 uint32_t cmd_get8 () THROW ((class out_of_input)); 1363 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1262#if ENABLE_FRILLS 1371#if ENABLE_FRILLS
1263 void set_urgency (bool enable); 1372 void set_urgency (bool enable);
1264#else 1373#else
1265 void set_urgency (bool enable) { } 1374 void set_urgency (bool enable) { }
1266#endif 1375#endif
1267 void update_fade_color (unsigned int idx); 1376 void update_fade_color (unsigned int idx, bool first_time = false);
1268#ifdef PRINTPIPE 1377#ifdef PRINTPIPE
1269 FILE *popen_printer (); 1378 FILE *popen_printer ();
1270 int pclose_printer (FILE *stream); 1379 int pclose_printer (FILE *stream);
1271#endif 1380#endif
1272 void process_print_pipe (); 1381 void process_print_pipe ();
… …
1281 void process_color_seq (int report, int color, const char *str, char resp); 1390 void process_color_seq (int report, int color, const char *str, char resp);
1282 void process_xterm_seq (int op, char *str, char resp); 1391 void process_xterm_seq (int op, char *str, char resp);
1283 int privcases (int mode, unsigned long bit); 1392 int privcases (int mode, unsigned long bit);
1284 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1393 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1285 void process_sgr_mode (unsigned int nargs, const int *arg); 1394 void process_sgr_mode (unsigned int nargs, const int *arg);
1286 void process_graphics (); 1395 void set_cursor_style (int style);
1287 // init.C 1396 // init.C
1397 void init (stringvec *argv, stringvec *envv);
1398 void init (int argc, const char *const *argv, const char *const *envv);
1399 void init2 (int argc, const char *const *argv);
1288 void init_vars (); 1400 void init_vars ();
1289 const char **init_resources (int argc, const char *const *argv); 1401 const char **init_resources (int argc, const char *const *argv);
1290 void init (int argc, const char *const *argv, stringvec *envv);
1291 void init_env (); 1402 void init_env ();
1292 void set_locale (const char *locale); 1403 void set_locale (const char *locale);
1293 void init_xlocale (); 1404 void init_xlocale ();
1294 void init_command (const char *const *argv); 1405 void init_command (const char *const *argv);
1295 void run_command (const char *const *argv); 1406 void run_command (const char *const *argv);
1296 int run_child (const char *const *argv); 1407 int run_child (const char *const *argv);
1297 void color_aliases (int idx); 1408 void color_aliases (int idx);
1298 void create_windows (int argc, const char *const *argv); 1409 void create_windows (int argc, const char *const *argv);
1299 void get_colours (); 1410 void get_colors ();
1300 void get_ourmods (); 1411 void get_ourmods ();
1301 void set_icon (const char *file); 1412 void set_icon (const char *file);
1302 // main.C 1413 // main.C
1303 void tt_winch (); 1414 void tt_winch ();
1304 rxvt_term (); 1415 rxvt_term ();
1305 ~rxvt_term (); 1416 ~rxvt_term ();
1306 void destroy (); 1417 void destroy ();
1307 void emergency_cleanup (); 1418 void emergency_cleanup ();
1308 void recolour_cursor (); 1419 void recolor_cursor ();
1309 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1420 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1310 void window_calc (unsigned int newwidth, unsigned int newheight); 1421 void window_calc (unsigned int newwidth, unsigned int newheight);
1311 bool set_fonts (); 1422 bool set_fonts ();
1312 void set_string_property (Atom prop, const char *str, int len = -1); 1423 void set_string_property (Atom prop, const char *str, int len = -1);
1313 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1424 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); 1425 void set_utf8_property (Atom prop, const char *str, int len = -1);
1315 void set_title (const char *str); 1426 void set_title (const char *str);
1316 void set_icon_name (const char *str); 1427 void set_icon_name (const char *str);
1317 void set_window_color (int idx, const char *color); 1428 void set_window_color (int idx, const char *color);
1318 void set_colorfgbg (); 1429 char *get_colorfgbg ();
1319 bool set_color (rxvt_color &color, const char *name); 1430 bool set_color (rxvt_color &color, const char *name);
1320 void alias_color (int dst, int src); 1431 void alias_color (int dst, int src);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1432 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 void get_window_origin (int &x, int &y); 1433 void get_window_origin (int &x, int &y);
1323 Pixmap get_pixmap_property (int prop_id);
1324 1434
1325 // screen.C 1435 // screen.C
1326 1436
1327 void lalloc (line_t &l) const 1437 bool option (uint8_t opt) const NOTHROW
1328 { 1438 {
1329 l.t = (text_t *)talloc->alloc (); 1439 return options[opt >> 3] & (1 << (opt & 7));
1330 l.r = (rend_t *)ralloc->alloc ();
1331 } 1440 }
1332 1441
1333#if 0 1442 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 1443
1355 int fgcolor_of (rend_t r) const NOTHROW 1444 int fgcolor_of (rend_t r) const NOTHROW
1356 { 1445 {
1357 int base = GET_BASEFG (r); 1446 int base = GET_BASEFG (r);
1358#ifndef NO_BRIGHTCOLOR 1447#ifndef NO_BRIGHTCOLOR
1359 if (r & RS_Bold 1448 if (r & RS_Bold
1360# if ENABLE_STYLES 1449# if ENABLE_STYLES
1361 && option (Opt_intensityStyles) 1450 && option (Opt_intensityStyles)
1362# endif 1451# endif
1363 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1452 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1364 base += minBrightCOLOR - minCOLOR; 1453 base += minBrightCOLOR - minCOLOR;
1365#endif 1454#endif
1366 return base; 1455 return base;
1367 } 1456 }
1368 1457
… …
1372#ifndef NO_BRIGHTCOLOR 1461#ifndef NO_BRIGHTCOLOR
1373 if (r & RS_Blink 1462 if (r & RS_Blink
1374# if ENABLE_STYLES 1463# if ENABLE_STYLES
1375 && option (Opt_intensityStyles) 1464 && option (Opt_intensityStyles)
1376# endif 1465# endif
1377 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1466 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1378 base += minBrightCOLOR - minCOLOR; 1467 base += minBrightCOLOR - minCOLOR;
1379#endif 1468#endif
1380 return base; 1469 return base;
1381 }
1382
1383 bool option (uint8_t opt) const NOTHROW
1384 {
1385 return options[opt >> 3] & (1 << (opt & 7));
1386 }
1387
1388 void set_option (uint8_t opt, bool set = true) NOTHROW
1389 {
1390 if (!opt)
1391 return;
1392
1393 uint8_t mask = 1 << (opt & 7);
1394 uint8_t &val = options [opt >> 3];
1395
1396 val = val & ~mask | (set ? 0 : mask);
1397 }
1398
1399 void set_privmode (unsigned bit, int set) NOTHROW
1400 {
1401 if (set)
1402 priv_modes |= bit;
1403 else
1404 priv_modes &= ~bit;
1405 } 1470 }
1406 1471
1407 // modifies first argument(!) 1472 // modifies first argument(!)
1408 void tt_paste (char *data, unsigned int len) NOTHROW; 1473 void tt_paste (char *data, unsigned int len) NOTHROW;
1409 void paste (char *data, unsigned int len) NOTHROW; 1474 void paste (char *data, unsigned int len) NOTHROW;
1475 void scr_alloc () NOTHROW;
1410 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1476 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1411 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1477 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1412 void scr_kill_char (line_t &l, int col) const NOTHROW; 1478 void scr_kill_char (line_t &l, int col) const NOTHROW;
1479 void scr_set_char_rend (line_t &l, int col, rend_t rend);
1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1480 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1481 void copy_line (line_t &dst, line_t &src);
1414 void scr_reset (); 1482 void scr_reset ();
1415 void scr_release () NOTHROW; 1483 void scr_release () NOTHROW;
1416 void scr_clear (bool really = false) NOTHROW; 1484 void scr_clear (bool really = false) NOTHROW;
1417 void scr_refresh () NOTHROW; 1485 void scr_refresh () NOTHROW;
1418 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1486 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
… …
1422 void scr_backindex () NOTHROW; 1490 void scr_backindex () NOTHROW;
1423 void scr_forwardindex () NOTHROW; 1491 void scr_forwardindex () NOTHROW;
1424#endif 1492#endif
1425 void scr_touch (bool refresh) NOTHROW; 1493 void scr_touch (bool refresh) NOTHROW;
1426 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1494 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1427 void scr_recolour () NOTHROW; 1495 void scr_recolor (bool refresh = true) NOTHROW;
1428 void scr_remap_chars () NOTHROW; 1496 void scr_remap_chars () NOTHROW;
1429 void scr_remap_chars (line_t &l) NOTHROW; 1497 void scr_remap_chars (line_t &l) NOTHROW;
1430 1498
1431 enum cursor_mode { SAVE, RESTORE }; 1499 enum cursor_mode { SAVE, RESTORE };
1432 1500
… …
1457 void scr_report_position () NOTHROW; 1525 void scr_report_position () NOTHROW;
1458 void set_font_style () NOTHROW; 1526 void set_font_style () NOTHROW;
1459 void scr_charset_choose (int set) NOTHROW; 1527 void scr_charset_choose (int set) NOTHROW;
1460 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1528 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1461 void scr_move_to (int y, int len) NOTHROW; 1529 void scr_move_to (int y, int len) NOTHROW;
1530 bool scr_page (int nlines) NOTHROW;
1462 bool scr_page (enum page_dirn direction, int nlines) NOTHROW; 1531 bool scr_page (enum page_dirn direction, int nlines) NOTHROW
1532 {
1533 return scr_page (direction * nlines);
1534 }
1463 bool scr_changeview (int new_view_start) NOTHROW; 1535 bool scr_changeview (int new_view_start) NOTHROW;
1464 void scr_bell () NOTHROW; 1536 void scr_bell () NOTHROW;
1465 void scr_printscreen (int fullhist) NOTHROW; 1537 void scr_printscreen (int fullhist) NOTHROW;
1466 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW; 1538 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1467 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1539 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1468 void scr_reverse_selection () NOTHROW; 1540 void scr_reverse_selection () NOTHROW;
1469 void scr_dump (int fd) NOTHROW; 1541 void scr_dump (int fd) NOTHROW;
1470 1542
1471 void selection_check (int check_more) NOTHROW; 1543 void selection_check (int check_more) NOTHROW;
1472 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1544 void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
1473 void selection_property (Window win, Atom prop) NOTHROW;
1474 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1545 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1475 int selection_request_other (Atom target, int selnum) NOTHROW;
1476 void selection_clear (bool clipboard = false) NOTHROW; 1546 void selection_clear (bool clipboard = false) NOTHROW;
1477 void selection_make (Time tm); 1547 void selection_make (Time tm);
1478 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1548 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1479 void selection_start_colrow (int col, int row) NOTHROW; 1549 void selection_start_colrow (int col, int row) NOTHROW;
1480 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1550 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
… …
1484 void selection_click (int clicks, int x, int y) NOTHROW; 1554 void selection_click (int clicks, int x, int y) NOTHROW;
1485 void selection_extend (int x, int y, int flag) NOTHROW; 1555 void selection_extend (int x, int y, int flag) NOTHROW;
1486 void selection_rotate (int x, int y) NOTHROW; 1556 void selection_rotate (int x, int y) NOTHROW;
1487 1557
1488 // xdefaults.C 1558 // xdefaults.C
1559 void rxvt_usage (int type);
1489 void get_options (int argc, const char *const *argv); 1560 const char **get_options (int argc, const char *const *argv);
1561 int parse_keysym (const char *str, unsigned int &state);
1490 int parse_keysym (const char *str, const char *arg); 1562 int bind_action (const char *str, const char *arg);
1491 const char *x_resource (const char *name); 1563 const char *x_resource (const char *name);
1492 void extract_resources (); 1564 void extract_resources ();
1565 void enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *));
1566 void extract_keysym_resources ();
1493}; 1567};
1494 1568
1495#endif /* _RXVT_H_ */ 1569#endif /* _RXVT_H_ */
1496 1570

Diff Legend

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