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.382 by root, Tue Mar 30 22:46:25 2010 UTC vs.
Revision 1.468 by sf-exg, Sat Feb 4 21:47:06 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
311#define RS_fgMask 0x0000007fUL // 128 colors 331// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_bgMask 0x00003f80UL // 128 colors 332#define RS_colorMask ((1UL << Color_Bits) - 1UL)
333#define RS_bgShift 0
334#define RS_fgShift (RS_bgShift + Color_Bits)
335#define RS_bgMask (RS_colorMask << RS_bgShift)
336#define RS_fgMask (RS_colorMask << RS_fgShift)
337
338// must have space for rxvt_fontset::fontCount * 2 + 2 values
339#define RS_fontShift (RS_fgShift + Color_Bits)
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
343
344// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
345#define RS_redraw (2UL << RS_fontShift)
346
347#define RS_Sel (1UL << 22)
348
349// 4 custom bits for extensions
350#define RS_customCount 16UL
351#define RS_customShift 23
352#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
313 353
314// font styles 354// font styles
315#define RS_Bold 0x00004000UL // value 1 355#define RS_Bold (1UL << RS_styleShift)
316#define RS_Italic 0x00008000UL // value 2 356#define RS_Italic (2UL << RS_styleShift)
357
358#define RS_styleCount 4
359#define RS_styleShift 27
360#define RS_styleMask (RS_Bold | RS_Italic)
317 361
318// fake styles 362// fake styles
319#define RS_Blink 0x00010000UL // blink 363#define RS_Blink (1UL << 29)
320#define RS_RVid 0x00020000UL // reverse video 364#define RS_RVid (1UL << 30) // reverse video
321#define RS_Uline 0x00040000UL // underline 365#define RS_Uline (1UL << 31) // underline
322
323// toggle this to force redraw, must be != RS_Careful
324#define RS_redraw 0x01000000UL
325
326// 5 custom bits for extensions
327#define RS_customCount 32
328#define RS_customMask 0x00f80000UL
329#define RS_customShift 19
330
331// other flags
332#define RS_Careful 0x80000000UL /* be careful when drawing these */
333
334#define RS_styleCount 4
335#define RS_styleMask (RS_Bold | RS_Italic)
336#define RS_styleShift 14
337 366
338#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)
339#define RS_attrMask (RS_baseattrMask | RS_fontMask) 368#define RS_attrMask (RS_baseattrMask | RS_fontMask)
340 369
341#define RS_fontCount rxvt_fontset::fontCount
342#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
343#define RS_fontShift 24
344
345#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 370#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
346#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 371#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
347
348#define Sel_none 0 /* Not waiting */
349#define Sel_normal 0x01 /* normal selection */
350#define Sel_incr 0x02 /* incremental selection */
351#define Sel_direct 0x00
352#define Sel_Primary 0x01
353#define Sel_Secondary 0x02
354#define Sel_Clipboard 0x03
355#define Sel_whereMask 0x0f
356#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
357#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
358 372
359enum { 373enum {
360 C0_NUL = 0x00, 374 C0_NUL = 0x00,
361 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,
362 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 ,
… …
380 XTerm_Color_cursor = 12, // change actual 'Cursor' color 394 XTerm_Color_cursor = 12, // change actual 'Cursor' color
381 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 395 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
382 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 396 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
383 XTerm_Color05 = 15, // not implemented (tektronix fg) 397 XTerm_Color05 = 15, // not implemented (tektronix fg)
384 XTerm_Color06 = 16, // not implemented (tektronix bg) 398 XTerm_Color06 = 16, // not implemented (tektronix bg)
385 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
386 XTerm_logfile = 46, // not implemented 401 XTerm_logfile = 46, // not implemented
387 XTerm_font = 50, 402 XTerm_font = 50,
388 403
389 XTerm_konsole30 = 30, // reserved for konsole 404 XTerm_konsole30 = 30, // reserved for konsole
390 XTerm_konsole31 = 31, // reserved for konsole 405 XTerm_konsole31 = 31, // reserved for konsole
… …
392 /* 407 /*
393 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 408 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
394 */ 409 */
395 410
396 // deprecated 411 // deprecated
397 Rxvt_Color_BD = 18,
398 Rxvt_Color_UL = 19,
399 Rxvt_restoreFG = 39, 412 Rxvt_restoreFG = 39,
400 Rxvt_restoreBG = 49, 413 Rxvt_restoreBG = 49,
401 414
402 Rxvt_Pixmap = 20, // new bg pixmap 415 Rxvt_Pixmap = 20, // new bg pixmap
403 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 416 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
457 Color_White = maxBrightCOLOR, 470 Color_White = maxBrightCOLOR,
458#else 471#else
459 Color_White = maxCOLOR, 472 Color_White = maxCOLOR,
460#endif 473#endif
461 minTermCOLOR = Color_White + 1, 474 minTermCOLOR = Color_White + 1,
475#if USE_256_COLORS
476 maxTermCOLOR = Color_White + 240,
477#else
462 maxTermCOLOR = Color_White + 72, 478 maxTermCOLOR = Color_White + 72,
479#endif
463#ifndef NO_CURSORCOLOR 480#ifndef NO_CURSORCOLOR
464 Color_cursor, 481 Color_cursor,
465 Color_cursor2, 482 Color_cursor2,
466#endif 483#endif
467 Color_pointer_fg, 484 Color_pointer_fg,
… …
476#if ENABLE_FRILLS 493#if ENABLE_FRILLS
477 Color_underline, 494 Color_underline,
478#endif 495#endif
479#ifdef OPTION_HC 496#ifdef OPTION_HC
480 Color_HC, 497 Color_HC,
498 Color_HTC,
481#endif 499#endif
482 Color_scroll, 500 Color_scroll,
483#ifdef RXVT_SCROLLBAR 501#ifdef RXVT_SCROLLBAR
484 Color_trough, 502 Color_trough,
485#endif 503#endif
… …
497#else 515#else
498 TOTAL_COLORS = NRS_COLORS 516 TOTAL_COLORS = NRS_COLORS
499#endif 517#endif
500}; 518};
501 519
520#if USE_256_COLORS
521# define Color_Bits 9 // 0 .. maxTermCOLOR
522#else
502#define Color_Bits 7 // 0 .. maxTermCOLOR 523# define Color_Bits 7 // 0 .. maxTermCOLOR
524#endif
503 525
504/* 526/*
505 * Resource list 527 * Resource list
506 */ 528 */
507enum { 529enum {
… …
535#define PrivMode_vt52 (1UL<<18) 557#define PrivMode_vt52 (1UL<<18)
536#define PrivMode_LFNL (1UL<<19) 558#define PrivMode_LFNL (1UL<<19)
537#define PrivMode_MouseBtnEvent (1UL<<20) 559#define PrivMode_MouseBtnEvent (1UL<<20)
538#define PrivMode_MouseAnyEvent (1UL<<21) 560#define PrivMode_MouseAnyEvent (1UL<<21)
539#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
540 564
541#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)
542 566
543#ifdef ALLOW_132_MODE 567#ifdef ALLOW_132_MODE
544# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 568# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
595/* 619/*
596 ***************************************************************************** 620 *****************************************************************************
597 * MACRO DEFINES 621 * MACRO DEFINES
598 ***************************************************************************** 622 *****************************************************************************
599 */ 623 */
624
625// speed hack, copy some member variable into a local variable of the same name
600#define dLocal(type,name) type const name = this->name 626#define dLocal(type,name) type const name = this->name
601 627
602// 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
603// single-width. 629// single-width.
604#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))
… …
618 644
619#define LINENO(n) LINENO_of (this, n) 645#define LINENO(n) LINENO_of (this, n)
620#define ROW(n) ROW_of (this, n) 646#define ROW(n) ROW_of (this, n)
621 647
622/* how to build & extract colors and attributes */ 648/* how to build & extract colors and attributes */
623#define GET_BASEFG(x) (((x) & RS_fgMask)) 649#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
624#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 650#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
625 651
626#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 652#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
627#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 653#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
628 654
629#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 655#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
630#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 656#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
631 657
632#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
633#define GET_BGATTR(x) \ 661#define GET_BGATTR(x) \
662 (ecb_unlikely ((x) & RS_RVid) \
634 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 663 ? (((x) & (RS_attrMask & ~RS_RVid)) \
635 | (((x) & RS_fgMask)<<Color_Bits)) \ 664 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
636 : ((x) & (RS_attrMask | RS_bgMask))) 665 : ((x) & (RS_attrMask | RS_bgMask)))
637#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 666#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
638#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 667#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
639#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 668#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
640 669
641#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 670#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
642 671
643#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 672#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
782{ 811{
783 int x, y, w, h; // overlay dimensions 812 int x, y, w, h; // overlay dimensions
784 text_t **text; 813 text_t **text;
785 rend_t **rend; 814 rend_t **rend;
786 815
787 // 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
788}; 817};
789 818
790/* ------------------------------------------------------------------------- */ 819/* ------------------------------------------------------------------------- */
791 820
792typedef struct 821typedef struct
… …
831 * END······················= total_rows 860 * END······················= total_rows
832 */ 861 */
833 862
834struct TermWin_t 863struct TermWin_t
835{ 864{
865 int vt_width; /* actual window width [pixels] */
866 int vt_height; /* actual window height [pixels] */
836 int width; /* window width [pixels] */ 867 int width; /* window width [pixels] */
837 int height; /* window height [pixels] */ 868 int height; /* window height [pixels] */
838 int fwidth; /* font width [pixels] */ 869 int fwidth; /* font width [pixels] */
839 int fheight; /* font height [pixels] */ 870 int fheight; /* font height [pixels] */
840 int fbase; /* font ascent (baseline) [pixels] */ 871 int fbase; /* font ascent (baseline) [pixels] */
… …
849 int saveLines; /* number of lines that fit in scrollback */ 880 int saveLines; /* number of lines that fit in scrollback */
850 int total_rows; /* total number of rows in this terminal */ 881 int total_rows; /* total number of rows in this terminal */
851 int term_start; /* term lines start here */ 882 int term_start; /* term lines start here */
852 int view_start; /* scrollback view starts here */ 883 int view_start; /* scrollback view starts here */
853 int top_row; /* topmost row index of scrollback */ 884 int top_row; /* topmost row index of scrollback */
854 Window parent[6]; /* parent identifiers - we're parent[0] */ 885 Window parent; /* parent identifier */
855 Window vt; /* vt100 window */ 886 Window vt; /* vt100 window */
856 GC gc; /* GC for drawing */ 887 GC gc; /* GC for drawing */
857 Pixmap pixmap;
858 rxvt_drawable *drawable; 888 rxvt_drawable *drawable;
859 rxvt_fontset *fontset[4]; 889 rxvt_fontset *fontset[4];
860}; 890};
861 891
862/* 892/*
… …
924#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 954#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
925#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 955#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
926 956
927/* rxvt_vars.options */ 957/* rxvt_vars.options */
928enum { 958enum {
929# define def(name,idx) Opt_ ## name = idx,
930# 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,
931# include "optinc.h" 962# include "optinc.h"
932# undef nodef 963# undef nodef
933# undef def 964# undef def
934Opt_count 965 Opt_count
935}; 966};
936 967
937/* ------------------------------------------------------------------------- */ 968/* ------------------------------------------------------------------------- */
938 969
939struct rxvt_vars : TermWin_t 970struct rxvt_vars : TermWin_t
… …
941 scrollBar_t scrollBar; 972 scrollBar_t scrollBar;
942 uint8_t options[(Opt_count + 7) >> 3]; 973 uint8_t options[(Opt_count + 7) >> 3];
943 XSizeHints szHint; 974 XSizeHints szHint;
944 rxvt_color *pix_colors; 975 rxvt_color *pix_colors;
945 Cursor TermWin_cursor; /* cursor for vt window */ 976 Cursor TermWin_cursor; /* cursor for vt window */
946 int numlock_state;
947 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 977 line_t *row_buf; // all lines, scrollback + terminal, circular
948 line_t *drawn_buf; // text on screen 978 line_t *drawn_buf; // text on screen
949 line_t *swap_buf; // lines for swap buffer 979 line_t *swap_buf; // lines for swap buffer
950 char *tabs; /* per location: 1 == tab-stop */ 980 char *tabs; /* per location: 1 == tab-stop */
951 screen_t screen; 981 screen_t screen;
952 screen_t swap; 982 screen_t swap;
… …
986 hidden_text:1, 1016 hidden_text:1,
987#endif 1017#endif
988#if POINTER_BLANK 1018#if POINTER_BLANK
989 hidden_pointer:1, 1019 hidden_pointer:1,
990#endif 1020#endif
991 enc_utf8:1, /* wether locale uses utf-8 */ 1021 enc_utf8:1, /* whether locale uses utf-8 */
992 seen_input:1, /* wether we have seen some program output yet */ 1022 seen_input:1, /* whether we have seen some program output yet */
993 seen_resize:1, /* wether we had a resize event */ 1023 seen_resize:1, /* whether we had a resize event */
1024 init_done:1,
994 parsed_geometry:1; 1025 parsed_geometry:1;
995 1026
996 unsigned char refresh_type, 1027 unsigned char refresh_type,
997#ifdef META8_OPTION 1028#ifdef META8_OPTION
998 meta_char, /* Alt-key prefix */ 1029 meta_char; /* Alt-key prefix */
999#endif 1030#endif
1000 selection_wait,
1001 selection_type;
1002/* ---------- */ 1031/* ---------- */
1003 bool rvideo_state, rvideo_mode; 1032 bool rvideo_state, rvideo_mode;
1004#ifndef NO_BELL 1033#ifndef NO_BELL
1005 bool rvideo_bell; 1034 bool rvideo_bell;
1006#endif 1035#endif
… …
1034 allowedxerror; 1063 allowedxerror;
1035/* ---------- */ 1064/* ---------- */
1036 unsigned int ModLevel3Mask, 1065 unsigned int ModLevel3Mask,
1037 ModMetaMask, 1066 ModMetaMask,
1038 ModNumLockMask; 1067 ModNumLockMask;
1039 int old_width, /* last used width in screen resize */
1040 old_height; /* last used height in screen resize */
1041 unsigned long priv_modes, 1068 unsigned long priv_modes,
1042 SavedModes; 1069 SavedModes;
1043/* ---------- */ 1070/* ---------- */
1044 Atom *xa; 1071 Atom *xa;
1045/* ---------- */ 1072/* ---------- */
1046 Time selection_time, 1073 Time selection_time,
1047 selection_request_time,
1048 clipboard_time; 1074 clipboard_time;
1075 rxvt_selection *selection_req;
1049 pid_t cmd_pid; /* process id of child */ 1076 pid_t cmd_pid; /* process id of child */
1050 char * incr_buf;
1051 size_t incr_buf_size, incr_buf_fill;
1052/* ---------- */ 1077/* ---------- */
1053 struct mouse_event MEvent; 1078 struct mouse_event MEvent;
1054 XComposeStatus compose; 1079 XComposeStatus compose;
1055 struct termios tio; 1080 static struct termios def_tio;
1056 row_col_t oldcursor; 1081 row_col_t oldcursor;
1057#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1058 bgPixmap_t bgPixmap;
1059#endif
1060#ifdef HAVE_AFTERIMAGE
1061 ASVisual *asv;
1062 ASImageManager *asimman;
1063
1064 void init_asv () 1083 void bg_init ();
1084 void bg_destroy ();
1085
1086 enum {
1087 //subset returned by make_transparency_pixmap
1088 BG_IS_VALID = 1 << 0,
1089 BG_NEEDS_TINT = 1 << 1,
1090 BG_NEEDS_BLUR = 1 << 2,
1091
1092 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1093
1094 BG_KEEP_ASPECT = 1 << 3,
1095 BG_ROOT_ALIGN = 1 << 4,
1096 BG_TILE = 1 << 14,
1097 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1098
1099 BG_TINT_SET = 1 << 5,
1100 BG_TINT_BITAND = 1 << 6,
1101 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1102
1103 BG_HAS_RENDER = 1 << 7,
1104 BG_HAS_RENDER_CONV = 1 << 8,
1105 BG_CLIENT_RENDER = 1 << 9,
1106
1107 BG_IS_TRANSPARENT = 1 << 10,
1108 BG_NEEDS_REFRESH = 1 << 11,
1109 BG_IS_SIZE_SENSITIVE = 1 << 12,
1110 BG_IS_FROM_FILE = 1 << 13,
1111 };
1112
1113 unsigned int bg_flags;
1114
1115# ifdef BG_IMAGE_FROM_FILE
1116 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1117 bool render_image (unsigned long tr_flags);
1118
1119 enum {
1120 noScale = 0,
1121 windowScale = 100,
1122 defaultScale = windowScale,
1123 centerAlign = 50,
1124 defaultAlign = centerAlign,
1125 };
1126
1127 unsigned int h_scale, v_scale; /* percents of the window size */
1128 int h_align, v_align; /* percents of the window size:
1129 0 - left align, 50 - center, 100 - right */
1130
1131 bool bg_set_geometry (const char *geom, bool update = false);
1132 void bg_set_default_geometry ()
1065 { 1133 {
1066 if (!asv) 1134 h_scale = v_scale = defaultScale;
1067 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1135 h_align = v_align = defaultAlign;
1068 } 1136 }
1137
1138 bool bg_set_file (const char *file);
1139# endif
1140
1141# ifdef ENABLE_TRANSPARENCY
1142 Pixmap root_pixmap; /* current root pixmap set */
1143 rxvt_color tint;
1144 int shade;
1145 int h_blurRadius, v_blurRadius;
1146
1147 bool bg_set_transparent ();
1148 void bg_set_root_pixmap ();
1149 void set_tint_shade_flags ();
1150 bool bg_set_tint (rxvt_color &new_tint);
1151 bool bg_set_shade (const char *shade_str);
1152 bool bg_set_blur (const char *geom);
1153
1154 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1155 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1156 void tint_ximage (Visual *visual, XImage *ximage);
1157 unsigned long make_transparency_pixmap ();
1158# endif
1159
1160 ev_tstamp bg_valid_since;
1161
1162 Pixmap bg_pixmap;
1163 unsigned int bg_pmap_width, bg_pmap_height;
1164
1165 int target_x;
1166 int target_y;
1167 bool bg_set_position (int x, int y);
1168 bool bg_window_size_sensitive ();
1169 bool bg_window_position_sensitive ();
1170
1171 bool bg_render ();
1172 void bg_invalidate ()
1173 {
1174 bg_flags &= ~BG_IS_VALID;
1175 }
1176#endif
1177#ifdef HAVE_PIXBUF
1178 GdkPixbuf *pixbuf;
1179 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1180 int src_x, int src_y, int dst_x, int dst_y,
1181 unsigned int width, unsigned int height);
1069#endif 1182#endif
1070 1183
1071#if ENABLE_OVERLAY 1184#if ENABLE_OVERLAY
1072 overlay_base ov; 1185 overlay_base ov;
1073 1186
… …
1081 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1194 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1082#endif 1195#endif
1083 1196
1084 vector<void *> allocated; // free these memory blocks with free() 1197 vector<void *> allocated; // free these memory blocks with free()
1085 1198
1086 char env_windowid[21]; /* environmental variable WINDOWID */
1087 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1088 char *env_display; /* environmental variable DISPLAY */
1089 char *env_term; /* environmental variable TERM */
1090
1091 char *locale; 1199 char *locale;
1092 char charsets[4]; 1200 char charsets[4];
1093 char *v_buffer; /* pointer to physical buffer */ 1201 char *v_buffer; /* pointer to physical buffer */
1094 unsigned int v_buflen; /* size of area to write */ 1202 unsigned int v_buflen; /* size of area to write */
1095 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1203 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1134 void rootwin_cb (XEvent &xev); 1242 void rootwin_cb (XEvent &xev);
1135 xevent_watcher rootwin_ev; 1243 xevent_watcher rootwin_ev;
1136#endif 1244#endif
1137#ifdef HAVE_BG_PIXMAP 1245#ifdef HAVE_BG_PIXMAP
1138 void update_background (); 1246 void update_background ();
1139#if TRACE_PIXMAPS
1140 void trace_update_background (const char *file, int line);
1141# define update_background() trace_update_background (__FILE__, __LINE__)
1142#endif
1143 void update_background_cb (ev::timer &w, int revents); 1247 void update_background_cb (ev::timer &w, int revents);
1144 ev::timer update_background_ev; 1248 ev::timer update_background_ev;
1145#endif 1249#endif
1146 1250
1147 void x_cb (XEvent &xev); 1251 void x_cb (XEvent &xev);
… …
1152 void child_cb (ev::child &w, int revents); ev::child child_ev; 1256 void child_cb (ev::child &w, int revents); ev::child child_ev;
1153 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1257 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1154 void refresh_check (); 1258 void refresh_check ();
1155 void flush (); 1259 void flush ();
1156 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1260 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1261 void cmdbuf_reify ();
1262 void cmdbuf_append (const char *str, size_t count);
1157 bool pty_fill (); 1263 bool pty_fill ();
1158 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1264 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1159 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1160 1265
1161#ifdef CURSOR_BLINK 1266#ifdef CURSOR_BLINK
1162 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1267 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1163#endif 1268#endif
1164#ifdef TEXT_BLINK 1269#ifdef TEXT_BLINK
… …
1185 void pointer_unblank (); 1290 void pointer_unblank ();
1186 1291
1187 void tt_printf (const char *fmt,...); 1292 void tt_printf (const char *fmt,...);
1188 void tt_write (const char *data, unsigned int len); 1293 void tt_write (const char *data, unsigned int len);
1189 void pty_write (); 1294 void pty_write ();
1190
1191 void init (stringvec *argv, stringvec *envv)
1192 {
1193 this->argv = argv;
1194 init (argv->size (), argv->begin (), envv);
1195 }
1196 1295
1197 void make_current () const // make this the "currently active" urxvt instance 1296 void make_current () const // make this the "currently active" urxvt instance
1198 { 1297 {
1199 SET_R (this); 1298 SET_R (this);
1200 set_environ (envv); 1299 set_environ (envv);
… …
1212 void im_set_size (XRectangle &size); 1311 void im_set_size (XRectangle &size);
1213 void im_set_position (XPoint &pos) NOTHROW; 1312 void im_set_position (XPoint &pos) NOTHROW;
1214 void im_set_color (unsigned long &fg, unsigned long &bg); 1313 void im_set_color (unsigned long &fg, unsigned long &bg);
1215 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1314 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1216 1315
1217 bool IMisRunning (); 1316 bool im_is_running ();
1218 void IMSendSpot (); 1317 void im_send_spot ();
1219 bool IM_get_IC (const char *modifiers); 1318 bool im_get_ic (const char *modifiers);
1220 void IMSetPosition (); 1319 void im_set_position ();
1221#endif 1320#endif
1222 1321
1223 // command.C 1322 // command.C
1224 void key_press (XKeyEvent &ev); 1323 void key_press (XKeyEvent &ev);
1225 void key_release (XKeyEvent &ev); 1324 void key_release (XKeyEvent &ev);
1226 unsigned int cmd_write (const char *str, unsigned int count);
1227 1325
1228 wchar_t next_char () NOTHROW; 1326 wchar_t next_char () NOTHROW;
1229 wchar_t cmd_getc () THROW ((class out_of_input)); 1327 wchar_t cmd_getc () THROW ((class out_of_input));
1230 uint32_t next_octet () NOTHROW; 1328 uint32_t next_octet () NOTHROW;
1231 uint32_t cmd_get8 () THROW ((class out_of_input)); 1329 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1258 void process_color_seq (int report, int color, const char *str, char resp); 1356 void process_color_seq (int report, int color, const char *str, char resp);
1259 void process_xterm_seq (int op, char *str, char resp); 1357 void process_xterm_seq (int op, char *str, char resp);
1260 int privcases (int mode, unsigned long bit); 1358 int privcases (int mode, unsigned long bit);
1261 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1359 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1262 void process_sgr_mode (unsigned int nargs, const int *arg); 1360 void process_sgr_mode (unsigned int nargs, const int *arg);
1263 void process_graphics ();
1264 // init.C 1361 // init.C
1362 void init (stringvec *argv, stringvec *envv);
1363 void init (int argc, const char *const *argv, const char *const *envv);
1364 void init2 (int argc, const char *const *argv);
1265 void init_vars (); 1365 void init_vars ();
1266 const char **init_resources (int argc, const char *const *argv); 1366 const char **init_resources (int argc, const char *const *argv);
1267 void init (int argc, const char *const *argv, stringvec *envv);
1268 void init_env (); 1367 void init_env ();
1269 void set_locale (const char *locale); 1368 void set_locale (const char *locale);
1270 void init_xlocale (); 1369 void init_xlocale ();
1271 void init_command (const char *const *argv); 1370 void init_command (const char *const *argv);
1272 void run_command (const char *const *argv); 1371 void run_command (const char *const *argv);
1273 int run_child (const char *const *argv); 1372 int run_child (const char *const *argv);
1274 void color_aliases (int idx); 1373 void color_aliases (int idx);
1275 void create_windows (int argc, const char *const *argv); 1374 void create_windows (int argc, const char *const *argv);
1276 void get_colours (); 1375 void get_colours ();
1277 void get_ourmods (); 1376 void get_ourmods ();
1377 void set_icon (const char *file);
1278 // main.C 1378 // main.C
1279 void tt_winch (); 1379 void tt_winch ();
1280 rxvt_term (); 1380 rxvt_term ();
1281 ~rxvt_term (); 1381 ~rxvt_term ();
1282 void destroy (); 1382 void destroy ();
… …
1284 void recolour_cursor (); 1384 void recolour_cursor ();
1285 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1385 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1286 void window_calc (unsigned int newwidth, unsigned int newheight); 1386 void window_calc (unsigned int newwidth, unsigned int newheight);
1287 bool set_fonts (); 1387 bool set_fonts ();
1288 void set_string_property (Atom prop, const char *str, int len = -1); 1388 void set_string_property (Atom prop, const char *str, int len = -1);
1389 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1289 void set_utf8_property (Atom prop, const char *str, int len = -1); 1390 void set_utf8_property (Atom prop, const char *str, int len = -1);
1290 void set_title (const char *str); 1391 void set_title (const char *str);
1291 void set_icon_name (const char *str); 1392 void set_icon_name (const char *str);
1292 void set_window_color (int idx, const char *color); 1393 void set_window_color (int idx, const char *color);
1293 void set_colorfgbg (); 1394 char *get_colorfgbg ();
1294 bool set_color (rxvt_color &color, const char *name); 1395 bool set_color (rxvt_color &color, const char *name);
1295 void alias_color (int dst, int src); 1396 void alias_color (int dst, int src);
1296 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1397 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1297 void get_window_origin (int &x, int &y); 1398 void get_window_origin (int &x, int &y);
1298 Pixmap get_pixmap_property (int prop_id); 1399 Pixmap get_pixmap_property (Atom property);
1299 1400
1300 // screen.C 1401 // screen.C
1301 1402
1302 void lalloc (line_t &l) const 1403 void lalloc (line_t &l) const
1303 { 1404 {
… …
1333#ifndef NO_BRIGHTCOLOR 1434#ifndef NO_BRIGHTCOLOR
1334 if (r & RS_Bold 1435 if (r & RS_Bold
1335# if ENABLE_STYLES 1436# if ENABLE_STYLES
1336 && option (Opt_intensityStyles) 1437 && option (Opt_intensityStyles)
1337# endif 1438# endif
1338 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1439 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1339 base += minBrightCOLOR - minCOLOR; 1440 base += minBrightCOLOR - minCOLOR;
1340#endif 1441#endif
1341 return base; 1442 return base;
1342 } 1443 }
1343 1444
… …
1347#ifndef NO_BRIGHTCOLOR 1448#ifndef NO_BRIGHTCOLOR
1348 if (r & RS_Blink 1449 if (r & RS_Blink
1349# if ENABLE_STYLES 1450# if ENABLE_STYLES
1350 && option (Opt_intensityStyles) 1451 && option (Opt_intensityStyles)
1351# endif 1452# endif
1352 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1453 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1353 base += minBrightCOLOR - minCOLOR; 1454 base += minBrightCOLOR - minCOLOR;
1354#endif 1455#endif
1355 return base; 1456 return base;
1356 } 1457 }
1357 1458
1358 bool option (uint8_t opt) const NOTHROW 1459 bool option (uint8_t opt) const NOTHROW
1359 { 1460 {
1360 if (!opt)
1361 return 0;
1362
1363 --opt;
1364 return options[opt >> 3] & (1 << (opt & 7)); 1461 return options[opt >> 3] & (1 << (opt & 7));
1365 } 1462 }
1366 1463
1367 void set_option (uint8_t opt, bool set = true) NOTHROW 1464 void set_option (uint8_t opt, bool set = true) NOTHROW;
1368 {
1369 if (!opt)
1370 return;
1371
1372 --opt;
1373 if (set)
1374 options[opt >> 3] |= (1 << (opt & 7));
1375 else
1376 options[opt >> 3] &= ~(1 << (opt & 7));
1377 }
1378
1379 void set_privmode (unsigned bit, int set) NOTHROW
1380 {
1381 if (set)
1382 priv_modes |= bit;
1383 else
1384 priv_modes &= ~bit;
1385 }
1386 1465
1387 // modifies first argument(!) 1466 // modifies first argument(!)
1467 void tt_paste (char *data, unsigned int len) NOTHROW;
1388 void paste (char *data, unsigned int len) NOTHROW; 1468 void paste (char *data, unsigned int len) NOTHROW;
1389 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1469 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1390 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1470 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1391 void scr_kill_char (line_t &l, int col) const NOTHROW; 1471 void scr_kill_char (line_t &l, int col) const NOTHROW;
1392 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1472 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1401 void scr_backindex () NOTHROW; 1481 void scr_backindex () NOTHROW;
1402 void scr_forwardindex () NOTHROW; 1482 void scr_forwardindex () NOTHROW;
1403#endif 1483#endif
1404 void scr_touch (bool refresh) NOTHROW; 1484 void scr_touch (bool refresh) NOTHROW;
1405 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1485 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1406 void scr_recolour () NOTHROW; 1486 void scr_recolour (bool refresh = true) NOTHROW;
1407 void scr_remap_chars () NOTHROW; 1487 void scr_remap_chars () NOTHROW;
1408 void scr_remap_chars (line_t &l) NOTHROW; 1488 void scr_remap_chars (line_t &l) NOTHROW;
1409 1489
1410 enum cursor_mode { SAVE, RESTORE }; 1490 enum cursor_mode { SAVE, RESTORE };
1411 1491
… …
1446 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1526 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1447 void scr_reverse_selection () NOTHROW; 1527 void scr_reverse_selection () NOTHROW;
1448 void scr_dump (int fd) NOTHROW; 1528 void scr_dump (int fd) NOTHROW;
1449 1529
1450 void selection_check (int check_more) NOTHROW; 1530 void selection_check (int check_more) NOTHROW;
1451 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1452 void selection_property (Window win, Atom prop) NOTHROW;
1453 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1531 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1454 int selection_request_other (Atom target, int selnum) NOTHROW;
1455 void selection_clear (bool clipboard = false) NOTHROW; 1532 void selection_clear (bool clipboard = false) NOTHROW;
1456 void clipboard_copy (Time tm);
1457 void selection_make (Time tm); 1533 void selection_make (Time tm);
1458 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1534 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1459 void selection_start_colrow (int col, int row) NOTHROW; 1535 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; 1536 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; 1537 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1464 void selection_click (int clicks, int x, int y) NOTHROW; 1540 void selection_click (int clicks, int x, int y) NOTHROW;
1465 void selection_extend (int x, int y, int flag) NOTHROW; 1541 void selection_extend (int x, int y, int flag) NOTHROW;
1466 void selection_rotate (int x, int y) NOTHROW; 1542 void selection_rotate (int x, int y) NOTHROW;
1467 1543
1468 // xdefaults.C 1544 // xdefaults.C
1469 void get_options (int argc, const char *const *argv); 1545 const char **get_options (int argc, const char *const *argv);
1470 int parse_keysym (const char *str, const char *arg); 1546 int parse_keysym (const char *str, const char *arg);
1471 const char *x_resource (const char *name); 1547 const char *x_resource (const char *name);
1472 void extract_resources (); 1548 void extract_resources ();
1549 void extract_keysym_resources ();
1473}; 1550};
1474 1551
1475#endif /* _RXVT_H_ */ 1552#endif /* _RXVT_H_ */
1476 1553

Diff Legend

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