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.552 by sf-exg, Thu Jul 14 05:33: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
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_IMG 1
91#endif 81#endif
92 82
83#include <ecb.h>
93#include "encoding.h" 84#include "encoding.h"
94#include "rxvtutil.h" 85#include "rxvtutil.h"
95#include "rxvtfont.h" 86#include "rxvtfont.h"
96#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
88#include "rxvtimg.h"
97#include "scrollbar.h" 89#include "scrollbar.h"
98#include "ev_cpp.h" 90#include "ev_cpp.h"
99#include "salloc.h"
100#include "libptytty.h" 91#include "libptytty.h"
101 92
102#include "rxvtperl.h" 93#include "rxvtperl.h"
103 94
104// try to avoid some macros to decrease code size, on some systems 95// try to avoid some macros to decrease code size, on some systems
… …
157 148
158const char * rxvt_basename (const char *str) NOTHROW; 149const char * rxvt_basename (const char *str) NOTHROW;
159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
160void rxvt_log (const char *fmt,...) NOTHROW; 151void rxvt_log (const char *fmt,...) NOTHROW;
161void rxvt_warn (const char *fmt,...) NOTHROW; 152void rxvt_warn (const char *fmt,...) NOTHROW;
153ecb_noreturn ecb_cold
162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn; 154void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception));
155ecb_noreturn ecb_cold
163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; 156void rxvt_exit_failure () THROW ((class rxvt_failure_exception));
164 157
158void * rxvt_malloc (size_t size);
159void * rxvt_calloc (size_t number, size_t size);
160void * rxvt_realloc (void *ptr, size_t size);
161
165char * rxvt_strtrim (char *str) NOTHROW; 162char * rxvt_strtrim (char *str) NOTHROW;
166char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 163char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
167 164
168static inline void 165static inline void
169rxvt_free_strsplit (char **ptr) NOTHROW 166rxvt_free_strsplit (char **ptr) NOTHROW
170{ 167{
171 free (ptr[0]); 168 free (ptr[0]);
172 free (ptr); 169 free (ptr);
173} 170}
174 171
175void * rxvt_malloc (size_t size); 172KeySym 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 173
179///////////////////////////////////////////////////////////////////////////// 174/////////////////////////////////////////////////////////////////////////////
180 175
181// temporarily replace the process environment 176// temporarily replace the process environment
182extern char **environ; 177extern char **environ;
183extern char **rxvt_environ; // the original environ pointer 178extern 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 179
196static inline void 180static inline void
197set_environ (char **envv) 181set_environ (char **envv)
198{ 182{
199#if ENABLE_PERL 183#if ENABLE_PERL
… …
269 ***************************************************************************** 253 *****************************************************************************
270 */ 254 */
271 255
272/* COLORTERM, TERM environment variables */ 256/* COLORTERM, TERM environment variables */
273#define COLORTERMENV "rxvt" 257#define COLORTERMENV "rxvt"
274#ifdef BG_IMAGE_FROM_FILE 258#if HAVE_IMG
275# define COLORTERMENVFULL COLORTERMENV "-xpm" 259# define COLORTERMENVFULL COLORTERMENV "-xpm"
276#else 260#else
277# define COLORTERMENVFULL COLORTERMENV 261# define COLORTERMENVFULL COLORTERMENV
278#endif 262#endif
279#ifndef TERMENV 263#ifndef TERMENV
… …
282# else 266# else
283# define TERMENV "rxvt-unicode" 267# define TERMENV "rxvt-unicode"
284# endif 268# endif
285#endif 269#endif
286 270
271// Hidden color cube for indexed 24-bit colors. There are fewer blue levels
272// because normal human eye is less sensitive to the blue component than to
273// the red or green. (https://en.m.wikipedia.org/wiki/Color_depth#8-bit_color)
274#if USE_256_COLORS
275// 7x7x5=245 < 254 unused color indices
276# define Red_levels 7
277# define Green_levels 7
278# define Blue_levels 5
279#else
280// 6x6x4=144 < 166 unused color indices
281# define Red_levels 6
282# define Green_levels 6
283# define Blue_levels 4
284#endif
285
286#define RGB24_CUBE_SIZE (Red_levels * Green_levels * Blue_levels)
287
287#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 288#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
288# define NO_MOUSE_REPORT_SCROLLBAR 1 289# define NO_MOUSE_REPORT_SCROLLBAR 1
289#endif 290#endif
290 291
291#define scrollBar_esc 30 292#define scrollBar_esc 30
… …
320 ERASE = +2, 321 ERASE = +2,
321}; 322};
322 323
323/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */ 324/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
324enum page_dirn { 325enum page_dirn {
325 UP, 326 DN = -1,
326 DN,
327 NO_DIR, 327 NO_DIR = 0,
328 UP = 1,
328}; 329};
329 330
330/* arguments for rxvt_term::scr_change_screen () */ 331/* arguments for rxvt_term::scr_change_screen () */
331enum { 332enum {
332 PRIMARY = 0, 333 PRIMARY = 0,
… …
420 421
421 // deprecated 422 // deprecated
422 Rxvt_restoreFG = 39, 423 Rxvt_restoreFG = 39,
423 Rxvt_restoreBG = 49, 424 Rxvt_restoreBG = 49,
424 425
425 Rxvt_Pixmap = 20, // new bg pixmap
426 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 426 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
427 427
428 URxvt_locale = 701, // change locale 428 URxvt_locale = 701, // change locale
429 URxvt_version = 702, // request version 429 URxvt_version = 702, // request version
430 430
431 URxvt_Color_IT = 704, // change actual 'Italic' colour 431 URxvt_Color_IT = 704, // change actual 'Italic' colour
432 URxvt_Color_tint = 705, // change actual tint colour
433 URxvt_Color_BD = 706, // change actual 'Bold' color 432 URxvt_Color_BD = 706, // change actual 'Bold' color
434 URxvt_Color_UL = 707, // change actual 'Underline' color 433 URxvt_Color_UL = 707, // change actual 'Underline' color
435 URxvt_Color_border = 708, 434 URxvt_Color_border = 708,
436 435
437 URxvt_font = 710, 436 URxvt_font = 710,
… …
485#if USE_256_COLORS 484#if USE_256_COLORS
486 maxTermCOLOR = Color_White + 240, 485 maxTermCOLOR = Color_White + 240,
487#else 486#else
488 maxTermCOLOR = Color_White + 72, 487 maxTermCOLOR = Color_White + 72,
489#endif 488#endif
489 minTermCOLOR24,
490 maxTermCOLOR24 = minTermCOLOR24 +
491 RGB24_CUBE_SIZE - 1,
490#ifndef NO_CURSORCOLOR 492#ifndef NO_CURSORCOLOR
491 Color_cursor, 493 Color_cursor,
492 Color_cursor2, 494 Color_cursor2,
493#endif 495#endif
494 Color_pointer_fg, 496 Color_pointer_fg,
… …
509#endif 511#endif
510 Color_scroll, 512 Color_scroll,
511#ifdef RXVT_SCROLLBAR 513#ifdef RXVT_SCROLLBAR
512 Color_trough, 514 Color_trough,
513#endif 515#endif
514#if ENABLE_TRANSPARENCY
515 Color_tint,
516#endif
517#if OFF_FOCUS_FADING 516#if OFF_FOCUS_FADING
518 Color_fade, 517 Color_fade,
519#endif 518#endif
520 NRS_COLORS, /* */ 519 NRS_COLORS, /* */
521#ifdef RXVT_SCROLLBAR 520#ifdef RXVT_SCROLLBAR
… …
526 TOTAL_COLORS = NRS_COLORS 525 TOTAL_COLORS = NRS_COLORS
527#endif 526#endif
528}; 527};
529 528
530#if USE_256_COLORS 529#if USE_256_COLORS
531# define Color_Bits 9 // 0 .. maxTermCOLOR 530# define Color_Bits 9 // 0 .. maxTermCOLOR24
532#else 531#else
533# define Color_Bits 7 // 0 .. maxTermCOLOR 532# define Color_Bits 8 // 0 .. maxTermCOLOR24
533#endif
534
535#if maxTermCOLOR24 >= (1 << Color_Bits)
536# error color index overflow
534#endif 537#endif
535 538
536/* 539/*
537 * Resource list 540 * Resource list
538 */ 541 */
… …
569#define PrivMode_MouseBtnEvent (1UL<<20) 572#define PrivMode_MouseBtnEvent (1UL<<20)
570#define PrivMode_MouseAnyEvent (1UL<<21) 573#define PrivMode_MouseAnyEvent (1UL<<21)
571#define PrivMode_BracketPaste (1UL<<22) 574#define PrivMode_BracketPaste (1UL<<22)
572#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack 575#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 576#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
577#define PrivMode_BlinkingCursor (1UL<<25)
578#define PrivMode_FocusEvent (1UL<<26)
574 579
575#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 580#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
576 581
577#ifdef ALLOW_132_MODE 582#ifdef ALLOW_132_MODE
578# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 583# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
581#endif 586#endif
582 587
583// do not change these constants lightly, there are many interdependencies 588// do not change these constants lightly, there are many interdependencies
584#define IMBUFSIZ 128 // input modifier buffer sizes 589#define IMBUFSIZ 128 // input modifier buffer sizes
585#define KBUFSZ 512 // size of keyboard mapping buffer 590#define KBUFSZ 512 // size of keyboard mapping buffer
586#define CBUFSIZ 2048 // size of command buffer 591#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 592#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
588#define UBUFSIZ 2048 // character buffer 593#define UBUFSIZ 2048 // character buffer
589 594
590#if ENABLE_FRILLS 595#if ENABLE_FRILLS
591# include <X11/Xmd.h> 596# include <X11/Xmd.h>
… …
664 669
665#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 670#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
666#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 671#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
667 672
668#define GET_ATTR(x) (((x) & RS_attrMask)) 673#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)) 674#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 675#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
678#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 676#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
679 677
680#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 678#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
… …
705{ 703{
706 text_t *t; // terminal the text 704 text_t *t; // terminal the text
707 rend_t *r; // rendition, uses RS_ flags 705 rend_t *r; // rendition, uses RS_ flags
708 tlen_t_ l; // length of each text line 706 tlen_t_ l; // length of each text line
709 uint32_t f; // flags 707 uint32_t f; // flags
708
709 bool valid ()
710 {
711 return l >= 0;
712 }
713
714 void alloc ()
715 {
716 l = 0;
717 }
710 718
711 bool is_longer () 719 bool is_longer ()
712 { 720 {
713 return f & LINE_LONGER; 721 return f & LINE_LONGER;
714 } 722 }
… …
779// that are not representable in unicode, as well as characters 787// that are not representable in unicode, as well as characters
780// not fitting in the BMP. 788// not fitting in the BMP.
781struct compose_char 789struct compose_char
782{ 790{
783 unicode_t c1, c2; // any chars != NOCHAR are valid 791 unicode_t c1, c2; // any chars != NOCHAR are valid
792
784 compose_char (unicode_t c1, unicode_t c2) 793 compose_char (unicode_t c1, unicode_t c2)
785 : c1(c1), c2(c2) 794 : c1(c1), c2(c2)
786 { } 795 { }
787}; 796};
788 797
… …
870 * END······················= total_rows 879 * END······················= total_rows
871 */ 880 */
872 881
873struct TermWin_t 882struct TermWin_t
874{ 883{
884 int vt_width; /* actual window width [pixels] */
885 int vt_height; /* actual window height [pixels] */
875 int width; /* window width [pixels] */ 886 int width; /* window width [pixels] */
876 int height; /* window height [pixels] */ 887 int height; /* window height [pixels] */
877 int fwidth; /* font width [pixels] */ 888 int fwidth; /* font width [pixels] */
878 int fheight; /* font height [pixels] */ 889 int fheight; /* font height [pixels] */
879 int fbase; /* font ascent (baseline) [pixels] */ 890 int fbase; /* font ascent (baseline) [pixels] */
… …
891 int view_start; /* scrollback view starts here */ 902 int view_start; /* scrollback view starts here */
892 int top_row; /* topmost row index of scrollback */ 903 int top_row; /* topmost row index of scrollback */
893 Window parent; /* parent identifier */ 904 Window parent; /* parent identifier */
894 Window vt; /* vt100 window */ 905 Window vt; /* vt100 window */
895 GC gc; /* GC for drawing */ 906 GC gc; /* GC for drawing */
896 Pixmap pixmap;
897 rxvt_drawable *drawable; 907 rxvt_drawable *drawable;
898 rxvt_fontset *fontset[4]; 908 rxvt_fontset *fontset[4];
899}; 909};
900 910
901/* 911/*
… …
981 scrollBar_t scrollBar; 991 scrollBar_t scrollBar;
982 uint8_t options[(Opt_count + 7) >> 3]; 992 uint8_t options[(Opt_count + 7) >> 3];
983 XSizeHints szHint; 993 XSizeHints szHint;
984 rxvt_color *pix_colors; 994 rxvt_color *pix_colors;
985 Cursor TermWin_cursor; /* cursor for vt window */ 995 Cursor TermWin_cursor; /* cursor for vt window */
996
986 line_t *row_buf; // all lines, scrollback + terminal, circular 997 line_t *row_buf; // all lines, scrollback + terminal, circular
987 line_t *drawn_buf; // text on screen 998 line_t *drawn_buf; // text on screen
988 line_t *swap_buf; // lines for swap buffer 999 line_t *swap_buf; // lines for swap buffer
989 char *tabs; /* per location: 1 == tab-stop */ 1000 char *tabs; /* per location: 1 == tab-stop */
990 screen_t screen; 1001 screen_t screen;
… …
1028 hidden_pointer:1, 1039 hidden_pointer:1,
1029#endif 1040#endif
1030 enc_utf8:1, /* whether locale uses utf-8 */ 1041 enc_utf8:1, /* whether locale uses utf-8 */
1031 seen_input:1, /* whether we have seen some program output yet */ 1042 seen_input:1, /* whether we have seen some program output yet */
1032 seen_resize:1, /* whether we had a resize event */ 1043 seen_resize:1, /* whether we had a resize event */
1044 init_done:1,
1033 parsed_geometry:1; 1045 parsed_geometry:1;
1034 1046
1035 unsigned char refresh_type, 1047 unsigned char refresh_type,
1036#ifdef META8_OPTION 1048#ifdef META8_OPTION
1037 meta_char; /* Alt-key prefix */ 1049 meta_char; /* Alt-key prefix */
… …
1047/* ---------- */ 1059/* ---------- */
1048 rend_t rstyle; 1060 rend_t rstyle;
1049/* ---------- */ 1061/* ---------- */
1050#ifdef SELECTION_SCROLLING 1062#ifdef SELECTION_SCROLLING
1051 int scroll_selection_lines; 1063 int scroll_selection_lines;
1052 enum page_dirn scroll_selection_dir;
1053 int selection_save_x, 1064 int selection_save_x,
1054 selection_save_y, 1065 selection_save_y,
1055 selection_save_state; 1066 selection_save_state;
1056#endif 1067#endif
1057/* ---------- */ 1068/* ---------- */
… …
1066 mouse_row, 1077 mouse_row,
1067 mouse_col, 1078 mouse_col,
1068# ifdef POINTER_BLANK 1079# ifdef POINTER_BLANK
1069 pointerBlankDelay, 1080 pointerBlankDelay,
1070# endif 1081# endif
1082 multiClickTime,
1083 cursor_type,
1071 allowedxerror; 1084 allowedxerror;
1072/* ---------- */ 1085/* ---------- */
1073 unsigned int ModLevel3Mask, 1086 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1087 ModMetaMask,
1075 ModNumLockMask; 1088 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, 1089 unsigned long priv_modes,
1079 SavedModes; 1090 SavedModes;
1080/* ---------- */ 1091/* ---------- */
1081 Atom *xa; 1092 Atom *xa;
1082/* ---------- */ 1093/* ---------- */
… …
1087/* ---------- */ 1098/* ---------- */
1088 struct mouse_event MEvent; 1099 struct mouse_event MEvent;
1089 XComposeStatus compose; 1100 XComposeStatus compose;
1090 static struct termios def_tio; 1101 static struct termios def_tio;
1091 row_col_t oldcursor; 1102 row_col_t oldcursor;
1092#ifdef HAVE_BG_PIXMAP
1093 void bg_init ();
1094 void bg_destroy ();
1095 1103
1104#ifdef HAVE_IMG
1096 enum { 1105 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, 1106 BG_IS_TRANSPARENT = 1 << 1,
1118 BG_NEEDS_REFRESH = 1 << 11, 1107 BG_NEEDS_REFRESH = 1 << 2,
1119 BG_IS_SIZE_SENSITIVE = 1 << 12,
1120 BG_IS_FROM_FILE = 1 << 13,
1121 }; 1108 };
1122 1109
1123 unsigned int bg_flags; 1110 uint8_t bg_flags;
1124 1111
1125# ifdef BG_IMAGE_FROM_FILE 1112 rxvt_img *bg_img;
1126 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1127 bool render_image (unsigned long tr_flags);
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
1150
1151# ifdef ENABLE_TRANSPARENCY
1152 Pixmap root_pixmap; /* current root pixmap set */
1153 rxvt_color tint;
1154 int shade;
1155 int h_blurRadius, v_blurRadius;
1156
1157 bool bg_set_transparent ();
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
1169
1170 ev_tstamp bg_valid_since;
1171
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 ();
1179 bool bg_window_position_sensitive ();
1180
1181 bool bg_render ();
1182 void bg_invalidate ()
1183 {
1184 bg_flags &= ~BG_IS_VALID;
1185 }
1186#endif
1187#ifdef HAVE_AFTERIMAGE
1188 ASImage *original_asim;
1189 ASVisual *asv;
1190 ASImageManager *asimman;
1191
1192 void init_asv ()
1193 {
1194 if (!asv)
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 1113#endif
1204 1114
1205#if ENABLE_OVERLAY 1115#if ENABLE_OVERLAY
1206 overlay_base ov; 1116 overlay_base ov;
1207 1117
… …
1215 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1125 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1216#endif 1126#endif
1217 1127
1218 vector<void *> allocated; // free these memory blocks with free() 1128 vector<void *> allocated; // free these memory blocks with free()
1219 1129
1220 char env_windowid[21]; /* environmental variable WINDOWID */ 1130 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 1131
1225 char *locale; 1132 char *locale;
1226 char charsets[4]; 1133 char charsets[4];
1227 char *v_buffer; /* pointer to physical buffer */ 1134 char *v_buffer; /* pointer to physical buffer */
1228 unsigned int v_buflen; /* size of area to write */ 1135 unsigned int v_buflen; /* size of area to write */
1229 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1136 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1137 char **env;
1230 1138
1231#ifdef KEYSYM_RESOURCE 1139#ifdef KEYSYM_RESOURCE
1232 keyboard_manager *keyboard; 1140 keyboard_manager *keyboard;
1233#endif 1141#endif
1234#ifndef NO_RESOURCES 1142#ifndef NO_RESOURCES
… …
1240 char *cmdbuf_ptr, *cmdbuf_endp; 1148 char *cmdbuf_ptr, *cmdbuf_endp;
1241 char cmdbuf_base[CBUFSIZ]; 1149 char cmdbuf_base[CBUFSIZ];
1242 1150
1243 ptytty *pty; 1151 ptytty *pty;
1244 1152
1245 rxvt_salloc *talloc; // text line allocator 1153 // chunk contains all line_t's as well as rend_t and text_t buffers
1246 rxvt_salloc *ralloc; // rend line allocator 1154 // for drawn_buf, swap_buf and row_buf, in this order
1155 void *chunk;
1156 size_t chunk_size;
1157
1158 uint32_t rgb24_color[RGB24_CUBE_SIZE]; // the 24-bit color value
1159 uint16_t rgb24_seqno[RGB24_CUBE_SIZE]; // which one is older?
1160 uint16_t rgb24_sequence;
1247 1161
1248 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1162 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1249 1163
1250#if ENABLE_FRILLS || ISO_14755 1164#if ENABLE_FRILLS || ISO_14755
1251 // ISO 14755 entry support 1165 // ISO 14755 entry support
1252 unicode_t iso14755buf; 1166 unicode_t iso14755buf;
1253 void commit_iso14755 (); 1167 void commit_iso14755 ();
1254# if ISO_14755 1168# if ISO_14755
1255 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1169 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); 1170 void iso14755_54 (int x, int y);
1257# endif 1171# endif
1258#endif 1172#endif
1259 1173
1260 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1174 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1262 void vt_select_input () const NOTHROW 1176 void vt_select_input () const NOTHROW
1263 { 1177 {
1264 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1178 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1265 } 1179 }
1266 1180
1267#if ENABLE_TRANSPARENCY || ENABLE_PERL 1181#if ENABLE_PERL
1268 void rootwin_cb (XEvent &xev); 1182 void rootwin_cb (XEvent &xev);
1269 xevent_watcher rootwin_ev; 1183 xevent_watcher rootwin_ev;
1270#endif
1271#ifdef HAVE_BG_PIXMAP
1272 void update_background ();
1273 void update_background_cb (ev::timer &w, int revents);
1274 ev::timer update_background_ev;
1275#endif 1184#endif
1276 1185
1277 void x_cb (XEvent &xev); 1186 void x_cb (XEvent &xev);
1278 xevent_watcher termwin_ev; 1187 xevent_watcher termwin_ev;
1279 xevent_watcher vt_ev; 1188 xevent_watcher vt_ev;
… …
1288 void cmdbuf_append (const char *str, size_t count); 1197 void cmdbuf_append (const char *str, size_t count);
1289 bool pty_fill (); 1198 bool pty_fill ();
1290 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1199 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1291 1200
1292#ifdef CURSOR_BLINK 1201#ifdef CURSOR_BLINK
1202 void cursor_blink_reset ();
1293 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1203 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1294#endif 1204#endif
1295#ifdef TEXT_BLINK 1205#ifdef TEXT_BLINK
1296 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1206 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1297#endif 1207#endif
… …
1314 void pointer_blank (); 1224 void pointer_blank ();
1315#endif 1225#endif
1316 void pointer_unblank (); 1226 void pointer_unblank ();
1317 1227
1318 void tt_printf (const char *fmt,...); 1228 void tt_printf (const char *fmt,...);
1229 void tt_write_ (const char *data, unsigned int len);
1319 void tt_write (const char *data, unsigned int len); 1230 void tt_write (const char *data, unsigned int len);
1231 void tt_write_user_input (const char *data, unsigned int len);
1320 void pty_write (); 1232 void pty_write ();
1321 1233
1322 void make_current () const // make this the "currently active" urxvt instance 1234 void make_current () const // make this the "currently active" urxvt instance
1323 { 1235 {
1324 SET_R (this); 1236 SET_R (this);
1325 set_environ (envv); 1237 set_environ (env);
1326 rxvt_set_locale (locale); 1238 rxvt_set_locale (locale);
1327 } 1239 }
1328 1240
1329#if USE_XIM 1241#if USE_XIM
1330 rxvt_xim *input_method; 1242 rxvt_xim *input_method;
… …
1363#if ENABLE_FRILLS 1275#if ENABLE_FRILLS
1364 void set_urgency (bool enable); 1276 void set_urgency (bool enable);
1365#else 1277#else
1366 void set_urgency (bool enable) { } 1278 void set_urgency (bool enable) { }
1367#endif 1279#endif
1368 void update_fade_color (unsigned int idx); 1280 void update_fade_color (unsigned int idx, bool first_time = false);
1369#ifdef PRINTPIPE 1281#ifdef PRINTPIPE
1370 FILE *popen_printer (); 1282 FILE *popen_printer ();
1371 int pclose_printer (FILE *stream); 1283 int pclose_printer (FILE *stream);
1372#endif 1284#endif
1373 void process_print_pipe (); 1285 void process_print_pipe ();
… …
1379 char *get_to_st (unicode_t &ends_how); 1291 char *get_to_st (unicode_t &ends_how);
1380 void process_dcs_seq (); 1292 void process_dcs_seq ();
1381 void process_osc_seq (); 1293 void process_osc_seq ();
1382 void process_color_seq (int report, int color, const char *str, char resp); 1294 void process_color_seq (int report, int color, const char *str, char resp);
1383 void process_xterm_seq (int op, char *str, char resp); 1295 void process_xterm_seq (int op, char *str, char resp);
1296 unsigned int map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a);
1384 int privcases (int mode, unsigned long bit); 1297 int privcases (int mode, unsigned long bit);
1385 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1298 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); 1299 void process_sgr_mode (unsigned int nargs, const int *arg);
1300 void set_cursor_style (int style);
1387 // init.C 1301 // init.C
1388 void init (stringvec *argv, stringvec *envv); 1302 void init (stringvec *argv, stringvec *envv);
1389 void init (int argc, const char *const *argv, const char *const *envv); 1303 void init (int argc, const char *const *argv, const char *const *envv);
1390 void init2 (int argc, const char *const *argv); 1304 void init2 (int argc, const char *const *argv);
1391 void init_vars (); 1305 void init_vars ();
… …
1396 void init_command (const char *const *argv); 1310 void init_command (const char *const *argv);
1397 void run_command (const char *const *argv); 1311 void run_command (const char *const *argv);
1398 int run_child (const char *const *argv); 1312 int run_child (const char *const *argv);
1399 void color_aliases (int idx); 1313 void color_aliases (int idx);
1400 void create_windows (int argc, const char *const *argv); 1314 void create_windows (int argc, const char *const *argv);
1401 void get_colours (); 1315 void get_colors ();
1402 void get_ourmods (); 1316 void get_ourmods ();
1403 void set_icon (const char *file); 1317 void set_icon (const char *file);
1404 // main.C 1318 // main.C
1405 void tt_winch (); 1319 void tt_winch ();
1406 rxvt_term (); 1320 rxvt_term ();
1407 ~rxvt_term (); 1321 ~rxvt_term ();
1408 void destroy (); 1322 void destroy ();
1409 void emergency_cleanup (); 1323 void emergency_cleanup ();
1410 void recolour_cursor (); 1324 void recolor_cursor ();
1411 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1325 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1412 void window_calc (unsigned int newwidth, unsigned int newheight); 1326 void window_calc (unsigned int newwidth, unsigned int newheight);
1413 bool set_fonts (); 1327 bool set_fonts ();
1414 void set_string_property (Atom prop, const char *str, int len = -1); 1328 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); 1329 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); 1330 void set_utf8_property (Atom prop, const char *str, int len = -1);
1417 void set_title (const char *str); 1331 void set_title (const char *str);
1418 void set_icon_name (const char *str); 1332 void set_icon_name (const char *str);
1419 void set_window_color (int idx, const char *color); 1333 void set_window_color (int idx, const char *color);
1420 void set_colorfgbg (); 1334 char *get_colorfgbg ();
1421 bool set_color (rxvt_color &color, const char *name); 1335 bool set_color (rxvt_color &color, const char *name);
1422 void alias_color (int dst, int src); 1336 void alias_color (int dst, int src);
1423 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1337 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1424 void get_window_origin (int &x, int &y); 1338 void get_window_origin (int &x, int &y);
1425 Pixmap get_pixmap_property (Atom property);
1426 1339
1427 // screen.C 1340 // screen.C
1428 1341
1429 void lalloc (line_t &l) const 1342 bool option (uint8_t opt) const NOTHROW
1430 { 1343 {
1431 l.t = (text_t *)talloc->alloc (); 1344 return options[opt >> 3] & (1 << (opt & 7));
1432 l.r = (rend_t *)ralloc->alloc ();
1433 } 1345 }
1434 1346
1435#if 0 1347 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 1348
1457 int fgcolor_of (rend_t r) const NOTHROW 1349 int fgcolor_of (rend_t r) const NOTHROW
1458 { 1350 {
1459 int base = GET_BASEFG (r); 1351 int base = GET_BASEFG (r);
1460#ifndef NO_BRIGHTCOLOR 1352#ifndef NO_BRIGHTCOLOR
… …
1480 base += minBrightCOLOR - minCOLOR; 1372 base += minBrightCOLOR - minCOLOR;
1481#endif 1373#endif
1482 return base; 1374 return base;
1483 } 1375 }
1484 1376
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(!) 1377 // modifies first argument(!)
1493 void tt_paste (char *data, unsigned int len) NOTHROW; 1378 void tt_paste (char *data, unsigned int len) NOTHROW;
1494 void paste (char *data, unsigned int len) NOTHROW; 1379 void paste (char *data, unsigned int len) NOTHROW;
1380 void scr_alloc () NOTHROW;
1495 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1381 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; 1382 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; 1383 void scr_kill_char (line_t &l, int col) const NOTHROW;
1384 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; 1385 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1386 void copy_line (line_t &dst, line_t &src);
1499 void scr_reset (); 1387 void scr_reset ();
1500 void scr_release () NOTHROW; 1388 void scr_release () NOTHROW;
1501 void scr_clear (bool really = false) NOTHROW; 1389 void scr_clear (bool really = false) NOTHROW;
1502 void scr_refresh () NOTHROW; 1390 void scr_refresh () NOTHROW;
1503 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1391 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
… …
1507 void scr_backindex () NOTHROW; 1395 void scr_backindex () NOTHROW;
1508 void scr_forwardindex () NOTHROW; 1396 void scr_forwardindex () NOTHROW;
1509#endif 1397#endif
1510 void scr_touch (bool refresh) NOTHROW; 1398 void scr_touch (bool refresh) NOTHROW;
1511 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1399 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1512 void scr_recolour (bool refresh = true) NOTHROW; 1400 void scr_recolor (bool refresh = true) NOTHROW;
1513 void scr_remap_chars () NOTHROW; 1401 void scr_remap_chars () NOTHROW;
1514 void scr_remap_chars (line_t &l) NOTHROW; 1402 void scr_remap_chars (line_t &l) NOTHROW;
1515 1403
1516 enum cursor_mode { SAVE, RESTORE }; 1404 enum cursor_mode { SAVE, RESTORE };
1517 1405
… …
1542 void scr_report_position () NOTHROW; 1430 void scr_report_position () NOTHROW;
1543 void set_font_style () NOTHROW; 1431 void set_font_style () NOTHROW;
1544 void scr_charset_choose (int set) NOTHROW; 1432 void scr_charset_choose (int set) NOTHROW;
1545 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1433 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1546 void scr_move_to (int y, int len) NOTHROW; 1434 void scr_move_to (int y, int len) NOTHROW;
1435 bool scr_page (int nlines) NOTHROW;
1547 bool scr_page (enum page_dirn direction, int nlines) NOTHROW; 1436 bool scr_page (enum page_dirn direction, int nlines) NOTHROW
1437 {
1438 return scr_page (direction * nlines);
1439 }
1548 bool scr_changeview (int new_view_start) NOTHROW; 1440 bool scr_changeview (int new_view_start) NOTHROW;
1549 void scr_bell () NOTHROW; 1441 void scr_bell () NOTHROW;
1550 void scr_printscreen (int fullhist) NOTHROW; 1442 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; 1443 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; 1444 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; 1445 void scr_reverse_selection () NOTHROW;
1554 void scr_dump (int fd) NOTHROW; 1446 void scr_dump (int fd) NOTHROW;
1555 1447
1556 void selection_check (int check_more) NOTHROW; 1448 void selection_check (int check_more) NOTHROW;
1449 void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
1557 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1450 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1558 void selection_clear (bool clipboard = false) NOTHROW; 1451 void selection_clear (bool clipboard = false) NOTHROW;
1559 void selection_make (Time tm); 1452 void selection_make (Time tm);
1560 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1453 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1561 void selection_start_colrow (int col, int row) NOTHROW; 1454 void selection_start_colrow (int col, int row) NOTHROW;
… …
1566 void selection_click (int clicks, int x, int y) NOTHROW; 1459 void selection_click (int clicks, int x, int y) NOTHROW;
1567 void selection_extend (int x, int y, int flag) NOTHROW; 1460 void selection_extend (int x, int y, int flag) NOTHROW;
1568 void selection_rotate (int x, int y) NOTHROW; 1461 void selection_rotate (int x, int y) NOTHROW;
1569 1462
1570 // xdefaults.C 1463 // xdefaults.C
1464 void rxvt_usage (int type);
1571 const char **get_options (int argc, const char *const *argv); 1465 const char **get_options (int argc, const char *const *argv);
1466 int parse_keysym (const char *str, unsigned int &state);
1572 int parse_keysym (const char *str, const char *arg); 1467 int bind_action (const char *str, const char *arg);
1573 const char *x_resource (const char *name); 1468 const char *x_resource (const char *name);
1574 void extract_resources (); 1469 void extract_resources ();
1470 void enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p = 0, const char *class_p = 0);
1471 void enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
1472 {
1473 enumerate_resources (cb, "keysym", "Keysym");
1474 }
1575 void extract_keysym_resources (); 1475 void extract_keysym_resources ();
1576}; 1476};
1577 1477
1578#endif /* _RXVT_H_ */ 1478#endif /* _RXVT_H_ */
1579 1479

Diff Legend

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