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.249 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.338 by ayin, Fri Dec 28 11:02:32 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"
37#include "rxvtutil.h" 36#include "rxvtutil.h"
38#include "rxvtfont.h" 37#include "rxvtfont.h"
39#include "rxvttoolkit.h" 38#include "rxvttoolkit.h"
40#include "iom.h" 39#include "ev_cpp.h"
41#include "salloc.h" 40#include "salloc.h"
42#include "libptytty.h" 41#include "libptytty.h"
43 42
44#include "rxvtperl.h" 43#include "rxvtperl.h"
45 44
… …
69 68
70#ifndef HAVE_XPOINTER 69#ifndef HAVE_XPOINTER
71typedef char *XPointer; 70typedef char *XPointer;
72#endif 71#endif
73 72
74#ifdef HAVE_TERMIOS_H
75# include <termios.h> 73#include <termios.h>
76typedef struct termios ttymode_t; 74typedef struct termios ttymode_t;
77#else
78# include <sgtty.h>
79typedef struct {
80 struct sgttyb sg;
81 struct tchars tc;
82 struct ltchars lc;
83 int line;
84 int local;
85} ttymode_t;
86#endif
87 75
88#ifdef XPM_BACKGROUND 76#include "background.h"
89# ifdef XPM_INC_X11
90# include <X11/xpm.h>
91# else
92# include <xpm.h>
93# endif
94#endif
95 77
96#ifndef STDIN_FILENO 78#ifndef STDIN_FILENO
97# define STDIN_FILENO 0 79# define STDIN_FILENO 0
98# define STDOUT_FILENO 1 80# define STDOUT_FILENO 1
99# define STDERR_FILENO 2 81# define STDERR_FILENO 2
100#endif 82#endif
101 83
84#if !defined (EACCESS) && defined(EAGAIN)
85# define EACCESS EAGAIN
86#endif
87
88#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
89# define EXIT_SUCCESS 0 /* exit function success */
90# define EXIT_FAILURE 1 /* exit function failure */
91#endif
92
93#ifndef PATH_MAX
94# define PATH_MAX 16384
95#endif
96
102/****************************************************************************/ 97/****************************************************************************/
103 98
104// exception thrown on fatal (per-instance) errors 99// exception thrown on fatal (per-instance) errors
105class rxvt_failure_exception { }; 100class rxvt_failure_exception { };
106 101
107// exception thrown when the command parser runs out of input data 102// exception thrown when the command parser runs out of input data
108class out_of_input { }; 103class out_of_input { };
109 104
110/* 105/*
111 ***************************************************************************** 106 *****************************************************************************
112 * PROTOTYPES 107 * PROTOTYPES
113 ***************************************************************************** 108 *****************************************************************************
114 */ 109 */
115// main.C 110// main.C
116RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW; 111#define SET_LOCALE(locale) rxvt_set_locale (locale)
117RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW; 112extern bool rxvt_set_locale (const char *locale) NOTHROW;
118void rxvt_clean_exit () NOTHROW; 113extern void rxvt_push_locale (const char *locale) NOTHROW;
119void * rxvt_malloc (size_t size); 114extern void rxvt_pop_locale () NOTHROW;
120void * rxvt_calloc (size_t number, size_t size);
121void * rxvt_realloc (void *ptr, size_t size);
122 115
123// misc.C 116// misc.C
124char * rxvt_wcstombs (const wchar_t *str, int len = -1); 117char * rxvt_wcstombs (const wchar_t *str, int len = -1);
125wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 118wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
126char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 119char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
127wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 120wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
128char * rxvt_strdup_cpp (const char *str);
129 121
130#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
131
132char * rxvt_r_basename (const char *str) NOTHROW; 122char * rxvt_basename (const char *str) NOTHROW;
133void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 123void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
134void rxvt_log (const char *fmt,...) NOTHROW; 124void rxvt_log (const char *fmt,...) NOTHROW;
135void rxvt_warn (const char *fmt,...) NOTHROW; 125void rxvt_warn (const char *fmt,...) NOTHROW;
136void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 126void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
137void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 127void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
138 128
139int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
140const char * rxvt_Str_skip_space (const char *str) NOTHROW;
141char * rxvt_Str_trim (char *str) NOTHROW; 129char * rxvt_strtrim (char *str) NOTHROW;
142int rxvt_Str_escaped (char *str) NOTHROW;
143char ** rxvt_splitcommastring (const char *cs) NOTHROW; 130char ** rxvt_splitcommastring (const char *cs) NOTHROW;
144void rxvt_freecommastring (char **cs) NOTHROW; 131void rxvt_freecommastring (char **cs) NOTHROW;
145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW; 132
133void * rxvt_malloc (size_t size);
134void * rxvt_calloc (size_t number, size_t size);
135void * rxvt_realloc (void *ptr, size_t size);
146 136
147///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
148 138
149// temporarily replace the process environment 139// temporarily replace the process environment
150extern char **environ; 140extern char **environ;
151extern char **rxvt_environ; // the original environ pointer 141extern char **rxvt_environ; // the original environ pointer
152 142
143static inline void
153inline void set_environ (stringvec *envv) 144set_environ (stringvec *envv)
154{ 145{
155#if ENABLE_PERL 146#if ENABLE_PERL
156 assert (envv); 147 assert (envv);
157#else 148#else
158 if (envv) 149 if (envv)
159#endif 150#endif
160 environ = (char **)envv->begin (); 151 environ = (char **)envv->begin ();
161} 152}
162 153
154static inline void
163inline void set_environ (char **envv) 155set_environ (char **envv)
164{ 156{
165#if ENABLE_PERL 157#if ENABLE_PERL
166 assert (envv); 158 assert (envv);
167#else 159#else
168 if (envv) 160 if (envv)
… …
173/* 165/*
174 ***************************************************************************** 166 *****************************************************************************
175 * STRUCTURES AND TYPEDEFS 167 * STRUCTURES AND TYPEDEFS
176 ***************************************************************************** 168 *****************************************************************************
177 */ 169 */
178struct grwin_t;
179 170
180/* If we're using either the rxvt scrollbar, keep the 171/* If we're using either the rxvt scrollbar, keep the
181 * scrollColor resource. 172 * scrollColor resource.
182 */ 173 */
183#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 174#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
184# define KEEP_SCROLLCOLOR 1 175# define KEEP_SCROLLCOLOR 1
185#else 176#else
186# undef KEEP_SCROLLCOLOR 177# undef KEEP_SCROLLCOLOR
187#endif
188
189#ifdef XPM_BACKGROUND
190typedef struct {
191 short w, h, x, y;
192 Pixmap pixmap;
193} bgPixmap_t;
194#endif 178#endif
195 179
196/* 180/*
197 * the 'essential' information for reporting Mouse Events 181 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 182 * pared down from XButtonEvent
… …
202 Time time; /* milliseconds */ 186 Time time; /* milliseconds */
203 unsigned int state; /* key or button mask */ 187 unsigned int state; /* key or button mask */
204 unsigned int button; /* detail */ 188 unsigned int button; /* detail */
205}; 189};
206 190
207#if ENABLE_FRILLS
208typedef struct _mwmhints {
209 CARD32 flags;
210 CARD32 functions;
211 CARD32 decorations;
212 INT32 input_mode;
213 CARD32 status;
214} MWMHints;
215#endif
216
217#if ENABLE_XEMBED 191#if ENABLE_XEMBED
218// XEMBED messages 192// XEMBED messages
219# define XEMBED_EMBEDDED_NOTIFY 0 193# define XEMBED_EMBEDDED_NOTIFY 0
220# define XEMBED_WINDOW_ACTIVATE 1 194# define XEMBED_WINDOW_ACTIVATE 1
221# define XEMBED_WINDOW_DEACTIVATE 2 195# define XEMBED_WINDOW_DEACTIVATE 2
222# define XEMBED_REQUEST_FOCUS 3 196# define XEMBED_REQUEST_FOCUS 3
223# define XEMBED_FOCUS_IN 4 197# define XEMBED_FOCUS_IN 4
224# define XEMBED_FOCUS_OUT 5 198# define XEMBED_FOCUS_OUT 5
225# define XEMBED_FOCUS_NEXT 6 199# define XEMBED_FOCUS_NEXT 6
226# define XEMBED_FOCUS_PREV 7 200# define XEMBED_FOCUS_PREV 7
227 201
228# define XEMBED_MODALITY_ON 10 202# define XEMBED_MODALITY_ON 10
229# define XEMBED_MODALITY_OFF 11 203# define XEMBED_MODALITY_OFF 11
230# define XEMBED_REGISTER_ACCELERATOR 12 204# define XEMBED_REGISTER_ACCELERATOR 12
231# define XEMBED_UNREGISTER_ACCELERATOR 13 205# define XEMBED_UNREGISTER_ACCELERATOR 13
232# define XEMBED_ACTIVATE_ACCELERATOR 14 206# define XEMBED_ACTIVATE_ACCELERATOR 14
233 207
234// XEMBED detail code 208// XEMBED detail code
235# define XEMBED_FOCUS_CURRENT 0 209# define XEMBED_FOCUS_CURRENT 0
236# define XEMBED_FOCUS_FIRST 1 210# define XEMBED_FOCUS_FIRST 1
237# define XEMBED_FOCUS_LAST 2 211# define XEMBED_FOCUS_LAST 2
238 212
239# define XEMBED_MAPPED (1 << 0) 213# define XEMBED_MAPPED (1 << 0)
240#endif 214#endif
241 215
… …
245 ***************************************************************************** 219 *****************************************************************************
246 */ 220 */
247 221
248/* COLORTERM, TERM environment variables */ 222/* COLORTERM, TERM environment variables */
249#define COLORTERMENV "rxvt" 223#define COLORTERMENV "rxvt"
250#ifdef XPM_BACKGROUND 224#ifdef BG_IMAGE_FROM_FILE
251# define COLORTERMENVFULL COLORTERMENV "-xpm" 225# define COLORTERMENVFULL COLORTERMENV "-xpm"
252#else 226#else
253# define COLORTERMENVFULL COLORTERMENV 227# define COLORTERMENVFULL COLORTERMENV
254#endif 228#endif
255#ifndef TERMENV 229#ifndef TERMENV
256# define TERMENV "rxvt-unicode" 230# define TERMENV "rxvt-unicode"
257#endif 231#endif
258 232
259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 233#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
260# define NO_MOUSE_REPORT_SCROLLBAR 1 234# define NO_MOUSE_REPORT_SCROLLBAR 1
261#endif
262
263/* now look for other badly set stuff */
264
265#if !defined (EACCESS) && defined(EAGAIN)
266# define EACCESS EAGAIN
267#endif
268
269#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
270# define EXIT_SUCCESS 0 /* exit function success */
271# define EXIT_FAILURE 1 /* exit function failure */
272#endif 235#endif
273 236
274#define scrollBar_esc 30 237#define scrollBar_esc 30
275 238
276#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 239#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
… …
454 C0_NUL = 0x00, 417 C0_NUL = 0x00,
455 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 418 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
456 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 419 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
457 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 420 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
458 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, 421 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
459}; 422};
460#define CHAR_ST 0x9c /* 0234 */ 423#define CHAR_ST 0x9c /* 0234 */
461 424
462/* 425/*
463 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 426 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
464 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 427 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 482 * on the unnecessary items, e.g. Color_pointer, but won't bother
520 * until we need to. Also, be aware of usage in pixcolor_set 483 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 484 */
522 485
523enum colour_list { 486enum colour_list {
487 Color_none = -2,
488 Color_transparent = -1,
524 Color_fg = 0, 489 Color_fg = 0,
525 Color_bg, 490 Color_bg,
526 minCOLOR, /* 2 */ 491 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 492 Color_Black = minCOLOR,
528 Color_Red3, 493 Color_Red3,
… …
570#endif 535#endif
571#ifdef KEEP_SCROLLCOLOR 536#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 537 Color_scroll,
573 Color_trough, 538 Color_trough,
574#endif 539#endif
575#if TINTING 540#if ENABLE_TRANSPARENCY
576 Color_tint, 541 Color_tint,
577#endif 542#endif
578#if OFF_FOCUS_FADING 543#if OFF_FOCUS_FADING
579 Color_fade, 544 Color_fade,
580#endif 545#endif
… …
587 TOTAL_COLORS = NRS_COLORS 552 TOTAL_COLORS = NRS_COLORS
588#endif 553#endif
589}; 554};
590 555
591#define Color_Bits 7 // 0 .. maxTermCOLOR 556#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 557
596/* 558/*
597 * Resource list 559 * Resource list
598 */ 560 */
599enum { 561enum {
… …
624#define PrivMode_TtyOutputInh (1UL<<15) 586#define PrivMode_TtyOutputInh (1UL<<15)
625#define PrivMode_Keypress (1UL<<16) 587#define PrivMode_Keypress (1UL<<16)
626#define PrivMode_smoothScroll (1UL<<17) 588#define PrivMode_smoothScroll (1UL<<17)
627#define PrivMode_vt52 (1UL<<18) 589#define PrivMode_vt52 (1UL<<18)
628#define PrivMode_LFNL (1UL<<19) 590#define PrivMode_LFNL (1UL<<19)
629/* too annoying to implement X11 highlight tracking */ 591#define PrivMode_MouseBtnEvent (1UL<<20)
630/* #define PrivMode_MouseX11Track (1LU<<20) */ 592#define PrivMode_MouseAnyEvent (1UL<<21)
631 593
632#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 594#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
633#define PrivMode(test,bit) \
634 if (test) \
635 priv_modes |= (bit); \
636 else \
637 priv_modes &= ~(bit)
638 595
639#ifdef ALLOW_132_MODE 596#ifdef ALLOW_132_MODE
640# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 597# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
641#else 598#else
642# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 599# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
646#define IMBUFSIZ 128 // input modifier buffer sizes 603#define IMBUFSIZ 128 // input modifier buffer sizes
647#define KBUFSZ 512 // size of keyboard mapping buffer 604#define KBUFSZ 512 // size of keyboard mapping buffer
648#define CBUFSIZ 2048 // size of command buffer 605#define CBUFSIZ 2048 // size of command buffer
649#define UBUFSIZ 2048 // character buffer 606#define UBUFSIZ 2048 // character buffer
650 607
651#ifndef PATH_MAX 608#if ENABLE_FRILLS
652# define PATH_MAX 16384 609# include <X11/Xmd.h>
610typedef struct _mwmhints {
611 CARD32 flags;
612 CARD32 functions;
613 CARD32 decorations;
614 INT32 input_mode;
615 CARD32 status;
616} MWMHints;
653#endif 617#endif
654 618
655/* Motif window hints */ 619/* Motif window hints */
656#define MWM_HINTS_FUNCTIONS (1L << 0) 620#define MWM_HINTS_FUNCTIONS (1L << 0)
657#define MWM_HINTS_DECORATIONS (1L << 1) 621#define MWM_HINTS_DECORATIONS (1L << 1)
… …
684 * MACRO DEFINES 648 * MACRO DEFINES
685 ***************************************************************************** 649 *****************************************************************************
686 */ 650 */
687#define dLocal(type,name) type const name = this->name 651#define dLocal(type,name) type const name = this->name
688 652
689// for speed reasons, we assume that all latin1 characters 653// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 654// single-width.
691// is actually 0x300, but ascii is what matters most). 655#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 656
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 657/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 658#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 659#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 660#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 662#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 663#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 664#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 665#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 666
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
708
709// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n))
711
712#define LINENO(n) MOD (term_start + int(n), total_rows) 667#define LINENO(n) MOD (term_start + int(n), total_rows)
713#define ROW(n) row_buf [LINENO (n)] 668#define ROW(n) row_buf [LINENO (n)]
714 669
715/* how to build & extract colors and attributes */ 670/* how to build & extract colors and attributes */
716#define GET_BASEFG(x) (((x) & RS_fgMask)) 671#define GET_BASEFG(x) (((x) & RS_fgMask))
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 686#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 687#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 688
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 689#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 690
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 691#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 692#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 693
739#if ENABLE_STYLES 694#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 695# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 696#else
742# define FONTSET(style) fontset[0] 697# define FONTSET(style) fontset[0]
… …
770#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 725#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
771#define scrollbar_position(y) ((y) - scrollBar.beg) 726#define scrollbar_position(y) ((y) - scrollBar.beg)
772#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 727#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773 - scrollbar_minheight ()) 728 - scrollbar_minheight ())
774 729
775#ifdef XPM_BACKGROUND
776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
777#else
778# define XPMClearArea(a, b, c, d, e, f, g)
779#endif
780
781typedef callback1<void, const char *> log_callback; 730typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 731typedef callback<int (int)> getfd_callback;
783
784#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW;
788 732
789/****************************************************************************/ 733/****************************************************************************/
790 734
791#define LINE_LONGER 0x0001 // line is continued on the next row 735#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 736#define LINE_FILTERED 0x0002 // line has been filtered
793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 737#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
738#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
739#define LINE_BIDI 0x0010 // line needs bidi (NYI)
794 740
795struct line_t { 741struct line_t {
796 text_t *t; // terminal the text 742 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 743 rend_t *r; // rendition, uses RS_ flags
798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 744 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
833 } 779 }
834}; 780};
835 781
836/****************************************************************************/ 782/****************************************************************************/
837 783
838// primivite wrapper around mbstate_t to ensure initialisation 784// primitive wrapper around mbstate_t to ensure initialisation
839struct mbstate { 785struct mbstate {
840 mbstate_t mbs; 786 mbstate_t mbs;
841 787
842 operator mbstate_t *() { return &mbs; } 788 operator mbstate_t *() { return &mbs; }
843 void reset () { memset (&mbs, 0, sizeof (mbs)); } 789 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
846 792
847/****************************************************************************/ 793/****************************************************************************/
848 794
849#define UNICODE_MASK 0x1fffffUL 795#define UNICODE_MASK 0x1fffffUL
850 796
851#if UNICODE3 797#if UNICODE_3
852# define COMPOSE_LO 0x40000000UL 798# define COMPOSE_LO 0x40000000UL
853# define COMPOSE_HI 0x400fffffUL 799# define COMPOSE_HI 0x400fffffUL
854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 800# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
855#else 801#else
856# if ENABLE_PERL 802# if ENABLE_PERL
857# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 803# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
858# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 804# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
859# else 805# else
860# define COMPOSE_LO 0xd800UL 806# define COMPOSE_LO 0xd800UL
861# define COMPOSE_HI 0xf8ffUL 807# define COMPOSE_HI 0xf8ffUL
862# endif 808# endif
… …
891#endif 837#endif
892 838
893/****************************************************************************/ 839/****************************************************************************/
894 840
895#ifdef KEYSYM_RESOURCE 841#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 842class keyboard_manager;
897#endif 843#endif
898 844
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 845struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
846
847 // special markers with magic addresses
848 static const char resval_undef []; // options specifically unset
849 static const char resval_on []; // boolean options switched on
850 static const char resval_off []; // or off
851
900 log_callback *log_hook; // log error messages through this hook, if != 0 852 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 853 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 854#if ENABLE_PERL
903 rxvt_perl_term perl; 855 rxvt_perl_term perl;
904#endif 856#endif
905 struct mbstate mbstate; // current input multibyte state 857 struct mbstate mbstate; // current input multibyte state
906 858
907 unsigned char want_refresh:1, 859 unsigned char want_refresh:1,
908#ifdef TRANSPARENT
909 want_full_refresh:1, /* awaiting full screen refresh */
910#endif
911#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
912 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif
915 current_screen:1, /* primary or secondary */ 860 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 861 num_scr_allow:1,
917 bypass_keystate:1, 862 bypass_keystate:1,
918#ifdef CURSOR_BLINK 863#ifdef CURSOR_BLINK
919 hidden_cursor:1, 864 hidden_cursor:1,
… …
945 int prev_ncol, /* screen: previous number of columns */ 890 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 891 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 892/* ---------- */
948 rend_t rstyle; 893 rend_t rstyle;
949/* ---------- */ 894/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */
952#ifdef SELECTION_SCROLLING 895#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 896 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 897 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 898 int selection_save_x,
956 selection_save_y, 899 selection_save_y,
… …
961 /* give proper Scroll behaviour */ 904 /* give proper Scroll behaviour */
962#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 905#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
963 mouse_slip_wheel_speed, 906 mouse_slip_wheel_speed,
964#endif 907#endif
965 refresh_count, 908 refresh_count,
966 refresh_limit,
967 last_bot, /* scrollbar last bottom position */ 909 last_bot, /* scrollbar last bottom position */
968 last_top, /* scrollbar last top position */ 910 last_top, /* scrollbar last top position */
969 last_state, /* scrollbar last state */ 911 last_state, /* scrollbar last state */
970 scrollbar_len, 912 scrollbar_len,
971 window_vt_x, 913 window_vt_x,
972 window_vt_y, 914 window_vt_y,
973 window_sb_x, 915 window_sb_x,
916 mouse_row,
917 mouse_col,
974# ifdef POINTER_BLANK 918# ifdef POINTER_BLANK
975 pointerBlankDelay, 919 pointerBlankDelay,
976# endif 920# endif
977 allowedxerror; 921 allowedxerror;
978/* ---------- */ 922/* ---------- */
… …
1017 char * incr_buf; 961 char * incr_buf;
1018 size_t incr_buf_size, incr_buf_fill; 962 size_t incr_buf_size, incr_buf_fill;
1019/* ---------- */ 963/* ---------- */
1020 Cursor leftptr_cursor; 964 Cursor leftptr_cursor;
1021/* ---------- */ 965/* ---------- */
1022#ifndef NO_BACKSPACE_KEY
1023 const char *key_backspace;
1024#endif
1025#ifndef NO_DELETE_KEY
1026 const char *key_delete;
1027#endif
1028 struct mouse_event MEvent; 966 struct mouse_event MEvent;
1029 XComposeStatus compose; 967 XComposeStatus compose;
1030 ttymode_t tio; 968 ttymode_t tio;
1031 row_col_t oldcursor; 969 row_col_t oldcursor;
1032#ifdef XPM_BACKGROUND 970#ifdef HAVE_BG_PIXMAP
1033 bgPixmap_t bgPixmap; 971 bgPixmap_t bgPixmap;
1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 972#endif
973#ifdef HAVE_AFTERIMAGE
974 ASVisual *asv;
975 ASImageManager *asimman;
1035#endif 976#endif
1036 977
1037#if ENABLE_OVERLAY 978#if ENABLE_OVERLAY
1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 979 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1039 text_t **ov_text; 980 text_t **ov_text;
… …
1062 unsigned int v_buflen; /* size of area to write */ 1003 unsigned int v_buflen; /* size of area to write */
1063 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1004 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1064 1005
1065#ifdef KEYSYM_RESOURCE 1006#ifdef KEYSYM_RESOURCE
1066 keyboard_manager *keyboard; 1007 keyboard_manager *keyboard;
1008#endif
1009#ifndef NO_RESOURCES
1010 XrmDatabase option_db;
1067#endif 1011#endif
1068 1012
1069 const char *rs[NUM_RESOURCES]; 1013 const char *rs[NUM_RESOURCES];
1070 /* command input buffering */ 1014 /* command input buffering */
1071 char *cmdbuf_ptr, *cmdbuf_endp; 1015 char *cmdbuf_ptr, *cmdbuf_endp;
… …
1087 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1031 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1088 void iso14755_54 (int x, int y); 1032 void iso14755_54 (int x, int y);
1089# endif 1033# endif
1090#endif 1034#endif
1091 1035
1092 // modifies first argument(!)
1093 void paste (char *data, unsigned int len) NOTHROW;
1094
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1036 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1096 1037
1097 void vt_select_input () const NOTHROW 1038 void vt_select_input () const NOTHROW
1098 { 1039 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1040 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1100 } 1041 }
1101 1042
1102#if TRANSPARENT 1043#if ENABLE_TRANSPARENCY || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1044 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1045 xevent_watcher rootwin_ev;
1105#endif 1046#endif
1047#ifdef HAVE_BG_PIXMAP
1048 void update_background ();
1049#if TRACE_PIXMAPS
1050 void trace_update_background (const char *file, int line);
1051# define update_background() trace_update_background (__FILE__, __LINE__)
1052#endif
1053 void update_background_cb (ev::timer &w, int revents);
1054 ev::timer update_background_ev;
1055#endif
1106 1056
1107 void x_cb (XEvent &xev); 1057 void x_cb (XEvent &xev);
1108 void flush ();
1109 xevent_watcher termwin_ev; 1058 xevent_watcher termwin_ev;
1110 xevent_watcher vt_ev; 1059 xevent_watcher vt_ev;
1111#ifdef HAVE_SCROLLBARS 1060#ifdef HAVE_SCROLLBARS
1112 xevent_watcher scrollbar_ev; 1061 xevent_watcher scrollbar_ev;
1113#endif 1062#endif
1114 1063
1115 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1064 void child_cb (ev::child &w, int revents); ev::child child_ev;
1116 void check_cb (check_watcher &w); check_watcher check_ev; 1065 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1117 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1066 void refresh_check ();
1118 void flush_cb (time_watcher &w); time_watcher flush_ev; 1067 void flush ();
1119 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1068 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1120 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1069 bool pty_fill ();
1070 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1071 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1121 1072
1122#ifdef CURSOR_BLINK 1073#ifdef CURSOR_BLINK
1123 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1074 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1124#endif 1075#endif
1125#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1126 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1077 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1127#endif 1078#endif
1128#ifndef NO_BELL 1079#ifndef NO_BELL
1129 void bell_cb (time_watcher &w); time_watcher bell_ev; 1080 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1130#endif 1081#endif
1131 1082
1132#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1133 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1084 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1134#endif 1085#endif
1135#ifdef SELECTION_SCROLLING 1086#ifdef SELECTION_SCROLLING
1136 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1087 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1137#endif 1088#endif
1138#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1139 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1090 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1140#endif 1091#endif
1141 1092
1142#ifdef POINTER_BLANK 1093#ifdef POINTER_BLANK
1143 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1094 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1144 void pointer_blank (); 1095 void pointer_blank ();
1145#endif 1096#endif
1146 void pointer_unblank (); 1097 void pointer_unblank ();
1147 1098
1148 void tt_printf (const char *fmt,...); 1099 void tt_printf (const char *fmt,...);
1149 void tt_write (const char *data, unsigned int len); 1100 void tt_write (const char *data, unsigned int len);
1150 void pty_write (); 1101 void pty_write ();
1151 1102
1152 void tt_winch ();
1153
1154 rxvt_term ();
1155 ~rxvt_term ();
1156 void destroy ();
1157 void emergency_cleanup ();
1158
1159 bool init (int argc, const char *const *argv, stringvec *envv);
1160
1161 bool init (stringvec *argv, stringvec *envv) 1103 void init (stringvec *argv, stringvec *envv)
1162 { 1104 {
1163 this->argv = argv; 1105 this->argv = argv;
1164 return init (argv->size (), argv->begin (), envv); 1106 init (argv->size (), argv->begin (), envv);
1165 } 1107 }
1166
1167 bool init_vars ();
1168
1169 bool pty_fill ();
1170 1108
1171 void make_current () const // make this the "currently active" urxvt instance 1109 void make_current () const // make this the "currently active" urxvt instance
1172 { 1110 {
1173 SET_R (this); 1111 SET_R (this);
1112 set_environ (envv);
1174 rxvt_set_locale (locale); 1113 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1114 }
1177
1178 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name);
1181 void init_env ();
1182 void set_locale (const char *locale);
1183 void init_xlocale ();
1184 void init_command (const char *const *argv);
1185 void run_command (const char *const *argv);
1186 int run_child (const char *const *argv);
1187
1188 void color_aliases (int idx);
1189 void recolour_cursor ();
1190 void create_windows (int argc, const char *const *argv);
1191 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1192 void window_calc (unsigned int newwidth, unsigned int newheight);
1193 1115
1194#if USE_XIM 1116#if USE_XIM
1195 rxvt_xim *input_method; 1117 rxvt_xim *input_method;
1196 XIC Input_Context; 1118 XIC Input_Context;
1197 XIMStyle input_style; 1119 XIMStyle input_style;
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1127 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1128
1207 bool IMisRunning (); 1129 bool IMisRunning ();
1208 void IMSendSpot (); 1130 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1131 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1132 void IMSetPosition ();
1211#endif 1133#endif
1212
1213 void resize_scrollbar ();
1214 1134
1215 // command.C 1135 // command.C
1216 void lookup_key (XKeyEvent &ev); 1136 void key_press (XKeyEvent &ev);
1137 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1138 unsigned int cmd_write (const char *str, unsigned int count);
1218 1139
1219 wchar_t next_char () NOTHROW; 1140 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1141 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1142 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1146 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1147 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1148 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1149 void focus_in ();
1229 void focus_out (); 1150 void focus_out ();
1230 int check_our_parents (); 1151 void update_fade_color (unsigned int idx);
1231#ifdef PRINTPIPE 1152#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1153 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1154 int pclose_printer (FILE *stream);
1234#endif 1155#endif
1235 void process_print_pipe (); 1156 void process_print_pipe ();
… …
1246 int privcases (int mode, unsigned long bit); 1167 int privcases (int mode, unsigned long bit);
1247 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1168 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1248 void process_sgr_mode (unsigned int nargs, const int *arg); 1169 void process_sgr_mode (unsigned int nargs, const int *arg);
1249 void process_graphics (); 1170 void process_graphics ();
1250 // init.C 1171 // init.C
1172 void init_vars ();
1173 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv);
1175 void init_env ();
1176 void set_locale (const char *locale);
1177 void init_xlocale ();
1178 void init_command (const char *const *argv);
1179 void run_command (const char *const *argv);
1180 int run_child (const char *const *argv);
1181 void color_aliases (int idx);
1182 void create_windows (int argc, const char *const *argv);
1251 void Get_Colours (); 1183 void Get_Colours ();
1252 void get_ourmods (); 1184 void get_ourmods ();
1253 // main.C 1185 // main.C
1186 void tt_winch ();
1187 rxvt_term ();
1188 ~rxvt_term ();
1189 void destroy ();
1190 void emergency_cleanup ();
1191 void init (int argc, const char *const *argv, stringvec *envv);
1192 void recolour_cursor ();
1193 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1194 void window_calc (unsigned int newwidth, unsigned int newheight);
1254 bool set_fonts (); 1195 bool set_fonts ();
1255 void set_string_property (Atom prop, const char *str, int len = -1); 1196 void set_string_property (Atom prop, const char *str, int len = -1);
1256 void set_utf8_property (Atom prop, const char *str, int len = -1); 1197 void set_utf8_property (Atom prop, const char *str, int len = -1);
1257 void set_title (const char *str); 1198 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1199 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1200 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1201 void set_colorfgbg ();
1261 bool set_color (rxvt_color &color, const char *name); 1202 bool set_color (rxvt_color &color, const char *name);
1203 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1204 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1205 void get_window_origin (int &x, int &y);
1206 Pixmap get_pixmap_property (int prop_id);
1263 1207
1264 // screen.C 1208 // screen.C
1265 1209
1266 void lalloc (line_t &l) const 1210 void lalloc (line_t &l) const
1267 { 1211 {
… …
1295 { 1239 {
1296 int base = GET_BASEFG (r); 1240 int base = GET_BASEFG (r);
1297#ifndef NO_BRIGHTCOLOR 1241#ifndef NO_BRIGHTCOLOR
1298 if (r & RS_Bold 1242 if (r & RS_Bold
1299# if ENABLE_STYLES 1243# if ENABLE_STYLES
1300 && OPTION (Opt_intensityStyles) 1244 && option (Opt_intensityStyles)
1301# endif 1245# endif
1302 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1246 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1303 base += minBrightCOLOR - minCOLOR; 1247 base += minBrightCOLOR - minCOLOR;
1304#endif 1248#endif
1305 return base; 1249 return base;
… …
1309 { 1253 {
1310 int base = GET_BASEBG (r); 1254 int base = GET_BASEBG (r);
1311#ifndef NO_BRIGHTCOLOR 1255#ifndef NO_BRIGHTCOLOR
1312 if (r & RS_Blink 1256 if (r & RS_Blink
1313# if ENABLE_STYLES 1257# if ENABLE_STYLES
1314 && OPTION (Opt_intensityStyles) 1258 && option (Opt_intensityStyles)
1315# endif 1259# endif
1316 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1260 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1317 base += minBrightCOLOR - minCOLOR; 1261 base += minBrightCOLOR - minCOLOR;
1318#endif 1262#endif
1319 return base; 1263 return base;
1320 } 1264 }
1321 1265
1322 bool option (uint32_t opt) const NOTHROW 1266 bool option (uint8_t opt) const NOTHROW
1323 { 1267 {
1324 return OPTION (opt); 1268 if (!opt)
1269 return 0;
1270
1271 --opt;
1272 return options[opt >> 3] & (1 << (opt & 7));
1325 } 1273 }
1326 1274
1327 void set_option (uint32_t opt, bool set) NOTHROW 1275 void set_option (uint8_t opt, bool set = true) NOTHROW
1276 {
1277 if (!opt)
1278 return;
1279
1280 --opt;
1281 if (set)
1282 options[opt >> 3] |= (1 << (opt & 7));
1283 else
1284 options[opt >> 3] &= ~(1 << (opt & 7));
1285 }
1286
1287 void PrivMode (int set, unsigned bit) NOTHROW
1328 { 1288 {
1329 if (set) 1289 if (set)
1330 options |= opt; 1290 priv_modes |= bit;
1331 else 1291 else
1332 options &= ~opt; 1292 priv_modes &= ~bit;
1333 } 1293 }
1334 1294
1295 // modifies first argument(!)
1296 void paste (char *data, unsigned int len) NOTHROW;
1335 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1297 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1336 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1298 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1337 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1299 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1338 void scr_reset (); 1300 void scr_reset ();
1339 void scr_release () NOTHROW; 1301 void scr_release () NOTHROW;
… …
1346 void scr_backindex () NOTHROW; 1308 void scr_backindex () NOTHROW;
1347 void scr_forwardindex () NOTHROW; 1309 void scr_forwardindex () NOTHROW;
1348#endif 1310#endif
1349 void scr_touch (bool refresh) NOTHROW; 1311 void scr_touch (bool refresh) NOTHROW;
1350 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1312 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1351 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1352 void scr_recolour () NOTHROW; 1313 void scr_recolour () NOTHROW;
1353 void scr_remap_chars () NOTHROW; 1314 void scr_remap_chars () NOTHROW;
1354 void scr_remap_chars (line_t &l) NOTHROW; 1315 void scr_remap_chars (line_t &l) NOTHROW;
1355 1316
1356 enum cursor_mode { SAVE, RESTORE }; 1317 enum cursor_mode { SAVE, RESTORE };
… …
1407 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1368 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1408 void selection_click (int clicks, int x, int y) NOTHROW; 1369 void selection_click (int clicks, int x, int y) NOTHROW;
1409 void selection_extend (int x, int y, int flag) NOTHROW; 1370 void selection_extend (int x, int y, int flag) NOTHROW;
1410 void selection_rotate (int x, int y) NOTHROW; 1371 void selection_rotate (int x, int y) NOTHROW;
1411 1372
1412 void pixel_position (int *x, int *y) NOTHROW;
1413
1414#if defined(NEXT_SCROLLBAR) 1373#if defined(NEXT_SCROLLBAR)
1415 // scrollbar-next.C 1374 // scrollbar-next.C
1416 Pixmap renderPixmap (const char *const *data, int width, int height); 1375 Pixmap renderPixmap (const char *const *data, int width, int height);
1417 void init_scrollbar_stuff (); 1376 void init_scrollbar_stuff ();
1418 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1377 void drawBevel (Drawable d, int x1, int y1, int w, int h);
… …
1433 // scrollbar-plain.C 1392 // scrollbar-plain.C
1434 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); 1393 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1435#endif 1394#endif
1436 1395
1437 // scrollbar.C 1396 // scrollbar.C
1397 void resize_scrollbar ();
1438 int scrollbar_mapping (int map); 1398 int scrollbar_mapping (int map);
1439 int scrollbar_show (int update); 1399 int scrollbar_show (int update);
1440 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); 1400 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1441 1401
1442 // xdefaults.C 1402 // xdefaults.C
1443 void get_options (int argc, const char *const *argv); 1403 void get_options (int argc, const char *const *argv);
1444 int parse_keysym (const char *str, const char *arg); 1404 int parse_keysym (const char *str, const char *arg);
1445 void get_xdefaults (FILE *stream, const char *name); 1405 const char *x_resource (const char *name);
1446 void extract_resources (); 1406 void extract_resources ();
1447 // xpm.C
1448 int scale_pixmap (const char *geom);
1449 void resize_pixmap ();
1450 Pixmap set_bgPixmap (const char *file);
1451}; 1407};
1452 1408
1453/* 1409#endif /* _RXVT_H_ */
1454 *****************************************************************************
1455 * PROTOTYPES
1456 *****************************************************************************
1457 */
1458#ifdef PROTOTYPES
1459# define __PROTO(p) p
1460#else
1461# define __PROTO(p) ()
1462#endif
1463 1410
1464#endif /* _RXVT_H_ */
1465

Diff Legend

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