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.398 by root, Thu Apr 1 01:03:20 2010 UTC vs.
Revision 1.499 by root, Tue Jun 5 11:00:40 2012 UTC

1#ifndef RXVT_H_ /* include once only */ 1#ifndef RXVT_H_ /* include once only */
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include <cstdio> 4#include <stdio.h>
5#include <cctype> 5#include <ctype.h>
6#include <cerrno> 6#include <errno.h>
7#include <cstdarg> 7#include <stdarg.h>
8#include <cstdlib> 8#include <stdlib.h>
9#ifdef HAVE_STDINT_H 9#ifdef HAVE_STDINT_H
10#include <stdint.h> 10#include <stdint.h>
11#endif 11#endif
12#include <sys/types.h> 12#include <sys/types.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <cstring> 14#include <string.h>
15#include <assert.h> 15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H 16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h> 17#include <sys/ioctl.h>
18#endif 18#endif
19#ifdef HAVE_SYS_STRREDIR_H 19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h> 20#include <sys/strredir.h>
21#endif 21#endif
22 22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H 23#if HAVE_WCHAR_H
26# include <wchar.h> 24# include <wchar.h>
27#else 25#else
28// stdlib.h might provide it 26// stdlib.h might provide it
29#endif 27#endif
30 28
31using namespace std; 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 30
33extern "C" { 31extern "C" {
34#include <X11/Xlib.h> 32#include <X11/Xlib.h>
35#include <X11/Xutil.h> 33#include <X11/Xutil.h>
36#include <X11/Xresource.h> 34#include <X11/Xresource.h>
… …
72#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
73#include <X11/keysym.h> 71#include <X11/keysym.h>
74#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 73#include <X11/Xatom.h>
76 74
75#if HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif
78
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1
81#endif
82
83#include <ecb.h>
77#include "encoding.h" 84#include "encoding.h"
78#include "rxvtutil.h" 85#include "rxvtutil.h"
79#include "rxvtfont.h" 86#include "rxvtfont.h"
80#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
88#include "rxvtimg.h"
81#include "scrollbar.h" 89#include "scrollbar.h"
82#include "ev_cpp.h" 90#include "ev_cpp.h"
83#include "salloc.h"
84#include "libptytty.h" 91#include "libptytty.h"
85 92
86#include "rxvtperl.h" 93#include "rxvtperl.h"
87 94
88// try to avoid some macros to decrease code size, on some systems 95// try to avoid some macros to decrease code size, on some systems
… …
98 ***************************************************************************** 105 *****************************************************************************
99 * SYSTEM HACKS 106 * SYSTEM HACKS
100 ***************************************************************************** 107 *****************************************************************************
101 */ 108 */
102 109
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 110#include <termios.h>
108
109#include "background.h"
110 111
111#ifndef STDIN_FILENO 112#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 113# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 114# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 115# define STDERR_FILENO 2
115#endif 116#endif
116 117
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 118#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 119# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 120# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 121#endif
125 122
126/****************************************************************************/ 123/****************************************************************************/
127 124
128// exception thrown on fatal (per-instance) errors 125// exception thrown on fatal (per-instance) errors
… …
151 148
152const char * rxvt_basename (const char *str) NOTHROW; 149const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 151void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 152void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
158 155
159char * rxvt_strtrim (char *str) NOTHROW; 156char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 157char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 158
159static inline void
160rxvt_free_strsplit (char **ptr) NOTHROW
161{
162 free (ptr[0]);
163 free (ptr);
164}
162 165
163void * rxvt_malloc (size_t size); 166void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 167void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 168void * rxvt_realloc (void *ptr, size_t size);
166 169
… …
189#else 192#else
190 if (envv) 193 if (envv)
191#endif 194#endif
192 environ = envv; 195 environ = envv;
193} 196}
197
198struct localise_env
199{
200 char **orig_env;
201
202 localise_env (char **new_env)
203 {
204 orig_env = environ;
205 environ = new_env;
206 }
207
208 ~localise_env ()
209 {
210 environ = orig_env;
211 }
212};
213
214#ifdef HAVE_BG_PIXMAP
215struct image_effects
216{
217 bool tint_set;
218 rxvt_color tint;
219 int shade;
220 int h_blurRadius, v_blurRadius;
221
222 image_effects ()
223 {
224 tint_set =
225 h_blurRadius =
226 v_blurRadius = 0;
227 shade = 100;
228 }
229
230 bool need_tint ()
231 {
232 return shade != 100 || tint_set;
233 }
234
235 bool need_blur ()
236 {
237 return h_blurRadius && v_blurRadius;
238 }
239
240 bool set_tint (const rxvt_color &new_tint);
241 bool set_shade (const char *shade_str);
242 bool set_blur (const char *geom);
243};
244
245# if BG_IMAGE_FROM_FILE
246enum {
247 IM_IS_SET = 1 << 0,
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# if HAVE_PIXBUF
279 GdkPixbuf *pixbuf;
280
281 void destroy ()
282 {
283 if (pixbuf)
284 g_object_unref (pixbuf);
285 }
286
287 int width ()
288 {
289 return gdk_pixbuf_get_width (pixbuf);
290 }
291 int height ()
292 {
293 return gdk_pixbuf_get_height (pixbuf);
294 }
295# endif
296
297 rxvt_image ();
298 bool set_file_geometry (const char *file);
299 bool set_file (const char *file);
300 bool set_geometry (const char *geom, bool update = false);
301};
302# endif
303#endif
194 304
195/* 305/*
196 ***************************************************************************** 306 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 307 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 308 *****************************************************************************
… …
241 ***************************************************************************** 351 *****************************************************************************
242 */ 352 */
243 353
244/* COLORTERM, TERM environment variables */ 354/* COLORTERM, TERM environment variables */
245#define COLORTERMENV "rxvt" 355#define COLORTERMENV "rxvt"
246#ifdef BG_IMAGE_FROM_FILE 356#if BG_IMAGE_FROM_FILE
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 357# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 358#else
249# define COLORTERMENVFULL COLORTERMENV 359# define COLORTERMENVFULL COLORTERMENV
250#endif 360#endif
251#ifndef TERMENV 361#ifndef TERMENV
362# if USE_256_COLORS
363# define TERMENV "rxvt-unicode-256color"
364# else
252# define TERMENV "rxvt-unicode" 365# define TERMENV "rxvt-unicode"
366# endif
253#endif 367#endif
254 368
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 369#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 370# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 371#endif
… …
272# define NSCREENS 0 386# define NSCREENS 0
273#else 387#else
274# define NSCREENS 1 388# define NSCREENS 1
275#endif 389#endif
276 390
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 () */ 391/* flags for rxvt_term::scr_gotorc () */
283enum { 392enum {
284 C_RELATIVE = 1, /* col movement is relative */ 393 C_RELATIVE = 1, /* col movement is relative */
285 R_RELATIVE = 2, /* row movement is relative */ 394 R_RELATIVE = 2, /* row movement is relative */
286 RELATIVE = C_RELATIVE | R_RELATIVE, 395 RELATIVE = C_RELATIVE | R_RELATIVE,
287}; 396};
288 397
289/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 398/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
290enum { 399enum {
291 INSERT = -1, /* don't change these values */ 400 INSERT = -1, /* don't change these values */
292 DELETE = +1, 401 DELETE = +1,
293 ERASE = +2, 402 ERASE = +2,
294}; 403};
295 404
296/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 405/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
297enum page_dirn { 406enum page_dirn {
298 UP, 407 UP,
299 DN, 408 DN,
300 NO_DIR, 409 NO_DIR,
301}; 410};
302 411
303/* arguments for rxvt_scr_change_screen () */ 412/* arguments for rxvt_term::scr_change_screen () */
304enum { 413enum {
305 PRIMARY = 0, 414 PRIMARY = 0,
306 SECONDARY, 415 SECONDARY,
307}; 416};
308 417
… …
319#define RS_fgMask (RS_colorMask << RS_fgShift) 428#define RS_fgMask (RS_colorMask << RS_fgShift)
320 429
321// must have space for rxvt_fontset::fontCount * 2 + 2 values 430// must have space for rxvt_fontset::fontCount * 2 + 2 values
322#define RS_fontShift (RS_fgShift + Color_Bits) 431#define RS_fontShift (RS_fgShift + Color_Bits)
323#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 432#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
433#define RS_fontCount rxvt_fontset::fontCount
324#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful 434#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
325 435
326// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 436// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
327#define RS_redraw (2UL << RS_fontShift) 437#define RS_redraw (2UL << RS_fontShift)
328 438
439#define RS_Sel (1UL << 22)
440
329// 5 custom bits for extensions 441// 4 custom bits for extensions
330#define RS_customCount 16UL 442#define RS_customCount 16UL
331#define RS_customShift 23 443#define RS_customShift 23
332#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 444#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
333 445
334// font styles 446// font styles
… …
347#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 459#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
348#define RS_attrMask (RS_baseattrMask | RS_fontMask) 460#define RS_attrMask (RS_baseattrMask | RS_fontMask)
349 461
350#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 462#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
351#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 463#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
352
353#define Sel_none 0 /* Not waiting */
354#define Sel_normal 0x01 /* normal selection */
355#define Sel_incr 0x02 /* incremental selection */
356#define Sel_direct 0x00
357#define Sel_Primary 0x01
358#define Sel_Secondary 0x02
359#define Sel_Clipboard 0x03
360#define Sel_whereMask 0x0f
361#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
362#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
363 464
364enum { 465enum {
365 C0_NUL = 0x00, 466 C0_NUL = 0x00,
366 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 467 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
367 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 468 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
385 XTerm_Color_cursor = 12, // change actual 'Cursor' color 486 XTerm_Color_cursor = 12, // change actual 'Cursor' color
386 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 487 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
387 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 488 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
388 XTerm_Color05 = 15, // not implemented (tektronix fg) 489 XTerm_Color05 = 15, // not implemented (tektronix fg)
389 XTerm_Color06 = 16, // not implemented (tektronix bg) 490 XTerm_Color06 = 16, // not implemented (tektronix bg)
390 XTerm_Color_RV = 17, // change actual 'Highlight' color 491 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
492 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
391 XTerm_logfile = 46, // not implemented 493 XTerm_logfile = 46, // not implemented
392 XTerm_font = 50, 494 XTerm_font = 50,
393 495
394 XTerm_konsole30 = 30, // reserved for konsole 496 XTerm_konsole30 = 30, // reserved for konsole
395 XTerm_konsole31 = 31, // reserved for konsole 497 XTerm_konsole31 = 31, // reserved for konsole
… …
397 /* 499 /*
398 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 500 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
399 */ 501 */
400 502
401 // deprecated 503 // deprecated
402 Rxvt_Color_BD = 18,
403 Rxvt_Color_UL = 19,
404 Rxvt_restoreFG = 39, 504 Rxvt_restoreFG = 39,
405 Rxvt_restoreBG = 49, 505 Rxvt_restoreBG = 49,
406 506
407 Rxvt_Pixmap = 20, // new bg pixmap 507 Rxvt_Pixmap = 20, // new bg pixmap
408 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 508 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
462 Color_White = maxBrightCOLOR, 562 Color_White = maxBrightCOLOR,
463#else 563#else
464 Color_White = maxCOLOR, 564 Color_White = maxCOLOR,
465#endif 565#endif
466 minTermCOLOR = Color_White + 1, 566 minTermCOLOR = Color_White + 1,
467#ifndef USE_256_COLORS 567#if USE_256_COLORS
568 maxTermCOLOR = Color_White + 240,
569#else
468 maxTermCOLOR = Color_White + 72, 570 maxTermCOLOR = Color_White + 72,
469#else
470 maxTermCOLOR = Color_White + 240,
471#endif 571#endif
472#ifndef NO_CURSORCOLOR 572#ifndef NO_CURSORCOLOR
473 Color_cursor, 573 Color_cursor,
474 Color_cursor2, 574 Color_cursor2,
475#endif 575#endif
… …
485#if ENABLE_FRILLS 585#if ENABLE_FRILLS
486 Color_underline, 586 Color_underline,
487#endif 587#endif
488#ifdef OPTION_HC 588#ifdef OPTION_HC
489 Color_HC, 589 Color_HC,
590 Color_HTC,
490#endif 591#endif
491 Color_scroll, 592 Color_scroll,
492#ifdef RXVT_SCROLLBAR 593#ifdef RXVT_SCROLLBAR
493 Color_trough, 594 Color_trough,
494#endif 595#endif
… …
506#else 607#else
507 TOTAL_COLORS = NRS_COLORS 608 TOTAL_COLORS = NRS_COLORS
508#endif 609#endif
509}; 610};
510 611
511#ifndef USE_256_COLORS 612#if USE_256_COLORS
512#define Color_Bits 7 // 0 .. maxTermCOLOR 613# define Color_Bits 9 // 0 .. maxTermCOLOR
513#else 614#else
514#define Color_Bits 9 // 0 .. maxTermCOLOR 615# define Color_Bits 7 // 0 .. maxTermCOLOR
515#endif 616#endif
516 617
517/* 618/*
518 * Resource list 619 * Resource list
519 */ 620 */
… …
548#define PrivMode_vt52 (1UL<<18) 649#define PrivMode_vt52 (1UL<<18)
549#define PrivMode_LFNL (1UL<<19) 650#define PrivMode_LFNL (1UL<<19)
550#define PrivMode_MouseBtnEvent (1UL<<20) 651#define PrivMode_MouseBtnEvent (1UL<<20)
551#define PrivMode_MouseAnyEvent (1UL<<21) 652#define PrivMode_MouseAnyEvent (1UL<<21)
552#define PrivMode_BracketPaste (1UL<<22) 653#define PrivMode_BracketPaste (1UL<<22)
654#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
655#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
553 656
554#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 657#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
555 658
556#ifdef ALLOW_132_MODE 659#ifdef ALLOW_132_MODE
557# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 660# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
608/* 711/*
609 ***************************************************************************** 712 *****************************************************************************
610 * MACRO DEFINES 713 * MACRO DEFINES
611 ***************************************************************************** 714 *****************************************************************************
612 */ 715 */
716
717// speed hack, copy some member variable into a local variable of the same name
613#define dLocal(type,name) type const name = this->name 718#define dLocal(type,name) type const name = this->name
614 719
615// for speed reasons, we assume that all codepoints 32 to 126 are 720// for speed reasons, we assume that all codepoints 32 to 126 are
616// single-width. 721// single-width.
617#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 722#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
644 749
645#define GET_ATTR(x) (((x) & RS_attrMask)) 750#define GET_ATTR(x) (((x) & RS_attrMask))
646// return attributes defining the background, encoding doesn't matter 751// return attributes defining the background, encoding doesn't matter
647// depends on RS_fgShift > RS_bgShift 752// depends on RS_fgShift > RS_bgShift
648#define GET_BGATTR(x) \ 753#define GET_BGATTR(x) \
649 (expect_false ((x) & RS_RVid) \ 754 (ecb_unlikely ((x) & RS_RVid) \
650 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 755 ? (((x) & (RS_attrMask & ~RS_RVid)) \
651 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 756 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
652 : ((x) & (RS_attrMask | RS_bgMask))) 757 : ((x) & (RS_attrMask | RS_bgMask)))
653#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 758#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
654#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 759#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
682{ 787{
683 text_t *t; // terminal the text 788 text_t *t; // terminal the text
684 rend_t *r; // rendition, uses RS_ flags 789 rend_t *r; // rendition, uses RS_ flags
685 tlen_t_ l; // length of each text line 790 tlen_t_ l; // length of each text line
686 uint32_t f; // flags 791 uint32_t f; // flags
792
793 bool valid ()
794 {
795 return l >= 0;
796 }
797
798 void alloc ()
799 {
800 l = 0;
801 }
687 802
688 bool is_longer () 803 bool is_longer ()
689 { 804 {
690 return f & LINE_LONGER; 805 return f & LINE_LONGER;
691 } 806 }
… …
756// that are not representable in unicode, as well as characters 871// that are not representable in unicode, as well as characters
757// not fitting in the BMP. 872// not fitting in the BMP.
758struct compose_char 873struct compose_char
759{ 874{
760 unicode_t c1, c2; // any chars != NOCHAR are valid 875 unicode_t c1, c2; // any chars != NOCHAR are valid
876 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
877 compose_char () = default;
878 #endif
761 compose_char (unicode_t c1, unicode_t c2) 879 compose_char (unicode_t c1, unicode_t c2)
762 : c1(c1), c2(c2) 880 : c1(c1), c2(c2)
763 { } 881 { }
764}; 882};
765 883
… …
798{ 916{
799 int x, y, w, h; // overlay dimensions 917 int x, y, w, h; // overlay dimensions
800 text_t **text; 918 text_t **text;
801 rend_t **rend; 919 rend_t **rend;
802 920
803 // while tempting to add swap() etc. here, it effetcively only increases code size 921 // while tempting to add swap() etc. here, it effectively only increases code size
804}; 922};
805 923
806/* ------------------------------------------------------------------------- */ 924/* ------------------------------------------------------------------------- */
807 925
808typedef struct 926typedef struct
… …
847 * END······················= total_rows 965 * END······················= total_rows
848 */ 966 */
849 967
850struct TermWin_t 968struct TermWin_t
851{ 969{
970 int vt_width; /* actual window width [pixels] */
971 int vt_height; /* actual window height [pixels] */
852 int width; /* window width [pixels] */ 972 int width; /* window width [pixels] */
853 int height; /* window height [pixels] */ 973 int height; /* window height [pixels] */
854 int fwidth; /* font width [pixels] */ 974 int fwidth; /* font width [pixels] */
855 int fheight; /* font height [pixels] */ 975 int fheight; /* font height [pixels] */
856 int fbase; /* font ascent (baseline) [pixels] */ 976 int fbase; /* font ascent (baseline) [pixels] */
… …
865 int saveLines; /* number of lines that fit in scrollback */ 985 int saveLines; /* number of lines that fit in scrollback */
866 int total_rows; /* total number of rows in this terminal */ 986 int total_rows; /* total number of rows in this terminal */
867 int term_start; /* term lines start here */ 987 int term_start; /* term lines start here */
868 int view_start; /* scrollback view starts here */ 988 int view_start; /* scrollback view starts here */
869 int top_row; /* topmost row index of scrollback */ 989 int top_row; /* topmost row index of scrollback */
870 Window parent[6]; /* parent identifiers - we're parent[0] */ 990 Window parent; /* parent identifier */
871 Window vt; /* vt100 window */ 991 Window vt; /* vt100 window */
872 GC gc; /* GC for drawing */ 992 GC gc; /* GC for drawing */
873 Pixmap pixmap;
874 rxvt_drawable *drawable; 993 rxvt_drawable *drawable;
875 rxvt_fontset *fontset[4]; 994 rxvt_fontset *fontset[4];
876}; 995};
877 996
878/* 997/*
… …
940#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1059#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
941#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1060#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
942 1061
943/* rxvt_vars.options */ 1062/* rxvt_vars.options */
944enum { 1063enum {
945# define def(name,idx) Opt_ ## name = idx,
946# define nodef(name) Opt_ ## name = 0, 1064# define def(name) Opt_ ## name,
1065# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1066 Opt_0,
947# include "optinc.h" 1067# include "optinc.h"
948# undef nodef 1068# undef nodef
949# undef def 1069# undef def
950Opt_count 1070 Opt_count
951}; 1071};
952 1072
953/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
954 1074
955struct rxvt_vars : TermWin_t 1075struct rxvt_vars : TermWin_t
… …
957 scrollBar_t scrollBar; 1077 scrollBar_t scrollBar;
958 uint8_t options[(Opt_count + 7) >> 3]; 1078 uint8_t options[(Opt_count + 7) >> 3];
959 XSizeHints szHint; 1079 XSizeHints szHint;
960 rxvt_color *pix_colors; 1080 rxvt_color *pix_colors;
961 Cursor TermWin_cursor; /* cursor for vt window */ 1081 Cursor TermWin_cursor; /* cursor for vt window */
962 int numlock_state; 1082
963 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1083 line_t *row_buf; // all lines, scrollback + terminal, circular
964 line_t *drawn_buf; // text on screen 1084 line_t *drawn_buf; // text on screen
965 line_t *swap_buf; // lines for swap buffer 1085 line_t *swap_buf; // lines for swap buffer
966 char *tabs; /* per location: 1 == tab-stop */ 1086 char *tabs; /* per location: 1 == tab-stop */
967 screen_t screen; 1087 screen_t screen;
968 screen_t swap; 1088 screen_t swap;
… …
1005 hidden_pointer:1, 1125 hidden_pointer:1,
1006#endif 1126#endif
1007 enc_utf8:1, /* whether locale uses utf-8 */ 1127 enc_utf8:1, /* whether locale uses utf-8 */
1008 seen_input:1, /* whether we have seen some program output yet */ 1128 seen_input:1, /* whether we have seen some program output yet */
1009 seen_resize:1, /* whether we had a resize event */ 1129 seen_resize:1, /* whether we had a resize event */
1130 init_done:1,
1010 parsed_geometry:1; 1131 parsed_geometry:1;
1011 1132
1012 unsigned char refresh_type, 1133 unsigned char refresh_type,
1013#ifdef META8_OPTION 1134#ifdef META8_OPTION
1014 meta_char, /* Alt-key prefix */ 1135 meta_char; /* Alt-key prefix */
1015#endif 1136#endif
1016 selection_wait,
1017 selection_type;
1018/* ---------- */ 1137/* ---------- */
1019 bool rvideo_state, rvideo_mode; 1138 bool rvideo_state, rvideo_mode;
1020#ifndef NO_BELL 1139#ifndef NO_BELL
1021 bool rvideo_bell; 1140 bool rvideo_bell;
1022#endif 1141#endif
… …
1050 allowedxerror; 1169 allowedxerror;
1051/* ---------- */ 1170/* ---------- */
1052 unsigned int ModLevel3Mask, 1171 unsigned int ModLevel3Mask,
1053 ModMetaMask, 1172 ModMetaMask,
1054 ModNumLockMask; 1173 ModNumLockMask;
1055 int old_width, /* last used width in screen resize */
1056 old_height; /* last used height in screen resize */
1057 unsigned long priv_modes, 1174 unsigned long priv_modes,
1058 SavedModes; 1175 SavedModes;
1059/* ---------- */ 1176/* ---------- */
1060 Atom *xa; 1177 Atom *xa;
1061/* ---------- */ 1178/* ---------- */
1062 Time selection_time, 1179 Time selection_time,
1063 selection_request_time,
1064 clipboard_time; 1180 clipboard_time;
1181 rxvt_selection *selection_req;
1065 pid_t cmd_pid; /* process id of child */ 1182 pid_t cmd_pid; /* process id of child */
1066 char * incr_buf;
1067 size_t incr_buf_size, incr_buf_fill;
1068/* ---------- */ 1183/* ---------- */
1069 struct mouse_event MEvent; 1184 struct mouse_event MEvent;
1070 XComposeStatus compose; 1185 XComposeStatus compose;
1071 struct termios tio; 1186 static struct termios def_tio;
1072 row_col_t oldcursor; 1187 row_col_t oldcursor;
1073#ifdef HAVE_BG_PIXMAP 1188#ifdef HAVE_BG_PIXMAP
1074 bgPixmap_t bgPixmap; 1189 void bg_init ();
1190 void bg_destroy ();
1191
1192 enum {
1193 BG_IS_VALID = 1 << 0,
1194
1195 BG_IS_TRANSPARENT = 1 << 1,
1196 BG_NEEDS_REFRESH = 1 << 2,
1197 };
1198
1199 uint8_t bg_flags;
1200
1201# if BG_IMAGE_FROM_FILE
1202 vector<rxvt_image> image_vec;
1203 rxvt_image *new_image ()
1204 {
1205 image_vec.resize (image_vec.size () + 1);
1206 return &image_vec.back ();
1207 }
1208 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1209 bool render_image (rxvt_image &image);
1210 void parse_image (int id, const char *type, const char *arg);
1075#endif 1211# endif
1076#ifdef HAVE_AFTERIMAGE
1077 ASVisual *asv;
1078 ASImageManager *asimman;
1079 1212
1080 void init_asv () 1213# if ENABLE_TRANSPARENCY
1214 Pixmap root_pixmap; /* current root pixmap set */
1215 image_effects root_effects;
1216
1217 void bg_set_transparent ()
1081 { 1218 {
1082 if (!asv) 1219 bg_flags |= BG_IS_TRANSPARENT;
1083 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1084 } 1220 }
1221 void bg_set_root_pixmap ();
1222 bool render_root_image ();
1223# endif
1224
1225 bool blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius);
1226 bool tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade);
1227 void tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade);
1228
1229 ev_tstamp bg_valid_since;
1230
1231 Pixmap bg_pixmap;
1232 unsigned int bg_pmap_width, bg_pmap_height;
1233
1234 int target_x;
1235 int target_y;
1236 bool bg_set_position (int x, int y);
1237 bool bg_window_size_sensitive ();
1238 bool bg_window_position_sensitive ();
1239
1240 bool bg_render ();
1241 void bg_invalidate ()
1242 {
1243 bg_flags &= ~BG_IS_VALID;
1244 }
1245#endif
1246#if HAVE_PIXBUF
1247 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1248 int src_x, int src_y, int dst_x, int dst_y,
1249 unsigned int width, unsigned int height, bool argb);
1085#endif 1250#endif
1086 1251
1087#if ENABLE_OVERLAY 1252#if ENABLE_OVERLAY
1088 overlay_base ov; 1253 overlay_base ov;
1089 1254
… …
1097 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1262 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1098#endif 1263#endif
1099 1264
1100 vector<void *> allocated; // free these memory blocks with free() 1265 vector<void *> allocated; // free these memory blocks with free()
1101 1266
1102 char env_windowid[21]; /* environmental variable WINDOWID */ 1267 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1103 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1104 char *env_display; /* environmental variable DISPLAY */
1105 char *env_term; /* environmental variable TERM */
1106 1268
1107 char *locale; 1269 char *locale;
1108 char charsets[4]; 1270 char charsets[4];
1109 char *v_buffer; /* pointer to physical buffer */ 1271 char *v_buffer; /* pointer to physical buffer */
1110 unsigned int v_buflen; /* size of area to write */ 1272 unsigned int v_buflen; /* size of area to write */
… …
1122 char *cmdbuf_ptr, *cmdbuf_endp; 1284 char *cmdbuf_ptr, *cmdbuf_endp;
1123 char cmdbuf_base[CBUFSIZ]; 1285 char cmdbuf_base[CBUFSIZ];
1124 1286
1125 ptytty *pty; 1287 ptytty *pty;
1126 1288
1127 rxvt_salloc *talloc; // text line allocator 1289 // chunk contains all line_t's as well as rend_t and text_t buffers
1128 rxvt_salloc *ralloc; // rend line allocator 1290 // for drawn_buf, swap_buf and row_buf, in this order
1291 void *chunk;
1292 size_t chunk_size;
1129 1293
1130 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1294 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1131 1295
1132#if ENABLE_FRILLS || ISO_14755 1296#if ENABLE_FRILLS || ISO_14755
1133 // ISO 14755 entry support 1297 // ISO 14755 entry support
… …
1150 void rootwin_cb (XEvent &xev); 1314 void rootwin_cb (XEvent &xev);
1151 xevent_watcher rootwin_ev; 1315 xevent_watcher rootwin_ev;
1152#endif 1316#endif
1153#ifdef HAVE_BG_PIXMAP 1317#ifdef HAVE_BG_PIXMAP
1154 void update_background (); 1318 void update_background ();
1155#if TRACE_PIXMAPS
1156 void trace_update_background (const char *file, int line);
1157# define update_background() trace_update_background (__FILE__, __LINE__)
1158#endif
1159 void update_background_cb (ev::timer &w, int revents); 1319 void update_background_cb (ev::timer &w, int revents);
1160 ev::timer update_background_ev; 1320 ev::timer update_background_ev;
1161#endif 1321#endif
1162 1322
1163 void x_cb (XEvent &xev); 1323 void x_cb (XEvent &xev);
… …
1168 void child_cb (ev::child &w, int revents); ev::child child_ev; 1328 void child_cb (ev::child &w, int revents); ev::child child_ev;
1169 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1329 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1170 void refresh_check (); 1330 void refresh_check ();
1171 void flush (); 1331 void flush ();
1172 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1332 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1333 void cmdbuf_reify ();
1334 void cmdbuf_append (const char *str, size_t count);
1173 bool pty_fill (); 1335 bool pty_fill ();
1174 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1336 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1175 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1176 1337
1177#ifdef CURSOR_BLINK 1338#ifdef CURSOR_BLINK
1339 void cursor_blink_reset ();
1178 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1340 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1179#endif 1341#endif
1180#ifdef TEXT_BLINK 1342#ifdef TEXT_BLINK
1181 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1343 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1182#endif 1344#endif
… …
1201 void pointer_unblank (); 1363 void pointer_unblank ();
1202 1364
1203 void tt_printf (const char *fmt,...); 1365 void tt_printf (const char *fmt,...);
1204 void tt_write (const char *data, unsigned int len); 1366 void tt_write (const char *data, unsigned int len);
1205 void pty_write (); 1367 void pty_write ();
1206
1207 void init (stringvec *argv, stringvec *envv)
1208 {
1209 this->argv = argv;
1210 init (argv->size (), argv->begin (), envv);
1211 }
1212 1368
1213 void make_current () const // make this the "currently active" urxvt instance 1369 void make_current () const // make this the "currently active" urxvt instance
1214 { 1370 {
1215 SET_R (this); 1371 SET_R (this);
1216 set_environ (envv); 1372 set_environ (envv);
… …
1228 void im_set_size (XRectangle &size); 1384 void im_set_size (XRectangle &size);
1229 void im_set_position (XPoint &pos) NOTHROW; 1385 void im_set_position (XPoint &pos) NOTHROW;
1230 void im_set_color (unsigned long &fg, unsigned long &bg); 1386 void im_set_color (unsigned long &fg, unsigned long &bg);
1231 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1387 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1232 1388
1233 bool IMisRunning (); 1389 bool im_is_running ();
1234 void IMSendSpot (); 1390 void im_send_spot ();
1235 bool IM_get_IC (const char *modifiers); 1391 bool im_get_ic (const char *modifiers);
1236 void IMSetPosition (); 1392 void im_set_position ();
1237#endif 1393#endif
1238 1394
1239 // command.C 1395 // command.C
1240 void key_press (XKeyEvent &ev); 1396 void key_press (XKeyEvent &ev);
1241 void key_release (XKeyEvent &ev); 1397 void key_release (XKeyEvent &ev);
1242 unsigned int cmd_write (const char *str, unsigned int count);
1243 1398
1244 wchar_t next_char () NOTHROW; 1399 wchar_t next_char () NOTHROW;
1245 wchar_t cmd_getc () THROW ((class out_of_input)); 1400 wchar_t cmd_getc () THROW ((class out_of_input));
1246 uint32_t next_octet () NOTHROW; 1401 uint32_t next_octet () NOTHROW;
1247 uint32_t cmd_get8 () THROW ((class out_of_input)); 1402 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1274 void process_color_seq (int report, int color, const char *str, char resp); 1429 void process_color_seq (int report, int color, const char *str, char resp);
1275 void process_xterm_seq (int op, char *str, char resp); 1430 void process_xterm_seq (int op, char *str, char resp);
1276 int privcases (int mode, unsigned long bit); 1431 int privcases (int mode, unsigned long bit);
1277 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1432 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1278 void process_sgr_mode (unsigned int nargs, const int *arg); 1433 void process_sgr_mode (unsigned int nargs, const int *arg);
1279 void process_graphics ();
1280 // init.C 1434 // init.C
1435 void init (stringvec *argv, stringvec *envv);
1436 void init (int argc, const char *const *argv, const char *const *envv);
1437 void init2 (int argc, const char *const *argv);
1281 void init_vars (); 1438 void init_vars ();
1282 const char **init_resources (int argc, const char *const *argv); 1439 const char **init_resources (int argc, const char *const *argv);
1283 void init (int argc, const char *const *argv, stringvec *envv);
1284 void init_env (); 1440 void init_env ();
1285 void set_locale (const char *locale); 1441 void set_locale (const char *locale);
1286 void init_xlocale (); 1442 void init_xlocale ();
1287 void init_command (const char *const *argv); 1443 void init_command (const char *const *argv);
1288 void run_command (const char *const *argv); 1444 void run_command (const char *const *argv);
1289 int run_child (const char *const *argv); 1445 int run_child (const char *const *argv);
1290 void color_aliases (int idx); 1446 void color_aliases (int idx);
1291 void create_windows (int argc, const char *const *argv); 1447 void create_windows (int argc, const char *const *argv);
1292 void get_colours (); 1448 void get_colours ();
1293 void get_ourmods (); 1449 void get_ourmods ();
1450 void set_icon (const char *file);
1294 // main.C 1451 // main.C
1295 void tt_winch (); 1452 void tt_winch ();
1296 rxvt_term (); 1453 rxvt_term ();
1297 ~rxvt_term (); 1454 ~rxvt_term ();
1298 void destroy (); 1455 void destroy ();
… …
1300 void recolour_cursor (); 1457 void recolour_cursor ();
1301 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1458 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1302 void window_calc (unsigned int newwidth, unsigned int newheight); 1459 void window_calc (unsigned int newwidth, unsigned int newheight);
1303 bool set_fonts (); 1460 bool set_fonts ();
1304 void set_string_property (Atom prop, const char *str, int len = -1); 1461 void set_string_property (Atom prop, const char *str, int len = -1);
1462 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1305 void set_utf8_property (Atom prop, const char *str, int len = -1); 1463 void set_utf8_property (Atom prop, const char *str, int len = -1);
1306 void set_title (const char *str); 1464 void set_title (const char *str);
1307 void set_icon_name (const char *str); 1465 void set_icon_name (const char *str);
1308 void set_window_color (int idx, const char *color); 1466 void set_window_color (int idx, const char *color);
1309 void set_colorfgbg (); 1467 char *get_colorfgbg ();
1310 bool set_color (rxvt_color &color, const char *name); 1468 bool set_color (rxvt_color &color, const char *name);
1311 void alias_color (int dst, int src); 1469 void alias_color (int dst, int src);
1312 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1470 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1313 void get_window_origin (int &x, int &y); 1471 void get_window_origin (int &x, int &y);
1314 Pixmap get_pixmap_property (int prop_id);
1315 1472
1316 // screen.C 1473 // screen.C
1317
1318 void lalloc (line_t &l) const
1319 {
1320 l.t = (text_t *)talloc->alloc ();
1321 l.r = (rend_t *)ralloc->alloc ();
1322 }
1323
1324#if 0
1325 void lfree (line_t &l)
1326 {
1327 talloc->free (l.t);
1328 ralloc->free (l.r);
1329 }
1330#endif
1331
1332 void lresize (line_t &l) const
1333 {
1334 if (!l.t)
1335 return;
1336
1337 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1338 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1339
1340 l.l = min (l.l, ncol);
1341
1342 if (ncol > prev_ncol)
1343 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1344 }
1345 1474
1346 int fgcolor_of (rend_t r) const NOTHROW 1475 int fgcolor_of (rend_t r) const NOTHROW
1347 { 1476 {
1348 int base = GET_BASEFG (r); 1477 int base = GET_BASEFG (r);
1349#ifndef NO_BRIGHTCOLOR 1478#ifndef NO_BRIGHTCOLOR
1350 if (r & RS_Bold 1479 if (r & RS_Bold
1351# if ENABLE_STYLES 1480# if ENABLE_STYLES
1352 && option (Opt_intensityStyles) 1481 && option (Opt_intensityStyles)
1353# endif 1482# endif
1354 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1483 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1355 base += minBrightCOLOR - minCOLOR; 1484 base += minBrightCOLOR - minCOLOR;
1356#endif 1485#endif
1357 return base; 1486 return base;
1358 } 1487 }
1359 1488
… …
1363#ifndef NO_BRIGHTCOLOR 1492#ifndef NO_BRIGHTCOLOR
1364 if (r & RS_Blink 1493 if (r & RS_Blink
1365# if ENABLE_STYLES 1494# if ENABLE_STYLES
1366 && option (Opt_intensityStyles) 1495 && option (Opt_intensityStyles)
1367# endif 1496# endif
1368 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1497 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1369 base += minBrightCOLOR - minCOLOR; 1498 base += minBrightCOLOR - minCOLOR;
1370#endif 1499#endif
1371 return base; 1500 return base;
1372 } 1501 }
1373 1502
1374 bool option (uint8_t opt) const NOTHROW 1503 bool option (uint8_t opt) const NOTHROW
1375 { 1504 {
1376 if (!opt)
1377 return 0;
1378
1379 --opt;
1380 return options[opt >> 3] & (1 << (opt & 7)); 1505 return options[opt >> 3] & (1 << (opt & 7));
1381 } 1506 }
1382 1507
1383 void set_option (uint8_t opt, bool set = true) NOTHROW 1508 void set_option (uint8_t opt, bool set = true) NOTHROW;
1384 {
1385 if (!opt)
1386 return;
1387
1388 --opt;
1389 if (set)
1390 options[opt >> 3] |= (1 << (opt & 7));
1391 else
1392 options[opt >> 3] &= ~(1 << (opt & 7));
1393 }
1394
1395 void set_privmode (unsigned bit, int set) NOTHROW
1396 {
1397 if (set)
1398 priv_modes |= bit;
1399 else
1400 priv_modes &= ~bit;
1401 }
1402 1509
1403 // modifies first argument(!) 1510 // modifies first argument(!)
1511 void tt_paste (char *data, unsigned int len) NOTHROW;
1404 void paste (char *data, unsigned int len) NOTHROW; 1512 void paste (char *data, unsigned int len) NOTHROW;
1513 void scr_alloc () NOTHROW;
1405 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1514 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1406 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1515 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1407 void scr_kill_char (line_t &l, int col) const NOTHROW; 1516 void scr_kill_char (line_t &l, int col) const NOTHROW;
1408 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1517 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1409 void scr_reset (); 1518 void scr_reset ();
… …
1417 void scr_backindex () NOTHROW; 1526 void scr_backindex () NOTHROW;
1418 void scr_forwardindex () NOTHROW; 1527 void scr_forwardindex () NOTHROW;
1419#endif 1528#endif
1420 void scr_touch (bool refresh) NOTHROW; 1529 void scr_touch (bool refresh) NOTHROW;
1421 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1530 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1422 void scr_recolour () NOTHROW; 1531 void scr_recolour (bool refresh = true) NOTHROW;
1423 void scr_remap_chars () NOTHROW; 1532 void scr_remap_chars () NOTHROW;
1424 void scr_remap_chars (line_t &l) NOTHROW; 1533 void scr_remap_chars (line_t &l) NOTHROW;
1425 1534
1426 enum cursor_mode { SAVE, RESTORE }; 1535 enum cursor_mode { SAVE, RESTORE };
1427 1536
… …
1462 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1571 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1463 void scr_reverse_selection () NOTHROW; 1572 void scr_reverse_selection () NOTHROW;
1464 void scr_dump (int fd) NOTHROW; 1573 void scr_dump (int fd) NOTHROW;
1465 1574
1466 void selection_check (int check_more) NOTHROW; 1575 void selection_check (int check_more) NOTHROW;
1467 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1468 void selection_property (Window win, Atom prop) NOTHROW;
1469 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1576 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1470 int selection_request_other (Atom target, int selnum) NOTHROW;
1471 void selection_clear (bool clipboard = false) NOTHROW; 1577 void selection_clear (bool clipboard = false) NOTHROW;
1472 void clipboard_copy (Time tm);
1473 void selection_make (Time tm); 1578 void selection_make (Time tm);
1474 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1579 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1475 void selection_start_colrow (int col, int row) NOTHROW; 1580 void selection_start_colrow (int col, int row) NOTHROW;
1476 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1581 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1477 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1582 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
… …
1480 void selection_click (int clicks, int x, int y) NOTHROW; 1585 void selection_click (int clicks, int x, int y) NOTHROW;
1481 void selection_extend (int x, int y, int flag) NOTHROW; 1586 void selection_extend (int x, int y, int flag) NOTHROW;
1482 void selection_rotate (int x, int y) NOTHROW; 1587 void selection_rotate (int x, int y) NOTHROW;
1483 1588
1484 // xdefaults.C 1589 // xdefaults.C
1485 void get_options (int argc, const char *const *argv); 1590 const char **get_options (int argc, const char *const *argv);
1486 int parse_keysym (const char *str, const char *arg); 1591 int parse_keysym (const char *str, const char *arg);
1487 const char *x_resource (const char *name); 1592 const char *x_resource (const char *name);
1488 void extract_resources (); 1593 void extract_resources ();
1594 void extract_keysym_resources ();
1595 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1596 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1597 bool parse_bool_resource (const char *str)
1598 {
1599 return (!strcasecmp (str, "TRUE")
1600 || !strcasecmp (str, "YES")
1601 || !strcasecmp (str, "ON")
1602 || !strcasecmp (str, "1"));
1603 }
1489}; 1604};
1490 1605
1491#endif /* _RXVT_H_ */ 1606#endif /* _RXVT_H_ */
1492 1607

Diff Legend

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