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.246 by root, Sat Jan 28 20:33:31 2006 UTC vs.
Revision 1.329 by ayin, Wed Dec 12 09:33:48 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1 20# define ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
23# define BUILTIN_GLYPHS 1
22#else 24#else
23# define ENABLE_MINIMAL 1 25# define ENABLE_MINIMAL 1
24#endif 26#endif
25 27
26#include <limits.h> 28#include <limits.h>
27 29
28#include <X11/cursorfont.h> 30#include <X11/cursorfont.h>
29#include <X11/keysym.h> 31#include <X11/keysym.h>
30#include <X11/keysymdef.h> 32#include <X11/keysymdef.h>
31#include <X11/Xatom.h> 33#include <X11/Xatom.h>
32#if ENABLE_FRILLS
33# include <X11/Xmd.h>
34#endif
35 34
36#include "encoding.h" 35#include "encoding.h"
36#include "rxvtutil.h"
37#include "rxvtfont.h" 37#include "rxvtfont.h"
38#include "rxvttoolkit.h" 38#include "rxvttoolkit.h"
39#include "iom.h" 39#include "ev_cpp.h"
40#include "salloc.h" 40#include "salloc.h"
41#include "libptytty.h" 41#include "libptytty.h"
42 42
43#include "rxvtperl.h" 43#include "rxvtperl.h"
44 44
… …
68 68
69#ifndef HAVE_XPOINTER 69#ifndef HAVE_XPOINTER
70typedef char *XPointer; 70typedef char *XPointer;
71#endif 71#endif
72 72
73#ifdef HAVE_TERMIOS_H
74# include <termios.h> 73#include <termios.h>
75typedef struct termios ttymode_t; 74typedef struct termios ttymode_t;
76#else
77# include <sgtty.h>
78typedef struct {
79 struct sgttyb sg;
80 struct tchars tc;
81 struct ltchars lc;
82 int line;
83 int local;
84} ttymode_t;
85#endif
86 75
87#ifdef XPM_BACKGROUND 76#include "background.h"
88# ifdef XPM_INC_X11
89# include <X11/xpm.h>
90# else
91# include <xpm.h>
92# endif
93#endif
94 77
95#ifndef STDIN_FILENO 78#ifndef STDIN_FILENO
96# define STDIN_FILENO 0 79# define STDIN_FILENO 0
97# define STDOUT_FILENO 1 80# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 81# define STDERR_FILENO 2
99#endif 82#endif
100 83
101/****************************************************************************/ 84/****************************************************************************/
102 85
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123
124// exception thrown on fatal (per-instance) errors 86// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 87class rxvt_failure_exception { };
126 88
127// exception thrown when the command parser runs out of input data 89// exception thrown when the command parser runs out of input data
128class out_of_input { }; 90class out_of_input { };
129 91
130/* 92/*
131 ***************************************************************************** 93 *****************************************************************************
132 * PROTOTYPES 94 * PROTOTYPES
133 ***************************************************************************** 95 *****************************************************************************
134 */ 96 */
135// main.C 97// main.C
136RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
137RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
138void rxvt_clean_exit () NOTHROW;
139void * rxvt_malloc (size_t size); 98void * rxvt_malloc (size_t size);
140void * rxvt_calloc (size_t number, size_t size); 99void * rxvt_calloc (size_t number, size_t size);
141void * rxvt_realloc (void *ptr, size_t size); 100void * rxvt_realloc (void *ptr, size_t size);
142 101
143// misc.C 102// misc.C
144char * rxvt_wcstombs (const wchar_t *str, int len = -1); 103char * rxvt_wcstombs (const wchar_t *str, int len = -1);
145wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 104wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 105char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
147wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 106wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
148char * rxvt_strdup_cpp (const char *str);
149 107
150#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
151
152char * rxvt_r_basename (const char *str) NOTHROW; 108char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 109void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 110void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 111void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 112void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 113void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158 114
159int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
160const char * rxvt_Str_skip_space (const char *str) NOTHROW;
161char * rxvt_Str_trim (char *str) NOTHROW; 115char * rxvt_strtrim (char *str) NOTHROW;
162int rxvt_Str_escaped (char *str) NOTHROW;
163char ** rxvt_splitcommastring (const char *cs) NOTHROW; 116char ** rxvt_splitcommastring (const char *cs) NOTHROW;
164void rxvt_freecommastring (char **cs) NOTHROW; 117void rxvt_freecommastring (char **cs) NOTHROW;
165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
166 118
167///////////////////////////////////////////////////////////////////////////// 119/////////////////////////////////////////////////////////////////////////////
168 120
169// temporarily replace the process environment 121// temporarily replace the process environment
170extern char **environ; 122extern char **environ;
171extern char **rxvt_environ; // the original environ pointer 123extern char **rxvt_environ; // the original environ pointer
172 124
173inline void set_environ (stringvec *envv) 125static inline void set_environ (stringvec *envv)
174{ 126{
175#if ENABLE_PERL 127#if ENABLE_PERL
176 assert (envv); 128 assert (envv);
177#else 129#else
178 if (envv) 130 if (envv)
179#endif 131#endif
180 environ = (char **)envv->begin (); 132 environ = (char **)envv->begin ();
181} 133}
182 134
183inline void set_environ (char **envv) 135static inline void set_environ (char **envv)
184{ 136{
185#if ENABLE_PERL 137#if ENABLE_PERL
186 assert (envv); 138 assert (envv);
187#else 139#else
188 if (envv) 140 if (envv)
… …
202 */ 154 */
203#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 155#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
204# define KEEP_SCROLLCOLOR 1 156# define KEEP_SCROLLCOLOR 1
205#else 157#else
206# undef KEEP_SCROLLCOLOR 158# undef KEEP_SCROLLCOLOR
207#endif
208
209#ifdef XPM_BACKGROUND
210typedef struct {
211 short w, h, x, y;
212 Pixmap pixmap;
213} bgPixmap_t;
214#endif 159#endif
215 160
216/* 161/*
217 * the 'essential' information for reporting Mouse Events 162 * the 'essential' information for reporting Mouse Events
218 * pared down from XButtonEvent 163 * pared down from XButtonEvent
… …
222 Time time; /* milliseconds */ 167 Time time; /* milliseconds */
223 unsigned int state; /* key or button mask */ 168 unsigned int state; /* key or button mask */
224 unsigned int button; /* detail */ 169 unsigned int button; /* detail */
225}; 170};
226 171
227#if ENABLE_FRILLS
228typedef struct _mwmhints {
229 CARD32 flags;
230 CARD32 functions;
231 CARD32 decorations;
232 INT32 input_mode;
233 CARD32 status;
234} MWMHints;
235#endif
236
237#if ENABLE_XEMBED 172#if ENABLE_XEMBED
238// XEMBED messages 173// XEMBED messages
239# define XEMBED_EMBEDDED_NOTIFY 0 174# define XEMBED_EMBEDDED_NOTIFY 0
240# define XEMBED_WINDOW_ACTIVATE 1 175# define XEMBED_WINDOW_ACTIVATE 1
241# define XEMBED_WINDOW_DEACTIVATE 2 176# define XEMBED_WINDOW_DEACTIVATE 2
242# define XEMBED_REQUEST_FOCUS 3 177# define XEMBED_REQUEST_FOCUS 3
243# define XEMBED_FOCUS_IN 4 178# define XEMBED_FOCUS_IN 4
244# define XEMBED_FOCUS_OUT 5 179# define XEMBED_FOCUS_OUT 5
245# define XEMBED_FOCUS_NEXT 6 180# define XEMBED_FOCUS_NEXT 6
246# define XEMBED_FOCUS_PREV 7 181# define XEMBED_FOCUS_PREV 7
247 182
248# define XEMBED_MODALITY_ON 10 183# define XEMBED_MODALITY_ON 10
249# define XEMBED_MODALITY_OFF 11 184# define XEMBED_MODALITY_OFF 11
250# define XEMBED_REGISTER_ACCELERATOR 12 185# define XEMBED_REGISTER_ACCELERATOR 12
251# define XEMBED_UNREGISTER_ACCELERATOR 13 186# define XEMBED_UNREGISTER_ACCELERATOR 13
252# define XEMBED_ACTIVATE_ACCELERATOR 14 187# define XEMBED_ACTIVATE_ACCELERATOR 14
253 188
254// XEMBED detail code 189// XEMBED detail code
255# define XEMBED_FOCUS_CURRENT 0 190# define XEMBED_FOCUS_CURRENT 0
256# define XEMBED_FOCUS_FIRST 1 191# define XEMBED_FOCUS_FIRST 1
257# define XEMBED_FOCUS_LAST 2 192# define XEMBED_FOCUS_LAST 2
258 193
259# define XEMBED_MAPPED (1 << 0) 194# define XEMBED_MAPPED (1 << 0)
260#endif 195#endif
261 196
… …
265 ***************************************************************************** 200 *****************************************************************************
266 */ 201 */
267 202
268/* COLORTERM, TERM environment variables */ 203/* COLORTERM, TERM environment variables */
269#define COLORTERMENV "rxvt" 204#define COLORTERMENV "rxvt"
270#ifdef XPM_BACKGROUND 205#ifdef BG_IMAGE_FROM_FILE
271# define COLORTERMENVFULL COLORTERMENV "-xpm" 206# define COLORTERMENVFULL COLORTERMENV "-xpm"
272#else 207#else
273# define COLORTERMENVFULL COLORTERMENV 208# define COLORTERMENVFULL COLORTERMENV
274#endif 209#endif
275#ifndef TERMENV 210#ifndef TERMENV
… …
432// fake styles 367// fake styles
433#define RS_Blink 0x00010000UL // blink 368#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 369#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 370#define RS_Uline 0x00040000UL // underline
436 371
372// toggle this to force redraw, must be != RS_Careful
373#define RS_redraw 0x01000000UL
374
437// 5 custom bits for extensions 375// 5 custom bits for extensions
438#define RS_customCount 32 376#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 377#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 378#define RS_customShift 19
441 379
… …
471 C0_NUL = 0x00, 409 C0_NUL = 0x00,
472 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 410 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
473 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 411 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
474 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 412 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
475 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, 413 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
476}; 414};
477#define CHAR_ST 0x9c /* 0234 */ 415#define CHAR_ST 0x9c /* 0234 */
478 416
479/* 417/*
480 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 418 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
481 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 419 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
… …
536 * on the unnecessary items, e.g. Color_pointer, but won't bother 474 * on the unnecessary items, e.g. Color_pointer, but won't bother
537 * until we need to. Also, be aware of usage in pixcolor_set 475 * until we need to. Also, be aware of usage in pixcolor_set
538 */ 476 */
539 477
540enum colour_list { 478enum colour_list {
479 Color_none = -2,
480 Color_transparent = -1,
541 Color_fg = 0, 481 Color_fg = 0,
542 Color_bg, 482 Color_bg,
543 minCOLOR, /* 2 */ 483 minCOLOR, /* 2 */
544 Color_Black = minCOLOR, 484 Color_Black = minCOLOR,
545 Color_Red3, 485 Color_Red3,
… …
587#endif 527#endif
588#ifdef KEEP_SCROLLCOLOR 528#ifdef KEEP_SCROLLCOLOR
589 Color_scroll, 529 Color_scroll,
590 Color_trough, 530 Color_trough,
591#endif 531#endif
592#if TINTING 532#if ENABLE_TRANSPARENCY
593 Color_tint, 533 Color_tint,
594#endif 534#endif
595#if OFF_FOCUS_FADING 535#if OFF_FOCUS_FADING
596 Color_fade, 536 Color_fade,
597#endif 537#endif
… …
604 TOTAL_COLORS = NRS_COLORS 544 TOTAL_COLORS = NRS_COLORS
605#endif 545#endif
606}; 546};
607 547
608#define Color_Bits 7 // 0 .. maxTermCOLOR 548#define Color_Bits 7 // 0 .. maxTermCOLOR
609
610#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
611#define NPIXCLR_BITS 32
612 549
613/* 550/*
614 * Resource list 551 * Resource list
615 */ 552 */
616enum { 553enum {
… …
641#define PrivMode_TtyOutputInh (1UL<<15) 578#define PrivMode_TtyOutputInh (1UL<<15)
642#define PrivMode_Keypress (1UL<<16) 579#define PrivMode_Keypress (1UL<<16)
643#define PrivMode_smoothScroll (1UL<<17) 580#define PrivMode_smoothScroll (1UL<<17)
644#define PrivMode_vt52 (1UL<<18) 581#define PrivMode_vt52 (1UL<<18)
645#define PrivMode_LFNL (1UL<<19) 582#define PrivMode_LFNL (1UL<<19)
646/* too annoying to implement X11 highlight tracking */ 583#define PrivMode_MouseBtnEvent (1UL<<20)
647/* #define PrivMode_MouseX11Track (1LU<<20) */ 584#define PrivMode_MouseAnyEvent (1UL<<21)
648 585
649#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 586#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
650#define PrivMode(test,bit) \
651 if (test) \
652 priv_modes |= (bit); \
653 else \
654 priv_modes &= ~(bit)
655 587
656#ifdef ALLOW_132_MODE 588#ifdef ALLOW_132_MODE
657# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 589# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
658#else 590#else
659# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 591# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
665#define CBUFSIZ 2048 // size of command buffer 597#define CBUFSIZ 2048 // size of command buffer
666#define UBUFSIZ 2048 // character buffer 598#define UBUFSIZ 2048 // character buffer
667 599
668#ifndef PATH_MAX 600#ifndef PATH_MAX
669# define PATH_MAX 16384 601# define PATH_MAX 16384
602#endif
603
604#if ENABLE_FRILLS
605# include <X11/Xmd.h>
606typedef struct _mwmhints {
607 CARD32 flags;
608 CARD32 functions;
609 CARD32 decorations;
610 INT32 input_mode;
611 CARD32 status;
612} MWMHints;
670#endif 613#endif
671 614
672/* Motif window hints */ 615/* Motif window hints */
673#define MWM_HINTS_FUNCTIONS (1L << 0) 616#define MWM_HINTS_FUNCTIONS (1L << 0)
674#define MWM_HINTS_DECORATIONS (1L << 1) 617#define MWM_HINTS_DECORATIONS (1L << 1)
… …
701 * MACRO DEFINES 644 * MACRO DEFINES
702 ***************************************************************************** 645 *****************************************************************************
703 */ 646 */
704#define dLocal(type,name) type const name = this->name 647#define dLocal(type,name) type const name = this->name
705 648
706// for speed reasons, we assume that all latin1 characters 649// for speed reasons, we assume that all codepoints 32 to 126 are
707// are single-width (the first unicode combining character 650// single-width.
708// is actually 0x300, but ascii is what matters most). 651#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
709#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
710 652
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 653/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 654#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 655#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 656#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
716#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 658#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
717#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 659#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 660#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 661#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
720 662
721#define OPTION(opt) (options & (opt))
722#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
723 | Opt_jumpScroll | Opt_secondaryScreen \
724 | Opt_pastableTabs | Opt_intensityStyles)
725
726// for m >= -n, ensure remainder lies between 0..n-1 663// for m >= -n, ensure remainder lies between 0..n-1
727#define MOD(m,n) (((m) + (n)) % (n)) 664#define MOD(m,n) (((m) + (n)) % (n))
728 665
729#define LINENO(n) MOD (term_start + int(n), total_rows) 666#define LINENO(n) MOD (term_start + int(n), total_rows)
730#define ROW(n) row_buf [LINENO (n)] 667#define ROW(n) row_buf [LINENO (n)]
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 685#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 686#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 687
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 688#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 689
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 690#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 691#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 692
756#if ENABLE_STYLES 693#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 694# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 695#else
759# define FONTSET(style) fontset[0] 696# define FONTSET(style) fontset[0]
… …
787#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 724#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788#define scrollbar_position(y) ((y) - scrollBar.beg) 725#define scrollbar_position(y) ((y) - scrollBar.beg)
789#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 726#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790 - scrollbar_minheight ()) 727 - scrollbar_minheight ())
791 728
792#ifdef XPM_BACKGROUND
793# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
794#else
795# define XPMClearArea(a, b, c, d, e, f, g)
796#endif
797
798typedef callback1<void, const char *> log_callback; 729typedef callback<void (const char *)> log_callback;
799typedef callback1<int, int> getfd_callback; 730typedef callback<int (int)> getfd_callback;
800 731
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 732#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern bool rxvt_set_locale (const char *locale) NOTHROW; 733extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW; 734extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW; 735extern void rxvt_pop_locale () NOTHROW;
… …
806/****************************************************************************/ 737/****************************************************************************/
807 738
808#define LINE_LONGER 0x0001 // line is continued on the next row 739#define LINE_LONGER 0x0001 // line is continued on the next row
809#define LINE_FILTERED 0x0002 // line has been filtered 740#define LINE_FILTERED 0x0002 // line has been filtered
810#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 741#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
742#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
743#define LINE_BIDI 0x0010 // line needs bidi (NYI)
811 744
812struct line_t { 745struct line_t {
813 text_t *t; // terminal the text 746 text_t *t; // terminal the text
814 rend_t *r; // rendition, uses RS_ flags 747 rend_t *r; // rendition, uses RS_ flags
815 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 748 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
850 } 783 }
851}; 784};
852 785
853/****************************************************************************/ 786/****************************************************************************/
854 787
855// primivite wrapper around mbstate_t to ensure initialisation 788// primitive wrapper around mbstate_t to ensure initialisation
856struct mbstate { 789struct mbstate {
857 mbstate_t mbs; 790 mbstate_t mbs;
858 791
859 operator mbstate_t *() { return &mbs; } 792 operator mbstate_t *() { return &mbs; }
860 void reset () { memset (&mbs, 0, sizeof (mbs)); } 793 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
869# define COMPOSE_LO 0x40000000UL 802# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 803# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 804# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 805#else
873# if ENABLE_PERL 806# if ENABLE_PERL
874# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 807# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
875# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 808# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
876# else 809# else
877# define COMPOSE_LO 0xd800UL 810# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 811# define COMPOSE_HI 0xf8ffUL
879# endif 812# endif
… …
908#endif 841#endif
909 842
910/****************************************************************************/ 843/****************************************************************************/
911 844
912#ifdef KEYSYM_RESOURCE 845#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 846class keyboard_manager;
914#endif 847#endif
915 848
916struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 849struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
850
851 // special markers with magic addresses
852 static const char resval_undef []; // options specifically unset
853 static const char resval_on []; // boolean options switched on
854 static const char resval_off []; // or off
855
917 log_callback *log_hook; // log error messages through this hook, if != 0 856 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 857 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 858#if ENABLE_PERL
920 rxvt_perl_term perl; 859 rxvt_perl_term perl;
921#endif 860#endif
922 struct mbstate mbstate; // current input multibyte state 861 struct mbstate mbstate; // current input multibyte state
923 862
924 unsigned char want_refresh:1, 863 unsigned char want_refresh:1,
925#ifdef TRANSPARENT
926 want_full_refresh:1, /* awaiting full screen refresh */
927#endif
928#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
929 am_transparent:1, /* is a transparent term */
930 am_pixmap_trans:1, /* transparency w/known root pixmap */
931#endif
932 current_screen:1, /* primary or secondary */ 864 current_screen:1, /* primary or secondary */
933 num_scr_allow:1, 865 num_scr_allow:1,
934 bypass_keystate:1, 866 bypass_keystate:1,
935#ifdef CURSOR_BLINK 867#ifdef CURSOR_BLINK
936 hidden_cursor:1, 868 hidden_cursor:1,
… …
962 int prev_ncol, /* screen: previous number of columns */ 894 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 895 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 896/* ---------- */
965 rend_t rstyle; 897 rend_t rstyle;
966/* ---------- */ 898/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */
969#ifdef SELECTION_SCROLLING 899#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 900 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 901 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 902 int selection_save_x,
973 selection_save_y, 903 selection_save_y,
… …
978 /* give proper Scroll behaviour */ 908 /* give proper Scroll behaviour */
979#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 909#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
980 mouse_slip_wheel_speed, 910 mouse_slip_wheel_speed,
981#endif 911#endif
982 refresh_count, 912 refresh_count,
983 refresh_limit,
984 last_bot, /* scrollbar last bottom position */ 913 last_bot, /* scrollbar last bottom position */
985 last_top, /* scrollbar last top position */ 914 last_top, /* scrollbar last top position */
986 last_state, /* scrollbar last state */ 915 last_state, /* scrollbar last state */
987 scrollbar_len, 916 scrollbar_len,
988 window_vt_x, 917 window_vt_x,
989 window_vt_y, 918 window_vt_y,
990 window_sb_x, 919 window_sb_x,
920 mouse_row,
921 mouse_col,
991# ifdef POINTER_BLANK 922# ifdef POINTER_BLANK
992 pointerBlankDelay, 923 pointerBlankDelay,
993# endif 924# endif
994 allowedxerror; 925 allowedxerror;
995/* ---------- */ 926/* ---------- */
… …
1034 char * incr_buf; 965 char * incr_buf;
1035 size_t incr_buf_size, incr_buf_fill; 966 size_t incr_buf_size, incr_buf_fill;
1036/* ---------- */ 967/* ---------- */
1037 Cursor leftptr_cursor; 968 Cursor leftptr_cursor;
1038/* ---------- */ 969/* ---------- */
1039#ifndef NO_BACKSPACE_KEY
1040 const char *key_backspace;
1041#endif
1042#ifndef NO_DELETE_KEY
1043 const char *key_delete;
1044#endif
1045 struct mouse_event MEvent; 970 struct mouse_event MEvent;
1046 XComposeStatus compose; 971 XComposeStatus compose;
1047 ttymode_t tio; 972 ttymode_t tio;
1048 row_col_t oldcursor; 973 row_col_t oldcursor;
1049#ifdef XPM_BACKGROUND 974#ifdef HAVE_BG_PIXMAP
1050 bgPixmap_t bgPixmap; 975 bgPixmap_t bgPixmap;
1051 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 976#endif
977#ifdef HAVE_AFTERIMAGE
978 ASVisual *asv;
979 ASImageManager *asimman;
1052#endif 980#endif
1053 981
1054#if ENABLE_OVERLAY 982#if ENABLE_OVERLAY
1055 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 983 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1056 text_t **ov_text; 984 text_t **ov_text;
… …
1079 unsigned int v_buflen; /* size of area to write */ 1007 unsigned int v_buflen; /* size of area to write */
1080 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1008 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1081 1009
1082#ifdef KEYSYM_RESOURCE 1010#ifdef KEYSYM_RESOURCE
1083 keyboard_manager *keyboard; 1011 keyboard_manager *keyboard;
1012#endif
1013#ifndef NO_RESOURCES
1014 XrmDatabase option_db;
1084#endif 1015#endif
1085 1016
1086 const char *rs[NUM_RESOURCES]; 1017 const char *rs[NUM_RESOURCES];
1087 /* command input buffering */ 1018 /* command input buffering */
1088 char *cmdbuf_ptr, *cmdbuf_endp; 1019 char *cmdbuf_ptr, *cmdbuf_endp;
… …
1104 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1035 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1105 void iso14755_54 (int x, int y); 1036 void iso14755_54 (int x, int y);
1106# endif 1037# endif
1107#endif 1038#endif
1108 1039
1109 // modifies first argument(!)
1110 void paste (char *data, unsigned int len) NOTHROW;
1111
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1040 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1113 1041
1114 void vt_select_input () const NOTHROW 1042 void vt_select_input () const NOTHROW
1115 { 1043 {
1116 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1044 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1117 } 1045 }
1118 1046
1119#if TRANSPARENT 1047#if ENABLE_TRANSPARENCY || ENABLE_PERL
1120 void rootwin_cb (XEvent &xev); 1048 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1049 xevent_watcher rootwin_ev;
1122#endif 1050#endif
1051#ifdef HAVE_BG_PIXMAP
1052 int update_background ();
1053#if TRACE_PIXMAPS
1054 int trace_update_background (const char *file, int line);
1055# define update_background() trace_update_background (__FILE__, __LINE__)
1056#endif
1057 void update_background_cb (ev::timer &w, int revents);
1058 ev::timer update_background_ev;
1059#endif
1123 1060
1124 void x_cb (XEvent &xev); 1061 void x_cb (XEvent &xev);
1125 void flush ();
1126 xevent_watcher termwin_ev; 1062 xevent_watcher termwin_ev;
1127 xevent_watcher vt_ev; 1063 xevent_watcher vt_ev;
1128#ifdef HAVE_SCROLLBARS 1064#ifdef HAVE_SCROLLBARS
1129 xevent_watcher scrollbar_ev; 1065 xevent_watcher scrollbar_ev;
1130#endif 1066#endif
1131 1067
1132 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1068 void child_cb (ev::child &w, int revents); ev::child child_ev;
1133 void check_cb (check_watcher &w); check_watcher check_ev; 1069 void prepare_cb (ev::prepare &w, int revents); ev::prepare prepare_ev;
1134 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1070 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1135 void flush_cb (time_watcher &w); time_watcher flush_ev; 1071 void flush ();
1136 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1072 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1137 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1073 bool pty_fill ();
1074 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1075 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1138 1076
1139#ifdef CURSOR_BLINK 1077#ifdef CURSOR_BLINK
1140 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1078 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1141#endif 1079#endif
1142#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1143 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1081 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1144#endif 1082#endif
1145#ifndef NO_BELL 1083#ifndef NO_BELL
1146 void bell_cb (time_watcher &w); time_watcher bell_ev; 1084 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1147#endif 1085#endif
1148 1086
1149#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1150 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1088 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1151#endif 1089#endif
1152#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1153 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1091 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1154#endif 1092#endif
1155#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1156 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1094 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1157#endif 1095#endif
1158 1096
1159#ifdef POINTER_BLANK 1097#ifdef POINTER_BLANK
1160 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1098 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1161 void pointer_blank (); 1099 void pointer_blank ();
1162#endif 1100#endif
1163 void pointer_unblank (); 1101 void pointer_unblank ();
1164 1102
1165 void tt_printf (const char *fmt,...); 1103 void tt_printf (const char *fmt,...);
1166 void tt_write (const char *data, unsigned int len); 1104 void tt_write (const char *data, unsigned int len);
1167 void pty_write (); 1105 void pty_write ();
1168
1169 void tt_winch ();
1170
1171 rxvt_term ();
1172 ~rxvt_term ();
1173 void destroy ();
1174 void emergency_cleanup ();
1175
1176 bool init (int argc, const char *const *argv, stringvec *envv);
1177 1106
1178 bool init (stringvec *argv, stringvec *envv) 1107 bool init (stringvec *argv, stringvec *envv)
1179 { 1108 {
1180 this->argv = argv; 1109 this->argv = argv;
1181 return init (argv->size (), argv->begin (), envv); 1110 return init (argv->size (), argv->begin (), envv);
1182 } 1111 }
1183
1184 bool init_vars ();
1185
1186 bool pty_fill ();
1187 1112
1188 void make_current () const // make this the "currently active" urxvt instance 1113 void make_current () const // make this the "currently active" urxvt instance
1189 { 1114 {
1190 SET_R (this); 1115 SET_R (this);
1116 set_environ (envv);
1191 rxvt_set_locale (locale); 1117 rxvt_set_locale (locale);
1192 set_environ (envv);
1193 } 1118 }
1194
1195 void init_secondary ();
1196 const char **init_resources (int argc, const char *const *argv);
1197 const char *x_resource (const char *name);
1198 void init_env ();
1199 void set_locale (const char *locale);
1200 void init_xlocale ();
1201 void init_command (const char *const *argv);
1202 void run_command (const char *const *argv);
1203 int run_child (const char *const *argv);
1204
1205 void color_aliases (int idx);
1206 void recolour_cursor ();
1207 void create_windows (int argc, const char *const *argv);
1208 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1209 void window_calc (unsigned int newwidth, unsigned int newheight);
1210 1119
1211#if USE_XIM 1120#if USE_XIM
1212 rxvt_xim *input_method; 1121 rxvt_xim *input_method;
1213 XIC Input_Context; 1122 XIC Input_Context;
1214 XIMStyle input_style; 1123 XIMStyle input_style;
… …
1222 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1131 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1223 1132
1224 bool IMisRunning (); 1133 bool IMisRunning ();
1225 void IMSendSpot (); 1134 void IMSendSpot ();
1226 bool IM_get_IC (const char *modifiers); 1135 bool IM_get_IC (const char *modifiers);
1227 void IMSetStatusPosition (); 1136 void IMSetPosition ();
1228#endif 1137#endif
1229
1230 void resize_scrollbar ();
1231 1138
1232 // command.C 1139 // command.C
1233 void lookup_key (XKeyEvent &ev); 1140 void key_press (XKeyEvent &ev);
1141 void key_release (XKeyEvent &ev);
1234 unsigned int cmd_write (const char *str, unsigned int count); 1142 unsigned int cmd_write (const char *str, unsigned int count);
1235 1143
1236 wchar_t next_char () NOTHROW; 1144 wchar_t next_char () NOTHROW;
1237 wchar_t cmd_getc () THROW ((class out_of_input)); 1145 wchar_t cmd_getc () THROW ((class out_of_input));
1238 uint32_t next_octet () NOTHROW; 1146 uint32_t next_octet () NOTHROW;
… …
1242 void mouse_report (XButtonEvent &ev); 1150 void mouse_report (XButtonEvent &ev);
1243 void button_press (XButtonEvent &ev); 1151 void button_press (XButtonEvent &ev);
1244 void button_release (XButtonEvent &ev); 1152 void button_release (XButtonEvent &ev);
1245 void focus_in (); 1153 void focus_in ();
1246 void focus_out (); 1154 void focus_out ();
1247 int check_our_parents (); 1155 void update_fade_color (unsigned int idx);
1248#ifdef PRINTPIPE 1156#ifdef PRINTPIPE
1249 FILE *popen_printer (); 1157 FILE *popen_printer ();
1250 int pclose_printer (FILE *stream); 1158 int pclose_printer (FILE *stream);
1251#endif 1159#endif
1252 void process_print_pipe (); 1160 void process_print_pipe ();
… …
1263 int privcases (int mode, unsigned long bit); 1171 int privcases (int mode, unsigned long bit);
1264 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1172 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1265 void process_sgr_mode (unsigned int nargs, const int *arg); 1173 void process_sgr_mode (unsigned int nargs, const int *arg);
1266 void process_graphics (); 1174 void process_graphics ();
1267 // init.C 1175 // init.C
1176 void init_vars ();
1177 void init_secondary ();
1178 const char **init_resources (int argc, const char *const *argv);
1179 void init_env ();
1180 void set_locale (const char *locale);
1181 void init_xlocale ();
1182 void init_command (const char *const *argv);
1183 void run_command (const char *const *argv);
1184 int run_child (const char *const *argv);
1185 void color_aliases (int idx);
1186 void create_windows (int argc, const char *const *argv);
1268 void Get_Colours (); 1187 void Get_Colours ();
1269 void get_ourmods (); 1188 void get_ourmods ();
1270 // main.C 1189 // main.C
1190 void tt_winch ();
1191 rxvt_term ();
1192 ~rxvt_term ();
1193 void destroy ();
1194 void emergency_cleanup ();
1195 bool init (int argc, const char *const *argv, stringvec *envv);
1196 void recolour_cursor ();
1197 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1198 void window_calc (unsigned int newwidth, unsigned int newheight);
1271 bool set_fonts (); 1199 bool set_fonts ();
1272 void set_string_property (Atom prop, const char *str, int len = -1); 1200 void set_string_property (Atom prop, const char *str, int len = -1);
1273 void set_utf8_property (Atom prop, const char *str, int len = -1); 1201 void set_utf8_property (Atom prop, const char *str, int len = -1);
1274 void set_title (const char *str); 1202 void set_title (const char *str);
1275 void set_icon_name (const char *str); 1203 void set_icon_name (const char *str);
1276 void set_window_color (int idx, const char *color); 1204 void set_window_color (int idx, const char *color);
1277 void set_colorfgbg (); 1205 void set_colorfgbg ();
1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1206 bool set_color (rxvt_color &color, const char *name);
1207 void alias_color (int dst, int src);
1279 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1208 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1209 void get_window_origin (int &x, int &y);
1210 Pixmap get_pixmap_property (int prop_id);
1280 1211
1281 // screen.C 1212 // screen.C
1282 1213
1283 void lalloc (line_t &l) const 1214 void lalloc (line_t &l) const
1284 { 1215 {
… …
1312 { 1243 {
1313 int base = GET_BASEFG (r); 1244 int base = GET_BASEFG (r);
1314#ifndef NO_BRIGHTCOLOR 1245#ifndef NO_BRIGHTCOLOR
1315 if (r & RS_Bold 1246 if (r & RS_Bold
1316# if ENABLE_STYLES 1247# if ENABLE_STYLES
1317 && OPTION (Opt_intensityStyles) 1248 && option (Opt_intensityStyles)
1318# endif 1249# endif
1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1250 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1320 base += minBrightCOLOR - minCOLOR; 1251 base += minBrightCOLOR - minCOLOR;
1321#endif 1252#endif
1322 return base; 1253 return base;
… …
1326 { 1257 {
1327 int base = GET_BASEBG (r); 1258 int base = GET_BASEBG (r);
1328#ifndef NO_BRIGHTCOLOR 1259#ifndef NO_BRIGHTCOLOR
1329 if (r & RS_Blink 1260 if (r & RS_Blink
1330# if ENABLE_STYLES 1261# if ENABLE_STYLES
1331 && OPTION (Opt_intensityStyles) 1262 && option (Opt_intensityStyles)
1332# endif 1263# endif
1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1264 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1334 base += minBrightCOLOR - minCOLOR; 1265 base += minBrightCOLOR - minCOLOR;
1335#endif 1266#endif
1336 return base; 1267 return base;
1337 } 1268 }
1338 1269
1339 bool option (uint32_t opt) const NOTHROW 1270 bool option (uint8_t opt) const NOTHROW
1340 { 1271 {
1341 return OPTION (opt); 1272 if (!opt)
1273 return 0;
1274
1275 --opt;
1276 return options[opt >> 3] & (1 << (opt & 7));
1342 } 1277 }
1343 1278
1344 void set_option (uint32_t opt, bool set) NOTHROW 1279 void set_option (uint8_t opt, bool set = true) NOTHROW
1280 {
1281 if (!opt)
1282 return;
1283
1284 --opt;
1285 if (set)
1286 options[opt >> 3] |= (1 << (opt & 7));
1287 else
1288 options[opt >> 3] &= ~(1 << (opt & 7));
1289 }
1290
1291 void PrivMode (int set, unsigned bit) NOTHROW
1345 { 1292 {
1346 if (set) 1293 if (set)
1347 options |= opt; 1294 priv_modes |= bit;
1348 else 1295 else
1349 options &= ~opt; 1296 priv_modes &= ~bit;
1350 } 1297 }
1351 1298
1299 // modifies first argument(!)
1300 void paste (char *data, unsigned int len) NOTHROW;
1352 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1301 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1353 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1302 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1354 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1303 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1355 void scr_reset (); 1304 void scr_reset ();
1356 void scr_release () NOTHROW; 1305 void scr_release () NOTHROW;
… …
1363 void scr_backindex () NOTHROW; 1312 void scr_backindex () NOTHROW;
1364 void scr_forwardindex () NOTHROW; 1313 void scr_forwardindex () NOTHROW;
1365#endif 1314#endif
1366 void scr_touch (bool refresh) NOTHROW; 1315 void scr_touch (bool refresh) NOTHROW;
1367 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1316 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1368 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1369 void scr_recolour () NOTHROW; 1317 void scr_recolour () NOTHROW;
1370 void scr_remap_chars () NOTHROW; 1318 void scr_remap_chars () NOTHROW;
1371 void scr_remap_chars (line_t &l) NOTHROW; 1319 void scr_remap_chars (line_t &l) NOTHROW;
1372 1320
1373 enum cursor_mode { SAVE, RESTORE }; 1321 enum cursor_mode { SAVE, RESTORE };
… …
1424 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1372 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1425 void selection_click (int clicks, int x, int y) NOTHROW; 1373 void selection_click (int clicks, int x, int y) NOTHROW;
1426 void selection_extend (int x, int y, int flag) NOTHROW; 1374 void selection_extend (int x, int y, int flag) NOTHROW;
1427 void selection_rotate (int x, int y) NOTHROW; 1375 void selection_rotate (int x, int y) NOTHROW;
1428 1376
1429 void pixel_position (int *x, int *y) NOTHROW;
1430
1431#if defined(NEXT_SCROLLBAR) 1377#if defined(NEXT_SCROLLBAR)
1432 // scrollbar-next.C 1378 // scrollbar-next.C
1433 Pixmap renderPixmap (const char *const *data, int width, int height); 1379 Pixmap renderPixmap (const char *const *data, int width, int height);
1434 void init_scrollbar_stuff (); 1380 void init_scrollbar_stuff ();
1435 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1381 void drawBevel (Drawable d, int x1, int y1, int w, int h);
… …
1450 // scrollbar-plain.C 1396 // scrollbar-plain.C
1451 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); 1397 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1452#endif 1398#endif
1453 1399
1454 // scrollbar.C 1400 // scrollbar.C
1401 void resize_scrollbar ();
1455 int scrollbar_mapping (int map); 1402 int scrollbar_mapping (int map);
1456 int scrollbar_show (int update); 1403 int scrollbar_show (int update);
1457 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); 1404 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1458 1405
1459 // xdefaults.C 1406 // xdefaults.C
1460 void get_options (int argc, const char *const *argv); 1407 void get_options (int argc, const char *const *argv);
1461 int parse_keysym (const char *str, const char *arg); 1408 int parse_keysym (const char *str, const char *arg);
1462 void get_xdefaults (FILE *stream, const char *name); 1409 const char *x_resource (const char *name);
1463 void extract_resources (); 1410 void extract_resources ();
1464 // xpm.C
1465 int scale_pixmap (const char *geom);
1466 void resize_pixmap ();
1467 Pixmap set_bgPixmap (const char *file);
1468}; 1411};
1469 1412
1470/* 1413#endif /* _RXVT_H_ */
1471 *****************************************************************************
1472 * PROTOTYPES
1473 *****************************************************************************
1474 */
1475#ifdef PROTOTYPES
1476# define __PROTO(p) p
1477#else
1478# define __PROTO(p) ()
1479#endif
1480 1414
1481#endif /* _RXVT_H_ */
1482

Diff Legend

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