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.397 by root, Thu Apr 1 01:01:44 2010 UTC vs.
Revision 1.505 by sf-exg, Sun Jun 10 13:07:56 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>
… …
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 defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
81# define HAVE_BG_PIXMAP 1
82#endif
83
84#include <ecb.h>
77#include "encoding.h" 85#include "encoding.h"
78#include "rxvtutil.h" 86#include "rxvtutil.h"
79#include "rxvtfont.h" 87#include "rxvtfont.h"
80#include "rxvttoolkit.h" 88#include "rxvttoolkit.h"
89#include "rxvtimg.h"
81#include "scrollbar.h" 90#include "scrollbar.h"
82#include "ev_cpp.h" 91#include "ev_cpp.h"
83#include "salloc.h"
84#include "libptytty.h" 92#include "libptytty.h"
85 93
86#include "rxvtperl.h" 94#include "rxvtperl.h"
87 95
88// try to avoid some macros to decrease code size, on some systems 96// try to avoid some macros to decrease code size, on some systems
… …
98 ***************************************************************************** 106 *****************************************************************************
99 * SYSTEM HACKS 107 * SYSTEM HACKS
100 ***************************************************************************** 108 *****************************************************************************
101 */ 109 */
102 110
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 111#include <termios.h>
108
109#include "background.h"
110 112
111#ifndef STDIN_FILENO 113#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 114# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 115# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 116# define STDERR_FILENO 2
115#endif 117#endif
116 118
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 119#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 120# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 121# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 122#endif
125 123
126/****************************************************************************/ 124/****************************************************************************/
127 125
128// exception thrown on fatal (per-instance) errors 126// exception thrown on fatal (per-instance) errors
… …
151 149
152const char * rxvt_basename (const char *str) NOTHROW; 150const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 151void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 152void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 153void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 154void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 155void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
158 156
159char * rxvt_strtrim (char *str) NOTHROW; 157char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 158char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 159
160static inline void
161rxvt_free_strsplit (char **ptr) NOTHROW
162{
163 free (ptr[0]);
164 free (ptr);
165}
162 166
163void * rxvt_malloc (size_t size); 167void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 168void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 169void * rxvt_realloc (void *ptr, size_t size);
166 170
… …
189#else 193#else
190 if (envv) 194 if (envv)
191#endif 195#endif
192 environ = envv; 196 environ = envv;
193} 197}
198
199struct localise_env
200{
201 char **orig_env;
202
203 localise_env (char **new_env)
204 {
205 orig_env = environ;
206 environ = new_env;
207 }
208
209 ~localise_env ()
210 {
211 environ = orig_env;
212 }
213};
214
215#ifdef HAVE_BG_PIXMAP
216struct image_effects
217{
218 bool tint_set;
219 rxvt_color tint;
220 int shade;
221 int h_blurRadius, v_blurRadius;
222
223 image_effects ()
224 {
225 tint_set =
226 h_blurRadius =
227 v_blurRadius = 0;
228 shade = 100;
229 }
230
231 bool need_tint ()
232 {
233 return shade != 100 || tint_set;
234 }
235
236 bool need_blur ()
237 {
238 return h_blurRadius && v_blurRadius;
239 }
240
241 bool set_tint (const rxvt_color &new_tint);
242 bool set_shade (const char *shade_str);
243 bool set_blur (const char *geom);
244};
245
246# if BG_IMAGE_FROM_FILE
247enum {
248 IM_IS_SIZE_SENSITIVE = 1 << 1,
249 IM_KEEP_ASPECT = 1 << 2,
250 IM_ROOT_ALIGN = 1 << 3,
251 IM_TILE = 1 << 4,
252 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
253};
254
255enum {
256 noScale = 0,
257 windowScale = 100,
258 defaultScale = windowScale,
259 centerAlign = 50,
260 defaultAlign = centerAlign,
261};
262
263struct rxvt_image : image_effects
264{
265 unsigned short alpha;
266 uint8_t flags;
267 unsigned int h_scale, v_scale; /* percents of the window size */
268 int h_align, v_align; /* percents of the window size:
269 0 - left align, 50 - center, 100 - right */
270
271 bool is_size_sensitive ()
272 {
273 return (!(flags & IM_TILE)
274 || h_scale || v_scale
275 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
276 }
277
278 rxvt_img *img;
279
280 void destroy ()
281 {
282 delete img;
283 }
284
285 rxvt_image ();
286 bool set_file_geometry (rxvt_screen *s, const char *file);
287 bool set_file (rxvt_screen *s, const char *file);
288 bool set_geometry (const char *geom, bool update = false);
289};
290# endif
291#endif
194 292
195/* 293/*
196 ***************************************************************************** 294 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 295 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 296 *****************************************************************************
… …
241 ***************************************************************************** 339 *****************************************************************************
242 */ 340 */
243 341
244/* COLORTERM, TERM environment variables */ 342/* COLORTERM, TERM environment variables */
245#define COLORTERMENV "rxvt" 343#define COLORTERMENV "rxvt"
246#ifdef BG_IMAGE_FROM_FILE 344#if BG_IMAGE_FROM_FILE
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 345# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 346#else
249# define COLORTERMENVFULL COLORTERMENV 347# define COLORTERMENVFULL COLORTERMENV
250#endif 348#endif
251#ifndef TERMENV 349#ifndef TERMENV
350# if USE_256_COLORS
351# define TERMENV "rxvt-unicode-256color"
352# else
252# define TERMENV "rxvt-unicode" 353# define TERMENV "rxvt-unicode"
354# endif
253#endif 355#endif
254 356
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 357#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 358# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 359#endif
… …
272# define NSCREENS 0 374# define NSCREENS 0
273#else 375#else
274# define NSCREENS 1 376# define NSCREENS 1
275#endif 377#endif
276 378
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 () */ 379/* flags for rxvt_term::scr_gotorc () */
283enum { 380enum {
284 C_RELATIVE = 1, /* col movement is relative */ 381 C_RELATIVE = 1, /* col movement is relative */
285 R_RELATIVE = 2, /* row movement is relative */ 382 R_RELATIVE = 2, /* row movement is relative */
286 RELATIVE = C_RELATIVE | R_RELATIVE, 383 RELATIVE = C_RELATIVE | R_RELATIVE,
287}; 384};
288 385
289/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 386/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
290enum { 387enum {
291 INSERT = -1, /* don't change these values */ 388 INSERT = -1, /* don't change these values */
292 DELETE = +1, 389 DELETE = +1,
293 ERASE = +2, 390 ERASE = +2,
294}; 391};
295 392
296/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 393/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
297enum page_dirn { 394enum page_dirn {
298 UP, 395 UP,
299 DN, 396 DN,
300 NO_DIR, 397 NO_DIR,
301}; 398};
302 399
303/* arguments for rxvt_scr_change_screen () */ 400/* arguments for rxvt_term::scr_change_screen () */
304enum { 401enum {
305 PRIMARY = 0, 402 PRIMARY = 0,
306 SECONDARY, 403 SECONDARY,
307}; 404};
405
406// define various rendition bits and masks. the rendition word
407// is 32 bits in size, and we should use it as efficiently as possible
308 408
309#define RS_None 0 409#define RS_None 0
310 410
311// GET_BGATTR depends on RS_fgShift > RS_bgShift 411// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_colorMask ((1UL << Color_Bits) - 1UL) 412#define RS_colorMask ((1UL << Color_Bits) - 1UL)
… …
316#define RS_fgMask (RS_colorMask << RS_fgShift) 416#define RS_fgMask (RS_colorMask << RS_fgShift)
317 417
318// must have space for rxvt_fontset::fontCount * 2 + 2 values 418// must have space for rxvt_fontset::fontCount * 2 + 2 values
319#define RS_fontShift (RS_fgShift + Color_Bits) 419#define RS_fontShift (RS_fgShift + Color_Bits)
320#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 420#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
421#define RS_fontCount rxvt_fontset::fontCount
321#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful 422#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
322 423
323// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 424// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
324#define RS_redraw (2UL << RS_fontShift) 425#define RS_redraw (2UL << RS_fontShift)
325 426
427#define RS_Sel (1UL << 22)
428
326// 5 custom bits for extensions 429// 4 custom bits for extensions
327#define RS_customCount 16UL 430#define RS_customCount 16UL
328#define RS_customShift 23 431#define RS_customShift 23
329#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 432#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
330 433
331// font styles 434// font styles
… …
344#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 447#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
345#define RS_attrMask (RS_baseattrMask | RS_fontMask) 448#define RS_attrMask (RS_baseattrMask | RS_fontMask)
346 449
347#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 450#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
348#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 451#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
349
350#define Sel_none 0 /* Not waiting */
351#define Sel_normal 0x01 /* normal selection */
352#define Sel_incr 0x02 /* incremental selection */
353#define Sel_direct 0x00
354#define Sel_Primary 0x01
355#define Sel_Secondary 0x02
356#define Sel_Clipboard 0x03
357#define Sel_whereMask 0x0f
358#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
359#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
360 452
361enum { 453enum {
362 C0_NUL = 0x00, 454 C0_NUL = 0x00,
363 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 455 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
364 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 456 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
382 XTerm_Color_cursor = 12, // change actual 'Cursor' color 474 XTerm_Color_cursor = 12, // change actual 'Cursor' color
383 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 475 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
384 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 476 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
385 XTerm_Color05 = 15, // not implemented (tektronix fg) 477 XTerm_Color05 = 15, // not implemented (tektronix fg)
386 XTerm_Color06 = 16, // not implemented (tektronix bg) 478 XTerm_Color06 = 16, // not implemented (tektronix bg)
387 XTerm_Color_RV = 17, // change actual 'Highlight' color 479 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
480 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
388 XTerm_logfile = 46, // not implemented 481 XTerm_logfile = 46, // not implemented
389 XTerm_font = 50, 482 XTerm_font = 50,
390 483
391 XTerm_konsole30 = 30, // reserved for konsole 484 XTerm_konsole30 = 30, // reserved for konsole
392 XTerm_konsole31 = 31, // reserved for konsole 485 XTerm_konsole31 = 31, // reserved for konsole
… …
394 /* 487 /*
395 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 488 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
396 */ 489 */
397 490
398 // deprecated 491 // deprecated
399 Rxvt_Color_BD = 18,
400 Rxvt_Color_UL = 19,
401 Rxvt_restoreFG = 39, 492 Rxvt_restoreFG = 39,
402 Rxvt_restoreBG = 49, 493 Rxvt_restoreBG = 49,
403 494
404 Rxvt_Pixmap = 20, // new bg pixmap 495 Rxvt_Pixmap = 20, // new bg pixmap
405 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
459 Color_White = maxBrightCOLOR, 550 Color_White = maxBrightCOLOR,
460#else 551#else
461 Color_White = maxCOLOR, 552 Color_White = maxCOLOR,
462#endif 553#endif
463 minTermCOLOR = Color_White + 1, 554 minTermCOLOR = Color_White + 1,
464#ifndef USE_256_COLORS 555#if USE_256_COLORS
556 maxTermCOLOR = Color_White + 240,
557#else
465 maxTermCOLOR = Color_White + 72, 558 maxTermCOLOR = Color_White + 72,
466#else
467 maxTermCOLOR = Color_White + 240,
468#endif 559#endif
469#ifndef NO_CURSORCOLOR 560#ifndef NO_CURSORCOLOR
470 Color_cursor, 561 Color_cursor,
471 Color_cursor2, 562 Color_cursor2,
472#endif 563#endif
… …
482#if ENABLE_FRILLS 573#if ENABLE_FRILLS
483 Color_underline, 574 Color_underline,
484#endif 575#endif
485#ifdef OPTION_HC 576#ifdef OPTION_HC
486 Color_HC, 577 Color_HC,
578 Color_HTC,
487#endif 579#endif
488 Color_scroll, 580 Color_scroll,
489#ifdef RXVT_SCROLLBAR 581#ifdef RXVT_SCROLLBAR
490 Color_trough, 582 Color_trough,
491#endif 583#endif
… …
503#else 595#else
504 TOTAL_COLORS = NRS_COLORS 596 TOTAL_COLORS = NRS_COLORS
505#endif 597#endif
506}; 598};
507 599
508#ifndef USE_256_COLORS 600#if USE_256_COLORS
509#define Color_Bits 7 // 0 .. maxTermCOLOR 601# define Color_Bits 9 // 0 .. maxTermCOLOR
510#else 602#else
511#define Color_Bits 9 // 0 .. maxTermCOLOR 603# define Color_Bits 7 // 0 .. maxTermCOLOR
512#endif 604#endif
513 605
514/* 606/*
515 * Resource list 607 * Resource list
516 */ 608 */
… …
545#define PrivMode_vt52 (1UL<<18) 637#define PrivMode_vt52 (1UL<<18)
546#define PrivMode_LFNL (1UL<<19) 638#define PrivMode_LFNL (1UL<<19)
547#define PrivMode_MouseBtnEvent (1UL<<20) 639#define PrivMode_MouseBtnEvent (1UL<<20)
548#define PrivMode_MouseAnyEvent (1UL<<21) 640#define PrivMode_MouseAnyEvent (1UL<<21)
549#define PrivMode_BracketPaste (1UL<<22) 641#define PrivMode_BracketPaste (1UL<<22)
642#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
643#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
550 644
551#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 645#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
552 646
553#ifdef ALLOW_132_MODE 647#ifdef ALLOW_132_MODE
554# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 648# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
605/* 699/*
606 ***************************************************************************** 700 *****************************************************************************
607 * MACRO DEFINES 701 * MACRO DEFINES
608 ***************************************************************************** 702 *****************************************************************************
609 */ 703 */
704
705// speed hack, copy some member variable into a local variable of the same name
610#define dLocal(type,name) type const name = this->name 706#define dLocal(type,name) type const name = this->name
611 707
612// for speed reasons, we assume that all codepoints 32 to 126 are 708// for speed reasons, we assume that all codepoints 32 to 126 are
613// single-width. 709// single-width.
614#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 710#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
641 737
642#define GET_ATTR(x) (((x) & RS_attrMask)) 738#define GET_ATTR(x) (((x) & RS_attrMask))
643// return attributes defining the background, encoding doesn't matter 739// return attributes defining the background, encoding doesn't matter
644// depends on RS_fgShift > RS_bgShift 740// depends on RS_fgShift > RS_bgShift
645#define GET_BGATTR(x) \ 741#define GET_BGATTR(x) \
646 (expect_false ((x) & RS_RVid) \ 742 (ecb_unlikely ((x) & RS_RVid) \
647 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 743 ? (((x) & (RS_attrMask & ~RS_RVid)) \
648 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 744 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
649 : ((x) & (RS_attrMask | RS_bgMask))) 745 : ((x) & (RS_attrMask | RS_bgMask)))
650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 746#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 747#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
679{ 775{
680 text_t *t; // terminal the text 776 text_t *t; // terminal the text
681 rend_t *r; // rendition, uses RS_ flags 777 rend_t *r; // rendition, uses RS_ flags
682 tlen_t_ l; // length of each text line 778 tlen_t_ l; // length of each text line
683 uint32_t f; // flags 779 uint32_t f; // flags
780
781 bool valid ()
782 {
783 return l >= 0;
784 }
785
786 void alloc ()
787 {
788 l = 0;
789 }
684 790
685 bool is_longer () 791 bool is_longer ()
686 { 792 {
687 return f & LINE_LONGER; 793 return f & LINE_LONGER;
688 } 794 }
… …
753// that are not representable in unicode, as well as characters 859// that are not representable in unicode, as well as characters
754// not fitting in the BMP. 860// not fitting in the BMP.
755struct compose_char 861struct compose_char
756{ 862{
757 unicode_t c1, c2; // any chars != NOCHAR are valid 863 unicode_t c1, c2; // any chars != NOCHAR are valid
864 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
865 compose_char () = default;
866 #endif
758 compose_char (unicode_t c1, unicode_t c2) 867 compose_char (unicode_t c1, unicode_t c2)
759 : c1(c1), c2(c2) 868 : c1(c1), c2(c2)
760 { } 869 { }
761}; 870};
762 871
… …
795{ 904{
796 int x, y, w, h; // overlay dimensions 905 int x, y, w, h; // overlay dimensions
797 text_t **text; 906 text_t **text;
798 rend_t **rend; 907 rend_t **rend;
799 908
800 // while tempting to add swap() etc. here, it effetcively only increases code size 909 // while tempting to add swap() etc. here, it effectively only increases code size
801}; 910};
802 911
803/* ------------------------------------------------------------------------- */ 912/* ------------------------------------------------------------------------- */
804 913
805typedef struct 914typedef struct
… …
844 * END······················= total_rows 953 * END······················= total_rows
845 */ 954 */
846 955
847struct TermWin_t 956struct TermWin_t
848{ 957{
958 int vt_width; /* actual window width [pixels] */
959 int vt_height; /* actual window height [pixels] */
849 int width; /* window width [pixels] */ 960 int width; /* window width [pixels] */
850 int height; /* window height [pixels] */ 961 int height; /* window height [pixels] */
851 int fwidth; /* font width [pixels] */ 962 int fwidth; /* font width [pixels] */
852 int fheight; /* font height [pixels] */ 963 int fheight; /* font height [pixels] */
853 int fbase; /* font ascent (baseline) [pixels] */ 964 int fbase; /* font ascent (baseline) [pixels] */
… …
862 int saveLines; /* number of lines that fit in scrollback */ 973 int saveLines; /* number of lines that fit in scrollback */
863 int total_rows; /* total number of rows in this terminal */ 974 int total_rows; /* total number of rows in this terminal */
864 int term_start; /* term lines start here */ 975 int term_start; /* term lines start here */
865 int view_start; /* scrollback view starts here */ 976 int view_start; /* scrollback view starts here */
866 int top_row; /* topmost row index of scrollback */ 977 int top_row; /* topmost row index of scrollback */
867 Window parent[6]; /* parent identifiers - we're parent[0] */ 978 Window parent; /* parent identifier */
868 Window vt; /* vt100 window */ 979 Window vt; /* vt100 window */
869 GC gc; /* GC for drawing */ 980 GC gc; /* GC for drawing */
870 Pixmap pixmap;
871 rxvt_drawable *drawable; 981 rxvt_drawable *drawable;
872 rxvt_fontset *fontset[4]; 982 rxvt_fontset *fontset[4];
873}; 983};
874 984
875/* 985/*
… …
937#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1047#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
938#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1048#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
939 1049
940/* rxvt_vars.options */ 1050/* rxvt_vars.options */
941enum { 1051enum {
942# define def(name,idx) Opt_ ## name = idx,
943# define nodef(name) Opt_ ## name = 0, 1052# define def(name) Opt_ ## name,
1053# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1054 Opt_0,
944# include "optinc.h" 1055# include "optinc.h"
945# undef nodef 1056# undef nodef
946# undef def 1057# undef def
947Opt_count 1058 Opt_count
948}; 1059};
949 1060
950/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
951 1062
952struct rxvt_vars : TermWin_t 1063struct rxvt_vars : TermWin_t
… …
954 scrollBar_t scrollBar; 1065 scrollBar_t scrollBar;
955 uint8_t options[(Opt_count + 7) >> 3]; 1066 uint8_t options[(Opt_count + 7) >> 3];
956 XSizeHints szHint; 1067 XSizeHints szHint;
957 rxvt_color *pix_colors; 1068 rxvt_color *pix_colors;
958 Cursor TermWin_cursor; /* cursor for vt window */ 1069 Cursor TermWin_cursor; /* cursor for vt window */
959 int numlock_state; 1070
960 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1071 line_t *row_buf; // all lines, scrollback + terminal, circular
961 line_t *drawn_buf; // text on screen 1072 line_t *drawn_buf; // text on screen
962 line_t *swap_buf; // lines for swap buffer 1073 line_t *swap_buf; // lines for swap buffer
963 char *tabs; /* per location: 1 == tab-stop */ 1074 char *tabs; /* per location: 1 == tab-stop */
964 screen_t screen; 1075 screen_t screen;
965 screen_t swap; 1076 screen_t swap;
… …
1002 hidden_pointer:1, 1113 hidden_pointer:1,
1003#endif 1114#endif
1004 enc_utf8:1, /* whether locale uses utf-8 */ 1115 enc_utf8:1, /* whether locale uses utf-8 */
1005 seen_input:1, /* whether we have seen some program output yet */ 1116 seen_input:1, /* whether we have seen some program output yet */
1006 seen_resize:1, /* whether we had a resize event */ 1117 seen_resize:1, /* whether we had a resize event */
1118 init_done:1,
1007 parsed_geometry:1; 1119 parsed_geometry:1;
1008 1120
1009 unsigned char refresh_type, 1121 unsigned char refresh_type,
1010#ifdef META8_OPTION 1122#ifdef META8_OPTION
1011 meta_char, /* Alt-key prefix */ 1123 meta_char; /* Alt-key prefix */
1012#endif 1124#endif
1013 selection_wait,
1014 selection_type;
1015/* ---------- */ 1125/* ---------- */
1016 bool rvideo_state, rvideo_mode; 1126 bool rvideo_state, rvideo_mode;
1017#ifndef NO_BELL 1127#ifndef NO_BELL
1018 bool rvideo_bell; 1128 bool rvideo_bell;
1019#endif 1129#endif
… …
1047 allowedxerror; 1157 allowedxerror;
1048/* ---------- */ 1158/* ---------- */
1049 unsigned int ModLevel3Mask, 1159 unsigned int ModLevel3Mask,
1050 ModMetaMask, 1160 ModMetaMask,
1051 ModNumLockMask; 1161 ModNumLockMask;
1052 int old_width, /* last used width in screen resize */
1053 old_height; /* last used height in screen resize */
1054 unsigned long priv_modes, 1162 unsigned long priv_modes,
1055 SavedModes; 1163 SavedModes;
1056/* ---------- */ 1164/* ---------- */
1057 Atom *xa; 1165 Atom *xa;
1058/* ---------- */ 1166/* ---------- */
1059 Time selection_time, 1167 Time selection_time,
1060 selection_request_time,
1061 clipboard_time; 1168 clipboard_time;
1169 rxvt_selection *selection_req;
1062 pid_t cmd_pid; /* process id of child */ 1170 pid_t cmd_pid; /* process id of child */
1063 char * incr_buf;
1064 size_t incr_buf_size, incr_buf_fill;
1065/* ---------- */ 1171/* ---------- */
1066 struct mouse_event MEvent; 1172 struct mouse_event MEvent;
1067 XComposeStatus compose; 1173 XComposeStatus compose;
1068 struct termios tio; 1174 static struct termios def_tio;
1069 row_col_t oldcursor; 1175 row_col_t oldcursor;
1070#ifdef HAVE_BG_PIXMAP 1176#ifdef HAVE_BG_PIXMAP
1071 bgPixmap_t bgPixmap; 1177 void bg_init ();
1178 void bg_destroy ();
1179
1180 enum {
1181 BG_IS_VALID = 1 << 0,
1182
1183 BG_IS_TRANSPARENT = 1 << 1,
1184 BG_NEEDS_REFRESH = 1 << 2,
1185 BG_INHIBIT_RENDER = 1 << 3,
1186 };
1187
1188 uint8_t bg_flags;
1189
1190# if BG_IMAGE_FROM_FILE
1191 rxvt_image fimage;
1192 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1193 bool render_image (rxvt_image &image);
1072#endif 1194# endif
1073#ifdef HAVE_AFTERIMAGE
1074 ASVisual *asv;
1075 ASImageManager *asimman;
1076 1195
1077 void init_asv () 1196# if ENABLE_TRANSPARENCY
1197 rxvt_img *root_img;
1198 image_effects root_effects;
1199
1200 void bg_set_transparent ()
1078 { 1201 {
1079 if (!asv) 1202 bg_flags |= BG_IS_TRANSPARENT;
1080 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1203 }
1204 void bg_set_root_pixmap ();
1205 bool render_root_image ();
1206# endif
1207
1208 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1209
1210 ev_tstamp bg_valid_since;
1211
1212 rxvt_img *bg_img;
1213
1214 int target_x;
1215 int target_y;
1216 bool bg_set_position (int x, int y);
1217 bool bg_window_size_sensitive ();
1218 bool bg_window_position_sensitive ();
1219
1220 void bg_render ();
1221 void bg_invalidate ()
1222 {
1223 bg_flags &= ~BG_IS_VALID;
1081 } 1224 }
1082#endif 1225#endif
1083 1226
1084#if ENABLE_OVERLAY 1227#if ENABLE_OVERLAY
1085 overlay_base ov; 1228 overlay_base ov;
… …
1094 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1237 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1095#endif 1238#endif
1096 1239
1097 vector<void *> allocated; // free these memory blocks with free() 1240 vector<void *> allocated; // free these memory blocks with free()
1098 1241
1099 char env_windowid[21]; /* environmental variable WINDOWID */ 1242 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1100 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1101 char *env_display; /* environmental variable DISPLAY */
1102 char *env_term; /* environmental variable TERM */
1103 1243
1104 char *locale; 1244 char *locale;
1105 char charsets[4]; 1245 char charsets[4];
1106 char *v_buffer; /* pointer to physical buffer */ 1246 char *v_buffer; /* pointer to physical buffer */
1107 unsigned int v_buflen; /* size of area to write */ 1247 unsigned int v_buflen; /* size of area to write */
… …
1119 char *cmdbuf_ptr, *cmdbuf_endp; 1259 char *cmdbuf_ptr, *cmdbuf_endp;
1120 char cmdbuf_base[CBUFSIZ]; 1260 char cmdbuf_base[CBUFSIZ];
1121 1261
1122 ptytty *pty; 1262 ptytty *pty;
1123 1263
1124 rxvt_salloc *talloc; // text line allocator 1264 // chunk contains all line_t's as well as rend_t and text_t buffers
1125 rxvt_salloc *ralloc; // rend line allocator 1265 // for drawn_buf, swap_buf and row_buf, in this order
1266 void *chunk;
1267 size_t chunk_size;
1126 1268
1127 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1269 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1128 1270
1129#if ENABLE_FRILLS || ISO_14755 1271#if ENABLE_FRILLS || ISO_14755
1130 // ISO 14755 entry support 1272 // ISO 14755 entry support
1131 unicode_t iso14755buf; 1273 unicode_t iso14755buf;
1132 void commit_iso14755 (); 1274 void commit_iso14755 ();
1133# if ISO_14755 1275# if ISO_14755
1134 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1276 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1135 void iso14755_54 (int x, int y); 1277 void iso14755_54 (int x, int y);
1136# endif 1278# endif
1137#endif 1279#endif
1138 1280
1139 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1281 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1147 void rootwin_cb (XEvent &xev); 1289 void rootwin_cb (XEvent &xev);
1148 xevent_watcher rootwin_ev; 1290 xevent_watcher rootwin_ev;
1149#endif 1291#endif
1150#ifdef HAVE_BG_PIXMAP 1292#ifdef HAVE_BG_PIXMAP
1151 void update_background (); 1293 void update_background ();
1152#if TRACE_PIXMAPS
1153 void trace_update_background (const char *file, int line);
1154# define update_background() trace_update_background (__FILE__, __LINE__)
1155#endif
1156 void update_background_cb (ev::timer &w, int revents); 1294 void update_background_cb (ev::timer &w, int revents);
1157 ev::timer update_background_ev; 1295 ev::timer update_background_ev;
1158#endif 1296#endif
1159 1297
1160 void x_cb (XEvent &xev); 1298 void x_cb (XEvent &xev);
… …
1165 void child_cb (ev::child &w, int revents); ev::child child_ev; 1303 void child_cb (ev::child &w, int revents); ev::child child_ev;
1166 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1304 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1167 void refresh_check (); 1305 void refresh_check ();
1168 void flush (); 1306 void flush ();
1169 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1307 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1308 void cmdbuf_reify ();
1309 void cmdbuf_append (const char *str, size_t count);
1170 bool pty_fill (); 1310 bool pty_fill ();
1171 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1311 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1172 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1173 1312
1174#ifdef CURSOR_BLINK 1313#ifdef CURSOR_BLINK
1314 void cursor_blink_reset ();
1175 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1315 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1176#endif 1316#endif
1177#ifdef TEXT_BLINK 1317#ifdef TEXT_BLINK
1178 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1318 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1179#endif 1319#endif
… …
1198 void pointer_unblank (); 1338 void pointer_unblank ();
1199 1339
1200 void tt_printf (const char *fmt,...); 1340 void tt_printf (const char *fmt,...);
1201 void tt_write (const char *data, unsigned int len); 1341 void tt_write (const char *data, unsigned int len);
1202 void pty_write (); 1342 void pty_write ();
1203
1204 void init (stringvec *argv, stringvec *envv)
1205 {
1206 this->argv = argv;
1207 init (argv->size (), argv->begin (), envv);
1208 }
1209 1343
1210 void make_current () const // make this the "currently active" urxvt instance 1344 void make_current () const // make this the "currently active" urxvt instance
1211 { 1345 {
1212 SET_R (this); 1346 SET_R (this);
1213 set_environ (envv); 1347 set_environ (envv);
… …
1225 void im_set_size (XRectangle &size); 1359 void im_set_size (XRectangle &size);
1226 void im_set_position (XPoint &pos) NOTHROW; 1360 void im_set_position (XPoint &pos) NOTHROW;
1227 void im_set_color (unsigned long &fg, unsigned long &bg); 1361 void im_set_color (unsigned long &fg, unsigned long &bg);
1228 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1362 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1229 1363
1230 bool IMisRunning (); 1364 bool im_is_running ();
1231 void IMSendSpot (); 1365 void im_send_spot ();
1232 bool IM_get_IC (const char *modifiers); 1366 bool im_get_ic (const char *modifiers);
1233 void IMSetPosition (); 1367 void im_set_position ();
1234#endif 1368#endif
1235 1369
1236 // command.C 1370 // command.C
1237 void key_press (XKeyEvent &ev); 1371 void key_press (XKeyEvent &ev);
1238 void key_release (XKeyEvent &ev); 1372 void key_release (XKeyEvent &ev);
1239 unsigned int cmd_write (const char *str, unsigned int count);
1240 1373
1241 wchar_t next_char () NOTHROW; 1374 wchar_t next_char () NOTHROW;
1242 wchar_t cmd_getc () THROW ((class out_of_input)); 1375 wchar_t cmd_getc () THROW ((class out_of_input));
1243 uint32_t next_octet () NOTHROW; 1376 uint32_t next_octet () NOTHROW;
1244 uint32_t cmd_get8 () THROW ((class out_of_input)); 1377 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1271 void process_color_seq (int report, int color, const char *str, char resp); 1404 void process_color_seq (int report, int color, const char *str, char resp);
1272 void process_xterm_seq (int op, char *str, char resp); 1405 void process_xterm_seq (int op, char *str, char resp);
1273 int privcases (int mode, unsigned long bit); 1406 int privcases (int mode, unsigned long bit);
1274 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1407 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1275 void process_sgr_mode (unsigned int nargs, const int *arg); 1408 void process_sgr_mode (unsigned int nargs, const int *arg);
1276 void process_graphics ();
1277 // init.C 1409 // init.C
1410 void init (stringvec *argv, stringvec *envv);
1411 void init (int argc, const char *const *argv, const char *const *envv);
1412 void init2 (int argc, const char *const *argv);
1278 void init_vars (); 1413 void init_vars ();
1279 const char **init_resources (int argc, const char *const *argv); 1414 const char **init_resources (int argc, const char *const *argv);
1280 void init (int argc, const char *const *argv, stringvec *envv);
1281 void init_env (); 1415 void init_env ();
1282 void set_locale (const char *locale); 1416 void set_locale (const char *locale);
1283 void init_xlocale (); 1417 void init_xlocale ();
1284 void init_command (const char *const *argv); 1418 void init_command (const char *const *argv);
1285 void run_command (const char *const *argv); 1419 void run_command (const char *const *argv);
1286 int run_child (const char *const *argv); 1420 int run_child (const char *const *argv);
1287 void color_aliases (int idx); 1421 void color_aliases (int idx);
1288 void create_windows (int argc, const char *const *argv); 1422 void create_windows (int argc, const char *const *argv);
1289 void get_colours (); 1423 void get_colours ();
1290 void get_ourmods (); 1424 void get_ourmods ();
1425 void set_icon (const char *file);
1291 // main.C 1426 // main.C
1292 void tt_winch (); 1427 void tt_winch ();
1293 rxvt_term (); 1428 rxvt_term ();
1294 ~rxvt_term (); 1429 ~rxvt_term ();
1295 void destroy (); 1430 void destroy ();
… …
1297 void recolour_cursor (); 1432 void recolour_cursor ();
1298 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1433 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1299 void window_calc (unsigned int newwidth, unsigned int newheight); 1434 void window_calc (unsigned int newwidth, unsigned int newheight);
1300 bool set_fonts (); 1435 bool set_fonts ();
1301 void set_string_property (Atom prop, const char *str, int len = -1); 1436 void set_string_property (Atom prop, const char *str, int len = -1);
1437 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1302 void set_utf8_property (Atom prop, const char *str, int len = -1); 1438 void set_utf8_property (Atom prop, const char *str, int len = -1);
1303 void set_title (const char *str); 1439 void set_title (const char *str);
1304 void set_icon_name (const char *str); 1440 void set_icon_name (const char *str);
1305 void set_window_color (int idx, const char *color); 1441 void set_window_color (int idx, const char *color);
1306 void set_colorfgbg (); 1442 char *get_colorfgbg ();
1307 bool set_color (rxvt_color &color, const char *name); 1443 bool set_color (rxvt_color &color, const char *name);
1308 void alias_color (int dst, int src); 1444 void alias_color (int dst, int src);
1309 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1445 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1310 void get_window_origin (int &x, int &y); 1446 void get_window_origin (int &x, int &y);
1311 Pixmap get_pixmap_property (int prop_id);
1312 1447
1313 // screen.C 1448 // screen.C
1314
1315 void lalloc (line_t &l) const
1316 {
1317 l.t = (text_t *)talloc->alloc ();
1318 l.r = (rend_t *)ralloc->alloc ();
1319 }
1320
1321#if 0
1322 void lfree (line_t &l)
1323 {
1324 talloc->free (l.t);
1325 ralloc->free (l.r);
1326 }
1327#endif
1328
1329 void lresize (line_t &l) const
1330 {
1331 if (!l.t)
1332 return;
1333
1334 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1335 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1336
1337 l.l = min (l.l, ncol);
1338
1339 if (ncol > prev_ncol)
1340 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1341 }
1342 1449
1343 int fgcolor_of (rend_t r) const NOTHROW 1450 int fgcolor_of (rend_t r) const NOTHROW
1344 { 1451 {
1345 int base = GET_BASEFG (r); 1452 int base = GET_BASEFG (r);
1346#ifndef NO_BRIGHTCOLOR 1453#ifndef NO_BRIGHTCOLOR
1347 if (r & RS_Bold 1454 if (r & RS_Bold
1348# if ENABLE_STYLES 1455# if ENABLE_STYLES
1349 && option (Opt_intensityStyles) 1456 && option (Opt_intensityStyles)
1350# endif 1457# endif
1351 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1458 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1352 base += minBrightCOLOR - minCOLOR; 1459 base += minBrightCOLOR - minCOLOR;
1353#endif 1460#endif
1354 return base; 1461 return base;
1355 } 1462 }
1356 1463
… …
1360#ifndef NO_BRIGHTCOLOR 1467#ifndef NO_BRIGHTCOLOR
1361 if (r & RS_Blink 1468 if (r & RS_Blink
1362# if ENABLE_STYLES 1469# if ENABLE_STYLES
1363 && option (Opt_intensityStyles) 1470 && option (Opt_intensityStyles)
1364# endif 1471# endif
1365 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1472 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1366 base += minBrightCOLOR - minCOLOR; 1473 base += minBrightCOLOR - minCOLOR;
1367#endif 1474#endif
1368 return base; 1475 return base;
1369 } 1476 }
1370 1477
1371 bool option (uint8_t opt) const NOTHROW 1478 bool option (uint8_t opt) const NOTHROW
1372 { 1479 {
1373 if (!opt)
1374 return 0;
1375
1376 --opt;
1377 return options[opt >> 3] & (1 << (opt & 7)); 1480 return options[opt >> 3] & (1 << (opt & 7));
1378 } 1481 }
1379 1482
1380 void set_option (uint8_t opt, bool set = true) NOTHROW 1483 void set_option (uint8_t opt, bool set = true) NOTHROW;
1381 {
1382 if (!opt)
1383 return;
1384
1385 --opt;
1386 if (set)
1387 options[opt >> 3] |= (1 << (opt & 7));
1388 else
1389 options[opt >> 3] &= ~(1 << (opt & 7));
1390 }
1391
1392 void set_privmode (unsigned bit, int set) NOTHROW
1393 {
1394 if (set)
1395 priv_modes |= bit;
1396 else
1397 priv_modes &= ~bit;
1398 }
1399 1484
1400 // modifies first argument(!) 1485 // modifies first argument(!)
1486 void tt_paste (char *data, unsigned int len) NOTHROW;
1401 void paste (char *data, unsigned int len) NOTHROW; 1487 void paste (char *data, unsigned int len) NOTHROW;
1488 void scr_alloc () NOTHROW;
1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1489 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1490 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1404 void scr_kill_char (line_t &l, int col) const NOTHROW; 1491 void scr_kill_char (line_t &l, int col) const NOTHROW;
1405 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1492 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1406 void scr_reset (); 1493 void scr_reset ();
… …
1414 void scr_backindex () NOTHROW; 1501 void scr_backindex () NOTHROW;
1415 void scr_forwardindex () NOTHROW; 1502 void scr_forwardindex () NOTHROW;
1416#endif 1503#endif
1417 void scr_touch (bool refresh) NOTHROW; 1504 void scr_touch (bool refresh) NOTHROW;
1418 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1505 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1419 void scr_recolour () NOTHROW; 1506 void scr_recolour (bool refresh = true) NOTHROW;
1420 void scr_remap_chars () NOTHROW; 1507 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1508 void scr_remap_chars (line_t &l) NOTHROW;
1422 1509
1423 enum cursor_mode { SAVE, RESTORE }; 1510 enum cursor_mode { SAVE, RESTORE };
1424 1511
… …
1459 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1546 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1460 void scr_reverse_selection () NOTHROW; 1547 void scr_reverse_selection () NOTHROW;
1461 void scr_dump (int fd) NOTHROW; 1548 void scr_dump (int fd) NOTHROW;
1462 1549
1463 void selection_check (int check_more) NOTHROW; 1550 void selection_check (int check_more) NOTHROW;
1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1465 void selection_property (Window win, Atom prop) NOTHROW;
1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1551 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1467 int selection_request_other (Atom target, int selnum) NOTHROW;
1468 void selection_clear (bool clipboard = false) NOTHROW; 1552 void selection_clear (bool clipboard = false) NOTHROW;
1469 void clipboard_copy (Time tm);
1470 void selection_make (Time tm); 1553 void selection_make (Time tm);
1471 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1554 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1472 void selection_start_colrow (int col, int row) NOTHROW; 1555 void selection_start_colrow (int col, int row) NOTHROW;
1473 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1556 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1474 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1557 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1477 void selection_click (int clicks, int x, int y) NOTHROW; 1560 void selection_click (int clicks, int x, int y) NOTHROW;
1478 void selection_extend (int x, int y, int flag) NOTHROW; 1561 void selection_extend (int x, int y, int flag) NOTHROW;
1479 void selection_rotate (int x, int y) NOTHROW; 1562 void selection_rotate (int x, int y) NOTHROW;
1480 1563
1481 // xdefaults.C 1564 // xdefaults.C
1565 void rxvt_usage (int type);
1482 void get_options (int argc, const char *const *argv); 1566 const char **get_options (int argc, const char *const *argv);
1483 int parse_keysym (const char *str, const char *arg); 1567 int parse_keysym (const char *str, const char *arg);
1484 const char *x_resource (const char *name); 1568 const char *x_resource (const char *name);
1485 void extract_resources (); 1569 void extract_resources ();
1570 void extract_keysym_resources ();
1571 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1572 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1573 bool parse_bool_resource (const char *str)
1574 {
1575 return (!strcasecmp (str, "TRUE")
1576 || !strcasecmp (str, "YES")
1577 || !strcasecmp (str, "ON")
1578 || !strcasecmp (str, "1"));
1579 }
1486}; 1580};
1487 1581
1488#endif /* _RXVT_H_ */ 1582#endif /* _RXVT_H_ */
1489 1583

Diff Legend

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