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.396 by root, Thu Apr 1 00:58:38 2010 UTC vs.
Revision 1.481 by sf-exg, Sun May 20 16:23:42 2012 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#ifdef HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif
78
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1
81#endif
82
83#include <ecb.h>
77#include "encoding.h" 84#include "encoding.h"
78#include "rxvtutil.h" 85#include "rxvtutil.h"
79#include "rxvtfont.h" 86#include "rxvtfont.h"
80#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
81#include "scrollbar.h" 88#include "scrollbar.h"
… …
98 ***************************************************************************** 105 *****************************************************************************
99 * SYSTEM HACKS 106 * SYSTEM HACKS
100 ***************************************************************************** 107 *****************************************************************************
101 */ 108 */
102 109
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 110#include <termios.h>
108
109#include "background.h"
110 111
111#ifndef STDIN_FILENO 112#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 113# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 114# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 115# define STDERR_FILENO 2
115#endif 116#endif
116 117
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 118#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 119# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 120# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 121#endif
125 122
126/****************************************************************************/ 123/****************************************************************************/
127 124
128// exception thrown on fatal (per-instance) errors 125// exception thrown on fatal (per-instance) errors
… …
151 148
152const char * rxvt_basename (const char *str) NOTHROW; 149const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 151void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 152void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
158 155
159char * rxvt_strtrim (char *str) NOTHROW; 156char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 157char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 158
159static inline void
160rxvt_free_strsplit (char **ptr) NOTHROW
161{
162 free (ptr[0]);
163 free (ptr);
164}
162 165
163void * rxvt_malloc (size_t size); 166void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 167void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 168void * rxvt_realloc (void *ptr, size_t size);
166 169
… …
189#else 192#else
190 if (envv) 193 if (envv)
191#endif 194#endif
192 environ = envv; 195 environ = envv;
193} 196}
197
198struct localise_env
199{
200 char **orig_env;
201
202 localise_env (char **new_env)
203 {
204 orig_env = environ;
205 environ = new_env;
206 }
207
208 ~localise_env ()
209 {
210 environ = orig_env;
211 }
212};
213
214#ifdef HAVE_BG_PIXMAP
215# ifdef BG_IMAGE_FROM_FILE
216enum {
217 IM_IS_SET = 1 << 0,
218 IM_IS_SIZE_SENSITIVE = 1 << 1,
219 IM_KEEP_ASPECT = 1 << 2,
220 IM_ROOT_ALIGN = 1 << 3,
221 IM_TILE = 1 << 4,
222 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
223};
224
225enum {
226 noScale = 0,
227 windowScale = 100,
228 defaultScale = windowScale,
229 centerAlign = 50,
230 defaultAlign = centerAlign,
231};
232
233struct rxvt_image
234{
235 uint8_t flags;
236 unsigned int h_scale, v_scale; /* percents of the window size */
237 int h_align, v_align; /* percents of the window size:
238 0 - left align, 50 - center, 100 - right */
239
240# ifdef HAVE_PIXBUF
241 GdkPixbuf *pixbuf;
242
243 ~rxvt_image ()
244 {
245 if (pixbuf)
246 g_object_unref (pixbuf);
247 }
248
249 int width ()
250 {
251 return gdk_pixbuf_get_width (pixbuf);
252 }
253 int height ()
254 {
255 return gdk_pixbuf_get_height (pixbuf);
256 }
257# endif
258
259 bool set_file (const char *file);
260 bool set_geometry (const char *geom, bool update = false);
261};
262# endif
263#endif
194 264
195/* 265/*
196 ***************************************************************************** 266 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 267 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 268 *****************************************************************************
… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 317# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 318#else
249# define COLORTERMENVFULL COLORTERMENV 319# define COLORTERMENVFULL COLORTERMENV
250#endif 320#endif
251#ifndef TERMENV 321#ifndef TERMENV
322# if USE_256_COLORS
323# define TERMENV "rxvt-unicode-256color"
324# else
252# define TERMENV "rxvt-unicode" 325# define TERMENV "rxvt-unicode"
326# endif
253#endif 327#endif
254 328
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 329#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 330# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 331#endif
… …
272# define NSCREENS 0 346# define NSCREENS 0
273#else 347#else
274# define NSCREENS 1 348# define NSCREENS 1
275#endif 349#endif
276 350
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 () */ 351/* flags for rxvt_term::scr_gotorc () */
283enum { 352enum {
284 C_RELATIVE = 1, /* col movement is relative */ 353 C_RELATIVE = 1, /* col movement is relative */
285 R_RELATIVE = 2, /* row movement is relative */ 354 R_RELATIVE = 2, /* row movement is relative */
286 RELATIVE = C_RELATIVE | R_RELATIVE, 355 RELATIVE = C_RELATIVE | R_RELATIVE,
287}; 356};
288 357
289/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 358/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
290enum { 359enum {
291 INSERT = -1, /* don't change these values */ 360 INSERT = -1, /* don't change these values */
292 DELETE = +1, 361 DELETE = +1,
293 ERASE = +2, 362 ERASE = +2,
294}; 363};
295 364
296/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 365/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
297enum page_dirn { 366enum page_dirn {
298 UP, 367 UP,
299 DN, 368 DN,
300 NO_DIR, 369 NO_DIR,
301}; 370};
302 371
303/* arguments for rxvt_scr_change_screen () */ 372/* arguments for rxvt_term::scr_change_screen () */
304enum { 373enum {
305 PRIMARY = 0, 374 PRIMARY = 0,
306 SECONDARY, 375 SECONDARY,
307}; 376};
377
378// define various rendition bits and masks. the rendition word
379// is 32 bits in size, and we should use it as efficiently as possible
308 380
309#define RS_None 0 381#define RS_None 0
310 382
311// GET_BGATTR depends on RS_fgShift > RS_bgShift 383// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_colorMask ((1UL << Color_Bits) - 1UL) 384#define RS_colorMask ((1UL << Color_Bits) - 1UL)
313#define RS_bgShift 0 385#define RS_bgShift 0
314#define RS_fgShift (RS_bgShift + Color_Bits) 386#define RS_fgShift (RS_bgShift + Color_Bits)
315#define RS_bgMask (RS_colorMask << RS_bgShift) 387#define RS_bgMask (RS_colorMask << RS_bgShift)
316#define RS_fgMask (RS_colorMask << RS_fgShift) 388#define RS_fgMask (RS_colorMask << RS_fgShift)
317 389
318// font styles 390// must have space for rxvt_fontset::fontCount * 2 + 2 values
319#define RS_Bold 0x08000000UL // value 1 391#define RS_fontShift (RS_fgShift + Color_Bits)
320#define RS_Italic 0x10000000UL // value 2 392#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
393#define RS_fontCount rxvt_fontset::fontCount
394#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
321 395
322#define RS_styleCount 4 396// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
323#define RS_styleMask (RS_Bold | RS_Italic) 397#define RS_redraw (2UL << RS_fontShift)
324#define RS_styleShift 27
325 398
326// fake styles 399#define RS_Sel (1UL << 22)
327#define RS_Blink 0x20000000UL // blink
328#define RS_RVid 0x40000000UL // reverse video
329#define RS_Uline 0x80000000UL // underline
330 400
331// 5 custom bits for extensions 401// 4 custom bits for extensions
332#define RS_customCount 16UL 402#define RS_customCount 16UL
333#define RS_customShift 23 403#define RS_customShift 23
334#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 404#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
335 405
336// must have space for rxvt_fontset::fontCount * 2 + 2 values 406// font styles
337#define RS_fontShift (RS_fgShift + Color_Bits) 407#define RS_Bold (1UL << RS_styleShift)
338#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
339#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
340
341// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
342#define RS_redraw (2UL << RS_fontShift) 408#define RS_Italic (2UL << RS_styleShift)
409
410#define RS_styleCount 4
411#define RS_styleShift 27
412#define RS_styleMask (RS_Bold | RS_Italic)
413
414// fake styles
415#define RS_Blink (1UL << 29)
416#define RS_RVid (1UL << 30) // reverse video
417#define RS_Uline (1UL << 31) // underline
343 418
344#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 419#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
345#define RS_attrMask (RS_baseattrMask | RS_fontMask) 420#define RS_attrMask (RS_baseattrMask | RS_fontMask)
346 421
347#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 422#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
348#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 423#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
349
350#define Sel_none 0 /* Not waiting */
351#define Sel_normal 0x01 /* normal selection */
352#define Sel_incr 0x02 /* incremental selection */
353#define Sel_direct 0x00
354#define Sel_Primary 0x01
355#define Sel_Secondary 0x02
356#define Sel_Clipboard 0x03
357#define Sel_whereMask 0x0f
358#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
359#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
360 424
361enum { 425enum {
362 C0_NUL = 0x00, 426 C0_NUL = 0x00,
363 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 427 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
364 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 428 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
382 XTerm_Color_cursor = 12, // change actual 'Cursor' color 446 XTerm_Color_cursor = 12, // change actual 'Cursor' color
383 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 447 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
384 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 448 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
385 XTerm_Color05 = 15, // not implemented (tektronix fg) 449 XTerm_Color05 = 15, // not implemented (tektronix fg)
386 XTerm_Color06 = 16, // not implemented (tektronix bg) 450 XTerm_Color06 = 16, // not implemented (tektronix bg)
387 XTerm_Color_RV = 17, // change actual 'Highlight' color 451 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
452 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
388 XTerm_logfile = 46, // not implemented 453 XTerm_logfile = 46, // not implemented
389 XTerm_font = 50, 454 XTerm_font = 50,
390 455
391 XTerm_konsole30 = 30, // reserved for konsole 456 XTerm_konsole30 = 30, // reserved for konsole
392 XTerm_konsole31 = 31, // reserved for konsole 457 XTerm_konsole31 = 31, // reserved for konsole
… …
394 /* 459 /*
395 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 460 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
396 */ 461 */
397 462
398 // deprecated 463 // deprecated
399 Rxvt_Color_BD = 18,
400 Rxvt_Color_UL = 19,
401 Rxvt_restoreFG = 39, 464 Rxvt_restoreFG = 39,
402 Rxvt_restoreBG = 49, 465 Rxvt_restoreBG = 49,
403 466
404 Rxvt_Pixmap = 20, // new bg pixmap 467 Rxvt_Pixmap = 20, // new bg pixmap
405 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 468 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
459 Color_White = maxBrightCOLOR, 522 Color_White = maxBrightCOLOR,
460#else 523#else
461 Color_White = maxCOLOR, 524 Color_White = maxCOLOR,
462#endif 525#endif
463 minTermCOLOR = Color_White + 1, 526 minTermCOLOR = Color_White + 1,
464#ifndef USE_256_COLORS 527#if USE_256_COLORS
528 maxTermCOLOR = Color_White + 240,
529#else
465 maxTermCOLOR = Color_White + 72, 530 maxTermCOLOR = Color_White + 72,
466#else
467 maxTermCOLOR = Color_White + 240,
468#endif 531#endif
469#ifndef NO_CURSORCOLOR 532#ifndef NO_CURSORCOLOR
470 Color_cursor, 533 Color_cursor,
471 Color_cursor2, 534 Color_cursor2,
472#endif 535#endif
… …
482#if ENABLE_FRILLS 545#if ENABLE_FRILLS
483 Color_underline, 546 Color_underline,
484#endif 547#endif
485#ifdef OPTION_HC 548#ifdef OPTION_HC
486 Color_HC, 549 Color_HC,
550 Color_HTC,
487#endif 551#endif
488 Color_scroll, 552 Color_scroll,
489#ifdef RXVT_SCROLLBAR 553#ifdef RXVT_SCROLLBAR
490 Color_trough, 554 Color_trough,
491#endif 555#endif
… …
503#else 567#else
504 TOTAL_COLORS = NRS_COLORS 568 TOTAL_COLORS = NRS_COLORS
505#endif 569#endif
506}; 570};
507 571
508#ifndef USE_256_COLORS 572#if USE_256_COLORS
509#define Color_Bits 7 // 0 .. maxTermCOLOR 573# define Color_Bits 9 // 0 .. maxTermCOLOR
510#else 574#else
511#define Color_Bits 9 // 0 .. maxTermCOLOR 575# define Color_Bits 7 // 0 .. maxTermCOLOR
512#endif 576#endif
513 577
514/* 578/*
515 * Resource list 579 * Resource list
516 */ 580 */
… …
545#define PrivMode_vt52 (1UL<<18) 609#define PrivMode_vt52 (1UL<<18)
546#define PrivMode_LFNL (1UL<<19) 610#define PrivMode_LFNL (1UL<<19)
547#define PrivMode_MouseBtnEvent (1UL<<20) 611#define PrivMode_MouseBtnEvent (1UL<<20)
548#define PrivMode_MouseAnyEvent (1UL<<21) 612#define PrivMode_MouseAnyEvent (1UL<<21)
549#define PrivMode_BracketPaste (1UL<<22) 613#define PrivMode_BracketPaste (1UL<<22)
614#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
615#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
550 616
551#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 617#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
552 618
553#ifdef ALLOW_132_MODE 619#ifdef ALLOW_132_MODE
554# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 620# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
605/* 671/*
606 ***************************************************************************** 672 *****************************************************************************
607 * MACRO DEFINES 673 * MACRO DEFINES
608 ***************************************************************************** 674 *****************************************************************************
609 */ 675 */
676
677// speed hack, copy some member variable into a local variable of the same name
610#define dLocal(type,name) type const name = this->name 678#define dLocal(type,name) type const name = this->name
611 679
612// for speed reasons, we assume that all codepoints 32 to 126 are 680// for speed reasons, we assume that all codepoints 32 to 126 are
613// single-width. 681// single-width.
614#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 682#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
641 709
642#define GET_ATTR(x) (((x) & RS_attrMask)) 710#define GET_ATTR(x) (((x) & RS_attrMask))
643// return attributes defining the background, encoding doesn't matter 711// return attributes defining the background, encoding doesn't matter
644// depends on RS_fgShift > RS_bgShift 712// depends on RS_fgShift > RS_bgShift
645#define GET_BGATTR(x) \ 713#define GET_BGATTR(x) \
646 (expect_false ((x) & RS_RVid) \ 714 (ecb_unlikely ((x) & RS_RVid) \
647 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 715 ? (((x) & (RS_attrMask & ~RS_RVid)) \
648 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 716 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
649 : ((x) & (RS_attrMask | RS_bgMask))) 717 : ((x) & (RS_attrMask | RS_bgMask)))
650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 718#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 719#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
753// that are not representable in unicode, as well as characters 821// that are not representable in unicode, as well as characters
754// not fitting in the BMP. 822// not fitting in the BMP.
755struct compose_char 823struct compose_char
756{ 824{
757 unicode_t c1, c2; // any chars != NOCHAR are valid 825 unicode_t c1, c2; // any chars != NOCHAR are valid
826 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
827 compose_char () = default;
828 #endif
758 compose_char (unicode_t c1, unicode_t c2) 829 compose_char (unicode_t c1, unicode_t c2)
759 : c1(c1), c2(c2) 830 : c1(c1), c2(c2)
760 { } 831 { }
761}; 832};
762 833
… …
795{ 866{
796 int x, y, w, h; // overlay dimensions 867 int x, y, w, h; // overlay dimensions
797 text_t **text; 868 text_t **text;
798 rend_t **rend; 869 rend_t **rend;
799 870
800 // while tempting to add swap() etc. here, it effetcively only increases code size 871 // while tempting to add swap() etc. here, it effectively only increases code size
801}; 872};
802 873
803/* ------------------------------------------------------------------------- */ 874/* ------------------------------------------------------------------------- */
804 875
805typedef struct 876typedef struct
… …
844 * END······················= total_rows 915 * END······················= total_rows
845 */ 916 */
846 917
847struct TermWin_t 918struct TermWin_t
848{ 919{
920 int vt_width; /* actual window width [pixels] */
921 int vt_height; /* actual window height [pixels] */
849 int width; /* window width [pixels] */ 922 int width; /* window width [pixels] */
850 int height; /* window height [pixels] */ 923 int height; /* window height [pixels] */
851 int fwidth; /* font width [pixels] */ 924 int fwidth; /* font width [pixels] */
852 int fheight; /* font height [pixels] */ 925 int fheight; /* font height [pixels] */
853 int fbase; /* font ascent (baseline) [pixels] */ 926 int fbase; /* font ascent (baseline) [pixels] */
… …
862 int saveLines; /* number of lines that fit in scrollback */ 935 int saveLines; /* number of lines that fit in scrollback */
863 int total_rows; /* total number of rows in this terminal */ 936 int total_rows; /* total number of rows in this terminal */
864 int term_start; /* term lines start here */ 937 int term_start; /* term lines start here */
865 int view_start; /* scrollback view starts here */ 938 int view_start; /* scrollback view starts here */
866 int top_row; /* topmost row index of scrollback */ 939 int top_row; /* topmost row index of scrollback */
867 Window parent[6]; /* parent identifiers - we're parent[0] */ 940 Window parent; /* parent identifier */
868 Window vt; /* vt100 window */ 941 Window vt; /* vt100 window */
869 GC gc; /* GC for drawing */ 942 GC gc; /* GC for drawing */
870 Pixmap pixmap;
871 rxvt_drawable *drawable; 943 rxvt_drawable *drawable;
872 rxvt_fontset *fontset[4]; 944 rxvt_fontset *fontset[4];
873}; 945};
874 946
875/* 947/*
… …
937#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1009#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
938#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1010#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
939 1011
940/* rxvt_vars.options */ 1012/* rxvt_vars.options */
941enum { 1013enum {
942# define def(name,idx) Opt_ ## name = idx,
943# define nodef(name) Opt_ ## name = 0, 1014# define def(name) Opt_ ## name,
1015# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1016 Opt_0,
944# include "optinc.h" 1017# include "optinc.h"
945# undef nodef 1018# undef nodef
946# undef def 1019# undef def
947Opt_count 1020 Opt_count
948}; 1021};
949 1022
950/* ------------------------------------------------------------------------- */ 1023/* ------------------------------------------------------------------------- */
951 1024
952struct rxvt_vars : TermWin_t 1025struct rxvt_vars : TermWin_t
… …
954 scrollBar_t scrollBar; 1027 scrollBar_t scrollBar;
955 uint8_t options[(Opt_count + 7) >> 3]; 1028 uint8_t options[(Opt_count + 7) >> 3];
956 XSizeHints szHint; 1029 XSizeHints szHint;
957 rxvt_color *pix_colors; 1030 rxvt_color *pix_colors;
958 Cursor TermWin_cursor; /* cursor for vt window */ 1031 Cursor TermWin_cursor; /* cursor for vt window */
959 int numlock_state;
960 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1032 line_t *row_buf; // all lines, scrollback + terminal, circular
961 line_t *drawn_buf; // text on screen 1033 line_t *drawn_buf; // text on screen
962 line_t *swap_buf; // lines for swap buffer 1034 line_t *swap_buf; // lines for swap buffer
963 char *tabs; /* per location: 1 == tab-stop */ 1035 char *tabs; /* per location: 1 == tab-stop */
964 screen_t screen; 1036 screen_t screen;
965 screen_t swap; 1037 screen_t swap;
… …
1002 hidden_pointer:1, 1074 hidden_pointer:1,
1003#endif 1075#endif
1004 enc_utf8:1, /* whether locale uses utf-8 */ 1076 enc_utf8:1, /* whether locale uses utf-8 */
1005 seen_input:1, /* whether we have seen some program output yet */ 1077 seen_input:1, /* whether we have seen some program output yet */
1006 seen_resize:1, /* whether we had a resize event */ 1078 seen_resize:1, /* whether we had a resize event */
1079 init_done:1,
1007 parsed_geometry:1; 1080 parsed_geometry:1;
1008 1081
1009 unsigned char refresh_type, 1082 unsigned char refresh_type,
1010#ifdef META8_OPTION 1083#ifdef META8_OPTION
1011 meta_char, /* Alt-key prefix */ 1084 meta_char; /* Alt-key prefix */
1012#endif 1085#endif
1013 selection_wait,
1014 selection_type;
1015/* ---------- */ 1086/* ---------- */
1016 bool rvideo_state, rvideo_mode; 1087 bool rvideo_state, rvideo_mode;
1017#ifndef NO_BELL 1088#ifndef NO_BELL
1018 bool rvideo_bell; 1089 bool rvideo_bell;
1019#endif 1090#endif
… …
1047 allowedxerror; 1118 allowedxerror;
1048/* ---------- */ 1119/* ---------- */
1049 unsigned int ModLevel3Mask, 1120 unsigned int ModLevel3Mask,
1050 ModMetaMask, 1121 ModMetaMask,
1051 ModNumLockMask; 1122 ModNumLockMask;
1052 int old_width, /* last used width in screen resize */
1053 old_height; /* last used height in screen resize */
1054 unsigned long priv_modes, 1123 unsigned long priv_modes,
1055 SavedModes; 1124 SavedModes;
1056/* ---------- */ 1125/* ---------- */
1057 Atom *xa; 1126 Atom *xa;
1058/* ---------- */ 1127/* ---------- */
1059 Time selection_time, 1128 Time selection_time,
1060 selection_request_time,
1061 clipboard_time; 1129 clipboard_time;
1130 rxvt_selection *selection_req;
1062 pid_t cmd_pid; /* process id of child */ 1131 pid_t cmd_pid; /* process id of child */
1063 char * incr_buf;
1064 size_t incr_buf_size, incr_buf_fill;
1065/* ---------- */ 1132/* ---------- */
1066 struct mouse_event MEvent; 1133 struct mouse_event MEvent;
1067 XComposeStatus compose; 1134 XComposeStatus compose;
1068 struct termios tio; 1135 static struct termios def_tio;
1069 row_col_t oldcursor; 1136 row_col_t oldcursor;
1070#ifdef HAVE_BG_PIXMAP 1137#ifdef HAVE_BG_PIXMAP
1071 bgPixmap_t bgPixmap; 1138 void bg_init ();
1139 void bg_destroy ();
1140
1141 enum {
1142 BG_IS_VALID = 1 << 0,
1143
1144 BG_IS_TRANSPARENT = 1 << 1,
1145 BG_NEEDS_REFRESH = 1 << 2,
1146
1147 BG_HAS_RENDER = 1 << 3,
1148 BG_HAS_RENDER_CONV = 1 << 4,
1149 BG_CLIENT_RENDER = 1 << 5,
1150
1151 BG_TINT_SET = 1 << 6,
1152 BG_TINT_BITAND = 1 << 7,
1153 };
1154
1155 uint8_t bg_flags;
1156
1157# ifdef BG_IMAGE_FROM_FILE
1158 rxvt_image bg_image;
1159 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1160 bool render_image (rxvt_image &image);
1072#endif 1161# endif
1073#ifdef HAVE_AFTERIMAGE
1074 ASVisual *asv;
1075 ASImageManager *asimman;
1076 1162
1077 void init_asv () 1163# ifdef ENABLE_TRANSPARENCY
1164 Pixmap root_pixmap; /* current root pixmap set */
1165 rxvt_color tint;
1166 int shade;
1167 int h_blurRadius, v_blurRadius;
1168
1169 void bg_set_transparent ()
1078 { 1170 {
1079 if (!asv) 1171 bg_flags |= BG_IS_TRANSPARENT;
1080 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1081 } 1172 }
1173 void bg_set_root_pixmap ();
1174 bool bg_set_tint (rxvt_color &new_tint);
1175 bool bg_set_shade (const char *shade_str);
1176 bool bg_set_blur (const char *geom);
1177
1178 bool blur_pixmap (Pixmap pixmap, int width, int height);
1179 bool tint_pixmap (Pixmap pixmap, int width, int height);
1180 void tint_ximage (XImage *ximage);
1181 bool make_transparency_pixmap ();
1182# endif
1183
1184 ev_tstamp bg_valid_since;
1185
1186 Pixmap bg_pixmap;
1187 unsigned int bg_pmap_width, bg_pmap_height;
1188
1189 int target_x;
1190 int target_y;
1191 bool bg_set_position (int x, int y);
1192 bool bg_window_size_sensitive ();
1193 bool bg_window_position_sensitive ();
1194
1195 bool bg_render ();
1196 void bg_invalidate ()
1197 {
1198 bg_flags &= ~BG_IS_VALID;
1199 }
1200#endif
1201#ifdef HAVE_PIXBUF
1202 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1203 int src_x, int src_y, int dst_x, int dst_y,
1204 unsigned int width, unsigned int height);
1082#endif 1205#endif
1083 1206
1084#if ENABLE_OVERLAY 1207#if ENABLE_OVERLAY
1085 overlay_base ov; 1208 overlay_base ov;
1086 1209
… …
1094 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1217 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1095#endif 1218#endif
1096 1219
1097 vector<void *> allocated; // free these memory blocks with free() 1220 vector<void *> allocated; // free these memory blocks with free()
1098 1221
1099 char env_windowid[21]; /* environmental variable WINDOWID */
1100 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1101 char *env_display; /* environmental variable DISPLAY */
1102 char *env_term; /* environmental variable TERM */
1103
1104 char *locale; 1222 char *locale;
1105 char charsets[4]; 1223 char charsets[4];
1106 char *v_buffer; /* pointer to physical buffer */ 1224 char *v_buffer; /* pointer to physical buffer */
1107 unsigned int v_buflen; /* size of area to write */ 1225 unsigned int v_buflen; /* size of area to write */
1108 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1226 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1147 void rootwin_cb (XEvent &xev); 1265 void rootwin_cb (XEvent &xev);
1148 xevent_watcher rootwin_ev; 1266 xevent_watcher rootwin_ev;
1149#endif 1267#endif
1150#ifdef HAVE_BG_PIXMAP 1268#ifdef HAVE_BG_PIXMAP
1151 void update_background (); 1269 void update_background ();
1152#if TRACE_PIXMAPS
1153 void trace_update_background (const char *file, int line);
1154# define update_background() trace_update_background (__FILE__, __LINE__)
1155#endif
1156 void update_background_cb (ev::timer &w, int revents); 1270 void update_background_cb (ev::timer &w, int revents);
1157 ev::timer update_background_ev; 1271 ev::timer update_background_ev;
1158#endif 1272#endif
1159 1273
1160 void x_cb (XEvent &xev); 1274 void x_cb (XEvent &xev);
… …
1165 void child_cb (ev::child &w, int revents); ev::child child_ev; 1279 void child_cb (ev::child &w, int revents); ev::child child_ev;
1166 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1280 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1167 void refresh_check (); 1281 void refresh_check ();
1168 void flush (); 1282 void flush ();
1169 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1283 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1284 void cmdbuf_reify ();
1285 void cmdbuf_append (const char *str, size_t count);
1170 bool pty_fill (); 1286 bool pty_fill ();
1171 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1287 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1172 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1173 1288
1174#ifdef CURSOR_BLINK 1289#ifdef CURSOR_BLINK
1290 void cursor_blink_reset ();
1175 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1291 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1176#endif 1292#endif
1177#ifdef TEXT_BLINK 1293#ifdef TEXT_BLINK
1178 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1294 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1179#endif 1295#endif
… …
1198 void pointer_unblank (); 1314 void pointer_unblank ();
1199 1315
1200 void tt_printf (const char *fmt,...); 1316 void tt_printf (const char *fmt,...);
1201 void tt_write (const char *data, unsigned int len); 1317 void tt_write (const char *data, unsigned int len);
1202 void pty_write (); 1318 void pty_write ();
1203
1204 void init (stringvec *argv, stringvec *envv)
1205 {
1206 this->argv = argv;
1207 init (argv->size (), argv->begin (), envv);
1208 }
1209 1319
1210 void make_current () const // make this the "currently active" urxvt instance 1320 void make_current () const // make this the "currently active" urxvt instance
1211 { 1321 {
1212 SET_R (this); 1322 SET_R (this);
1213 set_environ (envv); 1323 set_environ (envv);
… …
1225 void im_set_size (XRectangle &size); 1335 void im_set_size (XRectangle &size);
1226 void im_set_position (XPoint &pos) NOTHROW; 1336 void im_set_position (XPoint &pos) NOTHROW;
1227 void im_set_color (unsigned long &fg, unsigned long &bg); 1337 void im_set_color (unsigned long &fg, unsigned long &bg);
1228 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1338 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1229 1339
1230 bool IMisRunning (); 1340 bool im_is_running ();
1231 void IMSendSpot (); 1341 void im_send_spot ();
1232 bool IM_get_IC (const char *modifiers); 1342 bool im_get_ic (const char *modifiers);
1233 void IMSetPosition (); 1343 void im_set_position ();
1234#endif 1344#endif
1235 1345
1236 // command.C 1346 // command.C
1237 void key_press (XKeyEvent &ev); 1347 void key_press (XKeyEvent &ev);
1238 void key_release (XKeyEvent &ev); 1348 void key_release (XKeyEvent &ev);
1239 unsigned int cmd_write (const char *str, unsigned int count);
1240 1349
1241 wchar_t next_char () NOTHROW; 1350 wchar_t next_char () NOTHROW;
1242 wchar_t cmd_getc () THROW ((class out_of_input)); 1351 wchar_t cmd_getc () THROW ((class out_of_input));
1243 uint32_t next_octet () NOTHROW; 1352 uint32_t next_octet () NOTHROW;
1244 uint32_t cmd_get8 () THROW ((class out_of_input)); 1353 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1271 void process_color_seq (int report, int color, const char *str, char resp); 1380 void process_color_seq (int report, int color, const char *str, char resp);
1272 void process_xterm_seq (int op, char *str, char resp); 1381 void process_xterm_seq (int op, char *str, char resp);
1273 int privcases (int mode, unsigned long bit); 1382 int privcases (int mode, unsigned long bit);
1274 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1383 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1275 void process_sgr_mode (unsigned int nargs, const int *arg); 1384 void process_sgr_mode (unsigned int nargs, const int *arg);
1276 void process_graphics ();
1277 // init.C 1385 // init.C
1386 void init (stringvec *argv, stringvec *envv);
1387 void init (int argc, const char *const *argv, const char *const *envv);
1388 void init2 (int argc, const char *const *argv);
1278 void init_vars (); 1389 void init_vars ();
1279 const char **init_resources (int argc, const char *const *argv); 1390 const char **init_resources (int argc, const char *const *argv);
1280 void init (int argc, const char *const *argv, stringvec *envv);
1281 void init_env (); 1391 void init_env ();
1282 void set_locale (const char *locale); 1392 void set_locale (const char *locale);
1283 void init_xlocale (); 1393 void init_xlocale ();
1284 void init_command (const char *const *argv); 1394 void init_command (const char *const *argv);
1285 void run_command (const char *const *argv); 1395 void run_command (const char *const *argv);
1286 int run_child (const char *const *argv); 1396 int run_child (const char *const *argv);
1287 void color_aliases (int idx); 1397 void color_aliases (int idx);
1288 void create_windows (int argc, const char *const *argv); 1398 void create_windows (int argc, const char *const *argv);
1289 void get_colours (); 1399 void get_colours ();
1290 void get_ourmods (); 1400 void get_ourmods ();
1401 void set_icon (const char *file);
1291 // main.C 1402 // main.C
1292 void tt_winch (); 1403 void tt_winch ();
1293 rxvt_term (); 1404 rxvt_term ();
1294 ~rxvt_term (); 1405 ~rxvt_term ();
1295 void destroy (); 1406 void destroy ();
… …
1297 void recolour_cursor (); 1408 void recolour_cursor ();
1298 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1409 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1299 void window_calc (unsigned int newwidth, unsigned int newheight); 1410 void window_calc (unsigned int newwidth, unsigned int newheight);
1300 bool set_fonts (); 1411 bool set_fonts ();
1301 void set_string_property (Atom prop, const char *str, int len = -1); 1412 void set_string_property (Atom prop, const char *str, int len = -1);
1413 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1302 void set_utf8_property (Atom prop, const char *str, int len = -1); 1414 void set_utf8_property (Atom prop, const char *str, int len = -1);
1303 void set_title (const char *str); 1415 void set_title (const char *str);
1304 void set_icon_name (const char *str); 1416 void set_icon_name (const char *str);
1305 void set_window_color (int idx, const char *color); 1417 void set_window_color (int idx, const char *color);
1306 void set_colorfgbg (); 1418 char *get_colorfgbg ();
1307 bool set_color (rxvt_color &color, const char *name); 1419 bool set_color (rxvt_color &color, const char *name);
1308 void alias_color (int dst, int src); 1420 void alias_color (int dst, int src);
1309 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1421 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1310 void get_window_origin (int &x, int &y); 1422 void get_window_origin (int &x, int &y);
1311 Pixmap get_pixmap_property (int prop_id); 1423 Pixmap get_pixmap_property (Atom property);
1312 1424
1313 // screen.C 1425 // screen.C
1314 1426
1315 void lalloc (line_t &l) const 1427 void lalloc (line_t &l) const
1316 { 1428 {
… …
1346#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
1347 if (r & RS_Bold 1459 if (r & RS_Bold
1348# if ENABLE_STYLES 1460# if ENABLE_STYLES
1349 && option (Opt_intensityStyles) 1461 && option (Opt_intensityStyles)
1350# endif 1462# endif
1351 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1463 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1352 base += minBrightCOLOR - minCOLOR; 1464 base += minBrightCOLOR - minCOLOR;
1353#endif 1465#endif
1354 return base; 1466 return base;
1355 } 1467 }
1356 1468
… …
1360#ifndef NO_BRIGHTCOLOR 1472#ifndef NO_BRIGHTCOLOR
1361 if (r & RS_Blink 1473 if (r & RS_Blink
1362# if ENABLE_STYLES 1474# if ENABLE_STYLES
1363 && option (Opt_intensityStyles) 1475 && option (Opt_intensityStyles)
1364# endif 1476# endif
1365 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1477 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1366 base += minBrightCOLOR - minCOLOR; 1478 base += minBrightCOLOR - minCOLOR;
1367#endif 1479#endif
1368 return base; 1480 return base;
1369 } 1481 }
1370 1482
1371 bool option (uint8_t opt) const NOTHROW 1483 bool option (uint8_t opt) const NOTHROW
1372 { 1484 {
1373 if (!opt)
1374 return 0;
1375
1376 --opt;
1377 return options[opt >> 3] & (1 << (opt & 7)); 1485 return options[opt >> 3] & (1 << (opt & 7));
1378 } 1486 }
1379 1487
1380 void set_option (uint8_t opt, bool set = true) NOTHROW 1488 void set_option (uint8_t opt, bool set = true) NOTHROW;
1381 {
1382 if (!opt)
1383 return;
1384
1385 --opt;
1386 if (set)
1387 options[opt >> 3] |= (1 << (opt & 7));
1388 else
1389 options[opt >> 3] &= ~(1 << (opt & 7));
1390 }
1391
1392 void set_privmode (unsigned bit, int set) NOTHROW
1393 {
1394 if (set)
1395 priv_modes |= bit;
1396 else
1397 priv_modes &= ~bit;
1398 }
1399 1489
1400 // modifies first argument(!) 1490 // modifies first argument(!)
1491 void tt_paste (char *data, unsigned int len) NOTHROW;
1401 void paste (char *data, unsigned int len) NOTHROW; 1492 void paste (char *data, unsigned int len) NOTHROW;
1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1493 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1494 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1404 void scr_kill_char (line_t &l, int col) const NOTHROW; 1495 void scr_kill_char (line_t &l, int col) const NOTHROW;
1405 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1496 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1414 void scr_backindex () NOTHROW; 1505 void scr_backindex () NOTHROW;
1415 void scr_forwardindex () NOTHROW; 1506 void scr_forwardindex () NOTHROW;
1416#endif 1507#endif
1417 void scr_touch (bool refresh) NOTHROW; 1508 void scr_touch (bool refresh) NOTHROW;
1418 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1509 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1419 void scr_recolour () NOTHROW; 1510 void scr_recolour (bool refresh = true) NOTHROW;
1420 void scr_remap_chars () NOTHROW; 1511 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1512 void scr_remap_chars (line_t &l) NOTHROW;
1422 1513
1423 enum cursor_mode { SAVE, RESTORE }; 1514 enum cursor_mode { SAVE, RESTORE };
1424 1515
… …
1459 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1550 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1460 void scr_reverse_selection () NOTHROW; 1551 void scr_reverse_selection () NOTHROW;
1461 void scr_dump (int fd) NOTHROW; 1552 void scr_dump (int fd) NOTHROW;
1462 1553
1463 void selection_check (int check_more) NOTHROW; 1554 void selection_check (int check_more) NOTHROW;
1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1465 void selection_property (Window win, Atom prop) NOTHROW;
1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1555 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1467 int selection_request_other (Atom target, int selnum) NOTHROW;
1468 void selection_clear (bool clipboard = false) NOTHROW; 1556 void selection_clear (bool clipboard = false) NOTHROW;
1469 void clipboard_copy (Time tm);
1470 void selection_make (Time tm); 1557 void selection_make (Time tm);
1471 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1558 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1472 void selection_start_colrow (int col, int row) NOTHROW; 1559 void selection_start_colrow (int col, int row) NOTHROW;
1473 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1560 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1474 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1561 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1477 void selection_click (int clicks, int x, int y) NOTHROW; 1564 void selection_click (int clicks, int x, int y) NOTHROW;
1478 void selection_extend (int x, int y, int flag) NOTHROW; 1565 void selection_extend (int x, int y, int flag) NOTHROW;
1479 void selection_rotate (int x, int y) NOTHROW; 1566 void selection_rotate (int x, int y) NOTHROW;
1480 1567
1481 // xdefaults.C 1568 // xdefaults.C
1482 void get_options (int argc, const char *const *argv); 1569 const char **get_options (int argc, const char *const *argv);
1483 int parse_keysym (const char *str, const char *arg); 1570 int parse_keysym (const char *str, const char *arg);
1484 const char *x_resource (const char *name); 1571 const char *x_resource (const char *name);
1485 void extract_resources (); 1572 void extract_resources ();
1573 void extract_keysym_resources ();
1486}; 1574};
1487 1575
1488#endif /* _RXVT_H_ */ 1576#endif /* _RXVT_H_ */
1489 1577

Diff Legend

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