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.528 by root, Fri Feb 21 18:07:15 2014 UTC vs.
Revision 1.564 by root, Sat Jun 19 09:47:41 2021 UTC

… …
45 45
46#include "feature.h" 46#include "feature.h"
47 47
48#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
49# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
51#endif 50#endif
52 51
53#if ENABLE_PERL 52#if ENABLE_PERL
54# define ENABLE_FRILLS 1 53# define ENABLE_FRILLS 1
55# define ENABLE_COMBINING 1 54# define ENABLE_COMBINING 1
… …
76#if HAVE_PIXBUF 75#if HAVE_PIXBUF
77# include <gdk-pixbuf/gdk-pixbuf.h> 76# include <gdk-pixbuf/gdk-pixbuf.h>
78#endif 77#endif
79 78
80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY) 79#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
81# define HAVE_BG_PIXMAP 1
82# define HAVE_IMG 1 80# define HAVE_IMG 1
83#endif 81#endif
84 82
85#if HAVE_BG_PIXMAP 83#define ECB_NO_THREADS 1
86# if HAVE_PIXBUF
87# define BG_IMAGE_FROM_FILE 1
88# endif
89# if ENABLE_TRANSPARENCY
90# define BG_IMAGE_FROM_ROOT 1
91# endif
92#endif
93
94#include <ecb.h> 84#include "ecb.h"
85
95#include "encoding.h" 86#include "encoding.h"
96#include "rxvtutil.h" 87#include "rxvtutil.h"
97#include "rxvtfont.h" 88#include "rxvtfont.h"
98#include "rxvttoolkit.h" 89#include "rxvttoolkit.h"
99#include "rxvtimg.h" 90#include "rxvtimg.h"
… …
144 * PROTOTYPES 135 * PROTOTYPES
145 ***************************************************************************** 136 *****************************************************************************
146 */ 137 */
147// main.C 138// main.C
148#define SET_LOCALE(locale) rxvt_set_locale (locale) 139#define SET_LOCALE(locale) rxvt_set_locale (locale)
149extern bool rxvt_set_locale (const char *locale) NOTHROW; 140extern bool rxvt_set_locale (const char *locale) noexcept;
150extern void rxvt_push_locale (const char *locale) NOTHROW; 141extern void rxvt_push_locale (const char *locale) noexcept;
151extern void rxvt_pop_locale () NOTHROW; 142extern void rxvt_pop_locale () noexcept;
152void rxvt_init (); 143void rxvt_init ();
153 144
154// misc.C 145// misc.C
155char * rxvt_wcstombs (const wchar_t *str, int len = -1); 146char * rxvt_wcstombs (const wchar_t *str, int len = -1);
156wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 147wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
157char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 148char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
158wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 149wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
159 150
160const char * rxvt_basename (const char *str) NOTHROW; 151const char * rxvt_basename (const char *str) noexcept;
161void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 152void rxvt_vlog (const char *fmt, va_list arg_ptr) noexcept;
162void rxvt_log (const char *fmt,...) NOTHROW; 153void rxvt_log (const char *fmt,...) noexcept;
163void rxvt_warn (const char *fmt,...) NOTHROW; 154void rxvt_warn (const char *fmt,...) noexcept;
164void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold; 155ecb_noreturn ecb_cold
165void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold; 156void rxvt_fatal (const char *fmt, ...);
157ecb_noreturn ecb_cold
158void rxvt_exit_failure ();
166 159
160void * rxvt_malloc (size_t size);
161void * rxvt_calloc (size_t number, size_t size);
162void * rxvt_realloc (void *ptr, size_t size);
163
167char * rxvt_strtrim (char *str) NOTHROW; 164char * rxvt_strtrim (char *str) noexcept;
168char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 165char ** rxvt_strsplit (char delim, const char *str) noexcept;
169 166
170static inline void 167static inline void
171rxvt_free_strsplit (char **ptr) NOTHROW 168rxvt_free_strsplit (char **ptr) noexcept
172{ 169{
173 free (ptr[0]); 170 free (ptr[0]);
174 free (ptr); 171 free (ptr);
175} 172}
176 173
177void * rxvt_malloc (size_t size); 174KeySym rxvt_XKeycodeToKeysym (Display *dpy, KeyCode keycode, int index);
178void * rxvt_calloc (size_t number, size_t size);
179void * rxvt_realloc (void *ptr, size_t size);
180 175
181///////////////////////////////////////////////////////////////////////////// 176/////////////////////////////////////////////////////////////////////////////
182 177
183// temporarily replace the process environment 178// temporarily replace the process environment
184extern char **environ; 179extern char **environ;
185extern char **rxvt_environ; // the original environ pointer 180extern char **rxvt_environ; // the original environ pointer
186
187static inline void
188set_environ (stringvec *envv)
189{
190#if ENABLE_PERL
191 assert (envv);
192#else
193 if (envv)
194#endif
195 environ = (char **)envv->begin ();
196}
197 181
198static inline void 182static inline void
199set_environ (char **envv) 183set_environ (char **envv)
200{ 184{
201#if ENABLE_PERL 185#if ENABLE_PERL
… …
219 ~localise_env () 203 ~localise_env ()
220 { 204 {
221 environ = orig_env; 205 environ = orig_env;
222 } 206 }
223}; 207};
224
225#ifdef HAVE_BG_PIXMAP
226struct image_effects
227{
228 bool tint_set;
229 rxvt_color tint;
230 int shade;
231 int h_blurRadius, v_blurRadius;
232
233 image_effects ()
234 {
235 tint_set =
236 h_blurRadius =
237 v_blurRadius = 0;
238 shade = 100;
239 }
240
241 bool need_tint ()
242 {
243 return shade != 100 || tint_set;
244 }
245
246 bool need_blur ()
247 {
248 return h_blurRadius && v_blurRadius;
249 }
250
251 bool set_tint (const rxvt_color &new_tint);
252 bool set_shade (const char *shade_str);
253 bool set_blur (const char *geom);
254};
255
256# if BG_IMAGE_FROM_FILE
257enum {
258 IM_IS_SIZE_SENSITIVE = 1 << 1,
259 IM_KEEP_ASPECT = 1 << 2,
260 IM_ROOT_ALIGN = 1 << 3,
261 IM_TILE = 1 << 4,
262 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
263};
264
265enum {
266 noScale = 0,
267 windowScale = 100,
268 defaultScale = windowScale,
269 centerAlign = 50,
270 defaultAlign = centerAlign,
271};
272
273struct rxvt_image : image_effects
274{
275 unsigned short alpha;
276 uint8_t flags;
277 unsigned int h_scale, v_scale; /* percents of the window size */
278 int h_align, v_align; /* percents of the window size:
279 0 - left align, 50 - center, 100 - right */
280
281 bool is_size_sensitive ()
282 {
283 return (!(flags & IM_TILE)
284 || h_scale || v_scale
285 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
286 }
287
288 rxvt_img *img;
289
290 void destroy ()
291 {
292 delete img;
293 img = 0;
294 }
295
296 rxvt_image ();
297 void set_file_geometry (rxvt_screen *s, const char *file);
298 void set_file (rxvt_screen *s, const char *file);
299 bool set_geometry (const char *geom, bool update = false);
300};
301# endif
302#endif
303 208
304/* 209/*
305 ***************************************************************************** 210 *****************************************************************************
306 * STRUCTURES AND TYPEDEFS 211 * STRUCTURES AND TYPEDEFS
307 ***************************************************************************** 212 *****************************************************************************
… …
350 ***************************************************************************** 255 *****************************************************************************
351 */ 256 */
352 257
353/* COLORTERM, TERM environment variables */ 258/* COLORTERM, TERM environment variables */
354#define COLORTERMENV "rxvt" 259#define COLORTERMENV "rxvt"
355#if BG_IMAGE_FROM_FILE 260#if HAVE_IMG
356# define COLORTERMENVFULL COLORTERMENV "-xpm" 261# define COLORTERMENVFULL COLORTERMENV "-xpm"
357#else 262#else
358# define COLORTERMENVFULL COLORTERMENV 263# define COLORTERMENVFULL COLORTERMENV
359#endif 264#endif
360#ifndef TERMENV 265#ifndef TERMENV
… …
362# define TERMENV "rxvt-unicode-256color" 267# define TERMENV "rxvt-unicode-256color"
363# else 268# else
364# define TERMENV "rxvt-unicode" 269# define TERMENV "rxvt-unicode"
365# endif 270# endif
366#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)
367 289
368#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 290#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
369# define NO_MOUSE_REPORT_SCROLLBAR 1 291# define NO_MOUSE_REPORT_SCROLLBAR 1
370#endif 292#endif
371 293
… …
501 423
502 // deprecated 424 // deprecated
503 Rxvt_restoreFG = 39, 425 Rxvt_restoreFG = 39,
504 Rxvt_restoreBG = 49, 426 Rxvt_restoreBG = 49,
505 427
506 Rxvt_Pixmap = 20, // new bg pixmap
507 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 428 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
508 429
509 URxvt_locale = 701, // change locale 430 URxvt_locale = 701, // change locale
510 URxvt_version = 702, // request version 431 URxvt_version = 702, // request version
511 432
512 URxvt_Color_IT = 704, // change actual 'Italic' colour 433 URxvt_Color_IT = 704, // change actual 'Italic' colour
513 URxvt_Color_tint = 705, // change actual tint colour
514 URxvt_Color_BD = 706, // change actual 'Bold' color 434 URxvt_Color_BD = 706, // change actual 'Bold' color
515 URxvt_Color_UL = 707, // change actual 'Underline' color 435 URxvt_Color_UL = 707, // change actual 'Underline' color
516 URxvt_Color_border = 708, 436 URxvt_Color_border = 708,
517 437
518 URxvt_font = 710, 438 URxvt_font = 710,
… …
566#if USE_256_COLORS 486#if USE_256_COLORS
567 maxTermCOLOR = Color_White + 240, 487 maxTermCOLOR = Color_White + 240,
568#else 488#else
569 maxTermCOLOR = Color_White + 72, 489 maxTermCOLOR = Color_White + 72,
570#endif 490#endif
491 minTermCOLOR24,
492 maxTermCOLOR24 = minTermCOLOR24 +
493 RGB24_CUBE_SIZE - 1,
571#ifndef NO_CURSORCOLOR 494#ifndef NO_CURSORCOLOR
572 Color_cursor, 495 Color_cursor,
573 Color_cursor2, 496 Color_cursor2,
574#endif 497#endif
575 Color_pointer_fg, 498 Color_pointer_fg,
… …
590#endif 513#endif
591 Color_scroll, 514 Color_scroll,
592#ifdef RXVT_SCROLLBAR 515#ifdef RXVT_SCROLLBAR
593 Color_trough, 516 Color_trough,
594#endif 517#endif
595#if BG_IMAGE_FROM_ROOT
596 Color_tint,
597#endif
598#if OFF_FOCUS_FADING 518#if OFF_FOCUS_FADING
599 Color_fade, 519 Color_fade,
600#endif 520#endif
601 NRS_COLORS, /* */ 521 NRS_COLORS, /* */
602#ifdef RXVT_SCROLLBAR 522#ifdef RXVT_SCROLLBAR
… …
607 TOTAL_COLORS = NRS_COLORS 527 TOTAL_COLORS = NRS_COLORS
608#endif 528#endif
609}; 529};
610 530
611#if USE_256_COLORS 531#if USE_256_COLORS
612# define Color_Bits 9 // 0 .. maxTermCOLOR 532# define Color_Bits 9 // 0 .. maxTermCOLOR24
613#else 533#else
614# define Color_Bits 7 // 0 .. maxTermCOLOR 534# define Color_Bits 8 // 0 .. maxTermCOLOR24
535#endif
536
537#if maxTermCOLOR24 >= (1 << Color_Bits)
538# error color index overflow
615#endif 539#endif
616 540
617/* 541/*
618 * Resource list 542 * Resource list
619 */ 543 */
… …
648#define PrivMode_vt52 (1UL<<18) 572#define PrivMode_vt52 (1UL<<18)
649#define PrivMode_LFNL (1UL<<19) 573#define PrivMode_LFNL (1UL<<19)
650#define PrivMode_MouseBtnEvent (1UL<<20) 574#define PrivMode_MouseBtnEvent (1UL<<20)
651#define PrivMode_MouseAnyEvent (1UL<<21) 575#define PrivMode_MouseAnyEvent (1UL<<21)
652#define PrivMode_BracketPaste (1UL<<22) 576#define PrivMode_BracketPaste (1UL<<22)
653#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack 577#define PrivMode_ExtMouseUTF8 (1UL<<23) // xterm pseudo-utf-8 hack
654#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales 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)
655 582
656#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)
657 584
658#ifdef ALLOW_132_MODE 585#ifdef ALLOW_132_MODE
659# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 586# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
745 672
746#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 673#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
747#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 674#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
748 675
749#define GET_ATTR(x) (((x) & RS_attrMask)) 676#define GET_ATTR(x) (((x) & RS_attrMask))
750// return attributes defining the background, encoding doesn't matter
751// depends on RS_fgShift > RS_bgShift
752#define GET_BGATTR(x) \
753 (ecb_unlikely ((x) & RS_RVid) \
754 ? (((x) & (RS_attrMask & ~RS_RVid)) \
755 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
756 : ((x) & (RS_attrMask | RS_bgMask)))
757#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 677#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
758#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 678#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
759#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 679#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
760 680
761#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 681#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
… …
849/****************************************************************************/ 769/****************************************************************************/
850 770
851#define UNICODE_MASK 0x1fffffUL 771#define UNICODE_MASK 0x1fffffUL
852 772
853#if UNICODE_3 773#if UNICODE_3
854# define COMPOSE_LO 0x40000000UL 774# define COMPOSE_LO 0x110000UL
855# define COMPOSE_HI 0x400fffffUL 775# define COMPOSE_HI 0x1fffffUL
856# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 776# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
857#else 777#else
858# if ENABLE_PERL 778# if ENABLE_PERL
859# 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
860# 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
… …
869// compose chars are used to represent composite characters 789// compose chars are used to represent composite characters
870// that are not representable in unicode, as well as characters 790// that are not representable in unicode, as well as characters
871// not fitting in the BMP. 791// not fitting in the BMP.
872struct compose_char 792struct compose_char
873{ 793{
874 unicode_t c1, c2; // any chars != NOCHAR are valid 794 // c1 can be any character != NOCHAR, including another compose character
875 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4) 795 // c2 must always be a zero-width character or NOCHAR, in case
876 compose_char () = default; 796 // this just extends beyond the BMP.
877 #endif 797 unicode_t c1, c2;
798
878 compose_char (unicode_t c1, unicode_t c2) 799 compose_char (unicode_t c1, unicode_t c2)
879 : c1(c1), c2(c2) 800 : c1(c1), c2(c2)
880 { } 801 { }
881}; 802};
882 803
883class rxvt_composite_vec 804struct rxvt_composite_vec
884{ 805{
885 vector<compose_char> v; 806 vector<compose_char> v;
886public: 807
887 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 808 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
888 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); }
889 compose_char *operator [](text_t c) 811 compose_char *operator [](text_t c)
890 { 812 {
891 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size () 813 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
892 ? &v[c - COMPOSE_LO] 814 ? &v[c - COMPOSE_LO]
893 : 0; 815 : 0;
894 } 816 }
895}; 817};
896 818
897extern class rxvt_composite_vec rxvt_composite; 819extern class rxvt_composite_vec rxvt_composite;
820#endif
821
822#if 0
823// expand the sequence into a static array
824// works even without ENABLE_COMBINING
825template<typename T, int max_size_ = 48>
826struct rxvt_compose_expand_static
827{
828#if ENABLE_COMBINING
829 enum { max_size = max_size_ };
830
831 T chrs[max_size];
832
833 // expand sequence and return start ptr
834 // guarantees at least one output
835 // get the length with length () on that ptr
836 T *operator ()(unicode_t c)
837 {
838 T *cur = chrs + max_size;
839
840 while (ecb_expect_false (IS_COMPOSE (c)))
841 if (ecb_expect_true (c - COMPOSE_LO < rxvt_composite.v.size ()))
842 {
843 compose_char *cc = &rxvt_composite.v [c - COMPOSE_LO];
844
845 if (cc->c2 != NOCHAR)
846 {
847 cur -= cur > chrs; *cur = cc->c2;
848 }
849
850 c = cc->c1;
851 }
852 else
853 c = NOCHAR;
854
855 cur -= cur > chrs; *cur = c;
856
857 return cur;
858 }
859
860 int length (T *first)
861 {
862 return chrs + max_size - first;
863 }
864#else
865 T chr;
866
867 T *operator ()(text_t c);
868 {
869 chr = c;
870 return &chr;
871 }
872
873 int length (T *first)
874 {
875 return 1;
876 }
877#endif
878};
898#endif 879#endif
899 880
900/****************************************************************************/ 881/****************************************************************************/
901 882
902#ifdef KEYSYM_RESOURCE 883#ifdef KEYSYM_RESOURCE
… …
1162 mouse_row, 1143 mouse_row,
1163 mouse_col, 1144 mouse_col,
1164# ifdef POINTER_BLANK 1145# ifdef POINTER_BLANK
1165 pointerBlankDelay, 1146 pointerBlankDelay,
1166# endif 1147# endif
1148 multiClickTime,
1149 cursor_type,
1167 allowedxerror; 1150 allowedxerror;
1168/* ---------- */ 1151/* ---------- */
1169 unsigned int ModLevel3Mask, 1152 unsigned int ModLevel3Mask,
1170 ModMetaMask, 1153 ModMetaMask,
1171 ModNumLockMask; 1154 ModNumLockMask;
… …
1182 struct mouse_event MEvent; 1165 struct mouse_event MEvent;
1183 XComposeStatus compose; 1166 XComposeStatus compose;
1184 static struct termios def_tio; 1167 static struct termios def_tio;
1185 row_col_t oldcursor; 1168 row_col_t oldcursor;
1186 1169
1187#ifdef HAVE_BG_PIXMAP
1188 void bg_init ();
1189 void bg_destroy ();
1190
1191# if BG_IMAGE_FROM_FILE
1192 rxvt_image fimage;
1193 void render_image (rxvt_image &image);
1194# endif
1195
1196# if BG_IMAGE_FROM_ROOT
1197 rxvt_img *root_img;
1198 image_effects root_effects;
1199
1200 void render_root_image ();
1201# endif
1202
1203 ev_tstamp bg_valid_since;
1204
1205 bool bg_window_size_sensitive ();
1206 bool bg_window_position_sensitive ();
1207
1208 void bg_render ();
1209#endif
1210
1211#ifdef HAVE_IMG 1170#ifdef HAVE_IMG
1212 enum { 1171 enum {
1213 BG_IS_TRANSPARENT = 1 << 1, 1172 BG_IS_TRANSPARENT = 1 << 1,
1214 BG_NEEDS_REFRESH = 1 << 2, 1173 BG_NEEDS_REFRESH = 1 << 2,
1215 BG_INHIBIT_RENDER = 1 << 3,
1216 }; 1174 };
1217 1175
1218 uint8_t bg_flags; 1176 uint8_t bg_flags;
1219 1177
1220 rxvt_img *bg_img; 1178 rxvt_img *bg_img;
1221#endif 1179#endif
1222 1180
1223#if ENABLE_OVERLAY 1181#if ENABLE_OVERLAY
1224 overlay_base ov; 1182 overlay_base ov;
1225 1183
1226 void scr_swap_overlay () NOTHROW; 1184 void scr_swap_overlay () noexcept;
1227 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1185 void scr_overlay_new (int x, int y, int w, int h) noexcept;
1228 void scr_overlay_off () NOTHROW; 1186 void scr_overlay_off () noexcept;
1229 void scr_overlay_set (int x, int y, 1187 void scr_overlay_set (int x, int y,
1230 text_t text, 1188 text_t text,
1231 rend_t rend = OVERLAY_RSTYLE) NOTHROW; 1189 rend_t rend = OVERLAY_RSTYLE) noexcept;
1232 void scr_overlay_set (int x, int y, const char *s) NOTHROW; 1190 void scr_overlay_set (int x, int y, const char *s) noexcept;
1233 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1191 void scr_overlay_set (int x, int y, const wchar_t *s) noexcept;
1234#endif 1192#endif
1235 1193
1236 vector<void *> allocated; // free these memory blocks with free() 1194 vector<void *> allocated; // free these memory blocks with free()
1237 1195
1238 int parent_x, parent_y; // parent window position relative to root, only updated on demand 1196 int parent_x, parent_y; // parent window position relative to root, only updated on demand
… …
1240 char *locale; 1198 char *locale;
1241 char charsets[4]; 1199 char charsets[4];
1242 char *v_buffer; /* pointer to physical buffer */ 1200 char *v_buffer; /* pointer to physical buffer */
1243 unsigned int v_buflen; /* size of area to write */ 1201 unsigned int v_buflen; /* size of area to write */
1244 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1202 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1203 char **env;
1245 1204
1246#ifdef KEYSYM_RESOURCE 1205#ifdef KEYSYM_RESOURCE
1247 keyboard_manager *keyboard; 1206 keyboard_manager *keyboard;
1248#endif 1207#endif
1249#ifndef NO_RESOURCES 1208#ifndef NO_RESOURCES
… …
1259 1218
1260 // chunk contains all line_t's as well as rend_t and text_t buffers 1219 // chunk contains all line_t's as well as rend_t and text_t buffers
1261 // for drawn_buf, swap_buf and row_buf, in this order 1220 // for drawn_buf, swap_buf and row_buf, in this order
1262 void *chunk; 1221 void *chunk;
1263 size_t chunk_size; 1222 size_t chunk_size;
1223
1224 uint32_t rgb24_color[RGB24_CUBE_SIZE]; // the 24-bit color value
1225 uint16_t rgb24_seqno[RGB24_CUBE_SIZE]; // which one is older?
1226 uint16_t rgb24_sequence;
1264 1227
1265 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1228 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1266 1229
1267#if ENABLE_FRILLS || ISO_14755 1230#if ENABLE_FRILLS || ISO_14755
1268 // ISO 14755 entry support 1231 // ISO 14755 entry support
… …
1274# endif 1237# endif
1275#endif 1238#endif
1276 1239
1277 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1240 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1278 1241
1279 void vt_select_input () const NOTHROW 1242 void vt_select_input () const noexcept
1280 { 1243 {
1281 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1244 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1282 } 1245 }
1283 1246
1284#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1247#if ENABLE_PERL
1285 void rootwin_cb (XEvent &xev); 1248 void rootwin_cb (XEvent &xev);
1286 xevent_watcher rootwin_ev; 1249 xevent_watcher rootwin_ev;
1287#endif
1288#ifdef HAVE_BG_PIXMAP
1289 void update_background ();
1290 void update_background_cb (ev::timer &w, int revents);
1291 ev::timer update_background_ev;
1292#endif 1250#endif
1293 1251
1294 void x_cb (XEvent &xev); 1252 void x_cb (XEvent &xev);
1295 xevent_watcher termwin_ev; 1253 xevent_watcher termwin_ev;
1296 xevent_watcher vt_ev; 1254 xevent_watcher vt_ev;
… …
1332 void pointer_blank (); 1290 void pointer_blank ();
1333#endif 1291#endif
1334 void pointer_unblank (); 1292 void pointer_unblank ();
1335 1293
1336 void tt_printf (const char *fmt,...); 1294 void tt_printf (const char *fmt,...);
1295 void tt_write_ (const char *data, unsigned int len);
1337 void tt_write (const char *data, unsigned int len); 1296 void tt_write (const char *data, unsigned int len);
1297 void tt_write_user_input (const char *data, unsigned int len);
1338 void pty_write (); 1298 void pty_write ();
1339 1299
1340 void make_current () const // make this the "currently active" urxvt instance 1300 void make_current () const // make this the "currently active" urxvt instance
1341 { 1301 {
1342 SET_R (this); 1302 SET_R (this);
1343 set_environ (envv); 1303 set_environ (env);
1344 rxvt_set_locale (locale); 1304 rxvt_set_locale (locale);
1345 } 1305 }
1346 1306
1347#if USE_XIM 1307#if USE_XIM
1348 rxvt_xim *input_method; 1308 rxvt_xim *input_method;
… …
1351 XPoint spot; // most recently sent spot position 1311 XPoint spot; // most recently sent spot position
1352 1312
1353 void im_destroy (); 1313 void im_destroy ();
1354 void im_cb (); im_watcher im_ev; 1314 void im_cb (); im_watcher im_ev;
1355 void im_set_size (XRectangle &size); 1315 void im_set_size (XRectangle &size);
1356 void im_set_position (XPoint &pos) NOTHROW; 1316 void im_set_position (XPoint &pos) noexcept;
1357 void im_set_color (unsigned long &fg, unsigned long &bg); 1317 void im_set_color (unsigned long &fg, unsigned long &bg);
1358 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1318 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1359 1319
1360 bool im_is_running (); 1320 bool im_is_running ();
1361 void im_send_spot (); 1321 void im_send_spot ();
… …
1365 1325
1366 // command.C 1326 // command.C
1367 void key_press (XKeyEvent &ev); 1327 void key_press (XKeyEvent &ev);
1368 void key_release (XKeyEvent &ev); 1328 void key_release (XKeyEvent &ev);
1369 1329
1370 wchar_t next_char () NOTHROW; 1330 wchar_t next_char () noexcept;
1371 wchar_t cmd_getc () THROW ((class out_of_input)); 1331 wchar_t cmd_getc ();
1372 uint32_t next_octet () NOTHROW; 1332 uint32_t next_octet () noexcept;
1373 uint32_t cmd_get8 () THROW ((class out_of_input)); 1333 uint32_t cmd_get8 ();
1374 1334
1375 void cmd_parse (); 1335 void cmd_parse ();
1376 void mouse_report (XButtonEvent &ev); 1336 void mouse_report (XButtonEvent &ev);
1377 void button_press (XButtonEvent &ev); 1337 void button_press (XButtonEvent &ev);
1378 void button_release (XButtonEvent &ev); 1338 void button_release (XButtonEvent &ev);
… …
1381#if ENABLE_FRILLS 1341#if ENABLE_FRILLS
1382 void set_urgency (bool enable); 1342 void set_urgency (bool enable);
1383#else 1343#else
1384 void set_urgency (bool enable) { } 1344 void set_urgency (bool enable) { }
1385#endif 1345#endif
1386 void update_fade_color (unsigned int idx); 1346 void update_fade_color (unsigned int idx, bool first_time = false);
1387#ifdef PRINTPIPE 1347#ifdef PRINTPIPE
1388 FILE *popen_printer (); 1348 FILE *popen_printer ();
1389 int pclose_printer (FILE *stream); 1349 int pclose_printer (FILE *stream);
1390#endif 1350#endif
1391 void process_print_pipe (); 1351 void process_print_pipe ();
… …
1397 char *get_to_st (unicode_t &ends_how); 1357 char *get_to_st (unicode_t &ends_how);
1398 void process_dcs_seq (); 1358 void process_dcs_seq ();
1399 void process_osc_seq (); 1359 void process_osc_seq ();
1400 void process_color_seq (int report, int color, const char *str, char resp); 1360 void process_color_seq (int report, int color, const char *str, char resp);
1401 void process_xterm_seq (int op, char *str, char resp); 1361 void process_xterm_seq (int op, char *str, char resp);
1362 unsigned int map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a);
1402 int privcases (int mode, unsigned long bit); 1363 int privcases (int mode, unsigned long bit);
1403 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1364 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1404 void process_sgr_mode (unsigned int nargs, const int *arg); 1365 void process_sgr_mode (unsigned int nargs, const int *arg);
1405 void set_cursor_style (int style); 1366 void set_cursor_style (int style);
1406 // init.C 1367 // init.C
… …
1415 void init_command (const char *const *argv); 1376 void init_command (const char *const *argv);
1416 void run_command (const char *const *argv); 1377 void run_command (const char *const *argv);
1417 int run_child (const char *const *argv); 1378 int run_child (const char *const *argv);
1418 void color_aliases (int idx); 1379 void color_aliases (int idx);
1419 void create_windows (int argc, const char *const *argv); 1380 void create_windows (int argc, const char *const *argv);
1420 void get_colours (); 1381 void get_colors ();
1421 void get_ourmods (); 1382 void get_ourmods ();
1422 void set_icon (const char *file); 1383 void set_icon (const char *file);
1423 // main.C 1384 // main.C
1424 void tt_winch (); 1385 void tt_winch ();
1425 rxvt_term (); 1386 rxvt_term ();
1426 ~rxvt_term (); 1387 ~rxvt_term ();
1427 void destroy (); 1388 void destroy ();
1428 void emergency_cleanup (); 1389 void emergency_cleanup ();
1429 void recolour_cursor (); 1390 void recolor_cursor ();
1430 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1391 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1431 void window_calc (unsigned int newwidth, unsigned int newheight); 1392 void window_calc (unsigned int newwidth, unsigned int newheight);
1432 bool set_fonts (); 1393 bool set_fonts ();
1433 void set_string_property (Atom prop, const char *str, int len = -1); 1394 void set_string_property (Atom prop, const char *str, int len = -1);
1434 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1395 void set_mbstring_property (Atom prop, const char *str, int len = -1);
… …
1442 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1403 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1443 void get_window_origin (int &x, int &y); 1404 void get_window_origin (int &x, int &y);
1444 1405
1445 // screen.C 1406 // screen.C
1446 1407
1447 bool option (uint8_t opt) const NOTHROW 1408 bool option (uint8_t opt) const noexcept
1448 { 1409 {
1449 return options[opt >> 3] & (1 << (opt & 7)); 1410 return options[opt >> 3] & (1 << (opt & 7));
1450 } 1411 }
1451 1412
1452 void set_option (uint8_t opt, bool set = true) NOTHROW; 1413 void set_option (uint8_t opt, bool set = true) noexcept;
1453 1414
1454 int fgcolor_of (rend_t r) const NOTHROW 1415 int fgcolor_of (rend_t r) const noexcept
1455 { 1416 {
1456 int base = GET_BASEFG (r); 1417 int base = GET_BASEFG (r);
1457#ifndef NO_BRIGHTCOLOR 1418#ifndef NO_BRIGHTCOLOR
1458 if (r & RS_Bold 1419 if (r & RS_Bold
1459# if ENABLE_STYLES 1420# if ENABLE_STYLES
… …
1463 base += minBrightCOLOR - minCOLOR; 1424 base += minBrightCOLOR - minCOLOR;
1464#endif 1425#endif
1465 return base; 1426 return base;
1466 } 1427 }
1467 1428
1468 int bgcolor_of (rend_t r) const NOTHROW 1429 int bgcolor_of (rend_t r) const noexcept
1469 { 1430 {
1470 int base = GET_BASEBG (r); 1431 int base = GET_BASEBG (r);
1471#ifndef NO_BRIGHTCOLOR 1432#ifndef NO_BRIGHTCOLOR
1472 if (r & RS_Blink 1433 if (r & RS_Blink
1473# if ENABLE_STYLES 1434# if ENABLE_STYLES
… …
1478#endif 1439#endif
1479 return base; 1440 return base;
1480 } 1441 }
1481 1442
1482 // modifies first argument(!) 1443 // modifies first argument(!)
1483 void tt_paste (char *data, unsigned int len) NOTHROW; 1444 void tt_paste (char *data, unsigned int len) noexcept;
1484 void paste (char *data, unsigned int len) NOTHROW; 1445 void paste (char *data, unsigned int len) noexcept;
1485 void scr_alloc () NOTHROW; 1446 void scr_alloc () noexcept;
1486 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1447 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const noexcept;
1487 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1448 void scr_blank_screen_mem (line_t &l, rend_t efs) const noexcept;
1488 void scr_kill_char (line_t &l, int col) const NOTHROW; 1449 void scr_kill_char (line_t &l, int col) const noexcept;
1489 void scr_set_char_rend (line_t &l, int col, rend_t rend); 1450 void scr_set_char_rend (line_t &l, int col, rend_t rend);
1490 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1451 int scr_scroll_text (int row1, int row2, int count) noexcept;
1491 void copy_line (line_t &dst, line_t &src); 1452 void copy_line (line_t &dst, line_t &src);
1492 void scr_reset (); 1453 void scr_reset ();
1493 void scr_release () NOTHROW; 1454 void scr_release () noexcept;
1494 void scr_clear (bool really = false) NOTHROW; 1455 void scr_clear (bool really = false) noexcept;
1495 void scr_refresh () NOTHROW; 1456 void scr_refresh () noexcept;
1496 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1457 bool scr_refresh_rend (rend_t mask, rend_t value) noexcept;
1497 void scr_erase_screen (int mode) NOTHROW; 1458 void scr_erase_screen (int mode) noexcept;
1498#if ENABLE_FRILLS 1459#if ENABLE_FRILLS
1499 void scr_erase_savelines () NOTHROW; 1460 void scr_erase_savelines () noexcept;
1500 void scr_backindex () NOTHROW; 1461 void scr_backindex () noexcept;
1501 void scr_forwardindex () NOTHROW; 1462 void scr_forwardindex () noexcept;
1502#endif 1463#endif
1503 void scr_touch (bool refresh) NOTHROW; 1464 void scr_touch (bool refresh) noexcept;
1504 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1465 void scr_expose (int x, int y, int width, int height, bool refresh) noexcept;
1505 void scr_recolour (bool refresh = true) NOTHROW; 1466 void scr_recolor (bool refresh = true) noexcept;
1506 void scr_remap_chars () NOTHROW; 1467 void scr_remap_chars () noexcept;
1507 void scr_remap_chars (line_t &l) NOTHROW; 1468 void scr_remap_chars (line_t &l) noexcept;
1508 1469
1509 enum cursor_mode { SAVE, RESTORE }; 1470 enum cursor_mode { SAVE, RESTORE };
1510 1471
1511 void scr_poweron (); 1472 void scr_poweron ();
1512 void scr_soft_reset () NOTHROW; 1473 void scr_soft_reset () noexcept;
1513 void scr_cursor (cursor_mode mode) NOTHROW; 1474 void scr_cursor (cursor_mode mode) noexcept;
1514 void scr_do_wrap () NOTHROW; 1475 void scr_do_wrap () noexcept;
1515 void scr_swap_screen () NOTHROW; 1476 void scr_swap_screen () noexcept;
1516 void scr_change_screen (int scrn); 1477 void scr_change_screen (int scrn);
1517 void scr_color (unsigned int color, int fgbg) NOTHROW; 1478 void scr_color (unsigned int color, int fgbg) noexcept;
1518 void scr_rendition (int set, int style) NOTHROW; 1479 void scr_rendition (int set, int style) noexcept;
1519 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1480 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) noexcept;
1520 void scr_backspace () NOTHROW; 1481 void scr_backspace () noexcept;
1521 void scr_tab (int count, bool ht = false) NOTHROW; 1482 void scr_tab (int count, bool ht = false) noexcept;
1522 void scr_gotorc (int row, int col, int relative) NOTHROW; 1483 void scr_gotorc (int row, int col, int relative) noexcept;
1523 void scr_index (enum page_dirn direction) NOTHROW; 1484 void scr_index (enum page_dirn direction) noexcept;
1524 void scr_erase_line (int mode) NOTHROW; 1485 void scr_erase_line (int mode) noexcept;
1525 void scr_E () NOTHROW; 1486 void scr_E () noexcept;
1526 void scr_insdel_lines (int count, int insdel) NOTHROW; 1487 void scr_insdel_lines (int count, int insdel) noexcept;
1527 void scr_insdel_chars (int count, int insdel) NOTHROW; 1488 void scr_insdel_chars (int count, int insdel) noexcept;
1528 void scr_scroll_region (int top, int bot) NOTHROW; 1489 void scr_scroll_region (int top, int bot) noexcept;
1529 void scr_cursor_visible (int mode) NOTHROW; 1490 void scr_cursor_visible (int mode) noexcept;
1530 void scr_autowrap (int mode) NOTHROW; 1491 void scr_autowrap (int mode) noexcept;
1531 void scr_relative_origin (int mode) NOTHROW; 1492 void scr_relative_origin (int mode) noexcept;
1532 void scr_insert_mode (int mode) NOTHROW; 1493 void scr_insert_mode (int mode) noexcept;
1533 void scr_set_tab (int mode) NOTHROW; 1494 void scr_set_tab (int mode) noexcept;
1534 void scr_rvideo_mode (bool on) NOTHROW; 1495 void scr_rvideo_mode (bool on) noexcept;
1535 void scr_report_position () NOTHROW; 1496 void scr_report_position () noexcept;
1536 void set_font_style () NOTHROW; 1497 void set_font_style () noexcept;
1537 void scr_charset_choose (int set) NOTHROW; 1498 void scr_charset_choose (int set) noexcept;
1538 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1499 void scr_charset_set (int set, unsigned int ch) noexcept;
1539 void scr_move_to (int y, int len) NOTHROW; 1500 void scr_move_to (int y, int len) noexcept;
1540 bool scr_page (int nlines) NOTHROW; 1501 bool scr_page (int nlines) noexcept;
1541 bool scr_page (enum page_dirn direction, int nlines) NOTHROW 1502 bool scr_page (enum page_dirn direction, int nlines) noexcept
1542 { 1503 {
1543 return scr_page (direction * nlines); 1504 return scr_page (direction * nlines);
1544 } 1505 }
1545 bool scr_changeview (int new_view_start) NOTHROW; 1506 bool scr_changeview (int new_view_start) noexcept;
1546 void scr_bell () NOTHROW; 1507 void scr_bell () noexcept;
1547 void scr_printscreen (int fullhist) NOTHROW; 1508 void scr_printscreen (int fullhist) noexcept;
1548 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW; 1509 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) noexcept;
1549 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1510 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) noexcept;
1550 void scr_reverse_selection () NOTHROW; 1511 void scr_reverse_selection () noexcept;
1551 void scr_dump (int fd) NOTHROW; 1512 void scr_dump (int fd) noexcept;
1552 1513
1553 void selection_check (int check_more) NOTHROW; 1514 void selection_check (int check_more) noexcept;
1554 void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */ 1515 void selection_changed () noexcept; /* sets want_refresh, corrects coordinates */
1555 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1516 void selection_request (Time tm, int selnum = Sel_Primary) noexcept;
1556 void selection_clear (bool clipboard = false) NOTHROW; 1517 void selection_clear (bool clipboard = false) noexcept;
1557 void selection_make (Time tm); 1518 void selection_make (Time tm);
1558 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1519 bool selection_grab (Time tm, bool clipboard = false) noexcept;
1559 void selection_start_colrow (int col, int row) NOTHROW; 1520 void selection_start_colrow (int col, int row) noexcept;
1560 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1521 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) noexcept;
1561 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1522 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) noexcept;
1562 void selection_remove_trailing_spaces () NOTHROW; 1523 void selection_remove_trailing_spaces () noexcept;
1563 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1524 void selection_send (const XSelectionRequestEvent &rq) noexcept;
1564 void selection_click (int clicks, int x, int y) NOTHROW; 1525 void selection_click (int clicks, int x, int y) noexcept;
1565 void selection_extend (int x, int y, int flag) NOTHROW; 1526 void selection_extend (int x, int y, int flag) noexcept;
1566 void selection_rotate (int x, int y) NOTHROW; 1527 void selection_rotate (int x, int y) noexcept;
1567 1528
1568 // xdefaults.C 1529 // xdefaults.C
1569 void rxvt_usage (int type); 1530 void rxvt_usage (int type);
1570 const char **get_options (int argc, const char *const *argv); 1531 const char **get_options (int argc, const char *const *argv);
1532 int parse_keysym (const char *str, unsigned int &state);
1571 int parse_keysym (const char *str, const char *arg); 1533 int bind_action (const char *str, const char *arg);
1572 const char *x_resource (const char *name); 1534 const char *x_resource (const char *name);
1573 void extract_resources (); 1535 void extract_resources ();
1536 void enumerate_resources (void (*cb)(rxvt_term *, const char *, const char *), const char *name_p = 0, const char *class_p = 0);
1537 void enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *))
1538 {
1539 enumerate_resources (cb, "keysym", "Keysym");
1540 }
1574 void extract_keysym_resources (); 1541 void extract_keysym_resources ();
1575}; 1542};
1576 1543
1577#endif /* _RXVT_H_ */ 1544#endif /* _RXVT_H_ */
1578 1545

Diff Legend

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