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.45 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.132 by root, Wed Dec 15 00:12:58 2004 UTC

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

Diff Legend

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