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.399 by sf-exg, Thu Apr 1 16:34:41 2010 UTC vs.
Revision 1.494 by sf-exg, Fri Jun 1 15:49:49 2012 UTC

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

Diff Legend

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