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.387 by root, Wed Mar 31 23:19:06 2010 UTC vs.
Revision 1.466 by sf-exg, Thu Jan 19 13:33:43 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; 29using namespace std;
30
31// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 32
33extern "C" { 33extern "C" {
34#include <X11/Xlib.h> 34#include <X11/Xlib.h>
35#include <X11/Xutil.h> 35#include <X11/Xutil.h>
36#include <X11/Xresource.h> 36#include <X11/Xresource.h>
… …
72#include <X11/cursorfont.h> 72#include <X11/cursorfont.h>
73#include <X11/keysym.h> 73#include <X11/keysym.h>
74#include <X11/keysymdef.h> 74#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 75#include <X11/Xatom.h>
76 76
77#ifdef HAVE_AFTERIMAGE
78# include <afterimage.h>
79# undef min
80# undef max
81#endif
82
83#ifdef HAVE_PIXBUF
84# include <gdk-pixbuf/gdk-pixbuf.h>
85#endif
86
87#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
88# define HAVE_BG_PIXMAP 1
89#endif
90
77#include "encoding.h" 91#include "encoding.h"
78#include "rxvtutil.h" 92#include "rxvtutil.h"
79#include "rxvtfont.h" 93#include "rxvtfont.h"
80#include "rxvttoolkit.h" 94#include "rxvttoolkit.h"
81#include "scrollbar.h" 95#include "scrollbar.h"
… …
98 ***************************************************************************** 112 *****************************************************************************
99 * SYSTEM HACKS 113 * SYSTEM HACKS
100 ***************************************************************************** 114 *****************************************************************************
101 */ 115 */
102 116
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 117#include <termios.h>
108
109#include "background.h"
110 118
111#ifndef STDIN_FILENO 119#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 120# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 121# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 122# define STDERR_FILENO 2
115#endif 123#endif
116 124
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 125#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 126# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 127# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 128#endif
125 129
126/****************************************************************************/ 130/****************************************************************************/
127 131
128// exception thrown on fatal (per-instance) errors 132// exception thrown on fatal (per-instance) errors
… …
151 155
152const char * rxvt_basename (const char *str) NOTHROW; 156const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 158void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 159void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
158 162
159char * rxvt_strtrim (char *str) NOTHROW; 163char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 164char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 165
166static inline void
167rxvt_free_strsplit (char **ptr) NOTHROW
168{
169 free (ptr[0]);
170 free (ptr);
171}
162 172
163void * rxvt_malloc (size_t size); 173void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 174void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 175void * rxvt_realloc (void *ptr, size_t size);
166 176
… …
189#else 199#else
190 if (envv) 200 if (envv)
191#endif 201#endif
192 environ = envv; 202 environ = envv;
193} 203}
204
205struct localise_env
206{
207 char **orig_env;
208
209 localise_env (char **new_env)
210 {
211 orig_env = environ;
212 environ = new_env;
213 }
214
215 ~localise_env ()
216 {
217 environ = orig_env;
218 }
219};
194 220
195/* 221/*
196 ***************************************************************************** 222 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 223 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 224 *****************************************************************************
… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 273# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 274#else
249# define COLORTERMENVFULL COLORTERMENV 275# define COLORTERMENVFULL COLORTERMENV
250#endif 276#endif
251#ifndef TERMENV 277#ifndef TERMENV
278# if USE_256_COLORS
279# define TERMENV "rxvt-unicode-256color"
280# else
252# define TERMENV "rxvt-unicode" 281# define TERMENV "rxvt-unicode"
282# endif
253#endif 283#endif
254 284
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 285#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 286# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 287#endif
… …
272# define NSCREENS 0 302# define NSCREENS 0
273#else 303#else
274# define NSCREENS 1 304# define NSCREENS 1
275#endif 305#endif
276 306
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 () */ 307/* flags for rxvt_term::scr_gotorc () */
283enum { 308enum {
284 C_RELATIVE = 1, /* col movement is relative */ 309 C_RELATIVE = 1, /* col movement is relative */
285 R_RELATIVE = 2, /* row movement is relative */ 310 R_RELATIVE = 2, /* row movement is relative */
286 RELATIVE = C_RELATIVE | R_RELATIVE, 311 RELATIVE = C_RELATIVE | R_RELATIVE,
287}; 312};
288 313
289/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 314/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
290enum { 315enum {
291 INSERT = -1, /* don't change these values */ 316 INSERT = -1, /* don't change these values */
292 DELETE = +1, 317 DELETE = +1,
293 ERASE = +2, 318 ERASE = +2,
294}; 319};
295 320
296/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 321/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
297enum page_dirn { 322enum page_dirn {
298 UP, 323 UP,
299 DN, 324 DN,
300 NO_DIR, 325 NO_DIR,
301}; 326};
302 327
303/* arguments for rxvt_scr_change_screen () */ 328/* arguments for rxvt_term::scr_change_screen () */
304enum { 329enum {
305 PRIMARY = 0, 330 PRIMARY = 0,
306 SECONDARY, 331 SECONDARY,
307}; 332};
308 333
334// define various rendition bits and masks. the rendition word
335// is 32 bits in size, and we should use it as efficiently as possible
336
309#define RS_None 0 337#define RS_None 0
310 338
311#define RS_colorMask 0x0000007fUL // 128 colors 339// GET_BGATTR depends on RS_fgShift > RS_bgShift
340#define RS_colorMask ((1UL << Color_Bits) - 1UL)
312#define RS_fgShift 0 341#define RS_bgShift 0
313#define RS_bgShift Color_Bits 342#define RS_fgShift (RS_bgShift + Color_Bits)
343#define RS_bgMask (RS_colorMask << RS_bgShift)
314#define RS_fgMask (RS_colorMask << RS_fgShift) 344#define RS_fgMask (RS_colorMask << RS_fgShift)
315#define RS_bgMask (RS_colorMask << RS_bgShift) 345
346// must have space for rxvt_fontset::fontCount * 2 + 2 values
347#define RS_fontShift (RS_fgShift + Color_Bits)
348#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
349#define RS_fontCount rxvt_fontset::fontCount
350#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
351
352// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
353#define RS_redraw (2UL << RS_fontShift)
354
355#define RS_Sel (1UL << 22)
356
357// 4 custom bits for extensions
358#define RS_customCount 16UL
359#define RS_customShift 23
360#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
316 361
317// font styles 362// font styles
318#define RS_Bold 0x00004000UL // value 1 363#define RS_Bold (1UL << RS_styleShift)
319#define RS_Italic 0x00008000UL // value 2 364#define RS_Italic (2UL << RS_styleShift)
365
366#define RS_styleCount 4
367#define RS_styleShift 27
368#define RS_styleMask (RS_Bold | RS_Italic)
320 369
321// fake styles 370// fake styles
322#define RS_Blink 0x00010000UL // blink 371#define RS_Blink (1UL << 29)
323#define RS_RVid 0x00020000UL // reverse video 372#define RS_RVid (1UL << 30) // reverse video
324#define RS_Uline 0x00040000UL // underline 373#define RS_Uline (1UL << 31) // underline
325
326// 5 custom bits for extensions
327#define RS_customCount 16
328#define RS_customMask 0x00780000UL
329#define RS_customShift 19
330
331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0xf8000000UL // includes RS_Careful
333#define RS_fontShift 27
334#define RS_Careful 0x08000000UL /* be careful when drawing these */
335
336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
337#define RS_redraw 0x02000000UL
338
339#define RS_styleCount 4
340#define RS_styleMask (RS_Bold | RS_Italic)
341#define RS_styleShift 14
342 374
343#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 375#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
344#define RS_attrMask (RS_baseattrMask | RS_fontMask) 376#define RS_attrMask (RS_baseattrMask | RS_fontMask)
345 377
346#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 378#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)) 379#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 380
360enum { 381enum {
361 C0_NUL = 0x00, 382 C0_NUL = 0x00,
362 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 383 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 , 384 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 402 XTerm_Color_cursor = 12, // change actual 'Cursor' color
382 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 403 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
383 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 404 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
384 XTerm_Color05 = 15, // not implemented (tektronix fg) 405 XTerm_Color05 = 15, // not implemented (tektronix fg)
385 XTerm_Color06 = 16, // not implemented (tektronix bg) 406 XTerm_Color06 = 16, // not implemented (tektronix bg)
386 XTerm_Color_RV = 17, // change actual 'Highlight' color 407 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
408 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
387 XTerm_logfile = 46, // not implemented 409 XTerm_logfile = 46, // not implemented
388 XTerm_font = 50, 410 XTerm_font = 50,
389 411
390 XTerm_konsole30 = 30, // reserved for konsole 412 XTerm_konsole30 = 30, // reserved for konsole
391 XTerm_konsole31 = 31, // reserved for konsole 413 XTerm_konsole31 = 31, // reserved for konsole
… …
393 /* 415 /*
394 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 416 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
395 */ 417 */
396 418
397 // deprecated 419 // deprecated
398 Rxvt_Color_BD = 18,
399 Rxvt_Color_UL = 19,
400 Rxvt_restoreFG = 39, 420 Rxvt_restoreFG = 39,
401 Rxvt_restoreBG = 49, 421 Rxvt_restoreBG = 49,
402 422
403 Rxvt_Pixmap = 20, // new bg pixmap 423 Rxvt_Pixmap = 20, // new bg pixmap
404 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 424 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
458 Color_White = maxBrightCOLOR, 478 Color_White = maxBrightCOLOR,
459#else 479#else
460 Color_White = maxCOLOR, 480 Color_White = maxCOLOR,
461#endif 481#endif
462 minTermCOLOR = Color_White + 1, 482 minTermCOLOR = Color_White + 1,
483#if USE_256_COLORS
484 maxTermCOLOR = Color_White + 240,
485#else
463 maxTermCOLOR = Color_White + 72, 486 maxTermCOLOR = Color_White + 72,
487#endif
464#ifndef NO_CURSORCOLOR 488#ifndef NO_CURSORCOLOR
465 Color_cursor, 489 Color_cursor,
466 Color_cursor2, 490 Color_cursor2,
467#endif 491#endif
468 Color_pointer_fg, 492 Color_pointer_fg,
… …
477#if ENABLE_FRILLS 501#if ENABLE_FRILLS
478 Color_underline, 502 Color_underline,
479#endif 503#endif
480#ifdef OPTION_HC 504#ifdef OPTION_HC
481 Color_HC, 505 Color_HC,
506 Color_HTC,
482#endif 507#endif
483 Color_scroll, 508 Color_scroll,
484#ifdef RXVT_SCROLLBAR 509#ifdef RXVT_SCROLLBAR
485 Color_trough, 510 Color_trough,
486#endif 511#endif
… …
498#else 523#else
499 TOTAL_COLORS = NRS_COLORS 524 TOTAL_COLORS = NRS_COLORS
500#endif 525#endif
501}; 526};
502 527
528#if USE_256_COLORS
529# define Color_Bits 9 // 0 .. maxTermCOLOR
530#else
503#define Color_Bits 7 // 0 .. maxTermCOLOR 531# define Color_Bits 7 // 0 .. maxTermCOLOR
532#endif
504 533
505/* 534/*
506 * Resource list 535 * Resource list
507 */ 536 */
508enum { 537enum {
… …
536#define PrivMode_vt52 (1UL<<18) 565#define PrivMode_vt52 (1UL<<18)
537#define PrivMode_LFNL (1UL<<19) 566#define PrivMode_LFNL (1UL<<19)
538#define PrivMode_MouseBtnEvent (1UL<<20) 567#define PrivMode_MouseBtnEvent (1UL<<20)
539#define PrivMode_MouseAnyEvent (1UL<<21) 568#define PrivMode_MouseAnyEvent (1UL<<21)
540#define PrivMode_BracketPaste (1UL<<22) 569#define PrivMode_BracketPaste (1UL<<22)
570#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
571#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
541 572
542#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 573#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
543 574
544#ifdef ALLOW_132_MODE 575#ifdef ALLOW_132_MODE
545# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 576# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
596/* 627/*
597 ***************************************************************************** 628 *****************************************************************************
598 * MACRO DEFINES 629 * MACRO DEFINES
599 ***************************************************************************** 630 *****************************************************************************
600 */ 631 */
632
633// speed hack, copy some member variable into a local variable of the same name
601#define dLocal(type,name) type const name = this->name 634#define dLocal(type,name) type const name = this->name
602 635
603// for speed reasons, we assume that all codepoints 32 to 126 are 636// for speed reasons, we assume that all codepoints 32 to 126 are
604// single-width. 637// single-width.
605#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 638#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
629 662
630#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 663#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
631#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 664#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
632 665
633#define GET_ATTR(x) (((x) & RS_attrMask)) 666#define GET_ATTR(x) (((x) & RS_attrMask))
667// return attributes defining the background, encoding doesn't matter
668// depends on RS_fgShift > RS_bgShift
634#define GET_BGATTR(x) \ 669#define GET_BGATTR(x) \
670 (ecb_unlikely ((x) & RS_RVid) \
635 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 671 ? (((x) & (RS_attrMask & ~RS_RVid)) \
636 | (((x) & RS_colorMask) << RS_bgShift)) \ 672 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
637 : ((x) & (RS_attrMask | RS_bgMask))) 673 : ((x) & (RS_attrMask | RS_bgMask)))
638#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 674#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
639#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 675#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
640#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 676#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
641 677
642#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 678#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
… …
783{ 819{
784 int x, y, w, h; // overlay dimensions 820 int x, y, w, h; // overlay dimensions
785 text_t **text; 821 text_t **text;
786 rend_t **rend; 822 rend_t **rend;
787 823
788 // while tempting to add swap() etc. here, it effetcively only increases code size 824 // while tempting to add swap() etc. here, it effectively only increases code size
789}; 825};
790 826
791/* ------------------------------------------------------------------------- */ 827/* ------------------------------------------------------------------------- */
792 828
793typedef struct 829typedef struct
… …
832 * END······················= total_rows 868 * END······················= total_rows
833 */ 869 */
834 870
835struct TermWin_t 871struct TermWin_t
836{ 872{
873 int vt_width; /* actual window width [pixels] */
874 int vt_height; /* actual window height [pixels] */
837 int width; /* window width [pixels] */ 875 int width; /* window width [pixels] */
838 int height; /* window height [pixels] */ 876 int height; /* window height [pixels] */
839 int fwidth; /* font width [pixels] */ 877 int fwidth; /* font width [pixels] */
840 int fheight; /* font height [pixels] */ 878 int fheight; /* font height [pixels] */
841 int fbase; /* font ascent (baseline) [pixels] */ 879 int fbase; /* font ascent (baseline) [pixels] */
… …
850 int saveLines; /* number of lines that fit in scrollback */ 888 int saveLines; /* number of lines that fit in scrollback */
851 int total_rows; /* total number of rows in this terminal */ 889 int total_rows; /* total number of rows in this terminal */
852 int term_start; /* term lines start here */ 890 int term_start; /* term lines start here */
853 int view_start; /* scrollback view starts here */ 891 int view_start; /* scrollback view starts here */
854 int top_row; /* topmost row index of scrollback */ 892 int top_row; /* topmost row index of scrollback */
855 Window parent[6]; /* parent identifiers - we're parent[0] */ 893 Window parent; /* parent identifier */
856 Window vt; /* vt100 window */ 894 Window vt; /* vt100 window */
857 GC gc; /* GC for drawing */ 895 GC gc; /* GC for drawing */
858 Pixmap pixmap;
859 rxvt_drawable *drawable; 896 rxvt_drawable *drawable;
860 rxvt_fontset *fontset[4]; 897 rxvt_fontset *fontset[4];
861}; 898};
862 899
863/* 900/*
… …
925#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 962#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
926#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 963#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
927 964
928/* rxvt_vars.options */ 965/* rxvt_vars.options */
929enum { 966enum {
930# define def(name,idx) Opt_ ## name = idx,
931# define nodef(name) Opt_ ## name = 0, 967# define def(name) Opt_ ## name,
968# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
969 Opt_0,
932# include "optinc.h" 970# include "optinc.h"
933# undef nodef 971# undef nodef
934# undef def 972# undef def
935Opt_count 973 Opt_count
936}; 974};
937 975
938/* ------------------------------------------------------------------------- */ 976/* ------------------------------------------------------------------------- */
939 977
940struct rxvt_vars : TermWin_t 978struct rxvt_vars : TermWin_t
… …
942 scrollBar_t scrollBar; 980 scrollBar_t scrollBar;
943 uint8_t options[(Opt_count + 7) >> 3]; 981 uint8_t options[(Opt_count + 7) >> 3];
944 XSizeHints szHint; 982 XSizeHints szHint;
945 rxvt_color *pix_colors; 983 rxvt_color *pix_colors;
946 Cursor TermWin_cursor; /* cursor for vt window */ 984 Cursor TermWin_cursor; /* cursor for vt window */
947 int numlock_state;
948 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 985 line_t *row_buf; // all lines, scrollback + terminal, circular
949 line_t *drawn_buf; // text on screen 986 line_t *drawn_buf; // text on screen
950 line_t *swap_buf; // lines for swap buffer 987 line_t *swap_buf; // lines for swap buffer
951 char *tabs; /* per location: 1 == tab-stop */ 988 char *tabs; /* per location: 1 == tab-stop */
952 screen_t screen; 989 screen_t screen;
953 screen_t swap; 990 screen_t swap;
… …
990 hidden_pointer:1, 1027 hidden_pointer:1,
991#endif 1028#endif
992 enc_utf8:1, /* whether locale uses utf-8 */ 1029 enc_utf8:1, /* whether locale uses utf-8 */
993 seen_input:1, /* whether we have seen some program output yet */ 1030 seen_input:1, /* whether we have seen some program output yet */
994 seen_resize:1, /* whether we had a resize event */ 1031 seen_resize:1, /* whether we had a resize event */
1032 init_done:1,
995 parsed_geometry:1; 1033 parsed_geometry:1;
996 1034
997 unsigned char refresh_type, 1035 unsigned char refresh_type,
998#ifdef META8_OPTION 1036#ifdef META8_OPTION
999 meta_char, /* Alt-key prefix */ 1037 meta_char; /* Alt-key prefix */
1000#endif 1038#endif
1001 selection_wait,
1002 selection_type;
1003/* ---------- */ 1039/* ---------- */
1004 bool rvideo_state, rvideo_mode; 1040 bool rvideo_state, rvideo_mode;
1005#ifndef NO_BELL 1041#ifndef NO_BELL
1006 bool rvideo_bell; 1042 bool rvideo_bell;
1007#endif 1043#endif
… …
1035 allowedxerror; 1071 allowedxerror;
1036/* ---------- */ 1072/* ---------- */
1037 unsigned int ModLevel3Mask, 1073 unsigned int ModLevel3Mask,
1038 ModMetaMask, 1074 ModMetaMask,
1039 ModNumLockMask; 1075 ModNumLockMask;
1040 int old_width, /* last used width in screen resize */
1041 old_height; /* last used height in screen resize */
1042 unsigned long priv_modes, 1076 unsigned long priv_modes,
1043 SavedModes; 1077 SavedModes;
1044/* ---------- */ 1078/* ---------- */
1045 Atom *xa; 1079 Atom *xa;
1046/* ---------- */ 1080/* ---------- */
1047 Time selection_time, 1081 Time selection_time,
1048 selection_request_time,
1049 clipboard_time; 1082 clipboard_time;
1083 rxvt_selection *selection_req;
1050 pid_t cmd_pid; /* process id of child */ 1084 pid_t cmd_pid; /* process id of child */
1051 char * incr_buf;
1052 size_t incr_buf_size, incr_buf_fill;
1053/* ---------- */ 1085/* ---------- */
1054 struct mouse_event MEvent; 1086 struct mouse_event MEvent;
1055 XComposeStatus compose; 1087 XComposeStatus compose;
1056 struct termios tio; 1088 static struct termios def_tio;
1057 row_col_t oldcursor; 1089 row_col_t oldcursor;
1058#ifdef HAVE_BG_PIXMAP 1090#ifdef HAVE_BG_PIXMAP
1059 bgPixmap_t bgPixmap; 1091 void bg_init ();
1092 void bg_destroy ();
1093
1094 enum {
1095 //subset returned by make_transparency_pixmap
1096 BG_IS_VALID = 1 << 0,
1097 BG_NEEDS_TINT = 1 << 1,
1098 BG_NEEDS_BLUR = 1 << 2,
1099
1100 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1101
1102 BG_KEEP_ASPECT = 1 << 3,
1103 BG_ROOT_ALIGN = 1 << 4,
1104 BG_TILE = 1 << 14,
1105 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1106
1107 BG_TINT_SET = 1 << 5,
1108 BG_TINT_BITAND = 1 << 6,
1109 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1110
1111 BG_HAS_RENDER = 1 << 7,
1112 BG_HAS_RENDER_CONV = 1 << 8,
1113 BG_CLIENT_RENDER = 1 << 9,
1114
1115 BG_IS_TRANSPARENT = 1 << 10,
1116 BG_NEEDS_REFRESH = 1 << 11,
1117 BG_IS_SIZE_SENSITIVE = 1 << 12,
1118 BG_IS_FROM_FILE = 1 << 13,
1119 };
1120
1121 unsigned int bg_flags;
1122
1123# ifdef BG_IMAGE_FROM_FILE
1124 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1125 bool render_image (unsigned long tr_flags);
1126
1127 enum {
1128 noScale = 0,
1129 windowScale = 100,
1130 defaultScale = windowScale,
1131 centerAlign = 50,
1132 defaultAlign = centerAlign,
1133 };
1134
1135 unsigned int h_scale, v_scale; /* percents of the window size */
1136 int h_align, v_align; /* percents of the window size:
1137 0 - left align, 50 - center, 100 - right */
1138
1139 bool bg_set_geometry (const char *geom, bool update = false);
1140 void bg_set_default_geometry ()
1141 {
1142 h_scale = v_scale = defaultScale;
1143 h_align = v_align = defaultAlign;
1144 }
1145
1146 bool bg_set_file (const char *file);
1147# endif
1148
1149# ifdef ENABLE_TRANSPARENCY
1150 Pixmap root_pixmap; /* current root pixmap set */
1151 rxvt_color tint;
1152 int shade;
1153 int h_blurRadius, v_blurRadius;
1154
1155 bool bg_set_transparent ();
1156 void bg_set_root_pixmap ();
1157 void set_tint_shade_flags ();
1158 bool bg_set_tint (rxvt_color &new_tint);
1159 bool bg_set_shade (const char *shade_str);
1160 bool bg_set_blur (const char *geom);
1161
1162 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1163 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1164 void tint_ximage (Visual *visual, XImage *ximage);
1165 unsigned long make_transparency_pixmap ();
1166# endif
1167
1168 ev_tstamp bg_valid_since;
1169
1170 Pixmap bg_pixmap;
1171 unsigned int bg_pmap_width, bg_pmap_height;
1172
1173 int target_x;
1174 int target_y;
1175 bool bg_set_position (int x, int y);
1176 bool bg_window_size_sensitive ();
1177 bool bg_window_position_sensitive ();
1178
1179 bool bg_render ();
1180 void bg_invalidate ()
1181 {
1182 bg_flags &= ~BG_IS_VALID;
1183 }
1060#endif 1184#endif
1061#ifdef HAVE_AFTERIMAGE 1185#ifdef HAVE_AFTERIMAGE
1186 ASImage *original_asim;
1062 ASVisual *asv; 1187 ASVisual *asv;
1063 ASImageManager *asimman; 1188 ASImageManager *asimman;
1064 1189
1065 void init_asv () 1190 void init_asv ()
1066 { 1191 {
1067 if (!asv) 1192 if (!asv)
1068 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1193 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1069 } 1194 }
1195#endif
1196#ifdef HAVE_PIXBUF
1197 GdkPixbuf *pixbuf;
1198 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1199 int src_x, int src_y, int dst_x, int dst_y,
1200 unsigned int width, unsigned int height);
1070#endif 1201#endif
1071 1202
1072#if ENABLE_OVERLAY 1203#if ENABLE_OVERLAY
1073 overlay_base ov; 1204 overlay_base ov;
1074 1205
… …
1082 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1213 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1083#endif 1214#endif
1084 1215
1085 vector<void *> allocated; // free these memory blocks with free() 1216 vector<void *> allocated; // free these memory blocks with free()
1086 1217
1087 char env_windowid[21]; /* environmental variable WINDOWID */
1088 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1089 char *env_display; /* environmental variable DISPLAY */
1090 char *env_term; /* environmental variable TERM */
1091
1092 char *locale; 1218 char *locale;
1093 char charsets[4]; 1219 char charsets[4];
1094 char *v_buffer; /* pointer to physical buffer */ 1220 char *v_buffer; /* pointer to physical buffer */
1095 unsigned int v_buflen; /* size of area to write */ 1221 unsigned int v_buflen; /* size of area to write */
1096 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1222 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1135 void rootwin_cb (XEvent &xev); 1261 void rootwin_cb (XEvent &xev);
1136 xevent_watcher rootwin_ev; 1262 xevent_watcher rootwin_ev;
1137#endif 1263#endif
1138#ifdef HAVE_BG_PIXMAP 1264#ifdef HAVE_BG_PIXMAP
1139 void update_background (); 1265 void update_background ();
1140#if TRACE_PIXMAPS
1141 void trace_update_background (const char *file, int line);
1142# define update_background() trace_update_background (__FILE__, __LINE__)
1143#endif
1144 void update_background_cb (ev::timer &w, int revents); 1266 void update_background_cb (ev::timer &w, int revents);
1145 ev::timer update_background_ev; 1267 ev::timer update_background_ev;
1146#endif 1268#endif
1147 1269
1148 void x_cb (XEvent &xev); 1270 void x_cb (XEvent &xev);
… …
1153 void child_cb (ev::child &w, int revents); ev::child child_ev; 1275 void child_cb (ev::child &w, int revents); ev::child child_ev;
1154 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1276 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1155 void refresh_check (); 1277 void refresh_check ();
1156 void flush (); 1278 void flush ();
1157 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1279 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1280 void cmdbuf_reify ();
1281 void cmdbuf_append (const char *str, size_t count);
1158 bool pty_fill (); 1282 bool pty_fill ();
1159 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1283 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1160 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1161 1284
1162#ifdef CURSOR_BLINK 1285#ifdef CURSOR_BLINK
1163 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1286 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1164#endif 1287#endif
1165#ifdef TEXT_BLINK 1288#ifdef TEXT_BLINK
… …
1186 void pointer_unblank (); 1309 void pointer_unblank ();
1187 1310
1188 void tt_printf (const char *fmt,...); 1311 void tt_printf (const char *fmt,...);
1189 void tt_write (const char *data, unsigned int len); 1312 void tt_write (const char *data, unsigned int len);
1190 void pty_write (); 1313 void pty_write ();
1191
1192 void init (stringvec *argv, stringvec *envv)
1193 {
1194 this->argv = argv;
1195 init (argv->size (), argv->begin (), envv);
1196 }
1197 1314
1198 void make_current () const // make this the "currently active" urxvt instance 1315 void make_current () const // make this the "currently active" urxvt instance
1199 { 1316 {
1200 SET_R (this); 1317 SET_R (this);
1201 set_environ (envv); 1318 set_environ (envv);
… …
1213 void im_set_size (XRectangle &size); 1330 void im_set_size (XRectangle &size);
1214 void im_set_position (XPoint &pos) NOTHROW; 1331 void im_set_position (XPoint &pos) NOTHROW;
1215 void im_set_color (unsigned long &fg, unsigned long &bg); 1332 void im_set_color (unsigned long &fg, unsigned long &bg);
1216 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1333 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1217 1334
1218 bool IMisRunning (); 1335 bool im_is_running ();
1219 void IMSendSpot (); 1336 void im_send_spot ();
1220 bool IM_get_IC (const char *modifiers); 1337 bool im_get_ic (const char *modifiers);
1221 void IMSetPosition (); 1338 void im_set_position ();
1222#endif 1339#endif
1223 1340
1224 // command.C 1341 // command.C
1225 void key_press (XKeyEvent &ev); 1342 void key_press (XKeyEvent &ev);
1226 void key_release (XKeyEvent &ev); 1343 void key_release (XKeyEvent &ev);
1227 unsigned int cmd_write (const char *str, unsigned int count);
1228 1344
1229 wchar_t next_char () NOTHROW; 1345 wchar_t next_char () NOTHROW;
1230 wchar_t cmd_getc () THROW ((class out_of_input)); 1346 wchar_t cmd_getc () THROW ((class out_of_input));
1231 uint32_t next_octet () NOTHROW; 1347 uint32_t next_octet () NOTHROW;
1232 uint32_t cmd_get8 () THROW ((class out_of_input)); 1348 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1259 void process_color_seq (int report, int color, const char *str, char resp); 1375 void process_color_seq (int report, int color, const char *str, char resp);
1260 void process_xterm_seq (int op, char *str, char resp); 1376 void process_xterm_seq (int op, char *str, char resp);
1261 int privcases (int mode, unsigned long bit); 1377 int privcases (int mode, unsigned long bit);
1262 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1378 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1263 void process_sgr_mode (unsigned int nargs, const int *arg); 1379 void process_sgr_mode (unsigned int nargs, const int *arg);
1264 void process_graphics ();
1265 // init.C 1380 // init.C
1381 void init (stringvec *argv, stringvec *envv);
1382 void init (int argc, const char *const *argv, const char *const *envv);
1383 void init2 (int argc, const char *const *argv);
1266 void init_vars (); 1384 void init_vars ();
1267 const char **init_resources (int argc, const char *const *argv); 1385 const char **init_resources (int argc, const char *const *argv);
1268 void init (int argc, const char *const *argv, stringvec *envv);
1269 void init_env (); 1386 void init_env ();
1270 void set_locale (const char *locale); 1387 void set_locale (const char *locale);
1271 void init_xlocale (); 1388 void init_xlocale ();
1272 void init_command (const char *const *argv); 1389 void init_command (const char *const *argv);
1273 void run_command (const char *const *argv); 1390 void run_command (const char *const *argv);
1274 int run_child (const char *const *argv); 1391 int run_child (const char *const *argv);
1275 void color_aliases (int idx); 1392 void color_aliases (int idx);
1276 void create_windows (int argc, const char *const *argv); 1393 void create_windows (int argc, const char *const *argv);
1277 void get_colours (); 1394 void get_colours ();
1278 void get_ourmods (); 1395 void get_ourmods ();
1396 void set_icon (const char *file);
1279 // main.C 1397 // main.C
1280 void tt_winch (); 1398 void tt_winch ();
1281 rxvt_term (); 1399 rxvt_term ();
1282 ~rxvt_term (); 1400 ~rxvt_term ();
1283 void destroy (); 1401 void destroy ();
… …
1285 void recolour_cursor (); 1403 void recolour_cursor ();
1286 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1404 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1287 void window_calc (unsigned int newwidth, unsigned int newheight); 1405 void window_calc (unsigned int newwidth, unsigned int newheight);
1288 bool set_fonts (); 1406 bool set_fonts ();
1289 void set_string_property (Atom prop, const char *str, int len = -1); 1407 void set_string_property (Atom prop, const char *str, int len = -1);
1408 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1290 void set_utf8_property (Atom prop, const char *str, int len = -1); 1409 void set_utf8_property (Atom prop, const char *str, int len = -1);
1291 void set_title (const char *str); 1410 void set_title (const char *str);
1292 void set_icon_name (const char *str); 1411 void set_icon_name (const char *str);
1293 void set_window_color (int idx, const char *color); 1412 void set_window_color (int idx, const char *color);
1294 void set_colorfgbg (); 1413 char *get_colorfgbg ();
1295 bool set_color (rxvt_color &color, const char *name); 1414 bool set_color (rxvt_color &color, const char *name);
1296 void alias_color (int dst, int src); 1415 void alias_color (int dst, int src);
1297 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1416 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1298 void get_window_origin (int &x, int &y); 1417 void get_window_origin (int &x, int &y);
1299 Pixmap get_pixmap_property (int prop_id); 1418 Pixmap get_pixmap_property (Atom property);
1300 1419
1301 // screen.C 1420 // screen.C
1302 1421
1303 void lalloc (line_t &l) const 1422 void lalloc (line_t &l) const
1304 { 1423 {
… …
1334#ifndef NO_BRIGHTCOLOR 1453#ifndef NO_BRIGHTCOLOR
1335 if (r & RS_Bold 1454 if (r & RS_Bold
1336# if ENABLE_STYLES 1455# if ENABLE_STYLES
1337 && option (Opt_intensityStyles) 1456 && option (Opt_intensityStyles)
1338# endif 1457# endif
1339 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1458 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1340 base += minBrightCOLOR - minCOLOR; 1459 base += minBrightCOLOR - minCOLOR;
1341#endif 1460#endif
1342 return base; 1461 return base;
1343 } 1462 }
1344 1463
… …
1348#ifndef NO_BRIGHTCOLOR 1467#ifndef NO_BRIGHTCOLOR
1349 if (r & RS_Blink 1468 if (r & RS_Blink
1350# if ENABLE_STYLES 1469# if ENABLE_STYLES
1351 && option (Opt_intensityStyles) 1470 && option (Opt_intensityStyles)
1352# endif 1471# endif
1353 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1472 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1354 base += minBrightCOLOR - minCOLOR; 1473 base += minBrightCOLOR - minCOLOR;
1355#endif 1474#endif
1356 return base; 1475 return base;
1357 } 1476 }
1358 1477
1359 bool option (uint8_t opt) const NOTHROW 1478 bool option (uint8_t opt) const NOTHROW
1360 { 1479 {
1361 if (!opt)
1362 return 0;
1363
1364 --opt;
1365 return options[opt >> 3] & (1 << (opt & 7)); 1480 return options[opt >> 3] & (1 << (opt & 7));
1366 } 1481 }
1367 1482
1368 void set_option (uint8_t opt, bool set = true) NOTHROW 1483 void set_option (uint8_t opt, bool set = true) NOTHROW;
1369 {
1370 if (!opt)
1371 return;
1372
1373 --opt;
1374 if (set)
1375 options[opt >> 3] |= (1 << (opt & 7));
1376 else
1377 options[opt >> 3] &= ~(1 << (opt & 7));
1378 }
1379
1380 void set_privmode (unsigned bit, int set) NOTHROW
1381 {
1382 if (set)
1383 priv_modes |= bit;
1384 else
1385 priv_modes &= ~bit;
1386 }
1387 1484
1388 // modifies first argument(!) 1485 // modifies first argument(!)
1486 void tt_paste (char *data, unsigned int len) NOTHROW;
1389 void paste (char *data, unsigned int len) NOTHROW; 1487 void paste (char *data, unsigned int len) NOTHROW;
1390 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1488 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1391 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1489 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1392 void scr_kill_char (line_t &l, int col) const NOTHROW; 1490 void scr_kill_char (line_t &l, int col) const NOTHROW;
1393 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1491 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1402 void scr_backindex () NOTHROW; 1500 void scr_backindex () NOTHROW;
1403 void scr_forwardindex () NOTHROW; 1501 void scr_forwardindex () NOTHROW;
1404#endif 1502#endif
1405 void scr_touch (bool refresh) NOTHROW; 1503 void scr_touch (bool refresh) NOTHROW;
1406 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1504 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1407 void scr_recolour () NOTHROW; 1505 void scr_recolour (bool refresh = true) NOTHROW;
1408 void scr_remap_chars () NOTHROW; 1506 void scr_remap_chars () NOTHROW;
1409 void scr_remap_chars (line_t &l) NOTHROW; 1507 void scr_remap_chars (line_t &l) NOTHROW;
1410 1508
1411 enum cursor_mode { SAVE, RESTORE }; 1509 enum cursor_mode { SAVE, RESTORE };
1412 1510
… …
1447 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1545 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1448 void scr_reverse_selection () NOTHROW; 1546 void scr_reverse_selection () NOTHROW;
1449 void scr_dump (int fd) NOTHROW; 1547 void scr_dump (int fd) NOTHROW;
1450 1548
1451 void selection_check (int check_more) NOTHROW; 1549 void selection_check (int check_more) NOTHROW;
1452 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1453 void selection_property (Window win, Atom prop) NOTHROW;
1454 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1550 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1455 int selection_request_other (Atom target, int selnum) NOTHROW;
1456 void selection_clear (bool clipboard = false) NOTHROW; 1551 void selection_clear (bool clipboard = false) NOTHROW;
1457 void clipboard_copy (Time tm);
1458 void selection_make (Time tm); 1552 void selection_make (Time tm);
1459 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1553 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1460 void selection_start_colrow (int col, int row) NOTHROW; 1554 void selection_start_colrow (int col, int row) NOTHROW;
1461 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1555 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1462 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1556 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1465 void selection_click (int clicks, int x, int y) NOTHROW; 1559 void selection_click (int clicks, int x, int y) NOTHROW;
1466 void selection_extend (int x, int y, int flag) NOTHROW; 1560 void selection_extend (int x, int y, int flag) NOTHROW;
1467 void selection_rotate (int x, int y) NOTHROW; 1561 void selection_rotate (int x, int y) NOTHROW;
1468 1562
1469 // xdefaults.C 1563 // xdefaults.C
1470 void get_options (int argc, const char *const *argv); 1564 const char **get_options (int argc, const char *const *argv);
1471 int parse_keysym (const char *str, const char *arg); 1565 int parse_keysym (const char *str, const char *arg);
1472 const char *x_resource (const char *name); 1566 const char *x_resource (const char *name);
1473 void extract_resources (); 1567 void extract_resources ();
1568 void extract_keysym_resources ();
1474}; 1569};
1475 1570
1476#endif /* _RXVT_H_ */ 1571#endif /* _RXVT_H_ */
1477 1572

Diff Legend

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