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.401 by sf-exg, Fri Apr 2 15:02:11 2010 UTC vs.
Revision 1.518 by sf-exg, Sun Jan 13 22:30:47 2013 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>
… …
47 45
48#include "feature.h" 46#include "feature.h"
49 47
50#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
51# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
52#endif 51#endif
53 52
54#if ENABLE_PERL 53#if ENABLE_PERL
55# define ENABLE_FRILLS 1 54# define ENABLE_FRILLS 1
56# define ENABLE_COMBINING 1 55# define ENABLE_COMBINING 1
… …
72#include <X11/cursorfont.h> 71#include <X11/cursorfont.h>
73#include <X11/keysym.h> 72#include <X11/keysym.h>
74#include <X11/keysymdef.h> 73#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 74#include <X11/Xatom.h>
76 75
76#if HAVE_PIXBUF
77# include <gdk-pixbuf/gdk-pixbuf.h>
78#endif
79
80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
81# define HAVE_BG_PIXMAP 1
82#endif
83
84#if HAVE_BG_PIXMAP
85# if HAVE_PIXBUF
86# define BG_IMAGE_FROM_FILE 1
87# endif
88# if ENABLE_TRANSPARENCY
89# define BG_IMAGE_FROM_ROOT 1
90# endif
91#endif
92
93#include <ecb.h>
77#include "encoding.h" 94#include "encoding.h"
78#include "rxvtutil.h" 95#include "rxvtutil.h"
79#include "rxvtfont.h" 96#include "rxvtfont.h"
80#include "rxvttoolkit.h" 97#include "rxvttoolkit.h"
98#include "rxvtimg.h"
81#include "scrollbar.h" 99#include "scrollbar.h"
82#include "ev_cpp.h" 100#include "ev_cpp.h"
83#include "salloc.h"
84#include "libptytty.h" 101#include "libptytty.h"
85 102
86#include "rxvtperl.h" 103#include "rxvtperl.h"
87 104
88// try to avoid some macros to decrease code size, on some systems 105// try to avoid some macros to decrease code size, on some systems
… …
98 ***************************************************************************** 115 *****************************************************************************
99 * SYSTEM HACKS 116 * SYSTEM HACKS
100 ***************************************************************************** 117 *****************************************************************************
101 */ 118 */
102 119
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 120#include <termios.h>
108
109#include "background.h"
110 121
111#ifndef STDIN_FILENO 122#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 123# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 124# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 125# define STDERR_FILENO 2
115#endif 126#endif
116 127
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 128#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 129# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 130# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 131#endif
125 132
126/****************************************************************************/ 133/****************************************************************************/
127 134
128// exception thrown on fatal (per-instance) errors 135// exception thrown on fatal (per-instance) errors
… …
151 158
152const char * rxvt_basename (const char *str) NOTHROW; 159const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 160void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 161void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 162void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 163void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 164void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
158 165
159char * rxvt_strtrim (char *str) NOTHROW; 166char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 167char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 168
169static inline void
170rxvt_free_strsplit (char **ptr) NOTHROW
171{
172 free (ptr[0]);
173 free (ptr);
174}
162 175
163void * rxvt_malloc (size_t size); 176void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 177void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 178void * rxvt_realloc (void *ptr, size_t size);
166 179
… …
189#else 202#else
190 if (envv) 203 if (envv)
191#endif 204#endif
192 environ = envv; 205 environ = envv;
193} 206}
207
208struct localise_env
209{
210 char **orig_env;
211
212 localise_env (char **new_env)
213 {
214 orig_env = environ;
215 environ = new_env;
216 }
217
218 ~localise_env ()
219 {
220 environ = orig_env;
221 }
222};
223
224#ifdef HAVE_BG_PIXMAP
225struct image_effects
226{
227 bool tint_set;
228 rxvt_color tint;
229 int shade;
230 int h_blurRadius, v_blurRadius;
231
232 image_effects ()
233 {
234 tint_set =
235 h_blurRadius =
236 v_blurRadius = 0;
237 shade = 100;
238 }
239
240 bool need_tint ()
241 {
242 return shade != 100 || tint_set;
243 }
244
245 bool need_blur ()
246 {
247 return h_blurRadius && v_blurRadius;
248 }
249
250 bool set_tint (const rxvt_color &new_tint);
251 bool set_shade (const char *shade_str);
252 bool set_blur (const char *geom);
253};
254
255# if BG_IMAGE_FROM_FILE
256enum {
257 IM_IS_SIZE_SENSITIVE = 1 << 1,
258 IM_KEEP_ASPECT = 1 << 2,
259 IM_ROOT_ALIGN = 1 << 3,
260 IM_TILE = 1 << 4,
261 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
262};
263
264enum {
265 noScale = 0,
266 windowScale = 100,
267 defaultScale = windowScale,
268 centerAlign = 50,
269 defaultAlign = centerAlign,
270};
271
272struct rxvt_image : image_effects
273{
274 unsigned short alpha;
275 uint8_t flags;
276 unsigned int h_scale, v_scale; /* percents of the window size */
277 int h_align, v_align; /* percents of the window size:
278 0 - left align, 50 - center, 100 - right */
279
280 bool is_size_sensitive ()
281 {
282 return (!(flags & IM_TILE)
283 || h_scale || v_scale
284 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
285 }
286
287 rxvt_img *img;
288
289 void destroy ()
290 {
291 delete img;
292 img = 0;
293 }
294
295 rxvt_image ();
296 void set_file_geometry (rxvt_screen *s, const char *file);
297 void set_file (rxvt_screen *s, const char *file);
298 bool set_geometry (const char *geom, bool update = false);
299};
300# endif
301#endif
194 302
195/* 303/*
196 ***************************************************************************** 304 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 305 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 306 *****************************************************************************
… …
241 ***************************************************************************** 349 *****************************************************************************
242 */ 350 */
243 351
244/* COLORTERM, TERM environment variables */ 352/* COLORTERM, TERM environment variables */
245#define COLORTERMENV "rxvt" 353#define COLORTERMENV "rxvt"
246#ifdef BG_IMAGE_FROM_FILE 354#if BG_IMAGE_FROM_FILE
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 355# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 356#else
249# define COLORTERMENVFULL COLORTERMENV 357# define COLORTERMENVFULL COLORTERMENV
250#endif 358#endif
251#ifndef TERMENV 359#ifndef TERMENV
252# ifdef USE_256_COLORS 360# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color" 361# define TERMENV "rxvt-unicode-256color"
254# else 362# else
255# define TERMENV "rxvt-unicode" 363# define TERMENV "rxvt-unicode"
256# endif 364# endif
257#endif 365#endif
… …
276# define NSCREENS 0 384# define NSCREENS 0
277#else 385#else
278# define NSCREENS 1 386# define NSCREENS 1
279#endif 387#endif
280 388
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 () */ 389/* flags for rxvt_term::scr_gotorc () */
287enum { 390enum {
288 C_RELATIVE = 1, /* col movement is relative */ 391 C_RELATIVE = 1, /* col movement is relative */
289 R_RELATIVE = 2, /* row movement is relative */ 392 R_RELATIVE = 2, /* row movement is relative */
290 RELATIVE = C_RELATIVE | R_RELATIVE, 393 RELATIVE = C_RELATIVE | R_RELATIVE,
291}; 394};
292 395
293/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 396/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294enum { 397enum {
295 INSERT = -1, /* don't change these values */ 398 INSERT = -1, /* don't change these values */
296 DELETE = +1, 399 DELETE = +1,
297 ERASE = +2, 400 ERASE = +2,
298}; 401};
299 402
300/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 403/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301enum page_dirn { 404enum page_dirn {
302 UP, 405 UP,
303 DN, 406 DN,
304 NO_DIR, 407 NO_DIR,
305}; 408};
306 409
307/* arguments for rxvt_scr_change_screen () */ 410/* arguments for rxvt_term::scr_change_screen () */
308enum { 411enum {
309 PRIMARY = 0, 412 PRIMARY = 0,
310 SECONDARY, 413 SECONDARY,
311}; 414};
312 415
… …
323#define RS_fgMask (RS_colorMask << RS_fgShift) 426#define RS_fgMask (RS_colorMask << RS_fgShift)
324 427
325// must have space for rxvt_fontset::fontCount * 2 + 2 values 428// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits) 429#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 430#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
431#define RS_fontCount rxvt_fontset::fontCount
328#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful 432#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
329 433
330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 434// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
331#define RS_redraw (2UL << RS_fontShift) 435#define RS_redraw (2UL << RS_fontShift)
332 436
437#define RS_Sel (1UL << 22)
438
333// 5 custom bits for extensions 439// 4 custom bits for extensions
334#define RS_customCount 16UL 440#define RS_customCount 16UL
335#define RS_customShift 23 441#define RS_customShift 23
336#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 442#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
337 443
338// font styles 444// font styles
… …
351#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 457#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
352#define RS_attrMask (RS_baseattrMask | RS_fontMask) 458#define RS_attrMask (RS_baseattrMask | RS_fontMask)
353 459
354#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 460#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
355#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 461#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
356
357#define Sel_none 0 /* Not waiting */
358#define Sel_normal 0x01 /* normal selection */
359#define Sel_incr 0x02 /* incremental selection */
360#define Sel_direct 0x00
361#define Sel_Primary 0x01
362#define Sel_Secondary 0x02
363#define Sel_Clipboard 0x03
364#define Sel_whereMask 0x0f
365#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
366#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
367 462
368enum { 463enum {
369 C0_NUL = 0x00, 464 C0_NUL = 0x00,
370 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 465 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
371 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 466 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
389 XTerm_Color_cursor = 12, // change actual 'Cursor' color 484 XTerm_Color_cursor = 12, // change actual 'Cursor' color
390 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 485 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
391 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 486 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
392 XTerm_Color05 = 15, // not implemented (tektronix fg) 487 XTerm_Color05 = 15, // not implemented (tektronix fg)
393 XTerm_Color06 = 16, // not implemented (tektronix bg) 488 XTerm_Color06 = 16, // not implemented (tektronix bg)
394 XTerm_Color_RV = 17, // change actual 'Highlight' color 489 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
490 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
395 XTerm_logfile = 46, // not implemented 491 XTerm_logfile = 46, // not implemented
396 XTerm_font = 50, 492 XTerm_font = 50,
397 493
398 XTerm_konsole30 = 30, // reserved for konsole 494 XTerm_konsole30 = 30, // reserved for konsole
399 XTerm_konsole31 = 31, // reserved for konsole 495 XTerm_konsole31 = 31, // reserved for konsole
… …
401 /* 497 /*
402 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 498 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
403 */ 499 */
404 500
405 // deprecated 501 // deprecated
406 Rxvt_Color_BD = 18,
407 Rxvt_Color_UL = 19,
408 Rxvt_restoreFG = 39, 502 Rxvt_restoreFG = 39,
409 Rxvt_restoreBG = 49, 503 Rxvt_restoreBG = 49,
410 504
411 Rxvt_Pixmap = 20, // new bg pixmap 505 Rxvt_Pixmap = 20, // new bg pixmap
412 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 506 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
466 Color_White = maxBrightCOLOR, 560 Color_White = maxBrightCOLOR,
467#else 561#else
468 Color_White = maxCOLOR, 562 Color_White = maxCOLOR,
469#endif 563#endif
470 minTermCOLOR = Color_White + 1, 564 minTermCOLOR = Color_White + 1,
471#ifndef USE_256_COLORS 565#if USE_256_COLORS
566 maxTermCOLOR = Color_White + 240,
567#else
472 maxTermCOLOR = Color_White + 72, 568 maxTermCOLOR = Color_White + 72,
473#else
474 maxTermCOLOR = Color_White + 240,
475#endif 569#endif
476#ifndef NO_CURSORCOLOR 570#ifndef NO_CURSORCOLOR
477 Color_cursor, 571 Color_cursor,
478 Color_cursor2, 572 Color_cursor2,
479#endif 573#endif
… …
489#if ENABLE_FRILLS 583#if ENABLE_FRILLS
490 Color_underline, 584 Color_underline,
491#endif 585#endif
492#ifdef OPTION_HC 586#ifdef OPTION_HC
493 Color_HC, 587 Color_HC,
588 Color_HTC,
494#endif 589#endif
495 Color_scroll, 590 Color_scroll,
496#ifdef RXVT_SCROLLBAR 591#ifdef RXVT_SCROLLBAR
497 Color_trough, 592 Color_trough,
498#endif 593#endif
499#if ENABLE_TRANSPARENCY 594#if BG_IMAGE_FROM_ROOT
500 Color_tint, 595 Color_tint,
501#endif 596#endif
502#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
503 Color_fade, 598 Color_fade,
504#endif 599#endif
… …
510#else 605#else
511 TOTAL_COLORS = NRS_COLORS 606 TOTAL_COLORS = NRS_COLORS
512#endif 607#endif
513}; 608};
514 609
515#ifndef USE_256_COLORS 610#if USE_256_COLORS
516#define Color_Bits 7 // 0 .. maxTermCOLOR 611# define Color_Bits 9 // 0 .. maxTermCOLOR
517#else 612#else
518#define Color_Bits 9 // 0 .. maxTermCOLOR 613# define Color_Bits 7 // 0 .. maxTermCOLOR
519#endif 614#endif
520 615
521/* 616/*
522 * Resource list 617 * Resource list
523 */ 618 */
… …
552#define PrivMode_vt52 (1UL<<18) 647#define PrivMode_vt52 (1UL<<18)
553#define PrivMode_LFNL (1UL<<19) 648#define PrivMode_LFNL (1UL<<19)
554#define PrivMode_MouseBtnEvent (1UL<<20) 649#define PrivMode_MouseBtnEvent (1UL<<20)
555#define PrivMode_MouseAnyEvent (1UL<<21) 650#define PrivMode_MouseAnyEvent (1UL<<21)
556#define PrivMode_BracketPaste (1UL<<22) 651#define PrivMode_BracketPaste (1UL<<22)
652#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
653#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
557 654
558#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 655#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
559 656
560#ifdef ALLOW_132_MODE 657#ifdef ALLOW_132_MODE
561# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 658# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
612/* 709/*
613 ***************************************************************************** 710 *****************************************************************************
614 * MACRO DEFINES 711 * MACRO DEFINES
615 ***************************************************************************** 712 *****************************************************************************
616 */ 713 */
714
715// speed hack, copy some member variable into a local variable of the same name
617#define dLocal(type,name) type const name = this->name 716#define dLocal(type,name) type const name = this->name
618 717
619// for speed reasons, we assume that all codepoints 32 to 126 are 718// for speed reasons, we assume that all codepoints 32 to 126 are
620// single-width. 719// single-width.
621#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 720#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
648 747
649#define GET_ATTR(x) (((x) & RS_attrMask)) 748#define GET_ATTR(x) (((x) & RS_attrMask))
650// return attributes defining the background, encoding doesn't matter 749// return attributes defining the background, encoding doesn't matter
651// depends on RS_fgShift > RS_bgShift 750// depends on RS_fgShift > RS_bgShift
652#define GET_BGATTR(x) \ 751#define GET_BGATTR(x) \
653 (expect_false ((x) & RS_RVid) \ 752 (ecb_unlikely ((x) & RS_RVid) \
654 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 753 ? (((x) & (RS_attrMask & ~RS_RVid)) \
655 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 754 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
656 : ((x) & (RS_attrMask | RS_bgMask))) 755 : ((x) & (RS_attrMask | RS_bgMask)))
657#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 756#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
658#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 757#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
686{ 785{
687 text_t *t; // terminal the text 786 text_t *t; // terminal the text
688 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
689 tlen_t_ l; // length of each text line 788 tlen_t_ l; // length of each text line
690 uint32_t f; // flags 789 uint32_t f; // flags
790
791 bool valid ()
792 {
793 return l >= 0;
794 }
795
796 void alloc ()
797 {
798 l = 0;
799 }
691 800
692 bool is_longer () 801 bool is_longer ()
693 { 802 {
694 return f & LINE_LONGER; 803 return f & LINE_LONGER;
695 } 804 }
… …
760// that are not representable in unicode, as well as characters 869// that are not representable in unicode, as well as characters
761// not fitting in the BMP. 870// not fitting in the BMP.
762struct compose_char 871struct compose_char
763{ 872{
764 unicode_t c1, c2; // any chars != NOCHAR are valid 873 unicode_t c1, c2; // any chars != NOCHAR are valid
874 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
875 compose_char () = default;
876 #endif
765 compose_char (unicode_t c1, unicode_t c2) 877 compose_char (unicode_t c1, unicode_t c2)
766 : c1(c1), c2(c2) 878 : c1(c1), c2(c2)
767 { } 879 { }
768}; 880};
769 881
… …
802{ 914{
803 int x, y, w, h; // overlay dimensions 915 int x, y, w, h; // overlay dimensions
804 text_t **text; 916 text_t **text;
805 rend_t **rend; 917 rend_t **rend;
806 918
807 // while tempting to add swap() etc. here, it effetcively only increases code size 919 // while tempting to add swap() etc. here, it effectively only increases code size
808}; 920};
809 921
810/* ------------------------------------------------------------------------- */ 922/* ------------------------------------------------------------------------- */
811 923
812typedef struct 924typedef struct
… …
851 * END······················= total_rows 963 * END······················= total_rows
852 */ 964 */
853 965
854struct TermWin_t 966struct TermWin_t
855{ 967{
968 int vt_width; /* actual window width [pixels] */
969 int vt_height; /* actual window height [pixels] */
856 int width; /* window width [pixels] */ 970 int width; /* window width [pixels] */
857 int height; /* window height [pixels] */ 971 int height; /* window height [pixels] */
858 int fwidth; /* font width [pixels] */ 972 int fwidth; /* font width [pixels] */
859 int fheight; /* font height [pixels] */ 973 int fheight; /* font height [pixels] */
860 int fbase; /* font ascent (baseline) [pixels] */ 974 int fbase; /* font ascent (baseline) [pixels] */
… …
869 int saveLines; /* number of lines that fit in scrollback */ 983 int saveLines; /* number of lines that fit in scrollback */
870 int total_rows; /* total number of rows in this terminal */ 984 int total_rows; /* total number of rows in this terminal */
871 int term_start; /* term lines start here */ 985 int term_start; /* term lines start here */
872 int view_start; /* scrollback view starts here */ 986 int view_start; /* scrollback view starts here */
873 int top_row; /* topmost row index of scrollback */ 987 int top_row; /* topmost row index of scrollback */
874 Window parent[6]; /* parent identifiers - we're parent[0] */ 988 Window parent; /* parent identifier */
875 Window vt; /* vt100 window */ 989 Window vt; /* vt100 window */
876 GC gc; /* GC for drawing */ 990 GC gc; /* GC for drawing */
877 Pixmap pixmap;
878 rxvt_drawable *drawable; 991 rxvt_drawable *drawable;
879 rxvt_fontset *fontset[4]; 992 rxvt_fontset *fontset[4];
880}; 993};
881 994
882/* 995/*
… …
944#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1057#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
945#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1058#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
946 1059
947/* rxvt_vars.options */ 1060/* rxvt_vars.options */
948enum { 1061enum {
949# define def(name,idx) Opt_ ## name = idx,
950# define nodef(name) Opt_ ## name = 0, 1062# define def(name) Opt_ ## name,
1063# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1064 Opt_0,
951# include "optinc.h" 1065# include "optinc.h"
952# undef nodef 1066# undef nodef
953# undef def 1067# undef def
954Opt_count 1068 Opt_count
955}; 1069};
956 1070
957/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
958 1072
959struct rxvt_vars : TermWin_t 1073struct rxvt_vars : TermWin_t
… …
961 scrollBar_t scrollBar; 1075 scrollBar_t scrollBar;
962 uint8_t options[(Opt_count + 7) >> 3]; 1076 uint8_t options[(Opt_count + 7) >> 3];
963 XSizeHints szHint; 1077 XSizeHints szHint;
964 rxvt_color *pix_colors; 1078 rxvt_color *pix_colors;
965 Cursor TermWin_cursor; /* cursor for vt window */ 1079 Cursor TermWin_cursor; /* cursor for vt window */
1080
966 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1081 line_t *row_buf; // all lines, scrollback + terminal, circular
967 line_t *drawn_buf; // text on screen 1082 line_t *drawn_buf; // text on screen
968 line_t *swap_buf; // lines for swap buffer 1083 line_t *swap_buf; // lines for swap buffer
969 char *tabs; /* per location: 1 == tab-stop */ 1084 char *tabs; /* per location: 1 == tab-stop */
970 screen_t screen; 1085 screen_t screen;
971 screen_t swap; 1086 screen_t swap;
… …
1008 hidden_pointer:1, 1123 hidden_pointer:1,
1009#endif 1124#endif
1010 enc_utf8:1, /* whether locale uses utf-8 */ 1125 enc_utf8:1, /* whether locale uses utf-8 */
1011 seen_input:1, /* whether we have seen some program output yet */ 1126 seen_input:1, /* whether we have seen some program output yet */
1012 seen_resize:1, /* whether we had a resize event */ 1127 seen_resize:1, /* whether we had a resize event */
1128 init_done:1,
1013 parsed_geometry:1; 1129 parsed_geometry:1;
1014 1130
1015 unsigned char refresh_type, 1131 unsigned char refresh_type,
1016#ifdef META8_OPTION 1132#ifdef META8_OPTION
1017 meta_char, /* Alt-key prefix */ 1133 meta_char; /* Alt-key prefix */
1018#endif 1134#endif
1019 selection_wait,
1020 selection_type;
1021/* ---------- */ 1135/* ---------- */
1022 bool rvideo_state, rvideo_mode; 1136 bool rvideo_state, rvideo_mode;
1023#ifndef NO_BELL 1137#ifndef NO_BELL
1024 bool rvideo_bell; 1138 bool rvideo_bell;
1025#endif 1139#endif
… …
1053 allowedxerror; 1167 allowedxerror;
1054/* ---------- */ 1168/* ---------- */
1055 unsigned int ModLevel3Mask, 1169 unsigned int ModLevel3Mask,
1056 ModMetaMask, 1170 ModMetaMask,
1057 ModNumLockMask; 1171 ModNumLockMask;
1058 int old_width, /* last used width in screen resize */
1059 old_height; /* last used height in screen resize */
1060 unsigned long priv_modes, 1172 unsigned long priv_modes,
1061 SavedModes; 1173 SavedModes;
1062/* ---------- */ 1174/* ---------- */
1063 Atom *xa; 1175 Atom *xa;
1064/* ---------- */ 1176/* ---------- */
1065 Time selection_time, 1177 Time selection_time,
1066 selection_request_time,
1067 clipboard_time; 1178 clipboard_time;
1179 rxvt_selection *selection_req;
1068 pid_t cmd_pid; /* process id of child */ 1180 pid_t cmd_pid; /* process id of child */
1069 char * incr_buf;
1070 size_t incr_buf_size, incr_buf_fill;
1071/* ---------- */ 1181/* ---------- */
1072 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1073 XComposeStatus compose; 1183 XComposeStatus compose;
1074 struct termios tio; 1184 static struct termios def_tio;
1075 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1076#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1077 bgPixmap_t bgPixmap; 1188 void bg_init ();
1189 void bg_destroy ();
1190
1191# if BG_IMAGE_FROM_FILE
1192 rxvt_image fimage;
1193 void render_image (rxvt_image &image);
1078#endif 1194# endif
1195
1196# if BG_IMAGE_FROM_ROOT
1197 rxvt_img *root_img;
1198 image_effects root_effects;
1199
1200 void render_root_image ();
1201# endif
1202
1203 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1204
1205 ev_tstamp bg_valid_since;
1206
1207 bool bg_window_size_sensitive ();
1208 bool bg_window_position_sensitive ();
1209
1210 void bg_render ();
1211#endif
1212
1079#ifdef HAVE_AFTERIMAGE 1213#ifdef HAVE_IMG
1080 ASVisual *asv; 1214 enum {
1081 ASImageManager *asimman; 1215 BG_IS_TRANSPARENT = 1 << 1,
1082 1216 BG_NEEDS_REFRESH = 1 << 2,
1083 void init_asv () 1217 BG_INHIBIT_RENDER = 1 << 3,
1084 {
1085 if (!asv)
1086 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1087 } 1218 };
1219
1220 uint8_t bg_flags;
1221
1222 rxvt_img *bg_img;
1088#endif 1223#endif
1089 1224
1090#if ENABLE_OVERLAY 1225#if ENABLE_OVERLAY
1091 overlay_base ov; 1226 overlay_base ov;
1092 1227
… …
1100 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1235 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1101#endif 1236#endif
1102 1237
1103 vector<void *> allocated; // free these memory blocks with free() 1238 vector<void *> allocated; // free these memory blocks with free()
1104 1239
1105 char env_windowid[21]; /* environmental variable WINDOWID */ 1240 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1106 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1107 char *env_display; /* environmental variable DISPLAY */
1108 char *env_term; /* environmental variable TERM */
1109 1241
1110 char *locale; 1242 char *locale;
1111 char charsets[4]; 1243 char charsets[4];
1112 char *v_buffer; /* pointer to physical buffer */ 1244 char *v_buffer; /* pointer to physical buffer */
1113 unsigned int v_buflen; /* size of area to write */ 1245 unsigned int v_buflen; /* size of area to write */
… …
1125 char *cmdbuf_ptr, *cmdbuf_endp; 1257 char *cmdbuf_ptr, *cmdbuf_endp;
1126 char cmdbuf_base[CBUFSIZ]; 1258 char cmdbuf_base[CBUFSIZ];
1127 1259
1128 ptytty *pty; 1260 ptytty *pty;
1129 1261
1130 rxvt_salloc *talloc; // text line allocator 1262 // chunk contains all line_t's as well as rend_t and text_t buffers
1131 rxvt_salloc *ralloc; // rend line allocator 1263 // for drawn_buf, swap_buf and row_buf, in this order
1264 void *chunk;
1265 size_t chunk_size;
1132 1266
1133 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1267 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1134 1268
1135#if ENABLE_FRILLS || ISO_14755 1269#if ENABLE_FRILLS || ISO_14755
1136 // ISO 14755 entry support 1270 // ISO 14755 entry support
1137 unicode_t iso14755buf; 1271 unicode_t iso14755buf;
1138 void commit_iso14755 (); 1272 void commit_iso14755 ();
1139# if ISO_14755 1273# if ISO_14755
1140 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1274 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1141 void iso14755_54 (int x, int y); 1275 void iso14755_54 (int x, int y);
1142# endif 1276# endif
1143#endif 1277#endif
1144 1278
1145 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1279 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1147 void vt_select_input () const NOTHROW 1281 void vt_select_input () const NOTHROW
1148 { 1282 {
1149 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1283 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1150 } 1284 }
1151 1285
1152#if ENABLE_TRANSPARENCY || ENABLE_PERL 1286#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1153 void rootwin_cb (XEvent &xev); 1287 void rootwin_cb (XEvent &xev);
1154 xevent_watcher rootwin_ev; 1288 xevent_watcher rootwin_ev;
1155#endif 1289#endif
1156#ifdef HAVE_BG_PIXMAP 1290#ifdef HAVE_BG_PIXMAP
1157 void update_background (); 1291 void update_background ();
1158#if TRACE_PIXMAPS
1159 void trace_update_background (const char *file, int line);
1160# define update_background() trace_update_background (__FILE__, __LINE__)
1161#endif
1162 void update_background_cb (ev::timer &w, int revents); 1292 void update_background_cb (ev::timer &w, int revents);
1163 ev::timer update_background_ev; 1293 ev::timer update_background_ev;
1164#endif 1294#endif
1165 1295
1166 void x_cb (XEvent &xev); 1296 void x_cb (XEvent &xev);
… …
1171 void child_cb (ev::child &w, int revents); ev::child child_ev; 1301 void child_cb (ev::child &w, int revents); ev::child child_ev;
1172 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1302 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1173 void refresh_check (); 1303 void refresh_check ();
1174 void flush (); 1304 void flush ();
1175 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1305 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1306 void cmdbuf_reify ();
1307 void cmdbuf_append (const char *str, size_t count);
1176 bool pty_fill (); 1308 bool pty_fill ();
1177 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1309 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1178 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1179 1310
1180#ifdef CURSOR_BLINK 1311#ifdef CURSOR_BLINK
1312 void cursor_blink_reset ();
1181 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1313 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1182#endif 1314#endif
1183#ifdef TEXT_BLINK 1315#ifdef TEXT_BLINK
1184 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1316 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1185#endif 1317#endif
… …
1204 void pointer_unblank (); 1336 void pointer_unblank ();
1205 1337
1206 void tt_printf (const char *fmt,...); 1338 void tt_printf (const char *fmt,...);
1207 void tt_write (const char *data, unsigned int len); 1339 void tt_write (const char *data, unsigned int len);
1208 void pty_write (); 1340 void pty_write ();
1209
1210 void init (stringvec *argv, stringvec *envv)
1211 {
1212 this->argv = argv;
1213 init (argv->size (), argv->begin (), envv);
1214 }
1215 1341
1216 void make_current () const // make this the "currently active" urxvt instance 1342 void make_current () const // make this the "currently active" urxvt instance
1217 { 1343 {
1218 SET_R (this); 1344 SET_R (this);
1219 set_environ (envv); 1345 set_environ (envv);
… …
1231 void im_set_size (XRectangle &size); 1357 void im_set_size (XRectangle &size);
1232 void im_set_position (XPoint &pos) NOTHROW; 1358 void im_set_position (XPoint &pos) NOTHROW;
1233 void im_set_color (unsigned long &fg, unsigned long &bg); 1359 void im_set_color (unsigned long &fg, unsigned long &bg);
1234 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1360 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1235 1361
1236 bool IMisRunning (); 1362 bool im_is_running ();
1237 void IMSendSpot (); 1363 void im_send_spot ();
1238 bool IM_get_IC (const char *modifiers); 1364 bool im_get_ic (const char *modifiers);
1239 void IMSetPosition (); 1365 void im_set_position ();
1240#endif 1366#endif
1241 1367
1242 // command.C 1368 // command.C
1243 void key_press (XKeyEvent &ev); 1369 void key_press (XKeyEvent &ev);
1244 void key_release (XKeyEvent &ev); 1370 void key_release (XKeyEvent &ev);
1245 unsigned int cmd_write (const char *str, unsigned int count);
1246 1371
1247 wchar_t next_char () NOTHROW; 1372 wchar_t next_char () NOTHROW;
1248 wchar_t cmd_getc () THROW ((class out_of_input)); 1373 wchar_t cmd_getc () THROW ((class out_of_input));
1249 uint32_t next_octet () NOTHROW; 1374 uint32_t next_octet () NOTHROW;
1250 uint32_t cmd_get8 () THROW ((class out_of_input)); 1375 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1277 void process_color_seq (int report, int color, const char *str, char resp); 1402 void process_color_seq (int report, int color, const char *str, char resp);
1278 void process_xterm_seq (int op, char *str, char resp); 1403 void process_xterm_seq (int op, char *str, char resp);
1279 int privcases (int mode, unsigned long bit); 1404 int privcases (int mode, unsigned long bit);
1280 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1405 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1281 void process_sgr_mode (unsigned int nargs, const int *arg); 1406 void process_sgr_mode (unsigned int nargs, const int *arg);
1282 void process_graphics ();
1283 // init.C 1407 // init.C
1408 void init (stringvec *argv, stringvec *envv);
1409 void init (int argc, const char *const *argv, const char *const *envv);
1410 void init2 (int argc, const char *const *argv);
1284 void init_vars (); 1411 void init_vars ();
1285 const char **init_resources (int argc, const char *const *argv); 1412 const char **init_resources (int argc, const char *const *argv);
1286 void init (int argc, const char *const *argv, stringvec *envv);
1287 void init_env (); 1413 void init_env ();
1288 void set_locale (const char *locale); 1414 void set_locale (const char *locale);
1289 void init_xlocale (); 1415 void init_xlocale ();
1290 void init_command (const char *const *argv); 1416 void init_command (const char *const *argv);
1291 void run_command (const char *const *argv); 1417 void run_command (const char *const *argv);
1292 int run_child (const char *const *argv); 1418 int run_child (const char *const *argv);
1293 void color_aliases (int idx); 1419 void color_aliases (int idx);
1294 void create_windows (int argc, const char *const *argv); 1420 void create_windows (int argc, const char *const *argv);
1295 void get_colours (); 1421 void get_colours ();
1296 void get_ourmods (); 1422 void get_ourmods ();
1423 void set_icon (const char *file);
1297 // main.C 1424 // main.C
1298 void tt_winch (); 1425 void tt_winch ();
1299 rxvt_term (); 1426 rxvt_term ();
1300 ~rxvt_term (); 1427 ~rxvt_term ();
1301 void destroy (); 1428 void destroy ();
… …
1303 void recolour_cursor (); 1430 void recolour_cursor ();
1304 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1431 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1305 void window_calc (unsigned int newwidth, unsigned int newheight); 1432 void window_calc (unsigned int newwidth, unsigned int newheight);
1306 bool set_fonts (); 1433 bool set_fonts ();
1307 void set_string_property (Atom prop, const char *str, int len = -1); 1434 void set_string_property (Atom prop, const char *str, int len = -1);
1435 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1308 void set_utf8_property (Atom prop, const char *str, int len = -1); 1436 void set_utf8_property (Atom prop, const char *str, int len = -1);
1309 void set_title (const char *str); 1437 void set_title (const char *str);
1310 void set_icon_name (const char *str); 1438 void set_icon_name (const char *str);
1311 void set_window_color (int idx, const char *color); 1439 void set_window_color (int idx, const char *color);
1312 void set_colorfgbg (); 1440 char *get_colorfgbg ();
1313 bool set_color (rxvt_color &color, const char *name); 1441 bool set_color (rxvt_color &color, const char *name);
1314 void alias_color (int dst, int src); 1442 void alias_color (int dst, int src);
1315 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1443 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1316 void get_window_origin (int &x, int &y); 1444 void get_window_origin (int &x, int &y);
1317 Pixmap get_pixmap_property (int prop_id);
1318 1445
1319 // screen.C 1446 // screen.C
1320 1447
1321 void lalloc (line_t &l) const 1448 bool option (uint8_t opt) const NOTHROW
1322 { 1449 {
1323 l.t = (text_t *)talloc->alloc (); 1450 return options[opt >> 3] & (1 << (opt & 7));
1324 l.r = (rend_t *)ralloc->alloc ();
1325 } 1451 }
1326 1452
1327#if 0 1453 void set_option (uint8_t opt, bool set = true) NOTHROW;
1328 void lfree (line_t &l)
1329 {
1330 talloc->free (l.t);
1331 ralloc->free (l.r);
1332 }
1333#endif
1334
1335 void lresize (line_t &l) const
1336 {
1337 if (!l.t)
1338 return;
1339
1340 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1341 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1342
1343 l.l = min (l.l, ncol);
1344
1345 if (ncol > prev_ncol)
1346 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1347 }
1348 1454
1349 int fgcolor_of (rend_t r) const NOTHROW 1455 int fgcolor_of (rend_t r) const NOTHROW
1350 { 1456 {
1351 int base = GET_BASEFG (r); 1457 int base = GET_BASEFG (r);
1352#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
1353 if (r & RS_Bold 1459 if (r & RS_Bold
1354# if ENABLE_STYLES 1460# if ENABLE_STYLES
1355 && option (Opt_intensityStyles) 1461 && option (Opt_intensityStyles)
1356# endif 1462# endif
1357 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1463 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1358 base += minBrightCOLOR - minCOLOR; 1464 base += minBrightCOLOR - minCOLOR;
1359#endif 1465#endif
1360 return base; 1466 return base;
1361 } 1467 }
1362 1468
… …
1366#ifndef NO_BRIGHTCOLOR 1472#ifndef NO_BRIGHTCOLOR
1367 if (r & RS_Blink 1473 if (r & RS_Blink
1368# if ENABLE_STYLES 1474# if ENABLE_STYLES
1369 && option (Opt_intensityStyles) 1475 && option (Opt_intensityStyles)
1370# endif 1476# endif
1371 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1477 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1372 base += minBrightCOLOR - minCOLOR; 1478 base += minBrightCOLOR - minCOLOR;
1373#endif 1479#endif
1374 return base; 1480 return base;
1375 } 1481 }
1376 1482
1377 bool option (uint8_t opt) const NOTHROW
1378 {
1379 if (!opt)
1380 return 0;
1381
1382 --opt;
1383 return options[opt >> 3] & (1 << (opt & 7));
1384 }
1385
1386 void set_option (uint8_t opt, bool set = true) NOTHROW
1387 {
1388 if (!opt)
1389 return;
1390
1391 --opt;
1392 if (set)
1393 options[opt >> 3] |= (1 << (opt & 7));
1394 else
1395 options[opt >> 3] &= ~(1 << (opt & 7));
1396 }
1397
1398 void set_privmode (unsigned bit, int set) NOTHROW
1399 {
1400 if (set)
1401 priv_modes |= bit;
1402 else
1403 priv_modes &= ~bit;
1404 }
1405
1406 // modifies first argument(!) 1483 // modifies first argument(!)
1484 void tt_paste (char *data, unsigned int len) NOTHROW;
1407 void paste (char *data, unsigned int len) NOTHROW; 1485 void paste (char *data, unsigned int len) NOTHROW;
1486 void scr_alloc () NOTHROW;
1408 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1487 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1409 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1488 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1410 void scr_kill_char (line_t &l, int col) const NOTHROW; 1489 void scr_kill_char (line_t &l, int col) const NOTHROW;
1411 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1490 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1491 void copy_line (line_t &dst, line_t &src);
1412 void scr_reset (); 1492 void scr_reset ();
1413 void scr_release () NOTHROW; 1493 void scr_release () NOTHROW;
1414 void scr_clear (bool really = false) NOTHROW; 1494 void scr_clear (bool really = false) NOTHROW;
1415 void scr_refresh () NOTHROW; 1495 void scr_refresh () NOTHROW;
1416 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1496 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
… …
1420 void scr_backindex () NOTHROW; 1500 void scr_backindex () NOTHROW;
1421 void scr_forwardindex () NOTHROW; 1501 void scr_forwardindex () NOTHROW;
1422#endif 1502#endif
1423 void scr_touch (bool refresh) NOTHROW; 1503 void scr_touch (bool refresh) NOTHROW;
1424 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1504 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1425 void scr_recolour () NOTHROW; 1505 void scr_recolour (bool refresh = true) NOTHROW;
1426 void scr_remap_chars () NOTHROW; 1506 void scr_remap_chars () NOTHROW;
1427 void scr_remap_chars (line_t &l) NOTHROW; 1507 void scr_remap_chars (line_t &l) NOTHROW;
1428 1508
1429 enum cursor_mode { SAVE, RESTORE }; 1509 enum cursor_mode { SAVE, RESTORE };
1430 1510
… …
1465 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1545 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1466 void scr_reverse_selection () NOTHROW; 1546 void scr_reverse_selection () NOTHROW;
1467 void scr_dump (int fd) NOTHROW; 1547 void scr_dump (int fd) NOTHROW;
1468 1548
1469 void selection_check (int check_more) NOTHROW; 1549 void selection_check (int check_more) NOTHROW;
1470 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1471 void selection_property (Window win, Atom prop) NOTHROW;
1472 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1550 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1473 int selection_request_other (Atom target, int selnum) NOTHROW;
1474 void selection_clear (bool clipboard = false) NOTHROW; 1551 void selection_clear (bool clipboard = false) NOTHROW;
1475 void clipboard_copy (Time tm);
1476 void selection_make (Time tm); 1552 void selection_make (Time tm);
1477 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1553 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1478 void selection_start_colrow (int col, int row) NOTHROW; 1554 void selection_start_colrow (int col, int row) NOTHROW;
1479 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1555 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1480 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1556 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1483 void selection_click (int clicks, int x, int y) NOTHROW; 1559 void selection_click (int clicks, int x, int y) NOTHROW;
1484 void selection_extend (int x, int y, int flag) NOTHROW; 1560 void selection_extend (int x, int y, int flag) NOTHROW;
1485 void selection_rotate (int x, int y) NOTHROW; 1561 void selection_rotate (int x, int y) NOTHROW;
1486 1562
1487 // xdefaults.C 1563 // xdefaults.C
1564 void rxvt_usage (int type);
1488 void get_options (int argc, const char *const *argv); 1565 const char **get_options (int argc, const char *const *argv);
1489 int parse_keysym (const char *str, const char *arg); 1566 int parse_keysym (const char *str, const char *arg);
1490 const char *x_resource (const char *name); 1567 const char *x_resource (const char *name);
1491 void extract_resources (); 1568 void extract_resources ();
1569 void extract_keysym_resources ();
1492}; 1570};
1493 1571
1494#endif /* _RXVT_H_ */ 1572#endif /* _RXVT_H_ */
1495 1573

Diff Legend

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