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.232 by root, Sat Jan 21 23:50:33 2006 UTC vs.
Revision 1.302 by ayin, Sat Sep 8 21:25:56 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
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
43#include "libptytty.h"
40 44
41#include "rxvtperl.h" 45#include "rxvtperl.h"
42 46
43// try to avoid some macros to decrease code size, on some systems 47// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 48#if ENABLE_MINIMAL
66 70
67#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
68typedef char *XPointer; 72typedef char *XPointer;
69#endif 73#endif
70 74
71#ifdef HAVE_TERMIOS_H
72# include <termios.h> 75#include <termios.h>
73typedef struct termios ttymode_t; 76typedef 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 77
85#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
86# ifdef XPM_INC_X11 79# include <afterimage.h>
87# include <X11/xpm.h> 80#undef min
88# else 81#undef max
89# include <xpm.h>
90# endif
91#endif 82#endif
92 83
93#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
94# define STDIN_FILENO 0 85# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 87# define STDERR_FILENO 2
97#endif 88#endif
98 89
99/****************************************************************************/ 90/****************************************************************************/
100
101#ifndef __attribute__
102# if __GNUC__
103# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
104# define __attribute__(x)
105# endif
106# endif
107# define __attribute__(x)
108#endif
109
110#define NORETURN __attribute__ ((noreturn))
111#define UNUSED __attribute__ ((unused))
112
113// increases code size unless -fno-enforce-eh-specs
114#if __GNUC__
115# define NOTHROW
116# define THROW(x)
117#else
118# define NOTHROW throw()
119# define THROW(x) throw x
120#endif
121 91
122// exception thrown on fatal (per-instance) errors 92// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { }; 93class rxvt_failure_exception { };
124 94
125// exception thrown when the command parser runs out of input data 95// exception thrown when the command parser runs out of input data
129 ***************************************************************************** 99 *****************************************************************************
130 * PROTOTYPES 100 * PROTOTYPES
131 ***************************************************************************** 101 *****************************************************************************
132 */ 102 */
133// main.C 103// main.C
134RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
135RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
136void rxvt_clean_exit () NOTHROW;
137void * rxvt_malloc (size_t size); 104void * rxvt_malloc (size_t size);
138void * rxvt_calloc (size_t number, size_t size); 105void * rxvt_calloc (size_t number, size_t size);
139void * rxvt_realloc (void *ptr, size_t size); 106void * rxvt_realloc (void *ptr, size_t size);
140 107
141// misc.C 108// misc.C
144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 111char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
145wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 112wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
146 113
147#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 114#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148 115
149char * rxvt_r_basename (const char *str) NOTHROW; 116char * rxvt_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 117void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
151void rxvt_log (const char *fmt,...) NOTHROW; 118void rxvt_log (const char *fmt,...) NOTHROW;
152void rxvt_warn (const char *fmt,...) NOTHROW; 119void rxvt_warn (const char *fmt,...) NOTHROW;
153void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 120void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 121void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
155 122
156int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
157const char * rxvt_Str_skip_space (const char *str) NOTHROW;
158char * rxvt_Str_trim (char *str) NOTHROW; 123char * rxvt_strtrim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 124char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 125void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163 126
164///////////////////////////////////////////////////////////////////////////// 127/////////////////////////////////////////////////////////////////////////////
165 128
166// temporarily replace the process environment 129// temporarily replace the process environment
167extern char **environ; 130extern char **environ;
168extern char **rxvt_environ; // the original environ pointer 131extern char **rxvt_environ; // the original environ pointer
169 132
170inline void set_environ (stringvec *envv) 133static inline void set_environ (stringvec *envv)
171{ 134{
135#if ENABLE_PERL
136 assert (envv);
137#else
172 if (envv) 138 if (envv)
139#endif
173 environ = (char **)envv->begin (); 140 environ = (char **)envv->begin ();
174} 141}
175 142
176inline void set_environ (char **envv) 143static inline void set_environ (char **envv)
177{ 144{
145#if ENABLE_PERL
146 assert (envv);
147#else
178 if (envv) 148 if (envv)
149#endif
179 environ = envv; 150 environ = envv;
180} 151}
181 152
182/* 153/*
183 ***************************************************************************** 154 *****************************************************************************
193# define KEEP_SCROLLCOLOR 1 164# define KEEP_SCROLLCOLOR 1
194#else 165#else
195# undef KEEP_SCROLLCOLOR 166# undef KEEP_SCROLLCOLOR
196#endif 167#endif
197 168
169#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
170# define HAVE_BG_PIXMAP 1/* to simplify further usage */
171struct bgPixmap_t {
172
173 enum {
174 geometrySet = (1UL<<0),
175 propScale = (1UL<<1),
176 geometryFlags = (geometrySet|propScale),
177
178 tintSet = (1UL<<8),
179 tintNeeded = (1UL<<9),
180 tintWholesome = (1UL<<10),
181 tintServerSide = (1UL<<11),
182 tintFlags = (tintSet|tintServerSide|tintNeeded|tintWholesome),
183 blurNeeded = (1UL<<12),
184
185 isTransparent = (1UL<<16),
186 isInvalid = (1UL<<17)
187 };
188
189 unsigned long flags;
190
191 enum {
192 transpPmapTiled = (1UL<<0),
193 transpPmapTinted = tintNeeded,
194 transpPmapBlured = blurNeeded,
195 transpTransformations = (tintNeeded|blurNeeded)
196 }; /* this flags are returned by make_transparency_pixmap if called */
197
198#ifdef XPM_BACKGROUND 198# ifdef XPM_BACKGROUND
199typedef struct { 199# ifdef HAVE_AFTERIMAGE
200 short w, h, x, y; 200 ASImage *original_asim;
201 bool render_asim (ASImage *background, ARGB32 background_tint);
202# endif
203
204 enum { defaultScale = 100, defaultAlign = 50 };
205
206 unsigned int h_scale, v_scale;/* percents of the window size */
207 int h_align, v_align; /* percents of the window size:
208 0 - left align, 50 - center, 100 - right */
209 void unset_geometry () { flags = flags & ~geometryFlags; };
210 bool set_geometry (const char *geom);
211 void set_defaultGeometry ()
212 {
213 h_scale = v_scale = defaultScale;
214 h_align = v_align = defaultAlign;
215 flags |= geometrySet;
216 };
217
218 bool set_file (const char *file);
219# endif /* XPM_BACKGROUND */
220
221 rxvt_term *target;
222 bool set_target (rxvt_term *new_target);
223
224# ifdef ENABLE_TRANSPARENCY
225 int root_depth; /* obtained when target is set */
226 Pixmap root_pixmap; /* current root pixmap set */
227 rxvt_color tint;
228 int shade;
229 int h_blurRadius, v_blurRadius;
230
231 bool set_transparent ();
232 bool set_blur_radius (const char *geom);
233 bool set_tint (rxvt_color &new_tint);
234 bool unset_tint ();
235 bool set_shade (const char *shade_str);
236 bool set_root_pixmap ();
237
238 unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */
239# endif
240 double invalid_since;
241
201 Pixmap pixmap; 242 Pixmap pixmap;
202} bgPixmap_t; 243 unsigned int pmap_width, pmap_height;
203#endif 244 unsigned int pmap_depth;
204 245
205struct rxvt_ptytty { 246 bool window_size_sensitive ();
206 int pty; // pty file descriptor; connected to rxvt 247 bool need_client_side_rendering ();
207 int tty; // tty file descriptor; connected to child 248 void apply ();
208 249 bool render ();
209 rxvt_ptytty () 250 void invalidate () {
210 : pty(-1), tty(-1) 251 if (!(flags & isInvalid))
211 { 252 {
253 flags |= isInvalid;
254 invalid_since = NOW;
255 }
212 } 256 };
213
214 virtual ~rxvt_ptytty ()
215 {
216 }
217
218 virtual bool get () = 0;
219#if UTMP_SUPPORT
220 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
221#endif
222
223 void close_tty ();
224 bool make_controlling_tty ();
225 void set_utf8_mode (bool on);
226}; 257};
227 258#else
228rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object 259# undef HAVE_BG_PIXMAP
229void rxvt_ptytty_server (); // start the ptytty server process 260#endif
230 261
231/* 262/*
232 * the 'essential' information for reporting Mouse Events 263 * the 'essential' information for reporting Mouse Events
233 * pared down from XButtonEvent 264 * pared down from XButtonEvent
234 */ 265 */
447// fake styles 478// fake styles
448#define RS_Blink 0x00010000UL // blink 479#define RS_Blink 0x00010000UL // blink
449#define RS_RVid 0x00020000UL // reverse video 480#define RS_RVid 0x00020000UL // reverse video
450#define RS_Uline 0x00040000UL // underline 481#define RS_Uline 0x00040000UL // underline
451 482
483// toggle this to force redraw, must be != RS_Careful
484#define RS_redraw 0x01000000UL
485
452// 5 custom bits for extensions 486// 5 custom bits for extensions
453#define RS_customCount 32 487#define RS_customCount 32
454#define RS_customMask 0x00f80000UL 488#define RS_customMask 0x00f80000UL
455#define RS_customShift 19 489#define RS_customShift 19
456 490
525 Rxvt_restoreFG = 39, // change default fg color 559 Rxvt_restoreFG = 39, // change default fg color
526 Rxvt_restoreBG = 49, // change default bg color 560 Rxvt_restoreBG = 49, // change default bg color
527 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 561 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
528 562
529 URxvt_locale = 701, // change locale 563 URxvt_locale = 701, // change locale
564 URxvt_version = 702, // request version
530 565
531 URxvt_Color_IT = 704, // change actual 'Italic' colour 566 URxvt_Color_IT = 704, // change actual 'Italic' colour
532 URxvt_Color_tint = 705, // change actual tint colour 567 URxvt_Color_tint = 705, // change actual tint colour
533 URxvt_Color_BD = 706, 568 URxvt_Color_BD = 706,
534 URxvt_Color_UL = 707, 569 URxvt_Color_UL = 707,
550 * on the unnecessary items, e.g. Color_pointer, but won't bother 585 * on the unnecessary items, e.g. Color_pointer, but won't bother
551 * until we need to. Also, be aware of usage in pixcolor_set 586 * until we need to. Also, be aware of usage in pixcolor_set
552 */ 587 */
553 588
554enum colour_list { 589enum colour_list {
590 Color_none = -2,
591 Color_transparent = -1,
555 Color_fg = 0, 592 Color_fg = 0,
556 Color_bg, 593 Color_bg,
557 minCOLOR, /* 2 */ 594 minCOLOR, /* 2 */
558 Color_Black = minCOLOR, 595 Color_Black = minCOLOR,
559 Color_Red3, 596 Color_Red3,
601#endif 638#endif
602#ifdef KEEP_SCROLLCOLOR 639#ifdef KEEP_SCROLLCOLOR
603 Color_scroll, 640 Color_scroll,
604 Color_trough, 641 Color_trough,
605#endif 642#endif
606#if TINTING 643#if ENABLE_TRANSPARENCY
607 Color_tint, 644 Color_tint,
608#endif 645#endif
609#if OFF_FOCUS_FADING 646#if OFF_FOCUS_FADING
610 Color_fade, 647 Color_fade,
611#endif 648#endif
618 TOTAL_COLORS = NRS_COLORS 655 TOTAL_COLORS = NRS_COLORS
619#endif 656#endif
620}; 657};
621 658
622#define Color_Bits 7 // 0 .. maxTermCOLOR 659#define Color_Bits 7 // 0 .. maxTermCOLOR
623
624#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
625#define NPIXCLR_BITS 32
626 660
627/* 661/*
628 * Resource list 662 * Resource list
629 */ 663 */
630enum { 664enum {
632# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 666# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
633# include "rsinc.h" 667# include "rsinc.h"
634# undef def 668# undef def
635# undef reserve 669# undef reserve
636 NUM_RESOURCES 670 NUM_RESOURCES
637};
638
639// see init.C:xa_names, which must be kept in sync
640enum {
641 XA_TEXT = 0,
642 XA_COMPOUND_TEXT,
643 XA_UTF8_STRING,
644 XA_MULTIPLE,
645 XA_TARGETS,
646 XA_TIMESTAMP,
647 XA_VT_SELECTION,
648 XA_INCR,
649 XA_WM_PROTOCOLS,
650 XA_WM_DELETE_WINDOW,
651 XA_CLIPBOARD,
652#if ENABLE_FRILLS
653 XA_MOTIF_WM_HINTS,
654#endif
655#if ENABLE_EWMH
656 XA_NET_WM_PID,
657 XA_NET_WM_NAME,
658 XA_NET_WM_ICON_NAME,
659 XA_NET_WM_PING,
660#endif
661#if USE_XIM
662 XA_WM_LOCALE_NAME,
663#endif
664#if TRANSPARENT
665 XA_XROOTPMAP_ID,
666 XA_ESETROOT_PMAP_ID,
667#endif
668#if ENABLE_XEMBED
669 XA_XEMBED,
670 XA_XEMBED_INFO,
671#endif
672 NUM_XA
673}; 671};
674 672
675/* DEC private modes */ 673/* DEC private modes */
676#define PrivMode_132 (1UL<<0) 674#define PrivMode_132 (1UL<<0)
677#define PrivMode_132OK (1UL<<1) 675#define PrivMode_132OK (1UL<<1)
695#define PrivMode_LFNL (1UL<<19) 693#define PrivMode_LFNL (1UL<<19)
696/* too annoying to implement X11 highlight tracking */ 694/* too annoying to implement X11 highlight tracking */
697/* #define PrivMode_MouseX11Track (1LU<<20) */ 695/* #define PrivMode_MouseX11Track (1LU<<20) */
698 696
699#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 697#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
700#define PrivMode(test,bit) \
701 if (test) \
702 priv_modes |= (bit); \
703 else \
704 priv_modes &= ~(bit)
705 698
706#ifdef ALLOW_132_MODE 699#ifdef ALLOW_132_MODE
707# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 700# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
708#else 701#else
709# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 702# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
750 ***************************************************************************** 743 *****************************************************************************
751 * MACRO DEFINES 744 * MACRO DEFINES
752 ***************************************************************************** 745 *****************************************************************************
753 */ 746 */
754#define dLocal(type,name) type const name = this->name 747#define dLocal(type,name) type const name = this->name
755#define dDisp Display *disp = this->display->display 748
749// for speed reasons, we assume that all codepoints 32 to 126 are
750// single-width.
751#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
756 752
757/* convert pixel dimensions to row/column values. Everything as int32_t */ 753/* convert pixel dimensions to row/column values. Everything as int32_t */
758#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 754#define Pixel2Col(x) Pixel2Width((int32_t)(x))
759#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 755#define Pixel2Row(y) Pixel2Height((int32_t)(y))
760#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 756#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
762#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 758#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
763#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 759#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
764#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 760#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
765#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 761#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
766 762
767#define OPTION(opt) (options & (opt))
768#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
769 | Opt_jumpScroll | Opt_secondaryScreen \
770 | Opt_pastableTabs | Opt_intensityStyles)
771
772// for m >= -n, ensure remainder lies between 0..n-1 763// for m >= -n, ensure remainder lies between 0..n-1
773#define MOD(m,n) (((m) + (n)) % (n)) 764#define MOD(m,n) (((m) + (n)) % (n))
774 765
775#define LINENO(n) MOD (term_start + int(n), total_rows) 766#define LINENO(n) MOD (term_start + int(n), total_rows)
776#define ROW(n) row_buf [LINENO (n)] 767#define ROW(n) row_buf [LINENO (n)]
794#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 785#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
795#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 786#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
796 787
797#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 788#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
798 789
799#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 790#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
800#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 791#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
801 792
802#if ENABLE_STYLES 793#if ENABLE_STYLES
803# define FONTSET(style) fontset[GET_STYLE (style)] 794# define FONTSET(style) fontset[GET_STYLE (style)]
804#else 795#else
805# define FONTSET(style) fontset[0] 796# define FONTSET(style) fontset[0]
833#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 824#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
834#define scrollbar_position(y) ((y) - scrollBar.beg) 825#define scrollbar_position(y) ((y) - scrollBar.beg)
835#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 826#define scrollbar_size() (scrollBar.end - scrollBar.beg \
836 - scrollbar_minheight ()) 827 - scrollbar_minheight ())
837 828
838#ifdef XPM_BACKGROUND
839# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
840#else
841# define XPMClearArea(a, b, c, d, e, f, g)
842#endif
843
844#ifdef DEBUG_CMD
845# define D_CMD(x) fprintf x ; fputc('\n', stderr)
846#else
847# define D_CMD(x)
848#endif
849#ifdef DEBUG_INIT
850# define D_INIT(x) fprintf x ; fputc('\n', stderr)
851#else
852# define D_INIT(x)
853#endif
854#ifdef DEBUG_MAIN
855# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
856#else
857# define D_MAIN(x)
858#endif
859#ifdef DEBUG_SIZE
860# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
861#else
862# define D_SIZE(x)
863#endif
864
865typedef callback1<void, const char *> log_callback; 829typedef callback<void (const char *)> log_callback;
866typedef callback1<int, int> getfd_callback; 830typedef callback<int (int)> getfd_callback;
867 831
868#define SET_LOCALE(locale) rxvt_set_locale (locale) 832#define SET_LOCALE(locale) rxvt_set_locale (locale)
869extern bool rxvt_set_locale (const char *locale) NOTHROW; 833extern bool rxvt_set_locale (const char *locale) NOTHROW;
870extern void rxvt_push_locale (const char *locale) NOTHROW; 834extern void rxvt_push_locale (const char *locale) NOTHROW;
871extern void rxvt_pop_locale () NOTHROW; 835extern void rxvt_pop_locale () NOTHROW;
873/****************************************************************************/ 837/****************************************************************************/
874 838
875#define LINE_LONGER 0x0001 // line is continued on the next row 839#define LINE_LONGER 0x0001 // line is continued on the next row
876#define LINE_FILTERED 0x0002 // line has been filtered 840#define LINE_FILTERED 0x0002 // line has been filtered
877#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 841#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
842#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
843#define LINE_BIDI 0x0010 // line needs bidi (NYI)
878 844
879struct line_t { 845struct line_t {
880 text_t *t; // terminal the text 846 text_t *t; // terminal the text
881 rend_t *r; // rendition, uses RS_ flags 847 rend_t *r; // rendition, uses RS_ flags
882 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 848 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
936# define COMPOSE_LO 0x40000000UL 902# define COMPOSE_LO 0x40000000UL
937# define COMPOSE_HI 0x400fffffUL 903# define COMPOSE_HI 0x400fffffUL
938# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 904# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
939#else 905#else
940# if ENABLE_PERL 906# if ENABLE_PERL
941# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 907# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
942# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 908# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
943# else 909# else
944# define COMPOSE_LO 0xd800UL 910# define COMPOSE_LO 0xd800UL
945# define COMPOSE_HI 0xf8ffUL 911# define COMPOSE_HI 0xf8ffUL
946# endif 912# endif
975#endif 941#endif
976 942
977/****************************************************************************/ 943/****************************************************************************/
978 944
979#ifdef KEYSYM_RESOURCE 945#ifdef KEYSYM_RESOURCE
980 class keyboard_manager; 946class keyboard_manager;
981#endif 947#endif
982 948
983struct rxvt_term : zero_initialized, rxvt_vars { 949struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
950
951 // special markers with magic addresses
952 static const char resval_undef []; // options specifically unset
953 static const char resval_on []; // boolean options switched on
954 static const char resval_off []; // or off
955
984 log_callback *log_hook; // log error messages through this hook, if != 0 956 log_callback *log_hook; // log error messages through this hook, if != 0
985 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 957 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
986#if ENABLE_PERL 958#if ENABLE_PERL
987 rxvt_perl_term perl; 959 rxvt_perl_term perl;
988#endif 960#endif
989 struct mbstate mbstate; // current input multibyte state 961 struct mbstate mbstate; // current input multibyte state
990 962
991 unsigned char want_refresh:1, 963 unsigned char want_refresh:1,
992#ifdef TRANSPARENT 964#ifdef ENABLE_TRANSPARENCY
993 want_full_refresh:1, /* awaiting full screen refresh */ 965 want_full_refresh:1, /* awaiting full screen refresh */
994#endif
995#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
996 am_transparent:1, /* is a transparent term */
997 am_pixmap_trans:1, /* transparency w/known root pixmap */
998#endif 966#endif
999 current_screen:1, /* primary or secondary */ 967 current_screen:1, /* primary or secondary */
1000 num_scr_allow:1, 968 num_scr_allow:1,
1001 bypass_keystate:1, 969 bypass_keystate:1,
1002#ifdef CURSOR_BLINK 970#ifdef CURSOR_BLINK
1029 int prev_ncol, /* screen: previous number of columns */ 997 int prev_ncol, /* screen: previous number of columns */
1030 prev_nrow; /* screen: previous number of rows */ 998 prev_nrow; /* screen: previous number of rows */
1031/* ---------- */ 999/* ---------- */
1032 rend_t rstyle; 1000 rend_t rstyle;
1033/* ---------- */ 1001/* ---------- */
1034 uint32_t pixcolor_set[NPIXCLR_SETS];
1035/* ---------- */
1036#ifdef SELECTION_SCROLLING 1002#ifdef SELECTION_SCROLLING
1037 int scroll_selection_lines; 1003 int scroll_selection_lines;
1038 enum page_dirn scroll_selection_dir; 1004 enum page_dirn scroll_selection_dir;
1039 int selection_save_x, 1005 int selection_save_x,
1040 selection_save_y, 1006 selection_save_y,
1045 /* give proper Scroll behaviour */ 1011 /* give proper Scroll behaviour */
1046#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1012#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1047 mouse_slip_wheel_speed, 1013 mouse_slip_wheel_speed,
1048#endif 1014#endif
1049 refresh_count, 1015 refresh_count,
1050 refresh_limit,
1051 last_bot, /* scrollbar last bottom position */ 1016 last_bot, /* scrollbar last bottom position */
1052 last_top, /* scrollbar last top position */ 1017 last_top, /* scrollbar last top position */
1053 last_state, /* scrollbar last state */ 1018 last_state, /* scrollbar last state */
1054 scrollbar_len, 1019 scrollbar_len,
1055 window_vt_x, 1020 window_vt_x,
1066 int old_width, /* last used width in screen resize */ 1031 int old_width, /* last used width in screen resize */
1067 old_height; /* last used height in screen resize */ 1032 old_height; /* last used height in screen resize */
1068 unsigned long priv_modes, 1033 unsigned long priv_modes,
1069 SavedModes; 1034 SavedModes;
1070/* ---------- */ 1035/* ---------- */
1071 Atom xa[NUM_XA]; 1036 Atom *xa;
1072/* ---------- */ 1037/* ---------- */
1073#ifdef RXVT_SCROLLBAR 1038#ifdef RXVT_SCROLLBAR
1074 GC scrollbarGC, 1039 GC scrollbarGC,
1075 topShadowGC, 1040 topShadowGC,
1076 botShadowGC; 1041 botShadowGC;
1111#endif 1076#endif
1112 struct mouse_event MEvent; 1077 struct mouse_event MEvent;
1113 XComposeStatus compose; 1078 XComposeStatus compose;
1114 ttymode_t tio; 1079 ttymode_t tio;
1115 row_col_t oldcursor; 1080 row_col_t oldcursor;
1116#ifdef XPM_BACKGROUND 1081#ifdef HAVE_BG_PIXMAP
1117 bgPixmap_t bgPixmap; 1082 bgPixmap_t bgPixmap;
1118 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1083#endif
1084#ifdef HAVE_AFTERIMAGE
1085 ASVisual *asv;
1086 ASImageManager *asimman;
1119#endif 1087#endif
1120 1088
1121#if ENABLE_OVERLAY 1089#if ENABLE_OVERLAY
1122 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1090 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1123 text_t **ov_text; 1091 text_t **ov_text;
1133 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1101 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1134#endif 1102#endif
1135 1103
1136 vector<void *> allocated; // free these memory blocks with free() 1104 vector<void *> allocated; // free these memory blocks with free()
1137 1105
1138 char *env_windowid; /* environmental variable WINDOWID */ 1106 char env_windowid[21]; /* environmental variable WINDOWID */
1107 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1139 char *env_display; /* environmental variable DISPLAY */ 1108 char *env_display; /* environmental variable DISPLAY */
1140 char *env_term; /* environmental variable TERM */ 1109 char *env_term; /* environmental variable TERM */
1141 char *env_colorfgbg; 1110
1142 char *locale; 1111 char *locale;
1143 char charsets[4]; 1112 char charsets[4];
1144 char *v_buffer; /* pointer to physical buffer */ 1113 char *v_buffer; /* pointer to physical buffer */
1145 unsigned int v_buflen; /* size of area to write */ 1114 unsigned int v_buflen; /* size of area to write */
1146 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1115 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1147 1116
1148#ifdef KEYSYM_RESOURCE 1117#ifdef KEYSYM_RESOURCE
1149 keyboard_manager *keyboard; 1118 keyboard_manager *keyboard;
1150#endif 1119#endif
1151 1120
1152 const char *rs[NUM_RESOURCES]; 1121 const char *rs[NUM_RESOURCES];
1153 /* command input buffering */ 1122 /* command input buffering */
1154 char *cmdbuf_ptr, *cmdbuf_endp; 1123 char *cmdbuf_ptr, *cmdbuf_endp;
1155 char cmdbuf_base[CBUFSIZ]; 1124 char cmdbuf_base[CBUFSIZ];
1156 1125
1157 rxvt_ptytty *pty; 1126 ptytty *pty;
1158 1127
1159 rxvt_salloc *talloc; // text line allocator 1128 rxvt_salloc *talloc; // text line allocator
1160 rxvt_salloc *ralloc; // rend line allocator 1129 rxvt_salloc *ralloc; // rend line allocator
1161 1130
1162 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1131 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1173#endif 1142#endif
1174 1143
1175 // modifies first argument(!) 1144 // modifies first argument(!)
1176 void paste (char *data, unsigned int len) NOTHROW; 1145 void paste (char *data, unsigned int len) NOTHROW;
1177 1146
1178 long vt_emask, vt_emask_perl; 1147 long vt_emask, vt_emask_perl, vt_emask_xim;
1179 1148
1180 void vt_select_input () const NOTHROW 1149 void vt_select_input () const NOTHROW
1181 { 1150 {
1182 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1151 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1183 } 1152 }
1184 1153
1185#if TRANSPARENT 1154#if ENABLE_TRANSPARENCY || ENABLE_PERL
1186 void rootwin_cb (XEvent &xev); 1155 void rootwin_cb (XEvent &xev);
1187 xevent_watcher rootwin_ev; 1156 xevent_watcher rootwin_ev;
1157#endif
1158#ifdef HAVE_BG_PIXMAP
1159 int update_background ();
1160 void update_background_cb (time_watcher &w);
1161 time_watcher update_background_ev;
1188#endif 1162#endif
1189 1163
1190 void x_cb (XEvent &xev); 1164 void x_cb (XEvent &xev);
1191 void flush (); 1165 void flush ();
1192 xevent_watcher termwin_ev; 1166 xevent_watcher termwin_ev;
1237 rxvt_term (); 1211 rxvt_term ();
1238 ~rxvt_term (); 1212 ~rxvt_term ();
1239 void destroy (); 1213 void destroy ();
1240 void emergency_cleanup (); 1214 void emergency_cleanup ();
1241 1215
1242 bool init (int argc, const char *const *argv); 1216 bool init (int argc, const char *const *argv, stringvec *envv);
1217
1218 bool init (stringvec *argv, stringvec *envv)
1219 {
1220 this->argv = argv;
1221 return init (argv->size (), argv->begin (), envv);
1222 }
1223
1243 bool init_vars (); 1224 bool init_vars ();
1244 1225
1245 bool pty_fill (); 1226 bool pty_fill ();
1246 1227
1247 void make_current () const // make this the "currently active" urxvt instance 1228 void make_current () const // make this the "currently active" urxvt instance
1248 { 1229 {
1249 SET_R (this); 1230 SET_R (this);
1231 set_environ (envv);
1250 rxvt_set_locale (locale); 1232 rxvt_set_locale (locale);
1251 set_environ (envv);
1252 } 1233 }
1253 1234
1254 void init_secondary (); 1235 void init_secondary ();
1255 const char **init_resources (int argc, const char *const *argv); 1236 const char **init_resources (int argc, const char *const *argv);
1256 const char *x_resource (const char *name); 1237 const char *x_resource (const char *name);
1266 void create_windows (int argc, const char *const *argv); 1247 void create_windows (int argc, const char *const *argv);
1267 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1248 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1268 void window_calc (unsigned int newwidth, unsigned int newheight); 1249 void window_calc (unsigned int newwidth, unsigned int newheight);
1269 1250
1270#if USE_XIM 1251#if USE_XIM
1271 rxvt_xim *input_method; 1252 rxvt_xim *input_method;
1272 XIC Input_Context; 1253 XIC Input_Context;
1273 XIMStyle input_style; 1254 XIMStyle input_style;
1274 XPoint spot; // most recently sent spot position 1255 XPoint spot; // most recently sent spot position
1275 1256
1276 void im_destroy (); 1257 void im_destroy ();
1277 void im_cb (); im_watcher im_ev; 1258 void im_cb (); im_watcher im_ev;
1278 void im_set_size (XRectangle &size); 1259 void im_set_size (XRectangle &size);
1279 void im_set_position (XPoint &pos) NOTHROW; 1260 void im_set_position (XPoint &pos) NOTHROW;
1281 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1262 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1282 1263
1283 bool IMisRunning (); 1264 bool IMisRunning ();
1284 void IMSendSpot (); 1265 void IMSendSpot ();
1285 bool IM_get_IC (const char *modifiers); 1266 bool IM_get_IC (const char *modifiers);
1286 void IMSetStatusPosition (); 1267 void IMSetPosition ();
1287#endif 1268#endif
1288 1269
1289 void resize_scrollbar (); 1270 void resize_scrollbar ();
1290 1271
1291 // command.C 1272 // command.C
1292 void lookup_key (XKeyEvent &ev); 1273 void key_press (XKeyEvent &ev);
1274 void key_release (XKeyEvent &ev);
1293 unsigned int cmd_write (const char *str, unsigned int count); 1275 unsigned int cmd_write (const char *str, unsigned int count);
1294 1276
1295 wchar_t next_char () NOTHROW; 1277 wchar_t next_char () NOTHROW;
1296 wchar_t cmd_getc () THROW ((class out_of_input)); 1278 wchar_t cmd_getc () THROW ((class out_of_input));
1297 uint32_t next_octet () NOTHROW; 1279 uint32_t next_octet () NOTHROW;
1301 void mouse_report (XButtonEvent &ev); 1283 void mouse_report (XButtonEvent &ev);
1302 void button_press (XButtonEvent &ev); 1284 void button_press (XButtonEvent &ev);
1303 void button_release (XButtonEvent &ev); 1285 void button_release (XButtonEvent &ev);
1304 void focus_in (); 1286 void focus_in ();
1305 void focus_out (); 1287 void focus_out ();
1306 int check_our_parents (); 1288 void update_fade_color (unsigned int idx);
1307#ifdef PRINTPIPE 1289#ifdef PRINTPIPE
1308 FILE *popen_printer (); 1290 FILE *popen_printer ();
1309 int pclose_printer (FILE *stream); 1291 int pclose_printer (FILE *stream);
1310#endif 1292#endif
1311 void process_print_pipe (); 1293 void process_print_pipe ();
1332 void set_utf8_property (Atom prop, const char *str, int len = -1); 1314 void set_utf8_property (Atom prop, const char *str, int len = -1);
1333 void set_title (const char *str); 1315 void set_title (const char *str);
1334 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1335 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1336 void set_colorfgbg (); 1318 void set_colorfgbg ();
1337 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1319 bool set_color (rxvt_color &color, const char *name);
1320 void alias_color (int dst, int src);
1338 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1321 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1339 1322
1340 // screen.C 1323 // screen.C
1341 1324
1342 void lalloc (line_t &l) const NOTHROW 1325 void lalloc (line_t &l) const
1343 { 1326 {
1344 l.t = (text_t *)talloc->alloc (); 1327 l.t = (text_t *)talloc->alloc ();
1345 l.r = (rend_t *)ralloc->alloc (); 1328 l.r = (rend_t *)ralloc->alloc ();
1346 } 1329 }
1347 1330
1351 talloc->free (l.t); 1334 talloc->free (l.t);
1352 ralloc->free (l.r); 1335 ralloc->free (l.r);
1353 } 1336 }
1354#endif 1337#endif
1355 1338
1356 void lresize (line_t &l) const NOTHROW 1339 void lresize (line_t &l) const
1357 { 1340 {
1358 if (!l.t) 1341 if (!l.t)
1359 return; 1342 return;
1360 1343
1361 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1344 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1371 { 1354 {
1372 int base = GET_BASEFG (r); 1355 int base = GET_BASEFG (r);
1373#ifndef NO_BRIGHTCOLOR 1356#ifndef NO_BRIGHTCOLOR
1374 if (r & RS_Bold 1357 if (r & RS_Bold
1375# if ENABLE_STYLES 1358# if ENABLE_STYLES
1376 && OPTION (Opt_intensityStyles) 1359 && option (Opt_intensityStyles)
1377# endif 1360# endif
1378 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1361 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1379 base += minBrightCOLOR - minCOLOR; 1362 base += minBrightCOLOR - minCOLOR;
1380#endif 1363#endif
1381 return base; 1364 return base;
1385 { 1368 {
1386 int base = GET_BASEBG (r); 1369 int base = GET_BASEBG (r);
1387#ifndef NO_BRIGHTCOLOR 1370#ifndef NO_BRIGHTCOLOR
1388 if (r & RS_Blink 1371 if (r & RS_Blink
1389# if ENABLE_STYLES 1372# if ENABLE_STYLES
1390 && OPTION (Opt_intensityStyles) 1373 && option (Opt_intensityStyles)
1391# endif 1374# endif
1392 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1375 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1393 base += minBrightCOLOR - minCOLOR; 1376 base += minBrightCOLOR - minCOLOR;
1394#endif 1377#endif
1395 return base; 1378 return base;
1396 } 1379 }
1397 1380
1398 bool option (uint32_t opt) const NOTHROW 1381 bool option (uint8_t opt) const NOTHROW
1399 { 1382 {
1400 return OPTION (opt); 1383 return options[opt >> 3] & (1 << (opt & 7));
1401 } 1384 }
1402 1385
1403 void set_option (uint32_t opt, bool set) NOTHROW 1386 void set_option (uint8_t opt, bool set = true) NOTHROW
1404 { 1387 {
1405 if (set) 1388 if (set)
1406 options |= opt; 1389 options[opt >> 3] |= (1 << (opt & 7));
1407 else 1390 else
1408 options &= ~opt; 1391 options[opt >> 3] &= ~(1 << (opt & 7));
1392 }
1393
1394 void PrivMode (int set, unsigned bit) NOTHROW
1395 {
1396 if (set)
1397 priv_modes |= bit;
1398 else
1399 priv_modes &= ~bit;
1409 } 1400 }
1410 1401
1411 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1412 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1404 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1429 void scr_remap_chars () NOTHROW; 1420 void scr_remap_chars () NOTHROW;
1430 void scr_remap_chars (line_t &l) NOTHROW; 1421 void scr_remap_chars (line_t &l) NOTHROW;
1431 1422
1432 enum cursor_mode { SAVE, RESTORE }; 1423 enum cursor_mode { SAVE, RESTORE };
1433 1424
1434 void scr_poweron () NOTHROW; 1425 void scr_poweron ();
1435 void scr_cursor (cursor_mode mode) NOTHROW; 1426 void scr_cursor (cursor_mode mode) NOTHROW;
1436 void scr_do_wrap () NOTHROW; 1427 void scr_do_wrap () NOTHROW;
1428 void scr_swap_screen () NOTHROW;
1437 int scr_change_screen (int scrn) NOTHROW; 1429 void scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg) NOTHROW; 1430 void scr_color (unsigned int color, int fgbg) NOTHROW;
1439 void scr_rendition (int set, int style) NOTHROW; 1431 void scr_rendition (int set, int style) NOTHROW;
1440 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1432 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1441 void scr_backspace () NOTHROW; 1433 void scr_backspace () NOTHROW;
1442 void scr_tab (int count, bool ht = false) NOTHROW; 1434 void scr_tab (int count, bool ht = false) NOTHROW;
1518 void get_options (int argc, const char *const *argv); 1510 void get_options (int argc, const char *const *argv);
1519 int parse_keysym (const char *str, const char *arg); 1511 int parse_keysym (const char *str, const char *arg);
1520 void get_xdefaults (FILE *stream, const char *name); 1512 void get_xdefaults (FILE *stream, const char *name);
1521 void extract_resources (); 1513 void extract_resources ();
1522 // xpm.C 1514 // xpm.C
1523 int scale_pixmap (const char *geom); 1515 void get_window_origin (int &x, int &y);
1524 void resize_pixmap (); 1516 Pixmap get_pixmap_property (int prop_id);
1525 Pixmap set_bgPixmap (const char *file);
1526}; 1517};
1527 1518
1528/*
1529 *****************************************************************************
1530 * PROTOTYPES
1531 *****************************************************************************
1532 */
1533#ifdef PROTOTYPES
1534# define __PROTO(p) p
1535#else
1536# define __PROTO(p) ()
1537#endif
1538
1539#ifdef DEBUG_malloc
1540# include "dmalloc.h" /* This comes last */
1541#endif
1542
1543#endif /* _RXVT_H_ */ 1519#endif /* _RXVT_H_ */
1544 1520

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines