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.378 by root, Sun Jan 10 21:57:50 2010 UTC vs.
Revision 1.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC

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

Diff Legend

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