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.394 by root, Thu Apr 1 00:29:22 2010 UTC vs.
Revision 1.563 by sf-exg, Sat Jun 19 09:13:51 2021 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_IMG 1
81#endif
82
83#define ECB_NO_THREADS 1
84#include "ecb.h"
85
77#include "encoding.h" 86#include "encoding.h"
78#include "rxvtutil.h" 87#include "rxvtutil.h"
79#include "rxvtfont.h" 88#include "rxvtfont.h"
80#include "rxvttoolkit.h" 89#include "rxvttoolkit.h"
90#include "rxvtimg.h"
81#include "scrollbar.h" 91#include "scrollbar.h"
82#include "ev_cpp.h" 92#include "ev_cpp.h"
83#include "salloc.h"
84#include "libptytty.h" 93#include "libptytty.h"
85 94
86#include "rxvtperl.h" 95#include "rxvtperl.h"
87 96
88// try to avoid some macros to decrease code size, on some systems 97// try to avoid some macros to decrease code size, on some systems
98 ***************************************************************************** 107 *****************************************************************************
99 * SYSTEM HACKS 108 * SYSTEM HACKS
100 ***************************************************************************** 109 *****************************************************************************
101 */ 110 */
102 111
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 112#include <termios.h>
108
109#include "background.h"
110 113
111#ifndef STDIN_FILENO 114#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 115# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 116# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 117# define STDERR_FILENO 2
115#endif 118#endif
116 119
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 120#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 121# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 122# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 123#endif
125 124
126/****************************************************************************/ 125/****************************************************************************/
127 126
128// exception thrown on fatal (per-instance) errors 127// exception thrown on fatal (per-instance) errors
136 * PROTOTYPES 135 * PROTOTYPES
137 ***************************************************************************** 136 *****************************************************************************
138 */ 137 */
139// main.C 138// main.C
140#define SET_LOCALE(locale) rxvt_set_locale (locale) 139#define SET_LOCALE(locale) rxvt_set_locale (locale)
141extern bool rxvt_set_locale (const char *locale) NOTHROW; 140extern bool rxvt_set_locale (const char *locale) noexcept;
142extern void rxvt_push_locale (const char *locale) NOTHROW; 141extern void rxvt_push_locale (const char *locale) noexcept;
143extern void rxvt_pop_locale () NOTHROW; 142extern void rxvt_pop_locale () noexcept;
144void rxvt_init (); 143void rxvt_init ();
145 144
146// misc.C 145// misc.C
147char * rxvt_wcstombs (const wchar_t *str, int len = -1); 146char * rxvt_wcstombs (const wchar_t *str, int len = -1);
148wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 147wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
149char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 148char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
150wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 149wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
151 150
152const char * rxvt_basename (const char *str) NOTHROW; 151const char * rxvt_basename (const char *str) noexcept;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 152void rxvt_vlog (const char *fmt, va_list arg_ptr) noexcept;
154void rxvt_log (const char *fmt,...) NOTHROW; 153void rxvt_log (const char *fmt,...) noexcept;
155void rxvt_warn (const char *fmt,...) NOTHROW; 154void rxvt_warn (const char *fmt,...) noexcept;
155ecb_noreturn ecb_cold
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 156void rxvt_fatal (const char *fmt, ...);
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 157ecb_noreturn ecb_cold
158void rxvt_exit_failure ();
158 159
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); 160void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 161void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 162void * rxvt_realloc (void *ptr, size_t size);
163
164char * rxvt_strtrim (char *str) noexcept;
165char ** rxvt_strsplit (char delim, const char *str) noexcept;
166
167static inline void
168rxvt_free_strsplit (char **ptr) noexcept
169{
170 free (ptr[0]);
171 free (ptr);
172}
173
174KeySym rxvt_XKeycodeToKeysym (Display *dpy, KeyCode keycode, int index);
166 175
167///////////////////////////////////////////////////////////////////////////// 176/////////////////////////////////////////////////////////////////////////////
168 177
169// temporarily replace the process environment 178// temporarily replace the process environment
170extern char **environ; 179extern char **environ;
171extern char **rxvt_environ; // the original environ pointer 180extern char **rxvt_environ; // the original environ pointer
172 181
173static inline void 182static inline void
174set_environ (stringvec *envv) 183set_environ (char **envv)
175{ 184{
176#if ENABLE_PERL 185#if ENABLE_PERL
177 assert (envv); 186 assert (envv);
178#else 187#else
179 if (envv) 188 if (envv)
180#endif 189#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; 190 environ = envv;
193} 191}
192
193struct localise_env
194{
195 char **orig_env;
196
197 localise_env (char **new_env)
198 {
199 orig_env = environ;
200 environ = new_env;
201 }
202
203 ~localise_env ()
204 {
205 environ = orig_env;
206 }
207};
194 208
195/* 209/*
196 ***************************************************************************** 210 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 211 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 212 *****************************************************************************
241 ***************************************************************************** 255 *****************************************************************************
242 */ 256 */
243 257
244/* COLORTERM, TERM environment variables */ 258/* COLORTERM, TERM environment variables */
245#define COLORTERMENV "rxvt" 259#define COLORTERMENV "rxvt"
246#ifdef BG_IMAGE_FROM_FILE 260#if HAVE_IMG
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 261# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 262#else
249# define COLORTERMENVFULL COLORTERMENV 263# define COLORTERMENVFULL COLORTERMENV
250#endif 264#endif
251#ifndef TERMENV 265#ifndef TERMENV
266# if USE_256_COLORS
267# define TERMENV "rxvt-unicode-256color"
268# else
252# define TERMENV "rxvt-unicode" 269# define TERMENV "rxvt-unicode"
253#endif 270# endif
271#endif
272
273// Hidden color cube for indexed 24-bit colors. There are fewer blue levels
274// because normal human eye is less sensitive to the blue component than to
275// the red or green. (https://en.m.wikipedia.org/wiki/Color_depth#8-bit_color)
276#if USE_256_COLORS
277// 7x7x5=245 < 254 unused color indices
278# define Red_levels 7
279# define Green_levels 7
280# define Blue_levels 5
281#else
282// 6x6x4=144 < 166 unused color indices
283# define Red_levels 6
284# define Green_levels 6
285# define Blue_levels 4
286#endif
287
288#define RGB24_CUBE_SIZE (Red_levels * Green_levels * Blue_levels)
254 289
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 290#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 291# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 292#endif
258 293
272# define NSCREENS 0 307# define NSCREENS 0
273#else 308#else
274# define NSCREENS 1 309# define NSCREENS 1
275#endif 310#endif
276 311
277/* special (internal) prefix for font commands */
278#define FONT_CMD '#'
279#define FONT_DN "#-"
280#define FONT_UP "#+"
281
282/* flags for rxvt_scr_gotorc () */ 312/* flags for rxvt_term::scr_gotorc () */
283enum { 313enum {
284 C_RELATIVE = 1, /* col movement is relative */ 314 C_RELATIVE = 1, /* col movement is relative */
285 R_RELATIVE = 2, /* row movement is relative */ 315 R_RELATIVE = 2, /* row movement is relative */
286 RELATIVE = C_RELATIVE | R_RELATIVE, 316 RELATIVE = C_RELATIVE | R_RELATIVE,
287}; 317};
288 318
289/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 319/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
290enum { 320enum {
291 INSERT = -1, /* don't change these values */ 321 INSERT = -1, /* don't change these values */
292 DELETE = +1, 322 DELETE = +1,
293 ERASE = +2, 323 ERASE = +2,
294}; 324};
295 325
296/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 326/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
297enum page_dirn { 327enum page_dirn {
298 UP, 328 DN = -1,
299 DN,
300 NO_DIR, 329 NO_DIR = 0,
330 UP = 1,
301}; 331};
302 332
303/* arguments for rxvt_scr_change_screen () */ 333/* arguments for rxvt_term::scr_change_screen () */
304enum { 334enum {
305 PRIMARY = 0, 335 PRIMARY = 0,
306 SECONDARY, 336 SECONDARY,
307}; 337};
308 338
339// define various rendition bits and masks. the rendition word
340// is 32 bits in size, and we should use it as efficiently as possible
341
309#define RS_None 0 342#define RS_None 0
310 343
344// GET_BGATTR depends on RS_fgShift > RS_bgShift
311#define RS_colorMask ((1UL << Color_Bits) - 1UL) 345#define RS_colorMask ((1UL << Color_Bits) - 1UL)
312#define RS_fgShift Color_Bits
313#define RS_bgShift 0 346#define RS_bgShift 0
347#define RS_fgShift (RS_bgShift + Color_Bits)
348#define RS_bgMask (RS_colorMask << RS_bgShift)
314#define RS_fgMask (RS_colorMask << RS_fgShift) 349#define RS_fgMask (RS_colorMask << RS_fgShift)
315#define RS_bgMask (RS_colorMask << RS_bgShift)
316
317// font styles
318#define RS_Bold 0x08000000UL // value 1
319#define RS_Italic 0x10000000UL // value 2
320
321// fake styles
322#define RS_Blink 0x20000000UL // blink
323#define RS_RVid 0x40000000UL // reverse video
324#define RS_Uline 0x80000000UL // underline
325
326// 5 custom bits for extensions
327#define RS_customCount 16
328#define RS_customMask 0x07800000UL
329#define RS_customShift 23
330 350
331// must have space for rxvt_fontset::fontCount * 2 + 2 values 351// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0x007c0000UL // includes RS_Careful 352#define RS_fontShift (RS_fgShift + Color_Bits)
333#define RS_fontShift 18
334#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 353#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
354#define RS_fontCount rxvt_fontset::fontCount
355#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
335 356
336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 357// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
337#define RS_redraw (2UL << RS_fontShift) 358#define RS_redraw (2UL << RS_fontShift)
338 359
360#define RS_Sel (1UL << 22)
361
362// 4 custom bits for extensions
363#define RS_customCount 16UL
364#define RS_customShift 23
365#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
366
367// font styles
368#define RS_Bold (1UL << RS_styleShift)
369#define RS_Italic (2UL << RS_styleShift)
370
339#define RS_styleCount 4 371#define RS_styleCount 4
372#define RS_styleShift 27
340#define RS_styleMask (RS_Bold | RS_Italic) 373#define RS_styleMask (RS_Bold | RS_Italic)
341#define RS_styleShift 27 374
375// fake styles
376#define RS_Blink (1UL << 29)
377#define RS_RVid (1UL << 30) // reverse video
378#define RS_Uline (1UL << 31) // underline
342 379
343#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 380#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
344#define RS_attrMask (RS_baseattrMask | RS_fontMask) 381#define RS_attrMask (RS_baseattrMask | RS_fontMask)
345 382
346#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 383#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
347#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 384#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
348
349#define Sel_none 0 /* Not waiting */
350#define Sel_normal 0x01 /* normal selection */
351#define Sel_incr 0x02 /* incremental selection */
352#define Sel_direct 0x00
353#define Sel_Primary 0x01
354#define Sel_Secondary 0x02
355#define Sel_Clipboard 0x03
356#define Sel_whereMask 0x0f
357#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
358#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
359 385
360enum { 386enum {
361 C0_NUL = 0x00, 387 C0_NUL = 0x00,
362 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 388 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
363 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 389 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
381 XTerm_Color_cursor = 12, // change actual 'Cursor' color 407 XTerm_Color_cursor = 12, // change actual 'Cursor' color
382 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 408 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
383 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 409 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
384 XTerm_Color05 = 15, // not implemented (tektronix fg) 410 XTerm_Color05 = 15, // not implemented (tektronix fg)
385 XTerm_Color06 = 16, // not implemented (tektronix bg) 411 XTerm_Color06 = 16, // not implemented (tektronix bg)
386 XTerm_Color_RV = 17, // change actual 'Highlight' color 412 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
413 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
387 XTerm_logfile = 46, // not implemented 414 XTerm_logfile = 46, // not implemented
388 XTerm_font = 50, 415 XTerm_font = 50,
389 416
390 XTerm_konsole30 = 30, // reserved for konsole 417 XTerm_konsole30 = 30, // reserved for konsole
391 XTerm_konsole31 = 31, // reserved for konsole 418 XTerm_konsole31 = 31, // reserved for konsole
393 /* 420 /*
394 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 421 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
395 */ 422 */
396 423
397 // deprecated 424 // deprecated
398 Rxvt_Color_BD = 18,
399 Rxvt_Color_UL = 19,
400 Rxvt_restoreFG = 39, 425 Rxvt_restoreFG = 39,
401 Rxvt_restoreBG = 49, 426 Rxvt_restoreBG = 49,
402 427
403 Rxvt_Pixmap = 20, // new bg pixmap
404 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 428 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
405 429
406 URxvt_locale = 701, // change locale 430 URxvt_locale = 701, // change locale
407 URxvt_version = 702, // request version 431 URxvt_version = 702, // request version
408 432
409 URxvt_Color_IT = 704, // change actual 'Italic' colour 433 URxvt_Color_IT = 704, // change actual 'Italic' colour
410 URxvt_Color_tint = 705, // change actual tint colour
411 URxvt_Color_BD = 706, // change actual 'Bold' color 434 URxvt_Color_BD = 706, // change actual 'Bold' color
412 URxvt_Color_UL = 707, // change actual 'Underline' color 435 URxvt_Color_UL = 707, // change actual 'Underline' color
413 URxvt_Color_border = 708, 436 URxvt_Color_border = 708,
414 437
415 URxvt_font = 710, 438 URxvt_font = 710,
458 Color_White = maxBrightCOLOR, 481 Color_White = maxBrightCOLOR,
459#else 482#else
460 Color_White = maxCOLOR, 483 Color_White = maxCOLOR,
461#endif 484#endif
462 minTermCOLOR = Color_White + 1, 485 minTermCOLOR = Color_White + 1,
463#ifndef USE_256_COLORS 486#if USE_256_COLORS
487 maxTermCOLOR = Color_White + 240,
488#else
464 maxTermCOLOR = Color_White + 72, 489 maxTermCOLOR = Color_White + 72,
465#else
466 maxTermCOLOR = Color_White + 240,
467#endif 490#endif
491 minTermCOLOR24,
492 maxTermCOLOR24 = minTermCOLOR24 +
493 RGB24_CUBE_SIZE - 1,
468#ifndef NO_CURSORCOLOR 494#ifndef NO_CURSORCOLOR
469 Color_cursor, 495 Color_cursor,
470 Color_cursor2, 496 Color_cursor2,
471#endif 497#endif
472 Color_pointer_fg, 498 Color_pointer_fg,
481#if ENABLE_FRILLS 507#if ENABLE_FRILLS
482 Color_underline, 508 Color_underline,
483#endif 509#endif
484#ifdef OPTION_HC 510#ifdef OPTION_HC
485 Color_HC, 511 Color_HC,
512 Color_HTC,
486#endif 513#endif
487 Color_scroll, 514 Color_scroll,
488#ifdef RXVT_SCROLLBAR 515#ifdef RXVT_SCROLLBAR
489 Color_trough, 516 Color_trough,
490#endif
491#if ENABLE_TRANSPARENCY
492 Color_tint,
493#endif 517#endif
494#if OFF_FOCUS_FADING 518#if OFF_FOCUS_FADING
495 Color_fade, 519 Color_fade,
496#endif 520#endif
497 NRS_COLORS, /* */ 521 NRS_COLORS, /* */
502#else 526#else
503 TOTAL_COLORS = NRS_COLORS 527 TOTAL_COLORS = NRS_COLORS
504#endif 528#endif
505}; 529};
506 530
507#ifndef USE_256_COLORS 531#if USE_256_COLORS
508#define Color_Bits 7 // 0 .. maxTermCOLOR 532# define Color_Bits 9 // 0 .. maxTermCOLOR24
509#else 533#else
510#define Color_Bits 9 // 0 .. maxTermCOLOR 534# define Color_Bits 8 // 0 .. maxTermCOLOR24
535#endif
536
537#if maxTermCOLOR24 >= (1 << Color_Bits)
538# error color index overflow
511#endif 539#endif
512 540
513/* 541/*
514 * Resource list 542 * Resource list
515 */ 543 */
544#define PrivMode_vt52 (1UL<<18) 572#define PrivMode_vt52 (1UL<<18)
545#define PrivMode_LFNL (1UL<<19) 573#define PrivMode_LFNL (1UL<<19)
546#define PrivMode_MouseBtnEvent (1UL<<20) 574#define PrivMode_MouseBtnEvent (1UL<<20)
547#define PrivMode_MouseAnyEvent (1UL<<21) 575#define PrivMode_MouseAnyEvent (1UL<<21)
548#define PrivMode_BracketPaste (1UL<<22) 576#define PrivMode_BracketPaste (1UL<<22)
577#define PrivMode_ExtMouseUTF8 (1UL<<23) // xterm pseudo-utf-8 hack
578#define PrivMode_ExtMouseUrxvt (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
579#define PrivMode_BlinkingCursor (1UL<<25)
580#define PrivMode_FocusEvent (1UL<<26)
581#define PrivMode_ExtMouseSGR (1UL<<27)
549 582
550#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 583#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
551 584
552#ifdef ALLOW_132_MODE 585#ifdef ALLOW_132_MODE
553# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 586# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
556#endif 589#endif
557 590
558// do not change these constants lightly, there are many interdependencies 591// do not change these constants lightly, there are many interdependencies
559#define IMBUFSIZ 128 // input modifier buffer sizes 592#define IMBUFSIZ 128 // input modifier buffer sizes
560#define KBUFSZ 512 // size of keyboard mapping buffer 593#define KBUFSZ 512 // size of keyboard mapping buffer
561#define CBUFSIZ 2048 // size of command buffer 594#define CBUFSIZ 32768 // size of command buffer (longest command sequence possible)
562#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 595#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
563#define UBUFSIZ 2048 // character buffer 596#define UBUFSIZ 2048 // character buffer
564 597
565#if ENABLE_FRILLS 598#if ENABLE_FRILLS
566# include <X11/Xmd.h> 599# include <X11/Xmd.h>
604/* 637/*
605 ***************************************************************************** 638 *****************************************************************************
606 * MACRO DEFINES 639 * MACRO DEFINES
607 ***************************************************************************** 640 *****************************************************************************
608 */ 641 */
642
643// speed hack, copy some member variable into a local variable of the same name
609#define dLocal(type,name) type const name = this->name 644#define dLocal(type,name) type const name = this->name
610 645
611// for speed reasons, we assume that all codepoints 32 to 126 are 646// for speed reasons, we assume that all codepoints 32 to 126 are
612// single-width. 647// single-width.
613#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 648#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
637 672
638#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 673#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
639#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 674#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
640 675
641#define GET_ATTR(x) (((x) & RS_attrMask)) 676#define GET_ATTR(x) (((x) & RS_attrMask))
642#define GET_BGATTR(x) \
643 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
644 | (((x) & RS_colorMask) << RS_bgShift)) \
645 : ((x) & (RS_attrMask | RS_bgMask)))
646#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 677#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
647#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 678#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
648#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 679#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
649 680
650#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 681#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
675{ 706{
676 text_t *t; // terminal the text 707 text_t *t; // terminal the text
677 rend_t *r; // rendition, uses RS_ flags 708 rend_t *r; // rendition, uses RS_ flags
678 tlen_t_ l; // length of each text line 709 tlen_t_ l; // length of each text line
679 uint32_t f; // flags 710 uint32_t f; // flags
711
712 bool valid ()
713 {
714 return l >= 0;
715 }
716
717 void alloc ()
718 {
719 l = 0;
720 }
680 721
681 bool is_longer () 722 bool is_longer ()
682 { 723 {
683 return f & LINE_LONGER; 724 return f & LINE_LONGER;
684 } 725 }
728/****************************************************************************/ 769/****************************************************************************/
729 770
730#define UNICODE_MASK 0x1fffffUL 771#define UNICODE_MASK 0x1fffffUL
731 772
732#if UNICODE_3 773#if UNICODE_3
733# define COMPOSE_LO 0x40000000UL 774# define COMPOSE_LO 0x110000UL
734# define COMPOSE_HI 0x400fffffUL 775# define COMPOSE_HI 0x1fffffUL
735# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 776# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
736#else 777#else
737# if ENABLE_PERL 778# if ENABLE_PERL
738# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates 779# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
739# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 780# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
748// compose chars are used to represent composite characters 789// compose chars are used to represent composite characters
749// that are not representable in unicode, as well as characters 790// that are not representable in unicode, as well as characters
750// not fitting in the BMP. 791// not fitting in the BMP.
751struct compose_char 792struct compose_char
752{ 793{
753 unicode_t c1, c2; // any chars != NOCHAR are valid 794 // c1 can be any character != NOCHAR, including another compose character
795 // c2 must always be a zero-width character or NOCHAR, in case
796 // this just extends beyond the BMP.
797 unicode_t c1, c2;
798
754 compose_char (unicode_t c1, unicode_t c2) 799 compose_char (unicode_t c1, unicode_t c2)
755 : c1(c1), c2(c2) 800 : c1(c1), c2(c2)
756 { } 801 { }
757}; 802};
758 803
759class rxvt_composite_vec 804struct rxvt_composite_vec
760{ 805{
761 vector<compose_char> v; 806 vector<compose_char> v;
762public: 807
763 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 808 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
764 int expand (unicode_t c, wchar_t *r); 809 template<typename T> int expand (unicode_t c, T *r);
810 int expand (unicode_t c) { return expand (c, (text_t *)0); }
765 compose_char *operator [](text_t c) 811 compose_char *operator [](text_t c)
766 { 812 {
767 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size () 813 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
768 ? &v[c - COMPOSE_LO] 814 ? &v[c - COMPOSE_LO]
769 : 0; 815 : 0;
771}; 817};
772 818
773extern class rxvt_composite_vec rxvt_composite; 819extern class rxvt_composite_vec rxvt_composite;
774#endif 820#endif
775 821
822// expand the sequence into a static array
823// works even without ENABLE_COMBINING
824template<typename T, int max_size_ = 48>
825struct rxvt_compose_expand_static
826{
827#if ENABLE_COMBINING
828 enum { max_size = max_size_ };
829
830 T chrs[max_size];
831
832 // expand sequence and return start ptr
833 // guarantees at least one output
834 // get the length with length () on that ptr
835 T *operator ()(unicode_t c)
836 {
837 T *cur = chrs + max_size;
838
839 while (ecb_expect_false (IS_COMPOSE (c)))
840 if (ecb_expect_true (c - COMPOSE_LO < rxvt_composite.v.size ()))
841 {
842 compose_char *cc = &rxvt_composite.v [c - COMPOSE_LO];
843
844 if (cc->c2 != NOCHAR)
845 {
846 cur -= cur > chrs; *cur = cc->c2;
847 }
848
849 c = cc->c1;
850 }
851 else
852 c = NOCHAR;
853
854 cur -= cur > chrs; *cur = c;
855
856 return cur;
857 }
858
859 int length (T *first)
860 {
861 return chrs + max_size - first;
862 }
863#else
864 T chr;
865
866 T *operator ()(text_t c);
867 {
868 chr = c;
869 return &chr;
870 }
871
872 int length (T *first)
873 {
874 return 1;
875 }
876#endif
877};
878
776/****************************************************************************/ 879/****************************************************************************/
777 880
778#ifdef KEYSYM_RESOURCE 881#ifdef KEYSYM_RESOURCE
779class keyboard_manager; 882class keyboard_manager;
780#endif 883#endif
791{ 894{
792 int x, y, w, h; // overlay dimensions 895 int x, y, w, h; // overlay dimensions
793 text_t **text; 896 text_t **text;
794 rend_t **rend; 897 rend_t **rend;
795 898
796 // while tempting to add swap() etc. here, it effetcively only increases code size 899 // while tempting to add swap() etc. here, it effectively only increases code size
797}; 900};
798 901
799/* ------------------------------------------------------------------------- */ 902/* ------------------------------------------------------------------------- */
800 903
801typedef struct 904typedef struct
840 * END······················= total_rows 943 * END······················= total_rows
841 */ 944 */
842 945
843struct TermWin_t 946struct TermWin_t
844{ 947{
948 int vt_width; /* actual window width [pixels] */
949 int vt_height; /* actual window height [pixels] */
845 int width; /* window width [pixels] */ 950 int width; /* window width [pixels] */
846 int height; /* window height [pixels] */ 951 int height; /* window height [pixels] */
847 int fwidth; /* font width [pixels] */ 952 int fwidth; /* font width [pixels] */
848 int fheight; /* font height [pixels] */ 953 int fheight; /* font height [pixels] */
849 int fbase; /* font ascent (baseline) [pixels] */ 954 int fbase; /* font ascent (baseline) [pixels] */
858 int saveLines; /* number of lines that fit in scrollback */ 963 int saveLines; /* number of lines that fit in scrollback */
859 int total_rows; /* total number of rows in this terminal */ 964 int total_rows; /* total number of rows in this terminal */
860 int term_start; /* term lines start here */ 965 int term_start; /* term lines start here */
861 int view_start; /* scrollback view starts here */ 966 int view_start; /* scrollback view starts here */
862 int top_row; /* topmost row index of scrollback */ 967 int top_row; /* topmost row index of scrollback */
863 Window parent[6]; /* parent identifiers - we're parent[0] */ 968 Window parent; /* parent identifier */
864 Window vt; /* vt100 window */ 969 Window vt; /* vt100 window */
865 GC gc; /* GC for drawing */ 970 GC gc; /* GC for drawing */
866 Pixmap pixmap;
867 rxvt_drawable *drawable; 971 rxvt_drawable *drawable;
868 rxvt_fontset *fontset[4]; 972 rxvt_fontset *fontset[4];
869}; 973};
870 974
871/* 975/*
933#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1037#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
934#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1038#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
935 1039
936/* rxvt_vars.options */ 1040/* rxvt_vars.options */
937enum { 1041enum {
938# define def(name,idx) Opt_ ## name = idx,
939# define nodef(name) Opt_ ## name = 0, 1042# define def(name) Opt_ ## name,
1043# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1044 Opt_0,
940# include "optinc.h" 1045# include "optinc.h"
941# undef nodef 1046# undef nodef
942# undef def 1047# undef def
943Opt_count 1048 Opt_count
944}; 1049};
945 1050
946/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
947 1052
948struct rxvt_vars : TermWin_t 1053struct rxvt_vars : TermWin_t
950 scrollBar_t scrollBar; 1055 scrollBar_t scrollBar;
951 uint8_t options[(Opt_count + 7) >> 3]; 1056 uint8_t options[(Opt_count + 7) >> 3];
952 XSizeHints szHint; 1057 XSizeHints szHint;
953 rxvt_color *pix_colors; 1058 rxvt_color *pix_colors;
954 Cursor TermWin_cursor; /* cursor for vt window */ 1059 Cursor TermWin_cursor; /* cursor for vt window */
955 int numlock_state; 1060
956 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1061 line_t *row_buf; // all lines, scrollback + terminal, circular
957 line_t *drawn_buf; // text on screen 1062 line_t *drawn_buf; // text on screen
958 line_t *swap_buf; // lines for swap buffer 1063 line_t *swap_buf; // lines for swap buffer
959 char *tabs; /* per location: 1 == tab-stop */ 1064 char *tabs; /* per location: 1 == tab-stop */
960 screen_t screen; 1065 screen_t screen;
961 screen_t swap; 1066 screen_t swap;
998 hidden_pointer:1, 1103 hidden_pointer:1,
999#endif 1104#endif
1000 enc_utf8:1, /* whether locale uses utf-8 */ 1105 enc_utf8:1, /* whether locale uses utf-8 */
1001 seen_input:1, /* whether we have seen some program output yet */ 1106 seen_input:1, /* whether we have seen some program output yet */
1002 seen_resize:1, /* whether we had a resize event */ 1107 seen_resize:1, /* whether we had a resize event */
1108 init_done:1,
1003 parsed_geometry:1; 1109 parsed_geometry:1;
1004 1110
1005 unsigned char refresh_type, 1111 unsigned char refresh_type,
1006#ifdef META8_OPTION 1112#ifdef META8_OPTION
1007 meta_char, /* Alt-key prefix */ 1113 meta_char; /* Alt-key prefix */
1008#endif 1114#endif
1009 selection_wait,
1010 selection_type;
1011/* ---------- */ 1115/* ---------- */
1012 bool rvideo_state, rvideo_mode; 1116 bool rvideo_state, rvideo_mode;
1013#ifndef NO_BELL 1117#ifndef NO_BELL
1014 bool rvideo_bell; 1118 bool rvideo_bell;
1015#endif 1119#endif
1019/* ---------- */ 1123/* ---------- */
1020 rend_t rstyle; 1124 rend_t rstyle;
1021/* ---------- */ 1125/* ---------- */
1022#ifdef SELECTION_SCROLLING 1126#ifdef SELECTION_SCROLLING
1023 int scroll_selection_lines; 1127 int scroll_selection_lines;
1024 enum page_dirn scroll_selection_dir;
1025 int selection_save_x, 1128 int selection_save_x,
1026 selection_save_y, 1129 selection_save_y,
1027 selection_save_state; 1130 selection_save_state;
1028#endif 1131#endif
1029/* ---------- */ 1132/* ---------- */
1038 mouse_row, 1141 mouse_row,
1039 mouse_col, 1142 mouse_col,
1040# ifdef POINTER_BLANK 1143# ifdef POINTER_BLANK
1041 pointerBlankDelay, 1144 pointerBlankDelay,
1042# endif 1145# endif
1146 multiClickTime,
1147 cursor_type,
1043 allowedxerror; 1148 allowedxerror;
1044/* ---------- */ 1149/* ---------- */
1045 unsigned int ModLevel3Mask, 1150 unsigned int ModLevel3Mask,
1046 ModMetaMask, 1151 ModMetaMask,
1047 ModNumLockMask; 1152 ModNumLockMask;
1048 int old_width, /* last used width in screen resize */
1049 old_height; /* last used height in screen resize */
1050 unsigned long priv_modes, 1153 unsigned long priv_modes,
1051 SavedModes; 1154 SavedModes;
1052/* ---------- */ 1155/* ---------- */
1053 Atom *xa; 1156 Atom *xa;
1054/* ---------- */ 1157/* ---------- */
1055 Time selection_time, 1158 Time selection_time,
1056 selection_request_time,
1057 clipboard_time; 1159 clipboard_time;
1160 rxvt_selection *selection_req;
1058 pid_t cmd_pid; /* process id of child */ 1161 pid_t cmd_pid; /* process id of child */
1059 char * incr_buf;
1060 size_t incr_buf_size, incr_buf_fill;
1061/* ---------- */ 1162/* ---------- */
1062 struct mouse_event MEvent; 1163 struct mouse_event MEvent;
1063 XComposeStatus compose; 1164 XComposeStatus compose;
1064 struct termios tio; 1165 static struct termios def_tio;
1065 row_col_t oldcursor; 1166 row_col_t oldcursor;
1066#ifdef HAVE_BG_PIXMAP 1167
1067 bgPixmap_t bgPixmap;
1068#endif
1069#ifdef HAVE_AFTERIMAGE 1168#ifdef HAVE_IMG
1070 ASVisual *asv; 1169 enum {
1071 ASImageManager *asimman; 1170 BG_IS_TRANSPARENT = 1 << 1,
1072 1171 BG_NEEDS_REFRESH = 1 << 2,
1073 void init_asv ()
1074 {
1075 if (!asv)
1076 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1077 } 1172 };
1173
1174 uint8_t bg_flags;
1175
1176 rxvt_img *bg_img;
1078#endif 1177#endif
1079 1178
1080#if ENABLE_OVERLAY 1179#if ENABLE_OVERLAY
1081 overlay_base ov; 1180 overlay_base ov;
1082 1181
1083 void scr_swap_overlay () NOTHROW; 1182 void scr_swap_overlay () noexcept;
1084 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1183 void scr_overlay_new (int x, int y, int w, int h) noexcept;
1085 void scr_overlay_off () NOTHROW; 1184 void scr_overlay_off () noexcept;
1086 void scr_overlay_set (int x, int y, 1185 void scr_overlay_set (int x, int y,
1087 text_t text, 1186 text_t text,
1088 rend_t rend = OVERLAY_RSTYLE) NOTHROW; 1187 rend_t rend = OVERLAY_RSTYLE) noexcept;
1089 void scr_overlay_set (int x, int y, const char *s) NOTHROW; 1188 void scr_overlay_set (int x, int y, const char *s) noexcept;
1090 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1189 void scr_overlay_set (int x, int y, const wchar_t *s) noexcept;
1091#endif 1190#endif
1092 1191
1093 vector<void *> allocated; // free these memory blocks with free() 1192 vector<void *> allocated; // free these memory blocks with free()
1094 1193
1095 char env_windowid[21]; /* environmental variable WINDOWID */ 1194 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1096 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1097 char *env_display; /* environmental variable DISPLAY */
1098 char *env_term; /* environmental variable TERM */
1099 1195
1100 char *locale; 1196 char *locale;
1101 char charsets[4]; 1197 char charsets[4];
1102 char *v_buffer; /* pointer to physical buffer */ 1198 char *v_buffer; /* pointer to physical buffer */
1103 unsigned int v_buflen; /* size of area to write */ 1199 unsigned int v_buflen; /* size of area to write */
1104 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1200 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1201 char **env;
1105 1202
1106#ifdef KEYSYM_RESOURCE 1203#ifdef KEYSYM_RESOURCE
1107 keyboard_manager *keyboard; 1204 keyboard_manager *keyboard;
1108#endif 1205#endif
1109#ifndef NO_RESOURCES 1206#ifndef NO_RESOURCES
1115 char *cmdbuf_ptr, *cmdbuf_endp; 1212 char *cmdbuf_ptr, *cmdbuf_endp;
1116 char cmdbuf_base[CBUFSIZ]; 1213 char cmdbuf_base[CBUFSIZ];
1117 1214
1118 ptytty *pty; 1215 ptytty *pty;
1119 1216
1120 rxvt_salloc *talloc; // text line allocator 1217 // chunk contains all line_t's as well as rend_t and text_t buffers
1121 rxvt_salloc *ralloc; // rend line allocator 1218 // for drawn_buf, swap_buf and row_buf, in this order
1219 void *chunk;
1220 size_t chunk_size;
1221
1222 uint32_t rgb24_color[RGB24_CUBE_SIZE]; // the 24-bit color value
1223 uint16_t rgb24_seqno[RGB24_CUBE_SIZE]; // which one is older?
1224 uint16_t rgb24_sequence;
1122 1225
1123 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1226 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1124 1227
1125#if ENABLE_FRILLS || ISO_14755 1228#if ENABLE_FRILLS || ISO_14755
1126 // ISO 14755 entry support 1229 // ISO 14755 entry support
1127 unicode_t iso14755buf; 1230 unicode_t iso14755buf;
1128 void commit_iso14755 (); 1231 void commit_iso14755 ();
1129# if ISO_14755 1232# if ISO_14755
1130 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1233 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1131 void iso14755_54 (int x, int y); 1234 void iso14755_54 (int x, int y);
1132# endif 1235# endif
1133#endif 1236#endif
1134 1237
1135 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1238 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1136 1239
1137 void vt_select_input () const NOTHROW 1240 void vt_select_input () const noexcept
1138 { 1241 {
1139 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1242 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1140 } 1243 }
1141 1244
1142#if ENABLE_TRANSPARENCY || ENABLE_PERL 1245#if ENABLE_PERL
1143 void rootwin_cb (XEvent &xev); 1246 void rootwin_cb (XEvent &xev);
1144 xevent_watcher rootwin_ev; 1247 xevent_watcher rootwin_ev;
1145#endif
1146#ifdef HAVE_BG_PIXMAP
1147 void update_background ();
1148#if TRACE_PIXMAPS
1149 void trace_update_background (const char *file, int line);
1150# define update_background() trace_update_background (__FILE__, __LINE__)
1151#endif
1152 void update_background_cb (ev::timer &w, int revents);
1153 ev::timer update_background_ev;
1154#endif 1248#endif
1155 1249
1156 void x_cb (XEvent &xev); 1250 void x_cb (XEvent &xev);
1157 xevent_watcher termwin_ev; 1251 xevent_watcher termwin_ev;
1158 xevent_watcher vt_ev; 1252 xevent_watcher vt_ev;
1161 void child_cb (ev::child &w, int revents); ev::child child_ev; 1255 void child_cb (ev::child &w, int revents); ev::child child_ev;
1162 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1256 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1163 void refresh_check (); 1257 void refresh_check ();
1164 void flush (); 1258 void flush ();
1165 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1259 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1260 void cmdbuf_reify ();
1261 void cmdbuf_append (const char *str, size_t count);
1166 bool pty_fill (); 1262 bool pty_fill ();
1167 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1263 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1168 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1169 1264
1170#ifdef CURSOR_BLINK 1265#ifdef CURSOR_BLINK
1266 void cursor_blink_reset ();
1171 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1267 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1172#endif 1268#endif
1173#ifdef TEXT_BLINK 1269#ifdef TEXT_BLINK
1174 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1270 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1175#endif 1271#endif
1192 void pointer_blank (); 1288 void pointer_blank ();
1193#endif 1289#endif
1194 void pointer_unblank (); 1290 void pointer_unblank ();
1195 1291
1196 void tt_printf (const char *fmt,...); 1292 void tt_printf (const char *fmt,...);
1293 void tt_write_ (const char *data, unsigned int len);
1197 void tt_write (const char *data, unsigned int len); 1294 void tt_write (const char *data, unsigned int len);
1295 void tt_write_user_input (const char *data, unsigned int len);
1198 void pty_write (); 1296 void pty_write ();
1199
1200 void init (stringvec *argv, stringvec *envv)
1201 {
1202 this->argv = argv;
1203 init (argv->size (), argv->begin (), envv);
1204 }
1205 1297
1206 void make_current () const // make this the "currently active" urxvt instance 1298 void make_current () const // make this the "currently active" urxvt instance
1207 { 1299 {
1208 SET_R (this); 1300 SET_R (this);
1209 set_environ (envv); 1301 set_environ (env);
1210 rxvt_set_locale (locale); 1302 rxvt_set_locale (locale);
1211 } 1303 }
1212 1304
1213#if USE_XIM 1305#if USE_XIM
1214 rxvt_xim *input_method; 1306 rxvt_xim *input_method;
1217 XPoint spot; // most recently sent spot position 1309 XPoint spot; // most recently sent spot position
1218 1310
1219 void im_destroy (); 1311 void im_destroy ();
1220 void im_cb (); im_watcher im_ev; 1312 void im_cb (); im_watcher im_ev;
1221 void im_set_size (XRectangle &size); 1313 void im_set_size (XRectangle &size);
1222 void im_set_position (XPoint &pos) NOTHROW; 1314 void im_set_position (XPoint &pos) noexcept;
1223 void im_set_color (unsigned long &fg, unsigned long &bg); 1315 void im_set_color (unsigned long &fg, unsigned long &bg);
1224 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1316 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1225 1317
1226 bool IMisRunning (); 1318 bool im_is_running ();
1227 void IMSendSpot (); 1319 void im_send_spot ();
1228 bool IM_get_IC (const char *modifiers); 1320 bool im_get_ic (const char *modifiers);
1229 void IMSetPosition (); 1321 void im_set_position ();
1230#endif 1322#endif
1231 1323
1232 // command.C 1324 // command.C
1233 void key_press (XKeyEvent &ev); 1325 void key_press (XKeyEvent &ev);
1234 void key_release (XKeyEvent &ev); 1326 void key_release (XKeyEvent &ev);
1235 unsigned int cmd_write (const char *str, unsigned int count);
1236 1327
1237 wchar_t next_char () NOTHROW; 1328 wchar_t next_char () noexcept;
1238 wchar_t cmd_getc () THROW ((class out_of_input)); 1329 wchar_t cmd_getc ();
1239 uint32_t next_octet () NOTHROW; 1330 uint32_t next_octet () noexcept;
1240 uint32_t cmd_get8 () THROW ((class out_of_input)); 1331 uint32_t cmd_get8 ();
1241 1332
1242 void cmd_parse (); 1333 void cmd_parse ();
1243 void mouse_report (XButtonEvent &ev); 1334 void mouse_report (XButtonEvent &ev);
1244 void button_press (XButtonEvent &ev); 1335 void button_press (XButtonEvent &ev);
1245 void button_release (XButtonEvent &ev); 1336 void button_release (XButtonEvent &ev);
1248#if ENABLE_FRILLS 1339#if ENABLE_FRILLS
1249 void set_urgency (bool enable); 1340 void set_urgency (bool enable);
1250#else 1341#else
1251 void set_urgency (bool enable) { } 1342 void set_urgency (bool enable) { }
1252#endif 1343#endif
1253 void update_fade_color (unsigned int idx); 1344 void update_fade_color (unsigned int idx, bool first_time = false);
1254#ifdef PRINTPIPE 1345#ifdef PRINTPIPE
1255 FILE *popen_printer (); 1346 FILE *popen_printer ();
1256 int pclose_printer (FILE *stream); 1347 int pclose_printer (FILE *stream);
1257#endif 1348#endif
1258 void process_print_pipe (); 1349 void process_print_pipe ();
1264 char *get_to_st (unicode_t &ends_how); 1355 char *get_to_st (unicode_t &ends_how);
1265 void process_dcs_seq (); 1356 void process_dcs_seq ();
1266 void process_osc_seq (); 1357 void process_osc_seq ();
1267 void process_color_seq (int report, int color, const char *str, char resp); 1358 void process_color_seq (int report, int color, const char *str, char resp);
1268 void process_xterm_seq (int op, char *str, char resp); 1359 void process_xterm_seq (int op, char *str, char resp);
1360 unsigned int map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a);
1269 int privcases (int mode, unsigned long bit); 1361 int privcases (int mode, unsigned long bit);
1270 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1362 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1271 void process_sgr_mode (unsigned int nargs, const int *arg); 1363 void process_sgr_mode (unsigned int nargs, const int *arg);
1272 void process_graphics (); 1364 void set_cursor_style (int style);
1273 // init.C 1365 // init.C
1366 void init (stringvec *argv, stringvec *envv);
1367 void init (int argc, const char *const *argv, const char *const *envv);
1368 void init2 (int argc, const char *const *argv);
1274 void init_vars (); 1369 void init_vars ();
1275 const char **init_resources (int argc, const char *const *argv); 1370 const char **init_resources (int argc, const char *const *argv);
1276 void init (int argc, const char *const *argv, stringvec *envv);
1277 void init_env (); 1371 void init_env ();
1278 void set_locale (const char *locale); 1372 void set_locale (const char *locale);
1279 void init_xlocale (); 1373 void init_xlocale ();
1280 void init_command (const char *const *argv); 1374 void init_command (const char *const *argv);
1281 void run_command (const char *const *argv); 1375 void run_command (const char *const *argv);
1282 int run_child (const char *const *argv); 1376 int run_child (const char *const *argv);
1283 void color_aliases (int idx); 1377 void color_aliases (int idx);
1284 void create_windows (int argc, const char *const *argv); 1378 void create_windows (int argc, const char *const *argv);
1285 void get_colours (); 1379 void get_colors ();
1286 void get_ourmods (); 1380 void get_ourmods ();
1381 void set_icon (const char *file);
1287 // main.C 1382 // main.C
1288 void tt_winch (); 1383 void tt_winch ();
1289 rxvt_term (); 1384 rxvt_term ();
1290 ~rxvt_term (); 1385 ~rxvt_term ();
1291 void destroy (); 1386 void destroy ();
1292 void emergency_cleanup (); 1387 void emergency_cleanup ();
1293 void recolour_cursor (); 1388 void recolor_cursor ();
1294 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1389 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1295 void window_calc (unsigned int newwidth, unsigned int newheight); 1390 void window_calc (unsigned int newwidth, unsigned int newheight);
1296 bool set_fonts (); 1391 bool set_fonts ();
1297 void set_string_property (Atom prop, const char *str, int len = -1); 1392 void set_string_property (Atom prop, const char *str, int len = -1);
1393 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1298 void set_utf8_property (Atom prop, const char *str, int len = -1); 1394 void set_utf8_property (Atom prop, const char *str, int len = -1);
1299 void set_title (const char *str); 1395 void set_title (const char *str);
1300 void set_icon_name (const char *str); 1396 void set_icon_name (const char *str);
1301 void set_window_color (int idx, const char *color); 1397 void set_window_color (int idx, const char *color);
1302 void set_colorfgbg (); 1398 char *get_colorfgbg ();
1303 bool set_color (rxvt_color &color, const char *name); 1399 bool set_color (rxvt_color &color, const char *name);
1304 void alias_color (int dst, int src); 1400 void alias_color (int dst, int src);
1305 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1401 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1306 void get_window_origin (int &x, int &y); 1402 void get_window_origin (int &x, int &y);
1307 Pixmap get_pixmap_property (int prop_id);
1308 1403
1309 // screen.C 1404 // screen.C
1310 1405
1311 void lalloc (line_t &l) const 1406 bool option (uint8_t opt) const noexcept
1312 { 1407 {
1313 l.t = (text_t *)talloc->alloc (); 1408 return options[opt >> 3] & (1 << (opt & 7));
1314 l.r = (rend_t *)ralloc->alloc ();
1315 } 1409 }
1316 1410
1317#if 0 1411 void set_option (uint8_t opt, bool set = true) noexcept;
1318 void lfree (line_t &l)
1319 {
1320 talloc->free (l.t);
1321 ralloc->free (l.r);
1322 }
1323#endif
1324 1412
1325 void lresize (line_t &l) const
1326 {
1327 if (!l.t)
1328 return;
1329
1330 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1331 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1332
1333 l.l = min (l.l, ncol);
1334
1335 if (ncol > prev_ncol)
1336 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1337 }
1338
1339 int fgcolor_of (rend_t r) const NOTHROW 1413 int fgcolor_of (rend_t r) const noexcept
1340 { 1414 {
1341 int base = GET_BASEFG (r); 1415 int base = GET_BASEFG (r);
1342#ifndef NO_BRIGHTCOLOR 1416#ifndef NO_BRIGHTCOLOR
1343 if (r & RS_Bold 1417 if (r & RS_Bold
1344# if ENABLE_STYLES 1418# if ENABLE_STYLES
1345 && option (Opt_intensityStyles) 1419 && option (Opt_intensityStyles)
1346# endif 1420# endif
1347 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1421 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1348 base += minBrightCOLOR - minCOLOR; 1422 base += minBrightCOLOR - minCOLOR;
1349#endif 1423#endif
1350 return base; 1424 return base;
1351 } 1425 }
1352 1426
1353 int bgcolor_of (rend_t r) const NOTHROW 1427 int bgcolor_of (rend_t r) const noexcept
1354 { 1428 {
1355 int base = GET_BASEBG (r); 1429 int base = GET_BASEBG (r);
1356#ifndef NO_BRIGHTCOLOR 1430#ifndef NO_BRIGHTCOLOR
1357 if (r & RS_Blink 1431 if (r & RS_Blink
1358# if ENABLE_STYLES 1432# if ENABLE_STYLES
1359 && option (Opt_intensityStyles) 1433 && option (Opt_intensityStyles)
1360# endif 1434# endif
1361 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1435 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1362 base += minBrightCOLOR - minCOLOR; 1436 base += minBrightCOLOR - minCOLOR;
1363#endif 1437#endif
1364 return base; 1438 return base;
1365 } 1439 }
1366 1440
1367 bool option (uint8_t opt) const NOTHROW 1441 // modifies first argument(!)
1442 void tt_paste (char *data, unsigned int len) noexcept;
1443 void paste (char *data, unsigned int len) noexcept;
1444 void scr_alloc () noexcept;
1445 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept;
1446 void scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept;
1447 void scr_kill_char (line_t &l, int col) const noexcept;
1448 void scr_set_char_rend (line_t &l, int col, rend_t rend);
1449 int scr_scroll_text (int row1, int row2, int count) noexcept;
1450 void copy_line (line_t &dst, line_t &src);
1451 void scr_reset ();
1452 void scr_release () noexcept;
1453 void scr_clear (bool really = false) noexcept;
1454 void scr_refresh () noexcept;
1455 bool scr_refresh_rend (rend_t mask, rend_t value) noexcept;
1456 void scr_erase_screen (int mode) noexcept;
1457#if ENABLE_FRILLS
1458 void scr_erase_savelines () noexcept;
1459 void scr_backindex () noexcept;
1460 void scr_forwardindex () noexcept;
1461#endif
1462 void scr_touch (bool refresh) noexcept;
1463 void scr_expose (int x, int y, int width, int height, bool refresh) noexcept;
1464 void scr_recolor (bool refresh = true) noexcept;
1465 void scr_remap_chars () noexcept;
1466 void scr_remap_chars (line_t &l) noexcept;
1467
1468 enum cursor_mode { SAVE, RESTORE };
1469
1470 void scr_poweron ();
1471 void scr_soft_reset () noexcept;
1472 void scr_cursor (cursor_mode mode) noexcept;
1473 void scr_do_wrap () noexcept;
1474 void scr_swap_screen () noexcept;
1475 void scr_change_screen (int scrn);
1476 void scr_color (unsigned int color, int fgbg) noexcept;
1477 void scr_rendition (int set, int style) noexcept;
1478 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) noexcept;
1479 void scr_backspace () noexcept;
1480 void scr_tab (int count, bool ht = false) noexcept;
1481 void scr_gotorc (int row, int col, int relative) noexcept;
1482 void scr_index (enum page_dirn direction) noexcept;
1483 void scr_erase_line (int mode) noexcept;
1484 void scr_E () noexcept;
1485 void scr_insdel_lines (int count, int insdel) noexcept;
1486 void scr_insdel_chars (int count, int insdel) noexcept;
1487 void scr_scroll_region (int top, int bot) noexcept;
1488 void scr_cursor_visible (int mode) noexcept;
1489 void scr_autowrap (int mode) noexcept;
1490 void scr_relative_origin (int mode) noexcept;
1491 void scr_insert_mode (int mode) noexcept;
1492 void scr_set_tab (int mode) noexcept;
1493 void scr_rvideo_mode (bool on) noexcept;
1494 void scr_report_position () noexcept;
1495 void set_font_style () noexcept;
1496 void scr_charset_choose (int set) noexcept;
1497 void scr_charset_set (int set, unsigned int ch) noexcept;
1498 void scr_move_to (int y, int len) noexcept;
1499 bool scr_page (int nlines) noexcept;
1500 bool scr_page (enum page_dirn direction, int nlines) noexcept
1368 { 1501 {
1369 if (!opt) 1502 return scr_page (direction * nlines);
1370 return 0;
1371
1372 --opt;
1373 return options[opt >> 3] & (1 << (opt & 7));
1374 } 1503 }
1375
1376 void set_option (uint8_t opt, bool set = true) NOTHROW
1377 {
1378 if (!opt)
1379 return;
1380
1381 --opt;
1382 if (set)
1383 options[opt >> 3] |= (1 << (opt & 7));
1384 else
1385 options[opt >> 3] &= ~(1 << (opt & 7));
1386 }
1387
1388 void set_privmode (unsigned bit, int set) NOTHROW
1389 {
1390 if (set)
1391 priv_modes |= bit;
1392 else
1393 priv_modes &= ~bit;
1394 }
1395
1396 // modifies first argument(!)
1397 void paste (char *data, unsigned int len) NOTHROW;
1398 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1399 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1400 void scr_kill_char (line_t &l, int col) const NOTHROW;
1401 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1402 void scr_reset ();
1403 void scr_release () NOTHROW;
1404 void scr_clear (bool really = false) NOTHROW;
1405 void scr_refresh () NOTHROW;
1406 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1407 void scr_erase_screen (int mode) NOTHROW;
1408#if ENABLE_FRILLS
1409 void scr_erase_savelines () NOTHROW;
1410 void scr_backindex () NOTHROW;
1411 void scr_forwardindex () NOTHROW;
1412#endif
1413 void scr_touch (bool refresh) NOTHROW;
1414 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1415 void scr_recolour () NOTHROW;
1416 void scr_remap_chars () NOTHROW;
1417 void scr_remap_chars (line_t &l) NOTHROW;
1418
1419 enum cursor_mode { SAVE, RESTORE };
1420
1421 void scr_poweron ();
1422 void scr_soft_reset () NOTHROW;
1423 void scr_cursor (cursor_mode mode) NOTHROW;
1424 void scr_do_wrap () NOTHROW;
1425 void scr_swap_screen () NOTHROW;
1426 void scr_change_screen (int scrn);
1427 void scr_color (unsigned int color, int fgbg) NOTHROW;
1428 void scr_rendition (int set, int style) NOTHROW;
1429 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1430 void scr_backspace () NOTHROW;
1431 void scr_tab (int count, bool ht = false) NOTHROW;
1432 void scr_gotorc (int row, int col, int relative) NOTHROW;
1433 void scr_index (enum page_dirn direction) NOTHROW;
1434 void scr_erase_line (int mode) NOTHROW;
1435 void scr_E () NOTHROW;
1436 void scr_insdel_lines (int count, int insdel) NOTHROW;
1437 void scr_insdel_chars (int count, int insdel) NOTHROW;
1438 void scr_scroll_region (int top, int bot) NOTHROW;
1439 void scr_cursor_visible (int mode) NOTHROW;
1440 void scr_autowrap (int mode) NOTHROW;
1441 void scr_relative_origin (int mode) NOTHROW;
1442 void scr_insert_mode (int mode) NOTHROW;
1443 void scr_set_tab (int mode) NOTHROW;
1444 void scr_rvideo_mode (bool on) NOTHROW;
1445 void scr_report_position () NOTHROW;
1446 void set_font_style () NOTHROW;
1447 void scr_charset_choose (int set) NOTHROW;
1448 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1449 void scr_move_to (int y, int len) NOTHROW;
1450 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1451 bool scr_changeview (int new_view_start) NOTHROW; 1504 bool scr_changeview (int new_view_start) noexcept;
1452 void scr_bell () NOTHROW; 1505 void scr_bell () noexcept;
1453 void scr_printscreen (int fullhist) NOTHROW; 1506 void scr_printscreen (int fullhist) noexcept;
1454 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW; 1507 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept;
1455 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1508 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept;
1456 void scr_reverse_selection () NOTHROW; 1509 void scr_reverse_selection () noexcept;
1457 void scr_dump (int fd) NOTHROW; 1510 void scr_dump (int fd) noexcept;
1458 1511
1459 void selection_check (int check_more) NOTHROW; 1512 void selection_check (int check_more) noexcept;
1460 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1513 void selection_changed () noexcept; /* sets want_refresh, corrects coordinates */
1461 void selection_property (Window win, Atom prop) NOTHROW;
1462 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1514 void selection_request (Time tm, int selnum = Sel_Primary) noexcept;
1463 int selection_request_other (Atom target, int selnum) NOTHROW;
1464 void selection_clear (bool clipboard = false) NOTHROW; 1515 void selection_clear (bool clipboard = false) noexcept;
1465 void clipboard_copy (Time tm);
1466 void selection_make (Time tm); 1516 void selection_make (Time tm);
1467 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1517 bool selection_grab (Time tm, bool clipboard = false) noexcept;
1468 void selection_start_colrow (int col, int row) NOTHROW; 1518 void selection_start_colrow (int col, int row) noexcept;
1469 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1519 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept;
1470 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1520 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept;
1471 void selection_remove_trailing_spaces () NOTHROW; 1521 void selection_remove_trailing_spaces () noexcept;
1472 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1522 void selection_send (const XSelectionRequestEvent &rq) noexcept;
1473 void selection_click (int clicks, int x, int y) NOTHROW; 1523 void selection_click (int clicks, int x, int y) noexcept;
1474 void selection_extend (int x, int y, int flag) NOTHROW; 1524 void selection_extend (int x, int y, int flag) noexcept;
1475 void selection_rotate (int x, int y) NOTHROW; 1525 void selection_rotate (int x, int y) noexcept;
1476 1526
1477 // xdefaults.C 1527 // xdefaults.C
1528 void rxvt_usage (int type);
1478 void get_options (int argc, const char *const *argv); 1529 const char **get_options (int argc, const char *const *argv);
1530 int parse_keysym (const char *str, unsigned int &state);
1479 int parse_keysym (const char *str, const char *arg); 1531 int bind_action (const char *str, const char *arg);
1480 const char *x_resource (const char *name); 1532 const char *x_resource (const char *name);
1481 void extract_resources (); 1533 void extract_resources ();
1534 void enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p = 0, const char *class_p = 0);
1535 void enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
1536 {
1537 enumerate_resources (cb, "keysym", "Keysym");
1538 }
1539 void extract_keysym_resources ();
1482}; 1540};
1483 1541
1484#endif /* _RXVT_H_ */ 1542#endif /* _RXVT_H_ */
1485 1543

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines