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.392 by root, Thu Apr 1 00:13:04 2010 UTC vs.
Revision 1.465 by sf-exg, Tue Jan 10 18:50:14 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#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 128# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 129# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 130#endif
125 131
126/****************************************************************************/ 132/****************************************************************************/
127 133
128// exception thrown on fatal (per-instance) errors 134// exception thrown on fatal (per-instance) errors
… …
151 157
152const char * rxvt_basename (const char *str) NOTHROW; 158const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 160void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 161void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
158 164
159char * rxvt_strtrim (char *str) NOTHROW; 165char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 166char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 167
168static inline void
169rxvt_free_strsplit (char **ptr) NOTHROW
170{
171 free (ptr[0]);
172 free (ptr);
173}
162 174
163void * rxvt_malloc (size_t size); 175void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 176void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 177void * rxvt_realloc (void *ptr, size_t size);
166 178
… …
189#else 201#else
190 if (envv) 202 if (envv)
191#endif 203#endif
192 environ = envv; 204 environ = envv;
193} 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};
194 222
195/* 223/*
196 ***************************************************************************** 224 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 225 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 226 *****************************************************************************
… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 275# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 276#else
249# define COLORTERMENVFULL COLORTERMENV 277# define COLORTERMENVFULL COLORTERMENV
250#endif 278#endif
251#ifndef TERMENV 279#ifndef TERMENV
280# if USE_256_COLORS
281# define TERMENV "rxvt-unicode-256color"
282# else
252# define TERMENV "rxvt-unicode" 283# define TERMENV "rxvt-unicode"
284# endif
253#endif 285#endif
254 286
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 287#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 288# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 289#endif
… …
272# define NSCREENS 0 304# define NSCREENS 0
273#else 305#else
274# define NSCREENS 1 306# define NSCREENS 1
275#endif 307#endif
276 308
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 () */ 309/* flags for rxvt_term::scr_gotorc () */
283enum { 310enum {
284 C_RELATIVE = 1, /* col movement is relative */ 311 C_RELATIVE = 1, /* col movement is relative */
285 R_RELATIVE = 2, /* row movement is relative */ 312 R_RELATIVE = 2, /* row movement is relative */
286 RELATIVE = C_RELATIVE | R_RELATIVE, 313 RELATIVE = C_RELATIVE | R_RELATIVE,
287}; 314};
288 315
289/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 316/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
290enum { 317enum {
291 INSERT = -1, /* don't change these values */ 318 INSERT = -1, /* don't change these values */
292 DELETE = +1, 319 DELETE = +1,
293 ERASE = +2, 320 ERASE = +2,
294}; 321};
295 322
296/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 323/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
297enum page_dirn { 324enum page_dirn {
298 UP, 325 UP,
299 DN, 326 DN,
300 NO_DIR, 327 NO_DIR,
301}; 328};
302 329
303/* arguments for rxvt_scr_change_screen () */ 330/* arguments for rxvt_term::scr_change_screen () */
304enum { 331enum {
305 PRIMARY = 0, 332 PRIMARY = 0,
306 SECONDARY, 333 SECONDARY,
307}; 334};
308 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
309#define RS_None 0 339#define RS_None 0
310 340
341// GET_BGATTR depends on RS_fgShift > RS_bgShift
311#define RS_colorMask ((1UL << Color_Bits) - 1UL) 342#define RS_colorMask ((1UL << Color_Bits) - 1UL)
312#define RS_fgShift 0 343#define RS_bgShift 0
313#define RS_bgShift Color_Bits 344#define RS_fgShift (RS_bgShift + Color_Bits)
345#define RS_bgMask (RS_colorMask << RS_bgShift)
314#define RS_fgMask (RS_colorMask << RS_fgShift) 346#define RS_fgMask (RS_colorMask << RS_fgShift)
315#define RS_bgMask (RS_colorMask << RS_bgShift) 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)
316 363
317// font styles 364// font styles
318#define RS_Bold 0x08000000UL // value 1 365#define RS_Bold (1UL << RS_styleShift)
319#define RS_Italic 0x10000000UL // 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)
320 371
321// fake styles 372// fake styles
322#define RS_Blink 0x20000000UL // blink 373#define RS_Blink (1UL << 29)
323#define RS_RVid 0x40000000UL // reverse video 374#define RS_RVid (1UL << 30) // reverse video
324#define RS_Uline 0x80000000UL // underline 375#define RS_Uline (1UL << 31) // underline
325
326// 5 custom bits for extensions
327#define RS_customCount 16
328#define RS_customMask 0x07800000UL
329#define RS_customShift 23
330
331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0x007c0000UL // includes RS_Careful
333#define RS_fontShift 18
334#define RS_Careful 0x00010000UL /* be careful when drawing these */
335
336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
337#define RS_redraw 0x00020000UL
338
339#define RS_styleCount 4
340#define RS_styleMask (RS_Bold | RS_Italic)
341#define RS_styleShift 27
342 376
343#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)
344#define RS_attrMask (RS_baseattrMask | RS_fontMask) 378#define RS_attrMask (RS_baseattrMask | RS_fontMask)
345 379
346#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 380#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)) 381#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 382
360enum { 383enum {
361 C0_NUL = 0x00, 384 C0_NUL = 0x00,
362 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,
363 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 ,
… …
381 XTerm_Color_cursor = 12, // change actual 'Cursor' color 404 XTerm_Color_cursor = 12, // change actual 'Cursor' color
382 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 405 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
383 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 406 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
384 XTerm_Color05 = 15, // not implemented (tektronix fg) 407 XTerm_Color05 = 15, // not implemented (tektronix fg)
385 XTerm_Color06 = 16, // not implemented (tektronix bg) 408 XTerm_Color06 = 16, // not implemented (tektronix bg)
386 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
387 XTerm_logfile = 46, // not implemented 411 XTerm_logfile = 46, // not implemented
388 XTerm_font = 50, 412 XTerm_font = 50,
389 413
390 XTerm_konsole30 = 30, // reserved for konsole 414 XTerm_konsole30 = 30, // reserved for konsole
391 XTerm_konsole31 = 31, // reserved for konsole 415 XTerm_konsole31 = 31, // reserved for konsole
… …
393 /* 417 /*
394 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 418 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
395 */ 419 */
396 420
397 // deprecated 421 // deprecated
398 Rxvt_Color_BD = 18,
399 Rxvt_Color_UL = 19,
400 Rxvt_restoreFG = 39, 422 Rxvt_restoreFG = 39,
401 Rxvt_restoreBG = 49, 423 Rxvt_restoreBG = 49,
402 424
403 Rxvt_Pixmap = 20, // new bg pixmap 425 Rxvt_Pixmap = 20, // new bg pixmap
404 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 426 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
458 Color_White = maxBrightCOLOR, 480 Color_White = maxBrightCOLOR,
459#else 481#else
460 Color_White = maxCOLOR, 482 Color_White = maxCOLOR,
461#endif 483#endif
462 minTermCOLOR = Color_White + 1, 484 minTermCOLOR = Color_White + 1,
463#ifndef USE_256_COLORS 485#if USE_256_COLORS
486 maxTermCOLOR = Color_White + 240,
487#else
464 maxTermCOLOR = Color_White + 72, 488 maxTermCOLOR = Color_White + 72,
465#else
466 maxTermCOLOR = Color_White + 240,
467#endif 489#endif
468#ifndef NO_CURSORCOLOR 490#ifndef NO_CURSORCOLOR
469 Color_cursor, 491 Color_cursor,
470 Color_cursor2, 492 Color_cursor2,
471#endif 493#endif
… …
481#if ENABLE_FRILLS 503#if ENABLE_FRILLS
482 Color_underline, 504 Color_underline,
483#endif 505#endif
484#ifdef OPTION_HC 506#ifdef OPTION_HC
485 Color_HC, 507 Color_HC,
508 Color_HTC,
486#endif 509#endif
487 Color_scroll, 510 Color_scroll,
488#ifdef RXVT_SCROLLBAR 511#ifdef RXVT_SCROLLBAR
489 Color_trough, 512 Color_trough,
490#endif 513#endif
… …
502#else 525#else
503 TOTAL_COLORS = NRS_COLORS 526 TOTAL_COLORS = NRS_COLORS
504#endif 527#endif
505}; 528};
506 529
507#ifndef USE_256_COLORS 530#if USE_256_COLORS
508#define Color_Bits 7 // 0 .. maxTermCOLOR 531# define Color_Bits 9 // 0 .. maxTermCOLOR
509#else 532#else
510#define Color_Bits 9 // 0 .. maxTermCOLOR 533# define Color_Bits 7 // 0 .. maxTermCOLOR
511#endif 534#endif
512 535
513/* 536/*
514 * Resource list 537 * Resource list
515 */ 538 */
… …
544#define PrivMode_vt52 (1UL<<18) 567#define PrivMode_vt52 (1UL<<18)
545#define PrivMode_LFNL (1UL<<19) 568#define PrivMode_LFNL (1UL<<19)
546#define PrivMode_MouseBtnEvent (1UL<<20) 569#define PrivMode_MouseBtnEvent (1UL<<20)
547#define PrivMode_MouseAnyEvent (1UL<<21) 570#define PrivMode_MouseAnyEvent (1UL<<21)
548#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
549 574
550#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)
551 576
552#ifdef ALLOW_132_MODE 577#ifdef ALLOW_132_MODE
553# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 578# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
604/* 629/*
605 ***************************************************************************** 630 *****************************************************************************
606 * MACRO DEFINES 631 * MACRO DEFINES
607 ***************************************************************************** 632 *****************************************************************************
608 */ 633 */
634
635// speed hack, copy some member variable into a local variable of the same name
609#define dLocal(type,name) type const name = this->name 636#define dLocal(type,name) type const name = this->name
610 637
611// 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
612// single-width. 639// single-width.
613#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))
… …
637 664
638#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 665#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
639#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 666#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
640 667
641#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
642#define GET_BGATTR(x) \ 671#define GET_BGATTR(x) \
672 (ecb_unlikely ((x) & RS_RVid) \
643 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 673 ? (((x) & (RS_attrMask & ~RS_RVid)) \
644 | (((x) & RS_colorMask) << RS_bgShift)) \ 674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
645 : ((x) & (RS_attrMask | RS_bgMask))) 675 : ((x) & (RS_attrMask | RS_bgMask)))
646#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
647#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
648#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 678#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
649 679
650#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 680#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
… …
791{ 821{
792 int x, y, w, h; // overlay dimensions 822 int x, y, w, h; // overlay dimensions
793 text_t **text; 823 text_t **text;
794 rend_t **rend; 824 rend_t **rend;
795 825
796 // 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
797}; 827};
798 828
799/* ------------------------------------------------------------------------- */ 829/* ------------------------------------------------------------------------- */
800 830
801typedef struct 831typedef struct
… …
840 * END······················= total_rows 870 * END······················= total_rows
841 */ 871 */
842 872
843struct TermWin_t 873struct TermWin_t
844{ 874{
875 int vt_width; /* actual window width [pixels] */
876 int vt_height; /* actual window height [pixels] */
845 int width; /* window width [pixels] */ 877 int width; /* window width [pixels] */
846 int height; /* window height [pixels] */ 878 int height; /* window height [pixels] */
847 int fwidth; /* font width [pixels] */ 879 int fwidth; /* font width [pixels] */
848 int fheight; /* font height [pixels] */ 880 int fheight; /* font height [pixels] */
849 int fbase; /* font ascent (baseline) [pixels] */ 881 int fbase; /* font ascent (baseline) [pixels] */
… …
858 int saveLines; /* number of lines that fit in scrollback */ 890 int saveLines; /* number of lines that fit in scrollback */
859 int total_rows; /* total number of rows in this terminal */ 891 int total_rows; /* total number of rows in this terminal */
860 int term_start; /* term lines start here */ 892 int term_start; /* term lines start here */
861 int view_start; /* scrollback view starts here */ 893 int view_start; /* scrollback view starts here */
862 int top_row; /* topmost row index of scrollback */ 894 int top_row; /* topmost row index of scrollback */
863 Window parent[6]; /* parent identifiers - we're parent[0] */ 895 Window parent; /* parent identifier */
864 Window vt; /* vt100 window */ 896 Window vt; /* vt100 window */
865 GC gc; /* GC for drawing */ 897 GC gc; /* GC for drawing */
866 Pixmap pixmap;
867 rxvt_drawable *drawable; 898 rxvt_drawable *drawable;
868 rxvt_fontset *fontset[4]; 899 rxvt_fontset *fontset[4];
869}; 900};
870 901
871/* 902/*
… …
933#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 964#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
934#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 965#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
935 966
936/* rxvt_vars.options */ 967/* rxvt_vars.options */
937enum { 968enum {
938# define def(name,idx) Opt_ ## name = idx,
939# define nodef(name) Opt_ ## name = 0, 969# define def(name) Opt_ ## name,
970# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
971 Opt_0,
940# include "optinc.h" 972# include "optinc.h"
941# undef nodef 973# undef nodef
942# undef def 974# undef def
943Opt_count 975 Opt_count
944}; 976};
945 977
946/* ------------------------------------------------------------------------- */ 978/* ------------------------------------------------------------------------- */
947 979
948struct rxvt_vars : TermWin_t 980struct rxvt_vars : TermWin_t
… …
950 scrollBar_t scrollBar; 982 scrollBar_t scrollBar;
951 uint8_t options[(Opt_count + 7) >> 3]; 983 uint8_t options[(Opt_count + 7) >> 3];
952 XSizeHints szHint; 984 XSizeHints szHint;
953 rxvt_color *pix_colors; 985 rxvt_color *pix_colors;
954 Cursor TermWin_cursor; /* cursor for vt window */ 986 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 987 line_t *row_buf; // all lines, scrollback + terminal, circular
957 line_t *drawn_buf; // text on screen 988 line_t *drawn_buf; // text on screen
958 line_t *swap_buf; // lines for swap buffer 989 line_t *swap_buf; // lines for swap buffer
959 char *tabs; /* per location: 1 == tab-stop */ 990 char *tabs; /* per location: 1 == tab-stop */
960 screen_t screen; 991 screen_t screen;
961 screen_t swap; 992 screen_t swap;
… …
998 hidden_pointer:1, 1029 hidden_pointer:1,
999#endif 1030#endif
1000 enc_utf8:1, /* whether locale uses utf-8 */ 1031 enc_utf8:1, /* whether locale uses utf-8 */
1001 seen_input:1, /* whether we have seen some program output yet */ 1032 seen_input:1, /* whether we have seen some program output yet */
1002 seen_resize:1, /* whether we had a resize event */ 1033 seen_resize:1, /* whether we had a resize event */
1034 init_done:1,
1003 parsed_geometry:1; 1035 parsed_geometry:1;
1004 1036
1005 unsigned char refresh_type, 1037 unsigned char refresh_type,
1006#ifdef META8_OPTION 1038#ifdef META8_OPTION
1007 meta_char, /* Alt-key prefix */ 1039 meta_char; /* Alt-key prefix */
1008#endif 1040#endif
1009 selection_wait,
1010 selection_type;
1011/* ---------- */ 1041/* ---------- */
1012 bool rvideo_state, rvideo_mode; 1042 bool rvideo_state, rvideo_mode;
1013#ifndef NO_BELL 1043#ifndef NO_BELL
1014 bool rvideo_bell; 1044 bool rvideo_bell;
1015#endif 1045#endif
… …
1043 allowedxerror; 1073 allowedxerror;
1044/* ---------- */ 1074/* ---------- */
1045 unsigned int ModLevel3Mask, 1075 unsigned int ModLevel3Mask,
1046 ModMetaMask, 1076 ModMetaMask,
1047 ModNumLockMask; 1077 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, 1078 unsigned long priv_modes,
1051 SavedModes; 1079 SavedModes;
1052/* ---------- */ 1080/* ---------- */
1053 Atom *xa; 1081 Atom *xa;
1054/* ---------- */ 1082/* ---------- */
1055 Time selection_time, 1083 Time selection_time,
1056 selection_request_time,
1057 clipboard_time; 1084 clipboard_time;
1085 rxvt_selection *selection_req;
1058 pid_t cmd_pid; /* process id of child */ 1086 pid_t cmd_pid; /* process id of child */
1059 char * incr_buf;
1060 size_t incr_buf_size, incr_buf_fill;
1061/* ---------- */ 1087/* ---------- */
1062 struct mouse_event MEvent; 1088 struct mouse_event MEvent;
1063 XComposeStatus compose; 1089 XComposeStatus compose;
1064 struct termios tio; 1090 static struct termios def_tio;
1065 row_col_t oldcursor; 1091 row_col_t oldcursor;
1066#ifdef HAVE_BG_PIXMAP 1092#ifdef HAVE_BG_PIXMAP
1067 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, int depth);
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 }
1068#endif 1186#endif
1069#ifdef HAVE_AFTERIMAGE 1187#ifdef HAVE_AFTERIMAGE
1188 ASImage *original_asim;
1070 ASVisual *asv; 1189 ASVisual *asv;
1071 ASImageManager *asimman; 1190 ASImageManager *asimman;
1072 1191
1073 void init_asv () 1192 void init_asv ()
1074 { 1193 {
1075 if (!asv) 1194 if (!asv)
1076 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);
1077 } 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);
1078#endif 1203#endif
1079 1204
1080#if ENABLE_OVERLAY 1205#if ENABLE_OVERLAY
1081 overlay_base ov; 1206 overlay_base ov;
1082 1207
… …
1090 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1215 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1091#endif 1216#endif
1092 1217
1093 vector<void *> allocated; // free these memory blocks with free() 1218 vector<void *> allocated; // free these memory blocks with free()
1094 1219
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; 1220 char *locale;
1101 char charsets[4]; 1221 char charsets[4];
1102 char *v_buffer; /* pointer to physical buffer */ 1222 char *v_buffer; /* pointer to physical buffer */
1103 unsigned int v_buflen; /* size of area to write */ 1223 unsigned int v_buflen; /* size of area to write */
1104 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1224 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1143 void rootwin_cb (XEvent &xev); 1263 void rootwin_cb (XEvent &xev);
1144 xevent_watcher rootwin_ev; 1264 xevent_watcher rootwin_ev;
1145#endif 1265#endif
1146#ifdef HAVE_BG_PIXMAP 1266#ifdef HAVE_BG_PIXMAP
1147 void update_background (); 1267 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); 1268 void update_background_cb (ev::timer &w, int revents);
1153 ev::timer update_background_ev; 1269 ev::timer update_background_ev;
1154#endif 1270#endif
1155 1271
1156 void x_cb (XEvent &xev); 1272 void x_cb (XEvent &xev);
… …
1161 void child_cb (ev::child &w, int revents); ev::child child_ev; 1277 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; 1278 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1163 void refresh_check (); 1279 void refresh_check ();
1164 void flush (); 1280 void flush ();
1165 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1281 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1282 void cmdbuf_reify ();
1283 void cmdbuf_append (const char *str, size_t count);
1166 bool pty_fill (); 1284 bool pty_fill ();
1167 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1285 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 1286
1170#ifdef CURSOR_BLINK 1287#ifdef CURSOR_BLINK
1171 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1288 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1172#endif 1289#endif
1173#ifdef TEXT_BLINK 1290#ifdef TEXT_BLINK
… …
1194 void pointer_unblank (); 1311 void pointer_unblank ();
1195 1312
1196 void tt_printf (const char *fmt,...); 1313 void tt_printf (const char *fmt,...);
1197 void tt_write (const char *data, unsigned int len); 1314 void tt_write (const char *data, unsigned int len);
1198 void pty_write (); 1315 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 1316
1206 void make_current () const // make this the "currently active" urxvt instance 1317 void make_current () const // make this the "currently active" urxvt instance
1207 { 1318 {
1208 SET_R (this); 1319 SET_R (this);
1209 set_environ (envv); 1320 set_environ (envv);
… …
1221 void im_set_size (XRectangle &size); 1332 void im_set_size (XRectangle &size);
1222 void im_set_position (XPoint &pos) NOTHROW; 1333 void im_set_position (XPoint &pos) NOTHROW;
1223 void im_set_color (unsigned long &fg, unsigned long &bg); 1334 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); 1335 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1225 1336
1226 bool IMisRunning (); 1337 bool im_is_running ();
1227 void IMSendSpot (); 1338 void im_send_spot ();
1228 bool IM_get_IC (const char *modifiers); 1339 bool im_get_ic (const char *modifiers);
1229 void IMSetPosition (); 1340 void im_set_position ();
1230#endif 1341#endif
1231 1342
1232 // command.C 1343 // command.C
1233 void key_press (XKeyEvent &ev); 1344 void key_press (XKeyEvent &ev);
1234 void key_release (XKeyEvent &ev); 1345 void key_release (XKeyEvent &ev);
1235 unsigned int cmd_write (const char *str, unsigned int count);
1236 1346
1237 wchar_t next_char () NOTHROW; 1347 wchar_t next_char () NOTHROW;
1238 wchar_t cmd_getc () THROW ((class out_of_input)); 1348 wchar_t cmd_getc () THROW ((class out_of_input));
1239 uint32_t next_octet () NOTHROW; 1349 uint32_t next_octet () NOTHROW;
1240 uint32_t cmd_get8 () THROW ((class out_of_input)); 1350 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1267 void process_color_seq (int report, int color, const char *str, char resp); 1377 void process_color_seq (int report, int color, const char *str, char resp);
1268 void process_xterm_seq (int op, char *str, char resp); 1378 void process_xterm_seq (int op, char *str, char resp);
1269 int privcases (int mode, unsigned long bit); 1379 int privcases (int mode, unsigned long bit);
1270 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1380 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); 1381 void process_sgr_mode (unsigned int nargs, const int *arg);
1272 void process_graphics ();
1273 // init.C 1382 // init.C
1383 void init (stringvec *argv, stringvec *envv);
1384 void init (int argc, const char *const *argv, const char *const *envv);
1385 void init2 (int argc, const char *const *argv);
1274 void init_vars (); 1386 void init_vars ();
1275 const char **init_resources (int argc, const char *const *argv); 1387 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 (); 1388 void init_env ();
1278 void set_locale (const char *locale); 1389 void set_locale (const char *locale);
1279 void init_xlocale (); 1390 void init_xlocale ();
1280 void init_command (const char *const *argv); 1391 void init_command (const char *const *argv);
1281 void run_command (const char *const *argv); 1392 void run_command (const char *const *argv);
1282 int run_child (const char *const *argv); 1393 int run_child (const char *const *argv);
1283 void color_aliases (int idx); 1394 void color_aliases (int idx);
1284 void create_windows (int argc, const char *const *argv); 1395 void create_windows (int argc, const char *const *argv);
1285 void get_colours (); 1396 void get_colours ();
1286 void get_ourmods (); 1397 void get_ourmods ();
1398 void set_icon (const char *file);
1287 // main.C 1399 // main.C
1288 void tt_winch (); 1400 void tt_winch ();
1289 rxvt_term (); 1401 rxvt_term ();
1290 ~rxvt_term (); 1402 ~rxvt_term ();
1291 void destroy (); 1403 void destroy ();
… …
1293 void recolour_cursor (); 1405 void recolour_cursor ();
1294 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1406 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1295 void window_calc (unsigned int newwidth, unsigned int newheight); 1407 void window_calc (unsigned int newwidth, unsigned int newheight);
1296 bool set_fonts (); 1408 bool set_fonts ();
1297 void set_string_property (Atom prop, const char *str, int len = -1); 1409 void set_string_property (Atom prop, const char *str, int len = -1);
1410 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); 1411 void set_utf8_property (Atom prop, const char *str, int len = -1);
1299 void set_title (const char *str); 1412 void set_title (const char *str);
1300 void set_icon_name (const char *str); 1413 void set_icon_name (const char *str);
1301 void set_window_color (int idx, const char *color); 1414 void set_window_color (int idx, const char *color);
1302 void set_colorfgbg (); 1415 char *get_colorfgbg ();
1303 bool set_color (rxvt_color &color, const char *name); 1416 bool set_color (rxvt_color &color, const char *name);
1304 void alias_color (int dst, int src); 1417 void alias_color (int dst, int src);
1305 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1418 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1306 void get_window_origin (int &x, int &y); 1419 void get_window_origin (int &x, int &y);
1307 Pixmap get_pixmap_property (int prop_id); 1420 Pixmap get_pixmap_property (Atom property);
1308 1421
1309 // screen.C 1422 // screen.C
1310 1423
1311 void lalloc (line_t &l) const 1424 void lalloc (line_t &l) const
1312 { 1425 {
… …
1342#ifndef NO_BRIGHTCOLOR 1455#ifndef NO_BRIGHTCOLOR
1343 if (r & RS_Bold 1456 if (r & RS_Bold
1344# if ENABLE_STYLES 1457# if ENABLE_STYLES
1345 && option (Opt_intensityStyles) 1458 && option (Opt_intensityStyles)
1346# endif 1459# endif
1347 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1460 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1348 base += minBrightCOLOR - minCOLOR; 1461 base += minBrightCOLOR - minCOLOR;
1349#endif 1462#endif
1350 return base; 1463 return base;
1351 } 1464 }
1352 1465
… …
1356#ifndef NO_BRIGHTCOLOR 1469#ifndef NO_BRIGHTCOLOR
1357 if (r & RS_Blink 1470 if (r & RS_Blink
1358# if ENABLE_STYLES 1471# if ENABLE_STYLES
1359 && option (Opt_intensityStyles) 1472 && option (Opt_intensityStyles)
1360# endif 1473# endif
1361 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1474 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1362 base += minBrightCOLOR - minCOLOR; 1475 base += minBrightCOLOR - minCOLOR;
1363#endif 1476#endif
1364 return base; 1477 return base;
1365 } 1478 }
1366 1479
1367 bool option (uint8_t opt) const NOTHROW 1480 bool option (uint8_t opt) const NOTHROW
1368 { 1481 {
1369 if (!opt)
1370 return 0;
1371
1372 --opt;
1373 return options[opt >> 3] & (1 << (opt & 7)); 1482 return options[opt >> 3] & (1 << (opt & 7));
1374 } 1483 }
1375 1484
1376 void set_option (uint8_t opt, bool set = true) NOTHROW 1485 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 1486
1396 // modifies first argument(!) 1487 // modifies first argument(!)
1488 void tt_paste (char *data, unsigned int len) NOTHROW;
1397 void paste (char *data, unsigned int len) NOTHROW; 1489 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; 1490 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; 1491 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; 1492 void scr_kill_char (line_t &l, int col) const NOTHROW;
1401 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1493 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1410 void scr_backindex () NOTHROW; 1502 void scr_backindex () NOTHROW;
1411 void scr_forwardindex () NOTHROW; 1503 void scr_forwardindex () NOTHROW;
1412#endif 1504#endif
1413 void scr_touch (bool refresh) NOTHROW; 1505 void scr_touch (bool refresh) NOTHROW;
1414 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1506 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1415 void scr_recolour () NOTHROW; 1507 void scr_recolour (bool refresh = true) NOTHROW;
1416 void scr_remap_chars () NOTHROW; 1508 void scr_remap_chars () NOTHROW;
1417 void scr_remap_chars (line_t &l) NOTHROW; 1509 void scr_remap_chars (line_t &l) NOTHROW;
1418 1510
1419 enum cursor_mode { SAVE, RESTORE }; 1511 enum cursor_mode { SAVE, RESTORE };
1420 1512
… …
1455 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1547 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; 1548 void scr_reverse_selection () NOTHROW;
1457 void scr_dump (int fd) NOTHROW; 1549 void scr_dump (int fd) NOTHROW;
1458 1550
1459 void selection_check (int check_more) NOTHROW; 1551 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; 1552 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; 1553 void selection_clear (bool clipboard = false) NOTHROW;
1465 void clipboard_copy (Time tm);
1466 void selection_make (Time tm); 1554 void selection_make (Time tm);
1467 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1555 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1468 void selection_start_colrow (int col, int row) NOTHROW; 1556 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; 1557 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; 1558 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; 1561 void selection_click (int clicks, int x, int y) NOTHROW;
1474 void selection_extend (int x, int y, int flag) NOTHROW; 1562 void selection_extend (int x, int y, int flag) NOTHROW;
1475 void selection_rotate (int x, int y) NOTHROW; 1563 void selection_rotate (int x, int y) NOTHROW;
1476 1564
1477 // xdefaults.C 1565 // xdefaults.C
1478 void get_options (int argc, const char *const *argv); 1566 const char **get_options (int argc, const char *const *argv);
1479 int parse_keysym (const char *str, const char *arg); 1567 int parse_keysym (const char *str, const char *arg);
1480 const char *x_resource (const char *name); 1568 const char *x_resource (const char *name);
1481 void extract_resources (); 1569 void extract_resources ();
1570 void extract_keysym_resources ();
1482}; 1571};
1483 1572
1484#endif /* _RXVT_H_ */ 1573#endif /* _RXVT_H_ */
1485 1574

Diff Legend

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