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

Diff Legend

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