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.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC vs.
Revision 1.548 by root, Tue Jun 21 15:24:06 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
31using namespace std;
32 28
33// we assume that Xlib.h defines XPointer, and it does since at least 1994... 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
34 30
35extern "C" { 31extern "C" {
36#include <X11/Xlib.h> 32#include <X11/Xlib.h>
… …
74#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
75#include <X11/keysym.h> 71#include <X11/keysym.h>
76#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
77#include <X11/Xatom.h> 73#include <X11/Xatom.h>
78 74
79#ifdef HAVE_AFTERIMAGE
80# include <afterimage.h>
81# undef min
82# undef max
83#endif
84
85#ifdef HAVE_PIXBUF 75#if HAVE_PIXBUF
86# include <gdk-pixbuf/gdk-pixbuf.h> 76# include <gdk-pixbuf/gdk-pixbuf.h>
87#endif 77#endif
88 78
89#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 79#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
90# define HAVE_BG_PIXMAP 1 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
91#endif 87# endif
88# if ENABLE_TRANSPARENCY
89# define BG_IMAGE_FROM_ROOT 1
90# endif
91#endif
92 92
93#include <ecb.h>
93#include "encoding.h" 94#include "encoding.h"
94#include "rxvtutil.h" 95#include "rxvtutil.h"
95#include "rxvtfont.h" 96#include "rxvtfont.h"
96#include "rxvttoolkit.h" 97#include "rxvttoolkit.h"
98#include "rxvtimg.h"
97#include "scrollbar.h" 99#include "scrollbar.h"
98#include "ev_cpp.h" 100#include "ev_cpp.h"
99#include "salloc.h"
100#include "libptytty.h" 101#include "libptytty.h"
101 102
102#include "rxvtperl.h" 103#include "rxvtperl.h"
103 104
104// 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
… …
157 158
158const char * rxvt_basename (const char *str) NOTHROW; 159const char * rxvt_basename (const char *str) NOTHROW;
159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 160void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
160void rxvt_log (const char *fmt,...) NOTHROW; 161void rxvt_log (const char *fmt,...) NOTHROW;
161void rxvt_warn (const char *fmt,...) NOTHROW; 162void rxvt_warn (const char *fmt,...) NOTHROW;
163ecb_noreturn ecb_cold
162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn; 164void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception));
165ecb_noreturn ecb_cold
163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; 166void rxvt_exit_failure () THROW ((class rxvt_failure_exception));
164 167
168void * rxvt_malloc (size_t size);
169void * rxvt_calloc (size_t number, size_t size);
170void * rxvt_realloc (void *ptr, size_t size);
171
165char * rxvt_strtrim (char *str) NOTHROW; 172char * rxvt_strtrim (char *str) NOTHROW;
166char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 173char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
167 174
168static inline void 175static inline void
169rxvt_free_strsplit (char **ptr) NOTHROW 176rxvt_free_strsplit (char **ptr) NOTHROW
170{ 177{
171 free (ptr[0]); 178 free (ptr[0]);
172 free (ptr); 179 free (ptr);
173} 180}
174 181
175void * rxvt_malloc (size_t size); 182KeySym rxvt_XKeycodeToKeysym (Display *dpy, KeyCode keycode, int index);
176void * rxvt_calloc (size_t number, size_t size);
177void * rxvt_realloc (void *ptr, size_t size);
178 183
179///////////////////////////////////////////////////////////////////////////// 184/////////////////////////////////////////////////////////////////////////////
180 185
181// temporarily replace the process environment 186// temporarily replace the process environment
182extern char **environ; 187extern char **environ;
183extern char **rxvt_environ; // the original environ pointer 188extern char **rxvt_environ; // the original environ pointer
184
185static inline void
186set_environ (stringvec *envv)
187{
188#if ENABLE_PERL
189 assert (envv);
190#else
191 if (envv)
192#endif
193 environ = (char **)envv->begin ();
194}
195 189
196static inline void 190static inline void
197set_environ (char **envv) 191set_environ (char **envv)
198{ 192{
199#if ENABLE_PERL 193#if ENABLE_PERL
… …
217 ~localise_env () 211 ~localise_env ()
218 { 212 {
219 environ = orig_env; 213 environ = orig_env;
220 } 214 }
221}; 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
222 295
223/* 296/*
224 ***************************************************************************** 297 *****************************************************************************
225 * STRUCTURES AND TYPEDEFS 298 * STRUCTURES AND TYPEDEFS
226 ***************************************************************************** 299 *****************************************************************************
… …
269 ***************************************************************************** 342 *****************************************************************************
270 */ 343 */
271 344
272/* COLORTERM, TERM environment variables */ 345/* COLORTERM, TERM environment variables */
273#define COLORTERMENV "rxvt" 346#define COLORTERMENV "rxvt"
274#ifdef BG_IMAGE_FROM_FILE 347#if BG_IMAGE_FROM_FILE
275# define COLORTERMENVFULL COLORTERMENV "-xpm" 348# define COLORTERMENVFULL COLORTERMENV "-xpm"
276#else 349#else
277# define COLORTERMENVFULL COLORTERMENV 350# define COLORTERMENVFULL COLORTERMENV
278#endif 351#endif
279#ifndef TERMENV 352#ifndef TERMENV
… …
282# else 355# else
283# define TERMENV "rxvt-unicode" 356# define TERMENV "rxvt-unicode"
284# endif 357# endif
285#endif 358#endif
286 359
360// Hidden color cube for indexed 24-bit colors. There are fewer blue levels
361// because normal human eye is less sensitive to the blue component than to
362// the red or green. (https://en.m.wikipedia.org/wiki/Color_depth#8-bit_color)
363#if USE_256_COLORS
364// 7x7x5=245 < 254 unused color indices
365# define Red_levels 7
366# define Green_levels 7
367# define Blue_levels 5
368#else
369// 6x6x4=144 < 166 unused color indices
370# define Red_levels 6
371# define Green_levels 6
372# define Blue_levels 4
373#endif
374
287#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 375#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
288# define NO_MOUSE_REPORT_SCROLLBAR 1 376# define NO_MOUSE_REPORT_SCROLLBAR 1
289#endif 377#endif
290 378
291#define scrollBar_esc 30 379#define scrollBar_esc 30
… …
320 ERASE = +2, 408 ERASE = +2,
321}; 409};
322 410
323/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */ 411/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
324enum page_dirn { 412enum page_dirn {
325 UP, 413 DN = -1,
326 DN,
327 NO_DIR, 414 NO_DIR = 0,
415 UP = 1,
328}; 416};
329 417
330/* arguments for rxvt_term::scr_change_screen () */ 418/* arguments for rxvt_term::scr_change_screen () */
331enum { 419enum {
332 PRIMARY = 0, 420 PRIMARY = 0,
… …
485#if USE_256_COLORS 573#if USE_256_COLORS
486 maxTermCOLOR = Color_White + 240, 574 maxTermCOLOR = Color_White + 240,
487#else 575#else
488 maxTermCOLOR = Color_White + 72, 576 maxTermCOLOR = Color_White + 72,
489#endif 577#endif
578 minTermCOLOR24,
579 maxTermCOLOR24 = minTermCOLOR24 +
580 (Red_levels * Green_levels * Blue_levels) - 1,
490#ifndef NO_CURSORCOLOR 581#ifndef NO_CURSORCOLOR
491 Color_cursor, 582 Color_cursor,
492 Color_cursor2, 583 Color_cursor2,
493#endif 584#endif
494 Color_pointer_fg, 585 Color_pointer_fg,
… …
509#endif 600#endif
510 Color_scroll, 601 Color_scroll,
511#ifdef RXVT_SCROLLBAR 602#ifdef RXVT_SCROLLBAR
512 Color_trough, 603 Color_trough,
513#endif 604#endif
514#if ENABLE_TRANSPARENCY 605#if BG_IMAGE_FROM_ROOT
515 Color_tint, 606 Color_tint,
516#endif 607#endif
517#if OFF_FOCUS_FADING 608#if OFF_FOCUS_FADING
518 Color_fade, 609 Color_fade,
519#endif 610#endif
… …
526 TOTAL_COLORS = NRS_COLORS 617 TOTAL_COLORS = NRS_COLORS
527#endif 618#endif
528}; 619};
529 620
530#if USE_256_COLORS 621#if USE_256_COLORS
531# define Color_Bits 9 // 0 .. maxTermCOLOR 622# define Color_Bits 9 // 0 .. maxTermCOLOR24
532#else 623#else
533# define Color_Bits 7 // 0 .. maxTermCOLOR 624# define Color_Bits 8 // 0 .. maxTermCOLOR24
625#endif
626
627#if maxTermCOLOR24 >= (1 << Color_Bits)
628# error color index overflow
534#endif 629#endif
535 630
536/* 631/*
537 * Resource list 632 * Resource list
538 */ 633 */
… …
569#define PrivMode_MouseBtnEvent (1UL<<20) 664#define PrivMode_MouseBtnEvent (1UL<<20)
570#define PrivMode_MouseAnyEvent (1UL<<21) 665#define PrivMode_MouseAnyEvent (1UL<<21)
571#define PrivMode_BracketPaste (1UL<<22) 666#define PrivMode_BracketPaste (1UL<<22)
572#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack 667#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
573#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales 668#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
669#define PrivMode_BlinkingCursor (1UL<<25)
670#define PrivMode_FocusEvent (1UL<<26)
574 671
575#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 672#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
576 673
577#ifdef ALLOW_132_MODE 674#ifdef ALLOW_132_MODE
578# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 675# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
581#endif 678#endif
582 679
583// do not change these constants lightly, there are many interdependencies 680// do not change these constants lightly, there are many interdependencies
584#define IMBUFSIZ 128 // input modifier buffer sizes 681#define IMBUFSIZ 128 // input modifier buffer sizes
585#define KBUFSZ 512 // size of keyboard mapping buffer 682#define KBUFSZ 512 // size of keyboard mapping buffer
586#define CBUFSIZ 2048 // size of command buffer 683#define CBUFSIZ 32768 // size of command buffer (longest command sequence possible)
587#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 684#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
588#define UBUFSIZ 2048 // character buffer 685#define UBUFSIZ 2048 // character buffer
589 686
590#if ENABLE_FRILLS 687#if ENABLE_FRILLS
591# include <X11/Xmd.h> 688# include <X11/Xmd.h>
… …
664 761
665#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 762#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
666#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 763#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
667 764
668#define GET_ATTR(x) (((x) & RS_attrMask)) 765#define GET_ATTR(x) (((x) & RS_attrMask))
669// return attributes defining the background, encoding doesn't matter
670// depends on RS_fgShift > RS_bgShift
671#define GET_BGATTR(x) \
672 (ecb_unlikely ((x) & RS_RVid) \
673 ? (((x) & (RS_attrMask & ~RS_RVid)) \
674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
675 : ((x) & (RS_attrMask | RS_bgMask)))
676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 766#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 767#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
678#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 768#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
679 769
680#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 770#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
… …
705{ 795{
706 text_t *t; // terminal the text 796 text_t *t; // terminal the text
707 rend_t *r; // rendition, uses RS_ flags 797 rend_t *r; // rendition, uses RS_ flags
708 tlen_t_ l; // length of each text line 798 tlen_t_ l; // length of each text line
709 uint32_t f; // flags 799 uint32_t f; // flags
800
801 bool valid ()
802 {
803 return l >= 0;
804 }
805
806 void alloc ()
807 {
808 l = 0;
809 }
710 810
711 bool is_longer () 811 bool is_longer ()
712 { 812 {
713 return f & LINE_LONGER; 813 return f & LINE_LONGER;
714 } 814 }
… …
779// that are not representable in unicode, as well as characters 879// that are not representable in unicode, as well as characters
780// not fitting in the BMP. 880// not fitting in the BMP.
781struct compose_char 881struct compose_char
782{ 882{
783 unicode_t c1, c2; // any chars != NOCHAR are valid 883 unicode_t c1, c2; // any chars != NOCHAR are valid
884
784 compose_char (unicode_t c1, unicode_t c2) 885 compose_char (unicode_t c1, unicode_t c2)
785 : c1(c1), c2(c2) 886 : c1(c1), c2(c2)
786 { } 887 { }
787}; 888};
788 889
… …
870 * END······················= total_rows 971 * END······················= total_rows
871 */ 972 */
872 973
873struct TermWin_t 974struct TermWin_t
874{ 975{
976 int vt_width; /* actual window width [pixels] */
977 int vt_height; /* actual window height [pixels] */
875 int width; /* window width [pixels] */ 978 int width; /* window width [pixels] */
876 int height; /* window height [pixels] */ 979 int height; /* window height [pixels] */
877 int fwidth; /* font width [pixels] */ 980 int fwidth; /* font width [pixels] */
878 int fheight; /* font height [pixels] */ 981 int fheight; /* font height [pixels] */
879 int fbase; /* font ascent (baseline) [pixels] */ 982 int fbase; /* font ascent (baseline) [pixels] */
… …
891 int view_start; /* scrollback view starts here */ 994 int view_start; /* scrollback view starts here */
892 int top_row; /* topmost row index of scrollback */ 995 int top_row; /* topmost row index of scrollback */
893 Window parent; /* parent identifier */ 996 Window parent; /* parent identifier */
894 Window vt; /* vt100 window */ 997 Window vt; /* vt100 window */
895 GC gc; /* GC for drawing */ 998 GC gc; /* GC for drawing */
896 Pixmap pixmap;
897 rxvt_drawable *drawable; 999 rxvt_drawable *drawable;
898 rxvt_fontset *fontset[4]; 1000 rxvt_fontset *fontset[4];
899}; 1001};
900 1002
901/* 1003/*
… …
981 scrollBar_t scrollBar; 1083 scrollBar_t scrollBar;
982 uint8_t options[(Opt_count + 7) >> 3]; 1084 uint8_t options[(Opt_count + 7) >> 3];
983 XSizeHints szHint; 1085 XSizeHints szHint;
984 rxvt_color *pix_colors; 1086 rxvt_color *pix_colors;
985 Cursor TermWin_cursor; /* cursor for vt window */ 1087 Cursor TermWin_cursor; /* cursor for vt window */
1088
986 line_t *row_buf; // all lines, scrollback + terminal, circular 1089 line_t *row_buf; // all lines, scrollback + terminal, circular
987 line_t *drawn_buf; // text on screen 1090 line_t *drawn_buf; // text on screen
988 line_t *swap_buf; // lines for swap buffer 1091 line_t *swap_buf; // lines for swap buffer
989 char *tabs; /* per location: 1 == tab-stop */ 1092 char *tabs; /* per location: 1 == tab-stop */
990 screen_t screen; 1093 screen_t screen;
… …
1028 hidden_pointer:1, 1131 hidden_pointer:1,
1029#endif 1132#endif
1030 enc_utf8:1, /* whether locale uses utf-8 */ 1133 enc_utf8:1, /* whether locale uses utf-8 */
1031 seen_input:1, /* whether we have seen some program output yet */ 1134 seen_input:1, /* whether we have seen some program output yet */
1032 seen_resize:1, /* whether we had a resize event */ 1135 seen_resize:1, /* whether we had a resize event */
1136 init_done:1,
1033 parsed_geometry:1; 1137 parsed_geometry:1;
1034 1138
1035 unsigned char refresh_type, 1139 unsigned char refresh_type,
1036#ifdef META8_OPTION 1140#ifdef META8_OPTION
1037 meta_char; /* Alt-key prefix */ 1141 meta_char; /* Alt-key prefix */
… …
1047/* ---------- */ 1151/* ---------- */
1048 rend_t rstyle; 1152 rend_t rstyle;
1049/* ---------- */ 1153/* ---------- */
1050#ifdef SELECTION_SCROLLING 1154#ifdef SELECTION_SCROLLING
1051 int scroll_selection_lines; 1155 int scroll_selection_lines;
1052 enum page_dirn scroll_selection_dir;
1053 int selection_save_x, 1156 int selection_save_x,
1054 selection_save_y, 1157 selection_save_y,
1055 selection_save_state; 1158 selection_save_state;
1056#endif 1159#endif
1057/* ---------- */ 1160/* ---------- */
… …
1066 mouse_row, 1169 mouse_row,
1067 mouse_col, 1170 mouse_col,
1068# ifdef POINTER_BLANK 1171# ifdef POINTER_BLANK
1069 pointerBlankDelay, 1172 pointerBlankDelay,
1070# endif 1173# endif
1174 multiClickTime,
1175 cursor_type,
1071 allowedxerror; 1176 allowedxerror;
1072/* ---------- */ 1177/* ---------- */
1073 unsigned int ModLevel3Mask, 1178 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1179 ModMetaMask,
1075 ModNumLockMask; 1180 ModNumLockMask;
1076 int old_width, /* last used width in screen resize */
1077 old_height; /* last used height in screen resize */
1078 unsigned long priv_modes, 1181 unsigned long priv_modes,
1079 SavedModes; 1182 SavedModes;
1080/* ---------- */ 1183/* ---------- */
1081 Atom *xa; 1184 Atom *xa;
1082/* ---------- */ 1185/* ---------- */
… …
1087/* ---------- */ 1190/* ---------- */
1088 struct mouse_event MEvent; 1191 struct mouse_event MEvent;
1089 XComposeStatus compose; 1192 XComposeStatus compose;
1090 static struct termios def_tio; 1193 static struct termios def_tio;
1091 row_col_t oldcursor; 1194 row_col_t oldcursor;
1195
1092#ifdef HAVE_BG_PIXMAP 1196#ifdef HAVE_BG_PIXMAP
1093 void bg_init (); 1197 void bg_init ();
1094 void bg_destroy (); 1198 void bg_destroy ();
1095 1199
1096 enum {
1097 //subset returned by make_transparency_pixmap
1098 BG_IS_VALID = 1 << 0,
1099 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2,
1101
1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1103
1104 BG_KEEP_ASPECT = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14,
1107 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1108
1109 BG_TINT_SET = 1 << 5,
1110 BG_TINT_BITAND = 1 << 6,
1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1112
1113 BG_HAS_RENDER = 1 << 7,
1114 BG_HAS_RENDER_CONV = 1 << 8,
1115 BG_CLIENT_RENDER = 1 << 9,
1116
1117 BG_IS_TRANSPARENT = 1 << 10,
1118 BG_NEEDS_REFRESH = 1 << 11,
1119 BG_IS_SIZE_SENSITIVE = 1 << 12,
1120 BG_IS_FROM_FILE = 1 << 13,
1121 };
1122
1123 unsigned int bg_flags;
1124
1125# ifdef BG_IMAGE_FROM_FILE 1200# if BG_IMAGE_FROM_FILE
1126 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1201 rxvt_image fimage;
1127 bool render_image (unsigned long tr_flags); 1202 void render_image (rxvt_image &image);
1128
1129 enum {
1130 noScale = 0,
1131 windowScale = 100,
1132 defaultScale = windowScale,
1133 centerAlign = 50,
1134 defaultAlign = centerAlign,
1135 };
1136
1137 unsigned int h_scale, v_scale; /* percents of the window size */
1138 int h_align, v_align; /* percents of the window size:
1139 0 - left align, 50 - center, 100 - right */
1140
1141 bool bg_set_geometry (const char *geom, bool update = false);
1142 void bg_set_default_geometry ()
1143 {
1144 h_scale = v_scale = defaultScale;
1145 h_align = v_align = defaultAlign;
1146 }
1147
1148 bool bg_set_file (const char *file);
1149# endif 1203# endif
1150 1204
1151# ifdef ENABLE_TRANSPARENCY 1205# if BG_IMAGE_FROM_ROOT
1152 Pixmap root_pixmap; /* current root pixmap set */ 1206 rxvt_img *root_img;
1153 rxvt_color tint; 1207 image_effects root_effects;
1154 int shade;
1155 int h_blurRadius, v_blurRadius;
1156 1208
1157 bool bg_set_transparent (); 1209 void render_root_image ();
1158 void bg_set_root_pixmap ();
1159 void set_tint_shade_flags ();
1160 bool bg_set_tint (rxvt_color &new_tint);
1161 bool bg_set_shade (const char *shade_str);
1162 bool bg_set_blur (const char *geom);
1163
1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1165 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1166 void tint_ximage (Visual *visual, XImage *ximage);
1167 unsigned long make_transparency_pixmap ();
1168# endif 1210# endif
1169 1211
1170 ev_tstamp bg_valid_since; 1212 ev_tstamp bg_valid_since;
1171 1213
1172 Pixmap bg_pixmap;
1173 unsigned int bg_pmap_width, bg_pmap_height;
1174
1175 int target_x;
1176 int target_y;
1177 bool bg_set_position (int x, int y);
1178 bool bg_window_size_sensitive (); 1214 bool bg_window_size_sensitive ();
1179 bool bg_window_position_sensitive (); 1215 bool bg_window_position_sensitive ();
1180 1216
1181 bool bg_render (); 1217 void bg_render ();
1182 void bg_invalidate () 1218#endif
1183 { 1219
1184 bg_flags &= ~BG_IS_VALID; 1220#ifdef HAVE_IMG
1221 enum {
1222 BG_IS_TRANSPARENT = 1 << 1,
1223 BG_NEEDS_REFRESH = 1 << 2,
1224 BG_INHIBIT_RENDER = 1 << 3,
1185 } 1225 };
1186#endif
1187#ifdef HAVE_AFTERIMAGE
1188 ASImage *original_asim;
1189 ASVisual *asv;
1190 ASImageManager *asimman;
1191 1226
1192 void init_asv () 1227 uint8_t bg_flags;
1193 { 1228
1194 if (!asv) 1229 rxvt_img *bg_img;
1195 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1196 }
1197#endif
1198#ifdef HAVE_PIXBUF
1199 GdkPixbuf *pixbuf;
1200 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1201 int src_x, int src_y, int dst_x, int dst_y,
1202 unsigned int width, unsigned int height);
1203#endif 1230#endif
1204 1231
1205#if ENABLE_OVERLAY 1232#if ENABLE_OVERLAY
1206 overlay_base ov; 1233 overlay_base ov;
1207 1234
… …
1215 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1242 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1216#endif 1243#endif
1217 1244
1218 vector<void *> allocated; // free these memory blocks with free() 1245 vector<void *> allocated; // free these memory blocks with free()
1219 1246
1220 char env_windowid[21]; /* environmental variable WINDOWID */ 1247 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1221 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1222 char *env_display; /* environmental variable DISPLAY */
1223 char *env_term; /* environmental variable TERM */
1224 1248
1225 char *locale; 1249 char *locale;
1226 char charsets[4]; 1250 char charsets[4];
1227 char *v_buffer; /* pointer to physical buffer */ 1251 char *v_buffer; /* pointer to physical buffer */
1228 unsigned int v_buflen; /* size of area to write */ 1252 unsigned int v_buflen; /* size of area to write */
1229 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1253 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1254 char **env;
1230 1255
1231#ifdef KEYSYM_RESOURCE 1256#ifdef KEYSYM_RESOURCE
1232 keyboard_manager *keyboard; 1257 keyboard_manager *keyboard;
1233#endif 1258#endif
1234#ifndef NO_RESOURCES 1259#ifndef NO_RESOURCES
… …
1240 char *cmdbuf_ptr, *cmdbuf_endp; 1265 char *cmdbuf_ptr, *cmdbuf_endp;
1241 char cmdbuf_base[CBUFSIZ]; 1266 char cmdbuf_base[CBUFSIZ];
1242 1267
1243 ptytty *pty; 1268 ptytty *pty;
1244 1269
1245 rxvt_salloc *talloc; // text line allocator 1270 // chunk contains all line_t's as well as rend_t and text_t buffers
1246 rxvt_salloc *ralloc; // rend line allocator 1271 // for drawn_buf, swap_buf and row_buf, in this order
1272 void *chunk;
1273 size_t chunk_size;
1247 1274
1248 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1275 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1249 1276
1250#if ENABLE_FRILLS || ISO_14755 1277#if ENABLE_FRILLS || ISO_14755
1251 // ISO 14755 entry support 1278 // ISO 14755 entry support
1252 unicode_t iso14755buf; 1279 unicode_t iso14755buf;
1253 void commit_iso14755 (); 1280 void commit_iso14755 ();
1254# if ISO_14755 1281# if ISO_14755
1255 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1282 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1256 void iso14755_54 (int x, int y); 1283 void iso14755_54 (int x, int y);
1257# endif 1284# endif
1258#endif 1285#endif
1259 1286
1260 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1287 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1262 void vt_select_input () const NOTHROW 1289 void vt_select_input () const NOTHROW
1263 { 1290 {
1264 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1291 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1265 } 1292 }
1266 1293
1267#if ENABLE_TRANSPARENCY || ENABLE_PERL 1294#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1268 void rootwin_cb (XEvent &xev); 1295 void rootwin_cb (XEvent &xev);
1269 xevent_watcher rootwin_ev; 1296 xevent_watcher rootwin_ev;
1270#endif 1297#endif
1271#ifdef HAVE_BG_PIXMAP 1298#ifdef HAVE_BG_PIXMAP
1272 void update_background (); 1299 void update_background ();
… …
1288 void cmdbuf_append (const char *str, size_t count); 1315 void cmdbuf_append (const char *str, size_t count);
1289 bool pty_fill (); 1316 bool pty_fill ();
1290 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1317 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1291 1318
1292#ifdef CURSOR_BLINK 1319#ifdef CURSOR_BLINK
1320 void cursor_blink_reset ();
1293 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1321 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1294#endif 1322#endif
1295#ifdef TEXT_BLINK 1323#ifdef TEXT_BLINK
1296 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1324 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1297#endif 1325#endif
… …
1314 void pointer_blank (); 1342 void pointer_blank ();
1315#endif 1343#endif
1316 void pointer_unblank (); 1344 void pointer_unblank ();
1317 1345
1318 void tt_printf (const char *fmt,...); 1346 void tt_printf (const char *fmt,...);
1347 void tt_write_ (const char *data, unsigned int len);
1319 void tt_write (const char *data, unsigned int len); 1348 void tt_write (const char *data, unsigned int len);
1349 void tt_write_user_input (const char *data, unsigned int len);
1320 void pty_write (); 1350 void pty_write ();
1321 1351
1322 void make_current () const // make this the "currently active" urxvt instance 1352 void make_current () const // make this the "currently active" urxvt instance
1323 { 1353 {
1324 SET_R (this); 1354 SET_R (this);
1325 set_environ (envv); 1355 set_environ (env);
1326 rxvt_set_locale (locale); 1356 rxvt_set_locale (locale);
1327 } 1357 }
1328 1358
1329#if USE_XIM 1359#if USE_XIM
1330 rxvt_xim *input_method; 1360 rxvt_xim *input_method;
… …
1363#if ENABLE_FRILLS 1393#if ENABLE_FRILLS
1364 void set_urgency (bool enable); 1394 void set_urgency (bool enable);
1365#else 1395#else
1366 void set_urgency (bool enable) { } 1396 void set_urgency (bool enable) { }
1367#endif 1397#endif
1368 void update_fade_color (unsigned int idx); 1398 void update_fade_color (unsigned int idx, bool first_time = false);
1369#ifdef PRINTPIPE 1399#ifdef PRINTPIPE
1370 FILE *popen_printer (); 1400 FILE *popen_printer ();
1371 int pclose_printer (FILE *stream); 1401 int pclose_printer (FILE *stream);
1372#endif 1402#endif
1373 void process_print_pipe (); 1403 void process_print_pipe ();
… …
1379 char *get_to_st (unicode_t &ends_how); 1409 char *get_to_st (unicode_t &ends_how);
1380 void process_dcs_seq (); 1410 void process_dcs_seq ();
1381 void process_osc_seq (); 1411 void process_osc_seq ();
1382 void process_color_seq (int report, int color, const char *str, char resp); 1412 void process_color_seq (int report, int color, const char *str, char resp);
1383 void process_xterm_seq (int op, char *str, char resp); 1413 void process_xterm_seq (int op, char *str, char resp);
1414 unsigned int map_rgb24_color (unsigned int r, unsigned int g, unsigned int b);
1384 int privcases (int mode, unsigned long bit); 1415 int privcases (int mode, unsigned long bit);
1385 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1416 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1386 void process_sgr_mode (unsigned int nargs, const int *arg); 1417 void process_sgr_mode (unsigned int nargs, const int *arg);
1418 void set_cursor_style (int style);
1387 // init.C 1419 // init.C
1388 void init (stringvec *argv, stringvec *envv); 1420 void init (stringvec *argv, stringvec *envv);
1389 void init (int argc, const char *const *argv, const char *const *envv); 1421 void init (int argc, const char *const *argv, const char *const *envv);
1390 void init2 (int argc, const char *const *argv); 1422 void init2 (int argc, const char *const *argv);
1391 void init_vars (); 1423 void init_vars ();
… …
1396 void init_command (const char *const *argv); 1428 void init_command (const char *const *argv);
1397 void run_command (const char *const *argv); 1429 void run_command (const char *const *argv);
1398 int run_child (const char *const *argv); 1430 int run_child (const char *const *argv);
1399 void color_aliases (int idx); 1431 void color_aliases (int idx);
1400 void create_windows (int argc, const char *const *argv); 1432 void create_windows (int argc, const char *const *argv);
1401 void get_colours (); 1433 void get_colors ();
1402 void get_ourmods (); 1434 void get_ourmods ();
1403 void set_icon (const char *file); 1435 void set_icon (const char *file);
1404 // main.C 1436 // main.C
1405 void tt_winch (); 1437 void tt_winch ();
1406 rxvt_term (); 1438 rxvt_term ();
1407 ~rxvt_term (); 1439 ~rxvt_term ();
1408 void destroy (); 1440 void destroy ();
1409 void emergency_cleanup (); 1441 void emergency_cleanup ();
1410 void recolour_cursor (); 1442 void recolor_cursor ();
1411 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1443 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1412 void window_calc (unsigned int newwidth, unsigned int newheight); 1444 void window_calc (unsigned int newwidth, unsigned int newheight);
1413 bool set_fonts (); 1445 bool set_fonts ();
1414 void set_string_property (Atom prop, const char *str, int len = -1); 1446 void set_string_property (Atom prop, const char *str, int len = -1);
1415 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1447 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1416 void set_utf8_property (Atom prop, const char *str, int len = -1); 1448 void set_utf8_property (Atom prop, const char *str, int len = -1);
1417 void set_title (const char *str); 1449 void set_title (const char *str);
1418 void set_icon_name (const char *str); 1450 void set_icon_name (const char *str);
1419 void set_window_color (int idx, const char *color); 1451 void set_window_color (int idx, const char *color);
1420 void set_colorfgbg (); 1452 char *get_colorfgbg ();
1421 bool set_color (rxvt_color &color, const char *name); 1453 bool set_color (rxvt_color &color, const char *name);
1422 void alias_color (int dst, int src); 1454 void alias_color (int dst, int src);
1423 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1455 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1424 void get_window_origin (int &x, int &y); 1456 void get_window_origin (int &x, int &y);
1425 Pixmap get_pixmap_property (Atom property);
1426 1457
1427 // screen.C 1458 // screen.C
1428 1459
1429 void lalloc (line_t &l) const 1460 bool option (uint8_t opt) const NOTHROW
1430 { 1461 {
1431 l.t = (text_t *)talloc->alloc (); 1462 return options[opt >> 3] & (1 << (opt & 7));
1432 l.r = (rend_t *)ralloc->alloc ();
1433 } 1463 }
1434 1464
1435#if 0 1465 void set_option (uint8_t opt, bool set = true) NOTHROW;
1436 void lfree (line_t &l)
1437 {
1438 talloc->free (l.t);
1439 ralloc->free (l.r);
1440 }
1441#endif
1442
1443 void lresize (line_t &l) const
1444 {
1445 if (!l.t)
1446 return;
1447
1448 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1449 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1450
1451 l.l = min (l.l, ncol);
1452
1453 if (ncol > prev_ncol)
1454 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1455 }
1456 1466
1457 int fgcolor_of (rend_t r) const NOTHROW 1467 int fgcolor_of (rend_t r) const NOTHROW
1458 { 1468 {
1459 int base = GET_BASEFG (r); 1469 int base = GET_BASEFG (r);
1460#ifndef NO_BRIGHTCOLOR 1470#ifndef NO_BRIGHTCOLOR
… …
1480 base += minBrightCOLOR - minCOLOR; 1490 base += minBrightCOLOR - minCOLOR;
1481#endif 1491#endif
1482 return base; 1492 return base;
1483 } 1493 }
1484 1494
1485 bool option (uint8_t opt) const NOTHROW
1486 {
1487 return options[opt >> 3] & (1 << (opt & 7));
1488 }
1489
1490 void set_option (uint8_t opt, bool set = true) NOTHROW;
1491
1492 // modifies first argument(!) 1495 // modifies first argument(!)
1493 void tt_paste (char *data, unsigned int len) NOTHROW; 1496 void tt_paste (char *data, unsigned int len) NOTHROW;
1494 void paste (char *data, unsigned int len) NOTHROW; 1497 void paste (char *data, unsigned int len) NOTHROW;
1498 void scr_alloc () NOTHROW;
1495 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1499 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1496 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1500 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1497 void scr_kill_char (line_t &l, int col) const NOTHROW; 1501 void scr_kill_char (line_t &l, int col) const NOTHROW;
1502 void scr_set_char_rend (line_t &l, int col, rend_t rend);
1498 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1503 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1504 void copy_line (line_t &dst, line_t &src);
1499 void scr_reset (); 1505 void scr_reset ();
1500 void scr_release () NOTHROW; 1506 void scr_release () NOTHROW;
1501 void scr_clear (bool really = false) NOTHROW; 1507 void scr_clear (bool really = false) NOTHROW;
1502 void scr_refresh () NOTHROW; 1508 void scr_refresh () NOTHROW;
1503 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1509 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
… …
1507 void scr_backindex () NOTHROW; 1513 void scr_backindex () NOTHROW;
1508 void scr_forwardindex () NOTHROW; 1514 void scr_forwardindex () NOTHROW;
1509#endif 1515#endif
1510 void scr_touch (bool refresh) NOTHROW; 1516 void scr_touch (bool refresh) NOTHROW;
1511 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1517 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1512 void scr_recolour (bool refresh = true) NOTHROW; 1518 void scr_recolor (bool refresh = true) NOTHROW;
1513 void scr_remap_chars () NOTHROW; 1519 void scr_remap_chars () NOTHROW;
1514 void scr_remap_chars (line_t &l) NOTHROW; 1520 void scr_remap_chars (line_t &l) NOTHROW;
1515 1521
1516 enum cursor_mode { SAVE, RESTORE }; 1522 enum cursor_mode { SAVE, RESTORE };
1517 1523
… …
1542 void scr_report_position () NOTHROW; 1548 void scr_report_position () NOTHROW;
1543 void set_font_style () NOTHROW; 1549 void set_font_style () NOTHROW;
1544 void scr_charset_choose (int set) NOTHROW; 1550 void scr_charset_choose (int set) NOTHROW;
1545 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1551 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1546 void scr_move_to (int y, int len) NOTHROW; 1552 void scr_move_to (int y, int len) NOTHROW;
1553 bool scr_page (int nlines) NOTHROW;
1547 bool scr_page (enum page_dirn direction, int nlines) NOTHROW; 1554 bool scr_page (enum page_dirn direction, int nlines) NOTHROW
1555 {
1556 return scr_page (direction * nlines);
1557 }
1548 bool scr_changeview (int new_view_start) NOTHROW; 1558 bool scr_changeview (int new_view_start) NOTHROW;
1549 void scr_bell () NOTHROW; 1559 void scr_bell () NOTHROW;
1550 void scr_printscreen (int fullhist) NOTHROW; 1560 void scr_printscreen (int fullhist) NOTHROW;
1551 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW; 1561 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1552 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1562 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1553 void scr_reverse_selection () NOTHROW; 1563 void scr_reverse_selection () NOTHROW;
1554 void scr_dump (int fd) NOTHROW; 1564 void scr_dump (int fd) NOTHROW;
1555 1565
1556 void selection_check (int check_more) NOTHROW; 1566 void selection_check (int check_more) NOTHROW;
1567 void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
1557 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1568 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1558 void selection_clear (bool clipboard = false) NOTHROW; 1569 void selection_clear (bool clipboard = false) NOTHROW;
1559 void selection_make (Time tm); 1570 void selection_make (Time tm);
1560 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1571 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1561 void selection_start_colrow (int col, int row) NOTHROW; 1572 void selection_start_colrow (int col, int row) NOTHROW;
… …
1566 void selection_click (int clicks, int x, int y) NOTHROW; 1577 void selection_click (int clicks, int x, int y) NOTHROW;
1567 void selection_extend (int x, int y, int flag) NOTHROW; 1578 void selection_extend (int x, int y, int flag) NOTHROW;
1568 void selection_rotate (int x, int y) NOTHROW; 1579 void selection_rotate (int x, int y) NOTHROW;
1569 1580
1570 // xdefaults.C 1581 // xdefaults.C
1582 void rxvt_usage (int type);
1571 const char **get_options (int argc, const char *const *argv); 1583 const char **get_options (int argc, const char *const *argv);
1584 int parse_keysym (const char *str, unsigned int &state);
1572 int parse_keysym (const char *str, const char *arg); 1585 int bind_action (const char *str, const char *arg);
1573 const char *x_resource (const char *name); 1586 const char *x_resource (const char *name);
1574 void extract_resources (); 1587 void extract_resources ();
1588 void enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *));
1575 void extract_keysym_resources (); 1589 void extract_keysym_resources ();
1576}; 1590};
1577 1591
1578#endif /* _RXVT_H_ */ 1592#endif /* _RXVT_H_ */
1579 1593

Diff Legend

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