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

Diff Legend

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