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.208 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.327 by ayin, Fri Nov 30 01:26: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 CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
23# define BUILTIN_GLYPHS 1
21#else 24#else
22# define ENABLE_MINIMAL 1 25# define ENABLE_MINIMAL 1
23#endif 26#endif
24 27
25#include <limits.h> 28#include <limits.h>
26 29
27#include <X11/cursorfont.h> 30#include <X11/cursorfont.h>
28#include <X11/keysym.h> 31#include <X11/keysym.h>
29#include <X11/keysymdef.h> 32#include <X11/keysymdef.h>
30#include <X11/Xatom.h> 33#include <X11/Xatom.h>
31#if ENABLE_FRILLS
32# include <X11/Xmd.h>
33#endif
34 34
35#include "encoding.h" 35#include "encoding.h"
36#include "rxvtutil.h"
36#include "rxvtfont.h" 37#include "rxvtfont.h"
37#include "rxvttoolkit.h" 38#include "rxvttoolkit.h"
38#include "iom.h" 39#include "ev_cpp.h"
39#include "salloc.h" 40#include "salloc.h"
41#include "libptytty.h"
40 42
41#include "rxvtperl.h" 43#include "rxvtperl.h"
42 44
43// try to avoid some macros to decrease code size, on some systems 45// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 46#if ENABLE_MINIMAL
… …
66 68
67#ifndef HAVE_XPOINTER 69#ifndef HAVE_XPOINTER
68typedef char *XPointer; 70typedef char *XPointer;
69#endif 71#endif
70 72
71#ifdef HAVE_TERMIOS_H
72# include <termios.h> 73#include <termios.h>
73typedef struct termios ttymode_t; 74typedef struct termios ttymode_t;
74#else
75# include <sgtty.h>
76typedef struct {
77 struct sgttyb sg;
78 struct tchars tc;
79 struct ltchars lc;
80 int line;
81 int local;
82} ttymode_t;
83#endif
84 75
85#ifdef XPM_BACKGROUND 76#include "background.h"
86# ifdef XPM_INC_X11
87# include <X11/xpm.h>
88# else
89# include <xpm.h>
90# endif
91#endif
92 77
93#ifndef STDIN_FILENO 78#ifndef STDIN_FILENO
94# define STDIN_FILENO 0 79# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 80# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 81# define STDERR_FILENO 2
97#endif 82#endif
98 83
84/****************************************************************************/
85
86// exception thrown on fatal (per-instance) errors
87class rxvt_failure_exception { };
88
89// exception thrown when the command parser runs out of input data
90class out_of_input { };
91
99/* 92/*
100 ***************************************************************************** 93 *****************************************************************************
101 * PROTOTYPES 94 * PROTOTYPES
102 ***************************************************************************** 95 *****************************************************************************
103 */ 96 */
104// main.C 97// main.C
105RETSIGTYPE rxvt_Child_signal (int sig);
106RETSIGTYPE rxvt_Exit_signal (int sig);
107void rxvt_clean_exit ();
108void * rxvt_malloc (size_t size); 98void * rxvt_malloc (size_t size);
109void * rxvt_calloc (size_t number, size_t size); 99void * rxvt_calloc (size_t number, size_t size);
110void * rxvt_realloc (void *ptr, size_t size); 100void * rxvt_realloc (void *ptr, size_t size);
111void rxvt_privileges (rxvt_privaction action);
112 101
113// util.C 102// misc.C
114char * rxvt_wcstombs (const wchar_t *str, int len = -1); 103char * rxvt_wcstombs (const wchar_t *str, int len = -1);
115wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 104wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
116char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 105char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
117wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 106wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
118char * rxvt_strdup (const char *str);
119 107
120// misc.C
121char * rxvt_r_basename (const char *str); 108char * rxvt_basename (const char *str) NOTHROW;
122void rxvt_vlog (const char *fmt, va_list arg_ptr); 109void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
123void rxvt_log (const char *fmt,...); 110void rxvt_log (const char *fmt,...) NOTHROW;
124void rxvt_warn (const char *fmt,...); 111void rxvt_warn (const char *fmt,...) NOTHROW;
125void rxvt_fatal (const char *fmt,...); 112void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
126void rxvt_exit_failure (); 113void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
127int rxvt_Str_match (const char *s1, const char *s2); 114
128const char * rxvt_Str_skip_space (const char *str);
129char * rxvt_Str_trim (char *str); 115char * rxvt_strtrim (char *str) NOTHROW;
130int rxvt_Str_escaped (char *str);
131char ** rxvt_splitcommastring (const char *cs); 116char ** rxvt_splitcommastring (const char *cs) NOTHROW;
132void rxvt_freecommastring (char **cs); 117void rxvt_freecommastring (char **cs) NOTHROW;
133char * rxvt_File_find (const char *file, const char *ext, const char *path);
134void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
135void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
136void rxvt_usleep (int usecs);
137 118
138///////////////////////////////////////////////////////////////////////////// 119/////////////////////////////////////////////////////////////////////////////
139 120
140// temporarily replace the process environment 121// temporarily replace the process environment
141extern char **environ; 122extern char **environ;
142extern char **rxvt_environ; // the original environ pointer 123extern char **rxvt_environ; // the original environ pointer
143 124
144inline void set_environ (stringvec *envv) 125static inline void set_environ (stringvec *envv)
145{ 126{
127#if ENABLE_PERL
128 assert (envv);
129#else
146 if (envv) 130 if (envv)
131#endif
147 environ = (char **)envv->begin (); 132 environ = (char **)envv->begin ();
148} 133}
149 134
150inline void set_environ (char **envv) 135static inline void set_environ (char **envv)
151{ 136{
137#if ENABLE_PERL
138 assert (envv);
139#else
152 if (envv) 140 if (envv)
141#endif
153 environ = envv; 142 environ = envv;
154} 143}
155 144
156/* 145/*
157 ***************************************************************************** 146 *****************************************************************************
158 * STRUCTURES AND TYPEDEFS 147 * STRUCTURES AND TYPEDEFS
159 ***************************************************************************** 148 *****************************************************************************
160 */ 149 */
161struct grwin_t; 150struct grwin_t;
162 151
163/* If we're using either the rxvt scrollbar or menu bars, keep the 152/* If we're using either the rxvt scrollbar, keep the
164 * scrollColor resource. 153 * scrollColor resource.
165 */ 154 */
166#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 155#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
167# define KEEP_SCROLLCOLOR 1 156# define KEEP_SCROLLCOLOR 1
168#else 157#else
169# undef KEEP_SCROLLCOLOR 158# undef KEEP_SCROLLCOLOR
170#endif
171
172#ifdef XPM_BACKGROUND
173typedef struct {
174 short w, h, x, y;
175 Pixmap pixmap;
176} bgPixmap_t;
177#endif 159#endif
178 160
179/* 161/*
180 * the 'essential' information for reporting Mouse Events 162 * the 'essential' information for reporting Mouse Events
181 * pared down from XButtonEvent 163 * pared down from XButtonEvent
… …
185 Time time; /* milliseconds */ 167 Time time; /* milliseconds */
186 unsigned int state; /* key or button mask */ 168 unsigned int state; /* key or button mask */
187 unsigned int button; /* detail */ 169 unsigned int button; /* detail */
188}; 170};
189 171
190#if ENABLE_FRILLS
191typedef struct _mwmhints {
192 CARD32 flags;
193 CARD32 functions;
194 CARD32 decorations;
195 INT32 input_mode;
196 CARD32 status;
197} MWMHints;
198#endif
199
200#if ENABLE_XEMBED 172#if ENABLE_XEMBED
201// XEMBED messages 173// XEMBED messages
202# define XEMBED_EMBEDDED_NOTIFY 0 174# define XEMBED_EMBEDDED_NOTIFY 0
203# define XEMBED_WINDOW_ACTIVATE 1 175# define XEMBED_WINDOW_ACTIVATE 1
204# define XEMBED_WINDOW_DEACTIVATE 2 176# define XEMBED_WINDOW_DEACTIVATE 2
205# define XEMBED_REQUEST_FOCUS 3 177# define XEMBED_REQUEST_FOCUS 3
206# define XEMBED_FOCUS_IN 4 178# define XEMBED_FOCUS_IN 4
207# define XEMBED_FOCUS_OUT 5 179# define XEMBED_FOCUS_OUT 5
208# define XEMBED_FOCUS_NEXT 6 180# define XEMBED_FOCUS_NEXT 6
209# define XEMBED_FOCUS_PREV 7 181# define XEMBED_FOCUS_PREV 7
210 182
211# define XEMBED_MODALITY_ON 10 183# define XEMBED_MODALITY_ON 10
212# define XEMBED_MODALITY_OFF 11 184# define XEMBED_MODALITY_OFF 11
213# define XEMBED_REGISTER_ACCELERATOR 12 185# define XEMBED_REGISTER_ACCELERATOR 12
214# define XEMBED_UNREGISTER_ACCELERATOR 13 186# define XEMBED_UNREGISTER_ACCELERATOR 13
215# define XEMBED_ACTIVATE_ACCELERATOR 14 187# define XEMBED_ACTIVATE_ACCELERATOR 14
216 188
217// XEMBED detail code 189// XEMBED detail code
218# define XEMBED_FOCUS_CURRENT 0 190# define XEMBED_FOCUS_CURRENT 0
219# define XEMBED_FOCUS_FIRST 1 191# define XEMBED_FOCUS_FIRST 1
220# define XEMBED_FOCUS_LAST 2 192# define XEMBED_FOCUS_LAST 2
221 193
222# define XEMBED_MAPPED (1 << 0) 194# define XEMBED_MAPPED (1 << 0)
223#endif 195#endif
224 196
… …
228 ***************************************************************************** 200 *****************************************************************************
229 */ 201 */
230 202
231/* COLORTERM, TERM environment variables */ 203/* COLORTERM, TERM environment variables */
232#define COLORTERMENV "rxvt" 204#define COLORTERMENV "rxvt"
233#ifdef XPM_BACKGROUND 205#ifdef BG_IMAGE_FROM_FILE
234# define COLORTERMENVFULL COLORTERMENV "-xpm" 206# define COLORTERMENVFULL COLORTERMENV "-xpm"
235#else 207#else
236# define COLORTERMENVFULL COLORTERMENV 208# define COLORTERMENVFULL COLORTERMENV
237#endif 209#endif
238#ifndef TERMENV 210#ifndef TERMENV
… …
256 228
257#define scrollBar_esc 30 229#define scrollBar_esc 30
258 230
259#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 231#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
260# define HAVE_SCROLLBARS 1 232# define HAVE_SCROLLBARS 1
261#endif
262
263/* width of scrollBar shadow, must be 1 or 2 */
264#ifdef HALFSHADOW
265# define MENU_SHADOW 1
266#else
267# define MENU_SHADOW 2
268#endif 233#endif
269 234
270#define R_SB_ALIGN_CENTRE 0 235#define R_SB_ALIGN_CENTRE 0
271#define R_SB_ALIGN_TOP 1 236#define R_SB_ALIGN_TOP 1
272#define R_SB_ALIGN_BOTTOM 2 237#define R_SB_ALIGN_BOTTOM 2
… …
345 * | 310 * |
346 * +---< SB_WIDTH_NEXT 311 * +---< SB_WIDTH_NEXT
347 */ 312 */
348 313
349enum { 314enum {
350 NO_REFRESH = 0 , /* Window not visible at all! */ 315 NO_REFRESH = 0, /* Window not visible at all! */
351 FAST_REFRESH = 1<<0, /* Fully exposed window */ 316 FAST_REFRESH = 1, /* Fully exposed window */
352 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 317 SLOW_REFRESH = 2, /* Partially exposed window */
353 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
354}; 318};
355 319
356#ifdef NO_SECONDARY_SCREEN 320#ifdef NO_SECONDARY_SCREEN
357# define NSCREENS 0 321# define NSCREENS 0
358#else 322#else
… …
402 366
403// fake styles 367// fake styles
404#define RS_Blink 0x00010000UL // blink 368#define RS_Blink 0x00010000UL // blink
405#define RS_RVid 0x00020000UL // reverse video 369#define RS_RVid 0x00020000UL // reverse video
406#define RS_Uline 0x00040000UL // underline 370#define RS_Uline 0x00040000UL // underline
371
372// toggle this to force redraw, must be != RS_Careful
373#define RS_redraw 0x01000000UL
407 374
408// 5 custom bits for extensions 375// 5 custom bits for extensions
409#define RS_customCount 32 376#define RS_customCount 32
410#define RS_customMask 0x00f80000UL 377#define RS_customMask 0x00f80000UL
411#define RS_customShift 19 378#define RS_customShift 19
… …
442 C0_NUL = 0x00, 409 C0_NUL = 0x00,
443 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 410 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
444 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 411 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
445 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 412 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
446 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, 413 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
447}; 414};
448#define CHAR_ST 0x9c /* 0234 */ 415#define CHAR_ST 0x9c /* 0234 */
449 416
450/* 417/*
451 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 418 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
452 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 419 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
… …
481 Rxvt_restoreFG = 39, // change default fg color 448 Rxvt_restoreFG = 39, // change default fg color
482 Rxvt_restoreBG = 49, // change default bg color 449 Rxvt_restoreBG = 49, // change default bg color
483 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 450 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
484 451
485 URxvt_locale = 701, // change locale 452 URxvt_locale = 701, // change locale
486 URxvt_Menu = 703, // set menu item 453 URxvt_version = 702, // request version
454
487 URxvt_Color_IT = 704, // change actual 'Italic' colour 455 URxvt_Color_IT = 704, // change actual 'Italic' colour
488 URxvt_Color_tint = 705, // change actual tint colour 456 URxvt_Color_tint = 705, // change actual tint colour
489 URxvt_Color_BD = 706, 457 URxvt_Color_BD = 706,
490 URxvt_Color_UL = 707, 458 URxvt_Color_UL = 707,
491 459
… …
506 * on the unnecessary items, e.g. Color_pointer, but won't bother 474 * on the unnecessary items, e.g. Color_pointer, but won't bother
507 * until we need to. Also, be aware of usage in pixcolor_set 475 * until we need to. Also, be aware of usage in pixcolor_set
508 */ 476 */
509 477
510enum colour_list { 478enum colour_list {
479 Color_none = -2,
480 Color_transparent = -1,
511 Color_fg = 0, 481 Color_fg = 0,
512 Color_bg, 482 Color_bg,
513 minCOLOR, /* 2 */ 483 minCOLOR, /* 2 */
514 Color_Black = minCOLOR, 484 Color_Black = minCOLOR,
515 Color_Red3, 485 Color_Red3,
… …
557#endif 527#endif
558#ifdef KEEP_SCROLLCOLOR 528#ifdef KEEP_SCROLLCOLOR
559 Color_scroll, 529 Color_scroll,
560 Color_trough, 530 Color_trough,
561#endif 531#endif
562#if TINTING 532#if ENABLE_TRANSPARENCY
563 Color_tint, 533 Color_tint,
564#endif 534#endif
565#if OFF_FOCUS_FADING 535#if OFF_FOCUS_FADING
566 Color_fade, 536 Color_fade,
567#endif 537#endif
… …
574 TOTAL_COLORS = NRS_COLORS 544 TOTAL_COLORS = NRS_COLORS
575#endif 545#endif
576}; 546};
577 547
578#define Color_Bits 7 // 0 .. maxTermCOLOR 548#define Color_Bits 7 // 0 .. maxTermCOLOR
579
580#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
581#define NPIXCLR_BITS 32
582 549
583/* 550/*
584 * Resource list 551 * Resource list
585 */ 552 */
586enum { 553enum {
… …
588# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 555# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
589# include "rsinc.h" 556# include "rsinc.h"
590# undef def 557# undef def
591# undef reserve 558# undef reserve
592 NUM_RESOURCES 559 NUM_RESOURCES
593};
594
595// see init.C:xa_names, which must be kept in sync
596enum {
597 XA_TEXT = 0,
598 XA_COMPOUND_TEXT,
599 XA_UTF8_STRING,
600 XA_MULTIPLE,
601 XA_TARGETS,
602 XA_TIMESTAMP,
603 XA_VT_SELECTION,
604 XA_INCR,
605 XA_WM_PROTOCOLS,
606 XA_WM_DELETE_WINDOW,
607 XA_CLIPBOARD,
608#if ENABLE_FRILLS
609 XA_MOTIF_WM_HINTS,
610#endif
611#if ENABLE_EWMH
612 XA_NET_WM_PID,
613 XA_NET_WM_NAME,
614 XA_NET_WM_ICON_NAME,
615 XA_NET_WM_PING,
616#endif
617#if USE_XIM
618 XA_WM_LOCALE_NAME,
619#endif
620#if TRANSPARENT
621 XA_XROOTPMAP_ID,
622 XA_ESETROOT_PMAP_ID,
623#endif
624#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
625 XA_DNDPROTOCOL,
626 XA_DNDSELECTION,
627#endif
628#if ENABLE_XEMBED
629 XA_XEMBED,
630 XA_XEMBED_INFO,
631#endif
632 NUM_XA
633}; 560};
634 561
635/* DEC private modes */ 562/* DEC private modes */
636#define PrivMode_132 (1UL<<0) 563#define PrivMode_132 (1UL<<0)
637#define PrivMode_132OK (1UL<<1) 564#define PrivMode_132OK (1UL<<1)
… …
651#define PrivMode_TtyOutputInh (1UL<<15) 578#define PrivMode_TtyOutputInh (1UL<<15)
652#define PrivMode_Keypress (1UL<<16) 579#define PrivMode_Keypress (1UL<<16)
653#define PrivMode_smoothScroll (1UL<<17) 580#define PrivMode_smoothScroll (1UL<<17)
654#define PrivMode_vt52 (1UL<<18) 581#define PrivMode_vt52 (1UL<<18)
655#define PrivMode_LFNL (1UL<<19) 582#define PrivMode_LFNL (1UL<<19)
583#define PrivMode_MouseBtnEvent (1UL<<20)
584#define PrivMode_MouseAnyEvent (1UL<<21)
656/* too annoying to implement X11 highlight tracking */ 585/* too annoying to implement X11 highlight tracking */
657/* #define PrivMode_MouseX11Track (1LU<<20) */ 586/* #define PrivMode_MouseX11Track (1LU<<20) */
658 587
659#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 588#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
660#define PrivMode(test,bit) \
661 if (test) \
662 priv_modes |= (bit); \
663 else \
664 priv_modes &= ~(bit)
665 589
666#ifdef ALLOW_132_MODE 590#ifdef ALLOW_132_MODE
667# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 591# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
668#else 592#else
669# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 593# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
675#define CBUFSIZ 2048 // size of command buffer 599#define CBUFSIZ 2048 // size of command buffer
676#define UBUFSIZ 2048 // character buffer 600#define UBUFSIZ 2048 // character buffer
677 601
678#ifndef PATH_MAX 602#ifndef PATH_MAX
679# define PATH_MAX 16384 603# define PATH_MAX 16384
604#endif
605
606#if ENABLE_FRILLS
607# include <X11/Xmd.h>
608typedef struct _mwmhints {
609 CARD32 flags;
610 CARD32 functions;
611 CARD32 decorations;
612 INT32 input_mode;
613 CARD32 status;
614} MWMHints;
680#endif 615#endif
681 616
682/* Motif window hints */ 617/* Motif window hints */
683#define MWM_HINTS_FUNCTIONS (1L << 0) 618#define MWM_HINTS_FUNCTIONS (1L << 0)
684#define MWM_HINTS_DECORATIONS (1L << 1) 619#define MWM_HINTS_DECORATIONS (1L << 1)
… …
709/* 644/*
710 ***************************************************************************** 645 *****************************************************************************
711 * MACRO DEFINES 646 * MACRO DEFINES
712 ***************************************************************************** 647 *****************************************************************************
713 */ 648 */
714#define dDisp Display *disp = display->display 649#define dLocal(type,name) type const name = this->name
650
651// for speed reasons, we assume that all codepoints 32 to 126 are
652// single-width.
653#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
715 654
716/* convert pixel dimensions to row/column values. Everything as int32_t */ 655/* convert pixel dimensions to row/column values. Everything as int32_t */
717#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 656#define Pixel2Col(x) Pixel2Width((int32_t)(x))
718#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 657#define Pixel2Row(y) Pixel2Height((int32_t)(y))
719#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 658#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
721#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 660#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
722#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 661#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
723#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 662#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
724#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 663#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
725 664
726#define OPTION(opt) (options & (opt))
727#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
728 | Opt_jumpScroll | Opt_secondaryScreen \
729 | Opt_pastableTabs | Opt_intensityStyles)
730
731// for m >= -n, ensure remainder lies between 0..n-1 665// for m >= -n, ensure remainder lies between 0..n-1
732#define MOD(m,n) (((m) + (n)) % (n)) 666#define MOD(m,n) (((m) + (n)) % (n))
733 667
734#define LINENO(n) MOD (term_start + int(n), total_rows) 668#define LINENO(n) MOD (term_start + int(n), total_rows)
735#define ROW(n) row_buf [LINENO (n)] 669#define ROW(n) row_buf [LINENO (n)]
… …
753#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 687#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
754#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 688#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
755 689
756#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 690#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
757 691
758#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 692#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
759#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 693#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
760 694
761#if ENABLE_STYLES 695#if ENABLE_STYLES
762# define FONTSET(style) fontset[GET_STYLE (style)] 696# define FONTSET(style) fontset[GET_STYLE (style)]
763#else 697#else
764# define FONTSET(style) fontset[0] 698# define FONTSET(style) fontset[0]
… …
792#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 726#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
793#define scrollbar_position(y) ((y) - scrollBar.beg) 727#define scrollbar_position(y) ((y) - scrollBar.beg)
794#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 728#define scrollbar_size() (scrollBar.end - scrollBar.beg \
795 - scrollbar_minheight ()) 729 - scrollbar_minheight ())
796 730
797#ifdef XPM_BACKGROUND
798# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
799#else
800# define XPMClearArea(a, b, c, d, e, f, g)
801#endif
802
803#ifdef UTMP_SUPPORT
804# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
805# undef HAVE_UTMPX_H
806# undef HAVE_STRUCT_UTMPX
807# endif
808# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
809# undef HAVE_UTMP_H
810# undef HAVE_STRUCT_UTMP
811# endif
812
813# ifdef HAVE_UTMPX_H
814# include <utmpx.h>
815# endif
816# ifdef HAVE_UTMP_H
817# include <utmp.h>
818# endif
819#endif
820
821#ifdef DEBUG_CMD
822# define D_CMD(x) fprintf x ; fputc('\n', stderr)
823#else
824# define D_CMD(x)
825#endif
826#ifdef DEBUG_INIT
827# define D_INIT(x) fprintf x ; fputc('\n', stderr)
828#else
829# define D_INIT(x)
830#endif
831#ifdef DEBUG_MAIN
832# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
833#else
834# define D_MAIN(x)
835#endif
836#ifdef DEBUG_SIZE
837# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
838#else
839# define D_SIZE(x)
840#endif
841
842extern class rxvt_failure_exception { } rxvt_failure_exception;
843
844typedef callback1<void, const char *> log_callback; 731typedef callback<void (const char *)> log_callback;
845typedef callback1<int, int> getfd_callback; 732typedef callback<int (int)> getfd_callback;
846
847extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
848extern void rxvt_log (const char *fmt, ...);
849extern void rxvt_warn (const char *fmt, ...);
850extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
851extern void rxvt_exit_failure () __attribute__ ((noreturn));
852 733
853#define SET_LOCALE(locale) rxvt_set_locale (locale) 734#define SET_LOCALE(locale) rxvt_set_locale (locale)
854extern bool rxvt_set_locale (const char *locale); 735extern bool rxvt_set_locale (const char *locale) NOTHROW;
855extern void rxvt_push_locale (const char *locale); 736extern void rxvt_push_locale (const char *locale) NOTHROW;
856extern void rxvt_pop_locale (); 737extern void rxvt_pop_locale () NOTHROW;
857
858/****************************************************************************/
859
860#define BLINK_INTERVAL 0.5
861#define TEXT_BLINK_INTERVAL 0.5
862
863#ifndef __attribute__
864# ifdef __GNUC__
865# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
866# define __attribute__(x)
867# endif
868# endif
869# define __attribute__(x)
870#endif
871 738
872/****************************************************************************/ 739/****************************************************************************/
873 740
874#define LINE_LONGER 0x0001 // line is continued on the next row 741#define LINE_LONGER 0x0001 // line is continued on the next row
875#define LINE_FILTERED 0x0002 // line has been filtered 742#define LINE_FILTERED 0x0002 // line has been filtered
876#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 743#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
744#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
745#define LINE_BIDI 0x0010 // line needs bidi (NYI)
877 746
878struct line_t { 747struct line_t {
879 text_t *t; // terminal the text 748 text_t *t; // terminal the text
880 rend_t *r; // rendition, uses RS_ flags 749 rend_t *r; // rendition, uses RS_ flags
881 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 750 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
916 } 785 }
917}; 786};
918 787
919/****************************************************************************/ 788/****************************************************************************/
920 789
921// primivite wrapper around mbstate_t to ensure initialisation 790// primitive wrapper around mbstate_t to ensure initialisation
922struct mbstate { 791struct mbstate {
923 mbstate_t mbs; 792 mbstate_t mbs;
924 793
925 operator mbstate_t *() { return &mbs; } 794 operator mbstate_t *() { return &mbs; }
926 void reset () { memset (&mbs, 0, sizeof (mbs)); } 795 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
935# define COMPOSE_LO 0x40000000UL 804# define COMPOSE_LO 0x40000000UL
936# define COMPOSE_HI 0x400fffffUL 805# define COMPOSE_HI 0x400fffffUL
937# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 806# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
938#else 807#else
939# if ENABLE_PERL 808# if ENABLE_PERL
940# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 809# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
941# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 810# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
942# else 811# else
943# define COMPOSE_LO 0xd800UL 812# define COMPOSE_LO 0xd800UL
944# define COMPOSE_HI 0xf8ffUL 813# define COMPOSE_HI 0xf8ffUL
945# endif 814# endif
… …
974#endif 843#endif
975 844
976/****************************************************************************/ 845/****************************************************************************/
977 846
978#ifdef KEYSYM_RESOURCE 847#ifdef KEYSYM_RESOURCE
979 class keyboard_manager; 848class keyboard_manager;
980#endif 849#endif
981 850
982struct rxvt_term : zero_initialized, rxvt_vars { 851struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
852
853 // special markers with magic addresses
854 static const char resval_undef []; // options specifically unset
855 static const char resval_on []; // boolean options switched on
856 static const char resval_off []; // or off
857
983 log_callback *log_hook; // log error messages through this hook, if != 0 858 log_callback *log_hook; // log error messages through this hook, if != 0
984 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 859 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
985#if ENABLE_PERL 860#if ENABLE_PERL
986 rxvt_perl_term perl; 861 rxvt_perl_term perl;
987#endif 862#endif
988 struct mbstate mbstate; // current input multibyte state 863 struct mbstate mbstate; // current input multibyte state
989 864
990 unsigned char want_refresh:1, 865 unsigned char want_refresh:1,
991#ifdef TRANSPARENT
992 want_full_refresh:1, /* awaiting full screen refresh */
993#endif
994#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
995 am_transparent:1, /* is a transparent term */
996 am_pixmap_trans:1, /* transparency w/known root pixmap */
997#endif
998 current_screen:1, /* primary or secondary */ 866 current_screen:1, /* primary or secondary */
999 hate_those_clicks:1, /* a.k.a. keep mark position */
1000 num_scr_allow:1, 867 num_scr_allow:1,
1001 bypass_keystate:1, 868 bypass_keystate:1,
1002#ifdef CURSOR_BLINK 869#ifdef CURSOR_BLINK
1003 hidden_cursor:1, 870 hidden_cursor:1,
1004#endif 871#endif
… …
1019#endif 886#endif
1020 scrollbar_align, 887 scrollbar_align,
1021 selection_wait, 888 selection_wait,
1022 selection_type; 889 selection_type;
1023/* ---------- */ 890/* ---------- */
891 bool rvideo_state, rvideo_mode;
892#ifndef NO_BELL
1024 short rvideo; 893 bool rvideo_bell;
894#endif
1025 int num_scr; /* screen: number lines scrolled */ 895 int num_scr; /* screen: number lines scrolled */
1026 int prev_ncol, /* screen: previous number of columns */ 896 int prev_ncol, /* screen: previous number of columns */
1027 prev_nrow; /* screen: previous number of rows */ 897 prev_nrow; /* screen: previous number of rows */
1028/* ---------- */ 898/* ---------- */
1029 rend_t rstyle; 899 rend_t rstyle;
1030/* ---------- */
1031 uint32_t pixcolor_set[NPIXCLR_SETS];
1032/* ---------- */ 900/* ---------- */
1033#ifdef SELECTION_SCROLLING 901#ifdef SELECTION_SCROLLING
1034 int scroll_selection_lines; 902 int scroll_selection_lines;
1035 enum page_dirn scroll_selection_dir; 903 enum page_dirn scroll_selection_dir;
1036 int selection_save_x, 904 int selection_save_x,
… …
1042 /* give proper Scroll behaviour */ 910 /* give proper Scroll behaviour */
1043#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 911#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1044 mouse_slip_wheel_speed, 912 mouse_slip_wheel_speed,
1045#endif 913#endif
1046 refresh_count, 914 refresh_count,
1047 refresh_limit,
1048 last_bot, /* scrollbar last bottom position */ 915 last_bot, /* scrollbar last bottom position */
1049 last_top, /* scrollbar last top position */ 916 last_top, /* scrollbar last top position */
1050 last_state, /* scrollbar last state */ 917 last_state, /* scrollbar last state */
1051 scrollbar_len, 918 scrollbar_len,
1052 window_vt_x, 919 window_vt_x,
1053 window_vt_y, 920 window_vt_y,
1054 window_sb_x, 921 window_sb_x,
922 mouse_row,
923 mouse_col,
1055# ifdef POINTER_BLANK 924# ifdef POINTER_BLANK
1056 pointerBlankDelay, 925 pointerBlankDelay,
1057# endif 926# endif
1058 allowedxerror; 927 allowedxerror;
1059/* ---------- */ 928/* ---------- */
… …
1063 int old_width, /* last used width in screen resize */ 932 int old_width, /* last used width in screen resize */
1064 old_height; /* last used height in screen resize */ 933 old_height; /* last used height in screen resize */
1065 unsigned long priv_modes, 934 unsigned long priv_modes,
1066 SavedModes; 935 SavedModes;
1067/* ---------- */ 936/* ---------- */
1068 Atom xa[NUM_XA]; 937 Atom *xa;
1069/* ---------- */ 938/* ---------- */
1070#ifdef RXVT_SCROLLBAR 939#ifdef RXVT_SCROLLBAR
1071 GC scrollbarGC, 940 GC scrollbarGC,
1072 topShadowGC, 941 topShadowGC,
1073 botShadowGC; 942 botShadowGC;
… …
1098 char * incr_buf; 967 char * incr_buf;
1099 size_t incr_buf_size, incr_buf_fill; 968 size_t incr_buf_size, incr_buf_fill;
1100/* ---------- */ 969/* ---------- */
1101 Cursor leftptr_cursor; 970 Cursor leftptr_cursor;
1102/* ---------- */ 971/* ---------- */
1103#ifndef NO_BACKSPACE_KEY
1104 const char *key_backspace;
1105#endif
1106#ifndef NO_DELETE_KEY
1107 const char *key_delete;
1108#endif
1109 struct mouse_event MEvent; 972 struct mouse_event MEvent;
1110 XComposeStatus compose; 973 XComposeStatus compose;
1111 ttymode_t tio; 974 ttymode_t tio;
1112#ifdef UTMP_SUPPORT
1113# ifdef HAVE_STRUCT_UTMP
1114 struct utmp ut;
1115# endif
1116# ifdef HAVE_STRUCT_UTMPX
1117 struct utmpx utx;
1118# endif
1119# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1120 char ut_id[5];
1121# endif
1122 int utmp_pos;
1123#endif
1124 row_col_t oldcursor; 975 row_col_t oldcursor;
1125#ifdef XPM_BACKGROUND 976#ifdef HAVE_BG_PIXMAP
1126 bgPixmap_t bgPixmap; 977 bgPixmap_t bgPixmap;
1127 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 978#endif
979#ifdef HAVE_AFTERIMAGE
980 ASVisual *asv;
981 ASImageManager *asimman;
1128#endif 982#endif
1129 983
1130#if ENABLE_OVERLAY 984#if ENABLE_OVERLAY
1131 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 985 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1132 text_t **ov_text; 986 text_t **ov_text;
1133 rend_t **ov_rend; 987 rend_t **ov_rend;
1134 988
1135 void scr_swap_overlay (); 989 void scr_swap_overlay () NOTHROW;
1136 void scr_overlay_new (int x, int y, int w, int h); 990 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1137 void scr_overlay_off (); 991 void scr_overlay_off () NOTHROW;
1138 void scr_overlay_set (int x, int y, 992 void scr_overlay_set (int x, int y,
1139 text_t text, 993 text_t text,
1140 rend_t rend = OVERLAY_RSTYLE); 994 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1141 void scr_overlay_set (int x, int y, const char *s); 995 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1142 void scr_overlay_set (int x, int y, const wchar_t *s); 996 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1143#endif 997#endif
1144 998
1145 vector<void *> allocated; // free these memory blocks with free() 999 vector<void *> allocated; // free these memory blocks with free()
1146 1000
1147 char *env_windowid; /* environmental variable WINDOWID */ 1001 char env_windowid[21]; /* environmental variable WINDOWID */
1002 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1148 char *env_display; /* environmental variable DISPLAY */ 1003 char *env_display; /* environmental variable DISPLAY */
1149 char *env_term; /* environmental variable TERM */ 1004 char *env_term; /* environmental variable TERM */
1150 char *env_colorfgbg; 1005
1151 char *locale; 1006 char *locale;
1152 char charsets[4]; 1007 char charsets[4];
1153 char *v_buffer; /* pointer to physical buffer */ 1008 char *v_buffer; /* pointer to physical buffer */
1154 unsigned int v_buflen; /* size of area to write */ 1009 unsigned int v_buflen; /* size of area to write */
1155 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1010 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1156 1011
1157#ifdef KEYSYM_RESOURCE 1012#ifdef KEYSYM_RESOURCE
1158 keyboard_manager *keyboard; 1013 keyboard_manager *keyboard;
1014#endif
1015#ifndef NO_RESOURCES
1016 XrmDatabase option_db;
1159#endif 1017#endif
1160 1018
1161 const char *rs[NUM_RESOURCES]; 1019 const char *rs[NUM_RESOURCES];
1162 /* command input buffering */ 1020 /* command input buffering */
1163 char *cmdbuf_ptr, *cmdbuf_endp; 1021 char *cmdbuf_ptr, *cmdbuf_endp;
1164 char cmdbuf_base[CBUFSIZ]; 1022 char cmdbuf_base[CBUFSIZ];
1023
1024 ptytty *pty;
1165 1025
1166 rxvt_salloc *talloc; // text line allocator 1026 rxvt_salloc *talloc; // text line allocator
1167 rxvt_salloc *ralloc; // rend line allocator 1027 rxvt_salloc *ralloc; // rend line allocator
1168 1028
1169 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1029 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1177 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1037 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1178 void iso14755_54 (int x, int y); 1038 void iso14755_54 (int x, int y);
1179# endif 1039# endif
1180#endif 1040#endif
1181 1041
1182 // modifies first argument(!) 1042 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1183 void paste (char *data, unsigned int len);
1184 1043
1185 long vt_emask, vt_emask_perl;
1186
1187 void vt_select_input () const 1044 void vt_select_input () const NOTHROW
1188 { 1045 {
1189 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1046 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1190 } 1047 }
1191 1048
1192#if TRANSPARENT 1049#if ENABLE_TRANSPARENCY || ENABLE_PERL
1193 void rootwin_cb (XEvent &xev); 1050 void rootwin_cb (XEvent &xev);
1194 xevent_watcher rootwin_ev; 1051 xevent_watcher rootwin_ev;
1195#endif 1052#endif
1053#ifdef HAVE_BG_PIXMAP
1054 int update_background ();
1055#if TRACE_PIXMAPS
1056 int trace_update_background (const char *file, int line);
1057# define update_background() trace_update_background (__FILE__, __LINE__)
1058#endif
1059 void update_background_cb (ev::timer &w, int revents);
1060 ev::timer update_background_ev;
1061#endif
1196 1062
1197 void x_cb (XEvent &xev); 1063 void x_cb (XEvent &xev);
1198 void flush ();
1199 xevent_watcher termwin_ev; 1064 xevent_watcher termwin_ev;
1200 xevent_watcher vt_ev; 1065 xevent_watcher vt_ev;
1201#ifdef HAVE_SCROLLBARS 1066#ifdef HAVE_SCROLLBARS
1202 xevent_watcher scrollbar_ev; 1067 xevent_watcher scrollbar_ev;
1203#endif 1068#endif
1204 1069
1205 void check_cb (check_watcher &w); check_watcher check_ev; 1070 void child_cb (ev::child &w, int revents); ev::child child_ev;
1206 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1071 void prepare_cb (ev::prepare &w, int revents); ev::prepare prepare_ev;
1207 void flush_cb (time_watcher &w); time_watcher flush_ev; 1072 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1208 1073 void flush ();
1209 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1074 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1210 1075 bool pty_fill ();
1211 void incr_cb (time_watcher &w); time_watcher incr_ev; 1076 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1077 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1212 1078
1213#ifdef CURSOR_BLINK 1079#ifdef CURSOR_BLINK
1214 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1080 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1215#endif 1081#endif
1216#ifdef TEXT_BLINK 1082#ifdef TEXT_BLINK
1217 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1083 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1084#endif
1085#ifndef NO_BELL
1086 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1218#endif 1087#endif
1219 1088
1220#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1221 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1090 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1222#endif 1091#endif
1223#ifdef SELECTION_SCROLLING 1092#ifdef SELECTION_SCROLLING
1224 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1093 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1225#endif 1094#endif
1226#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1095#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1227 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1096 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1228#endif 1097#endif
1229 1098
1230#ifdef POINTER_BLANK 1099#ifdef POINTER_BLANK
1231 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1100 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1232 void pointer_blank (); 1101 void pointer_blank ();
1233#endif 1102#endif
1234 void pointer_unblank (); 1103 void pointer_unblank ();
1235 1104
1236 void tt_printf (const char *fmt,...); 1105 void tt_printf (const char *fmt,...);
1237 void tt_write (const char *data, unsigned int len); 1106 void tt_write (const char *data, unsigned int len);
1238 void pty_write (); 1107 void pty_write ();
1239 1108
1240 void tt_winch (); 1109 bool init (stringvec *argv, stringvec *envv)
1241 1110 {
1242 rxvt_term (); 1111 this->argv = argv;
1243 ~rxvt_term (); 1112 return init (argv->size (), argv->begin (), envv);
1244 void child_exit (); // child has exited, usually destroys 1113 }
1245 void destroy ();
1246 void emergency_cleanup ();
1247
1248 bool init (int argc, const char *const *argv);
1249 bool init_vars ();
1250
1251 bool pty_fill ();
1252 1114
1253 void make_current () const // make this the "currently active" urxvt instance 1115 void make_current () const // make this the "currently active" urxvt instance
1254 { 1116 {
1255 SET_R (this); 1117 SET_R (this);
1118 set_environ (envv);
1256 rxvt_set_locale (locale); 1119 rxvt_set_locale (locale);
1257 set_environ (envv);
1258 } 1120 }
1259 1121
1260 void init_secondary ();
1261 const char **init_resources (int argc, const char *const *argv);
1262 const char *x_resource (const char *name);
1263 void init_env ();
1264 void set_locale (const char *locale);
1265 void init_xlocale ();
1266 void init_command (const char *const *argv);
1267 void run_command (const char *const *argv);
1268 int run_child (const char *const *argv);
1269
1270 void color_aliases (int idx);
1271 void recolour_cursor ();
1272 void create_windows (int argc, const char *const *argv);
1273 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1274 void window_calc (unsigned int newwidth, unsigned int newheight);
1275
1276#if USE_XIM 1122#if USE_XIM
1277 rxvt_xim *input_method; 1123 rxvt_xim *input_method;
1278 XIC Input_Context; 1124 XIC Input_Context;
1279 XIMStyle input_style; 1125 XIMStyle input_style;
1280 XPoint spot; // most recently sent spot position 1126 XPoint spot; // most recently sent spot position
1281 1127
1282 void im_destroy (); 1128 void im_destroy ();
1283 void im_cb (); im_watcher im_ev; 1129 void im_cb (); im_watcher im_ev;
1284 void im_set_size (XRectangle &size); 1130 void im_set_size (XRectangle &size);
1285 void im_set_position (XPoint &pos); 1131 void im_set_position (XPoint &pos) NOTHROW;
1286 void im_set_color (unsigned long &fg, unsigned long &bg); 1132 void im_set_color (unsigned long &fg, unsigned long &bg);
1287 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1133 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1288 1134
1289 bool IMisRunning (); 1135 bool IMisRunning ();
1290 void IMSendSpot (); 1136 void IMSendSpot ();
1291 bool IM_get_IC (const char *modifiers); 1137 bool IM_get_IC (const char *modifiers);
1292 void IMSetStatusPosition (); 1138 void IMSetPosition ();
1293#endif 1139#endif
1294
1295 void resize_scrollbar ();
1296
1297 void pixel_position (int *x, int *y);
1298
1299 void selection_click (int clicks, int x, int y);
1300 void selection_extend (int x, int y, int flag);
1301 void selection_rotate (int x, int y);
1302
1303 /* autoconvert */
1304 1140
1305 // command.C 1141 // command.C
1306 void lookup_key (XKeyEvent &ev); 1142 void key_press (XKeyEvent &ev);
1143 void key_release (XKeyEvent &ev);
1307 unsigned int cmd_write (const char *str, unsigned int count); 1144 unsigned int cmd_write (const char *str, unsigned int count);
1308 1145
1309 wchar_t next_char (); 1146 wchar_t next_char () NOTHROW;
1310 wchar_t cmd_getc (); 1147 wchar_t cmd_getc () THROW ((class out_of_input));
1311 uint32_t next_octet (); 1148 uint32_t next_octet () NOTHROW;
1312 uint32_t cmd_get8 (); 1149 uint32_t cmd_get8 () THROW ((class out_of_input));
1313 1150
1314 bool cmd_parse (); 1151 bool cmd_parse ();
1315 void mouse_report (XButtonEvent &ev); 1152 void mouse_report (XButtonEvent &ev);
1316 void button_press (XButtonEvent &ev); 1153 void button_press (XButtonEvent &ev);
1317 void button_release (XButtonEvent &ev); 1154 void button_release (XButtonEvent &ev);
1318 void focus_in (); 1155 void focus_in ();
1319 void focus_out (); 1156 void focus_out ();
1320 int check_our_parents (); 1157 void update_fade_color (unsigned int idx);
1321#ifdef PRINTPIPE 1158#ifdef PRINTPIPE
1322 FILE *popen_printer (); 1159 FILE *popen_printer ();
1323 int pclose_printer (FILE *stream); 1160 int pclose_printer (FILE *stream);
1324#endif 1161#endif
1325 void process_print_pipe (); 1162 void process_print_pipe ();
… …
1336 int privcases (int mode, unsigned long bit); 1173 int privcases (int mode, unsigned long bit);
1337 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1174 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1338 void process_sgr_mode (unsigned int nargs, const int *arg); 1175 void process_sgr_mode (unsigned int nargs, const int *arg);
1339 void process_graphics (); 1176 void process_graphics ();
1340 // init.C 1177 // init.C
1178 bool init_vars ();
1179 void init_secondary ();
1180 const char **init_resources (int argc, const char *const *argv);
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 void color_aliases (int idx);
1188 void create_windows (int argc, const char *const *argv);
1341 void Get_Colours (); 1189 void Get_Colours ();
1342 void get_ourmods (); 1190 void get_ourmods ();
1343 // logging.C
1344 void makeutent (const char *pty, const char *hostname);
1345 void cleanutent ();
1346 // main.C 1191 // main.C
1347 void privileged_utmp (rxvt_privaction action); 1192 void tt_winch ();
1193 rxvt_term ();
1194 ~rxvt_term ();
1195 void destroy ();
1196 void emergency_cleanup ();
1197 bool init (int argc, const char *const *argv, stringvec *envv);
1198 void recolour_cursor ();
1199 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1200 void window_calc (unsigned int newwidth, unsigned int newheight);
1348 bool set_fonts (); 1201 bool set_fonts ();
1349 void set_string_property (Atom prop, const char *str, int len = -1); 1202 void set_string_property (Atom prop, const char *str, int len = -1);
1350 void set_utf8_property (Atom prop, const char *str, int len = -1); 1203 void set_utf8_property (Atom prop, const char *str, int len = -1);
1351 void set_title (const char *str); 1204 void set_title (const char *str);
1352 void set_icon_name (const char *str); 1205 void set_icon_name (const char *str);
1353 void set_window_color (int idx, const char *color); 1206 void set_window_color (int idx, const char *color);
1354 void set_colorfgbg (); 1207 void set_colorfgbg ();
1355 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1208 bool set_color (rxvt_color &color, const char *name);
1209 void alias_color (int dst, int src);
1356 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1210 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1211 void get_window_origin (int &x, int &y);
1212 Pixmap get_pixmap_property (int prop_id);
1357 1213
1358 // screen.C 1214 // screen.C
1359 1215
1360 void lalloc (line_t &l) const 1216 void lalloc (line_t &l) const
1361 { 1217 {
… …
1383 1239
1384 if (ncol > prev_ncol) 1240 if (ncol > prev_ncol)
1385 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1241 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1386 } 1242 }
1387 1243
1388 int fgcolor_of (rend_t r) const 1244 int fgcolor_of (rend_t r) const NOTHROW
1389 { 1245 {
1390 int base = GET_BASEFG (r); 1246 int base = GET_BASEFG (r);
1391#ifndef NO_BRIGHTCOLOR 1247#ifndef NO_BRIGHTCOLOR
1392 if (r & RS_Bold 1248 if (r & RS_Bold
1393# if ENABLE_STYLES 1249# if ENABLE_STYLES
1394 && OPTION (Opt_intensityStyles) 1250 && option (Opt_intensityStyles)
1395# endif 1251# endif
1396 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1252 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1397 base += minBrightCOLOR - minCOLOR; 1253 base += minBrightCOLOR - minCOLOR;
1398#endif 1254#endif
1399 return base; 1255 return base;
1400 } 1256 }
1401 1257
1402 int bgcolor_of (rend_t r) const 1258 int bgcolor_of (rend_t r) const NOTHROW
1403 { 1259 {
1404 int base = GET_BASEBG (r); 1260 int base = GET_BASEBG (r);
1405#ifndef NO_BRIGHTCOLOR 1261#ifndef NO_BRIGHTCOLOR
1406 if (r & RS_Blink 1262 if (r & RS_Blink
1407# if ENABLE_STYLES 1263# if ENABLE_STYLES
1408 && OPTION (Opt_intensityStyles) 1264 && option (Opt_intensityStyles)
1409# endif 1265# endif
1410 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1266 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1411 base += minBrightCOLOR - minCOLOR; 1267 base += minBrightCOLOR - minCOLOR;
1412#endif 1268#endif
1413 return base; 1269 return base;
1414 } 1270 }
1415 1271
1416 bool option (uint32_t opt) const 1272 bool option (uint8_t opt) const NOTHROW
1417 { 1273 {
1418 return OPTION (opt); 1274 if (!opt)
1275 return 0;
1276
1277 --opt;
1278 return options[opt >> 3] & (1 << (opt & 7));
1419 } 1279 }
1420 1280
1421 void set_option (uint32_t opt, bool set) 1281 void set_option (uint8_t opt, bool set = true) NOTHROW
1282 {
1283 if (!opt)
1284 return;
1285
1286 --opt;
1287 if (set)
1288 options[opt >> 3] |= (1 << (opt & 7));
1289 else
1290 options[opt >> 3] &= ~(1 << (opt & 7));
1291 }
1292
1293 void PrivMode (int set, unsigned bit) NOTHROW
1422 { 1294 {
1423 if (set) 1295 if (set)
1424 options |= opt; 1296 priv_modes |= bit;
1425 else 1297 else
1426 options &= ~opt; 1298 priv_modes &= ~bit;
1427 } 1299 }
1428 1300
1301 // modifies first argument(!)
1302 void paste (char *data, unsigned int len) NOTHROW;
1429 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1303 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1430 void scr_blank_screen_mem (line_t &l, rend_t efs) const; 1304 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1431 int scr_scroll_text (int row1, int row2, int count); 1305 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1432 void scr_reset (); 1306 void scr_reset ();
1433 void scr_release (); 1307 void scr_release () NOTHROW;
1434 void scr_clear (bool really = false); 1308 void scr_clear (bool really = false) NOTHROW;
1435 void scr_refresh (unsigned char refresh_type); 1309 void scr_refresh () NOTHROW;
1436 bool scr_refresh_rend (rend_t mask, rend_t value); 1310 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1437 void scr_erase_screen (int mode); 1311 void scr_erase_screen (int mode) NOTHROW;
1438#if ENABLE_FRILLS 1312#if ENABLE_FRILLS
1439 void scr_erase_savelines (); 1313 void scr_erase_savelines () NOTHROW;
1440 void scr_backindex (); 1314 void scr_backindex () NOTHROW;
1441 void scr_forwardindex (); 1315 void scr_forwardindex () NOTHROW;
1442#endif 1316#endif
1443 void scr_touch (bool refresh); 1317 void scr_touch (bool refresh) NOTHROW;
1444 void scr_expose (int x, int y, int width, int height, bool refresh); 1318 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1445 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1446 void scr_recolour (); 1319 void scr_recolour () NOTHROW;
1447 void scr_remap_chars (); 1320 void scr_remap_chars () NOTHROW;
1448 void scr_remap_chars (line_t &l); 1321 void scr_remap_chars (line_t &l) NOTHROW;
1322
1323 enum cursor_mode { SAVE, RESTORE };
1449 1324
1450 void scr_poweron (); 1325 void scr_poweron ();
1451 void scr_cursor (int mode); 1326 void scr_cursor (cursor_mode mode) NOTHROW;
1452 void scr_do_wrap (); 1327 void scr_do_wrap () NOTHROW;
1328 void scr_swap_screen () NOTHROW;
1453 int scr_change_screen (int scrn); 1329 void scr_change_screen (int scrn);
1454 void scr_color (unsigned int color, int fgbg); 1330 void scr_color (unsigned int color, int fgbg) NOTHROW;
1455 void scr_rendition (int set, int style); 1331 void scr_rendition (int set, int style) NOTHROW;
1456 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1332 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1457 void scr_backspace (); 1333 void scr_backspace () NOTHROW;
1458 void scr_tab (int count, bool ht = false); 1334 void scr_tab (int count, bool ht = false) NOTHROW;
1459 void scr_gotorc (int row, int col, int relative); 1335 void scr_gotorc (int row, int col, int relative) NOTHROW;
1460 void scr_index (enum page_dirn direction); 1336 void scr_index (enum page_dirn direction) NOTHROW;
1461 void scr_erase_line (int mode); 1337 void scr_erase_line (int mode) NOTHROW;
1462 void scr_E (); 1338 void scr_E () NOTHROW;
1463 void scr_insdel_lines (int count, int insdel); 1339 void scr_insdel_lines (int count, int insdel) NOTHROW;
1464 void scr_insdel_chars (int count, int insdel); 1340 void scr_insdel_chars (int count, int insdel) NOTHROW;
1465 void scr_scroll_region (int top, int bot); 1341 void scr_scroll_region (int top, int bot) NOTHROW;
1466 void scr_cursor_visible (int mode); 1342 void scr_cursor_visible (int mode) NOTHROW;
1467 void scr_autowrap (int mode); 1343 void scr_autowrap (int mode) NOTHROW;
1468 void scr_relative_origin (int mode); 1344 void scr_relative_origin (int mode) NOTHROW;
1469 void scr_insert_mode (int mode); 1345 void scr_insert_mode (int mode) NOTHROW;
1470 void scr_set_tab (int mode); 1346 void scr_set_tab (int mode) NOTHROW;
1471 void scr_rvideo_mode (int mode); 1347 void scr_rvideo_mode (bool on) NOTHROW;
1472 void scr_report_position (); 1348 void scr_report_position () NOTHROW;
1473 void set_font_style (); 1349 void set_font_style () NOTHROW;
1474 void scr_charset_choose (int set); 1350 void scr_charset_choose (int set) NOTHROW;
1475 void scr_charset_set (int set, unsigned int ch); 1351 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1476 void scr_move_to (int y, int len); 1352 void scr_move_to (int y, int len) NOTHROW;
1477 bool scr_page (enum page_dirn direction, int nlines); 1353 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1478 bool scr_changeview (int new_view_start); 1354 bool scr_changeview (int new_view_start) NOTHROW;
1479 void scr_bell (); 1355 void scr_bell () NOTHROW;
1480 void scr_printscreen (int fullhist); 1356 void scr_printscreen (int fullhist) NOTHROW;
1481 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1357 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1482 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1358 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1483 void scr_reverse_selection (); 1359 void scr_reverse_selection () NOTHROW;
1484 void scr_dump (int fd); 1360 void scr_dump (int fd) NOTHROW;
1361
1485 void selection_check (int check_more); 1362 void selection_check (int check_more) NOTHROW;
1486 void selection_paste (Window win, Atom prop, bool delete_prop); 1363 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1487 void selection_property (Window win, Atom prop); 1364 void selection_property (Window win, Atom prop) NOTHROW;
1488 void selection_request (Time tm, int x, int y); 1365 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1489 int selection_request_other (Atom target, int selnum); 1366 int selection_request_other (Atom target, int selnum) NOTHROW;
1490 void selection_clear (); 1367 void selection_clear () NOTHROW;
1491 void selection_make (Time tm); 1368 void selection_make (Time tm);
1492 bool selection_grab (Time tm); 1369 bool selection_grab (Time tm) NOTHROW;
1493 void selection_start_colrow (int col, int row); 1370 void selection_start_colrow (int col, int row) NOTHROW;
1494 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1371 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1495 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1372 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1496 void selection_remove_trailing_spaces (); 1373 void selection_remove_trailing_spaces () NOTHROW;
1497 void selection_send (const XSelectionRequestEvent &rq); 1374 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1375 void selection_click (int clicks, int x, int y) NOTHROW;
1376 void selection_extend (int x, int y, int flag) NOTHROW;
1377 void selection_rotate (int x, int y) NOTHROW;
1498 1378
1499#if defined(NEXT_SCROLLBAR) 1379#if defined(NEXT_SCROLLBAR)
1500 // scrollbar-next.C 1380 // scrollbar-next.C
1501 Pixmap renderPixmap (const char *const *data, int width, int height); 1381 Pixmap renderPixmap (const char *const *data, int width, int height);
1502 void init_scrollbar_stuff (); 1382 void init_scrollbar_stuff ();
… …
1504 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1384 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1505#endif 1385#endif
1506 1386
1507#if defined(RXVT_SCROLLBAR) 1387#if defined(RXVT_SCROLLBAR)
1508 // scrollbar-rxvt.C 1388 // scrollbar-rxvt.C
1509 void Draw_button (int x, int y, int state, int dirn);
1510 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1389 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1511#endif 1390#endif
1512 1391
1513#if defined(XTERM_SCROLLBAR) 1392#if defined(XTERM_SCROLLBAR)
1514 // scrollbar-xterm.C 1393 // scrollbar-xterm.C
… …
1519 // scrollbar-plain.C 1398 // scrollbar-plain.C
1520 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); 1399 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1521#endif 1400#endif
1522 1401
1523 // scrollbar.C 1402 // scrollbar.C
1403 void resize_scrollbar ();
1524 int scrollbar_mapping (int map); 1404 int scrollbar_mapping (int map);
1525 int scrollbar_show (int update); 1405 int scrollbar_show (int update);
1526 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); 1406 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1527 1407
1528 // xdefaults.C 1408 // xdefaults.C
1529 void get_options (int argc, const char *const *argv); 1409 void get_options (int argc, const char *const *argv);
1530 int parse_keysym (const char *str, const char *arg); 1410 int parse_keysym (const char *str, const char *arg);
1531 void get_xdefaults (FILE *stream, const char *name); 1411 const char *x_resource (const char *name);
1532 void extract_resources (); 1412 void extract_resources ();
1533 // xpm.C
1534 int scale_pixmap (const char *geom);
1535 void resize_pixmap ();
1536 Pixmap set_bgPixmap (const char *file);
1537}; 1413};
1538 1414
1539/* 1415#endif /* _RXVT_H_ */
1540 *****************************************************************************
1541 * PROTOTYPES
1542 *****************************************************************************
1543 */
1544#ifdef PROTOTYPES
1545# define __PROTO(p) p
1546#else
1547# define __PROTO(p) ()
1548#endif
1549 1416
1550#ifdef DEBUG_malloc
1551# include "dmalloc.h" /* This comes last */
1552#endif
1553
1554#endif /* _RXVT_H_ */
1555

Diff Legend

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