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.87 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.180 by root, Mon Jan 2 15:35:43 2006 UTC

9 9
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#ifndef NO_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "defaultfont.h"
20#include "rxvtcolor.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
28#endif
23 29
24/* 30/*
25 ***************************************************************************** 31 *****************************************************************************
26 * SYSTEM HACKS 32 * SYSTEM HACKS
27 ***************************************************************************** 33 *****************************************************************************
28 */ 34 */
29/* Consistent defines - please report on the necessity 35/* Consistent defines - please report on the necessity
30 * @ Unixware: defines (__svr4__) 36 * @ Unixware: defines (__svr4__)
31 */ 37 */
32#if defined (SVR4) && !defined (__svr4__) 38#if defined (SVR4) && !defined (__svr4__)
33# define __svr4__ 39# define __svr4__ 1
34#endif 40#endif
35#if defined (sun) && !defined (__sun__) 41#if defined (sun) && !defined (__sun__)
36# define __sun__ 42# define __sun__ 1
37#endif 43#endif
38 44
39#ifndef HAVE_XPOINTER 45#ifndef HAVE_XPOINTER
40typedef char *XPointer; 46typedef char *XPointer;
41#endif 47#endif
66# define STDIN_FILENO 0 72# define STDIN_FILENO 0
67# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
68# define STDERR_FILENO 2 74# define STDERR_FILENO 2
69#endif 75#endif
70 76
71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 77/*
72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 78 *****************************************************************************
73# define NO_SETOWNER_TTYDEV 79 * PROTOTYPES
74# endif 80 *****************************************************************************
75#endif 81 */
76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY) 82// main.C
77# define NO_SETOWNER_TTYDEV 83RETSIGTYPE rxvt_Child_signal (int sig);
78#endif 84RETSIGTYPE rxvt_Exit_signal (int sig);
85void rxvt_clean_exit ();
86void * rxvt_malloc (size_t size);
87void * rxvt_calloc (size_t number, size_t size);
88void * rxvt_realloc (void *ptr, size_t size);
89void rxvt_privileges (rxvt_privaction action);
90
91// util.C
92char * rxvt_wcstombs (const wchar_t *str, int len = -1);
93wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
94char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
95wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
96char * rxvt_strdup (const char *str);
97
98// misc.C
99char * rxvt_r_basename (const char *str);
100void rxvt_vlog (const char *fmt, va_list arg_ptr);
101void rxvt_log (const char *fmt,...);
102void rxvt_warn (const char *fmt,...);
103void rxvt_fatal (const char *fmt,...);
104void rxvt_exit_failure ();
105int rxvt_Str_match (const char *s1, const char *s2);
106const char * rxvt_Str_skip_space (const char *str);
107char * rxvt_Str_trim (char *str);
108int rxvt_Str_escaped (char *str);
109char ** rxvt_splitcommastring (const char *cs);
110void rxvt_freecommastring (char **cs);
111char * rxvt_File_find (const char *file, const char *ext, const char *path);
112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs);
79 115
80/* 116/*
81 ***************************************************************************** 117 *****************************************************************************
82 * STRUCTURES AND TYPEDEFS 118 * STRUCTURES AND TYPEDEFS
83 ***************************************************************************** 119 *****************************************************************************
93#endif 129#endif
94 130
95/* If we're using either the rxvt scrollbar or menu bars, keep the 131/* If we're using either the rxvt scrollbar or menu bars, keep the
96 * scrollColor resource. 132 * scrollColor resource.
97 */ 133 */
98#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 134#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
99# define KEEP_SCROLLCOLOR 1 135# define KEEP_SCROLLCOLOR 1
100#else 136#else
101# undef KEEP_SCROLLCOLOR 137# undef KEEP_SCROLLCOLOR
102#endif 138#endif
103 139
104#ifdef XPM_BACKGROUND 140#ifdef XPM_BACKGROUND
105typedef struct { 141typedef struct {
106 short w, h, x, y; 142 short w, h, x, y;
107 Pixmap pixmap; 143 Pixmap pixmap;
108} bgPixmap_t; 144} bgPixmap_t;
109#endif 145#endif
110 146
111/* 147/*
112 * the 'essential' information for reporting Mouse Events 148 * the 'essential' information for reporting Mouse Events
113 * pared down from XButtonEvent 149 * pared down from XButtonEvent
114 */ 150 */
115struct mouse_event { 151struct mouse_event {
116 int clicks; 152 int clicks;
117 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
118 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
119 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
120}; 156};
121 157
122#ifndef min 158#if ENABLE_FRILLS
123# define min(a,b) (((a) < (b)) ? (a) : (b))
124# define max(a,b) (((a) > (b)) ? (a) : (b))
125#endif
126
127#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
128#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
129#define SWAP_IT(one, two, typeof) \
130 do { \
131 typeof swapittmp; \
132 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
133 } while (/* CONSTCOND */ 0)
134#define BOUND_POSITIVE_INT16(val) \
135 (int16_t) ((val) <= 0 \
136 ? 0 \
137 : min ((val), (((uint16_t)-1)>>1)))
138
139#ifndef NO_FRILLS
140typedef struct _mwmhints { 159typedef struct _mwmhints {
141 CARD32 flags; 160 CARD32 flags;
142 CARD32 functions; 161 CARD32 functions;
143 CARD32 decorations; 162 CARD32 decorations;
144 INT32 input_mode; 163 INT32 input_mode;
145 CARD32 status; 164 CARD32 status;
146} MWMHints; 165} MWMHints;
147#endif 166#endif
148 167
168#if ENABLE_XEMBED
169// XEMBED messages
170# define XEMBED_EMBEDDED_NOTIFY 0
171# define XEMBED_WINDOW_ACTIVATE 1
172# define XEMBED_WINDOW_DEACTIVATE 2
173# define XEMBED_REQUEST_FOCUS 3
174# define XEMBED_FOCUS_IN 4
175# define XEMBED_FOCUS_OUT 5
176# define XEMBED_FOCUS_NEXT 6
177# define XEMBED_FOCUS_PREV 7
178
179# define XEMBED_MODALITY_ON 10
180# define XEMBED_MODALITY_OFF 11
181# define XEMBED_REGISTER_ACCELERATOR 12
182# define XEMBED_UNREGISTER_ACCELERATOR 13
183# define XEMBED_ACTIVATE_ACCELERATOR 14
184
185// XEMBED detail code
186# define XEMBED_FOCUS_CURRENT 0
187# define XEMBED_FOCUS_FIRST 1
188# define XEMBED_FOCUS_LAST 2
189
190# define XEMBED_MAPPED (1 << 0)
191#endif
192
149/* 193/*
150 ***************************************************************************** 194 *****************************************************************************
151 * NORMAL DEFINES 195 * NORMAL DEFINES
152 ***************************************************************************** 196 *****************************************************************************
153 */ 197 */
158# define COLORTERMENVFULL COLORTERMENV "-xpm" 202# define COLORTERMENVFULL COLORTERMENV "-xpm"
159#else 203#else
160# define COLORTERMENVFULL COLORTERMENV 204# define COLORTERMENVFULL COLORTERMENV
161#endif 205#endif
162#ifndef TERMENV 206#ifndef TERMENV
163# define TERMENV "rxvt" 207# define TERMENV "rxvt-unicode"
164#endif 208#endif
165 209
166#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
167# define NO_MOUSE_REPORT_SCROLLBAR 211# define NO_MOUSE_REPORT_SCROLLBAR 1
168#endif 212#endif
169 213
170#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
171# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
216#endif
217
218#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1
172#endif 220#endif
173 221
174/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
175 223
176#if !defined (EACCESS) && defined(EAGAIN) 224#if !defined (EACCESS) && defined(EAGAIN)
185#define menuBar_esc 10 233#define menuBar_esc 10
186#define scrollBar_esc 30 234#define scrollBar_esc 30
187#define menuBar_margin 2 /* margin below text */ 235#define menuBar_margin 2 /* margin below text */
188 236
189#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 237#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
190# define HAVE_SCROLLBARS 238# define HAVE_SCROLLBARS 1
191#endif 239#endif
192 240
193/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 241/* width of scrollBar, menuBar shadow, must be 1 or 2 */
194#ifdef HALFSHADOW 242#ifdef HALFSHADOW
195# define SHADOW 1 243# define SHADOW 1
199 247
200#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
201#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
202#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
203 251
204#define R_SB_RXVT 0
205#define R_SB_NEXT 1 252#define R_SB_NEXT 1
206#define R_SB_XTERM 2 253#define R_SB_XTERM 2
207#define R_SB_PLAIN 4 254#define R_SB_PLAIN 4
255#define R_SB_RXVT 8
208 256
209#define SB_WIDTH_NEXT 19 257#define SB_WIDTH_NEXT 19
210#define SB_WIDTH_XTERM 15 258#define SB_WIDTH_XTERM 15
211#define SB_WIDTH_PLAIN 7 259#define SB_WIDTH_PLAIN 7
212#ifndef SB_WIDTH_RXVT 260#ifndef SB_WIDTH_RXVT
279enum { 327enum {
280 NO_REFRESH = 0 , /* Window not visible at all! */ 328 NO_REFRESH = 0 , /* Window not visible at all! */
281 FAST_REFRESH = 1<<0, /* Fully exposed window */ 329 FAST_REFRESH = 1<<0, /* Fully exposed window */
282 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 330 SLOW_REFRESH = 1<<1, /* Partially exposed window */
283 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */ 331 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
284#if 0
285 REFRESH_BOUNDS = 1<<3
286#endif
287 REFRESH_BOUNDS = 0 /* only required for old int_bwidth code. */ //TODO: remove this and all depending code
288}; 332};
289 333
290#ifdef NO_SECONDARY_SCREEN 334#ifdef NO_SECONDARY_SCREEN
291# define NSCREENS 0 335# define NSCREENS 0
292#else 336#else
293# define NSCREENS 1 337# define NSCREENS 1
294#endif 338#endif
295
296#define IGNORE 0
297#define SAVE 's'
298#define RESTORE 'r'
299 339
300/* special (internal) prefix for font commands */ 340/* special (internal) prefix for font commands */
301#define FONT_CMD '#' 341#define FONT_CMD '#'
302#define FONT_DN "#-" 342#define FONT_DN "#-"
303#define FONT_UP "#+" 343#define FONT_UP "#+"
304 344
305/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
306enum { 346enum {
307 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
308 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
309 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
310}; 350};
311 351
312/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
313enum { 353enum {
314 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
327enum { 367enum {
328 PRIMARY = 0, 368 PRIMARY = 0,
329 SECONDARY, 369 SECONDARY,
330}; 370};
331 371
332#define RS_None 0 /* Normal */ 372#define RS_None 0
333 373
334#define RS_fgMask 0x000001FFu /* 512 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
335#define RS_bgMask 0x0003FE00u /* 512 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
336#define RS_Bold 0x00040000u /* bold */ 376
377// font styles
378#define RS_Bold 0x00004000UL // value 1
379#define RS_Italic 0x00008000UL // value 2
380
381// fake styles
337#define RS_Blink 0x00080000u /* blink */ 382#define RS_Blink 0x00010000UL // blink
338#define RS_RVid 0x00100000u /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
339#define RS_Uline 0x00200000u /* underline */ 384#define RS_Uline 0x00040000UL // underline
340 385
341#define RS_fontMask 0xffc00000u /* plenty(?) of fonts */ 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
342#define RS_fontShift 22 389#define RS_customShift 19
343 390
391// other flags
392#define RS_Careful 0x80000000UL /* be careful when drawing these */
393
394#define RS_styleCount 4
395#define RS_styleMask (RS_Bold | RS_Italic)
396#define RS_styleShift 14
397
344#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 398#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
345#define RS_attrMask (RS_baseattrMask|RS_fontMask) 399#define RS_attrMask (RS_baseattrMask | RS_fontMask)
400
401#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
402#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
403#define RS_fontShift 24
404
405#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
406#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
346 407
347#define Sel_none 0 /* Not waiting */ 408#define Sel_none 0 /* Not waiting */
348#define Sel_normal 0x01 /* normal selection */ 409#define Sel_normal 0x01 /* normal selection */
349#define Sel_incr 0x02 /* incremental selection */ 410#define Sel_incr 0x02 /* incremental selection */
350#define Sel_direct 0x00 411#define Sel_direct 0x00
395 XTerm_Color_UL = 19, // change actual 'Underline' color 456 XTerm_Color_UL = 19, // change actual 'Underline' color
396 XTerm_Pixmap = 20, // new bg pixmap 457 XTerm_Pixmap = 20, // new bg pixmap
397 XTerm_restoreFG = 39, // change default fg color 458 XTerm_restoreFG = 39, // change default fg color
398 XTerm_restoreBG = 49, // change default bg color 459 XTerm_restoreBG = 49, // change default bg color
399 XTerm_dumpscreen = 55, // dump scrollback and all of screen 460 XTerm_dumpscreen = 55, // dump scrollback and all of screen
461
400 XTerm_locale = 701, // change locale 462 URxvt_locale = 701, // change locale
401 XTerm_findfont = 702, // find font of given character (in decimal)
402 XTerm_Menu = 703, // set menu item 463 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour
466
467 URxvt_font = 710,
468 URxvt_boldFont = 711,
469 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713,
471
472 URxvt_view_up = 720,
473 URxvt_view_down = 721,
403}; 474};
404 475
405/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
406/* 477/*
407 * The following comment is mostly obsolete since pixcolor_set was expanded:
408 * We're currently upto 29 colours. Only 3 more available. The
409 * PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
410 * on the unnecessary items, e.g. Color_pointer, but won't bother 479 * on the unnecessary items, e.g. Color_pointer, but won't bother
411 * until we need to. Also, be aware of usage in pixcolor_set 480 * until we need to. Also, be aware of usage in pixcolor_set
412 */ 481 */
413 482
414enum colour_list { 483enum colour_list {
436 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 505 maxBrightCOLOR, /* minBrightCOLOR + 7 */
437 Color_White = maxBrightCOLOR, 506 Color_White = maxBrightCOLOR,
438#else 507#else
439 Color_White = maxCOLOR, 508 Color_White = maxCOLOR,
440#endif 509#endif
441#ifdef TTY_256COLOR
442 min256COLOR = Color_White + 1, 510 minTermCOLOR = Color_White + 1,
443 max256COLOR = minCOLOR + 255, 511 maxTermCOLOR = Color_White + 72,
444#endif
445#ifndef NO_CURSORCOLOR 512#ifndef NO_CURSORCOLOR
446 Color_cursor, 513 Color_cursor,
447 Color_cursor2, 514 Color_cursor2,
448#endif 515#endif
449 Color_pointer_fg, 516 Color_pointer_fg,
450 Color_pointer_bg, 517 Color_pointer_bg,
451 Color_border, 518 Color_border,
452#ifndef NO_BOLD_UNDERLINE_REVERSE 519#ifndef NO_BOLD_UNDERLINE_REVERSE
453 Color_BD, 520 Color_BD,
521 Color_IT,
454 Color_UL, 522 Color_UL,
455 Color_RV, 523 Color_RV,
524#endif
525#if ENABLE_FRILLS
526 Color_underline,
456#endif 527#endif
457#ifdef OPTION_HC 528#ifdef OPTION_HC
458 Color_HC, 529 Color_HC,
459#endif 530#endif
460#ifdef KEEP_SCROLLCOLOR 531#ifdef KEEP_SCROLLCOLOR
461 Color_scroll, 532 Color_scroll,
462 Color_trough, 533 Color_trough,
463#endif 534#endif
464#if TINTING 535#if TINTING
465 Color_tint, 536 Color_tint,
537#endif
538#if OFF_FOCUS_FADING
539 Color_fade,
466#endif 540#endif
467 NRS_COLORS, /* */ 541 NRS_COLORS, /* */
468#ifdef KEEP_SCROLLCOLOR 542#ifdef KEEP_SCROLLCOLOR
469 Color_topShadow = NRS_COLORS, 543 Color_topShadow = NRS_COLORS,
470 Color_bottomShadow, 544 Color_bottomShadow,
471 TOTAL_COLORS /* upto 30 */ 545 TOTAL_COLORS
472#else 546#else
473 TOTAL_COLORS = NRS_COLORS /* */ 547 TOTAL_COLORS = NRS_COLORS
474#endif 548#endif
475}; 549};
476 550
477#define Color_Bits 9 551#define Color_Bits 7 // 0 .. maxTermCOLOR
552
478#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 553#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
479#define NPIXCLR_BITS 32 554#define NPIXCLR_BITS 32
480
481#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
482 555
483/* 556/*
484 * Resource list 557 * Resource list
485 */ 558 */
486enum { 559enum {
490 Rs_geometry, 563 Rs_geometry,
491 Rs_reverseVideo, 564 Rs_reverseVideo,
492 Rs_color, 565 Rs_color,
493 _Rs_color = Rs_color + NRS_COLORS - 1, 566 _Rs_color = Rs_color + NRS_COLORS - 1,
494 Rs_font, 567 Rs_font,
568#if ENABLE_STYLES
569 Rs_boldFont,
570 Rs_italicFont,
571 Rs_boldItalicFont,
572 Rs_intensityStyles,
573#endif
495 Rs_name, 574 Rs_name,
496 Rs_title, 575 Rs_title,
497#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 576#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
498 Rs_path, 577 Rs_path,
499#endif 578#endif
508#ifdef HAVE_SCROLLBARS 587#ifdef HAVE_SCROLLBARS
509 Rs_scrollBar, 588 Rs_scrollBar,
510 Rs_scrollBar_right, 589 Rs_scrollBar_right,
511 Rs_scrollBar_floating, 590 Rs_scrollBar_floating,
512 Rs_scrollBar_align, 591 Rs_scrollBar_align,
513#endif
514 Rs_scrollstyle, /* Rs_scrollBar_style */ 592 Rs_scrollstyle, /* Rs_scrollBar_style */
593 Rs_scrollBar_thickness,
594#endif
515 Rs_scrollTtyOutput, 595 Rs_scrollTtyOutput,
516 Rs_scrollTtyKeypress, 596 Rs_scrollTtyKeypress,
517 Rs_scrollWithBuffer, 597 Rs_scrollWithBuffer,
518 Rs_saveLines, 598 Rs_saveLines,
519 Rs_utmpInhibit, 599 Rs_utmpInhibit,
543#endif 623#endif
544#ifdef TRANSPARENT 624#ifdef TRANSPARENT
545 Rs_transparent, 625 Rs_transparent,
546 Rs_transparent_all, 626 Rs_transparent_all,
547#endif 627#endif
548#ifndef NO_FRILLS 628#if ENABLE_FRILLS
629 Rs_pty_fd,
630 Rs_hold,
549 Rs_ext_bwidth, 631 Rs_ext_bwidth,
550 Rs_int_bwidth, 632 Rs_int_bwidth,
551 Rs_borderLess, 633 Rs_borderLess,
552#endif
553 Rs_scrollBar_thickness,
554#ifndef NO_LINESPACE
555 Rs_lineSpace, 634 Rs_lineSpace,
635 Rs_cursorUnderline,
636#endif
637#if CURSOR_BLINK
638 Rs_cursorBlink,
639#endif
640#if ENABLE_XEMBED
641 Rs_embed,
556#endif 642#endif
557 Rs_cutchars, 643 Rs_cutchars,
558 Rs_modifier, 644 Rs_modifier,
559 Rs_answerbackstring, 645 Rs_answerbackstring,
560 Rs_tripleclickwords, 646 Rs_tripleclickwords,
561 Rs_insecure, 647 Rs_insecure,
562 Rs_cursorBlink,
563 Rs_pointerBlank, 648 Rs_pointerBlank,
564 Rs_pointerBlankDelay, 649 Rs_pointerBlankDelay,
565 Rs_imLocale, 650 Rs_imLocale,
651 Rs_imFont,
652 Rs_pastableTabs,
566#ifndef NO_SECONDARY_SCREEN 653#ifndef NO_SECONDARY_SCREEN
567 Rs_secondaryScreen, 654 Rs_secondaryScreen,
568 Rs_secondaryScroll, 655 Rs_secondaryScroll,
569#endif
570#ifndef NO_BOLD_UNDERLINE_REVERSE
571 Rs_realBold,
572#endif 656#endif
573#ifdef OFF_FOCUS_FADING 657#ifdef OFF_FOCUS_FADING
574 Rs_fade, 658 Rs_fade,
575#endif 659#endif
576#ifdef TINTING 660#ifdef TINTING
587 XA_MULTIPLE, 671 XA_MULTIPLE,
588 XA_TARGETS, 672 XA_TARGETS,
589 XA_TIMESTAMP, 673 XA_TIMESTAMP,
590 XA_VT_SELECTION, 674 XA_VT_SELECTION,
591 XA_INCR, 675 XA_INCR,
676 XA_WM_PROTOCOLS,
592 XA_WMDELETEWINDOW, 677 XA_WM_DELETE_WINDOW,
678 XA_CLIPBOARD,
679#if ENABLE_FRILLS
680 XA_MOTIF_WM_HINTS,
681#endif
682#if ENABLE_EWMH
683 XA_NET_WM_PID,
684 XA_NET_WM_NAME,
685 XA_NET_WM_ICON_NAME,
686 XA_NET_WM_PING,
687#endif
688#if USE_XIM
689 XA_WM_LOCALE_NAME,
690#endif
593#ifdef TRANSPARENT 691#if TRANSPARENT
594 XA_XROOTPMAPID, 692 XA_XROOTPMAP_ID,
595 XA_XSETROOTID, 693 XA_ESETROOT_PMAP_ID,
596#endif 694#endif
597#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 695#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
598 XA_DNDPROTOCOL, 696 XA_DNDPROTOCOL,
599 XA_DNDSELECTION, 697 XA_DNDSELECTION,
600#endif /* OFFIX_DND */ 698#endif
601 XA_CLIPBOARD, 699#if ENABLE_XEMBED
700 XA_XEMBED,
701 XA_XEMBED_INFO,
702#endif
602 NUM_XA 703 NUM_XA
603}; 704};
604 705
605/* DEC private modes */ 706/* DEC private modes */
606#define PrivMode_132 (1LU<<0) 707#define PrivMode_132 (1UL<<0)
607#define PrivMode_132OK (1LU<<1) 708#define PrivMode_132OK (1UL<<1)
608#define PrivMode_rVideo (1LU<<2) 709#define PrivMode_rVideo (1UL<<2)
609#define PrivMode_relOrigin (1LU<<3) 710#define PrivMode_relOrigin (1UL<<3)
610#define PrivMode_Screen (1LU<<4) 711#define PrivMode_Screen (1UL<<4)
611#define PrivMode_Autowrap (1LU<<5) 712#define PrivMode_Autowrap (1UL<<5)
612#define PrivMode_aplCUR (1LU<<6) 713#define PrivMode_aplCUR (1UL<<6)
613#define PrivMode_aplKP (1LU<<7) 714#define PrivMode_aplKP (1UL<<7)
614#define PrivMode_HaveBackSpace (1LU<<8) 715#define PrivMode_HaveBackSpace (1UL<<8)
615#define PrivMode_BackSpace (1LU<<9) 716#define PrivMode_BackSpace (1UL<<9)
616#define PrivMode_ShiftKeys (1LU<<10) 717#define PrivMode_ShiftKeys (1UL<<10)
617#define PrivMode_VisibleCursor (1LU<<11) 718#define PrivMode_VisibleCursor (1UL<<11)
618#define PrivMode_MouseX10 (1LU<<12) 719#define PrivMode_MouseX10 (1UL<<12)
619#define PrivMode_MouseX11 (1LU<<13) 720#define PrivMode_MouseX11 (1UL<<13)
620#define PrivMode_scrollBar (1LU<<14) 721#define PrivMode_scrollBar (1UL<<14)
621#define PrivMode_menuBar (1LU<<15) 722#define PrivMode_menuBar (1UL<<15)
622#define PrivMode_TtyOutputInh (1LU<<16) 723#define PrivMode_TtyOutputInh (1UL<<16)
623#define PrivMode_Keypress (1LU<<17) 724#define PrivMode_Keypress (1UL<<17)
624#define PrivMode_smoothScroll (1LU<<18) 725#define PrivMode_smoothScroll (1UL<<18)
625#define PrivMode_vt52 (1LU<<19) 726#define PrivMode_vt52 (1UL<<19)
727#define PrivMode_LFNL (1UL<<20)
626/* too annoying to implement X11 highlight tracking */ 728/* too annoying to implement X11 highlight tracking */
627/* #define PrivMode_MouseX11Track (1LU<<20) */ 729/* #define PrivMode_MouseX11Track (1LU<<21) */
628 730
629#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 731#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
630#define PrivMode(test,bit) \ 732#define PrivMode(test,bit) \
631 if (test) \ 733 if (test) \
632 PrivateModes |= (bit); \ 734 priv_modes |= (bit); \
633 else \ 735 else \
634 PrivateModes &= ~(bit) 736 priv_modes &= ~(bit)
635 737
636#ifdef ALLOW_132_MODE 738#ifdef ALLOW_132_MODE
637# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 739# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
638#else 740#else
639# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 741# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
640#endif 742#endif
641 743
642// do not change these constants lightly, there are many interdependencies 744// do not change these constants lightly, there are many interdependencies
643#define IMBUFSIZ 128 // input modifier buffer sizes 745#define IMBUFSIZ 128 // input modifier buffer sizes
644#define KBUFSZ 512 // size of keyboard mapping buffer 746#define KBUFSZ 512 // size of keyboard mapping buffer
645#define CBUFSIZ 4096 // size of command buffer 747#define CBUFSIZ 2048 // size of command buffer
646#define UBUFSIZ 4096 // character buffer 748#define UBUFSIZ 2048 // character buffer
647 749
648#ifndef PATH_MAX 750#ifndef PATH_MAX
649# define PATH_MAX 16384 751# define PATH_MAX 16384
650#endif 752#endif
651 753
679/* 781/*
680 ***************************************************************************** 782 *****************************************************************************
681 * MACRO DEFINES 783 * MACRO DEFINES
682 ***************************************************************************** 784 *****************************************************************************
683 */ 785 */
684#define MEMSET(x, y, z) memset((x), (y), (size_t)(z)) 786#define memset(x, y, z) memset((x), (y), (size_t)(z))
685#define MEMCPY(x, y, z) memcpy((void *)(x), (const void *)(y), (z)) 787#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
686#define MEMMOVE(x, y, z) memmove((void *)(x), (const void *)(y), (z)) 788#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
687#define STRCASECMP(x, y) strcasecmp((x), (y)) 789#define strcasecmp(x, y) strcasecmp((x), (y))
688#define STRNCASECMP(x, y, z) strncasecmp((x), (y), (z)) 790#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
689#define STRCPY(x, y) strcpy((char *)(x), (const char *)(y)) 791#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
690#define STRNCPY(x, y, z) strncpy((char *)(x), (const char *)(y), (z)) 792#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
691#define STRCMP(x, y) strcmp((const char *)(x), (const char *)(y)) 793#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
692#define STRNCMP(x, y, z) strncmp((const char *)(x), (const char *)(y), (z)) 794#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
693#define STRCAT(x, y) strcat((char *)(x), (const char *)(y)) 795#define strcat(x, y) strcat((char *)(x), (const char *)(y))
694#define STRNCAT(x, y, z) strncat((char *)(x), (const char *)(y), (z)) 796#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
695#define STRDUP(x) strdup((const char *)(x)) 797#define strdup(x) strdup((const char *)(x))
696#define STRLEN(x) strlen((const char *)(x)) 798#define strlen(x) strlen((const char *)(x))
697#define STRCHR(x, y) strchr((const char *)(x), (int)(y)) 799#define strchr(x, y) strchr((const char *)(x), (int)(y))
698#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y)) 800#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
801
802#define dDisp Display *disp = display->display
699 803
700/* convert pixel dimensions to row/column values. Everything as int32_t */ 804/* convert pixel dimensions to row/column values. Everything as int32_t */
701#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 805#define Pixel2Col(x) Pixel2Width((int32_t)(x))
702#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 806#define Pixel2Row(y) Pixel2Height((int32_t)(y))
703#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 807#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
704#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 808#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
705#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 809#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
706#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 810#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
707#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 811#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
708#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 812#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
709 813
710#define TermWin_TotalWidth() ((int32_t)TermWin.width) 814#define TermWin_TotalWidth() ((int32_t)this->width)
711#define TermWin_TotalHeight() ((int32_t)TermWin.height) 815#define TermWin_TotalHeight() ((int32_t)this->height)
816
817// for m >= -n, ensure remainder lies between 0..n-1
818#define MOD(m,n) (((m) + (n)) % (n))
819
820#define LINENO(n) MOD (term_start + int(n), total_rows)
821#define ROW(n) row_buf [LINENO (n)]
712 822
713/* how to build & extract colors and attributes */ 823/* how to build & extract colors and attributes */
714#define GET_BASEFG(x) (((x) & RS_fgMask)) 824#define GET_BASEFG(x) (((x) & RS_fgMask))
715#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 825#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
716#ifndef NO_BRIGHTCOLOR
717# define GET_FGCOLOR(x) \
718 ((((x) & RS_Bold) == 0 \
719 || GET_BASEFG (x) < minCOLOR \
720 || GET_BASEFG (x) >= minBrightCOLOR) \
721 ? GET_BASEFG (x) \
722 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
723# define GET_BGCOLOR(x) \
724 ((((x) & RS_Blink) == 0 \
725 || GET_BASEBG (x) < minCOLOR \
726 || GET_BASEBG (x) >= minBrightCOLOR) \
727 ? GET_BASEBG (x) \
728 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
729#else
730# define GET_FGCOLOR(x) GET_BASEFG(x)
731# define GET_BGCOLOR(x) GET_BASEBG(x)
732#endif
733 826
734#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 827#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
735#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 828#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
829
830#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
831#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
736 832
737#define GET_ATTR(x) (((x) & RS_attrMask)) 833#define GET_ATTR(x) (((x) & RS_attrMask))
738#define GET_BGATTR(x) \ 834#define GET_BGATTR(x) \
739 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 835 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
740 | (((x) & RS_fgMask)<<Color_Bits)) \ 836 | (((x) & RS_fgMask)<<Color_Bits)) \
741 : ((x) & (RS_attrMask | RS_bgMask))) 837 : ((x) & (RS_attrMask | RS_bgMask)))
742#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 838#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
743#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 839#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
744#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 840#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
841
842#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
745 843
746#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 844#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
747#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 845#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
846
847#if ENABLE_STYLES
848# define FONTSET(style) fontset[GET_STYLE (style)]
849#else
850# define FONTSET(style) fontset[0]
851#endif
748 852
749#ifdef HAVE_SCROLLBARS 853#ifdef HAVE_SCROLLBARS
750# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 854# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
751#else 855#else
752# define scrollbar_TotalWidth() (0) 856# define scrollbar_TotalWidth() (0)
776#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 880#define scrollbar_size() (scrollBar.end - scrollBar.beg \
777 - scrollbar_minheight ()) 881 - scrollbar_minheight ())
778 882
779#if (MENUBAR_MAX > 1) 883#if (MENUBAR_MAX > 1)
780/* rendition style flags */ 884/* rendition style flags */
781# define menuBar_height() (TermWin.fheight + SHADOW) 885# define menuBar_height() (fheight + SHADOW)
782# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 886# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
783# define isMenuBarWindow(w) ((w) == menuBar.win) 887# define isMenuBarWindow(w) ((w) == menuBar.win)
784#else 888#else
785# define menuBar_height() (0) 889# define menuBar_height() (0)
786# define menuBar_TotalHeight() (0) 890# define menuBar_TotalHeight() (0)
790#ifdef XPM_BACKGROUND 894#ifdef XPM_BACKGROUND
791# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 895# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
792#else 896#else
793# define XPMClearArea(a, b, c, d, e, f, g) 897# define XPMClearArea(a, b, c, d, e, f, g)
794#endif 898#endif
795
796#ifndef STRICT_FONT_CHECKING
797# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
798#endif
799
800#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
801#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
802 899
803#ifdef UTMP_SUPPORT 900#ifdef UTMP_SUPPORT
804# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 901# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
805# undef HAVE_UTMPX_H 902# undef HAVE_UTMPX_H
806# undef HAVE_STRUCT_UTMPX 903# undef HAVE_STRUCT_UTMPX
831#ifdef DEBUG_MAIN 928#ifdef DEBUG_MAIN
832# define D_MAIN(x) fprintf x ; fputc('\n', stderr) 929# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
833#else 930#else
834# define D_MAIN(x) 931# define D_MAIN(x)
835#endif 932#endif
836#ifdef DEBUG_SCREEN
837# define D_SCREEN(x) fprintf x ; fputc('\n', stderr)
838#else
839# define D_SCREEN(x)
840#endif
841#ifdef DEBUG_SELECT
842# define D_SELECT(x) fprintf x ; fputc('\n', stderr)
843#else
844# define D_SELECT(x)
845#endif
846#ifdef DEBUG_SIZE 933#ifdef DEBUG_SIZE
847# define D_SIZE(x) fprintf x ; fputc('\n', stderr) 934# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
848#else 935#else
849# define D_SIZE(x) 936# define D_SIZE(x)
850#endif 937#endif
851#ifdef DEBUG_X
852# define D_X(x) fprintf x ; fputc('\n', stderr)
853#else
854# define D_X(x)
855#endif
856 938
857extern class rxvt_failure_exception { } rxvt_failure_exception; 939extern class rxvt_failure_exception { } rxvt_failure_exception;
858 940
859typedef callback1<void, const char *> log_callback; 941typedef callback1<void, const char *> log_callback;
942typedef callback1<int, int> getfd_callback;
860 943
861extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 944extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
862extern void rxvt_log (const char *fmt, ...); 945extern void rxvt_log (const char *fmt, ...);
863extern void rxvt_warn (const char *fmt, ...); 946extern void rxvt_warn (const char *fmt, ...);
864extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 947extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
891// primivite wrapper around mbstate_t to ensure initialisation 974// primivite wrapper around mbstate_t to ensure initialisation
892struct mbstate { 975struct mbstate {
893 mbstate_t mbs; 976 mbstate_t mbs;
894 977
895 operator mbstate_t *() { return &mbs; } 978 operator mbstate_t *() { return &mbs; }
896 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); } 979 void reset () { memset (&mbs, 0, sizeof (mbs)); }
897 mbstate () { reset (); } 980 mbstate () { reset (); }
898}; 981};
982
983#define UNICODE_MASK 0x1fffffUL
899 984
900#if UNICODE3 985#if UNICODE3
901# define COMPOSE_LO 0x40000000UL 986# define COMPOSE_LO 0x40000000UL
902# define COMPOSE_HI 0x400fffffUL 987# define COMPOSE_HI 0x400fffffUL
903# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 988# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
933 1018
934extern class rxvt_composite_vec rxvt_composite; 1019extern class rxvt_composite_vec rxvt_composite;
935#endif 1020#endif
936 1021
937 1022
1023#ifdef KEYSYM_RESOURCE
1024 class keyboard_manager;
1025#endif
1026
938struct rxvt_term : rxvt_vars { 1027struct rxvt_term : zero_initialized, rxvt_vars {
939 log_callback *log_hook; // log error messages through this hook, if != 0 1028 log_callback *log_hook; // log error messages through this hook, if != 0
1029 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1030
1031#if ENABLE_PERL
1032 void *self; // perl's $self
1033#endif
940 1034
941 struct mbstate mbstate; // current input multibyte state 1035 struct mbstate mbstate; // current input multibyte state
942 1036
943 unsigned char want_refresh:1, 1037 unsigned char want_refresh:1,
944#ifdef TRANSPARENT 1038#ifdef TRANSPARENT
959 hidden_text:1, 1053 hidden_text:1,
960#endif 1054#endif
961#ifdef POINTER_BLANK 1055#ifdef POINTER_BLANK
962 hidden_pointer:1, 1056 hidden_pointer:1,
963#endif 1057#endif
964// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1058 enc_utf8:1, /* wether locale uses utf-8 */
1059 seen_input:1, /* wether we have seen some program output yet */
1060 seen_resize:1, /* wether we had a resize event */
965 parsed_geometry:1; 1061 parsed_geometry:1;
966 1062
967 unsigned char refresh_type, 1063 unsigned char refresh_type,
968#ifdef UTMP_SUPPORT
969 next_utmp_action,
970#endif
971#ifndef NO_SETOWNER_TTYDEV
972 next_tty_action,
973#endif
974#ifdef META8_OPTION 1064#ifdef META8_OPTION
975 meta_char, /* Alt-key prefix */ 1065 meta_char, /* Alt-key prefix */
976#endif 1066#endif
977 scrollbar_align, 1067 scrollbar_align,
978 selection_wait, 1068 selection_wait,
979 selection_type; 1069 selection_type;
980/* ---------- */ 1070/* ---------- */
981 short rvideo; 1071 short rvideo;
982 int16_t num_scr; /* screen: number lines scrolled */ 1072 int num_scr; /* screen: number lines scrolled */
983 unsigned int prev_ncol, /* screen: previous number of columns */ 1073 int prev_ncol, /* screen: previous number of columns */
984 prev_nrow; /* screen: previous number of rows */ 1074 prev_nrow; /* screen: previous number of rows */
985/* ---------- */ 1075/* ---------- */
986 rend_t rstyle; 1076 rend_t rstyle;
987/* ---------- */ 1077/* ---------- */
988 uint32_t pixcolor_set[NPIXCLR_SETS]; 1078 uint32_t pixcolor_set[NPIXCLR_SETS];
1019# ifdef POINTER_BLANK 1109# ifdef POINTER_BLANK
1020 pointerBlankDelay, 1110 pointerBlankDelay,
1021# endif 1111# endif
1022 allowedxerror; 1112 allowedxerror;
1023/* ---------- */ 1113/* ---------- */
1024 unsigned int ModMetaMask, 1114 unsigned int ModLevel3Mask,
1115 ModMetaMask,
1025 ModNumLockMask, 1116 ModNumLockMask;
1026 old_width, /* last used width in screen resize */ 1117 int old_width, /* last used width in screen resize */
1027 old_height, /* last used height in screen resize */ 1118 old_height; /* last used height in screen resize */
1028#ifndef NO_BRIGHTCOLOR
1029 colorfgbg,
1030#endif
1031 ttymode;
1032 unsigned long PrivateModes, 1119 unsigned long priv_modes,
1033 SavedModes; 1120 SavedModes;
1034/* ---------- */ 1121/* ---------- */
1035 Atom xa[NUM_XA]; 1122 Atom xa[NUM_XA];
1036/* ---------- */ 1123/* ---------- */
1037#ifdef MENUBAR 1124#ifdef MENUBAR
1063#endif 1150#endif
1064/* ---------- */ 1151/* ---------- */
1065 Time selection_time, 1152 Time selection_time,
1066 selection_request_time; 1153 selection_request_time;
1067 pid_t cmd_pid; /* process id of child */ 1154 pid_t cmd_pid; /* process id of child */
1068 gid_t ttygid; 1155 char * incr_buf;
1069#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 1156 size_t incr_buf_size, incr_buf_fill;
1070 uid_t euid;
1071 gid_t egid;
1072#endif
1073/* ---------- */ 1157/* ---------- */
1074 Cursor leftptr_cursor; 1158 Cursor leftptr_cursor;
1075#ifdef POINTER_BLANK
1076 Cursor blank_cursor;
1077#endif
1078/* ---------- */ 1159/* ---------- */
1079 const char *ttydev; /* pty/tty name */
1080#ifndef NO_BACKSPACE_KEY 1160#ifndef NO_BACKSPACE_KEY
1081 const char *key_backspace; 1161 const char *key_backspace;
1082#endif 1162#endif
1083#ifndef NO_DELETE_KEY 1163#ifndef NO_DELETE_KEY
1084 const char *key_delete; 1164 const char *key_delete;
1085#endif
1086#ifdef USE_XIM
1087 rxvt_xim *input_method;
1088 XIC Input_Context;
1089 XIMStyle input_style;
1090 int event_type;
1091#endif 1165#endif
1092 struct mouse_event MEvent; 1166 struct mouse_event MEvent;
1093 XComposeStatus compose; 1167 XComposeStatus compose;
1094 ttymode_t tio; 1168 ttymode_t tio;
1095#ifdef UTMP_SUPPORT 1169#ifdef UTMP_SUPPORT
1107 row_col_t oldcursor; 1181 row_col_t oldcursor;
1108#ifdef XPM_BACKGROUND 1182#ifdef XPM_BACKGROUND
1109 bgPixmap_t bgPixmap; 1183 bgPixmap_t bgPixmap;
1110 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1184 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1111#endif 1185#endif
1112#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1113 struct stat ttyfd_stat; /* original status of our tty */
1114#endif
1115#ifdef MENUBAR 1186#ifdef MENUBAR
1116 menu_t *ActiveMenu, /* currently active menu */ 1187 menu_t *ActiveMenu, /* currently active menu */
1117 *BuildMenu; /* the menu currently being built */ 1188 *BuildMenu; /* the menu currently being built */
1118 bar_t *CurrentBar; 1189 bar_t *CurrentBar;
1119# if ! (MENUBAR_MAX > 1) 1190# if ! (MENUBAR_MAX > 1)
1125#endif 1196#endif
1126#ifdef POINTER_BLANK 1197#ifdef POINTER_BLANK
1127 struct timeval lastmotion; 1198 struct timeval lastmotion;
1128#endif 1199#endif
1129 1200
1201#if ENABLE_OVERLAY
1202 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1203 text_t **ov_text;
1204 rend_t **ov_rend;
1205
1206 void scr_swap_overlay ();
1207 void scr_overlay_new (int x, int y, int w, int h);
1208 void scr_overlay_off ();
1209 void scr_overlay_set (int x, int y,
1210 text_t text,
1211 rend_t rend = OVERLAY_RSTYLE);
1212 void scr_overlay_set (int x, int y, const char *s);
1213 void scr_overlay_set (int x, int y, const wchar_t *s);
1214#endif
1215
1130 vector<void *> allocated; // free these memory blocks with free() 1216 vector<void *> allocated; // free these memory blocks with free()
1131 1217
1132 char *env_windowid; /* environmental variable WINDOWID */ 1218 char *env_windowid; /* environmental variable WINDOWID */
1133 char *env_display; /* environmental variable DISPLAY */ 1219 char *env_display; /* environmental variable DISPLAY */
1134 char *env_term; /* environmental variable TERM */ 1220 char *env_term; /* environmental variable TERM */
1135 char *env_colorfgbg; 1221 char *env_colorfgbg;
1136 char *locale; 1222 char *locale;
1137#if 0
1138 char *codeset;
1139#endif
1140 char charsets[4]; 1223 char charsets[4];
1141 unsigned char *v_buffer; /* pointer to physical buffer */ 1224 unsigned char *v_buffer; /* pointer to physical buffer */
1142 unsigned int v_buflen; /* size of area to write */ 1225 unsigned int v_buflen; /* size of area to write */
1143 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1226 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1227
1144#ifdef KEYSYM_RESOURCE 1228#ifdef KEYSYM_RESOURCE
1145 const unsigned char *Keysym_map[256]; 1229 keyboard_manager *keyboard;
1146#endif 1230#endif
1231
1147 const char *rs[NUM_RESOURCES]; 1232 const char *rs[NUM_RESOURCES];
1148 /* command input buffering */ 1233 /* command input buffering */
1149 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1234 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1150 unsigned char cmdbuf_base[CBUFSIZ]; 1235 unsigned char cmdbuf_base[CBUFSIZ];
1151 1236
1152 rxvt_salloc *talloc; // text line allocator 1237 rxvt_salloc *talloc; // text line allocator
1153 rxvt_salloc *ralloc; // rend line allocator 1238 rxvt_salloc *ralloc; // rend line allocator
1154 1239
1155 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1240 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1156 1241
1242#if ENABLE_FRILLS || ISO_14755
1243 // ISO 14755 entry support
1244 unicode_t iso14755buf;
1245 void commit_iso14755 ();
1246 int hex_keyval (XKeyEvent &ev);
1247# if ISO_14755
1248 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1249 void iso14755_54 (int x, int y);
1250# endif
1251#endif
1252
1253 // modifies first argument(!)
1157 void paste (const unsigned char *data, unsigned int len); 1254 void paste (unsigned char *data, unsigned int len);
1158 1255
1159 void flush (); 1256 void flush ();
1160 1257
1258#if TRANSPARENT
1161 void rootwin_cb (XEvent &xev); 1259 void rootwin_cb (XEvent &xev);
1162 xevent_watcher rootwin_ev; 1260 xevent_watcher rootwin_ev;
1261#endif
1163 1262
1164 void x_cb (XEvent &xev); 1263 void x_cb (XEvent &xev);
1165 xevent_watcher termwin_ev; 1264 xevent_watcher termwin_ev;
1166 xevent_watcher vt_ev; 1265 xevent_watcher vt_ev;
1167#ifdef HAVE_SCROLLBARS 1266#ifdef HAVE_SCROLLBARS
1202#endif 1301#endif
1203 void pointer_unblank (); 1302 void pointer_unblank ();
1204 1303
1205 void tt_printf (const char *fmt,...); 1304 void tt_printf (const char *fmt,...);
1206 void tt_write (const unsigned char *data, unsigned int len); 1305 void tt_write (const unsigned char *data, unsigned int len);
1306 void pty_write ();
1207 1307
1208 void tt_winch (); 1308 void tt_winch ();
1209 1309
1210 rxvt_term (); 1310 rxvt_term ();
1211 ~rxvt_term (); 1311 ~rxvt_term ();
1312 void child_exit (); // child has exited, usually destroys
1212 void destroy (); 1313 void destroy ();
1314 void emergency_cleanup ();
1213 1315
1214 bool init (int argc, const char *const *argv); 1316 bool init (int argc, const char *const *argv);
1215 bool init_vars (); 1317 bool init_vars ();
1216 1318
1217 bool pty_fill (); 1319 bool pty_fill ();
1218
1219 void *operator new (size_t s);
1220 void operator delete (void *p, size_t s);
1221 1320
1222 void init_secondary (); 1321 void init_secondary ();
1223 const char **init_resources (int argc, const char *const *argv); 1322 const char **init_resources (int argc, const char *const *argv);
1224 void init_env (); 1323 void init_env ();
1225 void set_locale (const char *locale); 1324 void set_locale (const char *locale);
1226 void init_xlocale (); 1325 void init_xlocale ();
1227 void init_command (const char *const *argv); 1326 void init_command (const char *const *argv);
1228 int run_command (const char *const *argv); 1327 void run_command (const char *const *argv);
1229 int run_child (const char *const *argv); 1328 int run_child (const char *const *argv);
1230 static void child_exited (int pid);
1231 1329
1232 void color_aliases (int idx); 1330 void color_aliases (int idx);
1233 void recolour_cursor (); 1331 void recolour_cursor ();
1234 void create_windows (int argc, const char *const *argv); 1332 void create_windows (int argc, const char *const *argv);
1235 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1333 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1236 void window_calc (unsigned int width, unsigned int height); 1334 void window_calc (unsigned int newwidth, unsigned int newheight);
1237 1335
1238#if USE_XIM 1336#if USE_XIM
1337 rxvt_xim *input_method;
1338 XIC Input_Context;
1339 XIMStyle input_style;
1340 XPoint spot; // most recently sent spot position
1341
1239 void im_destroy (); 1342 void im_destroy ();
1240 void im_cb (); im_watcher im_ev; 1343 void im_cb (); im_watcher im_ev;
1241 void im_set_size (XRectangle *size); 1344 void im_set_size (XRectangle &size);
1242 void im_set_position (XPoint *pos); 1345 void im_set_position (XPoint &pos);
1243 void im_set_color (unsigned long *fg, unsigned long *bg); 1346 void im_set_color (unsigned long &fg, unsigned long &bg);
1244 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect); 1347 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1245 1348
1246 bool IMisRunning (); 1349 bool IMisRunning ();
1247 void IMSendSpot (); 1350 void IMSendSpot ();
1248 bool IM_get_IC (const char *modifiers); 1351 bool IM_get_IC (const char *modifiers);
1249 void IMSetStatusPosition (); 1352 void IMSetStatusPosition ();
1255 1358
1256 void selection_click (int clicks, int x, int y); 1359 void selection_click (int clicks, int x, int y);
1257 void selection_extend (int x, int y, int flag); 1360 void selection_extend (int x, int y, int flag);
1258 void selection_rotate (int x, int y); 1361 void selection_rotate (int x, int y);
1259 1362
1260 /* screen (!) */
1261 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1262 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1263 int scr_scroll_text (int row1, int row2, int count, int spec);
1264 void scr_reset ();
1265 void scr_reset_realloc ();
1266 void scr_release ();
1267 void scr_clear (bool really = false);
1268 void scr_refresh (unsigned char refresh_type);
1269 bool scr_refresh_rend (rend_t mask, rend_t value);
1270 void scr_erase_screen (int mode);
1271 void scr_touch (bool refresh);
1272 void scr_expose (int x, int y, int width, int height, bool refresh);
1273 void scr_remap_chars ();
1274 void scr_remap_chars (text_t *tp, rend_t *rp);
1275
1276 /* autoconvert */ 1363 /* autoconvert */
1277 1364
1278 // command.C 1365 // command.C
1279 void lookup_key (XKeyEvent &ev); 1366 void lookup_key (XKeyEvent &ev);
1280 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1367 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1286 1373
1287 bool cmd_parse (); 1374 bool cmd_parse ();
1288 void mouse_report (XButtonEvent &ev); 1375 void mouse_report (XButtonEvent &ev);
1289 void button_press (XButtonEvent &ev); 1376 void button_press (XButtonEvent &ev);
1290 void button_release (XButtonEvent &ev); 1377 void button_release (XButtonEvent &ev);
1378 void focus_in ();
1379 void focus_out ();
1291 int check_our_parents (); 1380 int check_our_parents ();
1292#ifdef PRINTPIPE 1381#ifdef PRINTPIPE
1293 FILE *popen_printer (); 1382 FILE *popen_printer ();
1294 int pclose_printer (FILE *stream); 1383 int pclose_printer (FILE *stream);
1295#endif 1384#endif
1312 void Get_Colours (); 1401 void Get_Colours ();
1313 void get_ourmods (); 1402 void get_ourmods ();
1314 // logging.C 1403 // logging.C
1315 void makeutent (const char *pty, const char *hostname); 1404 void makeutent (const char *pty, const char *hostname);
1316 void cleanutent (); 1405 void cleanutent ();
1317 // main.C; 1406 // main.C
1318 void privileges (int mode);
1319 void privileged_utmp (char action); 1407 void privileged_utmp (rxvt_privaction action);
1320 void privileged_ttydev (char action); 1408 bool set_fonts ();
1321 bool change_font (const char *fontname); 1409 void set_string_property (Atom prop, const char *str, int len = -1);
1322 bool font_up_down (int n, int direction); 1410 void set_utf8_property (Atom prop, const char *str, int len = -1);
1323 void set_title (const char *str); 1411 void set_title (const char *str);
1324 void set_icon_name (const char *str); 1412 void set_icon_name (const char *str);
1325 void set_window_color (int idx, const char *color); 1413 void set_window_color (int idx, const char *color);
1326 void set_colorfgbg (); 1414 void set_colorfgbg ();
1327 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1415 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1328 void set_widthheight (unsigned int width, unsigned int height); 1416 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1329 1417
1330#ifdef MENUBAR 1418#ifdef MENUBAR
1331 // menubar.C 1419 // menubar.C
1332 void menuitem_free (menu_t *menu, menuitem_t *item); 1420 void menuitem_free (menu_t *menu, menuitem_t *item);
1333 int action_dispatch (action_t *action); 1421 int action_dispatch (action_t *action);
1359 void menubar_control (XButtonEvent &ev); 1447 void menubar_control (XButtonEvent &ev);
1360 void map_menuBar (int map); 1448 void map_menuBar (int map);
1361#endif 1449#endif
1362 1450
1363 // screen.C 1451 // screen.C
1452
1453 void lalloc (line_t &l)
1454 {
1455 l.t = (text_t *)talloc->alloc ();
1456 l.r = (rend_t *)ralloc->alloc ();
1457 }
1458
1459#if 0
1460 void lfree (line_t &l)
1461 {
1462 talloc->free (l.t);
1463 ralloc->free (l.r);
1464 }
1465#endif
1466
1467 void lresize (line_t &l)
1468 {
1469 if (!l.t)
1470 return;
1471
1472 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1473 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1474
1475 l.l = min (l.l, ncol);
1476
1477 if (ncol > prev_ncol)
1478 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1479 }
1480
1481 int fgcolor_of (rend_t r)
1482 {
1483 int base = GET_BASEFG (r);
1484#ifndef NO_BRIGHTCOLOR
1485 if (r & RS_Bold
1486# if ENABLE_STYLES
1487 && OPTION (Opt_intensityStyles)
1488# endif
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR;
1491#endif
1492 return base;
1493 }
1494
1495 int bgcolor_of (rend_t r)
1496 {
1497 int base = GET_BASEBG (r);
1498#ifndef NO_BRIGHTCOLOR
1499 if (r & RS_Blink
1500# if ENABLE_STYLES
1501 && OPTION (Opt_intensityStyles)
1502# endif
1503 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1504 base += minBrightCOLOR - minCOLOR;
1505#endif
1506 return base;
1507 }
1508
1509 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1510 void scr_blank_screen_mem (line_t &l, rend_t efs);
1511 int scr_scroll_text (int row1, int row2, int count);
1512 void scr_reset ();
1513 void scr_release ();
1514 void scr_clear (bool really = false);
1515 void scr_refresh (unsigned char refresh_type);
1516 bool scr_refresh_rend (rend_t mask, rend_t value);
1517 void scr_erase_screen (int mode);
1518#if ENABLE_FRILLS
1519 void scr_erase_savelines ();
1520 void scr_backindex ();
1521 void scr_forwardindex ();
1522#endif
1523 void scr_touch (bool refresh);
1524 void scr_expose (int x, int y, int width, int height, bool refresh);
1525 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1526 void scr_recolour ();
1527 void scr_remap_chars ();
1528 void scr_remap_chars (const line_t &l);
1529
1364 void scr_poweron (); 1530 void scr_poweron ();
1365 void scr_cursor (int mode); 1531 void scr_cursor (int mode);
1532 void scr_do_wrap ();
1366 int scr_change_screen (int scrn); 1533 int scr_change_screen (int scrn);
1367 void scr_color (unsigned int color, int fgbg); 1534 void scr_color (unsigned int color, int fgbg);
1368 void scr_rendition (int set, int style); 1535 void scr_rendition (int set, int style);
1369 void scr_add_lines (const unicode_t *str, int nlines, int len); 1536 void scr_add_lines (const unicode_t *str, int nlines, int len);
1370 void scr_backspace (); 1537 void scr_backspace ();
1371 void scr_tab (int count); 1538 void scr_tab (int count, bool ht = false);
1372 void scr_backindex ();
1373 void scr_forwardindex ();
1374 void scr_gotorc (int row, int col, int relative); 1539 void scr_gotorc (int row, int col, int relative);
1375 void scr_index (enum page_dirn direction); 1540 void scr_index (enum page_dirn direction);
1376 void scr_erase_line (int mode); 1541 void scr_erase_line (int mode);
1377 void scr_E (); 1542 void scr_E ();
1378 void scr_insdel_lines (int count, int insdel); 1543 void scr_insdel_lines (int count, int insdel);
1388 void set_font_style (); 1553 void set_font_style ();
1389 void scr_charset_choose (int set); 1554 void scr_charset_choose (int set);
1390 void scr_charset_set (int set, unsigned int ch); 1555 void scr_charset_set (int set, unsigned int ch);
1391 int scr_move_to (int y, int len); 1556 int scr_move_to (int y, int len);
1392 int scr_page (enum page_dirn direction, int nlines); 1557 int scr_page (enum page_dirn direction, int nlines);
1393 int scr_changeview (uint16_t oldviewstart); 1558 int scr_changeview (unsigned int oldviewstart);
1394 void scr_bell (); 1559 void scr_bell ();
1395 void scr_printscreen (int fullhist); 1560 void scr_printscreen (int fullhist);
1396 void scr_reverse_selection (); 1561 void scr_reverse_selection ();
1397 void scr_dump (int fd); 1562 void scr_dump (int fd);
1398 void selection_check (int check_more); 1563 void selection_check (int check_more);
1399 int selection_paste (Window win, Atom prop, bool delete_prop); 1564 void selection_paste (Window win, Atom prop, bool delete_prop);
1400 void selection_property (Window win, Atom prop); 1565 void selection_property (Window win, Atom prop);
1401 void selection_request (Time tm, int x, int y); 1566 void selection_request (Time tm, int x, int y);
1402 int selection_request_other (Atom target, int selnum); 1567 int selection_request_other (Atom target, int selnum);
1403 void selection_clear (); 1568 void selection_clear ();
1404 void selection_make (Time tm); 1569 void selection_make (Time tm);
1570 bool selection_grab (Time tm);
1405 void selection_start_colrow (int col, int row); 1571 void selection_start_colrow (int col, int row);
1406 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1572 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1407 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1573 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1408 void selection_remove_trailing_spaces (); 1574 void selection_remove_trailing_spaces ();
1409 void selection_send (const XSelectionRequestEvent &rq); 1575 void selection_send (const XSelectionRequestEvent &rq);
1439 1605
1440 // xdefaults.C 1606 // xdefaults.C
1441 void get_options (int argc, const char *const *argv); 1607 void get_options (int argc, const char *const *argv);
1442 int parse_keysym (const char *str, const char *arg); 1608 int parse_keysym (const char *str, const char *arg);
1443 void get_xdefaults (FILE *stream, const char *name); 1609 void get_xdefaults (FILE *stream, const char *name);
1444 void extract_resources (Display *display, const char *name); 1610 void extract_resources ();
1445 // xpm.C 1611 // xpm.C
1446 int scale_pixmap (const char *geom); 1612 int scale_pixmap (const char *geom);
1447 void resize_pixmap (); 1613 void resize_pixmap ();
1448 Pixmap set_bgPixmap (const char *file); 1614 Pixmap set_bgPixmap (const char *file);
1449}; 1615};
1456#ifdef PROTOTYPES 1622#ifdef PROTOTYPES
1457# define __PROTO(p) p 1623# define __PROTO(p) p
1458#else 1624#else
1459# define __PROTO(p) () 1625# define __PROTO(p) ()
1460#endif 1626#endif
1461#include "protos.h"
1462 1627
1463#ifdef DEBUG_malloc 1628#ifdef DEBUG_malloc
1464# include "dmalloc.h" /* This comes last */ 1629# include "dmalloc.h" /* This comes last */
1465#endif 1630#endif
1466 1631

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines