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.78 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.163 by root, Tue Dec 20 19:30:59 2005 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#if ENABLE_FRILLS
15# include <X11/Xmd.h>
16#endif
14 17
15#include "encoding.h" 18#include "encoding.h"
16#include "defaultfont.h"
17#include "rxvtcolor.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h"
18#include "iom.h" 21#include "iom.h"
19#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
20 29
21/* 30/*
22 ***************************************************************************** 31 *****************************************************************************
23 * SYSTEM HACKS 32 * SYSTEM HACKS
24 ***************************************************************************** 33 *****************************************************************************
25 */ 34 */
26/* Consistent defines - please report on the necessity 35/* Consistent defines - please report on the necessity
27 * @ Unixware: defines (__svr4__) 36 * @ Unixware: defines (__svr4__)
28 */ 37 */
29#if defined (SVR4) && !defined (__svr4__) 38#if defined (SVR4) && !defined (__svr4__)
30# define __svr4__ 39# define __svr4__ 1
31#endif 40#endif
32#if defined (sun) && !defined (__sun__) 41#if defined (sun) && !defined (__sun__)
33# define __sun__ 42# define __sun__ 1
34#endif 43#endif
35 44
36#ifndef HAVE_XPOINTER 45#ifndef HAVE_XPOINTER
37typedef char *XPointer; 46typedef char *XPointer;
38#endif 47#endif
… …
65# define STDERR_FILENO 2 74# define STDERR_FILENO 2
66#endif 75#endif
67 76
68#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
69# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
70# define NO_SETOWNER_TTYDEV 79# define NO_SETOWNER_TTYDEV 1
71# endif 80# endif
72#endif 81#endif
73#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY) 82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
74# define NO_SETOWNER_TTYDEV 83# define NO_SETOWNER_TTYDEV 1
75#endif 84#endif
85
86/*
87 *****************************************************************************
88 * PROTOTYPES
89 *****************************************************************************
90 */
91// main.C
92RETSIGTYPE rxvt_Child_signal (int sig);
93RETSIGTYPE rxvt_Exit_signal (int sig);
94void rxvt_clean_exit ();
95void * rxvt_malloc (size_t size);
96void * rxvt_calloc (size_t number, size_t size);
97void * rxvt_realloc (void *ptr, size_t size);
98void rxvt_privileges (rxvt_privaction action);
99
100// util.C
101char * rxvt_wcstombs (const wchar_t *str, int len = -1);
102wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
103char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
104wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
105char * rxvt_strdup (const char *str);
106
107// misc.C
108char * rxvt_r_basename (const char *str);
109void rxvt_vlog (const char *fmt, va_list arg_ptr);
110void rxvt_log (const char *fmt,...);
111void rxvt_warn (const char *fmt,...);
112void rxvt_fatal (const char *fmt,...);
113void rxvt_exit_failure ();
114int rxvt_Str_match (const char *s1, const char *s2);
115const char * rxvt_Str_skip_space (const char *str);
116char * rxvt_Str_trim (char *str);
117int rxvt_Str_escaped (char *str);
118char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs);
120char * rxvt_File_find (const char *file, const char *ext, const char *path);
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
123void rxvt_usleep (int usecs);
76 124
77/* 125/*
78 ***************************************************************************** 126 *****************************************************************************
79 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
80 ***************************************************************************** 128 *****************************************************************************
… …
90#endif 138#endif
91 139
92/* If we're using either the rxvt scrollbar or menu bars, keep the 140/* If we're using either the rxvt scrollbar or menu bars, keep the
93 * scrollColor resource. 141 * scrollColor resource.
94 */ 142 */
95#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
96# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
97#else 145#else
98# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
99#endif 147#endif
100 148
101#ifdef XPM_BACKGROUND 149#ifdef XPM_BACKGROUND
102typedef struct { 150typedef struct {
103 short w, h, x, y; 151 short w, h, x, y;
104 Pixmap pixmap; 152 Pixmap pixmap;
105} bgPixmap_t; 153} bgPixmap_t;
106#endif 154#endif
107 155
108/* 156/*
109 * the 'essential' information for reporting Mouse Events 157 * the 'essential' information for reporting Mouse Events
110 * pared down from XButtonEvent 158 * pared down from XButtonEvent
111 */ 159 */
112struct mouse_event { 160struct mouse_event {
113 int clicks; 161 int clicks;
114 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
115 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
116 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
117}; 165};
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 166
124#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 167#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
125#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 168#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
126#define SWAP_IT(one, two, typeof) \ 169#define SWAP_IT(one, two, typeof) \
127 do { \ 170 do { \
… …
131#define BOUND_POSITIVE_INT16(val) \ 174#define BOUND_POSITIVE_INT16(val) \
132 (int16_t) ((val) <= 0 \ 175 (int16_t) ((val) <= 0 \
133 ? 0 \ 176 ? 0 \
134 : min ((val), (((uint16_t)-1)>>1))) 177 : min ((val), (((uint16_t)-1)>>1)))
135 178
179#if ENABLE_FRILLS
180typedef struct _mwmhints {
181 CARD32 flags;
182 CARD32 functions;
183 CARD32 decorations;
184 INT32 input_mode;
185 CARD32 status;
186} MWMHints;
187#endif
188
189#if ENABLE_XEMBED
190// XEMBED messages
191# define XEMBED_EMBEDDED_NOTIFY 0
192# define XEMBED_WINDOW_ACTIVATE 1
193# define XEMBED_WINDOW_DEACTIVATE 2
194# define XEMBED_REQUEST_FOCUS 3
195# define XEMBED_FOCUS_IN 4
196# define XEMBED_FOCUS_OUT 5
197# define XEMBED_FOCUS_NEXT 6
198# define XEMBED_FOCUS_PREV 7
199
200# define XEMBED_MODALITY_ON 10
201# define XEMBED_MODALITY_OFF 11
202# define XEMBED_REGISTER_ACCELERATOR 12
203# define XEMBED_UNREGISTER_ACCELERATOR 13
204# define XEMBED_ACTIVATE_ACCELERATOR 14
205
206// XEMBED detail code
207# define XEMBED_FOCUS_CURRENT 0
208# define XEMBED_FOCUS_FIRST 1
209# define XEMBED_FOCUS_LAST 2
210
211# define XEMBED_MAPPED (1 << 0)
212#endif
213
136/* 214/*
137 ***************************************************************************** 215 *****************************************************************************
138 * NORMAL DEFINES 216 * NORMAL DEFINES
139 ***************************************************************************** 217 *****************************************************************************
140 */ 218 */
… …
145# define COLORTERMENVFULL COLORTERMENV "-xpm" 223# define COLORTERMENVFULL COLORTERMENV "-xpm"
146#else 224#else
147# define COLORTERMENVFULL COLORTERMENV 225# define COLORTERMENVFULL COLORTERMENV
148#endif 226#endif
149#ifndef TERMENV 227#ifndef TERMENV
150# define TERMENV "rxvt" 228# define TERMENV "rxvt-unicode"
151#endif 229#endif
152 230
153#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 231#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
154# define NO_MOUSE_REPORT_SCROLLBAR 232# define NO_MOUSE_REPORT_SCROLLBAR 1
155#endif 233#endif
156 234
157#ifdef NO_RESOURCES 235#ifdef NO_RESOURCES
158# undef USE_XGETDEFAULT 236# undef USE_XGETDEFAULT
237#endif
238
239#if ISO_14755
240# define ENABLE_OVERLAY 1
159#endif 241#endif
160 242
161/* now look for other badly set stuff */ 243/* now look for other badly set stuff */
162 244
163#if !defined (EACCESS) && defined(EAGAIN) 245#if !defined (EACCESS) && defined(EAGAIN)
… …
172#define menuBar_esc 10 254#define menuBar_esc 10
173#define scrollBar_esc 30 255#define scrollBar_esc 30
174#define menuBar_margin 2 /* margin below text */ 256#define menuBar_margin 2 /* margin below text */
175 257
176#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 258#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
177# define HAVE_SCROLLBARS 259# define HAVE_SCROLLBARS 1
178#endif 260#endif
179 261
180/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 262/* width of scrollBar, menuBar shadow, must be 1 or 2 */
181#ifdef HALFSHADOW 263#ifdef HALFSHADOW
182# define SHADOW 1 264# define SHADOW 1
… …
186 268
187#define R_SB_ALIGN_CENTRE 0 269#define R_SB_ALIGN_CENTRE 0
188#define R_SB_ALIGN_TOP 1 270#define R_SB_ALIGN_TOP 1
189#define R_SB_ALIGN_BOTTOM 2 271#define R_SB_ALIGN_BOTTOM 2
190 272
191#define R_SB_RXVT 0
192#define R_SB_NEXT 1 273#define R_SB_NEXT 1
193#define R_SB_XTERM 2 274#define R_SB_XTERM 2
194#define R_SB_PLAIN 4 275#define R_SB_PLAIN 4
276#define R_SB_RXVT 8
195 277
196#define SB_WIDTH_NEXT 19 278#define SB_WIDTH_NEXT 19
197#define SB_WIDTH_XTERM 15 279#define SB_WIDTH_XTERM 15
198#define SB_WIDTH_PLAIN 7 280#define SB_WIDTH_PLAIN 7
199#ifndef SB_WIDTH_RXVT 281#ifndef SB_WIDTH_RXVT
… …
266enum { 348enum {
267 NO_REFRESH = 0 , /* Window not visible at all! */ 349 NO_REFRESH = 0 , /* Window not visible at all! */
268 FAST_REFRESH = 1<<0, /* Fully exposed window */ 350 FAST_REFRESH = 1<<0, /* Fully exposed window */
269 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 351 SLOW_REFRESH = 1<<1, /* Partially exposed window */
270 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */ 352 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
271#if 0
272 REFRESH_BOUNDS = 1<<3
273#endif
274 REFRESH_BOUNDS = 0 /* only required for old int_bwidth code. */ //TODO: remove this and all depending code
275}; 353};
276 354
277#ifdef NO_SECONDARY_SCREEN 355#ifdef NO_SECONDARY_SCREEN
278# define NSCREENS 0 356# define NSCREENS 0
279#else 357#else
280# define NSCREENS 1 358# define NSCREENS 1
281#endif 359#endif
282
283#define IGNORE 0
284#define SAVE 's'
285#define RESTORE 'r'
286 360
287/* special (internal) prefix for font commands */ 361/* special (internal) prefix for font commands */
288#define FONT_CMD '#' 362#define FONT_CMD '#'
289#define FONT_DN "#-" 363#define FONT_DN "#-"
290#define FONT_UP "#+" 364#define FONT_UP "#+"
… …
316 SECONDARY, 390 SECONDARY,
317}; 391};
318 392
319#define RS_None 0 /* Normal */ 393#define RS_None 0 /* Normal */
320 394
321#define RS_fgMask 0x000001FFu /* 512 colors */ 395#define RS_fgMask 0x0000007fUL /* 128 colors */
322#define RS_bgMask 0x0003FE00u /* 512 colors */ 396#define RS_bgMask 0x00003f80UL /* 128 colors */
323#define RS_Bold 0x00040000u /* bold */ 397
398// font styles
399#define RS_Bold 0x00004000UL // value 1
400#define RS_Italic 0x00008000UL // value 2
401
402// fake styles
324#define RS_Blink 0x00080000u /* blink */ 403#define RS_Blink 0x00010000UL /* blink */
325#define RS_RVid 0x00100000u /* reverse video */ 404#define RS_RVid 0x00020000UL /* reverse video */
326#define RS_Uline 0x00200000u /* underline */ 405#define RS_Uline 0x00040000UL /* underline */
327 406
328#define RS_fontMask 0xffc00000u /* plenty(?) of fonts */ 407// 5 bits still to go
329#define RS_fontShift 22
330 408
409// other flags
410#define RS_Careful 0x80000000UL /* be careful when drawing these */
411
412#define RS_styleCount 4
413#define RS_styleMask (RS_Bold | RS_Italic)
414#define RS_styleShift 14
415
331#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 416#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
332#define RS_attrMask (RS_baseattrMask|RS_fontMask) 417#define RS_attrMask (RS_baseattrMask | RS_fontMask)
418
419#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
420#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
421#define RS_fontShift 24
422
423#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
424#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
333 425
334#define Sel_none 0 /* Not waiting */ 426#define Sel_none 0 /* Not waiting */
335#define Sel_normal 0x01 /* normal selection */ 427#define Sel_normal 0x01 /* normal selection */
336#define Sel_incr 0x02 /* incremental selection */ 428#define Sel_incr 0x02 /* incremental selection */
337#define Sel_direct 0x00 429#define Sel_direct 0x00
… …
382 XTerm_Color_UL = 19, // change actual 'Underline' color 474 XTerm_Color_UL = 19, // change actual 'Underline' color
383 XTerm_Pixmap = 20, // new bg pixmap 475 XTerm_Pixmap = 20, // new bg pixmap
384 XTerm_restoreFG = 39, // change default fg color 476 XTerm_restoreFG = 39, // change default fg color
385 XTerm_restoreBG = 49, // change default bg color 477 XTerm_restoreBG = 49, // change default bg color
386 XTerm_dumpscreen = 55, // dump scrollback and all of screen 478 XTerm_dumpscreen = 55, // dump scrollback and all of screen
479
387 XTerm_locale = 701, // change locale 480 URxvt_locale = 701, // change locale
388 XTerm_findfont = 702, // find font of given character (in decimal)
389 XTerm_Menu = 703, // set menu item 481 URxvt_Menu = 703, // set menu item
482 URxvt_Color_IT = 704, // change actual 'Italic' colour
483 URxvt_Color_tint = 705, // change actual tint colour
484
485 URxvt_font = 710,
486 URxvt_boldFont = 711,
487 URxvt_italicFont = 712,
488 URxvt_boldItalicFont = 713,
489
490 URxvt_view_up = 720,
491 URxvt_view_down = 721,
390}; 492};
391 493
392/* Words starting with `Color_' are colours. Others are counts */ 494/* Words starting with `Color_' are colours. Others are counts */
393/* 495/*
394 * The following comment is mostly obsolete since pixcolor_set was expanded:
395 * We're currently upto 29 colours. Only 3 more available. The
396 * PixColor and rendition colour usage should probably be decoupled 496 * The PixColor and rendition colour usage should probably be decoupled
397 * on the unnecessary items, e.g. Color_pointer, but won't bother 497 * on the unnecessary items, e.g. Color_pointer, but won't bother
398 * until we need to. Also, be aware of usage in pixcolor_set 498 * until we need to. Also, be aware of usage in pixcolor_set
399 */ 499 */
400 500
401enum colour_list { 501enum colour_list {
… …
423 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 523 maxBrightCOLOR, /* minBrightCOLOR + 7 */
424 Color_White = maxBrightCOLOR, 524 Color_White = maxBrightCOLOR,
425#else 525#else
426 Color_White = maxCOLOR, 526 Color_White = maxCOLOR,
427#endif 527#endif
428#ifdef TTY_256COLOR
429 min256COLOR = Color_White + 1, 528 minTermCOLOR = Color_White + 1,
430 max256COLOR = minCOLOR + 255, 529 maxTermCOLOR = Color_White + 72,
431#endif
432#ifndef NO_CURSORCOLOR 530#ifndef NO_CURSORCOLOR
433 Color_cursor, 531 Color_cursor,
434 Color_cursor2, 532 Color_cursor2,
435#endif 533#endif
436 Color_pointer_fg, 534 Color_pointer_fg,
437 Color_pointer_bg, 535 Color_pointer_bg,
438 Color_border, 536 Color_border,
439#ifndef NO_BOLD_UNDERLINE_REVERSE 537#ifndef NO_BOLD_UNDERLINE_REVERSE
440 Color_BD, 538 Color_BD,
539 Color_IT,
441 Color_UL, 540 Color_UL,
442 Color_RV, 541 Color_RV,
542#endif
543#if ENABLE_FRILLS
544 Color_underline,
443#endif 545#endif
444#ifdef OPTION_HC 546#ifdef OPTION_HC
445 Color_HC, 547 Color_HC,
446#endif 548#endif
447#ifdef KEEP_SCROLLCOLOR 549#ifdef KEEP_SCROLLCOLOR
448 Color_scroll, 550 Color_scroll,
449 Color_trough, 551 Color_trough,
450#endif 552#endif
451#if TINTING 553#if TINTING
452 Color_tint, 554 Color_tint,
555#endif
556#if OFF_FOCUS_FADING
557 Color_fade,
453#endif 558#endif
454 NRS_COLORS, /* */ 559 NRS_COLORS, /* */
455#ifdef KEEP_SCROLLCOLOR 560#ifdef KEEP_SCROLLCOLOR
456 Color_topShadow = NRS_COLORS, 561 Color_topShadow = NRS_COLORS,
457 Color_bottomShadow, 562 Color_bottomShadow,
458 TOTAL_COLORS /* upto 30 */ 563 TOTAL_COLORS
459#else 564#else
460 TOTAL_COLORS = NRS_COLORS /* */ 565 TOTAL_COLORS = NRS_COLORS
461#endif 566#endif
462}; 567};
463 568
464#define Color_Bits 9 569#define Color_Bits 7 // 0 .. maxTermCOLOR
570
465#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 571#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
466#define NPIXCLR_BITS 32 572#define NPIXCLR_BITS 32
467
468#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
469 573
470/* 574/*
471 * Resource list 575 * Resource list
472 */ 576 */
473enum { 577enum {
… …
477 Rs_geometry, 581 Rs_geometry,
478 Rs_reverseVideo, 582 Rs_reverseVideo,
479 Rs_color, 583 Rs_color,
480 _Rs_color = Rs_color + NRS_COLORS - 1, 584 _Rs_color = Rs_color + NRS_COLORS - 1,
481 Rs_font, 585 Rs_font,
586#if ENABLE_STYLES
587 Rs_boldFont,
588 Rs_italicFont,
589 Rs_boldItalicFont,
590#endif
482 Rs_name, 591 Rs_name,
483 Rs_title, 592 Rs_title,
484#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 593#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
485 Rs_path, 594 Rs_path,
486#endif 595#endif
… …
495#ifdef HAVE_SCROLLBARS 604#ifdef HAVE_SCROLLBARS
496 Rs_scrollBar, 605 Rs_scrollBar,
497 Rs_scrollBar_right, 606 Rs_scrollBar_right,
498 Rs_scrollBar_floating, 607 Rs_scrollBar_floating,
499 Rs_scrollBar_align, 608 Rs_scrollBar_align,
500#endif
501 Rs_scrollstyle, /* Rs_scrollBar_style */ 609 Rs_scrollstyle, /* Rs_scrollBar_style */
610 Rs_scrollBar_thickness,
611#endif
502 Rs_scrollTtyOutput, 612 Rs_scrollTtyOutput,
503 Rs_scrollTtyKeypress, 613 Rs_scrollTtyKeypress,
504 Rs_scrollWithBuffer, 614 Rs_scrollWithBuffer,
505 Rs_saveLines, 615 Rs_saveLines,
506 Rs_utmpInhibit, 616 Rs_utmpInhibit,
… …
530#endif 640#endif
531#ifdef TRANSPARENT 641#ifdef TRANSPARENT
532 Rs_transparent, 642 Rs_transparent,
533 Rs_transparent_all, 643 Rs_transparent_all,
534#endif 644#endif
535#ifndef NO_FRILLS 645#if ENABLE_FRILLS
536 Rs_ext_bwidth, 646 Rs_ext_bwidth,
537 Rs_int_bwidth, 647 Rs_int_bwidth,
538#endif 648 Rs_borderLess,
539 Rs_scrollBar_thickness,
540#ifndef NO_LINESPACE
541 Rs_lineSpace, 649 Rs_lineSpace,
650 Rs_pty_fd,
651 Rs_cursorUnderline,
652#endif
653#if CURSOR_BLINK
654 Rs_cursorBlink,
655#endif
656#if ENABLE_XEMBED
657 Rs_embed,
542#endif 658#endif
543 Rs_cutchars, 659 Rs_cutchars,
544 Rs_modifier, 660 Rs_modifier,
545 Rs_answerbackstring, 661 Rs_answerbackstring,
546 Rs_tripleclickwords, 662 Rs_tripleclickwords,
547 Rs_insecure, 663 Rs_insecure,
548 Rs_cursorBlink,
549 Rs_pointerBlank, 664 Rs_pointerBlank,
550 Rs_pointerBlankDelay, 665 Rs_pointerBlankDelay,
551 Rs_imLocale, 666 Rs_imLocale,
667 Rs_imFont,
668 Rs_pastableTabs,
552#ifndef NO_SECONDARY_SCREEN 669#ifndef NO_SECONDARY_SCREEN
553 Rs_secondaryScreen, 670 Rs_secondaryScreen,
554 Rs_secondaryScroll, 671 Rs_secondaryScroll,
555#endif 672#endif
556#ifndef NO_BOLD_UNDERLINE_REVERSE 673#ifdef OFF_FOCUS_FADING
557 Rs_realBold, 674 Rs_fade,
675#endif
676#ifdef TINTING
677 Rs_shade,
558#endif 678#endif
559 NUM_RESOURCES 679 NUM_RESOURCES
560}; 680};
561 681
562// see init.C:xa_names, which must be kept in sync 682// see init.C:xa_names, which must be kept in sync
… …
567 XA_MULTIPLE, 687 XA_MULTIPLE,
568 XA_TARGETS, 688 XA_TARGETS,
569 XA_TIMESTAMP, 689 XA_TIMESTAMP,
570 XA_VT_SELECTION, 690 XA_VT_SELECTION,
571 XA_INCR, 691 XA_INCR,
692 XA_WM_PROTOCOLS,
572 XA_WMDELETEWINDOW, 693 XA_WM_DELETE_WINDOW,
694 XA_CLIPBOARD,
695#if ENABLE_FRILLS
696 XA_MOTIF_WM_HINTS,
697#endif
698#if ENABLE_EWMH
699 XA_NET_WM_PID,
700 XA_NET_WM_NAME,
701 XA_NET_WM_ICON_NAME,
702 XA_NET_WM_PING,
703#endif
704#if USE_XIM
705 XA_WM_LOCALE_NAME,
706#endif
573#ifdef TRANSPARENT 707#if TRANSPARENT
574 XA_XROOTPMAPID, 708 XA_XROOTPMAP_ID,
575 XA_XSETROOTID, 709 XA_ESETROOT_PMAP_ID,
576#endif 710#endif
577#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 711#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
578 XA_DNDPROTOCOL, 712 XA_DNDPROTOCOL,
579 XA_DNDSELECTION, 713 XA_DNDSELECTION,
580#endif /* OFFIX_DND */ 714#endif
581 XA_CLIPBOARD, 715#if ENABLE_XEMBED
716 XA_XEMBED,
717 XA_XEMBED_INFO,
718#endif
582 NUM_XA 719 NUM_XA
583}; 720};
584 721
585/* DEC private modes */ 722/* DEC private modes */
586#define PrivMode_132 (1LU<<0) 723#define PrivMode_132 (1UL<<0)
587#define PrivMode_132OK (1LU<<1) 724#define PrivMode_132OK (1UL<<1)
588#define PrivMode_rVideo (1LU<<2) 725#define PrivMode_rVideo (1UL<<2)
589#define PrivMode_relOrigin (1LU<<3) 726#define PrivMode_relOrigin (1UL<<3)
590#define PrivMode_Screen (1LU<<4) 727#define PrivMode_Screen (1UL<<4)
591#define PrivMode_Autowrap (1LU<<5) 728#define PrivMode_Autowrap (1UL<<5)
592#define PrivMode_aplCUR (1LU<<6) 729#define PrivMode_aplCUR (1UL<<6)
593#define PrivMode_aplKP (1LU<<7) 730#define PrivMode_aplKP (1UL<<7)
594#define PrivMode_HaveBackSpace (1LU<<8) 731#define PrivMode_HaveBackSpace (1UL<<8)
595#define PrivMode_BackSpace (1LU<<9) 732#define PrivMode_BackSpace (1UL<<9)
596#define PrivMode_ShiftKeys (1LU<<10) 733#define PrivMode_ShiftKeys (1UL<<10)
597#define PrivMode_VisibleCursor (1LU<<11) 734#define PrivMode_VisibleCursor (1UL<<11)
598#define PrivMode_MouseX10 (1LU<<12) 735#define PrivMode_MouseX10 (1UL<<12)
599#define PrivMode_MouseX11 (1LU<<13) 736#define PrivMode_MouseX11 (1UL<<13)
600#define PrivMode_scrollBar (1LU<<14) 737#define PrivMode_scrollBar (1UL<<14)
601#define PrivMode_menuBar (1LU<<15) 738#define PrivMode_menuBar (1UL<<15)
602#define PrivMode_TtyOutputInh (1LU<<16) 739#define PrivMode_TtyOutputInh (1UL<<16)
603#define PrivMode_Keypress (1LU<<17) 740#define PrivMode_Keypress (1UL<<17)
604#define PrivMode_smoothScroll (1LU<<18) 741#define PrivMode_smoothScroll (1UL<<18)
605#define PrivMode_vt52 (1LU<<19) 742#define PrivMode_vt52 (1UL<<19)
743#define PrivMode_LFNL (1UL<<20)
606/* too annoying to implement X11 highlight tracking */ 744/* too annoying to implement X11 highlight tracking */
607/* #define PrivMode_MouseX11Track (1LU<<20) */ 745/* #define PrivMode_MouseX11Track (1LU<<21) */
608 746
609#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 747#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
610#define PrivMode(test,bit) \ 748#define PrivMode(test,bit) \
611 if (test) \ 749 if (test) \
612 PrivateModes |= (bit); \ 750 priv_modes |= (bit); \
613 else \ 751 else \
614 PrivateModes &= ~(bit) 752 priv_modes &= ~(bit)
615 753
616#ifdef ALLOW_132_MODE 754#ifdef ALLOW_132_MODE
617# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 755# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
618#else 756#else
619# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 757# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
620#endif 758#endif
621 759
622#define XDEPTH display->depth 760// do not change these constants lightly, there are many interdependencies
623#define XCMAP display->cmap
624#define XVISUAL display->visual
625
626#define IMBUFSIZ 128 // input modifier buffer sizes 761#define IMBUFSIZ 128 // input modifier buffer sizes
627#define KBUFSZ 512 // size of keyboard mapping buffer 762#define KBUFSZ 512 // size of keyboard mapping buffer
628#define CBUFSIZ 4096 // size of command buffer 763#define CBUFSIZ 4096 // size of command buffer
629#define UBUFSIZ 4096 // character buffer 764#define UBUFSIZ 4096 // character buffer
630 765
631#ifndef PATH_MAX 766#ifndef PATH_MAX
632# define PATH_MAX 16384 767# define PATH_MAX 16384
633#endif 768#endif
769
770/* Motif window hints */
771#define MWM_HINTS_FUNCTIONS (1L << 0)
772#define MWM_HINTS_DECORATIONS (1L << 1)
773#define MWM_HINTS_INPUT_MODE (1L << 2)
774#define MWM_HINTS_STATUS (1L << 3)
775/* bit definitions for MwmHints.functions */
776#define MWM_FUNC_ALL (1L << 0)
777#define MWM_FUNC_RESIZE (1L << 1)
778#define MWM_FUNC_MOVE (1L << 2)
779#define MWM_FUNC_MINIMIZE (1L << 3)
780#define MWM_FUNC_MAXIMIZE (1L << 4)
781#define MWM_FUNC_CLOSE (1L << 5)
782/* bit definitions for MwmHints.decorations */
783#define MWM_DECOR_ALL (1L << 0)
784#define MWM_DECOR_BORDER (1L << 1)
785#define MWM_DECOR_RESIZEH (1L << 2)
786#define MWM_DECOR_TITLE (1L << 3)
787#define MWM_DECOR_MENU (1L << 4)
788#define MWM_DECOR_MINIMIZE (1L << 5)
789#define MWM_DECOR_MAXIMIZE (1L << 6)
790/* bit definitions for MwmHints.inputMode */
791#define MWM_INPUT_MODELESS 0
792#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
793#define MWM_INPUT_SYSTEM_MODAL 2
794#define MWM_INPUT_FULL_APPLICATION_MODAL 3
795#define PROP_MWM_HINTS_ELEMENTS 5
634 796
635/* 797/*
636 ***************************************************************************** 798 *****************************************************************************
637 * MACRO DEFINES 799 * MACRO DEFINES
638 ***************************************************************************** 800 *****************************************************************************
639 */ 801 */
640#define MEMSET(x, y, z) memset((x), (y), (size_t)(z)) 802#define memset(x, y, z) memset((x), (y), (size_t)(z))
641#define MEMCPY(x, y, z) memcpy((void *)(x), (const void *)(y), (z)) 803#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
642#define MEMMOVE(x, y, z) memmove((void *)(x), (const void *)(y), (z)) 804#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
643#define STRCASECMP(x, y) strcasecmp((x), (y)) 805#define strcasecmp(x, y) strcasecmp((x), (y))
644#define STRNCASECMP(x, y, z) strncasecmp((x), (y), (z)) 806#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
645#define STRCPY(x, y) strcpy((char *)(x), (const char *)(y)) 807#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
646#define STRNCPY(x, y, z) strncpy((char *)(x), (const char *)(y), (z)) 808#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
647#define STRCMP(x, y) strcmp((const char *)(x), (const char *)(y)) 809#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
648#define STRNCMP(x, y, z) strncmp((const char *)(x), (const char *)(y), (z)) 810#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
649#define STRCAT(x, y) strcat((char *)(x), (const char *)(y)) 811#define strcat(x, y) strcat((char *)(x), (const char *)(y))
650#define STRNCAT(x, y, z) strncat((char *)(x), (const char *)(y), (z)) 812#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
651#define STRDUP(x) strdup((const char *)(x)) 813#define strdup(x) strdup((const char *)(x))
652#define STRLEN(x) strlen((const char *)(x)) 814#define strlen(x) strlen((const char *)(x))
653#define STRCHR(x, y) strchr((const char *)(x), (int)(y)) 815#define strchr(x, y) strchr((const char *)(x), (int)(y))
654#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y)) 816#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
817
818#define dDisp Display *disp = display->display
655 819
656/* convert pixel dimensions to row/column values. Everything as int32_t */ 820/* convert pixel dimensions to row/column values. Everything as int32_t */
657#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 821#define Pixel2Col(x) Pixel2Width((int32_t)(x))
658#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 822#define Pixel2Row(y) Pixel2Height((int32_t)(y))
659#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
660#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
661#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 825#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
662#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 826#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
663#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
664#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
665 829
666#define TermWin_TotalWidth() ((int32_t)TermWin.width) 830#define TermWin_TotalWidth() ((int32_t)width)
667#define TermWin_TotalHeight() ((int32_t)TermWin.height) 831#define TermWin_TotalHeight() ((int32_t)height)
668 832
669/* how to build & extract colors and attributes */ 833/* how to build & extract colors and attributes */
670#define GET_BASEFG(x) (((x) & RS_fgMask)) 834#define GET_BASEFG(x) (((x) & RS_fgMask))
671#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
672#ifndef NO_BRIGHTCOLOR 836#ifndef NO_BRIGHTCOLOR
… …
686# define GET_FGCOLOR(x) GET_BASEFG(x) 850# define GET_FGCOLOR(x) GET_BASEFG(x)
687# define GET_BGCOLOR(x) GET_BASEBG(x) 851# define GET_BGCOLOR(x) GET_BASEBG(x)
688#endif 852#endif
689 853
690#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 854#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
691#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 855#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
856
857#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
858#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
692 859
693#define GET_ATTR(x) (((x) & RS_attrMask)) 860#define GET_ATTR(x) (((x) & RS_attrMask))
694#define GET_BGATTR(x) \ 861#define GET_BGATTR(x) \
695 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 862 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
696 | (((x) & RS_fgMask)<<Color_Bits)) \ 863 | (((x) & RS_fgMask)<<Color_Bits)) \
697 : ((x) & (RS_attrMask | RS_bgMask))) 864 : ((x) & (RS_attrMask | RS_bgMask)))
698#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 865#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
699#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 866#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
700#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 867#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
868
869#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
701 870
702#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 871#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
703#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 872#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
873
874#if ENABLE_STYLES
875# define FONTSET(style) fontset[GET_STYLE (style)]
876#else
877# define FONTSET(style) fontset[0]
878#endif
704 879
705#ifdef HAVE_SCROLLBARS 880#ifdef HAVE_SCROLLBARS
706# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 881# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
707#else 882#else
708# define scrollbar_TotalWidth() (0) 883# define scrollbar_TotalWidth() (0)
… …
732#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 907#define scrollbar_size() (scrollBar.end - scrollBar.beg \
733 - scrollbar_minheight ()) 908 - scrollbar_minheight ())
734 909
735#if (MENUBAR_MAX > 1) 910#if (MENUBAR_MAX > 1)
736/* rendition style flags */ 911/* rendition style flags */
737# define menuBar_height() (TermWin.fheight + SHADOW) 912# define menuBar_height() (fheight + SHADOW)
738# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
739# define isMenuBarWindow(w) ((w) == menuBar.win) 914# define isMenuBarWindow(w) ((w) == menuBar.win)
740#else 915#else
741# define menuBar_height() (0) 916# define menuBar_height() (0)
742# define menuBar_TotalHeight() (0) 917# define menuBar_TotalHeight() (0)
… …
746#ifdef XPM_BACKGROUND 921#ifdef XPM_BACKGROUND
747# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 922# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
748#else 923#else
749# define XPMClearArea(a, b, c, d, e, f, g) 924# define XPMClearArea(a, b, c, d, e, f, g)
750#endif 925#endif
751
752#ifndef STRICT_FONT_CHECKING
753# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
754#endif
755
756#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
757#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
758 926
759#ifdef UTMP_SUPPORT 927#ifdef UTMP_SUPPORT
760# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 928# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
761# undef HAVE_UTMPX_H 929# undef HAVE_UTMPX_H
762# undef HAVE_STRUCT_UTMPX 930# undef HAVE_STRUCT_UTMPX
… …
787#ifdef DEBUG_MAIN 955#ifdef DEBUG_MAIN
788# define D_MAIN(x) fprintf x ; fputc('\n', stderr) 956# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
789#else 957#else
790# define D_MAIN(x) 958# define D_MAIN(x)
791#endif 959#endif
792#ifdef DEBUG_SCREEN
793# define D_SCREEN(x) fprintf x ; fputc('\n', stderr)
794#else
795# define D_SCREEN(x)
796#endif
797#ifdef DEBUG_SELECT
798# define D_SELECT(x) fprintf x ; fputc('\n', stderr)
799#else
800# define D_SELECT(x)
801#endif
802#ifdef DEBUG_SIZE 960#ifdef DEBUG_SIZE
803# define D_SIZE(x) fprintf x ; fputc('\n', stderr) 961# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
804#else 962#else
805# define D_SIZE(x) 963# define D_SIZE(x)
806#endif
807#ifdef DEBUG_X
808# define D_X(x) fprintf x ; fputc('\n', stderr)
809#else
810# define D_X(x)
811#endif 964#endif
812 965
813extern class rxvt_failure_exception { } rxvt_failure_exception; 966extern class rxvt_failure_exception { } rxvt_failure_exception;
814 967
815typedef callback1<void, const char *> log_callback; 968typedef callback1<void, const char *> log_callback;
… …
847// primivite wrapper around mbstate_t to ensure initialisation 1000// primivite wrapper around mbstate_t to ensure initialisation
848struct mbstate { 1001struct mbstate {
849 mbstate_t mbs; 1002 mbstate_t mbs;
850 1003
851 operator mbstate_t *() { return &mbs; } 1004 operator mbstate_t *() { return &mbs; }
852 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); } 1005 void reset () { memset (&mbs, 0, sizeof (mbs)); }
853 mbstate () { reset (); } 1006 mbstate () { reset (); }
854}; 1007};
1008
1009#define UNICODE_MASK 0x1fffffUL
855 1010
856#if UNICODE3 1011#if UNICODE3
857# define COMPOSE_LO 0x40000000UL 1012# define COMPOSE_LO 0x40000000UL
858# define COMPOSE_HI 0x400fffffUL 1013# define COMPOSE_HI 0x400fffffUL
859# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 1014# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
889 1044
890extern class rxvt_composite_vec rxvt_composite; 1045extern class rxvt_composite_vec rxvt_composite;
891#endif 1046#endif
892 1047
893 1048
1049#ifdef KEYSYM_RESOURCE
1050 class keyboard_manager;
1051#endif
1052
894struct rxvt_term : rxvt_vars { 1053struct rxvt_term : zero_initialized, rxvt_vars {
895 log_callback *log_hook; // log error messages through this hook, if != 0 1054 log_callback *log_hook; // log error messages through this hook, if != 0
896 1055
897 struct mbstate mbstate; // current input multibyte state 1056 struct mbstate mbstate; // current input multibyte state
898 1057
899 unsigned char want_refresh:1, 1058 unsigned char want_refresh:1,
… …
915 hidden_text:1, 1074 hidden_text:1,
916#endif 1075#endif
917#ifdef POINTER_BLANK 1076#ifdef POINTER_BLANK
918 hidden_pointer:1, 1077 hidden_pointer:1,
919#endif 1078#endif
920// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1079 enc_utf8:1, /* wether locale uses utf-8 */
1080 seen_input:1, /* wether we have seen some program output yet */
1081 seen_resize:1, /* wether we had a resize event */
921 parsed_geometry:1; 1082 parsed_geometry:1;
922 1083
923 unsigned char refresh_type, 1084 unsigned char refresh_type,
924#ifdef UTMP_SUPPORT
925 next_utmp_action,
926#endif
927#ifndef NO_SETOWNER_TTYDEV
928 next_tty_action,
929#endif
930#ifdef META8_OPTION 1085#ifdef META8_OPTION
931 meta_char, /* Alt-key prefix */ 1086 meta_char, /* Alt-key prefix */
932#endif 1087#endif
933 scrollbar_align, 1088 scrollbar_align,
934 selection_wait, 1089 selection_wait,
935 selection_type; 1090 selection_type;
936/* ---------- */ 1091/* ---------- */
937 short rvideo; 1092 short rvideo;
938 int16_t num_scr; /* screen: number lines scrolled */ 1093 int num_scr; /* screen: number lines scrolled */
939 unsigned int prev_ncol, /* screen: previous number of columns */ 1094 int prev_ncol, /* screen: previous number of columns */
940 prev_nrow; /* screen: previous number of rows */ 1095 prev_nrow; /* screen: previous number of rows */
941/* ---------- */ 1096/* ---------- */
942 rend_t rstyle; 1097 rend_t rstyle;
943/* ---------- */ 1098/* ---------- */
944 uint32_t pixcolor_set[NPIXCLR_SETS]; 1099 uint32_t pixcolor_set[NPIXCLR_SETS];
… …
956#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
957 mouse_slip_wheel_speed, 1112 mouse_slip_wheel_speed,
958#endif 1113#endif
959 refresh_count, 1114 refresh_count,
960 refresh_limit, 1115 refresh_limit,
961 fnum, /* logical font number */
962 last_bot, /* scrollbar last bottom position */ 1116 last_bot, /* scrollbar last bottom position */
963 last_top, /* scrollbar last top position */ 1117 last_top, /* scrollbar last top position */
964 last_state, /* scrollbar last state */ 1118 last_state, /* scrollbar last state */
965 scrollbar_len, 1119 scrollbar_len,
966#ifdef MENUBAR 1120#ifdef MENUBAR
… …
976# ifdef POINTER_BLANK 1130# ifdef POINTER_BLANK
977 pointerBlankDelay, 1131 pointerBlankDelay,
978# endif 1132# endif
979 allowedxerror; 1133 allowedxerror;
980/* ---------- */ 1134/* ---------- */
981 unsigned int ModMetaMask, 1135 unsigned int ModLevel3Mask,
1136 ModMetaMask,
982 ModNumLockMask, 1137 ModNumLockMask;
983 old_width, /* last used width in screen resize */ 1138 int old_width, /* last used width in screen resize */
984 old_height, /* last used height in screen resize */ 1139 old_height; /* last used height in screen resize */
985#ifndef NO_BRIGHTCOLOR
986 colorfgbg,
987#endif
988 ttymode;
989 unsigned long PrivateModes, 1140 unsigned long priv_modes,
990 SavedModes; 1141 SavedModes;
991/* ---------- */ 1142/* ---------- */
992 Atom xa[NUM_XA]; 1143 Atom xa[NUM_XA];
993/* ---------- */ 1144/* ---------- */
994#ifdef MENUBAR 1145#ifdef MENUBAR
… …
1020#endif 1171#endif
1021/* ---------- */ 1172/* ---------- */
1022 Time selection_time, 1173 Time selection_time,
1023 selection_request_time; 1174 selection_request_time;
1024 pid_t cmd_pid; /* process id of child */ 1175 pid_t cmd_pid; /* process id of child */
1025 gid_t ttygid; 1176 char * incr_buf;
1026#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 1177 size_t incr_buf_size, incr_buf_fill;
1027 uid_t euid;
1028 gid_t egid;
1029#endif
1030/* ---------- */ 1178/* ---------- */
1031 Cursor leftptr_cursor; 1179 Cursor leftptr_cursor;
1032#ifdef POINTER_BLANK
1033 Cursor blank_cursor;
1034#endif
1035/* ---------- */ 1180/* ---------- */
1036 const char *ttydev; /* pty/tty name */
1037#ifndef NO_BACKSPACE_KEY 1181#ifndef NO_BACKSPACE_KEY
1038 const char *key_backspace; 1182 const char *key_backspace;
1039#endif 1183#endif
1040#ifndef NO_DELETE_KEY 1184#ifndef NO_DELETE_KEY
1041 const char *key_delete; 1185 const char *key_delete;
1042#endif
1043#ifdef USE_XIM
1044 rxvt_xim *input_method;
1045 XIC Input_Context;
1046 XIMStyle input_style;
1047 int event_type;
1048#endif 1186#endif
1049 struct mouse_event MEvent; 1187 struct mouse_event MEvent;
1050 XComposeStatus compose; 1188 XComposeStatus compose;
1051 ttymode_t tio; 1189 ttymode_t tio;
1052#ifdef UTMP_SUPPORT 1190#ifdef UTMP_SUPPORT
… …
1064 row_col_t oldcursor; 1202 row_col_t oldcursor;
1065#ifdef XPM_BACKGROUND 1203#ifdef XPM_BACKGROUND
1066 bgPixmap_t bgPixmap; 1204 bgPixmap_t bgPixmap;
1067 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1205 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1068#endif 1206#endif
1069#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1070 struct stat ttyfd_stat; /* original status of our tty */
1071#endif
1072#ifdef MENUBAR 1207#ifdef MENUBAR
1073 menu_t *ActiveMenu, /* currently active menu */ 1208 menu_t *ActiveMenu, /* currently active menu */
1074 *BuildMenu; /* the menu currently being built */ 1209 *BuildMenu; /* the menu currently being built */
1075 bar_t *CurrentBar; 1210 bar_t *CurrentBar;
1076# if ! (MENUBAR_MAX > 1) 1211# if ! (MENUBAR_MAX > 1)
… …
1082#endif 1217#endif
1083#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1084 struct timeval lastmotion; 1219 struct timeval lastmotion;
1085#endif 1220#endif
1086 1221
1222#if ENABLE_OVERLAY
1223 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1224 text_t **ov_text;
1225 rend_t **ov_rend;
1226
1227 void scr_swap_overlay ();
1228 void scr_overlay_new (int x, int y, int w, int h);
1229 void scr_overlay_off ();
1230 void scr_overlay_set (int x, int y,
1231 text_t text,
1232 rend_t rend = OVERLAY_RSTYLE);
1233 void scr_overlay_set (int x, int y, const char *s);
1234 void scr_overlay_set (int x, int y, const wchar_t *s);
1235#endif
1236
1087 vector<void *> allocated; // free these memory blocks with free() 1237 vector<void *> allocated; // free these memory blocks with free()
1088 1238
1089 char *env_windowid; /* environmental variable WINDOWID */ 1239 char *env_windowid; /* environmental variable WINDOWID */
1090 char *env_display; /* environmental variable DISPLAY */ 1240 char *env_display; /* environmental variable DISPLAY */
1091 char *env_term; /* environmental variable TERM */ 1241 char *env_term; /* environmental variable TERM */
1092 char *env_colorfgbg; 1242 char *env_colorfgbg;
1093 char *locale; 1243 char *locale;
1094#if 0
1095 char *codeset;
1096#endif
1097 char charsets[4]; 1244 char charsets[4];
1098 unsigned char *v_buffer; /* pointer to physical buffer */ 1245 unsigned char *v_buffer; /* pointer to physical buffer */
1099 unsigned int v_buflen; /* size of area to write */ 1246 unsigned int v_buflen; /* size of area to write */
1100 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1247 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1248
1101#ifdef KEYSYM_RESOURCE 1249#ifdef KEYSYM_RESOURCE
1102 const unsigned char *Keysym_map[256]; 1250 keyboard_manager *keyboard;
1103#endif 1251#endif
1252
1104 const char *rs[NUM_RESOURCES]; 1253 const char *rs[NUM_RESOURCES];
1105 /* command input buffering */ 1254 /* command input buffering */
1106 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1255 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1107 unsigned char cmdbuf_base[CBUFSIZ]; 1256 unsigned char cmdbuf_base[CBUFSIZ];
1108 1257
1109 rxvt_salloc *talloc; // text line allocator 1258 rxvt_salloc *talloc; // text line allocator
1110 rxvt_salloc *ralloc; // rend line allocator 1259 rxvt_salloc *ralloc; // rend line allocator
1111 1260
1112 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1261 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1113 1262
1263#if ENABLE_FRILLS || ISO_14755
1264 // ISO 14755 entry support
1265 unicode_t iso14755buf;
1266 void commit_iso14755 ();
1267 int hex_keyval (XKeyEvent &ev);
1268# if ISO_14755
1269 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1270 void iso14755_54 (int x, int y);
1271# endif
1272#endif
1273
1274 // modifies first argument(!)
1114 void paste (const unsigned char *data, unsigned int len); 1275 void paste (unsigned char *data, unsigned int len);
1115 1276
1116 void flush (); 1277 void flush ();
1117 1278
1279#if TRANSPARENT
1118 void rootwin_cb (XEvent &xev); 1280 void rootwin_cb (XEvent &xev);
1119 xevent_watcher rootwin_ev; 1281 xevent_watcher rootwin_ev;
1282#endif
1120 1283
1121 void x_cb (XEvent &xev); 1284 void x_cb (XEvent &xev);
1122 xevent_watcher termwin_ev; 1285 xevent_watcher termwin_ev;
1123 xevent_watcher vt_ev; 1286 xevent_watcher vt_ev;
1124#ifdef HAVE_SCROLLBARS 1287#ifdef HAVE_SCROLLBARS
… …
1126#endif 1289#endif
1127#ifdef MENUBAR 1290#ifdef MENUBAR
1128 xevent_watcher menubar_ev; 1291 xevent_watcher menubar_ev;
1129#endif 1292#endif
1130 1293
1131 void check_cb (check_watcher &w); check_watcher check_ev; 1294 void check_cb (check_watcher &w); check_watcher check_ev;
1132 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1295 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1296 void flush_cb (time_watcher &w); time_watcher flush_ev;
1133 1297
1134 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1298 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1135 1299
1136 void incr_cb (time_watcher &w); time_watcher incr_ev; 1300 void incr_cb (time_watcher &w); time_watcher incr_ev;
1137 1301
… …
1153#endif 1317#endif
1154 1318
1155#ifdef POINTER_BLANK 1319#ifdef POINTER_BLANK
1156 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1320 void pointer_cb (time_watcher &w); time_watcher pointer_ev;
1157 void pointer_blank (); 1321 void pointer_blank ();
1322#endif
1158 void pointer_unblank (); 1323 void pointer_unblank ();
1159#endif
1160 1324
1161 void tt_printf (const char *fmt,...); 1325 void tt_printf (const char *fmt,...);
1162 void tt_write (const unsigned char *data, unsigned int len); 1326 void tt_write (const unsigned char *data, unsigned int len);
1327 void pty_write ();
1163 1328
1164 void tt_winch (); 1329 void tt_winch ();
1165 1330
1166 rxvt_term (); 1331 rxvt_term ();
1167 ~rxvt_term (); 1332 ~rxvt_term ();
1168 void destroy (); 1333 void destroy ();
1334 void emergency_cleanup ();
1169 1335
1170 bool init (int argc, const char *const *argv); 1336 bool init (int argc, const char *const *argv);
1171 bool init_vars (); 1337 bool init_vars ();
1172 1338
1173 bool pty_fill (); 1339 bool pty_fill ();
1174
1175 void *operator new (size_t s);
1176 void operator delete (void *p, size_t s);
1177 1340
1178 void init_secondary (); 1341 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1342 const char **init_resources (int argc, const char *const *argv);
1180 void init_env (); 1343 void init_env ();
1181 void set_locale (const char *locale); 1344 void set_locale (const char *locale);
1182 void init_xlocale (); 1345 void init_xlocale ();
1183 void init_command (const char *const *argv); 1346 void init_command (const char *const *argv);
1184 int run_command (const char *const *argv); 1347 void run_command (const char *const *argv);
1185 int run_child (const char *const *argv); 1348 int run_child (const char *const *argv);
1186 static void child_exited (int pid);
1187 1349
1188 void color_aliases (int idx); 1350 void color_aliases (int idx);
1189 void recolour_cursor (); 1351 void recolour_cursor ();
1190 void create_windows (int argc, const char *const *argv); 1352 void create_windows (int argc, const char *const *argv);
1191 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1353 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1192 void window_calc (unsigned int width, unsigned int height); 1354 void window_calc (unsigned int newwidth, unsigned int newheight);
1193 1355
1194#if USE_XIM 1356#if USE_XIM
1357 rxvt_xim *input_method;
1358 XIC Input_Context;
1359 XIMStyle input_style;
1360 XPoint spot; // most recently sent spot position
1361
1195 void im_destroy (); 1362 void im_destroy ();
1196 void im_cb (); im_watcher im_ev; 1363 void im_cb (); im_watcher im_ev;
1197 void im_set_size (XRectangle *size); 1364 void im_set_size (XRectangle &size);
1198 void im_set_position (XPoint *pos); 1365 void im_set_position (XPoint &pos);
1199 void im_set_color (unsigned long *fg, unsigned long *bg); 1366 void im_set_color (unsigned long &fg, unsigned long &bg);
1200 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect); 1367 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1201 1368
1202 bool IMisRunning (); 1369 bool IMisRunning ();
1203 void IMSendSpot (); 1370 void IMSendSpot ();
1204 bool IM_get_IC (const char *modifiers); 1371 bool IM_get_IC (const char *modifiers);
1205 void IMSetStatusPosition (); 1372 void IMSetStatusPosition ();
… …
1211 1378
1212 void selection_click (int clicks, int x, int y); 1379 void selection_click (int clicks, int x, int y);
1213 void selection_extend (int x, int y, int flag); 1380 void selection_extend (int x, int y, int flag);
1214 void selection_rotate (int x, int y); 1381 void selection_rotate (int x, int y);
1215 1382
1216 /* screen (!) */
1217 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1218 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1219 int scr_scroll_text (int row1, int row2, int count, int spec);
1220 void scr_reset ();
1221 void scr_reset_realloc ();
1222 void scr_release ();
1223 void scr_clear (bool really = false);
1224 void scr_refresh (unsigned char refresh_type);
1225 bool scr_refresh_rend (rend_t mask, rend_t value);
1226 void scr_erase_screen (int mode);
1227 void scr_touch (bool refresh);
1228 void scr_expose (int x, int y, int width, int height, bool refresh);
1229 void scr_remap_chars ();
1230 void scr_remap_chars (text_t *tp, rend_t *rp);
1231
1232 /* autoconvert */ 1383 /* autoconvert */
1233 1384
1234 // command.C 1385 // command.C
1235 void lookup_key (XKeyEvent &ev); 1386 void lookup_key (XKeyEvent &ev);
1236 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1387 unsigned int cmd_write (const unsigned char *str, unsigned int count);
… …
1242 1393
1243 bool cmd_parse (); 1394 bool cmd_parse ();
1244 void mouse_report (XButtonEvent &ev); 1395 void mouse_report (XButtonEvent &ev);
1245 void button_press (XButtonEvent &ev); 1396 void button_press (XButtonEvent &ev);
1246 void button_release (XButtonEvent &ev); 1397 void button_release (XButtonEvent &ev);
1398 void focus_in ();
1399 void focus_out ();
1247 int check_our_parents (); 1400 int check_our_parents ();
1248#ifdef PRINTPIPE 1401#ifdef PRINTPIPE
1249 FILE *popen_printer (); 1402 FILE *popen_printer ();
1250 int pclose_printer (FILE *stream); 1403 int pclose_printer (FILE *stream);
1251#endif 1404#endif
… …
1268 void Get_Colours (); 1421 void Get_Colours ();
1269 void get_ourmods (); 1422 void get_ourmods ();
1270 // logging.C 1423 // logging.C
1271 void makeutent (const char *pty, const char *hostname); 1424 void makeutent (const char *pty, const char *hostname);
1272 void cleanutent (); 1425 void cleanutent ();
1273 // main.C; 1426 // main.C
1274 void privileges (int mode);
1275 void privileged_utmp (char action); 1427 void privileged_utmp (rxvt_privaction action);
1276 void privileged_ttydev (char action); 1428 bool set_fonts ();
1277 bool change_font (const char *fontname); 1429 void set_string_property (Atom prop, const char *str, int len = -1);
1278 bool font_up_down (int n, int direction); 1430 void set_utf8_property (Atom prop, const char *str, int len = -1);
1279 void set_title (const char *str); 1431 void set_title (const char *str);
1280 void set_icon_name (const char *str); 1432 void set_icon_name (const char *str);
1281 void set_window_color (int idx, const char *color); 1433 void set_window_color (int idx, const char *color);
1282 void set_colorfgbg (); 1434 void set_colorfgbg ();
1283 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1435 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1284 void set_widthheight (unsigned int width, unsigned int height); 1436 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1285 1437
1286#ifdef MENUBAR 1438#ifdef MENUBAR
1287 // menubar.C 1439 // menubar.C
1288 void menuitem_free (menu_t *menu, menuitem_t *item); 1440 void menuitem_free (menu_t *menu, menuitem_t *item);
1289 int action_dispatch (action_t *action); 1441 int action_dispatch (action_t *action);
… …
1315 void menubar_control (XButtonEvent &ev); 1467 void menubar_control (XButtonEvent &ev);
1316 void map_menuBar (int map); 1468 void map_menuBar (int map);
1317#endif 1469#endif
1318 1470
1319 // screen.C 1471 // screen.C
1472
1473 void lalloc (line_t &l)
1474 {
1475 l.t = (text_t *)talloc->alloc ();
1476 l.r = (rend_t *)ralloc->alloc ();
1477 }
1478
1479 void lfree (line_t &l)
1480 {
1481 talloc->free (l.t);
1482 ralloc->free (l.r);
1483 }
1484
1485 void lresize (line_t &l)
1486 {
1487 if (!l.t)
1488 return;
1489
1490 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1491 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1492
1493 MIN_IT (l.l, (int16_t)ncol);
1494
1495 if (ncol > prev_ncol)
1496 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1497 }
1498
1499 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1500 void scr_blank_screen_mem (line_t &l, rend_t efs);
1501 int scr_scroll_text (int row1, int row2, int count, int spec);
1502 void scr_reset ();
1503 void scr_reset_realloc ();
1504 void scr_release ();
1505 void scr_clear (bool really = false);
1506 void scr_refresh (unsigned char refresh_type);
1507 bool scr_refresh_rend (rend_t mask, rend_t value);
1508 void scr_erase_screen (int mode);
1509#if ENABLE_FRILLS
1510 void scr_erase_savelines ();
1511 void scr_backindex ();
1512 void scr_forwardindex ();
1513#endif
1514 void scr_touch (bool refresh);
1515 void scr_expose (int x, int y, int width, int height, bool refresh);
1516 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1517 void scr_recolour ();
1518 void scr_remap_chars ();
1519 void scr_remap_chars (const line_t &l);
1520
1320 void scr_poweron (); 1521 void scr_poweron ();
1321 void scr_cursor (int mode); 1522 void scr_cursor (int mode);
1523 void scr_do_wrap ();
1322 int scr_change_screen (int scrn); 1524 int scr_change_screen (int scrn);
1323 void scr_color (unsigned int color, int fgbg); 1525 void scr_color (unsigned int color, int fgbg);
1324 void scr_rendition (int set, int style); 1526 void scr_rendition (int set, int style);
1325 void scr_add_lines (const unicode_t *str, int nlines, int len); 1527 void scr_add_lines (const unicode_t *str, int nlines, int len);
1326 void scr_backspace (); 1528 void scr_backspace ();
1327 void scr_tab (int count); 1529 void scr_tab (int count, bool ht = false);
1328 void scr_backindex ();
1329 void scr_forwardindex ();
1330 void scr_gotorc (int row, int col, int relative); 1530 void scr_gotorc (int row, int col, int relative);
1331 void scr_index (enum page_dirn direction); 1531 void scr_index (enum page_dirn direction);
1332 void scr_erase_line (int mode); 1532 void scr_erase_line (int mode);
1333 void scr_E (); 1533 void scr_E ();
1334 void scr_insdel_lines (int count, int insdel); 1534 void scr_insdel_lines (int count, int insdel);
… …
1344 void set_font_style (); 1544 void set_font_style ();
1345 void scr_charset_choose (int set); 1545 void scr_charset_choose (int set);
1346 void scr_charset_set (int set, unsigned int ch); 1546 void scr_charset_set (int set, unsigned int ch);
1347 int scr_move_to (int y, int len); 1547 int scr_move_to (int y, int len);
1348 int scr_page (enum page_dirn direction, int nlines); 1548 int scr_page (enum page_dirn direction, int nlines);
1349 int scr_changeview (uint16_t oldviewstart); 1549 int scr_changeview (unsigned int oldviewstart);
1350 void scr_bell (); 1550 void scr_bell ();
1351 void scr_printscreen (int fullhist); 1551 void scr_printscreen (int fullhist);
1352 void scr_reverse_selection (); 1552 void scr_reverse_selection ();
1353 void scr_dump (int fd); 1553 void scr_dump (int fd);
1354 void selection_check (int check_more); 1554 void selection_check (int check_more);
1355 int selection_paste (Window win, Atom prop, bool delete_prop); 1555 void selection_paste (Window win, Atom prop, bool delete_prop);
1356 void selection_property (Window win, Atom prop); 1556 void selection_property (Window win, Atom prop);
1357 void selection_request (Time tm, int x, int y); 1557 void selection_request (Time tm, int x, int y);
1358 int selection_request_other (Atom target, int selnum); 1558 int selection_request_other (Atom target, int selnum);
1359 void selection_clear (); 1559 void selection_clear ();
1360 void selection_make (Time tm); 1560 void selection_make (Time tm);
… …
1395 1595
1396 // xdefaults.C 1596 // xdefaults.C
1397 void get_options (int argc, const char *const *argv); 1597 void get_options (int argc, const char *const *argv);
1398 int parse_keysym (const char *str, const char *arg); 1598 int parse_keysym (const char *str, const char *arg);
1399 void get_xdefaults (FILE *stream, const char *name); 1599 void get_xdefaults (FILE *stream, const char *name);
1400 void extract_resources (Display *display, const char *name); 1600 void extract_resources ();
1401 // xpm.C 1601 // xpm.C
1402 int scale_pixmap (const char *geom); 1602 int scale_pixmap (const char *geom);
1403 void resize_pixmap (); 1603 void resize_pixmap ();
1404 Pixmap set_bgPixmap (const char *file); 1604 Pixmap set_bgPixmap (const char *file);
1405}; 1605};
… …
1412#ifdef PROTOTYPES 1612#ifdef PROTOTYPES
1413# define __PROTO(p) p 1613# define __PROTO(p) p
1414#else 1614#else
1415# define __PROTO(p) () 1615# define __PROTO(p) ()
1416#endif 1616#endif
1417#include "protos.h"
1418 1617
1419#ifdef DEBUG_malloc 1618#ifdef DEBUG_malloc
1420# include "dmalloc.h" /* This comes last */ 1619# include "dmalloc.h" /* This comes last */
1421#endif 1620#endif
1422 1621

Diff Legend

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