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

Diff Legend

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