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.395 by root, Thu Apr 1 00:41:07 2010 UTC vs.
Revision 1.474 by sf-exg, Sun May 13 21:12:01 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
77#include "encoding.h" 83#include "encoding.h"
78#include "rxvtutil.h" 84#include "rxvtutil.h"
79#include "rxvtfont.h" 85#include "rxvtfont.h"
80#include "rxvttoolkit.h" 86#include "rxvttoolkit.h"
81#include "scrollbar.h" 87#include "scrollbar.h"
… …
98 ***************************************************************************** 104 *****************************************************************************
99 * SYSTEM HACKS 105 * SYSTEM HACKS
100 ***************************************************************************** 106 *****************************************************************************
101 */ 107 */
102 108
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 109#include <termios.h>
108
109#include "background.h"
110 110
111#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 112# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 114# define STDERR_FILENO 2
115#endif 115#endif
116 116
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 120#endif
125 121
126/****************************************************************************/ 122/****************************************************************************/
127 123
128// exception thrown on fatal (per-instance) errors 124// exception thrown on fatal (per-instance) errors
… …
151 147
152const char * rxvt_basename (const char *str) NOTHROW; 148const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 150void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 151void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 152void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
158 154
159char * rxvt_strtrim (char *str) NOTHROW; 155char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 156char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 157
158static inline void
159rxvt_free_strsplit (char **ptr) NOTHROW
160{
161 free (ptr[0]);
162 free (ptr);
163}
162 164
163void * rxvt_malloc (size_t size); 165void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 166void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 167void * rxvt_realloc (void *ptr, size_t size);
166 168
… …
189#else 191#else
190 if (envv) 192 if (envv)
191#endif 193#endif
192 environ = envv; 194 environ = envv;
193} 195}
196
197struct localise_env
198{
199 char **orig_env;
200
201 localise_env (char **new_env)
202 {
203 orig_env = environ;
204 environ = new_env;
205 }
206
207 ~localise_env ()
208 {
209 environ = orig_env;
210 }
211};
194 212
195/* 213/*
196 ***************************************************************************** 214 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 215 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 216 *****************************************************************************
… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 265# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 266#else
249# define COLORTERMENVFULL COLORTERMENV 267# define COLORTERMENVFULL COLORTERMENV
250#endif 268#endif
251#ifndef TERMENV 269#ifndef TERMENV
270# if USE_256_COLORS
271# define TERMENV "rxvt-unicode-256color"
272# else
252# define TERMENV "rxvt-unicode" 273# define TERMENV "rxvt-unicode"
274# endif
253#endif 275#endif
254 276
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 277#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 278# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 279#endif
… …
272# define NSCREENS 0 294# define NSCREENS 0
273#else 295#else
274# define NSCREENS 1 296# define NSCREENS 1
275#endif 297#endif
276 298
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 () */ 299/* flags for rxvt_term::scr_gotorc () */
283enum { 300enum {
284 C_RELATIVE = 1, /* col movement is relative */ 301 C_RELATIVE = 1, /* col movement is relative */
285 R_RELATIVE = 2, /* row movement is relative */ 302 R_RELATIVE = 2, /* row movement is relative */
286 RELATIVE = C_RELATIVE | R_RELATIVE, 303 RELATIVE = C_RELATIVE | R_RELATIVE,
287}; 304};
288 305
289/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 306/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
290enum { 307enum {
291 INSERT = -1, /* don't change these values */ 308 INSERT = -1, /* don't change these values */
292 DELETE = +1, 309 DELETE = +1,
293 ERASE = +2, 310 ERASE = +2,
294}; 311};
295 312
296/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 313/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
297enum page_dirn { 314enum page_dirn {
298 UP, 315 UP,
299 DN, 316 DN,
300 NO_DIR, 317 NO_DIR,
301}; 318};
302 319
303/* arguments for rxvt_scr_change_screen () */ 320/* arguments for rxvt_term::scr_change_screen () */
304enum { 321enum {
305 PRIMARY = 0, 322 PRIMARY = 0,
306 SECONDARY, 323 SECONDARY,
307}; 324};
308 325
326// define various rendition bits and masks. the rendition word
327// is 32 bits in size, and we should use it as efficiently as possible
328
309#define RS_None 0 329#define RS_None 0
310 330
331// GET_BGATTR depends on RS_fgShift > RS_bgShift
311#define RS_colorMask ((1UL << Color_Bits) - 1UL) 332#define RS_colorMask ((1UL << Color_Bits) - 1UL)
312#define RS_bgShift 0 333#define RS_bgShift 0
313#define RS_fgShift (RS_bgShift + Color_Bits) 334#define RS_fgShift (RS_bgShift + Color_Bits)
314#define RS_bgMask (RS_colorMask << RS_bgShift) 335#define RS_bgMask (RS_colorMask << RS_bgShift)
315#define RS_fgMask (RS_colorMask << RS_fgShift) 336#define RS_fgMask (RS_colorMask << RS_fgShift)
316 337
317// font styles 338// must have space for rxvt_fontset::fontCount * 2 + 2 values
318#define RS_Bold 0x08000000UL // value 1 339#define RS_fontShift (RS_fgShift + Color_Bits)
319#define RS_Italic 0x10000000UL // value 2 340#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
341#define RS_fontCount rxvt_fontset::fontCount
342#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
320 343
321// fake styles 344// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
322#define RS_Blink 0x20000000UL // blink 345#define RS_redraw (2UL << RS_fontShift)
323#define RS_RVid 0x40000000UL // reverse video
324#define RS_Uline 0x80000000UL // underline
325 346
347#define RS_Sel (1UL << 22)
348
326// 5 custom bits for extensions 349// 4 custom bits for extensions
327#define RS_customCount 16UL 350#define RS_customCount 16UL
328#define RS_customShift 23 351#define RS_customShift 23
329#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 352#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
330 353
331// must have space for rxvt_fontset::fontCount * 2 + 2 values 354// font styles
332#define RS_fontShift (RS_fgShift + Color_Bits) 355#define RS_Bold (1UL << RS_styleShift)
333#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
334#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
335
336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
337#define RS_redraw (2UL << RS_fontShift) 356#define RS_Italic (2UL << RS_styleShift)
338 357
339#define RS_styleCount 4 358#define RS_styleCount 4
359#define RS_styleShift 27
340#define RS_styleMask (RS_Bold | RS_Italic) 360#define RS_styleMask (RS_Bold | RS_Italic)
341#define RS_styleShift 27 361
362// fake styles
363#define RS_Blink (1UL << 29)
364#define RS_RVid (1UL << 30) // reverse video
365#define RS_Uline (1UL << 31) // underline
342 366
343#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 367#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
344#define RS_attrMask (RS_baseattrMask | RS_fontMask) 368#define RS_attrMask (RS_baseattrMask | RS_fontMask)
345 369
346#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 370#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)) 371#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 372
360enum { 373enum {
361 C0_NUL = 0x00, 374 C0_NUL = 0x00,
362 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 375 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 , 376 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 394 XTerm_Color_cursor = 12, // change actual 'Cursor' color
382 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 395 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
383 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 396 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
384 XTerm_Color05 = 15, // not implemented (tektronix fg) 397 XTerm_Color05 = 15, // not implemented (tektronix fg)
385 XTerm_Color06 = 16, // not implemented (tektronix bg) 398 XTerm_Color06 = 16, // not implemented (tektronix bg)
386 XTerm_Color_RV = 17, // change actual 'Highlight' color 399 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
400 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
387 XTerm_logfile = 46, // not implemented 401 XTerm_logfile = 46, // not implemented
388 XTerm_font = 50, 402 XTerm_font = 50,
389 403
390 XTerm_konsole30 = 30, // reserved for konsole 404 XTerm_konsole30 = 30, // reserved for konsole
391 XTerm_konsole31 = 31, // reserved for konsole 405 XTerm_konsole31 = 31, // reserved for konsole
… …
393 /* 407 /*
394 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 408 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
395 */ 409 */
396 410
397 // deprecated 411 // deprecated
398 Rxvt_Color_BD = 18,
399 Rxvt_Color_UL = 19,
400 Rxvt_restoreFG = 39, 412 Rxvt_restoreFG = 39,
401 Rxvt_restoreBG = 49, 413 Rxvt_restoreBG = 49,
402 414
403 Rxvt_Pixmap = 20, // new bg pixmap 415 Rxvt_Pixmap = 20, // new bg pixmap
404 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 416 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
458 Color_White = maxBrightCOLOR, 470 Color_White = maxBrightCOLOR,
459#else 471#else
460 Color_White = maxCOLOR, 472 Color_White = maxCOLOR,
461#endif 473#endif
462 minTermCOLOR = Color_White + 1, 474 minTermCOLOR = Color_White + 1,
463#ifndef USE_256_COLORS 475#if USE_256_COLORS
476 maxTermCOLOR = Color_White + 240,
477#else
464 maxTermCOLOR = Color_White + 72, 478 maxTermCOLOR = Color_White + 72,
465#else
466 maxTermCOLOR = Color_White + 240,
467#endif 479#endif
468#ifndef NO_CURSORCOLOR 480#ifndef NO_CURSORCOLOR
469 Color_cursor, 481 Color_cursor,
470 Color_cursor2, 482 Color_cursor2,
471#endif 483#endif
… …
481#if ENABLE_FRILLS 493#if ENABLE_FRILLS
482 Color_underline, 494 Color_underline,
483#endif 495#endif
484#ifdef OPTION_HC 496#ifdef OPTION_HC
485 Color_HC, 497 Color_HC,
498 Color_HTC,
486#endif 499#endif
487 Color_scroll, 500 Color_scroll,
488#ifdef RXVT_SCROLLBAR 501#ifdef RXVT_SCROLLBAR
489 Color_trough, 502 Color_trough,
490#endif 503#endif
… …
502#else 515#else
503 TOTAL_COLORS = NRS_COLORS 516 TOTAL_COLORS = NRS_COLORS
504#endif 517#endif
505}; 518};
506 519
507#ifndef USE_256_COLORS 520#if USE_256_COLORS
508#define Color_Bits 7 // 0 .. maxTermCOLOR 521# define Color_Bits 9 // 0 .. maxTermCOLOR
509#else 522#else
510#define Color_Bits 9 // 0 .. maxTermCOLOR 523# define Color_Bits 7 // 0 .. maxTermCOLOR
511#endif 524#endif
512 525
513/* 526/*
514 * Resource list 527 * Resource list
515 */ 528 */
… …
544#define PrivMode_vt52 (1UL<<18) 557#define PrivMode_vt52 (1UL<<18)
545#define PrivMode_LFNL (1UL<<19) 558#define PrivMode_LFNL (1UL<<19)
546#define PrivMode_MouseBtnEvent (1UL<<20) 559#define PrivMode_MouseBtnEvent (1UL<<20)
547#define PrivMode_MouseAnyEvent (1UL<<21) 560#define PrivMode_MouseAnyEvent (1UL<<21)
548#define PrivMode_BracketPaste (1UL<<22) 561#define PrivMode_BracketPaste (1UL<<22)
562#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
563#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
549 564
550#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 565#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
551 566
552#ifdef ALLOW_132_MODE 567#ifdef ALLOW_132_MODE
553# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 568# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
604/* 619/*
605 ***************************************************************************** 620 *****************************************************************************
606 * MACRO DEFINES 621 * MACRO DEFINES
607 ***************************************************************************** 622 *****************************************************************************
608 */ 623 */
624
625// speed hack, copy some member variable into a local variable of the same name
609#define dLocal(type,name) type const name = this->name 626#define dLocal(type,name) type const name = this->name
610 627
611// for speed reasons, we assume that all codepoints 32 to 126 are 628// for speed reasons, we assume that all codepoints 32 to 126 are
612// single-width. 629// single-width.
613#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 630#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
637 654
638#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 655#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
639#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 656#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
640 657
641#define GET_ATTR(x) (((x) & RS_attrMask)) 658#define GET_ATTR(x) (((x) & RS_attrMask))
659// return attributes defining the background, encoding doesn't matter
660// depends on RS_fgShift > RS_bgShift
642#define GET_BGATTR(x) \ 661#define GET_BGATTR(x) \
662 (ecb_unlikely ((x) & RS_RVid) \
643 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 663 ? (((x) & (RS_attrMask & ~RS_RVid)) \
644 | (((x) & RS_colorMask) << RS_bgShift)) \ 664 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
645 : ((x) & (RS_attrMask | RS_bgMask))) 665 : ((x) & (RS_attrMask | RS_bgMask)))
646#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 666#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
647#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 667#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
648#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 668#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
649 669
650#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 670#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
… …
791{ 811{
792 int x, y, w, h; // overlay dimensions 812 int x, y, w, h; // overlay dimensions
793 text_t **text; 813 text_t **text;
794 rend_t **rend; 814 rend_t **rend;
795 815
796 // while tempting to add swap() etc. here, it effetcively only increases code size 816 // while tempting to add swap() etc. here, it effectively only increases code size
797}; 817};
798 818
799/* ------------------------------------------------------------------------- */ 819/* ------------------------------------------------------------------------- */
800 820
801typedef struct 821typedef struct
… …
840 * END······················= total_rows 860 * END······················= total_rows
841 */ 861 */
842 862
843struct TermWin_t 863struct TermWin_t
844{ 864{
865 int vt_width; /* actual window width [pixels] */
866 int vt_height; /* actual window height [pixels] */
845 int width; /* window width [pixels] */ 867 int width; /* window width [pixels] */
846 int height; /* window height [pixels] */ 868 int height; /* window height [pixels] */
847 int fwidth; /* font width [pixels] */ 869 int fwidth; /* font width [pixels] */
848 int fheight; /* font height [pixels] */ 870 int fheight; /* font height [pixels] */
849 int fbase; /* font ascent (baseline) [pixels] */ 871 int fbase; /* font ascent (baseline) [pixels] */
… …
858 int saveLines; /* number of lines that fit in scrollback */ 880 int saveLines; /* number of lines that fit in scrollback */
859 int total_rows; /* total number of rows in this terminal */ 881 int total_rows; /* total number of rows in this terminal */
860 int term_start; /* term lines start here */ 882 int term_start; /* term lines start here */
861 int view_start; /* scrollback view starts here */ 883 int view_start; /* scrollback view starts here */
862 int top_row; /* topmost row index of scrollback */ 884 int top_row; /* topmost row index of scrollback */
863 Window parent[6]; /* parent identifiers - we're parent[0] */ 885 Window parent; /* parent identifier */
864 Window vt; /* vt100 window */ 886 Window vt; /* vt100 window */
865 GC gc; /* GC for drawing */ 887 GC gc; /* GC for drawing */
866 Pixmap pixmap;
867 rxvt_drawable *drawable; 888 rxvt_drawable *drawable;
868 rxvt_fontset *fontset[4]; 889 rxvt_fontset *fontset[4];
869}; 890};
870 891
871/* 892/*
… …
933#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 954#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
934#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 955#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
935 956
936/* rxvt_vars.options */ 957/* rxvt_vars.options */
937enum { 958enum {
938# define def(name,idx) Opt_ ## name = idx,
939# define nodef(name) Opt_ ## name = 0, 959# define def(name) Opt_ ## name,
960# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
961 Opt_0,
940# include "optinc.h" 962# include "optinc.h"
941# undef nodef 963# undef nodef
942# undef def 964# undef def
943Opt_count 965 Opt_count
944}; 966};
945 967
946/* ------------------------------------------------------------------------- */ 968/* ------------------------------------------------------------------------- */
947 969
948struct rxvt_vars : TermWin_t 970struct rxvt_vars : TermWin_t
… …
950 scrollBar_t scrollBar; 972 scrollBar_t scrollBar;
951 uint8_t options[(Opt_count + 7) >> 3]; 973 uint8_t options[(Opt_count + 7) >> 3];
952 XSizeHints szHint; 974 XSizeHints szHint;
953 rxvt_color *pix_colors; 975 rxvt_color *pix_colors;
954 Cursor TermWin_cursor; /* cursor for vt window */ 976 Cursor TermWin_cursor; /* cursor for vt window */
955 int numlock_state;
956 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 977 line_t *row_buf; // all lines, scrollback + terminal, circular
957 line_t *drawn_buf; // text on screen 978 line_t *drawn_buf; // text on screen
958 line_t *swap_buf; // lines for swap buffer 979 line_t *swap_buf; // lines for swap buffer
959 char *tabs; /* per location: 1 == tab-stop */ 980 char *tabs; /* per location: 1 == tab-stop */
960 screen_t screen; 981 screen_t screen;
961 screen_t swap; 982 screen_t swap;
… …
998 hidden_pointer:1, 1019 hidden_pointer:1,
999#endif 1020#endif
1000 enc_utf8:1, /* whether locale uses utf-8 */ 1021 enc_utf8:1, /* whether locale uses utf-8 */
1001 seen_input:1, /* whether we have seen some program output yet */ 1022 seen_input:1, /* whether we have seen some program output yet */
1002 seen_resize:1, /* whether we had a resize event */ 1023 seen_resize:1, /* whether we had a resize event */
1024 init_done:1,
1003 parsed_geometry:1; 1025 parsed_geometry:1;
1004 1026
1005 unsigned char refresh_type, 1027 unsigned char refresh_type,
1006#ifdef META8_OPTION 1028#ifdef META8_OPTION
1007 meta_char, /* Alt-key prefix */ 1029 meta_char; /* Alt-key prefix */
1008#endif 1030#endif
1009 selection_wait,
1010 selection_type;
1011/* ---------- */ 1031/* ---------- */
1012 bool rvideo_state, rvideo_mode; 1032 bool rvideo_state, rvideo_mode;
1013#ifndef NO_BELL 1033#ifndef NO_BELL
1014 bool rvideo_bell; 1034 bool rvideo_bell;
1015#endif 1035#endif
… …
1043 allowedxerror; 1063 allowedxerror;
1044/* ---------- */ 1064/* ---------- */
1045 unsigned int ModLevel3Mask, 1065 unsigned int ModLevel3Mask,
1046 ModMetaMask, 1066 ModMetaMask,
1047 ModNumLockMask; 1067 ModNumLockMask;
1048 int old_width, /* last used width in screen resize */
1049 old_height; /* last used height in screen resize */
1050 unsigned long priv_modes, 1068 unsigned long priv_modes,
1051 SavedModes; 1069 SavedModes;
1052/* ---------- */ 1070/* ---------- */
1053 Atom *xa; 1071 Atom *xa;
1054/* ---------- */ 1072/* ---------- */
1055 Time selection_time, 1073 Time selection_time,
1056 selection_request_time,
1057 clipboard_time; 1074 clipboard_time;
1075 rxvt_selection *selection_req;
1058 pid_t cmd_pid; /* process id of child */ 1076 pid_t cmd_pid; /* process id of child */
1059 char * incr_buf;
1060 size_t incr_buf_size, incr_buf_fill;
1061/* ---------- */ 1077/* ---------- */
1062 struct mouse_event MEvent; 1078 struct mouse_event MEvent;
1063 XComposeStatus compose; 1079 XComposeStatus compose;
1064 struct termios tio; 1080 static struct termios def_tio;
1065 row_col_t oldcursor; 1081 row_col_t oldcursor;
1066#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1067 bgPixmap_t bgPixmap;
1068#endif
1069#ifdef HAVE_AFTERIMAGE
1070 ASVisual *asv;
1071 ASImageManager *asimman;
1072
1073 void init_asv () 1083 void bg_init ();
1084 void bg_destroy ();
1085
1086 enum {
1087 BG_IS_VALID = 1 << 0,
1088
1089 BG_KEEP_ASPECT = 1 << 3,
1090 BG_ROOT_ALIGN = 1 << 4,
1091 BG_TILE = 1 << 14,
1092 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1093
1094 BG_TINT_SET = 1 << 5,
1095 BG_TINT_BITAND = 1 << 6,
1096
1097 BG_HAS_RENDER = 1 << 7,
1098 BG_HAS_RENDER_CONV = 1 << 8,
1099 BG_CLIENT_RENDER = 1 << 9,
1100
1101 BG_IS_TRANSPARENT = 1 << 10,
1102 BG_NEEDS_REFRESH = 1 << 11,
1103 BG_IS_SIZE_SENSITIVE = 1 << 12,
1104 BG_IS_FROM_FILE = 1 << 13,
1105 };
1106
1107 unsigned int bg_flags;
1108
1109# ifdef BG_IMAGE_FROM_FILE
1110 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1111 bool render_image (bool transparent);
1112
1113 enum {
1114 noScale = 0,
1115 windowScale = 100,
1116 defaultScale = windowScale,
1117 centerAlign = 50,
1118 defaultAlign = centerAlign,
1119 };
1120
1121 unsigned int h_scale, v_scale; /* percents of the window size */
1122 int h_align, v_align; /* percents of the window size:
1123 0 - left align, 50 - center, 100 - right */
1124
1125 bool bg_set_geometry (const char *geom, bool update = false);
1126 void bg_set_default_geometry ()
1074 { 1127 {
1075 if (!asv) 1128 h_scale = v_scale = defaultScale;
1076 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1129 h_align = v_align = defaultAlign;
1077 } 1130 }
1131
1132 bool bg_set_file (const char *file);
1133# endif
1134
1135# ifdef ENABLE_TRANSPARENCY
1136 Pixmap root_pixmap; /* current root pixmap set */
1137 rxvt_color tint;
1138 int shade;
1139 int h_blurRadius, v_blurRadius;
1140
1141 void bg_set_transparent ()
1142 {
1143 bg_flags |= BG_IS_TRANSPARENT;
1144 }
1145 void bg_set_root_pixmap ();
1146 bool bg_set_tint (rxvt_color &new_tint);
1147 bool bg_set_shade (const char *shade_str);
1148 bool bg_set_blur (const char *geom);
1149
1150 bool blur_pixmap (Pixmap pixmap, int width, int height);
1151 bool tint_pixmap (Pixmap pixmap, int width, int height);
1152 void tint_ximage (XImage *ximage);
1153 bool make_transparency_pixmap ();
1154# endif
1155
1156 ev_tstamp bg_valid_since;
1157
1158 Pixmap bg_pixmap;
1159 unsigned int bg_pmap_width, bg_pmap_height;
1160
1161 int target_x;
1162 int target_y;
1163 bool bg_set_position (int x, int y);
1164 bool bg_window_size_sensitive ();
1165 bool bg_window_position_sensitive ();
1166
1167 bool bg_render ();
1168 void bg_invalidate ()
1169 {
1170 bg_flags &= ~BG_IS_VALID;
1171 }
1172#endif
1173#ifdef HAVE_PIXBUF
1174 GdkPixbuf *pixbuf;
1175 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1176 int src_x, int src_y, int dst_x, int dst_y,
1177 unsigned int width, unsigned int height);
1078#endif 1178#endif
1079 1179
1080#if ENABLE_OVERLAY 1180#if ENABLE_OVERLAY
1081 overlay_base ov; 1181 overlay_base ov;
1082 1182
… …
1090 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1190 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1091#endif 1191#endif
1092 1192
1093 vector<void *> allocated; // free these memory blocks with free() 1193 vector<void *> allocated; // free these memory blocks with free()
1094 1194
1095 char env_windowid[21]; /* environmental variable WINDOWID */
1096 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1097 char *env_display; /* environmental variable DISPLAY */
1098 char *env_term; /* environmental variable TERM */
1099
1100 char *locale; 1195 char *locale;
1101 char charsets[4]; 1196 char charsets[4];
1102 char *v_buffer; /* pointer to physical buffer */ 1197 char *v_buffer; /* pointer to physical buffer */
1103 unsigned int v_buflen; /* size of area to write */ 1198 unsigned int v_buflen; /* size of area to write */
1104 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1199 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1143 void rootwin_cb (XEvent &xev); 1238 void rootwin_cb (XEvent &xev);
1144 xevent_watcher rootwin_ev; 1239 xevent_watcher rootwin_ev;
1145#endif 1240#endif
1146#ifdef HAVE_BG_PIXMAP 1241#ifdef HAVE_BG_PIXMAP
1147 void update_background (); 1242 void update_background ();
1148#if TRACE_PIXMAPS
1149 void trace_update_background (const char *file, int line);
1150# define update_background() trace_update_background (__FILE__, __LINE__)
1151#endif
1152 void update_background_cb (ev::timer &w, int revents); 1243 void update_background_cb (ev::timer &w, int revents);
1153 ev::timer update_background_ev; 1244 ev::timer update_background_ev;
1154#endif 1245#endif
1155 1246
1156 void x_cb (XEvent &xev); 1247 void x_cb (XEvent &xev);
… …
1161 void child_cb (ev::child &w, int revents); ev::child child_ev; 1252 void child_cb (ev::child &w, int revents); ev::child child_ev;
1162 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1253 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1163 void refresh_check (); 1254 void refresh_check ();
1164 void flush (); 1255 void flush ();
1165 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1256 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1257 void cmdbuf_reify ();
1258 void cmdbuf_append (const char *str, size_t count);
1166 bool pty_fill (); 1259 bool pty_fill ();
1167 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1260 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1168 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1169 1261
1170#ifdef CURSOR_BLINK 1262#ifdef CURSOR_BLINK
1263 void cursor_blink_reset ();
1171 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1264 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1172#endif 1265#endif
1173#ifdef TEXT_BLINK 1266#ifdef TEXT_BLINK
1174 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1267 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1175#endif 1268#endif
… …
1194 void pointer_unblank (); 1287 void pointer_unblank ();
1195 1288
1196 void tt_printf (const char *fmt,...); 1289 void tt_printf (const char *fmt,...);
1197 void tt_write (const char *data, unsigned int len); 1290 void tt_write (const char *data, unsigned int len);
1198 void pty_write (); 1291 void pty_write ();
1199
1200 void init (stringvec *argv, stringvec *envv)
1201 {
1202 this->argv = argv;
1203 init (argv->size (), argv->begin (), envv);
1204 }
1205 1292
1206 void make_current () const // make this the "currently active" urxvt instance 1293 void make_current () const // make this the "currently active" urxvt instance
1207 { 1294 {
1208 SET_R (this); 1295 SET_R (this);
1209 set_environ (envv); 1296 set_environ (envv);
… …
1221 void im_set_size (XRectangle &size); 1308 void im_set_size (XRectangle &size);
1222 void im_set_position (XPoint &pos) NOTHROW; 1309 void im_set_position (XPoint &pos) NOTHROW;
1223 void im_set_color (unsigned long &fg, unsigned long &bg); 1310 void im_set_color (unsigned long &fg, unsigned long &bg);
1224 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1311 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1225 1312
1226 bool IMisRunning (); 1313 bool im_is_running ();
1227 void IMSendSpot (); 1314 void im_send_spot ();
1228 bool IM_get_IC (const char *modifiers); 1315 bool im_get_ic (const char *modifiers);
1229 void IMSetPosition (); 1316 void im_set_position ();
1230#endif 1317#endif
1231 1318
1232 // command.C 1319 // command.C
1233 void key_press (XKeyEvent &ev); 1320 void key_press (XKeyEvent &ev);
1234 void key_release (XKeyEvent &ev); 1321 void key_release (XKeyEvent &ev);
1235 unsigned int cmd_write (const char *str, unsigned int count);
1236 1322
1237 wchar_t next_char () NOTHROW; 1323 wchar_t next_char () NOTHROW;
1238 wchar_t cmd_getc () THROW ((class out_of_input)); 1324 wchar_t cmd_getc () THROW ((class out_of_input));
1239 uint32_t next_octet () NOTHROW; 1325 uint32_t next_octet () NOTHROW;
1240 uint32_t cmd_get8 () THROW ((class out_of_input)); 1326 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1267 void process_color_seq (int report, int color, const char *str, char resp); 1353 void process_color_seq (int report, int color, const char *str, char resp);
1268 void process_xterm_seq (int op, char *str, char resp); 1354 void process_xterm_seq (int op, char *str, char resp);
1269 int privcases (int mode, unsigned long bit); 1355 int privcases (int mode, unsigned long bit);
1270 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1356 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1271 void process_sgr_mode (unsigned int nargs, const int *arg); 1357 void process_sgr_mode (unsigned int nargs, const int *arg);
1272 void process_graphics ();
1273 // init.C 1358 // init.C
1359 void init (stringvec *argv, stringvec *envv);
1360 void init (int argc, const char *const *argv, const char *const *envv);
1361 void init2 (int argc, const char *const *argv);
1274 void init_vars (); 1362 void init_vars ();
1275 const char **init_resources (int argc, const char *const *argv); 1363 const char **init_resources (int argc, const char *const *argv);
1276 void init (int argc, const char *const *argv, stringvec *envv);
1277 void init_env (); 1364 void init_env ();
1278 void set_locale (const char *locale); 1365 void set_locale (const char *locale);
1279 void init_xlocale (); 1366 void init_xlocale ();
1280 void init_command (const char *const *argv); 1367 void init_command (const char *const *argv);
1281 void run_command (const char *const *argv); 1368 void run_command (const char *const *argv);
1282 int run_child (const char *const *argv); 1369 int run_child (const char *const *argv);
1283 void color_aliases (int idx); 1370 void color_aliases (int idx);
1284 void create_windows (int argc, const char *const *argv); 1371 void create_windows (int argc, const char *const *argv);
1285 void get_colours (); 1372 void get_colours ();
1286 void get_ourmods (); 1373 void get_ourmods ();
1374 void set_icon (const char *file);
1287 // main.C 1375 // main.C
1288 void tt_winch (); 1376 void tt_winch ();
1289 rxvt_term (); 1377 rxvt_term ();
1290 ~rxvt_term (); 1378 ~rxvt_term ();
1291 void destroy (); 1379 void destroy ();
… …
1293 void recolour_cursor (); 1381 void recolour_cursor ();
1294 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1382 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1295 void window_calc (unsigned int newwidth, unsigned int newheight); 1383 void window_calc (unsigned int newwidth, unsigned int newheight);
1296 bool set_fonts (); 1384 bool set_fonts ();
1297 void set_string_property (Atom prop, const char *str, int len = -1); 1385 void set_string_property (Atom prop, const char *str, int len = -1);
1386 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1298 void set_utf8_property (Atom prop, const char *str, int len = -1); 1387 void set_utf8_property (Atom prop, const char *str, int len = -1);
1299 void set_title (const char *str); 1388 void set_title (const char *str);
1300 void set_icon_name (const char *str); 1389 void set_icon_name (const char *str);
1301 void set_window_color (int idx, const char *color); 1390 void set_window_color (int idx, const char *color);
1302 void set_colorfgbg (); 1391 char *get_colorfgbg ();
1303 bool set_color (rxvt_color &color, const char *name); 1392 bool set_color (rxvt_color &color, const char *name);
1304 void alias_color (int dst, int src); 1393 void alias_color (int dst, int src);
1305 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1394 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1306 void get_window_origin (int &x, int &y); 1395 void get_window_origin (int &x, int &y);
1307 Pixmap get_pixmap_property (int prop_id); 1396 Pixmap get_pixmap_property (Atom property);
1308 1397
1309 // screen.C 1398 // screen.C
1310 1399
1311 void lalloc (line_t &l) const 1400 void lalloc (line_t &l) const
1312 { 1401 {
… …
1342#ifndef NO_BRIGHTCOLOR 1431#ifndef NO_BRIGHTCOLOR
1343 if (r & RS_Bold 1432 if (r & RS_Bold
1344# if ENABLE_STYLES 1433# if ENABLE_STYLES
1345 && option (Opt_intensityStyles) 1434 && option (Opt_intensityStyles)
1346# endif 1435# endif
1347 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1436 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1348 base += minBrightCOLOR - minCOLOR; 1437 base += minBrightCOLOR - minCOLOR;
1349#endif 1438#endif
1350 return base; 1439 return base;
1351 } 1440 }
1352 1441
… …
1356#ifndef NO_BRIGHTCOLOR 1445#ifndef NO_BRIGHTCOLOR
1357 if (r & RS_Blink 1446 if (r & RS_Blink
1358# if ENABLE_STYLES 1447# if ENABLE_STYLES
1359 && option (Opt_intensityStyles) 1448 && option (Opt_intensityStyles)
1360# endif 1449# endif
1361 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1450 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1362 base += minBrightCOLOR - minCOLOR; 1451 base += minBrightCOLOR - minCOLOR;
1363#endif 1452#endif
1364 return base; 1453 return base;
1365 } 1454 }
1366 1455
1367 bool option (uint8_t opt) const NOTHROW 1456 bool option (uint8_t opt) const NOTHROW
1368 { 1457 {
1369 if (!opt)
1370 return 0;
1371
1372 --opt;
1373 return options[opt >> 3] & (1 << (opt & 7)); 1458 return options[opt >> 3] & (1 << (opt & 7));
1374 } 1459 }
1375 1460
1376 void set_option (uint8_t opt, bool set = true) NOTHROW 1461 void set_option (uint8_t opt, bool set = true) NOTHROW;
1377 {
1378 if (!opt)
1379 return;
1380
1381 --opt;
1382 if (set)
1383 options[opt >> 3] |= (1 << (opt & 7));
1384 else
1385 options[opt >> 3] &= ~(1 << (opt & 7));
1386 }
1387
1388 void set_privmode (unsigned bit, int set) NOTHROW
1389 {
1390 if (set)
1391 priv_modes |= bit;
1392 else
1393 priv_modes &= ~bit;
1394 }
1395 1462
1396 // modifies first argument(!) 1463 // modifies first argument(!)
1464 void tt_paste (char *data, unsigned int len) NOTHROW;
1397 void paste (char *data, unsigned int len) NOTHROW; 1465 void paste (char *data, unsigned int len) NOTHROW;
1398 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1466 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1399 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1467 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1400 void scr_kill_char (line_t &l, int col) const NOTHROW; 1468 void scr_kill_char (line_t &l, int col) const NOTHROW;
1401 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1469 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1410 void scr_backindex () NOTHROW; 1478 void scr_backindex () NOTHROW;
1411 void scr_forwardindex () NOTHROW; 1479 void scr_forwardindex () NOTHROW;
1412#endif 1480#endif
1413 void scr_touch (bool refresh) NOTHROW; 1481 void scr_touch (bool refresh) NOTHROW;
1414 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1482 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1415 void scr_recolour () NOTHROW; 1483 void scr_recolour (bool refresh = true) NOTHROW;
1416 void scr_remap_chars () NOTHROW; 1484 void scr_remap_chars () NOTHROW;
1417 void scr_remap_chars (line_t &l) NOTHROW; 1485 void scr_remap_chars (line_t &l) NOTHROW;
1418 1486
1419 enum cursor_mode { SAVE, RESTORE }; 1487 enum cursor_mode { SAVE, RESTORE };
1420 1488
… …
1455 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1523 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1456 void scr_reverse_selection () NOTHROW; 1524 void scr_reverse_selection () NOTHROW;
1457 void scr_dump (int fd) NOTHROW; 1525 void scr_dump (int fd) NOTHROW;
1458 1526
1459 void selection_check (int check_more) NOTHROW; 1527 void selection_check (int check_more) NOTHROW;
1460 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1461 void selection_property (Window win, Atom prop) NOTHROW;
1462 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1528 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1463 int selection_request_other (Atom target, int selnum) NOTHROW;
1464 void selection_clear (bool clipboard = false) NOTHROW; 1529 void selection_clear (bool clipboard = false) NOTHROW;
1465 void clipboard_copy (Time tm);
1466 void selection_make (Time tm); 1530 void selection_make (Time tm);
1467 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1531 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1468 void selection_start_colrow (int col, int row) NOTHROW; 1532 void selection_start_colrow (int col, int row) NOTHROW;
1469 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1533 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1470 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1534 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1473 void selection_click (int clicks, int x, int y) NOTHROW; 1537 void selection_click (int clicks, int x, int y) NOTHROW;
1474 void selection_extend (int x, int y, int flag) NOTHROW; 1538 void selection_extend (int x, int y, int flag) NOTHROW;
1475 void selection_rotate (int x, int y) NOTHROW; 1539 void selection_rotate (int x, int y) NOTHROW;
1476 1540
1477 // xdefaults.C 1541 // xdefaults.C
1478 void get_options (int argc, const char *const *argv); 1542 const char **get_options (int argc, const char *const *argv);
1479 int parse_keysym (const char *str, const char *arg); 1543 int parse_keysym (const char *str, const char *arg);
1480 const char *x_resource (const char *name); 1544 const char *x_resource (const char *name);
1481 void extract_resources (); 1545 void extract_resources ();
1546 void extract_keysym_resources ();
1482}; 1547};
1483 1548
1484#endif /* _RXVT_H_ */ 1549#endif /* _RXVT_H_ */
1485 1550

Diff Legend

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