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.236 by root, Sun Jan 22 17:10:01 2006 UTC vs.
Revision 1.341 by ayin, Fri Dec 28 14:57:04 2007 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 "rxvtlib.h" 4#include <cstdio>
5#include <cctype>
6#include <cerrno>
7#include <cstdarg>
8#include <cstdlib>
9#ifdef HAVE_STDINT_H
10#include <stdint.h>
11#endif
12#include <sys/types.h>
13#include <unistd.h>
14#include <cstring>
15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h>
18#endif
19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h>
21#endif
22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H
26# include <wchar.h>
27#else
28// stdlib.h might provide it
29#endif
30
31using namespace std;
32
33extern "C" {
34#include <X11/Xlib.h>
35#include <X11/Xutil.h>
36#include <X11/Xresource.h>
37}
38
39#if UNICODE_3
40typedef uint32_t text_t;
41#else
42typedef uint16_t text_t; // saves lots of memory
43#endif
44typedef uint32_t rend_t;
45typedef int32_t tlen_t; // was int16_t, but this results in smaller code and memory use
46typedef int32_t tlen_t_; // specifically for use in the line_t structure
5 47
6#include "feature.h" 48#include "feature.h"
7 49
8#if defined (ISO_14755) || defined (ENABLE_PERL) 50#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 51# define ENABLE_OVERLAY 1
10#endif 52#endif
11 53
12#if ENABLE_PERL 54#if ENABLE_PERL
13# define ENABLE_FRILLS 1 55# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 56# define ENABLE_COMBINING 1
15#endif 57#endif
16 58
17#if ENABLE_FRILLS 59#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 60# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 61# define ENABLE_EWMH 1
62# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 63# define CURSOR_BLINK 1
64# define OPTION_HC 1
65# define BUILTIN_GLYPHS 1
21#else 66#else
22# define ENABLE_MINIMAL 1 67# define ENABLE_MINIMAL 1
23#endif 68#endif
24 69
25#include <limits.h> 70#include <limits.h>
26 71
27#include <X11/cursorfont.h> 72#include <X11/cursorfont.h>
28#include <X11/keysym.h> 73#include <X11/keysym.h>
29#include <X11/keysymdef.h> 74#include <X11/keysymdef.h>
30#include <X11/Xatom.h> 75#include <X11/Xatom.h>
31#if ENABLE_FRILLS
32# include <X11/Xmd.h>
33#endif
34 76
35#include "encoding.h" 77#include "encoding.h"
78#include "rxvtutil.h"
36#include "rxvtfont.h" 79#include "rxvtfont.h"
37#include "rxvttoolkit.h" 80#include "rxvttoolkit.h"
38#include "iom.h" 81#include "ev_cpp.h"
39#include "salloc.h" 82#include "salloc.h"
40#include "libptytty.h" 83#include "libptytty.h"
41 84
42#include "rxvtperl.h" 85#include "rxvtperl.h"
43 86
67 110
68#ifndef HAVE_XPOINTER 111#ifndef HAVE_XPOINTER
69typedef char *XPointer; 112typedef char *XPointer;
70#endif 113#endif
71 114
72#ifdef HAVE_TERMIOS_H
73# include <termios.h> 115#include <termios.h>
74typedef struct termios ttymode_t; 116typedef struct termios ttymode_t;
75#else
76# include <sgtty.h>
77typedef struct {
78 struct sgttyb sg;
79 struct tchars tc;
80 struct ltchars lc;
81 int line;
82 int local;
83} ttymode_t;
84#endif
85 117
86#ifdef XPM_BACKGROUND 118#include "background.h"
87# ifdef XPM_INC_X11
88# include <X11/xpm.h>
89# else
90# include <xpm.h>
91# endif
92#endif
93 119
94#ifndef STDIN_FILENO 120#ifndef STDIN_FILENO
95# define STDIN_FILENO 0 121# define STDIN_FILENO 0
96# define STDOUT_FILENO 1 122# define STDOUT_FILENO 1
97# define STDERR_FILENO 2 123# define STDERR_FILENO 2
98#endif 124#endif
99 125
126#if !defined (EACCESS) && defined(EAGAIN)
127# define EACCESS EAGAIN
128#endif
129
130#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
131# define EXIT_SUCCESS 0 /* exit function success */
132# define EXIT_FAILURE 1 /* exit function failure */
133#endif
134
135#ifndef PATH_MAX
136# define PATH_MAX 16384
137#endif
138
100/****************************************************************************/ 139/****************************************************************************/
101
102#ifndef __attribute__
103# if __GNUC__
104# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
105# define __attribute__(x)
106# endif
107# endif
108# define __attribute__(x)
109#endif
110
111#define NORETURN __attribute__ ((noreturn))
112#define UNUSED __attribute__ ((unused))
113
114// increases code size unless -fno-enforce-eh-specs
115#if __GNUC__
116# define NOTHROW
117# define THROW(x)
118#else
119# define NOTHROW throw()
120# define THROW(x) throw x
121#endif
122 140
123// exception thrown on fatal (per-instance) errors 141// exception thrown on fatal (per-instance) errors
124class rxvt_failure_exception { }; 142class rxvt_failure_exception { };
125 143
126// exception thrown when the command parser runs out of input data 144// exception thrown when the command parser runs out of input data
127class out_of_input { }; 145class out_of_input { };
128 146
129/* 147/*
130 ***************************************************************************** 148 *****************************************************************************
131 * PROTOTYPES 149 * PROTOTYPES
132 ***************************************************************************** 150 *****************************************************************************
133 */ 151 */
134// main.C 152// main.C
135RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW; 153#define SET_LOCALE(locale) rxvt_set_locale (locale)
136RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW; 154extern bool rxvt_set_locale (const char *locale) NOTHROW;
137void rxvt_clean_exit () NOTHROW; 155extern void rxvt_push_locale (const char *locale) NOTHROW;
138void * rxvt_malloc (size_t size); 156extern void rxvt_pop_locale () NOTHROW;
139void * rxvt_calloc (size_t number, size_t size); 157void rxvt_init ();
140void * rxvt_realloc (void *ptr, size_t size);
141 158
142// misc.C 159// misc.C
143char * rxvt_wcstombs (const wchar_t *str, int len = -1); 160char * rxvt_wcstombs (const wchar_t *str, int len = -1);
144wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 161wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
145char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 162char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
146wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 163wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
147char * rxvt_strdup_cpp (const char *str);
148 164
149#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
150
151char * rxvt_r_basename (const char *str) NOTHROW; 165char * rxvt_basename (const char *str) NOTHROW;
152void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 166void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
153void rxvt_log (const char *fmt,...) NOTHROW; 167void rxvt_log (const char *fmt,...) NOTHROW;
154void rxvt_warn (const char *fmt,...) NOTHROW; 168void rxvt_warn (const char *fmt,...) NOTHROW;
155void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 169void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
156void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 170void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
157 171
158int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
159const char * rxvt_Str_skip_space (const char *str) NOTHROW;
160char * rxvt_Str_trim (char *str) NOTHROW; 172char * rxvt_strtrim (char *str) NOTHROW;
161int rxvt_Str_escaped (char *str) NOTHROW;
162char ** rxvt_splitcommastring (const char *cs) NOTHROW; 173char ** rxvt_splitcommastring (const char *cs) NOTHROW;
163void rxvt_freecommastring (char **cs) NOTHROW; 174void rxvt_freecommastring (char **cs) NOTHROW;
164char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW; 175
176void * rxvt_malloc (size_t size);
177void * rxvt_calloc (size_t number, size_t size);
178void * rxvt_realloc (void *ptr, size_t size);
165 179
166///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
167 181
168// temporarily replace the process environment 182// temporarily replace the process environment
169extern char **environ; 183extern char **environ;
170extern char **rxvt_environ; // the original environ pointer 184extern char **rxvt_environ; // the original environ pointer
171 185
186static inline void
172inline void set_environ (stringvec *envv) 187set_environ (stringvec *envv)
173{ 188{
174#if ENABLE_PERL 189#if ENABLE_PERL
175 assert (envv); 190 assert (envv);
176#else 191#else
177 if (envv) 192 if (envv)
178#endif 193#endif
179 environ = (char **)envv->begin (); 194 environ = (char **)envv->begin ();
180} 195}
181 196
197static inline void
182inline void set_environ (char **envv) 198set_environ (char **envv)
183{ 199{
184#if ENABLE_PERL 200#if ENABLE_PERL
185 assert (envv); 201 assert (envv);
186#else 202#else
187 if (envv) 203 if (envv)
192/* 208/*
193 ***************************************************************************** 209 *****************************************************************************
194 * STRUCTURES AND TYPEDEFS 210 * STRUCTURES AND TYPEDEFS
195 ***************************************************************************** 211 *****************************************************************************
196 */ 212 */
197struct grwin_t;
198 213
199/* If we're using either the rxvt scrollbar, keep the 214/* If we're using either the rxvt scrollbar, keep the
200 * scrollColor resource. 215 * scrollColor resource.
201 */ 216 */
202#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 217#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
203# define KEEP_SCROLLCOLOR 1 218# define KEEP_SCROLLCOLOR 1
204#else 219#else
205# undef KEEP_SCROLLCOLOR 220# undef KEEP_SCROLLCOLOR
206#endif
207
208#ifdef XPM_BACKGROUND
209typedef struct {
210 short w, h, x, y;
211 Pixmap pixmap;
212} bgPixmap_t;
213#endif 221#endif
214 222
215/* 223/*
216 * the 'essential' information for reporting Mouse Events 224 * the 'essential' information for reporting Mouse Events
217 * pared down from XButtonEvent 225 * pared down from XButtonEvent
221 Time time; /* milliseconds */ 229 Time time; /* milliseconds */
222 unsigned int state; /* key or button mask */ 230 unsigned int state; /* key or button mask */
223 unsigned int button; /* detail */ 231 unsigned int button; /* detail */
224}; 232};
225 233
226#if ENABLE_FRILLS
227typedef struct _mwmhints {
228 CARD32 flags;
229 CARD32 functions;
230 CARD32 decorations;
231 INT32 input_mode;
232 CARD32 status;
233} MWMHints;
234#endif
235
236#if ENABLE_XEMBED 234#if ENABLE_XEMBED
237// XEMBED messages 235// XEMBED messages
238# define XEMBED_EMBEDDED_NOTIFY 0 236# define XEMBED_EMBEDDED_NOTIFY 0
239# define XEMBED_WINDOW_ACTIVATE 1 237# define XEMBED_WINDOW_ACTIVATE 1
240# define XEMBED_WINDOW_DEACTIVATE 2 238# define XEMBED_WINDOW_DEACTIVATE 2
241# define XEMBED_REQUEST_FOCUS 3 239# define XEMBED_REQUEST_FOCUS 3
242# define XEMBED_FOCUS_IN 4 240# define XEMBED_FOCUS_IN 4
243# define XEMBED_FOCUS_OUT 5 241# define XEMBED_FOCUS_OUT 5
244# define XEMBED_FOCUS_NEXT 6 242# define XEMBED_FOCUS_NEXT 6
245# define XEMBED_FOCUS_PREV 7 243# define XEMBED_FOCUS_PREV 7
246 244
247# define XEMBED_MODALITY_ON 10 245# define XEMBED_MODALITY_ON 10
248# define XEMBED_MODALITY_OFF 11 246# define XEMBED_MODALITY_OFF 11
249# define XEMBED_REGISTER_ACCELERATOR 12 247# define XEMBED_REGISTER_ACCELERATOR 12
250# define XEMBED_UNREGISTER_ACCELERATOR 13 248# define XEMBED_UNREGISTER_ACCELERATOR 13
251# define XEMBED_ACTIVATE_ACCELERATOR 14 249# define XEMBED_ACTIVATE_ACCELERATOR 14
252 250
253// XEMBED detail code 251// XEMBED detail code
254# define XEMBED_FOCUS_CURRENT 0 252# define XEMBED_FOCUS_CURRENT 0
255# define XEMBED_FOCUS_FIRST 1 253# define XEMBED_FOCUS_FIRST 1
256# define XEMBED_FOCUS_LAST 2 254# define XEMBED_FOCUS_LAST 2
257 255
258# define XEMBED_MAPPED (1 << 0) 256# define XEMBED_MAPPED (1 << 0)
259#endif 257#endif
260 258
264 ***************************************************************************** 262 *****************************************************************************
265 */ 263 */
266 264
267/* COLORTERM, TERM environment variables */ 265/* COLORTERM, TERM environment variables */
268#define COLORTERMENV "rxvt" 266#define COLORTERMENV "rxvt"
269#ifdef XPM_BACKGROUND 267#ifdef BG_IMAGE_FROM_FILE
270# define COLORTERMENVFULL COLORTERMENV "-xpm" 268# define COLORTERMENVFULL COLORTERMENV "-xpm"
271#else 269#else
272# define COLORTERMENVFULL COLORTERMENV 270# define COLORTERMENVFULL COLORTERMENV
273#endif 271#endif
274#ifndef TERMENV 272#ifndef TERMENV
275# define TERMENV "rxvt-unicode" 273# define TERMENV "rxvt-unicode"
276#endif 274#endif
277 275
278#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 276#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
279# define NO_MOUSE_REPORT_SCROLLBAR 1 277# define NO_MOUSE_REPORT_SCROLLBAR 1
280#endif
281
282/* now look for other badly set stuff */
283
284#if !defined (EACCESS) && defined(EAGAIN)
285# define EACCESS EAGAIN
286#endif
287
288#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
289# define EXIT_SUCCESS 0 /* exit function success */
290# define EXIT_FAILURE 1 /* exit function failure */
291#endif 278#endif
292 279
293#define scrollBar_esc 30 280#define scrollBar_esc 30
294 281
295#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
431// fake styles 418// fake styles
432#define RS_Blink 0x00010000UL // blink 419#define RS_Blink 0x00010000UL // blink
433#define RS_RVid 0x00020000UL // reverse video 420#define RS_RVid 0x00020000UL // reverse video
434#define RS_Uline 0x00040000UL // underline 421#define RS_Uline 0x00040000UL // underline
435 422
423// toggle this to force redraw, must be != RS_Careful
424#define RS_redraw 0x01000000UL
425
436// 5 custom bits for extensions 426// 5 custom bits for extensions
437#define RS_customCount 32 427#define RS_customCount 32
438#define RS_customMask 0x00f80000UL 428#define RS_customMask 0x00f80000UL
439#define RS_customShift 19 429#define RS_customShift 19
440 430
470 C0_NUL = 0x00, 460 C0_NUL = 0x00,
471 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 461 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
472 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 462 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
473 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 463 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
474 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, 464 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
475}; 465};
476#define CHAR_ST 0x9c /* 0234 */ 466#define CHAR_ST 0x9c /* 0234 */
477 467
478/* 468/*
479 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 469 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
480 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 470 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
509 Rxvt_restoreFG = 39, // change default fg color 499 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 500 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 501 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 502
513 URxvt_locale = 701, // change locale 503 URxvt_locale = 701, // change locale
504 URxvt_version = 702, // request version
514 505
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 506 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 507 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 508 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 509 URxvt_Color_UL = 707,
534 * on the unnecessary items, e.g. Color_pointer, but won't bother 525 * on the unnecessary items, e.g. Color_pointer, but won't bother
535 * until we need to. Also, be aware of usage in pixcolor_set 526 * until we need to. Also, be aware of usage in pixcolor_set
536 */ 527 */
537 528
538enum colour_list { 529enum colour_list {
530 Color_none = -2,
531 Color_transparent = -1,
539 Color_fg = 0, 532 Color_fg = 0,
540 Color_bg, 533 Color_bg,
541 minCOLOR, /* 2 */ 534 minCOLOR, /* 2 */
542 Color_Black = minCOLOR, 535 Color_Black = minCOLOR,
543 Color_Red3, 536 Color_Red3,
585#endif 578#endif
586#ifdef KEEP_SCROLLCOLOR 579#ifdef KEEP_SCROLLCOLOR
587 Color_scroll, 580 Color_scroll,
588 Color_trough, 581 Color_trough,
589#endif 582#endif
590#if TINTING 583#if ENABLE_TRANSPARENCY
591 Color_tint, 584 Color_tint,
592#endif 585#endif
593#if OFF_FOCUS_FADING 586#if OFF_FOCUS_FADING
594 Color_fade, 587 Color_fade,
595#endif 588#endif
602 TOTAL_COLORS = NRS_COLORS 595 TOTAL_COLORS = NRS_COLORS
603#endif 596#endif
604}; 597};
605 598
606#define Color_Bits 7 // 0 .. maxTermCOLOR 599#define Color_Bits 7 // 0 .. maxTermCOLOR
607
608#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
609#define NPIXCLR_BITS 32
610 600
611/* 601/*
612 * Resource list 602 * Resource list
613 */ 603 */
614enum { 604enum {
616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 606# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
617# include "rsinc.h" 607# include "rsinc.h"
618# undef def 608# undef def
619# undef reserve 609# undef reserve
620 NUM_RESOURCES 610 NUM_RESOURCES
621};
622
623// see init.C:xa_names, which must be kept in sync
624enum {
625 XA_TEXT = 0,
626 XA_COMPOUND_TEXT,
627 XA_UTF8_STRING,
628 XA_MULTIPLE,
629 XA_TARGETS,
630 XA_TIMESTAMP,
631 XA_VT_SELECTION,
632 XA_INCR,
633 XA_WM_PROTOCOLS,
634 XA_WM_DELETE_WINDOW,
635 XA_CLIPBOARD,
636#if ENABLE_FRILLS
637 XA_MOTIF_WM_HINTS,
638#endif
639#if ENABLE_EWMH
640 XA_NET_WM_PID,
641 XA_NET_WM_NAME,
642 XA_NET_WM_ICON_NAME,
643 XA_NET_WM_PING,
644#endif
645#if USE_XIM
646 XA_WM_LOCALE_NAME,
647#endif
648#if TRANSPARENT
649 XA_XROOTPMAP_ID,
650 XA_ESETROOT_PMAP_ID,
651#endif
652#if ENABLE_XEMBED
653 XA_XEMBED,
654 XA_XEMBED_INFO,
655#endif
656 NUM_XA
657}; 611};
658 612
659/* DEC private modes */ 613/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 614#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 615#define PrivMode_132OK (1UL<<1)
675#define PrivMode_TtyOutputInh (1UL<<15) 629#define PrivMode_TtyOutputInh (1UL<<15)
676#define PrivMode_Keypress (1UL<<16) 630#define PrivMode_Keypress (1UL<<16)
677#define PrivMode_smoothScroll (1UL<<17) 631#define PrivMode_smoothScroll (1UL<<17)
678#define PrivMode_vt52 (1UL<<18) 632#define PrivMode_vt52 (1UL<<18)
679#define PrivMode_LFNL (1UL<<19) 633#define PrivMode_LFNL (1UL<<19)
680/* too annoying to implement X11 highlight tracking */ 634#define PrivMode_MouseBtnEvent (1UL<<20)
681/* #define PrivMode_MouseX11Track (1LU<<20) */ 635#define PrivMode_MouseAnyEvent (1UL<<21)
682 636
683#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 637#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
684#define PrivMode(test,bit) \
685 if (test) \
686 priv_modes |= (bit); \
687 else \
688 priv_modes &= ~(bit)
689 638
690#ifdef ALLOW_132_MODE 639#ifdef ALLOW_132_MODE
691# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 640# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
692#else 641#else
693# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 642# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
697#define IMBUFSIZ 128 // input modifier buffer sizes 646#define IMBUFSIZ 128 // input modifier buffer sizes
698#define KBUFSZ 512 // size of keyboard mapping buffer 647#define KBUFSZ 512 // size of keyboard mapping buffer
699#define CBUFSIZ 2048 // size of command buffer 648#define CBUFSIZ 2048 // size of command buffer
700#define UBUFSIZ 2048 // character buffer 649#define UBUFSIZ 2048 // character buffer
701 650
702#ifndef PATH_MAX 651#if ENABLE_FRILLS
703# define PATH_MAX 16384 652# include <X11/Xmd.h>
653typedef struct _mwmhints {
654 CARD32 flags;
655 CARD32 functions;
656 CARD32 decorations;
657 INT32 input_mode;
658 CARD32 status;
659} MWMHints;
704#endif 660#endif
705 661
706/* Motif window hints */ 662/* Motif window hints */
707#define MWM_HINTS_FUNCTIONS (1L << 0) 663#define MWM_HINTS_FUNCTIONS (1L << 0)
708#define MWM_HINTS_DECORATIONS (1L << 1) 664#define MWM_HINTS_DECORATIONS (1L << 1)
734 ***************************************************************************** 690 *****************************************************************************
735 * MACRO DEFINES 691 * MACRO DEFINES
736 ***************************************************************************** 692 *****************************************************************************
737 */ 693 */
738#define dLocal(type,name) type const name = this->name 694#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 695
696// for speed reasons, we assume that all codepoints 32 to 126 are
697// single-width.
698#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
740 699
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 700/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 701#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 702#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 703#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
746#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 705#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
747#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 706#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
748#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 707#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
749#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 708#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
750 709
751#define OPTION(opt) (options & (opt))
752#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
753 | Opt_jumpScroll | Opt_secondaryScreen \
754 | Opt_pastableTabs | Opt_intensityStyles)
755
756// for m >= -n, ensure remainder lies between 0..n-1
757#define MOD(m,n) (((m) + (n)) % (n))
758
759#define LINENO(n) MOD (term_start + int(n), total_rows) 710#define LINENO(n) MOD (term_start + int(n), total_rows)
760#define ROW(n) row_buf [LINENO (n)] 711#define ROW(n) row_buf [LINENO (n)]
761 712
762/* how to build & extract colors and attributes */ 713/* how to build & extract colors and attributes */
763#define GET_BASEFG(x) (((x) & RS_fgMask)) 714#define GET_BASEFG(x) (((x) & RS_fgMask))
778#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
779#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 730#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
780 731
781#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 732#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
782 733
783#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
784#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
785 736
786#if ENABLE_STYLES 737#if ENABLE_STYLES
787# define FONTSET(style) fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
788#else 739#else
789# define FONTSET(style) fontset[0] 740# define FONTSET(style) fontset[0]
817#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 768#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
818#define scrollbar_position(y) ((y) - scrollBar.beg) 769#define scrollbar_position(y) ((y) - scrollBar.beg)
819#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 770#define scrollbar_size() (scrollBar.end - scrollBar.beg \
820 - scrollbar_minheight ()) 771 - scrollbar_minheight ())
821 772
822#ifdef XPM_BACKGROUND
823# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
824#else
825# define XPMClearArea(a, b, c, d, e, f, g)
826#endif
827
828#ifdef DEBUG_CMD
829# define D_CMD(x) fprintf x ; fputc('\n', stderr)
830#else
831# define D_CMD(x)
832#endif
833#ifdef DEBUG_INIT
834# define D_INIT(x) fprintf x ; fputc('\n', stderr)
835#else
836# define D_INIT(x)
837#endif
838#ifdef DEBUG_MAIN
839# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
840#else
841# define D_MAIN(x)
842#endif
843#ifdef DEBUG_SIZE
844# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
845#else
846# define D_SIZE(x)
847#endif
848
849typedef callback1<void, const char *> log_callback; 773typedef callback<void (const char *)> log_callback;
850typedef callback1<int, int> getfd_callback; 774typedef callback<int (int)> getfd_callback;
851
852#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale) NOTHROW;
854extern void rxvt_push_locale (const char *locale) NOTHROW;
855extern void rxvt_pop_locale () NOTHROW;
856 775
857/****************************************************************************/ 776/****************************************************************************/
858 777
859#define LINE_LONGER 0x0001 // line is continued on the next row 778#define LINE_LONGER 0x0001 // line is continued on the next row
860#define LINE_FILTERED 0x0002 // line has been filtered 779#define LINE_FILTERED 0x0002 // line has been filtered
861#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 780#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
781#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
782#define LINE_BIDI 0x0010 // line needs bidi (NYI)
862 783
863struct line_t { 784struct line_t {
864 text_t *t; // terminal the text 785 text_t *t; // terminal the text
865 rend_t *r; // rendition, uses RS_ flags 786 rend_t *r; // rendition, uses RS_ flags
866 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 787 tlen_t_ l; // length of each text line
867 uint32_t f; // flags 788 uint32_t f; // flags
868 789
869 bool is_longer () 790 bool is_longer ()
870 { 791 {
871 return f & LINE_LONGER; 792 return f & LINE_LONGER;
901 } 822 }
902}; 823};
903 824
904/****************************************************************************/ 825/****************************************************************************/
905 826
906// primivite wrapper around mbstate_t to ensure initialisation 827// primitive wrapper around mbstate_t to ensure initialisation
907struct mbstate { 828struct mbstate {
908 mbstate_t mbs; 829 mbstate_t mbs;
909 830
910 operator mbstate_t *() { return &mbs; } 831 operator mbstate_t *() { return &mbs; }
911 void reset () { memset (&mbs, 0, sizeof (mbs)); } 832 void reset () { memset (&mbs, 0, sizeof (mbs)); }
914 835
915/****************************************************************************/ 836/****************************************************************************/
916 837
917#define UNICODE_MASK 0x1fffffUL 838#define UNICODE_MASK 0x1fffffUL
918 839
919#if UNICODE3 840#if UNICODE_3
920# define COMPOSE_LO 0x40000000UL 841# define COMPOSE_LO 0x40000000UL
921# define COMPOSE_HI 0x400fffffUL 842# define COMPOSE_HI 0x400fffffUL
922# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 843# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
923#else 844#else
924# if ENABLE_PERL 845# if ENABLE_PERL
925# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 846# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
926# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 847# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
927# else 848# else
928# define COMPOSE_LO 0xd800UL 849# define COMPOSE_LO 0xd800UL
929# define COMPOSE_HI 0xf8ffUL 850# define COMPOSE_HI 0xf8ffUL
930# endif 851# endif
959#endif 880#endif
960 881
961/****************************************************************************/ 882/****************************************************************************/
962 883
963#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
964 class keyboard_manager; 885class keyboard_manager;
965#endif 886#endif
966 887
888typedef struct rxvt_term *rxvt_t;
889
890extern rxvt_t rxvt_current_term;
891
892#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
893#define GET_R rxvt_current_term
894
895typedef struct {
896 int row;
897 int col;
898} row_col_t;
899
900/*
901 * terminal limits:
902 *
903 * width : 1 <= width
904 * height : 1 <= height
905 * ncol : 1 <= ncol <= MAX(tlen_t)
906 * nrow : 1 <= nrow <= MAX(int)
907 * saveLines : 0 <= saveLines <= MAX(int)
908 * term_start : 0 <= term_start < saveLines
909 * total_rows : nrow + saveLines
910 *
911 * top_row : -saveLines <= top_row <= 0
912 * view_start : top_row <= view_start <= 0
913 *
914 * | most coordinates are stored relative to term_start,
915 * ROW_BUF | which is the first line of the terminal screen
916 * |························= row_buf[0]
917 * |························= row_buf[1]
918 * |························= row_buf[2] etc.
919 * |
920 * +------------+···········= term_start + top_row
921 * | scrollback |
922 * | scrollback +---------+·= term_start + view_start
923 * | scrollback | display |
924 * | scrollback | display |
925 * +------------+·display·+·= term_start
926 * | terminal | display |
927 * | terminal +---------+
928 * | terminal |
929 * | terminal |
930 * +------------+···········= term_stat + nrow - 1
931 * |
932 * |
933 * END······················= total_rows
934 */
935
936struct TermWin_t {
937 int width; /* window width [pixels] */
938 int height; /* window height [pixels] */
939 int fwidth; /* font width [pixels] */
940 int fheight; /* font height [pixels] */
941 int fbase; /* font ascent (baseline) [pixels] */
942 int ncol; /* window columns [characters] */
943 int nrow; /* window rows [characters] */
944 int focus; /* window has focus */
945 int mapped; /* window state mapped? */
946 int int_bwidth; /* internal border width */
947 int ext_bwidth; /* external border width */
948 int lineSpace; /* number of extra pixels between rows */
949 int saveLines; /* number of lines that fit in scrollback */
950 int total_rows; /* total number of rows in this terminal */
951 int term_start; /* term lines start here */
952 int view_start; /* scrollback view starts here */
953 int top_row; /* topmost row index of scrollback */
954 Window parent[6]; /* parent identifiers - we're parent[0] */
955 Window vt; /* vt100 window */
956 GC gc; /* GC for drawing */
957 Pixmap pixmap;
958 rxvt_drawable *drawable;
959 rxvt_fontset *fontset[4];
960};
961
962/*
963 * screen accounting:
964 * screen_t elements
965 * row: Cursor row position : 0 <= row < nrow
966 * col: Cursor column position : 0 <= col < ncol
967 * tscroll: Scrolling region top row inclusive : 0 <= row < nrow
968 * bscroll: Scrolling region bottom row inclusive : 0 <= row < nrow
969 *
970 * selection_t elements
971 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
972 * nothing is selected
973 * beg: row/column of beginning of selection : never past mark
974 * mark: row/column of initial click : never past end
975 * end: row/column of one character past end of selection
976 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow
977 * * Note: col == -1 ==> we're left of screen
978 *
979 */
980typedef struct {
981 row_col_t cur; /* cursor position on the screen */
982 int tscroll; /* top of settable scroll region */
983 int bscroll; /* bottom of settable scroll region */
984 unsigned int charset; /* character set number [0..3] */
985 unsigned int flags; /* see below */
986 row_col_t s_cur; /* saved cursor position */
987 unsigned int s_charset; /* saved character set number [0..3] */
988 char s_charset_char;
989 rend_t s_rstyle; /* saved rendition style */
990} screen_t;
991
992enum selection_op_t {
993 SELECTION_CLEAR = 0, /* nothing selected */
994 SELECTION_INIT, /* marked a point */
995 SELECTION_BEGIN, /* started a selection */
996 SELECTION_CONT, /* continued selection */
997 SELECTION_DONE /* selection put in CUT_BUFFER0 */
998};
999
1000typedef struct {
1001 wchar_t *text; /* selected text */
1002 unsigned int len; /* length of selected text */
1003 unsigned int screen; /* screen being used */
1004 unsigned int clicks; /* number of clicks */
1005 selection_op_t op; /* current operation */
1006 bool rect; /* rectangular selection? */
1007 row_col_t beg; /* beginning of selection <= mark */
1008 row_col_t mark; /* point of initial click <= end */
1009 row_col_t end; /* one character past end point */
1010} selection_t;
1011
1012/* ------------------------------------------------------------------------- */
1013
1014/* screen_t flags */
1015#define Screen_Relative (1<<0) /* relative origin mode flag */
1016#define Screen_VisibleCursor (1<<1) /* cursor visible? */
1017#define Screen_Autowrap (1<<2) /* auto-wrap flag */
1018#define Screen_Insert (1<<3) /* insert mode (vs. overstrike) */
1019#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
1020#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
1021
1022/* rxvt_vars.options */
1023enum {
1024# define def(name,idx) Opt_ ## name = idx,
1025# define nodef(name) Opt_ ## name = 0,
1026# include "optinc.h"
1027# undef nodef
1028# undef def
1029Opt_count
1030};
1031
1032/* ------------------------------------------------------------------------- */
1033
1034typedef struct {
1035 char state; /* scrollbar state */
1036 char init; /* scrollbar has been initialised */
1037 unsigned int beg; /* slider sub-window begin height */
1038 unsigned int end; /* slider sub-window end height */
1039 unsigned int top; /* slider top position */
1040 unsigned int bot; /* slider bottom position */
1041 unsigned int style; /* style: rxvt, xterm, next */
1042 unsigned int width; /* scrollbar width */
1043 Window win;
1044 int (rxvt_term::*update)(int, int, int, int);
1045
1046 void setIdle() { state = 1 ; }
1047 void setMotion() { state = 'm'; }
1048 void setUp() { state = 'U'; }
1049 void setDn() { state = 'D'; }
1050} scrollBar_t;
1051
1052struct rxvt_vars : TermWin_t {
1053 scrollBar_t scrollBar;
1054 uint8_t options[(Opt_count + 7) >> 3];
1055 XSizeHints szHint;
1056 rxvt_color *pix_colors;
1057 Cursor TermWin_cursor; /* cursor for vt window */
1058 int sb_shadow; /* scrollbar shadow width */
1059 int numlock_state;
1060 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
1061 line_t *drawn_buf; // text on screen
1062 line_t *swap_buf; // lines for swap buffer
1063 char *tabs; /* per location: 1 == tab-stop */
1064 screen_t screen;
1065 screen_t swap;
1066 selection_t selection;
1067 rxvt_color pix_colors_focused[TOTAL_COLORS];
1068#ifdef OFF_FOCUS_FADING
1069 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
1070#endif
1071};
1072
967struct rxvt_term : zero_initialized, rxvt_vars { 1073struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
1074
1075 // special markers with magic addresses
1076 static const char resval_undef []; // options specifically unset
1077 static const char resval_on []; // boolean options switched on
1078 static const char resval_off []; // or off
1079
968 log_callback *log_hook; // log error messages through this hook, if != 0 1080 log_callback *log_hook; // log error messages through this hook, if != 0
969 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 1081 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
970#if ENABLE_PERL 1082#if ENABLE_PERL
971 rxvt_perl_term perl; 1083 rxvt_perl_term perl;
972#endif 1084#endif
973 struct mbstate mbstate; // current input multibyte state 1085 struct mbstate mbstate; // current input multibyte state
974 1086
975 unsigned char want_refresh:1, 1087 unsigned char want_refresh:1,
976#ifdef TRANSPARENT
977 want_full_refresh:1, /* awaiting full screen refresh */
978#endif
979#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
980 am_transparent:1, /* is a transparent term */
981 am_pixmap_trans:1, /* transparency w/known root pixmap */
982#endif
983 current_screen:1, /* primary or secondary */ 1088 current_screen:1, /* primary or secondary */
984 num_scr_allow:1, 1089 num_scr_allow:1,
985 bypass_keystate:1, 1090 bypass_keystate:1,
986#ifdef CURSOR_BLINK 1091#ifdef CURSOR_BLINK
987 hidden_cursor:1, 1092 hidden_cursor:1,
1013 int prev_ncol, /* screen: previous number of columns */ 1118 int prev_ncol, /* screen: previous number of columns */
1014 prev_nrow; /* screen: previous number of rows */ 1119 prev_nrow; /* screen: previous number of rows */
1015/* ---------- */ 1120/* ---------- */
1016 rend_t rstyle; 1121 rend_t rstyle;
1017/* ---------- */ 1122/* ---------- */
1018 uint32_t pixcolor_set[NPIXCLR_SETS];
1019/* ---------- */
1020#ifdef SELECTION_SCROLLING 1123#ifdef SELECTION_SCROLLING
1021 int scroll_selection_lines; 1124 int scroll_selection_lines;
1022 enum page_dirn scroll_selection_dir; 1125 enum page_dirn scroll_selection_dir;
1023 int selection_save_x, 1126 int selection_save_x,
1024 selection_save_y, 1127 selection_save_y,
1029 /* give proper Scroll behaviour */ 1132 /* give proper Scroll behaviour */
1030#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1133#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1031 mouse_slip_wheel_speed, 1134 mouse_slip_wheel_speed,
1032#endif 1135#endif
1033 refresh_count, 1136 refresh_count,
1034 refresh_limit,
1035 last_bot, /* scrollbar last bottom position */ 1137 last_bot, /* scrollbar last bottom position */
1036 last_top, /* scrollbar last top position */ 1138 last_top, /* scrollbar last top position */
1037 last_state, /* scrollbar last state */ 1139 last_state, /* scrollbar last state */
1038 scrollbar_len, 1140 scrollbar_len,
1039 window_vt_x, 1141 window_vt_x,
1040 window_vt_y, 1142 window_vt_y,
1041 window_sb_x, 1143 window_sb_x,
1144 mouse_row,
1145 mouse_col,
1042# ifdef POINTER_BLANK 1146# ifdef POINTER_BLANK
1043 pointerBlankDelay, 1147 pointerBlankDelay,
1044# endif 1148# endif
1045 allowedxerror; 1149 allowedxerror;
1046/* ---------- */ 1150/* ---------- */
1050 int old_width, /* last used width in screen resize */ 1154 int old_width, /* last used width in screen resize */
1051 old_height; /* last used height in screen resize */ 1155 old_height; /* last used height in screen resize */
1052 unsigned long priv_modes, 1156 unsigned long priv_modes,
1053 SavedModes; 1157 SavedModes;
1054/* ---------- */ 1158/* ---------- */
1055 Atom xa[NUM_XA]; 1159 Atom *xa;
1056/* ---------- */ 1160/* ---------- */
1057#ifdef RXVT_SCROLLBAR 1161#ifdef RXVT_SCROLLBAR
1058 GC scrollbarGC, 1162 GC scrollbarGC,
1059 topShadowGC, 1163 topShadowGC,
1060 botShadowGC; 1164 botShadowGC;
1085 char * incr_buf; 1189 char * incr_buf;
1086 size_t incr_buf_size, incr_buf_fill; 1190 size_t incr_buf_size, incr_buf_fill;
1087/* ---------- */ 1191/* ---------- */
1088 Cursor leftptr_cursor; 1192 Cursor leftptr_cursor;
1089/* ---------- */ 1193/* ---------- */
1090#ifndef NO_BACKSPACE_KEY
1091 const char *key_backspace;
1092#endif
1093#ifndef NO_DELETE_KEY
1094 const char *key_delete;
1095#endif
1096 struct mouse_event MEvent; 1194 struct mouse_event MEvent;
1097 XComposeStatus compose; 1195 XComposeStatus compose;
1098 ttymode_t tio; 1196 ttymode_t tio;
1099 row_col_t oldcursor; 1197 row_col_t oldcursor;
1100#ifdef XPM_BACKGROUND 1198#ifdef HAVE_BG_PIXMAP
1101 bgPixmap_t bgPixmap; 1199 bgPixmap_t bgPixmap;
1102 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1200#endif
1201#ifdef HAVE_AFTERIMAGE
1202 ASVisual *asv;
1203 ASImageManager *asimman;
1103#endif 1204#endif
1104 1205
1105#if ENABLE_OVERLAY 1206#if ENABLE_OVERLAY
1106 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1207 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1107 text_t **ov_text; 1208 text_t **ov_text;
1117 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1218 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1118#endif 1219#endif
1119 1220
1120 vector<void *> allocated; // free these memory blocks with free() 1221 vector<void *> allocated; // free these memory blocks with free()
1121 1222
1122 char *env_windowid; /* environmental variable WINDOWID */ 1223 char env_windowid[21]; /* environmental variable WINDOWID */
1224 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1123 char *env_display; /* environmental variable DISPLAY */ 1225 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1226 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1227
1126 char *locale; 1228 char *locale;
1127 char charsets[4]; 1229 char charsets[4];
1128 char *v_buffer; /* pointer to physical buffer */ 1230 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1231 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1232 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1131 1233
1132#ifdef KEYSYM_RESOURCE 1234#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1235 keyboard_manager *keyboard;
1236#endif
1237#ifndef NO_RESOURCES
1238 XrmDatabase option_db;
1134#endif 1239#endif
1135 1240
1136 const char *rs[NUM_RESOURCES]; 1241 const char *rs[NUM_RESOURCES];
1137 /* command input buffering */ 1242 /* command input buffering */
1138 char *cmdbuf_ptr, *cmdbuf_endp; 1243 char *cmdbuf_ptr, *cmdbuf_endp;
1154 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1259 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1155 void iso14755_54 (int x, int y); 1260 void iso14755_54 (int x, int y);
1156# endif 1261# endif
1157#endif 1262#endif
1158 1263
1159 // modifies first argument(!) 1264 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1160 void paste (char *data, unsigned int len) NOTHROW;
1161
1162 long vt_emask, vt_emask_perl;
1163 1265
1164 void vt_select_input () const NOTHROW 1266 void vt_select_input () const NOTHROW
1165 { 1267 {
1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1268 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1167 } 1269 }
1168 1270
1169#if TRANSPARENT 1271#if ENABLE_TRANSPARENCY || ENABLE_PERL
1170 void rootwin_cb (XEvent &xev); 1272 void rootwin_cb (XEvent &xev);
1171 xevent_watcher rootwin_ev; 1273 xevent_watcher rootwin_ev;
1172#endif 1274#endif
1275#ifdef HAVE_BG_PIXMAP
1276 void update_background ();
1277#if TRACE_PIXMAPS
1278 void trace_update_background (const char *file, int line);
1279# define update_background() trace_update_background (__FILE__, __LINE__)
1280#endif
1281 void update_background_cb (ev::timer &w, int revents);
1282 ev::timer update_background_ev;
1283#endif
1173 1284
1174 void x_cb (XEvent &xev); 1285 void x_cb (XEvent &xev);
1175 void flush ();
1176 xevent_watcher termwin_ev; 1286 xevent_watcher termwin_ev;
1177 xevent_watcher vt_ev; 1287 xevent_watcher vt_ev;
1178#ifdef HAVE_SCROLLBARS 1288#ifdef HAVE_SCROLLBARS
1179 xevent_watcher scrollbar_ev; 1289 xevent_watcher scrollbar_ev;
1180#endif 1290#endif
1181 1291
1182 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1292 void child_cb (ev::child &w, int revents); ev::child child_ev;
1183 void check_cb (check_watcher &w); check_watcher check_ev; 1293 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1184 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1294 void refresh_check ();
1185 void flush_cb (time_watcher &w); time_watcher flush_ev; 1295 void flush ();
1186 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1296 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1187 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1297 bool pty_fill ();
1298 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1299 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1188 1300
1189#ifdef CURSOR_BLINK 1301#ifdef CURSOR_BLINK
1190 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1302 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1191#endif 1303#endif
1192#ifdef TEXT_BLINK 1304#ifdef TEXT_BLINK
1193 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1305 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1194#endif 1306#endif
1195#ifndef NO_BELL 1307#ifndef NO_BELL
1196 void bell_cb (time_watcher &w); time_watcher bell_ev; 1308 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1197#endif 1309#endif
1198 1310
1199#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1311#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1200 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1312 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1201#endif 1313#endif
1202#ifdef SELECTION_SCROLLING 1314#ifdef SELECTION_SCROLLING
1203 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1315 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1204#endif 1316#endif
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1317#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1318 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1207#endif 1319#endif
1208 1320
1209#ifdef POINTER_BLANK 1321#ifdef POINTER_BLANK
1210 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1322 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1211 void pointer_blank (); 1323 void pointer_blank ();
1212#endif 1324#endif
1213 void pointer_unblank (); 1325 void pointer_unblank ();
1214 1326
1215 void tt_printf (const char *fmt,...); 1327 void tt_printf (const char *fmt,...);
1216 void tt_write (const char *data, unsigned int len); 1328 void tt_write (const char *data, unsigned int len);
1217 void pty_write (); 1329 void pty_write ();
1218 1330
1219 void tt_winch ();
1220
1221 rxvt_term ();
1222 ~rxvt_term ();
1223 void destroy ();
1224 void emergency_cleanup ();
1225
1226 bool init (int argc, const char *const *argv, stringvec *envv);
1227
1228 bool init (stringvec *argv, stringvec *envv) 1331 void init (stringvec *argv, stringvec *envv)
1229 { 1332 {
1230 this->argv = argv; 1333 this->argv = argv;
1231 return init (argv->size (), argv->begin (), envv); 1334 init (argv->size (), argv->begin (), envv);
1232 } 1335 }
1233
1234 bool init_vars ();
1235
1236 bool pty_fill ();
1237 1336
1238 void make_current () const // make this the "currently active" urxvt instance 1337 void make_current () const // make this the "currently active" urxvt instance
1239 { 1338 {
1240 SET_R (this); 1339 SET_R (this);
1340 set_environ (envv);
1241 rxvt_set_locale (locale); 1341 rxvt_set_locale (locale);
1242 set_environ (envv);
1243 } 1342 }
1244
1245 void init_secondary ();
1246 const char **init_resources (int argc, const char *const *argv);
1247 const char *x_resource (const char *name);
1248 void init_env ();
1249 void set_locale (const char *locale);
1250 void init_xlocale ();
1251 void init_command (const char *const *argv);
1252 void run_command (const char *const *argv);
1253 int run_child (const char *const *argv);
1254
1255 void color_aliases (int idx);
1256 void recolour_cursor ();
1257 void create_windows (int argc, const char *const *argv);
1258 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1259 void window_calc (unsigned int newwidth, unsigned int newheight);
1260 1343
1261#if USE_XIM 1344#if USE_XIM
1262 rxvt_xim *input_method; 1345 rxvt_xim *input_method;
1263 XIC Input_Context; 1346 XIC Input_Context;
1264 XIMStyle input_style; 1347 XIMStyle input_style;
1272 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1355 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1273 1356
1274 bool IMisRunning (); 1357 bool IMisRunning ();
1275 void IMSendSpot (); 1358 void IMSendSpot ();
1276 bool IM_get_IC (const char *modifiers); 1359 bool IM_get_IC (const char *modifiers);
1277 void IMSetStatusPosition (); 1360 void IMSetPosition ();
1278#endif 1361#endif
1279
1280 void resize_scrollbar ();
1281 1362
1282 // command.C 1363 // command.C
1283 void lookup_key (XKeyEvent &ev); 1364 void key_press (XKeyEvent &ev);
1365 void key_release (XKeyEvent &ev);
1284 unsigned int cmd_write (const char *str, unsigned int count); 1366 unsigned int cmd_write (const char *str, unsigned int count);
1285 1367
1286 wchar_t next_char () NOTHROW; 1368 wchar_t next_char () NOTHROW;
1287 wchar_t cmd_getc () THROW ((class out_of_input)); 1369 wchar_t cmd_getc () THROW ((class out_of_input));
1288 uint32_t next_octet () NOTHROW; 1370 uint32_t next_octet () NOTHROW;
1292 void mouse_report (XButtonEvent &ev); 1374 void mouse_report (XButtonEvent &ev);
1293 void button_press (XButtonEvent &ev); 1375 void button_press (XButtonEvent &ev);
1294 void button_release (XButtonEvent &ev); 1376 void button_release (XButtonEvent &ev);
1295 void focus_in (); 1377 void focus_in ();
1296 void focus_out (); 1378 void focus_out ();
1297 int check_our_parents (); 1379 void update_fade_color (unsigned int idx);
1298#ifdef PRINTPIPE 1380#ifdef PRINTPIPE
1299 FILE *popen_printer (); 1381 FILE *popen_printer ();
1300 int pclose_printer (FILE *stream); 1382 int pclose_printer (FILE *stream);
1301#endif 1383#endif
1302 void process_print_pipe (); 1384 void process_print_pipe ();
1313 int privcases (int mode, unsigned long bit); 1395 int privcases (int mode, unsigned long bit);
1314 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1396 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1315 void process_sgr_mode (unsigned int nargs, const int *arg); 1397 void process_sgr_mode (unsigned int nargs, const int *arg);
1316 void process_graphics (); 1398 void process_graphics ();
1317 // init.C 1399 // init.C
1400 void init_vars ();
1401 void init_secondary ();
1402 const char **init_resources (int argc, const char *const *argv);
1403 void init_env ();
1404 void set_locale (const char *locale);
1405 void init_xlocale ();
1406 void init_command (const char *const *argv);
1407 void run_command (const char *const *argv);
1408 int run_child (const char *const *argv);
1409 void color_aliases (int idx);
1410 void create_windows (int argc, const char *const *argv);
1318 void Get_Colours (); 1411 void Get_Colours ();
1319 void get_ourmods (); 1412 void get_ourmods ();
1320 // main.C 1413 // main.C
1414 void tt_winch ();
1415 rxvt_term ();
1416 ~rxvt_term ();
1417 void destroy ();
1418 void emergency_cleanup ();
1419 void init (int argc, const char *const *argv, stringvec *envv);
1420 void recolour_cursor ();
1421 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1422 void window_calc (unsigned int newwidth, unsigned int newheight);
1321 bool set_fonts (); 1423 bool set_fonts ();
1322 void set_string_property (Atom prop, const char *str, int len = -1); 1424 void set_string_property (Atom prop, const char *str, int len = -1);
1323 void set_utf8_property (Atom prop, const char *str, int len = -1); 1425 void set_utf8_property (Atom prop, const char *str, int len = -1);
1324 void set_title (const char *str); 1426 void set_title (const char *str);
1325 void set_icon_name (const char *str); 1427 void set_icon_name (const char *str);
1326 void set_window_color (int idx, const char *color); 1428 void set_window_color (int idx, const char *color);
1327 void set_colorfgbg (); 1429 void set_colorfgbg ();
1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1430 bool set_color (rxvt_color &color, const char *name);
1431 void alias_color (int dst, int src);
1329 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1432 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1433 void get_window_origin (int &x, int &y);
1434 Pixmap get_pixmap_property (int prop_id);
1330 1435
1331 // screen.C 1436 // screen.C
1332 1437
1333 void lalloc (line_t &l) const NOTHROW 1438 void lalloc (line_t &l) const
1334 { 1439 {
1335 l.t = (text_t *)talloc->alloc (); 1440 l.t = (text_t *)talloc->alloc ();
1336 l.r = (rend_t *)ralloc->alloc (); 1441 l.r = (rend_t *)ralloc->alloc ();
1337 } 1442 }
1338 1443
1342 talloc->free (l.t); 1447 talloc->free (l.t);
1343 ralloc->free (l.r); 1448 ralloc->free (l.r);
1344 } 1449 }
1345#endif 1450#endif
1346 1451
1347 void lresize (line_t &l) const NOTHROW 1452 void lresize (line_t &l) const
1348 { 1453 {
1349 if (!l.t) 1454 if (!l.t)
1350 return; 1455 return;
1351 1456
1352 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1457 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1362 { 1467 {
1363 int base = GET_BASEFG (r); 1468 int base = GET_BASEFG (r);
1364#ifndef NO_BRIGHTCOLOR 1469#ifndef NO_BRIGHTCOLOR
1365 if (r & RS_Bold 1470 if (r & RS_Bold
1366# if ENABLE_STYLES 1471# if ENABLE_STYLES
1367 && OPTION (Opt_intensityStyles) 1472 && option (Opt_intensityStyles)
1368# endif 1473# endif
1369 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1474 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1370 base += minBrightCOLOR - minCOLOR; 1475 base += minBrightCOLOR - minCOLOR;
1371#endif 1476#endif
1372 return base; 1477 return base;
1376 { 1481 {
1377 int base = GET_BASEBG (r); 1482 int base = GET_BASEBG (r);
1378#ifndef NO_BRIGHTCOLOR 1483#ifndef NO_BRIGHTCOLOR
1379 if (r & RS_Blink 1484 if (r & RS_Blink
1380# if ENABLE_STYLES 1485# if ENABLE_STYLES
1381 && OPTION (Opt_intensityStyles) 1486 && option (Opt_intensityStyles)
1382# endif 1487# endif
1383 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1488 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1384 base += minBrightCOLOR - minCOLOR; 1489 base += minBrightCOLOR - minCOLOR;
1385#endif 1490#endif
1386 return base; 1491 return base;
1387 } 1492 }
1388 1493
1389 bool option (uint32_t opt) const NOTHROW 1494 bool option (uint8_t opt) const NOTHROW
1390 { 1495 {
1391 return OPTION (opt); 1496 if (!opt)
1497 return 0;
1498
1499 --opt;
1500 return options[opt >> 3] & (1 << (opt & 7));
1392 } 1501 }
1393 1502
1394 void set_option (uint32_t opt, bool set) NOTHROW 1503 void set_option (uint8_t opt, bool set = true) NOTHROW
1504 {
1505 if (!opt)
1506 return;
1507
1508 --opt;
1509 if (set)
1510 options[opt >> 3] |= (1 << (opt & 7));
1511 else
1512 options[opt >> 3] &= ~(1 << (opt & 7));
1513 }
1514
1515 void PrivMode (int set, unsigned bit) NOTHROW
1395 { 1516 {
1396 if (set) 1517 if (set)
1397 options |= opt; 1518 priv_modes |= bit;
1398 else 1519 else
1399 options &= ~opt; 1520 priv_modes &= ~bit;
1400 } 1521 }
1401 1522
1523 // modifies first argument(!)
1524 void paste (char *data, unsigned int len) NOTHROW;
1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1525 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1526 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1404 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1527 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1405 void scr_reset (); 1528 void scr_reset ();
1406 void scr_release () NOTHROW; 1529 void scr_release () NOTHROW;
1413 void scr_backindex () NOTHROW; 1536 void scr_backindex () NOTHROW;
1414 void scr_forwardindex () NOTHROW; 1537 void scr_forwardindex () NOTHROW;
1415#endif 1538#endif
1416 void scr_touch (bool refresh) NOTHROW; 1539 void scr_touch (bool refresh) NOTHROW;
1417 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1540 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1418 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1419 void scr_recolour () NOTHROW; 1541 void scr_recolour () NOTHROW;
1420 void scr_remap_chars () NOTHROW; 1542 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1543 void scr_remap_chars (line_t &l) NOTHROW;
1422 1544
1423 enum cursor_mode { SAVE, RESTORE }; 1545 enum cursor_mode { SAVE, RESTORE };
1424 1546
1425 void scr_poweron () NOTHROW; 1547 void scr_poweron ();
1426 void scr_cursor (cursor_mode mode) NOTHROW; 1548 void scr_cursor (cursor_mode mode) NOTHROW;
1427 void scr_do_wrap () NOTHROW; 1549 void scr_do_wrap () NOTHROW;
1550 void scr_swap_screen () NOTHROW;
1428 int scr_change_screen (int scrn) NOTHROW; 1551 void scr_change_screen (int scrn);
1429 void scr_color (unsigned int color, int fgbg) NOTHROW; 1552 void scr_color (unsigned int color, int fgbg) NOTHROW;
1430 void scr_rendition (int set, int style) NOTHROW; 1553 void scr_rendition (int set, int style) NOTHROW;
1431 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1554 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1432 void scr_backspace () NOTHROW; 1555 void scr_backspace () NOTHROW;
1433 void scr_tab (int count, bool ht = false) NOTHROW; 1556 void scr_tab (int count, bool ht = false) NOTHROW;
1473 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1596 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1474 void selection_click (int clicks, int x, int y) NOTHROW; 1597 void selection_click (int clicks, int x, int y) NOTHROW;
1475 void selection_extend (int x, int y, int flag) NOTHROW; 1598 void selection_extend (int x, int y, int flag) NOTHROW;
1476 void selection_rotate (int x, int y) NOTHROW; 1599 void selection_rotate (int x, int y) NOTHROW;
1477 1600
1478 void pixel_position (int *x, int *y) NOTHROW;
1479
1480#if defined(NEXT_SCROLLBAR) 1601#if defined(NEXT_SCROLLBAR)
1481 // scrollbar-next.C 1602 // scrollbar-next.C
1482 Pixmap renderPixmap (const char *const *data, int width, int height); 1603 Pixmap renderPixmap (const char *const *data, int width, int height);
1483 void init_scrollbar_stuff (); 1604 void init_scrollbar_stuff ();
1484 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1605 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1499 // scrollbar-plain.C 1620 // scrollbar-plain.C
1500 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); 1621 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1501#endif 1622#endif
1502 1623
1503 // scrollbar.C 1624 // scrollbar.C
1625 void resize_scrollbar ();
1504 int scrollbar_mapping (int map); 1626 int scrollbar_mapping (int map);
1505 int scrollbar_show (int update); 1627 int scrollbar_show (int update);
1506 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); 1628 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1507 1629
1508 // xdefaults.C 1630 // xdefaults.C
1509 void get_options (int argc, const char *const *argv); 1631 void get_options (int argc, const char *const *argv);
1510 int parse_keysym (const char *str, const char *arg); 1632 int parse_keysym (const char *str, const char *arg);
1511 void get_xdefaults (FILE *stream, const char *name); 1633 const char *x_resource (const char *name);
1512 void extract_resources (); 1634 void extract_resources ();
1513 // xpm.C
1514 int scale_pixmap (const char *geom);
1515 void resize_pixmap ();
1516 Pixmap set_bgPixmap (const char *file);
1517}; 1635};
1518 1636
1519/* 1637#endif /* _RXVT_H_ */
1520 *****************************************************************************
1521 * PROTOTYPES
1522 *****************************************************************************
1523 */
1524#ifdef PROTOTYPES
1525# define __PROTO(p) p
1526#else
1527# define __PROTO(p) ()
1528#endif
1529 1638
1530#ifdef DEBUG_malloc
1531# include "dmalloc.h" /* This comes last */
1532#endif
1533
1534#endif /* _RXVT_H_ */
1535

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines