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.175 by root, Sat Dec 31 18:19:07 2005 UTC vs.
Revision 1.246 by root, Sat Jan 28 20:33:31 2006 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#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1
10#endif
11
12#if ENABLE_PERL
13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1
15#endif
16
17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1
22#else
23# define ENABLE_MINIMAL 1
24#endif
7 25
8#include <limits.h> 26#include <limits.h>
9 27
10#include <X11/cursorfont.h> 28#include <X11/cursorfont.h>
11#include <X11/keysym.h> 29#include <X11/keysym.h>
… …
18#include "encoding.h" 36#include "encoding.h"
19#include "rxvtfont.h" 37#include "rxvtfont.h"
20#include "rxvttoolkit.h" 38#include "rxvttoolkit.h"
21#include "iom.h" 39#include "iom.h"
22#include "salloc.h" 40#include "salloc.h"
41#include "libptytty.h"
23 42
24#if ENABLE_FRILLS 43#include "rxvtperl.h"
25# define ENABLE_XEMBED 1 44
26# define ENABLE_EWMH 1 45// try to avoid some macros to decrease code size, on some systems
27# define CURSOR_BLINK 1 46#if ENABLE_MINIMAL
47# define strcmp(a,b) (strcmp)(a,b)
48# define strlen(a) (strlen)(a)
49# define strcpy(a,b) (strcpy)(a,b)
50# define memset(a,c,l) (memset)(a,c,l)
51# define memcpy(a,b,l) (memcpy)(a,b,l)
28#endif 52#endif
29 53
30/* 54/*
31 ***************************************************************************** 55 *****************************************************************************
32 * SYSTEM HACKS 56 * SYSTEM HACKS
… …
41#if defined (sun) && !defined (__sun__) 65#if defined (sun) && !defined (__sun__)
42# define __sun__ 1 66# define __sun__ 1
43#endif 67#endif
44 68
45#ifndef HAVE_XPOINTER 69#ifndef HAVE_XPOINTER
46typedef char *XPointer; 70typedef char *XPointer;
47#endif 71#endif
48 72
49#ifdef HAVE_TERMIOS_H 73#ifdef HAVE_TERMIOS_H
50# include <termios.h> 74# include <termios.h>
51typedef struct termios ttymode_t; 75typedef struct termios ttymode_t;
… …
72# define STDIN_FILENO 0 96# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 97# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 98# define STDERR_FILENO 2
75#endif 99#endif
76 100
77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 101/****************************************************************************/
78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 102
79# define NO_SETOWNER_TTYDEV 1 103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
80# endif 108# endif
109# define __attribute__(x)
81#endif 110#endif
82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY) 111
83# define NO_SETOWNER_TTYDEV 1 112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
84#endif 122#endif
123
124// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { };
126
127// exception thrown when the command parser runs out of input data
128class out_of_input { };
85 129
86/* 130/*
87 ***************************************************************************** 131 *****************************************************************************
88 * PROTOTYPES 132 * PROTOTYPES
89 ***************************************************************************** 133 *****************************************************************************
90 */ 134 */
91// main.C 135// main.C
92RETSIGTYPE rxvt_Child_signal (int sig); 136RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
93RETSIGTYPE rxvt_Exit_signal (int sig); 137RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
94void rxvt_clean_exit (); 138void rxvt_clean_exit () NOTHROW;
95void * rxvt_malloc (size_t size); 139void * rxvt_malloc (size_t size);
96void * rxvt_calloc (size_t number, size_t size); 140void * rxvt_calloc (size_t number, size_t size);
97void * rxvt_realloc (void *ptr, size_t size); 141void * rxvt_realloc (void *ptr, size_t size);
98void rxvt_privileges (rxvt_privaction action);
99 142
100// util.C 143// misc.C
101char * rxvt_wcstombs (const wchar_t *str, int len = -1); 144char * rxvt_wcstombs (const wchar_t *str, int len = -1);
102wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 145wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
103char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
104wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 147wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
105char * rxvt_strdup (const char *str); 148char * rxvt_strdup_cpp (const char *str);
106 149
107// misc.C 150#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
151
108char * rxvt_r_basename (const char *str); 152char * rxvt_r_basename (const char *str) NOTHROW;
109void rxvt_vlog (const char *fmt, va_list arg_ptr); 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
110void rxvt_log (const char *fmt,...); 154void rxvt_log (const char *fmt,...) NOTHROW;
111void rxvt_warn (const char *fmt,...); 155void rxvt_warn (const char *fmt,...) NOTHROW;
112void rxvt_fatal (const char *fmt,...); 156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
113void rxvt_exit_failure (); 157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158
114int rxvt_Str_match (const char *s1, const char *s2); 159int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
115const char * rxvt_Str_skip_space (const char *str); 160const char * rxvt_Str_skip_space (const char *str) NOTHROW;
116char * rxvt_Str_trim (char *str); 161char * rxvt_Str_trim (char *str) NOTHROW;
117int rxvt_Str_escaped (char *str); 162int rxvt_Str_escaped (char *str) NOTHROW;
118char ** rxvt_splitcommastring (const char *cs); 163char ** rxvt_splitcommastring (const char *cs) NOTHROW;
119void rxvt_freecommastring (char **cs); 164void rxvt_freecommastring (char **cs) NOTHROW;
120char * rxvt_File_find (const char *file, const char *ext, const char *path); 165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 166
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 167/////////////////////////////////////////////////////////////////////////////
123void rxvt_usleep (int usecs); 168
169// temporarily replace the process environment
170extern char **environ;
171extern char **rxvt_environ; // the original environ pointer
172
173inline void set_environ (stringvec *envv)
174{
175#if ENABLE_PERL
176 assert (envv);
177#else
178 if (envv)
179#endif
180 environ = (char **)envv->begin ();
181}
182
183inline void set_environ (char **envv)
184{
185#if ENABLE_PERL
186 assert (envv);
187#else
188 if (envv)
189#endif
190 environ = envv;
191}
124 192
125/* 193/*
126 ***************************************************************************** 194 *****************************************************************************
127 * STRUCTURES AND TYPEDEFS 195 * STRUCTURES AND TYPEDEFS
128 ***************************************************************************** 196 *****************************************************************************
129 */ 197 */
130struct grwin_t; 198struct grwin_t;
131 199
132/* Sanitize menubar info */
133#ifndef MENUBAR
134# undef MENUBAR_MAX
135#endif
136#ifndef MENUBAR_MAX
137# define MENUBAR_MAX 0
138#endif
139
140/* If we're using either the rxvt scrollbar or menu bars, keep the 200/* If we're using either the rxvt scrollbar, keep the
141 * scrollColor resource. 201 * scrollColor resource.
142 */ 202 */
143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 203#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
144# define KEEP_SCROLLCOLOR 1 204# define KEEP_SCROLLCOLOR 1
145#else 205#else
146# undef KEEP_SCROLLCOLOR 206# undef KEEP_SCROLLCOLOR
147#endif 207#endif
148 208
… …
218 278
219#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 279#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
220# define NO_MOUSE_REPORT_SCROLLBAR 1 280# define NO_MOUSE_REPORT_SCROLLBAR 1
221#endif 281#endif
222 282
223#ifdef NO_RESOURCES
224# undef USE_XGETDEFAULT
225#endif
226
227#if ISO_14755
228# define ENABLE_OVERLAY 1
229#endif
230
231/* now look for other badly set stuff */ 283/* now look for other badly set stuff */
232 284
233#if !defined (EACCESS) && defined(EAGAIN) 285#if !defined (EACCESS) && defined(EAGAIN)
234# define EACCESS EAGAIN 286# define EACCESS EAGAIN
235#endif 287#endif
… …
237#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 289#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
238# define EXIT_SUCCESS 0 /* exit function success */ 290# define EXIT_SUCCESS 0 /* exit function success */
239# define EXIT_FAILURE 1 /* exit function failure */ 291# define EXIT_FAILURE 1 /* exit function failure */
240#endif 292#endif
241 293
242#define menuBar_esc 10
243#define scrollBar_esc 30 294#define scrollBar_esc 30
244#define menuBar_margin 2 /* margin below text */
245 295
246#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 296#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
247# define HAVE_SCROLLBARS 1 297# define HAVE_SCROLLBARS 1
248#endif
249
250/* width of scrollBar, menuBar shadow, must be 1 or 2 */
251#ifdef HALFSHADOW
252# define SHADOW 1
253#else
254# define SHADOW 2
255#endif 298#endif
256 299
257#define R_SB_ALIGN_CENTRE 0 300#define R_SB_ALIGN_CENTRE 0
258#define R_SB_ALIGN_TOP 1 301#define R_SB_ALIGN_TOP 1
259#define R_SB_ALIGN_BOTTOM 2 302#define R_SB_ALIGN_BOTTOM 2
… …
332 * | 375 * |
333 * +---< SB_WIDTH_NEXT 376 * +---< SB_WIDTH_NEXT
334 */ 377 */
335 378
336enum { 379enum {
337 NO_REFRESH = 0 , /* Window not visible at all! */ 380 NO_REFRESH = 0, /* Window not visible at all! */
338 FAST_REFRESH = 1<<0, /* Fully exposed window */ 381 FAST_REFRESH = 1, /* Fully exposed window */
339 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 382 SLOW_REFRESH = 2, /* Partially exposed window */
340 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
341}; 383};
342 384
343#ifdef NO_SECONDARY_SCREEN 385#ifdef NO_SECONDARY_SCREEN
344# define NSCREENS 0 386# define NSCREENS 0
345#else 387#else
… …
376enum { 418enum {
377 PRIMARY = 0, 419 PRIMARY = 0,
378 SECONDARY, 420 SECONDARY,
379}; 421};
380 422
381#define RS_None 0 /* Normal */ 423#define RS_None 0
382 424
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 425#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 426#define RS_bgMask 0x00003f80UL // 128 colors
385 427
386// font styles 428// font styles
387#define RS_Bold 0x00004000UL // value 1 429#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 430#define RS_Italic 0x00008000UL // value 2
389 431
390// fake styles 432// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 433#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 434#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 435#define RS_Uline 0x00040000UL // underline
394 436
395// 5 bits still to go 437// 5 custom bits for extensions
438#define RS_customCount 32
439#define RS_customMask 0x00f80000UL
440#define RS_customShift 19
396 441
397// other flags 442// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 443#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 444
400#define RS_styleCount 4 445#define RS_styleCount 4
… …
442 XTerm_property = 3, // change X property 487 XTerm_property = 3, // change X property
443 XTerm_Color = 4, // change colors 488 XTerm_Color = 4, // change colors
444 XTerm_Color00 = 10, // not implemented, CLASH! 489 XTerm_Color00 = 10, // not implemented, CLASH!
445 XTerm_Color01 = 11, // not implemented 490 XTerm_Color01 = 11, // not implemented
446 XTerm_Color_cursor = 12, // change actual 'Cursor' color 491 XTerm_Color_cursor = 12, // change actual 'Cursor' color
447 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 492 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
448 XTerm_Color_pointer_bg = 14, // not implemented 493 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
449 XTerm_Color05 = 15, // not implemented 494 XTerm_Color05 = 15, // not implemented (tektronix fg)
450 XTerm_Color06 = 16, // not implemented 495 XTerm_Color06 = 16, // not implemented (tektronix bg)
451 XTerm_Color_RV = 17, // change actual 'Highlight' color 496 XTerm_Color_RV = 17, // change actual 'Highlight' color
452 XTerm_logfile = 46, // not implemented 497 XTerm_logfile = 46, // not implemented
453 XTerm_font = 50, 498 XTerm_font = 50,
454 499
455 XTerm_konsole30 = 30, // reserved for konsole 500 XTerm_konsole30 = 30, // reserved for konsole
456 XTerm_konsole31 = 31, // reserved for konsole 501 XTerm_konsole31 = 31, // reserved for konsole
457 XTerm_emacs51 = 51, // reserved for emacs shell 502 XTerm_emacs51 = 51, // reserved for emacs shell
458 /* 503 /*
459 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 504 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
505 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
460 */ 506 */
461 XTerm_Color_BD = 18, // change actual 'Bold' color 507 Rxvt_Color_BD = 18, // change actual 'Bold' color
462 XTerm_Color_UL = 19, // change actual 'Underline' color 508 Rxvt_Color_UL = 19, // change actual 'Underline' color
463 XTerm_Pixmap = 20, // new bg pixmap 509 Rxvt_Pixmap = 20, // new bg pixmap
464 XTerm_restoreFG = 39, // change default fg color 510 Rxvt_restoreFG = 39, // change default fg color
465 XTerm_restoreBG = 49, // change default bg color 511 Rxvt_restoreBG = 49, // change default bg color
466 XTerm_dumpscreen = 55, // dump scrollback and all of screen 512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
467 513
468 URxvt_locale = 701, // change locale 514 URxvt_locale = 701, // change locale
469 URxvt_Menu = 703, // set menu item 515 URxvt_version = 702, // request version
516
470 URxvt_Color_IT = 704, // change actual 'Italic' colour 517 URxvt_Color_IT = 704, // change actual 'Italic' colour
471 URxvt_Color_tint = 705, // change actual tint colour 518 URxvt_Color_tint = 705, // change actual tint colour
519 URxvt_Color_BD = 706,
520 URxvt_Color_UL = 707,
472 521
473 URxvt_font = 710, 522 URxvt_font = 710,
474 URxvt_boldFont = 711, 523 URxvt_boldFont = 711,
475 URxvt_italicFont = 712, 524 URxvt_italicFont = 712,
476 URxvt_boldItalicFont = 713, 525 URxvt_boldItalicFont = 713,
477 526
478 URxvt_view_up = 720, 527 URxvt_view_up = 720,
479 URxvt_view_down = 721, 528 URxvt_view_down = 721,
529
530 URxvt_perl = 777,
480}; 531};
481 532
482/* Words starting with `Color_' are colours. Others are counts */ 533/* Words starting with `Color_' are colours. Others are counts */
483/* 534/*
484 * The PixColor and rendition colour usage should probably be decoupled 535 * The PixColor and rendition colour usage should probably be decoupled
… …
561 612
562/* 613/*
563 * Resource list 614 * Resource list
564 */ 615 */
565enum { 616enum {
566 Rs_display_name = 0, 617# define def(name) Rs_ ## name,
567 Rs_term_name, 618# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
568 Rs_iconName, 619# include "rsinc.h"
569 Rs_geometry, 620# undef def
570 Rs_reverseVideo, 621# undef reserve
571 Rs_color,
572 _Rs_color = Rs_color + NRS_COLORS - 1,
573 Rs_font,
574#if ENABLE_STYLES
575 Rs_boldFont,
576 Rs_italicFont,
577 Rs_boldItalicFont,
578 Rs_intensityStyles,
579#endif
580 Rs_name,
581 Rs_title,
582#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
583 Rs_path,
584#endif
585#ifdef XPM_BACKGROUND
586 Rs_backgroundPixmap,
587#endif
588#if (MENUBAR_MAX)
589 Rs_menu,
590#endif
591 Rs_loginShell,
592 Rs_jumpScroll,
593#ifdef HAVE_SCROLLBARS
594 Rs_scrollBar,
595 Rs_scrollBar_right,
596 Rs_scrollBar_floating,
597 Rs_scrollBar_align,
598 Rs_scrollstyle, /* Rs_scrollBar_style */
599 Rs_scrollBar_thickness,
600#endif
601 Rs_scrollTtyOutput,
602 Rs_scrollTtyKeypress,
603 Rs_scrollWithBuffer,
604 Rs_saveLines,
605 Rs_utmpInhibit,
606 Rs_visualBell,
607#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
608 Rs_mapAlert,
609#endif
610#ifdef META8_OPTION
611 Rs_meta8,
612#endif
613#ifdef MOUSE_WHEEL
614 Rs_mouseWheelScrollPage,
615#endif
616#ifndef NO_BACKSPACE_KEY
617 Rs_backspace_key,
618#endif
619#ifndef NO_DELETE_KEY
620 Rs_delete_key,
621#endif
622 Rs_selectstyle,
623#ifdef PRINTPIPE
624 Rs_print_pipe,
625#endif
626#ifdef USE_XIM
627 Rs_preeditType,
628 Rs_inputMethod,
629#endif
630#ifdef TRANSPARENT
631 Rs_transparent,
632 Rs_transparent_all,
633#endif
634#if ENABLE_FRILLS
635 Rs_pty_fd,
636 Rs_hold,
637 Rs_ext_bwidth,
638 Rs_int_bwidth,
639 Rs_borderLess,
640 Rs_lineSpace,
641 Rs_cursorUnderline,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
645#endif
646#if ENABLE_XEMBED
647 Rs_embed,
648#endif
649 Rs_cutchars,
650 Rs_modifier,
651 Rs_answerbackstring,
652 Rs_tripleclickwords,
653 Rs_insecure,
654 Rs_pointerBlank,
655 Rs_pointerBlankDelay,
656 Rs_imLocale,
657 Rs_imFont,
658 Rs_pastableTabs,
659#ifndef NO_SECONDARY_SCREEN
660 Rs_secondaryScreen,
661 Rs_secondaryScroll,
662#endif
663#ifdef OFF_FOCUS_FADING
664 Rs_fade,
665#endif
666#ifdef TINTING
667 Rs_shade,
668#endif
669 NUM_RESOURCES 622 NUM_RESOURCES
670};
671
672// see init.C:xa_names, which must be kept in sync
673enum {
674 XA_TEXT = 0,
675 XA_COMPOUND_TEXT,
676 XA_UTF8_STRING,
677 XA_MULTIPLE,
678 XA_TARGETS,
679 XA_TIMESTAMP,
680 XA_VT_SELECTION,
681 XA_INCR,
682 XA_WM_PROTOCOLS,
683 XA_WM_DELETE_WINDOW,
684 XA_CLIPBOARD,
685#if ENABLE_FRILLS
686 XA_MOTIF_WM_HINTS,
687#endif
688#if ENABLE_EWMH
689 XA_NET_WM_PID,
690 XA_NET_WM_NAME,
691 XA_NET_WM_ICON_NAME,
692 XA_NET_WM_PING,
693#endif
694#if USE_XIM
695 XA_WM_LOCALE_NAME,
696#endif
697#if TRANSPARENT
698 XA_XROOTPMAP_ID,
699 XA_ESETROOT_PMAP_ID,
700#endif
701#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
702 XA_DNDPROTOCOL,
703 XA_DNDSELECTION,
704#endif
705#if ENABLE_XEMBED
706 XA_XEMBED,
707 XA_XEMBED_INFO,
708#endif
709 NUM_XA
710}; 623};
711 624
712/* DEC private modes */ 625/* DEC private modes */
713#define PrivMode_132 (1UL<<0) 626#define PrivMode_132 (1UL<<0)
714#define PrivMode_132OK (1UL<<1) 627#define PrivMode_132OK (1UL<<1)
… …
723#define PrivMode_ShiftKeys (1UL<<10) 636#define PrivMode_ShiftKeys (1UL<<10)
724#define PrivMode_VisibleCursor (1UL<<11) 637#define PrivMode_VisibleCursor (1UL<<11)
725#define PrivMode_MouseX10 (1UL<<12) 638#define PrivMode_MouseX10 (1UL<<12)
726#define PrivMode_MouseX11 (1UL<<13) 639#define PrivMode_MouseX11 (1UL<<13)
727#define PrivMode_scrollBar (1UL<<14) 640#define PrivMode_scrollBar (1UL<<14)
728#define PrivMode_menuBar (1UL<<15)
729#define PrivMode_TtyOutputInh (1UL<<16) 641#define PrivMode_TtyOutputInh (1UL<<15)
730#define PrivMode_Keypress (1UL<<17) 642#define PrivMode_Keypress (1UL<<16)
731#define PrivMode_smoothScroll (1UL<<18) 643#define PrivMode_smoothScroll (1UL<<17)
732#define PrivMode_vt52 (1UL<<19) 644#define PrivMode_vt52 (1UL<<18)
733#define PrivMode_LFNL (1UL<<20) 645#define PrivMode_LFNL (1UL<<19)
734/* too annoying to implement X11 highlight tracking */ 646/* too annoying to implement X11 highlight tracking */
735/* #define PrivMode_MouseX11Track (1LU<<21) */ 647/* #define PrivMode_MouseX11Track (1LU<<20) */
736 648
737#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 649#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
738#define PrivMode(test,bit) \ 650#define PrivMode(test,bit) \
739 if (test) \ 651 if (test) \
740 priv_modes |= (bit); \ 652 priv_modes |= (bit); \
… …
748#endif 660#endif
749 661
750// do not change these constants lightly, there are many interdependencies 662// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 663#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 664#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 665#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 666#define UBUFSIZ 2048 // character buffer
755 667
756#ifndef PATH_MAX 668#ifndef PATH_MAX
757# define PATH_MAX 16384 669# define PATH_MAX 16384
758#endif 670#endif
759 671
… …
787/* 699/*
788 ***************************************************************************** 700 *****************************************************************************
789 * MACRO DEFINES 701 * MACRO DEFINES
790 ***************************************************************************** 702 *****************************************************************************
791 */ 703 */
792#define memset(x, y, z) memset((x), (y), (size_t)(z)) 704#define dLocal(type,name) type const name = this->name
793#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
794#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
795#define strcasecmp(x, y) strcasecmp((x), (y))
796#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
797#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
798#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
799#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
800#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
801#define strcat(x, y) strcat((char *)(x), (const char *)(y))
802#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
803#define strdup(x) strdup((const char *)(x))
804#define strlen(x) strlen((const char *)(x))
805#define strchr(x, y) strchr((const char *)(x), (int)(y))
806#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
807 705
808#define dDisp Display *disp = display->display 706// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicode combining character
708// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
809 710
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
813#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 716#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 717#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 720
820#define TermWin_TotalWidth() ((int32_t)this->width) 721#define OPTION(opt) (options & (opt))
821#define TermWin_TotalHeight() ((int32_t)this->height) 722#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
723 | Opt_jumpScroll | Opt_secondaryScreen \
724 | Opt_pastableTabs | Opt_intensityStyles)
822 725
823// for m >= -n, ensure remainder lies between 0..n-1 726// for m >= -n, ensure remainder lies between 0..n-1
824#define MOD(m,n) (((m) + (n)) % (n)) 727#define MOD(m,n) (((m) + (n)) % (n))
825 728
826#define LINENO(n) MOD (term_start + int(n), total_rows) 729#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
884#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 787#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
885#define scrollbar_position(y) ((y) - scrollBar.beg) 788#define scrollbar_position(y) ((y) - scrollBar.beg)
886#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 789#define scrollbar_size() (scrollBar.end - scrollBar.beg \
887 - scrollbar_minheight ()) 790 - scrollbar_minheight ())
888 791
889#if (MENUBAR_MAX > 1)
890/* rendition style flags */
891# define menuBar_height() (fheight + SHADOW)
892# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
893# define isMenuBarWindow(w) ((w) == menuBar.win)
894#else
895# define menuBar_height() (0)
896# define menuBar_TotalHeight() (0)
897# define isMenuBarWindow(w) (0)
898#endif
899
900#ifdef XPM_BACKGROUND 792#ifdef XPM_BACKGROUND
901# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 793# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
902#else 794#else
903# define XPMClearArea(a, b, c, d, e, f, g) 795# define XPMClearArea(a, b, c, d, e, f, g)
904#endif 796#endif
905 797
906#ifdef UTMP_SUPPORT
907# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
908# undef HAVE_UTMPX_H
909# undef HAVE_STRUCT_UTMPX
910# endif
911# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
912# undef HAVE_UTMP_H
913# undef HAVE_STRUCT_UTMP
914# endif
915
916# ifdef HAVE_UTMPX_H
917# include <utmpx.h>
918# endif
919# ifdef HAVE_UTMP_H
920# include <utmp.h>
921# endif
922#endif
923
924#ifdef DEBUG_CMD
925# define D_CMD(x) fprintf x ; fputc('\n', stderr)
926#else
927# define D_CMD(x)
928#endif
929#ifdef DEBUG_INIT
930# define D_INIT(x) fprintf x ; fputc('\n', stderr)
931#else
932# define D_INIT(x)
933#endif
934#ifdef DEBUG_MAIN
935# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
936#else
937# define D_MAIN(x)
938#endif
939#ifdef DEBUG_SIZE
940# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
941#else
942# define D_SIZE(x)
943#endif
944
945extern class rxvt_failure_exception { } rxvt_failure_exception;
946
947typedef callback1<void, const char *> log_callback; 798typedef callback1<void, const char *> log_callback;
948typedef callback1<int, int> getfd_callback; 799typedef callback1<int, int> getfd_callback;
949 800
950extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
951extern void rxvt_log (const char *fmt, ...);
952extern void rxvt_warn (const char *fmt, ...);
953extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
954extern void rxvt_exit_failure () __attribute__ ((noreturn));
955
956#define SET_LOCALE(locale) rxvt_set_locale (locale) 801#define SET_LOCALE(locale) rxvt_set_locale (locale)
957extern bool rxvt_set_locale (const char *locale); 802extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW;
958 805
959/*
960 ***************************************************************************** 806/****************************************************************************/
961 * VARIABLES 807
808#define LINE_LONGER 0x0001 // line is continued on the next row
809#define LINE_FILTERED 0x0002 // line has been filtered
810#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
811
812struct line_t {
813 text_t *t; // terminal the text
814 rend_t *r; // rendition, uses RS_ flags
815 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
816 uint32_t f; // flags
817
818 bool is_longer ()
819 {
820 return f & LINE_LONGER;
821 }
822
823 void is_longer (int set)
824 {
825 if (set)
826 f |= LINE_LONGER;
827 else
828 f &= ~LINE_LONGER;
829 }
830
831 void clear ()
832 {
833 t = 0;
834 r = 0;
835 l = 0;
836 f = 0;
837 }
838
839 void touch () // call whenever a line is changed/touched/updated
840 {
841#if ENABLE_PERL
842 f &= ~LINE_FILTERED;
843#endif
844 }
845
846 void touch (int col)
847 {
848 max_it (l, col);
849 touch ();
850 }
851};
852
962 ***************************************************************************** 853/****************************************************************************/
963 */
964#ifdef MENUBAR
965# include "menubar.h"
966#endif
967
968#define BLINK_INTERVAL 0.5
969#define TEXT_BLINK_INTERVAL 0.5
970
971#ifndef __attribute__
972# ifdef __GNUC__
973# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
974# define __attribute__(x)
975# endif
976# endif
977# define __attribute__(x)
978#endif
979 854
980// primivite wrapper around mbstate_t to ensure initialisation 855// primivite wrapper around mbstate_t to ensure initialisation
981struct mbstate { 856struct mbstate {
982 mbstate_t mbs; 857 mbstate_t mbs;
983 858
984 operator mbstate_t *() { return &mbs; } 859 operator mbstate_t *() { return &mbs; }
985 void reset () { memset (&mbs, 0, sizeof (mbs)); } 860 void reset () { memset (&mbs, 0, sizeof (mbs)); }
986 mbstate () { reset (); } 861 mbstate () { reset (); }
987}; 862};
988 863
864/****************************************************************************/
865
989#define UNICODE_MASK 0x1fffffUL 866#define UNICODE_MASK 0x1fffffUL
990 867
991#if UNICODE3 868#if UNICODE3
992# define COMPOSE_LO 0x40000000UL 869# define COMPOSE_LO 0x40000000UL
993# define COMPOSE_HI 0x400fffffUL 870# define COMPOSE_HI 0x400fffffUL
994# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
995#else 872#else
873# if ENABLE_PERL
874# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
875# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
876# else
996# define COMPOSE_LO 0xd800UL 877# define COMPOSE_LO 0xd800UL
997# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 878# define COMPOSE_HI 0xf8ffUL
998# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 879# endif
880# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
999#endif 881#endif
1000 882
1001#if ENABLE_COMBINING 883#if ENABLE_COMBINING
1002// compose chars are used to represent composite characters 884// compose chars are used to represent composite characters
1003// that are not representable in unicode, as well as characters 885// that are not representable in unicode, as well as characters
… …
1023}; 905};
1024 906
1025extern class rxvt_composite_vec rxvt_composite; 907extern class rxvt_composite_vec rxvt_composite;
1026#endif 908#endif
1027 909
910/****************************************************************************/
1028 911
1029#ifdef KEYSYM_RESOURCE 912#ifdef KEYSYM_RESOURCE
1030 class keyboard_manager; 913 class keyboard_manager;
1031#endif 914#endif
1032 915
1033struct rxvt_term : zero_initialized, rxvt_vars { 916struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
1034 log_callback *log_hook; // log error messages through this hook, if != 0 917 log_callback *log_hook; // log error messages through this hook, if != 0
1035 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1036 919#if ENABLE_PERL
920 rxvt_perl_term perl;
921#endif
1037 struct mbstate mbstate; // current input multibyte state 922 struct mbstate mbstate; // current input multibyte state
1038 923
1039 unsigned char want_refresh:1, 924 unsigned char want_refresh:1,
1040#ifdef TRANSPARENT 925#ifdef TRANSPARENT
1041 want_full_refresh:1, /* awaiting full screen refresh */ 926 want_full_refresh:1, /* awaiting full screen refresh */
… …
1043#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 928#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1044 am_transparent:1, /* is a transparent term */ 929 am_transparent:1, /* is a transparent term */
1045 am_pixmap_trans:1, /* transparency w/known root pixmap */ 930 am_pixmap_trans:1, /* transparency w/known root pixmap */
1046#endif 931#endif
1047 current_screen:1, /* primary or secondary */ 932 current_screen:1, /* primary or secondary */
1048 hate_those_clicks:1, /* a.k.a. keep mark position */
1049 num_scr_allow:1, 933 num_scr_allow:1,
1050 bypass_keystate:1, 934 bypass_keystate:1,
1051#ifdef CURSOR_BLINK 935#ifdef CURSOR_BLINK
1052 hidden_cursor:1, 936 hidden_cursor:1,
1053#endif 937#endif
… …
1068#endif 952#endif
1069 scrollbar_align, 953 scrollbar_align,
1070 selection_wait, 954 selection_wait,
1071 selection_type; 955 selection_type;
1072/* ---------- */ 956/* ---------- */
957 bool rvideo_state, rvideo_mode;
958#ifndef NO_BELL
1073 short rvideo; 959 bool rvideo_bell;
960#endif
1074 int num_scr; /* screen: number lines scrolled */ 961 int num_scr; /* screen: number lines scrolled */
1075 int prev_ncol, /* screen: previous number of columns */ 962 int prev_ncol, /* screen: previous number of columns */
1076 prev_nrow; /* screen: previous number of rows */ 963 prev_nrow; /* screen: previous number of rows */
1077/* ---------- */ 964/* ---------- */
1078 rend_t rstyle; 965 rend_t rstyle;
… …
1096 refresh_limit, 983 refresh_limit,
1097 last_bot, /* scrollbar last bottom position */ 984 last_bot, /* scrollbar last bottom position */
1098 last_top, /* scrollbar last top position */ 985 last_top, /* scrollbar last top position */
1099 last_state, /* scrollbar last state */ 986 last_state, /* scrollbar last state */
1100 scrollbar_len, 987 scrollbar_len,
1101#ifdef MENUBAR
1102 menu_readonly, /* okay to alter menu? */
1103 Arrows_x,
1104#endif
1105#if MENUBAR_MAX > 1
1106 Nbars,
1107#endif
1108 window_vt_x, 988 window_vt_x,
1109 window_vt_y, 989 window_vt_y,
1110 window_sb_x, 990 window_sb_x,
1111# ifdef POINTER_BLANK 991# ifdef POINTER_BLANK
1112 pointerBlankDelay, 992 pointerBlankDelay,
… …
1119 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1120 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1121 unsigned long priv_modes, 1001 unsigned long priv_modes,
1122 SavedModes; 1002 SavedModes;
1123/* ---------- */ 1003/* ---------- */
1124 Atom xa[NUM_XA]; 1004 Atom *xa;
1125/* ---------- */ 1005/* ---------- */
1126#ifdef MENUBAR 1006#ifdef RXVT_SCROLLBAR
1127 GC menubarGC;
1128#endif
1129#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1130 GC scrollbarGC, 1007 GC scrollbarGC,
1131 topShadowGC, 1008 topShadowGC,
1132 botShadowGC; 1009 botShadowGC;
1133#endif 1010#endif
1134#ifdef XTERM_SCROLLBAR 1011#ifdef XTERM_SCROLLBAR
… …
1166 const char *key_delete; 1043 const char *key_delete;
1167#endif 1044#endif
1168 struct mouse_event MEvent; 1045 struct mouse_event MEvent;
1169 XComposeStatus compose; 1046 XComposeStatus compose;
1170 ttymode_t tio; 1047 ttymode_t tio;
1171#ifdef UTMP_SUPPORT
1172# ifdef HAVE_STRUCT_UTMP
1173 struct utmp ut;
1174# endif
1175# ifdef HAVE_STRUCT_UTMPX
1176 struct utmpx utx;
1177# endif
1178# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1179 char ut_id[5];
1180# endif
1181 int utmp_pos;
1182#endif
1183 row_col_t oldcursor; 1048 row_col_t oldcursor;
1184#ifdef XPM_BACKGROUND 1049#ifdef XPM_BACKGROUND
1185 bgPixmap_t bgPixmap; 1050 bgPixmap_t bgPixmap;
1186 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1051 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1187#endif 1052#endif
1188#ifdef MENUBAR
1189 menu_t *ActiveMenu, /* currently active menu */
1190 *BuildMenu; /* the menu currently being built */
1191 bar_t *CurrentBar;
1192# if ! (MENUBAR_MAX > 1)
1193 bar_t BarList;
1194# endif /* (MENUBAR_MAX > 1) */
1195#endif
1196#ifdef CURSOR_BLINK
1197 struct timeval lastcursorchange;
1198#endif
1199#ifdef POINTER_BLANK
1200 struct timeval lastmotion;
1201#endif
1202 1053
1203#if ENABLE_OVERLAY 1054#if ENABLE_OVERLAY
1204 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1055 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1205 text_t **ov_text; 1056 text_t **ov_text;
1206 rend_t **ov_rend; 1057 rend_t **ov_rend;
1207 1058
1208 void scr_swap_overlay (); 1059 void scr_swap_overlay () NOTHROW;
1209 void scr_overlay_new (int x, int y, int w, int h); 1060 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1210 void scr_overlay_off (); 1061 void scr_overlay_off () NOTHROW;
1211 void scr_overlay_set (int x, int y, 1062 void scr_overlay_set (int x, int y,
1212 text_t text, 1063 text_t text,
1213 rend_t rend = OVERLAY_RSTYLE); 1064 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1214 void scr_overlay_set (int x, int y, const char *s); 1065 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1215 void scr_overlay_set (int x, int y, const wchar_t *s); 1066 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1216#endif 1067#endif
1217 1068
1218 vector<void *> allocated; // free these memory blocks with free() 1069 vector<void *> allocated; // free these memory blocks with free()
1219 1070
1220 char *env_windowid; /* environmental variable WINDOWID */ 1071 char env_windowid[21]; /* environmental variable WINDOWID */
1072 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1221 char *env_display; /* environmental variable DISPLAY */ 1073 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */ 1074 char *env_term; /* environmental variable TERM */
1223 char *env_colorfgbg; 1075
1224 char *locale; 1076 char *locale;
1225 char charsets[4]; 1077 char charsets[4];
1226 unsigned char *v_buffer; /* pointer to physical buffer */ 1078 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1079 unsigned int v_buflen; /* size of area to write */
1228 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1080 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1229 1081
1230#ifdef KEYSYM_RESOURCE 1082#ifdef KEYSYM_RESOURCE
1231 keyboard_manager *keyboard; 1083 keyboard_manager *keyboard;
1232#endif 1084#endif
1233 1085
1234 const char *rs[NUM_RESOURCES]; 1086 const char *rs[NUM_RESOURCES];
1235 /* command input buffering */ 1087 /* command input buffering */
1236 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1088 char *cmdbuf_ptr, *cmdbuf_endp;
1237 unsigned char cmdbuf_base[CBUFSIZ]; 1089 char cmdbuf_base[CBUFSIZ];
1090
1091 ptytty *pty;
1238 1092
1239 rxvt_salloc *talloc; // text line allocator 1093 rxvt_salloc *talloc; // text line allocator
1240 rxvt_salloc *ralloc; // rend line allocator 1094 rxvt_salloc *ralloc; // rend line allocator
1241 1095
1242 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1096 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1251 void iso14755_54 (int x, int y); 1105 void iso14755_54 (int x, int y);
1252# endif 1106# endif
1253#endif 1107#endif
1254 1108
1255 // modifies first argument(!) 1109 // modifies first argument(!)
1256 void paste (unsigned char *data, unsigned int len); 1110 void paste (char *data, unsigned int len) NOTHROW;
1257 1111
1258 void flush (); 1112 long vt_emask, vt_emask_perl, vt_emask_xim;
1113
1114 void vt_select_input () const NOTHROW
1115 {
1116 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 }
1259 1118
1260#if TRANSPARENT 1119#if TRANSPARENT
1261 void rootwin_cb (XEvent &xev); 1120 void rootwin_cb (XEvent &xev);
1262 xevent_watcher rootwin_ev; 1121 xevent_watcher rootwin_ev;
1263#endif 1122#endif
1264 1123
1265 void x_cb (XEvent &xev); 1124 void x_cb (XEvent &xev);
1125 void flush ();
1266 xevent_watcher termwin_ev; 1126 xevent_watcher termwin_ev;
1267 xevent_watcher vt_ev; 1127 xevent_watcher vt_ev;
1268#ifdef HAVE_SCROLLBARS 1128#ifdef HAVE_SCROLLBARS
1269 xevent_watcher scrollbar_ev; 1129 xevent_watcher scrollbar_ev;
1270#endif 1130#endif
1271#ifdef MENUBAR
1272 xevent_watcher menubar_ev;
1273#endif
1274 1131
1132 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1275 void check_cb (check_watcher &w); check_watcher check_ev; 1133 void check_cb (check_watcher &w); check_watcher check_ev;
1276 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1134 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1277 void flush_cb (time_watcher &w); time_watcher flush_ev; 1135 void flush_cb (time_watcher &w); time_watcher flush_ev;
1278
1279 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1136 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1280
1281 void incr_cb (time_watcher &w); time_watcher incr_ev; 1137 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1282 1138
1283#ifdef CURSOR_BLINK 1139#ifdef CURSOR_BLINK
1284 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1140 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1285#endif 1141#endif
1286#ifdef TEXT_BLINK 1142#ifdef TEXT_BLINK
1287 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1143 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1144#endif
1145#ifndef NO_BELL
1146 void bell_cb (time_watcher &w); time_watcher bell_ev;
1288#endif 1147#endif
1289 1148
1290#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1149#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1291 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1150 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1292#endif 1151#endif
… …
1302 void pointer_blank (); 1161 void pointer_blank ();
1303#endif 1162#endif
1304 void pointer_unblank (); 1163 void pointer_unblank ();
1305 1164
1306 void tt_printf (const char *fmt,...); 1165 void tt_printf (const char *fmt,...);
1307 void tt_write (const unsigned char *data, unsigned int len); 1166 void tt_write (const char *data, unsigned int len);
1308 void pty_write (); 1167 void pty_write ();
1309 1168
1310 void tt_winch (); 1169 void tt_winch ();
1311 1170
1312 rxvt_term (); 1171 rxvt_term ();
1313 ~rxvt_term (); 1172 ~rxvt_term ();
1314 void child_exit (); // child has exited, usually destroys
1315 void destroy (); 1173 void destroy ();
1316 void emergency_cleanup (); 1174 void emergency_cleanup ();
1317 1175
1318 bool init (int argc, const char *const *argv); 1176 bool init (int argc, const char *const *argv, stringvec *envv);
1177
1178 bool init (stringvec *argv, stringvec *envv)
1179 {
1180 this->argv = argv;
1181 return init (argv->size (), argv->begin (), envv);
1182 }
1183
1319 bool init_vars (); 1184 bool init_vars ();
1320 1185
1321 bool pty_fill (); 1186 bool pty_fill ();
1187
1188 void make_current () const // make this the "currently active" urxvt instance
1189 {
1190 SET_R (this);
1191 rxvt_set_locale (locale);
1192 set_environ (envv);
1193 }
1322 1194
1323 void init_secondary (); 1195 void init_secondary ();
1324 const char **init_resources (int argc, const char *const *argv); 1196 const char **init_resources (int argc, const char *const *argv);
1197 const char *x_resource (const char *name);
1325 void init_env (); 1198 void init_env ();
1326 void set_locale (const char *locale); 1199 void set_locale (const char *locale);
1327 void init_xlocale (); 1200 void init_xlocale ();
1328 void init_command (const char *const *argv); 1201 void init_command (const char *const *argv);
1329 void run_command (const char *const *argv); 1202 void run_command (const char *const *argv);
… …
1334 void create_windows (int argc, const char *const *argv); 1207 void create_windows (int argc, const char *const *argv);
1335 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1208 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1336 void window_calc (unsigned int newwidth, unsigned int newheight); 1209 void window_calc (unsigned int newwidth, unsigned int newheight);
1337 1210
1338#if USE_XIM 1211#if USE_XIM
1339 rxvt_xim *input_method; 1212 rxvt_xim *input_method;
1340 XIC Input_Context; 1213 XIC Input_Context;
1341 XIMStyle input_style; 1214 XIMStyle input_style;
1342 XPoint spot; // most recently sent spot position 1215 XPoint spot; // most recently sent spot position
1343 1216
1344 void im_destroy (); 1217 void im_destroy ();
1345 void im_cb (); im_watcher im_ev; 1218 void im_cb (); im_watcher im_ev;
1346 void im_set_size (XRectangle &size); 1219 void im_set_size (XRectangle &size);
1347 void im_set_position (XPoint &pos); 1220 void im_set_position (XPoint &pos) NOTHROW;
1348 void im_set_color (unsigned long &fg, unsigned long &bg); 1221 void im_set_color (unsigned long &fg, unsigned long &bg);
1349 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1222 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1350 1223
1351 bool IMisRunning (); 1224 bool IMisRunning ();
1352 void IMSendSpot (); 1225 void IMSendSpot ();
… …
1354 void IMSetStatusPosition (); 1227 void IMSetStatusPosition ();
1355#endif 1228#endif
1356 1229
1357 void resize_scrollbar (); 1230 void resize_scrollbar ();
1358 1231
1359 void pixel_position (int *x, int *y);
1360
1361 void selection_click (int clicks, int x, int y);
1362 void selection_extend (int x, int y, int flag);
1363 void selection_rotate (int x, int y);
1364
1365 /* autoconvert */
1366
1367 // command.C 1232 // command.C
1368 void lookup_key (XKeyEvent &ev); 1233 void lookup_key (XKeyEvent &ev);
1369 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1234 unsigned int cmd_write (const char *str, unsigned int count);
1370 1235
1371 unicode_t next_char (); 1236 wchar_t next_char () NOTHROW;
1372 unicode_t cmd_getc (); 1237 wchar_t cmd_getc () THROW ((class out_of_input));
1373 unicode_t next_octet (); 1238 uint32_t next_octet () NOTHROW;
1374 unicode_t cmd_get8 (); 1239 uint32_t cmd_get8 () THROW ((class out_of_input));
1375 1240
1376 bool cmd_parse (); 1241 bool cmd_parse ();
1377 void mouse_report (XButtonEvent &ev); 1242 void mouse_report (XButtonEvent &ev);
1378 void button_press (XButtonEvent &ev); 1243 void button_press (XButtonEvent &ev);
1379 void button_release (XButtonEvent &ev); 1244 void button_release (XButtonEvent &ev);
… …
1388 void process_nonprinting (unicode_t ch); 1253 void process_nonprinting (unicode_t ch);
1389 void process_escape_vt52 (unicode_t ch); 1254 void process_escape_vt52 (unicode_t ch);
1390 void process_escape_seq (); 1255 void process_escape_seq ();
1391 void process_csi_seq (); 1256 void process_csi_seq ();
1392 void process_window_ops (const int *args, unsigned int nargs); 1257 void process_window_ops (const int *args, unsigned int nargs);
1393 unsigned char *get_to_st (unicode_t &ends_how); 1258 char *get_to_st (unicode_t &ends_how);
1394 void process_dcs_seq (); 1259 void process_dcs_seq ();
1395 void process_osc_seq (); 1260 void process_osc_seq ();
1396 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1261 void process_color_seq (int report, int color, const char *str, char resp);
1397 void process_xterm_seq (int op, const char *str, unsigned char resp); 1262 void process_xterm_seq (int op, const char *str, char resp);
1398 int privcases (int mode, unsigned long bit); 1263 int privcases (int mode, unsigned long bit);
1399 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1264 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1400 void process_sgr_mode (unsigned int nargs, const int *arg); 1265 void process_sgr_mode (unsigned int nargs, const int *arg);
1401 void process_graphics (); 1266 void process_graphics ();
1402 // init.C 1267 // init.C
1403 void Get_Colours (); 1268 void Get_Colours ();
1404 void get_ourmods (); 1269 void get_ourmods ();
1405 // logging.C
1406 void makeutent (const char *pty, const char *hostname);
1407 void cleanutent ();
1408 // main.C 1270 // main.C
1409 void privileged_utmp (rxvt_privaction action);
1410 bool set_fonts (); 1271 bool set_fonts ();
1411 void set_string_property (Atom prop, const char *str, int len = -1); 1272 void set_string_property (Atom prop, const char *str, int len = -1);
1412 void set_utf8_property (Atom prop, const char *str, int len = -1); 1273 void set_utf8_property (Atom prop, const char *str, int len = -1);
1413 void set_title (const char *str); 1274 void set_title (const char *str);
1414 void set_icon_name (const char *str); 1275 void set_icon_name (const char *str);
1415 void set_window_color (int idx, const char *color); 1276 void set_window_color (int idx, const char *color);
1416 void set_colorfgbg (); 1277 void set_colorfgbg ();
1417 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1418 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1279 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1419 1280
1420#ifdef MENUBAR
1421 // menubar.C
1422 void menuitem_free (menu_t *menu, menuitem_t *item);
1423 int action_dispatch (action_t *action);
1424 void menuarrow_free (char name);
1425 void menuarrow_add (char *string);
1426 char *menu_find_base (menu_t **menu, char *path);
1427 menu_t *menu_delete (menu_t *menu);
1428 menu_t *menu_add (menu_t *parent, char *path);
1429 void drawbox_menubar (int x, int len, int state);
1430 void drawtriangle (int x, int y, int state);
1431 void drawbox_menuitem (int y, int state);
1432 void menu_show ();
1433 void menu_display (void (rxvt_term::*update) ());
1434 void menu_hide_all ();
1435 void menu_hide ();
1436 void menu_clear (menu_t *menu);
1437 void menubar_clear ();
1438 bar_t *menubar_find (const char *name);
1439 int menubar_push (const char *name);
1440 void menubar_remove (const char *name);
1441 void menubar_dump (FILE *fp);
1442 void menubar_read (const char *filename);
1443 void menubar_dispatch (char *str);
1444 void draw_Arrows (int name, int state);
1445 void menubar_expose ();
1446 int menubar_mapping (int map);
1447 int menu_select (XButtonEvent &ev);
1448 void menubar_select (XButtonEvent &ev);
1449 void menubar_control (XButtonEvent &ev);
1450 void map_menuBar (int map);
1451#endif
1452
1453 // screen.C 1281 // screen.C
1454 1282
1455 void lalloc (line_t &l) 1283 void lalloc (line_t &l) const
1456 { 1284 {
1457 l.t = (text_t *)talloc->alloc (); 1285 l.t = (text_t *)talloc->alloc ();
1458 l.r = (rend_t *)ralloc->alloc (); 1286 l.r = (rend_t *)ralloc->alloc ();
1459 } 1287 }
1460 1288
… …
1464 talloc->free (l.t); 1292 talloc->free (l.t);
1465 ralloc->free (l.r); 1293 ralloc->free (l.r);
1466 } 1294 }
1467#endif 1295#endif
1468 1296
1469 void lresize (line_t &l) 1297 void lresize (line_t &l) const
1470 { 1298 {
1471 if (!l.t) 1299 if (!l.t)
1472 return; 1300 return;
1473 1301
1474 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1302 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1478 1306
1479 if (ncol > prev_ncol) 1307 if (ncol > prev_ncol)
1480 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1308 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1481 } 1309 }
1482 1310
1483 int fgcolor_of (rend_t r) 1311 int fgcolor_of (rend_t r) const NOTHROW
1484 { 1312 {
1485 int base = GET_BASEFG (r); 1313 int base = GET_BASEFG (r);
1486#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1487 if (r & RS_Bold 1315 if (r & RS_Bold
1488# if ENABLE_STYLES 1316# if ENABLE_STYLES
… …
1492 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1493#endif 1321#endif
1494 return base; 1322 return base;
1495 } 1323 }
1496 1324
1497 int bgcolor_of (rend_t r) 1325 int bgcolor_of (rend_t r) const NOTHROW
1498 { 1326 {
1499 int base = GET_BASEBG (r); 1327 int base = GET_BASEBG (r);
1500#ifndef NO_BRIGHTCOLOR 1328#ifndef NO_BRIGHTCOLOR
1501 if (r & RS_Blink 1329 if (r & RS_Blink
1502# if ENABLE_STYLES 1330# if ENABLE_STYLES
… …
1506 base += minBrightCOLOR - minCOLOR; 1334 base += minBrightCOLOR - minCOLOR;
1507#endif 1335#endif
1508 return base; 1336 return base;
1509 } 1337 }
1510 1338
1339 bool option (uint32_t opt) const NOTHROW
1340 {
1341 return OPTION (opt);
1342 }
1343
1344 void set_option (uint32_t opt, bool set) NOTHROW
1345 {
1346 if (set)
1347 options |= opt;
1348 else
1349 options &= ~opt;
1350 }
1351
1511 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1352 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1512 void scr_blank_screen_mem (line_t &l, rend_t efs); 1353 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1513 int scr_scroll_text (int row1, int row2, int count); 1354 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1514 void scr_reset (); 1355 void scr_reset ();
1515 void scr_release (); 1356 void scr_release () NOTHROW;
1516 void scr_clear (bool really = false); 1357 void scr_clear (bool really = false) NOTHROW;
1517 void scr_refresh (unsigned char refresh_type); 1358 void scr_refresh () NOTHROW;
1518 bool scr_refresh_rend (rend_t mask, rend_t value); 1359 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1519 void scr_erase_screen (int mode); 1360 void scr_erase_screen (int mode) NOTHROW;
1520#if ENABLE_FRILLS 1361#if ENABLE_FRILLS
1521 void scr_erase_savelines (); 1362 void scr_erase_savelines () NOTHROW;
1522 void scr_backindex (); 1363 void scr_backindex () NOTHROW;
1523 void scr_forwardindex (); 1364 void scr_forwardindex () NOTHROW;
1524#endif 1365#endif
1525 void scr_touch (bool refresh); 1366 void scr_touch (bool refresh) NOTHROW;
1526 void scr_expose (int x, int y, int width, int height, bool refresh); 1367 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1527 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1368 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1528 void scr_recolour (); 1369 void scr_recolour () NOTHROW;
1529 void scr_remap_chars (); 1370 void scr_remap_chars () NOTHROW;
1530 void scr_remap_chars (const line_t &l); 1371 void scr_remap_chars (line_t &l) NOTHROW;
1372
1373 enum cursor_mode { SAVE, RESTORE };
1531 1374
1532 void scr_poweron (); 1375 void scr_poweron ();
1533 void scr_cursor (int mode); 1376 void scr_cursor (cursor_mode mode) NOTHROW;
1534 void scr_do_wrap (); 1377 void scr_do_wrap () NOTHROW;
1378 void scr_swap_screen () NOTHROW;
1535 int scr_change_screen (int scrn); 1379 void scr_change_screen (int scrn);
1536 void scr_color (unsigned int color, int fgbg); 1380 void scr_color (unsigned int color, int fgbg) NOTHROW;
1537 void scr_rendition (int set, int style); 1381 void scr_rendition (int set, int style) NOTHROW;
1538 void scr_add_lines (const unicode_t *str, int nlines, int len); 1382 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1539 void scr_backspace (); 1383 void scr_backspace () NOTHROW;
1540 void scr_tab (int count, bool ht = false); 1384 void scr_tab (int count, bool ht = false) NOTHROW;
1541 void scr_gotorc (int row, int col, int relative); 1385 void scr_gotorc (int row, int col, int relative) NOTHROW;
1542 void scr_index (enum page_dirn direction); 1386 void scr_index (enum page_dirn direction) NOTHROW;
1543 void scr_erase_line (int mode); 1387 void scr_erase_line (int mode) NOTHROW;
1544 void scr_E (); 1388 void scr_E () NOTHROW;
1545 void scr_insdel_lines (int count, int insdel); 1389 void scr_insdel_lines (int count, int insdel) NOTHROW;
1546 void scr_insdel_chars (int count, int insdel); 1390 void scr_insdel_chars (int count, int insdel) NOTHROW;
1547 void scr_scroll_region (int top, int bot); 1391 void scr_scroll_region (int top, int bot) NOTHROW;
1548 void scr_cursor_visible (int mode); 1392 void scr_cursor_visible (int mode) NOTHROW;
1549 void scr_autowrap (int mode); 1393 void scr_autowrap (int mode) NOTHROW;
1550 void scr_relative_origin (int mode); 1394 void scr_relative_origin (int mode) NOTHROW;
1551 void scr_insert_mode (int mode); 1395 void scr_insert_mode (int mode) NOTHROW;
1552 void scr_set_tab (int mode); 1396 void scr_set_tab (int mode) NOTHROW;
1553 void scr_rvideo_mode (int mode); 1397 void scr_rvideo_mode (bool on) NOTHROW;
1554 void scr_report_position (); 1398 void scr_report_position () NOTHROW;
1555 void set_font_style (); 1399 void set_font_style () NOTHROW;
1556 void scr_charset_choose (int set); 1400 void scr_charset_choose (int set) NOTHROW;
1557 void scr_charset_set (int set, unsigned int ch); 1401 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1558 int scr_move_to (int y, int len); 1402 void scr_move_to (int y, int len) NOTHROW;
1559 int scr_page (enum page_dirn direction, int nlines); 1403 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1560 int scr_changeview (unsigned int oldviewstart); 1404 bool scr_changeview (int new_view_start) NOTHROW;
1561 void scr_bell (); 1405 void scr_bell () NOTHROW;
1562 void scr_printscreen (int fullhist); 1406 void scr_printscreen (int fullhist) NOTHROW;
1407 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1408 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1563 void scr_reverse_selection (); 1409 void scr_reverse_selection () NOTHROW;
1564 void scr_dump (int fd); 1410 void scr_dump (int fd) NOTHROW;
1411
1565 void selection_check (int check_more); 1412 void selection_check (int check_more) NOTHROW;
1566 void selection_paste (Window win, Atom prop, bool delete_prop); 1413 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1567 void selection_property (Window win, Atom prop); 1414 void selection_property (Window win, Atom prop) NOTHROW;
1568 void selection_request (Time tm, int x, int y); 1415 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1569 int selection_request_other (Atom target, int selnum); 1416 int selection_request_other (Atom target, int selnum) NOTHROW;
1570 void selection_clear (); 1417 void selection_clear () NOTHROW;
1571 void selection_make (Time tm); 1418 void selection_make (Time tm);
1419 bool selection_grab (Time tm) NOTHROW;
1572 void selection_start_colrow (int col, int row); 1420 void selection_start_colrow (int col, int row) NOTHROW;
1573 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1421 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1574 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1422 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1575 void selection_remove_trailing_spaces (); 1423 void selection_remove_trailing_spaces () NOTHROW;
1576 void selection_send (const XSelectionRequestEvent &rq); 1424 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1425 void selection_click (int clicks, int x, int y) NOTHROW;
1426 void selection_extend (int x, int y, int flag) NOTHROW;
1427 void selection_rotate (int x, int y) NOTHROW;
1428
1429 void pixel_position (int *x, int *y) NOTHROW;
1577 1430
1578#if defined(NEXT_SCROLLBAR) 1431#if defined(NEXT_SCROLLBAR)
1579 // scrollbar-next.C 1432 // scrollbar-next.C
1580 Pixmap renderPixmap (const char *const *data, int width, int height); 1433 Pixmap renderPixmap (const char *const *data, int width, int height);
1581 void init_scrollbar_stuff (); 1434 void init_scrollbar_stuff ();
… …
1583 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1436 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1584#endif 1437#endif
1585 1438
1586#if defined(RXVT_SCROLLBAR) 1439#if defined(RXVT_SCROLLBAR)
1587 // scrollbar-rxvt.C 1440 // scrollbar-rxvt.C
1588 void Draw_button (int x, int y, int state, int dirn);
1589 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1441 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1590#endif 1442#endif
1591 1443
1592#if defined(XTERM_SCROLLBAR) 1444#if defined(XTERM_SCROLLBAR)
1593 // scrollbar-xterm.C 1445 // scrollbar-xterm.C
… …
1624# define __PROTO(p) p 1476# define __PROTO(p) p
1625#else 1477#else
1626# define __PROTO(p) () 1478# define __PROTO(p) ()
1627#endif 1479#endif
1628 1480
1629#ifdef DEBUG_malloc
1630# include "dmalloc.h" /* This comes last */
1631#endif
1632
1633#endif /* _RXVT_H_ */ 1481#endif /* _RXVT_H_ */
1634 1482

Diff Legend

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