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.40 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.124 by root, Sun Sep 5 09:54:28 2004 UTC

2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include "rxvtlib.h" 4#include "rxvtlib.h"
5 5
6#include "feature.h" 6#include "feature.h"
7
8#include <limits.h>
7 9
8#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
9#include <X11/keysym.h> 11#include <X11/keysym.h>
10#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
11#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS
15#include <X11/Xmd.h>
16#endif
12 17
13#include "defaultfont.h" 18#include "encoding.h"
14#include "rxvtcolor.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h"
15#include "iom.h" 21#include "iom.h"
16#include "salloc.h" 22#include "salloc.h"
17
18#include <wchar.h>
19 23
20/* 24/*
21 ***************************************************************************** 25 *****************************************************************************
22 * SYSTEM HACKS 26 * SYSTEM HACKS
23 ***************************************************************************** 27 *****************************************************************************
24 */ 28 */
25/* Consistent defines - please report on the necessity 29/* Consistent defines - please report on the necessity
26 * @ Unixware: defines (__svr4__) 30 * @ Unixware: defines (__svr4__)
27 */ 31 */
28#if defined (SVR4) && !defined (__svr4__) 32#if defined (SVR4) && !defined (__svr4__)
29# define __svr4__ 33# define __svr4__ 1
30#endif 34#endif
31#if defined (sun) && !defined (__sun__) 35#if defined (sun) && !defined (__sun__)
32# define __sun__ 36# define __sun__ 1
33#endif 37#endif
34
35 38
36#ifndef HAVE_XPOINTER 39#ifndef HAVE_XPOINTER
37typedef char *XPointer; 40typedef char *XPointer;
38#endif 41#endif
39 42
65# define STDERR_FILENO 2 68# define STDERR_FILENO 2
66#endif 69#endif
67 70
68#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
69# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
70# define NO_SETOWNER_TTYDEV 73# define NO_SETOWNER_TTYDEV 1
71# endif 74# endif
72#endif 75#endif
73#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY) 76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
74# define NO_SETOWNER_TTYDEV 77# define NO_SETOWNER_TTYDEV 1
75#endif 78#endif
79
80/*
81 *****************************************************************************
82 * PROTOTYPES
83 *****************************************************************************
84 */
85RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size);
91char * rxvt_wcstombs (const wchar_t *str, int len);
92char * rxvt_strdup (const char *str);
93char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...);
97void rxvt_fatal (const char *fmt,...);
98void rxvt_exit_failure ();
99int rxvt_Str_match (const char *s1, const char *s2);
100const char * rxvt_Str_skip_space (const char *str);
101char * rxvt_Str_trim (char *str);
102int rxvt_Str_escaped (char *str);
103char ** rxvt_splitcommastring (const char *cs);
104char * rxvt_File_find (const char *file, const char *ext, const char *path);
105void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
106void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
107
108void rxvt_privileges (rxvt_privaction action);
76 109
77/* 110/*
78 ***************************************************************************** 111 *****************************************************************************
79 * STRUCTURES AND TYPEDEFS 112 * STRUCTURES AND TYPEDEFS
80 ***************************************************************************** 113 *****************************************************************************
90#endif 123#endif
91 124
92/* If we're using either the rxvt scrollbar or menu bars, keep the 125/* If we're using either the rxvt scrollbar or menu bars, keep the
93 * scrollColor resource. 126 * scrollColor resource.
94 */ 127 */
95#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 128#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
96# define KEEP_SCROLLCOLOR 1 129# define KEEP_SCROLLCOLOR 1
97#else 130#else
98# undef KEEP_SCROLLCOLOR 131# undef KEEP_SCROLLCOLOR
99#endif 132#endif
100 133
113 int clicks; 146 int clicks;
114 Time time; /* milliseconds */ 147 Time time; /* milliseconds */
115 unsigned int state; /* key or button mask */ 148 unsigned int state; /* key or button mask */
116 unsigned int button; /* detail */ 149 unsigned int button; /* detail */
117}; 150};
118
119#ifndef min
120# define min(a,b) (((a) < (b)) ? (a) : (b))
121# define max(a,b) (((a) > (b)) ? (a) : (b))
122#endif
123 151
124#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 152#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
125#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 153#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
126#define SWAP_IT(one, two, typeof) \ 154#define SWAP_IT(one, two, typeof) \
127 do { \ 155 do { \
131#define BOUND_POSITIVE_INT16(val) \ 159#define BOUND_POSITIVE_INT16(val) \
132 (int16_t) ((val) <= 0 \ 160 (int16_t) ((val) <= 0 \
133 ? 0 \ 161 ? 0 \
134 : min ((val), (((uint16_t)-1)>>1))) 162 : min ((val), (((uint16_t)-1)>>1)))
135 163
164#if ENABLE_FRILLS
165typedef struct _mwmhints {
166 CARD32 flags;
167 CARD32 functions;
168 CARD32 decorations;
169 INT32 input_mode;
170 CARD32 status;
171} MWMHints;
172#endif
173
136/* 174/*
137 ***************************************************************************** 175 *****************************************************************************
138 * NORMAL DEFINES 176 * NORMAL DEFINES
139 ***************************************************************************** 177 *****************************************************************************
140 */ 178 */
141 179
142#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
143# error if you disable both selection styles, how can you select, silly?
144#endif
145
146#define APL_CLASS "XTerm" /* class name */
147#define APL_SUBCLASS "Rxvt" /* also check resources under this name */
148#define APL_NAME "rxvt" /* normal name */
149
150/* COLORTERM, TERM environment variables */ 180/* COLORTERM, TERM environment variables */
151#define COLORTERMENV "rxvt" 181#define COLORTERMENV "rxvt"
152#ifdef XPM_BACKGROUND 182#ifdef XPM_BACKGROUND
153# define COLORTERMENVFULL COLORTERMENV "-xpm" 183# define COLORTERMENVFULL COLORTERMENV "-xpm"
154#else 184#else
155# define COLORTERMENVFULL COLORTERMENV 185# define COLORTERMENVFULL COLORTERMENV
156#endif 186#endif
157#ifndef TERMENV 187#ifndef TERMENV
158# define TERMENV "xterm" 188# define TERMENV "rxvt-unicode"
159#endif 189#endif
160 190
161#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 191#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
162# define NO_MOUSE_REPORT_SCROLLBAR 192# define NO_MOUSE_REPORT_SCROLLBAR 1
163#endif 193#endif
164 194
165#ifdef NO_RESOURCES 195#ifdef NO_RESOURCES
166# undef USE_XGETDEFAULT 196# undef USE_XGETDEFAULT
197#endif
198
199#if ISO_14755
200# define ENABLE_OVERLAY 1
167#endif 201#endif
168 202
169/* now look for other badly set stuff */ 203/* now look for other badly set stuff */
170 204
171#if !defined (EACCESS) && defined(EAGAIN) 205#if !defined (EACCESS) && defined(EAGAIN)
180#define menuBar_esc 10 214#define menuBar_esc 10
181#define scrollBar_esc 30 215#define scrollBar_esc 30
182#define menuBar_margin 2 /* margin below text */ 216#define menuBar_margin 2 /* margin below text */
183 217
184#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 218#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
185# define HAVE_SCROLLBARS 219# define HAVE_SCROLLBARS 1
186#endif 220#endif
187 221
188/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 222/* width of scrollBar, menuBar shadow, must be 1 or 2 */
189#ifdef HALFSHADOW 223#ifdef HALFSHADOW
190# define SHADOW 1 224# define SHADOW 1
274enum { 308enum {
275 NO_REFRESH = 0 , /* Window not visible at all! */ 309 NO_REFRESH = 0 , /* Window not visible at all! */
276 FAST_REFRESH = 1<<0, /* Fully exposed window */ 310 FAST_REFRESH = 1<<0, /* Fully exposed window */
277 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 311 SLOW_REFRESH = 1<<1, /* Partially exposed window */
278 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */ 312 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
279 REFRESH_BOUNDS = 1<<3
280}; 313};
281 314
282#ifdef NO_SECONDARY_SCREEN 315#ifdef NO_SECONDARY_SCREEN
283# define NSCREENS 0 316# define NSCREENS 0
284#else 317#else
285# define NSCREENS 1 318# define NSCREENS 1
286#endif 319#endif
287
288#define IGNORE 0
289#define SAVE 's'
290#define RESTORE 'r'
291 320
292/* special (internal) prefix for font commands */ 321/* special (internal) prefix for font commands */
293#define FONT_CMD '#' 322#define FONT_CMD '#'
294#define FONT_DN "#-" 323#define FONT_DN "#-"
295#define FONT_UP "#+" 324#define FONT_UP "#+"
296 325
297/* flags for rxvt_scr_gotorc () */ 326/* flags for rxvt_scr_gotorc () */
298enum { 327enum {
299 C_RELATIVE = 1 , /* col movement is relative */ 328 C_RELATIVE = 1 , /* col movement is relative */
300 R_RELATIVE = 2, /* row movement is relative */ 329 R_RELATIVE = 2, /* row movement is relative */
301 RELATIVE = 1 | 2 330 RELATIVE = 1 | 2,
302}; 331};
303 332
304/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 333/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
305enum { 334enum {
306 INSERT = -1, /* don't change these values */ 335 INSERT = -1, /* don't change these values */
307 DELETE = +1, 336 DELETE = +1,
308 ERASE = +2 337 ERASE = +2,
309}; 338};
310 339
311/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 340/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
312enum page_dirn { 341enum page_dirn {
313 UP, 342 UP,
314 DN, 343 DN,
315 NO_DIR 344 NO_DIR,
316}; 345};
317 346
318/* arguments for rxvt_scr_change_screen () */ 347/* arguments for rxvt_scr_change_screen () */
319enum { 348enum {
320 PRIMARY = 0, 349 PRIMARY = 0,
321 SECONDARY 350 SECONDARY,
322}; 351};
323 352
324#define RS_None 0 /* Normal */ 353#define RS_None 0 /* Normal */
325 354
326#define RS_fgMask 0x000001FFu /* 512 colors */ 355#define RS_fgMask 0x0000007fUL /* 128 colors */
327#define RS_bgMask 0x0003FE00u /* 512 colors */ 356#define RS_bgMask 0x00003f80UL /* 128 colors */
328#define RS_Bold 0x00040000u /* bold */ 357
358// font styles
359#define RS_Bold 0x00004000UL // value 1
360#define RS_Italic 0x00008000UL // value 2
361
362// fake styles
329#define RS_Blink 0x00080000u /* blink */ 363#define RS_Blink 0x00010000UL /* blink */
330#define RS_RVid 0x00100000u /* reverse video */ 364#define RS_RVid 0x00020000UL /* reverse video */
331#define RS_Uline 0x00200000u /* underline */ 365#define RS_Uline 0x00040000UL /* underline */
332 366
333#define RS_fontMask 0xffc00000u /* plenty(?) of fonts */ 367// 5 bits still to go
334#define RS_fontShift 22
335 368
369// other flags
370#define RS_Careful 0x80000000UL /* be careful when drawing these */
371
372#define RS_styleCount 4
373#define RS_styleMask (RS_Bold | RS_Italic)
374#define RS_styleShift 14
375
336#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 376#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
337#define RS_attrMask (RS_baseattrMask|RS_fontMask) 377#define RS_attrMask (RS_baseattrMask | RS_fontMask)
378
379#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
380#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
381#define RS_fontShift 24
382
383#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
384#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
338 385
339#define Sel_none 0 /* Not waiting */ 386#define Sel_none 0 /* Not waiting */
340#define Sel_normal 0x01 /* normal selection */ 387#define Sel_normal 0x01 /* normal selection */
341#define Sel_incr 0x02 /* incremental selection */ 388#define Sel_incr 0x02 /* incremental selection */
342#define Sel_direct 0x00 389#define Sel_direct 0x00
350enum { 397enum {
351 C0_NUL = 0x00, 398 C0_NUL = 0x00,
352 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 399 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
353 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 400 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
354 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 401 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
355 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1 402 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
356}; 403};
357#define CHAR_ST 0x9c /* 0234 */ 404#define CHAR_ST 0x9c /* 0234 */
358 405
359/* 406/*
360 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 407 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
361 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 408 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
362 */ 409 */
410enum {
363#define XTerm_name 0 411 XTerm_name = 0,
364#define XTerm_iconName 1 412 XTerm_iconName = 1,
365#define XTerm_title 2 413 XTerm_title = 2,
414 XTerm_property = 3, // change X property
366#define XTerm_Color 4 /* change colors */ 415 XTerm_Color = 4, // change colors
416 XTerm_Color00 = 10, // not implemented, CLASH!
417 XTerm_Color01 = 11, // not implemented
367#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ 418 XTerm_Color_cursor = 12, // change actual 'Cursor' color
368#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ 419 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color
420 XTerm_Color_pointer_bg = 14, // not implemented
421 XTerm_Color05 = 15, // not implemented
422 XTerm_Color06 = 16, // not implemented
369#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ 423 XTerm_Color_RV = 17, // change actual 'Highlight' color
370#define XTerm_Color_BD 18 /* change actual 'Bold' color */
371#define XTerm_Color_UL 19 /* change actual 'Underline' color */
372#define XTerm_logfile 46 /* not implemented */ 424 XTerm_logfile = 46, // not implemented
373#define XTerm_font 50 425 XTerm_font = 50,
374 426
375/* 427 XTerm_konsole30 = 30, // reserved for konsole
428 XTerm_konsole31 = 31, // reserved for konsole
429 XTerm_emacs51 = 51, // reserved for emacs shell
430 /*
376 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 431 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
377 */ 432 */
378#define XTerm_locale 9 /* change locale */ 433 XTerm_Color_BD = 18, // change actual 'Bold' color
379#define XTerm_Menu 10 /* set menu item */ 434 XTerm_Color_UL = 19, // change actual 'Underline' color
380#define XTerm_Pixmap 20 /* new bg pixmap */ 435 XTerm_Pixmap = 20, // new bg pixmap
381#define XTerm_restoreFG 39 /* change default fg color */ 436 XTerm_restoreFG = 39, // change default fg color
382#define XTerm_restoreBG 49 /* change default bg color */ 437 XTerm_restoreBG = 49, // change default bg color
383#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 438 XTerm_dumpscreen = 55, // dump scrollback and all of screen
439 XTerm_locale = 701, // change locale
440 XTerm_Menu = 703, // set menu item
441 XTerm_Color_IT = 704, // change actual 'Italic' colour
442 XTerm_Color_tint = 705, // change actual tint colour
443
444 URxvt_font = 710,
445 URxvt_boldFont = 711,
446 URxvt_italicFont = 712,
447 URxvt_boldItalicFont = 713,
448};
384 449
385/* Words starting with `Color_' are colours. Others are counts */ 450/* Words starting with `Color_' are colours. Others are counts */
386/* 451/*
387 * The following comment is mostly obsolete since pixcolor_set was expanded: 452 * The following comment is mostly obsolete since pixcolor_set was expanded:
388 * We're currently upto 29 colours. Only 3 more available. The 453 * We're currently upto 29 colours. Only 3 more available. The
416 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 481 maxBrightCOLOR, /* minBrightCOLOR + 7 */
417 Color_White = maxBrightCOLOR, 482 Color_White = maxBrightCOLOR,
418#else 483#else
419 Color_White = maxCOLOR, 484 Color_White = maxCOLOR,
420#endif 485#endif
421#ifdef TTY_256COLOR
422 min256COLOR = Color_White + 1, 486 minTermCOLOR = Color_White + 1,
423 max256COLOR = minCOLOR + 255, 487 maxTermCOLOR = Color_White + 72,
424#endif
425#ifndef NO_CURSORCOLOR 488#ifndef NO_CURSORCOLOR
426 Color_cursor, 489 Color_cursor,
427 Color_cursor2, 490 Color_cursor2,
428#endif 491#endif
429 Color_pointer, 492 Color_pointer_fg,
493 Color_pointer_bg,
430 Color_border, 494 Color_border,
431#ifndef NO_BOLD_UNDERLINE_REVERSE 495#ifndef NO_BOLD_UNDERLINE_REVERSE
432 Color_BD, 496 Color_BD,
497 Color_IT,
433 Color_UL, 498 Color_UL,
434 Color_RV, 499 Color_RV,
435#endif 500#endif
436#ifdef OPTION_HC 501#ifdef OPTION_HC
437 Color_HC, 502 Color_HC,
438#endif 503#endif
439#ifdef KEEP_SCROLLCOLOR 504#ifdef KEEP_SCROLLCOLOR
440 Color_scroll, 505 Color_scroll,
441 Color_trough, 506 Color_trough,
507#endif
508#if TINTING
509 Color_tint,
442#endif 510#endif
443 NRS_COLORS, /* */ 511 NRS_COLORS, /* */
444#ifdef KEEP_SCROLLCOLOR 512#ifdef KEEP_SCROLLCOLOR
445 Color_topShadow = NRS_COLORS, 513 Color_topShadow = NRS_COLORS,
446 Color_bottomShadow, 514 Color_bottomShadow,
447 TOTAL_COLORS /* upto 30 */ 515 TOTAL_COLORS
448#else 516#else
449 TOTAL_COLORS = NRS_COLORS /* */ 517 TOTAL_COLORS = NRS_COLORS
450#endif 518#endif
451}; 519};
452 520
453#define Color_Bits 9 521#define Color_Bits 7 // 0 .. maxTermCOLOR
522
454#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 523#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
455#define NPIXCLR_BITS 32 524#define NPIXCLR_BITS 32
456
457#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
458 525
459/* 526/*
460 * Resource list 527 * Resource list
461 */ 528 */
462enum { 529enum {
466 Rs_geometry, 533 Rs_geometry,
467 Rs_reverseVideo, 534 Rs_reverseVideo,
468 Rs_color, 535 Rs_color,
469 _Rs_color = Rs_color + NRS_COLORS - 1, 536 _Rs_color = Rs_color + NRS_COLORS - 1,
470 Rs_font, 537 Rs_font,
538#if ENABLE_STYLES
539 Rs_boldFont,
540 Rs_italicFont,
541 Rs_boldItalicFont,
542#endif
471 Rs_name, 543 Rs_name,
472 Rs_title, 544 Rs_title,
473#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 545#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
474 Rs_path, 546 Rs_path,
475#endif 547#endif
515#endif 587#endif
516#ifdef USE_XIM 588#ifdef USE_XIM
517 Rs_preeditType, 589 Rs_preeditType,
518 Rs_inputMethod, 590 Rs_inputMethod,
519#endif 591#endif
520#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
521 Rs_bigfont_key,
522 Rs_smallfont_key,
523#endif
524#ifdef TRANSPARENT 592#ifdef TRANSPARENT
525 Rs_transparent, 593 Rs_transparent,
526 Rs_transparent_all, 594 Rs_transparent_all,
527#endif 595#endif
528#ifndef NO_FRILLS 596#if ENABLE_FRILLS
529 Rs_ext_bwidth, 597 Rs_ext_bwidth,
530 Rs_int_bwidth, 598 Rs_int_bwidth,
599 Rs_borderLess,
531#endif 600#endif
532 Rs_scrollBar_thickness, 601 Rs_scrollBar_thickness,
533#ifndef NO_LINESPACE 602#ifndef NO_LINESPACE
534 Rs_lineSpace, 603 Rs_lineSpace,
535#endif 604#endif
536 Rs_cutchars, 605 Rs_cutchars,
537#ifdef ACS_ASCII
538 Rs_acs_chars,
539#endif
540 Rs_modifier, 606 Rs_modifier,
541 Rs_answerbackstring, 607 Rs_answerbackstring,
542 Rs_tripleclickwords, 608 Rs_tripleclickwords,
609 Rs_insecure,
543 Rs_cursorBlink, 610 Rs_cursorBlink,
544 Rs_pointerBlank, 611 Rs_pointerBlank,
545 Rs_pointerBlankDelay, 612 Rs_pointerBlankDelay,
546 Rs_imLocale, 613 Rs_imLocale,
614#ifndef NO_SECONDARY_SCREEN
615 Rs_secondaryScreen,
616 Rs_secondaryScroll,
617#endif
618#ifdef OFF_FOCUS_FADING
619 Rs_fade,
620#endif
621#ifdef TINTING
622 Rs_shade,
623#endif
547 NUM_RESOURCES 624 NUM_RESOURCES
548}; 625};
549 626
550// see init.C:xa_names, which must be kept in sync 627// see init.C:xa_names, which must be kept in sync
551enum { 628enum {
558 XA_VT_SELECTION, 635 XA_VT_SELECTION,
559 XA_INCR, 636 XA_INCR,
560 XA_WMDELETEWINDOW, 637 XA_WMDELETEWINDOW,
561#ifdef TRANSPARENT 638#ifdef TRANSPARENT
562 XA_XROOTPMAPID, 639 XA_XROOTPMAPID,
640 XA_XSETROOTID,
563#endif 641#endif
564#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 642#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
565 XA_DNDPROTOCOL, 643 XA_DNDPROTOCOL,
566 XA_DNDSELECTION, 644 XA_DNDSELECTION,
567#endif /* OFFIX_DND */ 645#endif /* OFFIX_DND */
568 XA_CLIPBOARD, 646 XA_CLIPBOARD,
569 NUM_XA 647 NUM_XA
570}; 648};
571 649
572/* DEC private modes */ 650/* DEC private modes */
573#define PrivMode_132 (1LU<<0) 651#define PrivMode_132 (1UL<<0)
574#define PrivMode_132OK (1LU<<1) 652#define PrivMode_132OK (1UL<<1)
575#define PrivMode_rVideo (1LU<<2) 653#define PrivMode_rVideo (1UL<<2)
576#define PrivMode_relOrigin (1LU<<3) 654#define PrivMode_relOrigin (1UL<<3)
577#define PrivMode_Screen (1LU<<4) 655#define PrivMode_Screen (1UL<<4)
578#define PrivMode_Autowrap (1LU<<5) 656#define PrivMode_Autowrap (1UL<<5)
579#define PrivMode_aplCUR (1LU<<6) 657#define PrivMode_aplCUR (1UL<<6)
580#define PrivMode_aplKP (1LU<<7) 658#define PrivMode_aplKP (1UL<<7)
581#define PrivMode_HaveBackSpace (1LU<<8) 659#define PrivMode_HaveBackSpace (1UL<<8)
582#define PrivMode_BackSpace (1LU<<9) 660#define PrivMode_BackSpace (1UL<<9)
583#define PrivMode_ShiftKeys (1LU<<10) 661#define PrivMode_ShiftKeys (1UL<<10)
584#define PrivMode_VisibleCursor (1LU<<11) 662#define PrivMode_VisibleCursor (1UL<<11)
585#define PrivMode_MouseX10 (1LU<<12) 663#define PrivMode_MouseX10 (1UL<<12)
586#define PrivMode_MouseX11 (1LU<<13) 664#define PrivMode_MouseX11 (1UL<<13)
587#define PrivMode_scrollBar (1LU<<14) 665#define PrivMode_scrollBar (1UL<<14)
588#define PrivMode_menuBar (1LU<<15) 666#define PrivMode_menuBar (1UL<<15)
589#define PrivMode_TtyOutputInh (1LU<<16) 667#define PrivMode_TtyOutputInh (1UL<<16)
590#define PrivMode_Keypress (1LU<<17) 668#define PrivMode_Keypress (1UL<<17)
591#define PrivMode_smoothScroll (1LU<<18) 669#define PrivMode_smoothScroll (1UL<<18)
592#define PrivMode_vt52 (1LU<<19) 670#define PrivMode_vt52 (1UL<<19)
671#define PrivMode_LFNL (1UL<<20)
593/* too annoying to implement X11 highlight tracking */ 672/* too annoying to implement X11 highlight tracking */
594/* #define PrivMode_MouseX11Track (1LU<<18) */ 673/* #define PrivMode_MouseX11Track (1LU<<21) */
595 674
596#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 675#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
597#define PrivMode(test,bit) \ 676#define PrivMode(test,bit) \
598 if (test) \ 677 if (test) \
599 PrivateModes |= (bit); \ 678 priv_modes |= (bit); \
600 else \ 679 else \
601 PrivateModes &= ~ (bit) 680 priv_modes &= ~(bit)
602 681
603#ifdef ALLOW_132_MODE 682#ifdef ALLOW_132_MODE
604# define PrivMode_Default \
605(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 683# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
606#else 684#else
607# define PrivMode_Default \
608(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 685# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
609#endif 686#endif
610 687
611#define XDEPTH display->depth 688// do not change these constants lightly, there are many interdependencies
612#define XCMAP display->cmap
613#define XVISUAL display->visual
614
615#define IMBUFSIZ 128 /* input modifier buffer sizes */ 689#define IMBUFSIZ 128 // input modifier buffer sizes
616#ifndef BUFSIZ
617# define BUFSIZ 4096
618#endif
619#define KBUFSZ 512 /* size of keyboard mapping buffer */ 690#define KBUFSZ 512 // size of keyboard mapping buffer
691#define CBUFSIZ 4096 // size of command buffer
692#define UBUFSIZ 4096 // character buffer
693
694#ifndef PATH_MAX
695# define PATH_MAX 16384
696#endif
697
698/* Motif window hints */
699#define MWM_HINTS_FUNCTIONS (1L << 0)
700#define MWM_HINTS_DECORATIONS (1L << 1)
701#define MWM_HINTS_INPUT_MODE (1L << 2)
702#define MWM_HINTS_STATUS (1L << 3)
703/* bit definitions for MwmHints.functions */
704#define MWM_FUNC_ALL (1L << 0)
705#define MWM_FUNC_RESIZE (1L << 1)
706#define MWM_FUNC_MOVE (1L << 2)
707#define MWM_FUNC_MINIMIZE (1L << 3)
708#define MWM_FUNC_MAXIMIZE (1L << 4)
709#define MWM_FUNC_CLOSE (1L << 5)
710/* bit definitions for MwmHints.decorations */
711#define MWM_DECOR_ALL (1L << 0)
712#define MWM_DECOR_BORDER (1L << 1)
713#define MWM_DECOR_RESIZEH (1L << 2)
714#define MWM_DECOR_TITLE (1L << 3)
715#define MWM_DECOR_MENU (1L << 4)
716#define MWM_DECOR_MINIMIZE (1L << 5)
717#define MWM_DECOR_MAXIMIZE (1L << 6)
718/* bit definitions for MwmHints.inputMode */
719#define MWM_INPUT_MODELESS 0
720#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
721#define MWM_INPUT_SYSTEM_MODAL 2
722#define MWM_INPUT_FULL_APPLICATION_MODAL 3
723#define PROP_MWM_HINTS_ELEMENTS 5
620 724
621/* 725/*
622 ***************************************************************************** 726 *****************************************************************************
623 * MACRO DEFINES 727 * MACRO DEFINES
624 ***************************************************************************** 728 *****************************************************************************
625 */ 729 */
626#define MEMSET(x, y, z) memset((x), (y), (size_t)(z)) 730#define memset(x, y, z) memset((x), (y), (size_t)(z))
627#define MEMCPY(x, y, z) memcpy((void *)(x), (const void *)(y), (z)) 731#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
628#define MEMMOVE(x, y, z) memmove((void *)(x), (const void *)(y), (z)) 732#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
629#define STRCASECMP(x, y) strcasecmp((x), (y)) 733#define strcasecmp(x, y) strcasecmp((x), (y))
630#define STRNCASECMP(x, y, z) strncasecmp((x), (y), (z)) 734#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
631#define STRCPY(x, y) strcpy((char *)(x), (const char *)(y)) 735#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
632#define STRNCPY(x, y, z) strncpy((char *)(x), (const char *)(y), (z)) 736#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
633#define STRCMP(x, y) strcmp((const char *)(x), (const char *)(y)) 737#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
634#define STRNCMP(x, y, z) strncmp((const char *)(x), (const char *)(y), (z)) 738#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
635#define STRCAT(x, y) strcat((char *)(x), (const char *)(y)) 739#define strcat(x, y) strcat((char *)(x), (const char *)(y))
636#define STRNCAT(x, y, z) strncat((char *)(x), (const char *)(y), (z)) 740#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
637#define STRDUP(x) strdup((const char *)(x)) 741#define strdup(x) strdup((const char *)(x))
638#define STRLEN(x) strlen((const char *)(x)) 742#define strlen(x) strlen((const char *)(x))
639#define STRCHR(x, y) strchr((const char *)(x), (int)(y)) 743#define strchr(x, y) strchr((const char *)(x), (int)(y))
640#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y)) 744#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
641 745
642/* convert pixel dimensions to row/column values. Everything as int32_t */ 746/* convert pixel dimensions to row/column values. Everything as int32_t */
643#define Pixel2Col(x) Pixel2Width((int32_t)(x) - (int32_t)TermWin.int_bwidth) 747#define Pixel2Col(x) Pixel2Width((int32_t)(x))
644#define Pixel2Row(y) Pixel2Height((int32_t)(y) - (int32_t)TermWin.int_bwidth) 748#define Pixel2Row(y) Pixel2Height((int32_t)(y))
645#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 749#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
646#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 750#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
647#define Col2Pixel(col) ((int32_t)Width2Pixel(col) + (int32_t)TermWin.int_bwidth) 751#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
648#define Row2Pixel(row) ((int32_t)Height2Pixel(row) + (int32_t)TermWin.int_bwidth) 752#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
649#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 753#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)
650#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 754#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
651 755
652#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 756#define TermWin_TotalWidth() ((int32_t)TermWin.width)
653#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) 757#define TermWin_TotalHeight() ((int32_t)TermWin.height)
654 758
655/* how to build & extract colors and attributes */ 759/* how to build & extract colors and attributes */
656#define GET_BASEFG(x) (((x) & RS_fgMask)) 760#define GET_BASEFG(x) (((x) & RS_fgMask))
657#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 761#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
658#ifndef NO_BRIGHTCOLOR 762#ifndef NO_BRIGHTCOLOR
672# define GET_FGCOLOR(x) GET_BASEFG(x) 776# define GET_FGCOLOR(x) GET_BASEFG(x)
673# define GET_BGCOLOR(x) GET_BASEBG(x) 777# define GET_BGCOLOR(x) GET_BASEBG(x)
674#endif 778#endif
675 779
676#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 780#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
677#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 781#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
782
783#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
784#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
678 785
679#define GET_ATTR(x) (((x) & RS_attrMask)) 786#define GET_ATTR(x) (((x) & RS_attrMask))
680#define GET_BGATTR(x) \ 787#define GET_BGATTR(x) \
681 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 788 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
682 | (((x) & RS_fgMask)<<Color_Bits)) \ 789 | (((x) & RS_fgMask)<<Color_Bits)) \
683 : ((x) & (RS_attrMask | RS_bgMask))) 790 : ((x) & (RS_attrMask | RS_bgMask)))
684#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 791#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
685#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 792#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
686#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 793#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
794
795#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
687 796
688#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 797#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
689#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 798#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
799
800#if ENABLE_STYLES
801# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]
802#else
803# define FONTSET(style) TermWin.fontset[0]
804#endif
690 805
691#ifdef HAVE_SCROLLBARS 806#ifdef HAVE_SCROLLBARS
692# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 807# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
693#else 808#else
694# define scrollbar_TotalWidth() (0) 809# define scrollbar_TotalWidth() (0)
773#ifdef DEBUG_MAIN 888#ifdef DEBUG_MAIN
774# define D_MAIN(x) fprintf x ; fputc('\n', stderr) 889# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
775#else 890#else
776# define D_MAIN(x) 891# define D_MAIN(x)
777#endif 892#endif
778#ifdef DEBUG_SCREEN
779# define D_SCREEN(x) fprintf x ; fputc('\n', stderr)
780#else
781# define D_SCREEN(x)
782#endif
783#ifdef DEBUG_SELECT
784# define D_SELECT(x) fprintf x ; fputc('\n', stderr)
785#else
786# define D_SELECT(x)
787#endif
788#ifdef DEBUG_SIZE 893#ifdef DEBUG_SIZE
789# define D_SIZE(x) fprintf x ; fputc('\n', stderr) 894# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
790#else 895#else
791# define D_SIZE(x) 896# define D_SIZE(x)
792#endif 897#endif
793#ifdef DEBUG_X 898
794# define D_X(x) fprintf x ; fputc('\n', stderr) 899extern class rxvt_failure_exception { } rxvt_failure_exception;
795#else 900
796# define D_X(x) 901typedef callback1<void, const char *> log_callback;
797#endif 902
903extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
904extern void rxvt_log (const char *fmt, ...);
905extern void rxvt_warn (const char *fmt, ...);
906extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
907extern void rxvt_exit_failure () __attribute__ ((noreturn));
908
909#define SET_LOCALE(locale) rxvt_set_locale (locale)
910extern bool rxvt_set_locale (const char *locale);
798 911
799/* 912/*
800 ***************************************************************************** 913 *****************************************************************************
801 * VARIABLES 914 * VARIABLES
802 ***************************************************************************** 915 *****************************************************************************
820// primivite wrapper around mbstate_t to ensure initialisation 933// primivite wrapper around mbstate_t to ensure initialisation
821struct mbstate { 934struct mbstate {
822 mbstate_t mbs; 935 mbstate_t mbs;
823 936
824 operator mbstate_t *() { return &mbs; } 937 operator mbstate_t *() { return &mbs; }
825 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); } 938 void reset () { memset (&mbs, 0, sizeof (mbs)); }
826 mbstate () { reset (); } 939 mbstate () { reset (); }
827}; 940};
828 941
942#if UNICODE3
943# define COMPOSE_LO 0x40000000UL
944# define COMPOSE_HI 0x400fffffUL
945# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
946#else
947# define COMPOSE_LO 0xd800UL
948# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...
949# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)
950#endif
951
952#if ENABLE_COMBINING
953// compose chars are used to represent composite characters
954// that are not representable in unicode, as well as characters
955// not fitting in the BMP.
956struct compose_char {
957 unicode_t c1, c2; // any chars != NOCHAR are valid
958 compose_char (unicode_t c1, unicode_t c2)
959 : c1(c1), c2(c2)
960 { }
961};
962
963class rxvt_composite_vec {
964 vector<compose_char> v;
965public:
966 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
967 int expand (unicode_t c, wchar_t *r);
968 compose_char *operator [](text_t c)
969 {
970 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
971 ? &v[c - COMPOSE_LO]
972 : 0;
973 }
974};
975
976extern class rxvt_composite_vec rxvt_composite;
977#endif
978
979
829struct rxvt_term : rxvt_vars { 980struct rxvt_term : zero_initialized, rxvt_vars {
830 struct mbstate mbstate; 981 log_callback *log_hook; // log error messages through this hook, if != 0
982
983 struct mbstate mbstate; // current input multibyte state
831 984
832 unsigned char want_refresh:1, 985 unsigned char want_refresh:1,
833#ifdef TRANSPARENT 986#ifdef TRANSPARENT
834 want_full_refresh:1, /* awaiting full screen refresh */ 987 want_full_refresh:1, /* awaiting full screen refresh */
835#endif 988#endif
848 hidden_text:1, 1001 hidden_text:1,
849#endif 1002#endif
850#ifdef POINTER_BLANK 1003#ifdef POINTER_BLANK
851 hidden_pointer:1, 1004 hidden_pointer:1,
852#endif 1005#endif
853 parsed_geometry:1,
854 seen_input:1, /* wether any input has been seen so far */
855 enc_utf8:1; /* wether terminal reads/writes utf-8 */ 1006// enc_utf8:1, /* wether terminal reads/writes utf-8 */
1007 seen_input:1, /* wether we have seen some program output yet */
1008 seen_resize:1, /* wether we had a resize event */
1009 parsed_geometry:1;
856 1010
857 unsigned char refresh_type, 1011 unsigned char refresh_type,
858#ifdef UTMP_SUPPORT
859 next_utmp_action,
860#endif
861#ifndef NO_SETOWNER_TTYDEV
862 next_tty_action,
863#endif
864#ifdef META8_OPTION 1012#ifdef META8_OPTION
865 meta_char, /* Alt-key prefix */ 1013 meta_char, /* Alt-key prefix */
866#endif 1014#endif
867 scrollbar_align, 1015 scrollbar_align,
868 selection_wait, 1016 selection_wait,
869 selection_type; 1017 selection_type;
870/* ---------- */ 1018/* ---------- */
871 short rvideo; 1019 short rvideo;
872 int16_t num_scr; /* screen: number lines scrolled */ 1020 int num_scr; /* screen: number lines scrolled */
873 unsigned int prev_ncol, /* screen: previous number of columns */ 1021 int prev_ncol, /* screen: previous number of columns */
874 prev_nrow; /* screen: previous number of rows */ 1022 prev_nrow; /* screen: previous number of rows */
875/* ---------- */ 1023/* ---------- */
876 rend_t rstyle; 1024 rend_t rstyle;
877/* ---------- */ 1025/* ---------- */
878 uint32_t pixcolor_set[NPIXCLR_SETS]; 1026 uint32_t pixcolor_set[NPIXCLR_SETS];
879/* ---------- */ 1027/* ---------- */
880#ifdef SELECTION_SCROLLING 1028#ifdef SELECTION_SCROLLING
881 int scroll_selection_delay,
882 scroll_selection_lines; 1029 int scroll_selection_lines;
883 enum page_dirn scroll_selection_dir; 1030 enum page_dirn scroll_selection_dir;
884 int selection_save_x, 1031 int selection_save_x,
885 selection_save_y, 1032 selection_save_y,
886 selection_save_state, 1033 selection_save_state;
887 pending_scroll_selection;
888#endif 1034#endif
889/* ---------- */ 1035/* ---------- */
890 int csrO, /* Hops - csr offset in thumb/slider to */ 1036 int csrO, /* Hops - csr offset in thumb/slider to */
891 /* give proper Scroll behaviour */ 1037 /* give proper Scroll behaviour */
892#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
893 scroll_arrow_delay,
894#endif
895#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1038#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
896 mouse_slip_wheel_delay,
897 mouse_slip_wheel_speed, 1039 mouse_slip_wheel_speed,
898#endif 1040#endif
899 refresh_count, 1041 refresh_count,
900 refresh_limit, 1042 refresh_limit,
901 fnum, /* logical font number */
902 last_bot, /* scrollbar last bottom position */ 1043 last_bot, /* scrollbar last bottom position */
903 last_top, /* scrollbar last top position */ 1044 last_top, /* scrollbar last top position */
904 last_state, /* scrollbar last state */ 1045 last_state, /* scrollbar last state */
905 scrollbar_len, 1046 scrollbar_len,
906#ifdef MENUBAR 1047#ifdef MENUBAR
917 pointerBlankDelay, 1058 pointerBlankDelay,
918# endif 1059# endif
919 allowedxerror; 1060 allowedxerror;
920/* ---------- */ 1061/* ---------- */
921 unsigned int ModMetaMask, 1062 unsigned int ModMetaMask,
922 ModNumLockMask, 1063 ModNumLockMask;
923 old_width, /* last used width in screen resize */ 1064 int old_width, /* last used width in screen resize */
924 old_height, /* last used height in screen resize */ 1065 old_height; /* last used height in screen resize */
925#ifndef NO_BRIGHTCOLOR
926 colorfgbg,
927#endif
928 ttymode;
929 unsigned long PrivateModes, 1066 unsigned long priv_modes,
930 SavedModes; 1067 SavedModes;
931/* ---------- */ 1068/* ---------- */
932 Atom xa[NUM_XA]; 1069 Atom xa[NUM_XA];
933/* ---------- */ 1070/* ---------- */
934#ifdef MENUBAR 1071#ifdef MENUBAR
960#endif 1097#endif
961/* ---------- */ 1098/* ---------- */
962 Time selection_time, 1099 Time selection_time,
963 selection_request_time; 1100 selection_request_time;
964 pid_t cmd_pid; /* process id of child */ 1101 pid_t cmd_pid; /* process id of child */
965 gid_t ttygid;
966#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
967 uid_t euid;
968 gid_t egid;
969#endif
970/* ---------- */ 1102/* ---------- */
971 Cursor leftptr_cursor; 1103 Cursor leftptr_cursor;
972#ifdef POINTER_BLANK 1104#ifdef POINTER_BLANK
973 Cursor blank_cursor; 1105 Cursor blank_cursor;
974#endif 1106#endif
975/* ---------- */ 1107/* ---------- */
976 const char *ttydev; /* pty/tty name */
977#ifndef NO_BACKSPACE_KEY 1108#ifndef NO_BACKSPACE_KEY
978 const char *key_backspace; 1109 const char *key_backspace;
979#endif 1110#endif
980#ifndef NO_DELETE_KEY 1111#ifndef NO_DELETE_KEY
981 const char *key_delete; 1112 const char *key_delete;
982#endif
983#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
984 KeySym ks_bigfont, ks_smallfont;
985#endif
986#ifdef USE_XIM
987 rxvt_xim *input_method;
988 XIC Input_Context;
989 XIMStyle input_style;
990 int event_type;
991#endif 1113#endif
992 struct mouse_event MEvent; 1114 struct mouse_event MEvent;
993 XComposeStatus compose; 1115 XComposeStatus compose;
994 ttymode_t tio; 1116 ttymode_t tio;
995#ifdef UTMP_SUPPORT 1117#ifdef UTMP_SUPPORT
1007 row_col_t oldcursor; 1129 row_col_t oldcursor;
1008#ifdef XPM_BACKGROUND 1130#ifdef XPM_BACKGROUND
1009 bgPixmap_t bgPixmap; 1131 bgPixmap_t bgPixmap;
1010 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1132 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1011#endif 1133#endif
1012#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1013 struct stat ttyfd_stat; /* original status of our tty */
1014#endif
1015#ifdef MENUBAR 1134#ifdef MENUBAR
1016 menu_t *ActiveMenu, /* currently active menu */ 1135 menu_t *ActiveMenu, /* currently active menu */
1017 *BuildMenu; /* the menu currently being built */ 1136 *BuildMenu; /* the menu currently being built */
1018 bar_t *CurrentBar; 1137 bar_t *CurrentBar;
1019# if ! (MENUBAR_MAX > 1) 1138# if ! (MENUBAR_MAX > 1)
1025#endif 1144#endif
1026#ifdef POINTER_BLANK 1145#ifdef POINTER_BLANK
1027 struct timeval lastmotion; 1146 struct timeval lastmotion;
1028#endif 1147#endif
1029 1148
1030/* these three don't need to be kept but do so to placate some mem checkers */ 1149#if ENABLE_OVERLAY
1150 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1151 text_t **ov_text;
1152 rend_t **ov_rend;
1153
1154 void scr_swap_overlay ();
1155 void scr_overlay_new (int x, int y, int w, int h);
1156 void scr_overlay_off ();
1157 void scr_overlay_set (int x, int y,
1158 text_t text,
1159 rend_t rend = OVERLAY_RSTYLE);
1160 void scr_overlay_set (int x, int y, const char *s);
1161#endif
1162
1163 vector<void *> allocated; // free these memory blocks with free()
1164
1031 char *env_windowid; /* environmental variable WINDOWID */ 1165 char *env_windowid; /* environmental variable WINDOWID */
1032 char *env_display; /* environmental variable DISPLAY */ 1166 char *env_display; /* environmental variable DISPLAY */
1033 char *env_term; /* environmental variable TERM */ 1167 char *env_term; /* environmental variable TERM */
1034 char *env_colorfgbg; 1168 char *env_colorfgbg;
1035 char *locale; 1169 char *locale;
1170#if 0
1036 char *codeset; 1171 char *codeset;
1172#endif
1037 char charsets[4]; 1173 char charsets[4];
1038 unsigned char *v_buffer; /* pointer to physical buffer */ 1174 unsigned char *v_buffer; /* pointer to physical buffer */
1039 unsigned int v_buflen; /* size of area to write */ 1175 unsigned int v_buflen; /* size of area to write */
1040 char *newfont[MAX_NFONTS];
1041 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1176 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1042#ifdef KEYSYM_RESOURCE 1177#ifdef KEYSYM_RESOURCE
1043 const unsigned char *Keysym_map[256]; 1178 const unsigned char *Keysym_map[256];
1044#endif 1179#endif
1045 const char *rs[NUM_RESOURCES]; 1180 const char *rs[NUM_RESOURCES];
1046/* command input buffering */ 1181 /* command input buffering */
1047 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1182 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1048 unsigned char cmdbuf_base[BUFSIZ]; 1183 unsigned char cmdbuf_base[CBUFSIZ];
1049 1184
1050 rxvt_salloc *ralloc; 1185 rxvt_salloc *talloc; // text line allocator
1051 rxvt_salloc *talloc; 1186 rxvt_salloc *ralloc; // rend line allocator
1187
1188 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1189
1190#if ENABLE_FRILLS || ISO_14755
1191 // ISO 14755 entry support
1192 unicode_t iso14755buf;
1193 void commit_iso14755 ();
1194 int hex_keyval (XKeyEvent &ev);
1195# if ISO_14755
1196 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1197 void iso14755_54 (int x, int y);
1198# endif
1199#endif
1052 1200
1053 void paste (const unsigned char *data, unsigned int len); 1201 void paste (const unsigned char *data, unsigned int len);
1054 1202
1055 void flush (); 1203 void flush ();
1056 1204
1205#if TRANSPARENT
1057 void rootwin_cb (XEvent &xev); 1206 void rootwin_cb (XEvent &xev);
1058 xevent_watcher rootwin_ev; 1207 xevent_watcher rootwin_ev;
1208#endif
1209
1210
1211 void sig_term (sig_watcher &w); sig_watcher sw_term;
1212 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1059 1213
1060 void x_cb (XEvent &xev); 1214 void x_cb (XEvent &xev);
1061 xevent_watcher termwin_ev; 1215 xevent_watcher termwin_ev;
1062 xevent_watcher vt_ev; 1216 xevent_watcher vt_ev;
1063#ifdef HAVE_SCROLLBARS 1217#ifdef HAVE_SCROLLBARS
1065#endif 1219#endif
1066#ifdef MENUBAR 1220#ifdef MENUBAR
1067 xevent_watcher menubar_ev; 1221 xevent_watcher menubar_ev;
1068#endif 1222#endif
1069 1223
1070 void check_cb (check_watcher &w); check_watcher check_ev; 1224 void check_cb (check_watcher &w); check_watcher check_ev;
1071 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1225 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1226 void flush_cb (time_watcher &w); time_watcher flush_ev;
1072 1227
1073 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1228 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1074 1229
1075 void incr_cb (time_watcher &w); time_watcher incr_ev; 1230 void incr_cb (time_watcher &w); time_watcher incr_ev;
1076 1231
1077#ifdef CURSOR_BLINK 1232#ifdef CURSOR_BLINK
1078 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1233 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1079#endif 1234#endif
1080#ifdef TEXT_BLINK 1235#ifdef TEXT_BLINK
1081 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1236 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1237#endif
1238
1239#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1240 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1241#endif
1242#ifdef SELECTION_SCROLLING
1243 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev;
1244#endif
1245#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1246 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev;
1082#endif 1247#endif
1083 1248
1084#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1085 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1250 void pointer_cb (time_watcher &w); time_watcher pointer_ev;
1086 void pointer_blank (); 1251 void pointer_blank ();
1252#endif
1087 void pointer_unblank (); 1253 void pointer_unblank ();
1088#endif
1089 1254
1090 void tt_printf (const char *fmt,...); 1255 void tt_printf (const char *fmt,...);
1091 void tt_write (const unsigned char *data, unsigned int len); 1256 void tt_write (const unsigned char *data, unsigned int len);
1092 1257
1093 void tt_winch (); 1258 void tt_winch ();
1097 void destroy (); 1262 void destroy ();
1098 1263
1099 bool init (int argc, const char *const *argv); 1264 bool init (int argc, const char *const *argv);
1100 bool init_vars (); 1265 bool init_vars ();
1101 1266
1102 uint32_t next_char ();
1103
1104 bool pty_fill (); 1267 bool pty_fill ();
1105
1106 void *operator new (size_t s);
1107 void operator delete (void *p, size_t s);
1108 1268
1109 void init_secondary (); 1269 void init_secondary ();
1110 const char **init_resources (int argc, const char *const *argv); 1270 const char **init_resources (int argc, const char *const *argv);
1111 void init_env (); 1271 void init_env ();
1112 void set_locale (const char *locale); 1272 void set_locale (const char *locale);
1113 void init_xlocale (); 1273 void init_xlocale ();
1114 void init_command (const char *const *argv); 1274 void init_command (const char *const *argv);
1115 int run_command (const char *const *argv); 1275 void run_command (const char *const *argv);
1116 int run_child (const char *const *argv); 1276 int run_child (const char *const *argv);
1117 1277
1118 void color_aliases (int idx); 1278 void color_aliases (int idx);
1119 void recolour_cursor (); 1279 void recolour_cursor ();
1120 void create_windows (int argc, const char *const *argv); 1280 void create_windows (int argc, const char *const *argv);
1121 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1281 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1122 void window_calc (unsigned int width, unsigned int height); 1282 void window_calc (unsigned int width, unsigned int height);
1123 1283
1124#if USE_XIM 1284#if USE_XIM
1285 rxvt_xim *input_method;
1286 XIC Input_Context;
1287 XIMStyle input_style;
1288 XPoint spot; // most recently sent spot position
1289
1125 void im_destroy (); 1290 void im_destroy ();
1126 void im_cb (); im_watcher im_ev; 1291 void im_cb (); im_watcher im_ev;
1127 void im_set_size (XRectangle *size); 1292 void im_set_size (XRectangle &size);
1128 void im_set_position (XPoint *pos); 1293 void im_set_position (XPoint &pos);
1129 void im_set_color (unsigned long *fg, unsigned long *bg); 1294 void im_set_color (unsigned long &fg, unsigned long &bg);
1130 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect); 1295 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1131 1296
1132 bool IMisRunning (); 1297 bool IMisRunning ();
1133 void IMSendSpot (); 1298 void IMSendSpot ();
1134 bool IM_get_IC (const char *modifiers); 1299 bool IM_get_IC (const char *modifiers);
1135 void IMSetStatusPosition (); 1300 void IMSetStatusPosition ();
1141 1306
1142 void selection_click (int clicks, int x, int y); 1307 void selection_click (int clicks, int x, int y);
1143 void selection_extend (int x, int y, int flag); 1308 void selection_extend (int x, int y, int flag);
1144 void selection_rotate (int x, int y); 1309 void selection_rotate (int x, int y);
1145 1310
1146 /* screen (!) */
1147 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1148 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1149 int scr_scroll_text (int row1, int row2, int count, int spec);
1150 void scr_reset ();
1151 void scr_reset_realloc ();
1152 void scr_release ();
1153 void scr_clear ();
1154 void scr_refresh (unsigned char refresh_type);
1155 bool scr_refresh_rend (rend_t mask, rend_t value);
1156 void scr_erase_screen (int mode);
1157 void scr_touch (bool refresh);
1158 void scr_expose (int x, int y, int width, int height, bool refresh);
1159 void scr_remap_chars ();
1160 void scr_remap_chars (text_t *tp, rend_t *rp);
1161
1162 /* autoconvert */ 1311 /* autoconvert */
1163 1312
1164 // command.C 1313 // command.C
1165 void lookup_key (XKeyEvent &ev); 1314 void lookup_key (XKeyEvent &ev);
1166 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1315 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1316
1317 unicode_t next_char ();
1167 uint32_t cmd_getc (); 1318 unicode_t cmd_getc ();
1319 unicode_t next_octet ();
1320 unicode_t cmd_get8 ();
1321
1322 bool cmd_parse ();
1168 void mouse_report (XButtonEvent &ev); 1323 void mouse_report (XButtonEvent &ev);
1169 void button_press (XButtonEvent &ev); 1324 void button_press (XButtonEvent &ev);
1170 void button_release (XButtonEvent &ev); 1325 void button_release (XButtonEvent &ev);
1171 int check_our_parents (); 1326 int check_our_parents ();
1172#ifdef PRINTPIPE 1327#ifdef PRINTPIPE
1173 FILE *popen_printer (); 1328 FILE *popen_printer ();
1174 int pclose_printer (FILE *stream); 1329 int pclose_printer (FILE *stream);
1175#endif 1330#endif
1176 void process_print_pipe (); 1331 void process_print_pipe ();
1177 void process_nonprinting (unsigned char ch); 1332 void process_nonprinting (unicode_t ch);
1178 void process_escape_vt52 (unsigned char ch); 1333 void process_escape_vt52 (unicode_t ch);
1179 void process_escape_seq (); 1334 void process_escape_seq ();
1180 void process_csi_seq (); 1335 void process_csi_seq ();
1181 void process_window_ops (const int *args, unsigned int nargs); 1336 void process_window_ops (const int *args, unsigned int nargs);
1182 unsigned char * get_to_st (unsigned char *ends_how); 1337 unsigned char *get_to_st (unicode_t &ends_how);
1183 void process_dcs_seq (); 1338 void process_dcs_seq ();
1184 void process_osc_seq (); 1339 void process_osc_seq ();
1340 void process_color_seq (int report, int color, const char *str, unsigned char resp);
1185 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))); 1341 void process_xterm_seq (int op, const char *str, unsigned char resp);
1186 int privcases (int mode, unsigned long bit); 1342 int privcases (int mode, unsigned long bit);
1187 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1343 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1188 void process_sgr_mode (unsigned int nargs, const int *arg); 1344 void process_sgr_mode (unsigned int nargs, const int *arg);
1189 void process_graphics (); 1345 void process_graphics ();
1190 // init.C 1346 // init.C
1191 void Get_Colours (); 1347 void Get_Colours ();
1192 void get_ourmods (); 1348 void get_ourmods ();
1193 // logging.C 1349 // logging.C
1194 void makeutent (const char *pty, const char *hostname); 1350 void makeutent (const char *pty, const char *hostname);
1195 void cleanutent (); 1351 void cleanutent ();
1196 // main.C; 1352 // main.C
1197 void privileges (int mode);
1198 void privileged_utmp (char action); 1353 void privileged_utmp (rxvt_privaction action);
1199 void privileged_ttydev (char action); 1354 bool set_fonts ();
1200 bool change_font (const char *fontname);
1201 bool font_up_down (int n, int direction);
1202 void set_title (const char *str); 1355 void set_title (const char *str);
1203 void set_iconName (const char *str); 1356 void set_icon_name (const char *str);
1204 void set_window_color (int idx, const char *color); 1357 void set_window_color (int idx, const char *color);
1205 void set_colorfgbg (); 1358 void set_colorfgbg ();
1206 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1359 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1207 void set_widthheight (unsigned int width, unsigned int height); 1360 void set_widthheight (unsigned int width, unsigned int height);
1208 1361
1238 void menubar_control (XButtonEvent &ev); 1391 void menubar_control (XButtonEvent &ev);
1239 void map_menuBar (int map); 1392 void map_menuBar (int map);
1240#endif 1393#endif
1241 1394
1242 // screen.C 1395 // screen.C
1396 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1397 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1398 int scr_scroll_text (int row1, int row2, int count, int spec);
1399 void scr_reset ();
1400 void scr_reset_realloc ();
1401 void scr_release ();
1402 void scr_clear (bool really = false);
1403 void scr_refresh (unsigned char refresh_type);
1404 bool scr_refresh_rend (rend_t mask, rend_t value);
1405 void scr_erase_screen (int mode);
1406 void scr_touch (bool refresh);
1407 void scr_expose (int x, int y, int width, int height, bool refresh);
1408 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1409 void scr_recolour ();
1410 void scr_remap_chars ();
1411 void scr_remap_chars (text_t *tp, rend_t *rp);
1412
1243 void scr_poweron (); 1413 void scr_poweron ();
1244 void scr_cursor (int mode); 1414 void scr_cursor (int mode);
1415 void scr_do_wrap ();
1245 int scr_change_screen (int scrn); 1416 int scr_change_screen (int scrn);
1246 void scr_color (unsigned int color, int fgbg); 1417 void scr_color (unsigned int color, int fgbg);
1247 void scr_rendition (int set, int style); 1418 void scr_rendition (int set, int style);
1248 void scr_add_lines (const uint32_t *str, int nlines, int len); 1419 void scr_add_lines (const unicode_t *str, int nlines, int len);
1249 void scr_backspace (); 1420 void scr_backspace ();
1250 void scr_tab (int count); 1421 void scr_tab (int count, bool ht = false);
1251 void scr_backindex (); 1422 void scr_backindex ();
1252 void scr_forwardindex (); 1423 void scr_forwardindex ();
1253 void scr_gotorc (int row, int col, int relative); 1424 void scr_gotorc (int row, int col, int relative);
1254 void scr_index (enum page_dirn direction); 1425 void scr_index (enum page_dirn direction);
1255 void scr_erase_line (int mode); 1426 void scr_erase_line (int mode);
1267 void set_font_style (); 1438 void set_font_style ();
1268 void scr_charset_choose (int set); 1439 void scr_charset_choose (int set);
1269 void scr_charset_set (int set, unsigned int ch); 1440 void scr_charset_set (int set, unsigned int ch);
1270 int scr_move_to (int y, int len); 1441 int scr_move_to (int y, int len);
1271 int scr_page (enum page_dirn direction, int nlines); 1442 int scr_page (enum page_dirn direction, int nlines);
1272 int scr_changeview (uint16_t oldviewstart); 1443 int scr_changeview (unsigned int oldviewstart);
1273 void scr_bell (); 1444 void scr_bell ();
1274 void scr_printscreen (int fullhist); 1445 void scr_printscreen (int fullhist);
1275 void scr_reverse_selection (); 1446 void scr_reverse_selection ();
1276 void scr_dump (int fd); 1447 void scr_dump (int fd);
1277 void selection_check (int check_more); 1448 void selection_check (int check_more);
1325 int scale_pixmap (const char *geom); 1496 int scale_pixmap (const char *geom);
1326 void resize_pixmap (); 1497 void resize_pixmap ();
1327 Pixmap set_bgPixmap (const char *file); 1498 Pixmap set_bgPixmap (const char *file);
1328}; 1499};
1329 1500
1330#define SET_LOCALE(locale) rxvt_set_locale (locale)
1331extern void rxvt_set_locale (const char *locale);
1332
1333/* 1501/*
1334 ***************************************************************************** 1502 *****************************************************************************
1335 * PROTOTYPES 1503 * PROTOTYPES
1336 ***************************************************************************** 1504 *****************************************************************************
1337 */ 1505 */
1338#ifdef PROTOTYPES 1506#ifdef PROTOTYPES
1339# define __PROTO(p) p 1507# define __PROTO(p) p
1340#else 1508#else
1341# define __PROTO(p) () 1509# define __PROTO(p) ()
1342#endif 1510#endif
1343#include "protos.h"
1344 1511
1345#ifdef DEBUG_malloc 1512#ifdef DEBUG_malloc
1346# include "dmalloc.h" /* This comes last */ 1513# include "dmalloc.h" /* This comes last */
1347#endif 1514#endif
1348 1515

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines