ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.181 by root, Mon Jan 2 17:17:02 2006 UTC vs.
Revision 1.215 by ayin, Tue Jan 17 09:28:32 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>
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"
23 40
24#if ENABLE_FRILLS 41#include "rxvtperl.h"
25# define ENABLE_XEMBED 1 42
26# define ENABLE_EWMH 1 43// try to avoid some macros to decrease code size, on some systems
27# define CURSOR_BLINK 1 44#if ENABLE_MINIMAL
45# define strcmp(a,b) (strcmp)(a,b)
46# define strlen(a) (strlen)(a)
47# define strcpy(a,b) (strcpy)(a,b)
48# define memset(a,c,l) (memset)(a,c,l)
49# define memcpy(a,b,l) (memcpy)(a,b,l)
28#endif 50#endif
29 51
30/* 52/*
31 ***************************************************************************** 53 *****************************************************************************
32 * SYSTEM HACKS 54 * SYSTEM HACKS
41#if defined (sun) && !defined (__sun__) 63#if defined (sun) && !defined (__sun__)
42# define __sun__ 1 64# define __sun__ 1
43#endif 65#endif
44 66
45#ifndef HAVE_XPOINTER 67#ifndef HAVE_XPOINTER
46typedef char *XPointer; 68typedef char *XPointer;
47#endif 69#endif
48 70
49#ifdef HAVE_TERMIOS_H 71#ifdef HAVE_TERMIOS_H
50# include <termios.h> 72# include <termios.h>
51typedef struct termios ttymode_t; 73typedef struct termios ttymode_t;
107char * rxvt_Str_trim (char *str); 129char * rxvt_Str_trim (char *str);
108int rxvt_Str_escaped (char *str); 130int rxvt_Str_escaped (char *str);
109char ** rxvt_splitcommastring (const char *cs); 131char ** rxvt_splitcommastring (const char *cs);
110void rxvt_freecommastring (char **cs); 132void rxvt_freecommastring (char **cs);
111char * rxvt_File_find (const char *file, const char *ext, const char *path); 133char * rxvt_File_find (const char *file, const char *ext, const char *path);
112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs); 134void rxvt_usleep (int usecs);
135
136/////////////////////////////////////////////////////////////////////////////
137
138// temporarily replace the process environment
139extern char **environ;
140extern char **rxvt_environ; // the original environ pointer
141
142inline void set_environ (stringvec *envv)
143{
144 if (envv)
145 environ = (char **)envv->begin ();
146}
147
148inline void set_environ (char **envv)
149{
150 if (envv)
151 environ = envv;
152}
115 153
116/* 154/*
117 ***************************************************************************** 155 *****************************************************************************
118 * STRUCTURES AND TYPEDEFS 156 * STRUCTURES AND TYPEDEFS
119 ***************************************************************************** 157 *****************************************************************************
120 */ 158 */
121struct grwin_t; 159struct grwin_t;
122 160
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 161/* If we're using either the rxvt scrollbar, keep the
132 * scrollColor resource. 162 * scrollColor resource.
133 */ 163 */
134#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 164#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
135# define KEEP_SCROLLCOLOR 1 165# define KEEP_SCROLLCOLOR 1
136#else 166#else
137# undef KEEP_SCROLLCOLOR 167# undef KEEP_SCROLLCOLOR
138#endif 168#endif
139 169
209 239
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 240#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 241# define NO_MOUSE_REPORT_SCROLLBAR 1
212#endif 242#endif
213 243
214#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT
216#endif
217
218#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1
220#endif
221
222/* now look for other badly set stuff */ 244/* now look for other badly set stuff */
223 245
224#if !defined (EACCESS) && defined(EAGAIN) 246#if !defined (EACCESS) && defined(EAGAIN)
225# define EACCESS EAGAIN 247# define EACCESS EAGAIN
226#endif 248#endif
228#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 250#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
229# define EXIT_SUCCESS 0 /* exit function success */ 251# define EXIT_SUCCESS 0 /* exit function success */
230# define EXIT_FAILURE 1 /* exit function failure */ 252# define EXIT_FAILURE 1 /* exit function failure */
231#endif 253#endif
232 254
233#define menuBar_esc 10
234#define scrollBar_esc 30 255#define scrollBar_esc 30
235#define menuBar_margin 2 /* margin below text */
236 256
237#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 257#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
238# define HAVE_SCROLLBARS 1 258# 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 259#endif
247 260
248#define R_SB_ALIGN_CENTRE 0 261#define R_SB_ALIGN_CENTRE 0
249#define R_SB_ALIGN_TOP 1 262#define R_SB_ALIGN_TOP 1
250#define R_SB_ALIGN_BOTTOM 2 263#define R_SB_ALIGN_BOTTOM 2
323 * | 336 * |
324 * +---< SB_WIDTH_NEXT 337 * +---< SB_WIDTH_NEXT
325 */ 338 */
326 339
327enum { 340enum {
328 NO_REFRESH = 0 , /* Window not visible at all! */ 341 NO_REFRESH = 0, /* Window not visible at all! */
329 FAST_REFRESH = 1<<0, /* Fully exposed window */ 342 FAST_REFRESH = 1, /* Fully exposed window */
330 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 343 SLOW_REFRESH = 2, /* Partially exposed window */
331 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
332}; 344};
333 345
334#ifdef NO_SECONDARY_SCREEN 346#ifdef NO_SECONDARY_SCREEN
335# define NSCREENS 0 347# define NSCREENS 0
336#else 348#else
436 XTerm_property = 3, // change X property 448 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 449 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 450 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 451 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 452 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 453 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 454 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 455 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 456 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 457 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 458 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 459 XTerm_font = 50,
448 460
449 XTerm_konsole30 = 30, // reserved for konsole 461 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 462 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 463 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 464 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 465 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
466 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 467 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 468 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 469 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 470 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 471 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 472 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 473 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 474
462 URxvt_locale = 701, // change locale 475 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 476
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 477 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 478 URxvt_Color_tint = 705, // change actual tint colour
479 URxvt_Color_BD = 706,
480 URxvt_Color_UL = 707,
466 481
467 URxvt_font = 710, 482 URxvt_font = 710,
468 URxvt_boldFont = 711, 483 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 484 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 485 URxvt_boldItalicFont = 713,
471 486
472 URxvt_view_up = 720, 487 URxvt_view_up = 720,
473 URxvt_view_down = 721, 488 URxvt_view_down = 721,
489
490 URxvt_perl = 777,
474}; 491};
475 492
476/* Words starting with `Color_' are colours. Others are counts */ 493/* Words starting with `Color_' are colours. Others are counts */
477/* 494/*
478 * The PixColor and rendition colour usage should probably be decoupled 495 * The PixColor and rendition colour usage should probably be decoupled
555 572
556/* 573/*
557 * Resource list 574 * Resource list
558 */ 575 */
559enum { 576enum {
560#define Rs_def(name) Rs_ ## name, 577# define def(name) Rs_ ## name,
561#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 578# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562#include "rsinc.h" 579# include "rsinc.h"
563#undef Rs_def 580# undef def
564#undef Rs_reserve 581# undef reserve
565 NUM_RESOURCES 582 NUM_RESOURCES
566}; 583};
567 584
568// see init.C:xa_names, which must be kept in sync 585// see init.C:xa_names, which must be kept in sync
569enum { 586enum {
619#define PrivMode_ShiftKeys (1UL<<10) 636#define PrivMode_ShiftKeys (1UL<<10)
620#define PrivMode_VisibleCursor (1UL<<11) 637#define PrivMode_VisibleCursor (1UL<<11)
621#define PrivMode_MouseX10 (1UL<<12) 638#define PrivMode_MouseX10 (1UL<<12)
622#define PrivMode_MouseX11 (1UL<<13) 639#define PrivMode_MouseX11 (1UL<<13)
623#define PrivMode_scrollBar (1UL<<14) 640#define PrivMode_scrollBar (1UL<<14)
624#define PrivMode_menuBar (1UL<<15)
625#define PrivMode_TtyOutputInh (1UL<<16) 641#define PrivMode_TtyOutputInh (1UL<<15)
626#define PrivMode_Keypress (1UL<<17) 642#define PrivMode_Keypress (1UL<<16)
627#define PrivMode_smoothScroll (1UL<<18) 643#define PrivMode_smoothScroll (1UL<<17)
628#define PrivMode_vt52 (1UL<<19) 644#define PrivMode_vt52 (1UL<<18)
629#define PrivMode_LFNL (1UL<<20) 645#define PrivMode_LFNL (1UL<<19)
630/* too annoying to implement X11 highlight tracking */ 646/* too annoying to implement X11 highlight tracking */
631/* #define PrivMode_MouseX11Track (1LU<<21) */ 647/* #define PrivMode_MouseX11Track (1LU<<20) */
632 648
633#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 649#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
634#define PrivMode(test,bit) \ 650#define PrivMode(test,bit) \
635 if (test) \ 651 if (test) \
636 priv_modes |= (bit); \ 652 priv_modes |= (bit); \
683/* 699/*
684 ***************************************************************************** 700 *****************************************************************************
685 * MACRO DEFINES 701 * MACRO DEFINES
686 ***************************************************************************** 702 *****************************************************************************
687 */ 703 */
688#define memset(x, y, z) memset((x), (y), (size_t)(z)) 704#define dLocal(type,name) type const name = this->name
689#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
690#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
691#define strcasecmp(x, y) strcasecmp((x), (y))
692#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
693#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
694#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
695#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
696#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
697#define strcat(x, y) strcat((char *)(x), (const char *)(y))
698#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
699#define strdup(x) strdup((const char *)(x))
700#define strlen(x) strlen((const char *)(x))
701#define strchr(x, y) strchr((const char *)(x), (int)(y))
702#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
703
704#define dDisp Display *disp = display->display 705#define dDisp Display *disp = this->display->display
705 706
706/* convert pixel dimensions to row/column values. Everything as int32_t */ 707/* convert pixel dimensions to row/column values. Everything as int32_t */
707#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 708#define Pixel2Col(x) Pixel2Width((int32_t)(x))
708#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 709#define Pixel2Row(y) Pixel2Height((int32_t)(y))
709#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 710#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
711#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 712#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
712#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 713#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
713#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 714#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
714#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 715#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
715 716
716#define TermWin_TotalWidth() ((int32_t)this->width) 717#define OPTION(opt) (options & (opt))
717#define TermWin_TotalHeight() ((int32_t)this->height) 718#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
719 | Opt_jumpScroll | Opt_secondaryScreen \
720 | Opt_pastableTabs | Opt_intensityStyles)
718 721
719// for m >= -n, ensure remainder lies between 0..n-1 722// for m >= -n, ensure remainder lies between 0..n-1
720#define MOD(m,n) (((m) + (n)) % (n)) 723#define MOD(m,n) (((m) + (n)) % (n))
721 724
722#define LINENO(n) MOD (term_start + int(n), total_rows) 725#define LINENO(n) MOD (term_start + int(n), total_rows)
780#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 783#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
781#define scrollbar_position(y) ((y) - scrollBar.beg) 784#define scrollbar_position(y) ((y) - scrollBar.beg)
782#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 785#define scrollbar_size() (scrollBar.end - scrollBar.beg \
783 - scrollbar_minheight ()) 786 - scrollbar_minheight ())
784 787
785#if (MENUBAR_MAX > 1)
786/* rendition style flags */
787# define menuBar_height() (fheight + SHADOW)
788# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
789# define isMenuBarWindow(w) ((w) == menuBar.win)
790#else
791# define menuBar_height() (0)
792# define menuBar_TotalHeight() (0)
793# define isMenuBarWindow(w) (0)
794#endif
795
796#ifdef XPM_BACKGROUND 788#ifdef XPM_BACKGROUND
797# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 789# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
798#else 790#else
799# define XPMClearArea(a, b, c, d, e, f, g) 791# define XPMClearArea(a, b, c, d, e, f, g)
800#endif
801
802#ifdef UTMP_SUPPORT
803# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
804# undef HAVE_UTMPX_H
805# undef HAVE_STRUCT_UTMPX
806# endif
807# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
808# undef HAVE_UTMP_H
809# undef HAVE_STRUCT_UTMP
810# endif
811
812# ifdef HAVE_UTMPX_H
813# include <utmpx.h>
814# endif
815# ifdef HAVE_UTMP_H
816# include <utmp.h>
817# endif
818#endif 792#endif
819 793
820#ifdef DEBUG_CMD 794#ifdef DEBUG_CMD
821# define D_CMD(x) fprintf x ; fputc('\n', stderr) 795# define D_CMD(x) fprintf x ; fputc('\n', stderr)
822#else 796#else
849extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 823extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
850extern void rxvt_exit_failure () __attribute__ ((noreturn)); 824extern void rxvt_exit_failure () __attribute__ ((noreturn));
851 825
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 826#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale); 827extern bool rxvt_set_locale (const char *locale);
828extern void rxvt_push_locale (const char *locale);
829extern void rxvt_pop_locale ();
854 830
855/*
856 ***************************************************************************** 831/****************************************************************************/
857 * VARIABLES
858 *****************************************************************************
859 */
860#ifdef MENUBAR
861# include "menubar.h"
862#endif
863 832
864#define BLINK_INTERVAL 0.5 833#define BLINK_INTERVAL 0.5
865#define TEXT_BLINK_INTERVAL 0.5 834#define TEXT_BLINK_INTERVAL 0.5
866 835
867#ifndef __attribute__ 836#ifndef __attribute__
871# endif 840# endif
872# endif 841# endif
873# define __attribute__(x) 842# define __attribute__(x)
874#endif 843#endif
875 844
845/****************************************************************************/
846
847#define LINE_LONGER 0x0001 // line is continued on the next row
848#define LINE_FILTERED 0x0002 // line has been filtered
849#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
850
851struct line_t {
852 text_t *t; // terminal the text
853 rend_t *r; // rendition, uses RS_ flags
854 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
855 uint32_t f; // flags
856
857 bool is_longer ()
858 {
859 return f & LINE_LONGER;
860 }
861
862 void is_longer (int set)
863 {
864 if (set)
865 f |= LINE_LONGER;
866 else
867 f &= ~LINE_LONGER;
868 }
869
870 void clear ()
871 {
872 t = 0;
873 r = 0;
874 l = 0;
875 f = 0;
876 }
877
878 void touch () // call whenever a line is changed/touched/updated
879 {
880#if ENABLE_PERL
881 f &= ~LINE_FILTERED;
882#endif
883 }
884
885 void touch (int col)
886 {
887 max_it (l, col);
888 touch ();
889 }
890};
891
892/****************************************************************************/
893
876// primivite wrapper around mbstate_t to ensure initialisation 894// primivite wrapper around mbstate_t to ensure initialisation
877struct mbstate { 895struct mbstate {
878 mbstate_t mbs; 896 mbstate_t mbs;
879 897
880 operator mbstate_t *() { return &mbs; } 898 operator mbstate_t *() { return &mbs; }
881 void reset () { memset (&mbs, 0, sizeof (mbs)); } 899 void reset () { memset (&mbs, 0, sizeof (mbs)); }
882 mbstate () { reset (); } 900 mbstate () { reset (); }
883}; 901};
884 902
903/****************************************************************************/
904
885#define UNICODE_MASK 0x1fffffUL 905#define UNICODE_MASK 0x1fffffUL
886 906
887#if UNICODE3 907#if UNICODE3
888# define COMPOSE_LO 0x40000000UL 908# define COMPOSE_LO 0x40000000UL
889# define COMPOSE_HI 0x400fffffUL 909# define COMPOSE_HI 0x400fffffUL
890# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 910# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
891#else 911#else
912# if ENABLE_PERL
913# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
914# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
915# else
892# define COMPOSE_LO 0xd800UL 916# define COMPOSE_LO 0xd800UL
893# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 917# define COMPOSE_HI 0xf8ffUL
894# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 918# endif
919# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
895#endif 920#endif
896 921
897#if ENABLE_COMBINING 922#if ENABLE_COMBINING
898// compose chars are used to represent composite characters 923// compose chars are used to represent composite characters
899// that are not representable in unicode, as well as characters 924// that are not representable in unicode, as well as characters
919}; 944};
920 945
921extern class rxvt_composite_vec rxvt_composite; 946extern class rxvt_composite_vec rxvt_composite;
922#endif 947#endif
923 948
949/****************************************************************************/
924 950
925#ifdef KEYSYM_RESOURCE 951#ifdef KEYSYM_RESOURCE
926 class keyboard_manager; 952 class keyboard_manager;
927#endif 953#endif
928 954
929struct rxvt_term : zero_initialized, rxvt_vars { 955struct rxvt_term : zero_initialized, rxvt_vars {
930 log_callback *log_hook; // log error messages through this hook, if != 0 956 log_callback *log_hook; // log error messages through this hook, if != 0
931 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 957 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
932
933#if ENABLE_PERL 958#if ENABLE_PERL
934 void *self; // perl's $self 959 rxvt_perl_term perl;
935#endif 960#endif
936
937 struct mbstate mbstate; // current input multibyte state 961 struct mbstate mbstate; // current input multibyte state
938 962
939 unsigned char want_refresh:1, 963 unsigned char want_refresh:1,
940#ifdef TRANSPARENT 964#ifdef TRANSPARENT
941 want_full_refresh:1, /* awaiting full screen refresh */ 965 want_full_refresh:1, /* awaiting full screen refresh */
996 refresh_limit, 1020 refresh_limit,
997 last_bot, /* scrollbar last bottom position */ 1021 last_bot, /* scrollbar last bottom position */
998 last_top, /* scrollbar last top position */ 1022 last_top, /* scrollbar last top position */
999 last_state, /* scrollbar last state */ 1023 last_state, /* scrollbar last state */
1000 scrollbar_len, 1024 scrollbar_len,
1001#ifdef MENUBAR
1002 menu_readonly, /* okay to alter menu? */
1003 Arrows_x,
1004#endif
1005#if MENUBAR_MAX > 1
1006 Nbars,
1007#endif
1008 window_vt_x, 1025 window_vt_x,
1009 window_vt_y, 1026 window_vt_y,
1010 window_sb_x, 1027 window_sb_x,
1011# ifdef POINTER_BLANK 1028# ifdef POINTER_BLANK
1012 pointerBlankDelay, 1029 pointerBlankDelay,
1021 unsigned long priv_modes, 1038 unsigned long priv_modes,
1022 SavedModes; 1039 SavedModes;
1023/* ---------- */ 1040/* ---------- */
1024 Atom xa[NUM_XA]; 1041 Atom xa[NUM_XA];
1025/* ---------- */ 1042/* ---------- */
1026#ifdef MENUBAR 1043#ifdef RXVT_SCROLLBAR
1027 GC menubarGC;
1028#endif
1029#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1030 GC scrollbarGC, 1044 GC scrollbarGC,
1031 topShadowGC, 1045 topShadowGC,
1032 botShadowGC; 1046 botShadowGC;
1033#endif 1047#endif
1034#ifdef XTERM_SCROLLBAR 1048#ifdef XTERM_SCROLLBAR
1066 const char *key_delete; 1080 const char *key_delete;
1067#endif 1081#endif
1068 struct mouse_event MEvent; 1082 struct mouse_event MEvent;
1069 XComposeStatus compose; 1083 XComposeStatus compose;
1070 ttymode_t tio; 1084 ttymode_t tio;
1071#ifdef UTMP_SUPPORT
1072# ifdef HAVE_STRUCT_UTMP
1073 struct utmp ut;
1074# endif
1075# ifdef HAVE_STRUCT_UTMPX
1076 struct utmpx utx;
1077# endif
1078# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1079 char ut_id[5];
1080# endif
1081 int utmp_pos;
1082#endif
1083 row_col_t oldcursor; 1085 row_col_t oldcursor;
1084#ifdef XPM_BACKGROUND 1086#ifdef XPM_BACKGROUND
1085 bgPixmap_t bgPixmap; 1087 bgPixmap_t bgPixmap;
1086 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1088 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1087#endif
1088#ifdef MENUBAR
1089 menu_t *ActiveMenu, /* currently active menu */
1090 *BuildMenu; /* the menu currently being built */
1091 bar_t *CurrentBar;
1092# if ! (MENUBAR_MAX > 1)
1093 bar_t BarList;
1094# endif /* (MENUBAR_MAX > 1) */
1095#endif
1096#ifdef CURSOR_BLINK
1097 struct timeval lastcursorchange;
1098#endif
1099#ifdef POINTER_BLANK
1100 struct timeval lastmotion;
1101#endif 1089#endif
1102 1090
1103#if ENABLE_OVERLAY 1091#if ENABLE_OVERLAY
1104 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1092 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1105 text_t **ov_text; 1093 text_t **ov_text;
1121 char *env_display; /* environmental variable DISPLAY */ 1109 char *env_display; /* environmental variable DISPLAY */
1122 char *env_term; /* environmental variable TERM */ 1110 char *env_term; /* environmental variable TERM */
1123 char *env_colorfgbg; 1111 char *env_colorfgbg;
1124 char *locale; 1112 char *locale;
1125 char charsets[4]; 1113 char charsets[4];
1126 unsigned char *v_buffer; /* pointer to physical buffer */ 1114 char *v_buffer; /* pointer to physical buffer */
1127 unsigned int v_buflen; /* size of area to write */ 1115 unsigned int v_buflen; /* size of area to write */
1128 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1116 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1129 1117
1130#ifdef KEYSYM_RESOURCE 1118#ifdef KEYSYM_RESOURCE
1131 keyboard_manager *keyboard; 1119 keyboard_manager *keyboard;
1132#endif 1120#endif
1133 1121
1134 const char *rs[NUM_RESOURCES]; 1122 const char *rs[NUM_RESOURCES];
1135 /* command input buffering */ 1123 /* command input buffering */
1136 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1124 char *cmdbuf_ptr, *cmdbuf_endp;
1137 unsigned char cmdbuf_base[CBUFSIZ]; 1125 char cmdbuf_base[CBUFSIZ];
1126
1127 rxvt_ptytty pty;
1128 rxvt_session session;
1138 1129
1139 rxvt_salloc *talloc; // text line allocator 1130 rxvt_salloc *talloc; // text line allocator
1140 rxvt_salloc *ralloc; // rend line allocator 1131 rxvt_salloc *ralloc; // rend line allocator
1141 1132
1142 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1133 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1151 void iso14755_54 (int x, int y); 1142 void iso14755_54 (int x, int y);
1152# endif 1143# endif
1153#endif 1144#endif
1154 1145
1155 // modifies first argument(!) 1146 // modifies first argument(!)
1156 void paste (unsigned char *data, unsigned int len); 1147 void paste (char *data, unsigned int len);
1157 1148
1158 void flush (); 1149 long vt_emask, vt_emask_perl;
1150
1151 void vt_select_input () const
1152 {
1153 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1154 }
1159 1155
1160#if TRANSPARENT 1156#if TRANSPARENT
1161 void rootwin_cb (XEvent &xev); 1157 void rootwin_cb (XEvent &xev);
1162 xevent_watcher rootwin_ev; 1158 xevent_watcher rootwin_ev;
1163#endif 1159#endif
1164 1160
1165 void x_cb (XEvent &xev); 1161 void x_cb (XEvent &xev);
1162 void flush ();
1166 xevent_watcher termwin_ev; 1163 xevent_watcher termwin_ev;
1167 xevent_watcher vt_ev; 1164 xevent_watcher vt_ev;
1168#ifdef HAVE_SCROLLBARS 1165#ifdef HAVE_SCROLLBARS
1169 xevent_watcher scrollbar_ev; 1166 xevent_watcher scrollbar_ev;
1170#endif 1167#endif
1171#ifdef MENUBAR
1172 xevent_watcher menubar_ev;
1173#endif
1174 1168
1175 void check_cb (check_watcher &w); check_watcher check_ev; 1169 void check_cb (check_watcher &w); check_watcher check_ev;
1176 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1170 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1177 void flush_cb (time_watcher &w); time_watcher flush_ev; 1171 void flush_cb (time_watcher &w); time_watcher flush_ev;
1178 1172
1202 void pointer_blank (); 1196 void pointer_blank ();
1203#endif 1197#endif
1204 void pointer_unblank (); 1198 void pointer_unblank ();
1205 1199
1206 void tt_printf (const char *fmt,...); 1200 void tt_printf (const char *fmt,...);
1207 void tt_write (const unsigned char *data, unsigned int len); 1201 void tt_write (const char *data, unsigned int len);
1208 void pty_write (); 1202 void pty_write ();
1209 1203
1210 void tt_winch (); 1204 void tt_winch ();
1211 1205
1212 rxvt_term (); 1206 rxvt_term ();
1218 bool init (int argc, const char *const *argv); 1212 bool init (int argc, const char *const *argv);
1219 bool init_vars (); 1213 bool init_vars ();
1220 1214
1221 bool pty_fill (); 1215 bool pty_fill ();
1222 1216
1217 void make_current () const // make this the "currently active" urxvt instance
1218 {
1219 SET_R (this);
1220 rxvt_set_locale (locale);
1221 set_environ (envv);
1222 }
1223
1223 void init_secondary (); 1224 void init_secondary ();
1224 const char **init_resources (int argc, const char *const *argv); 1225 const char **init_resources (int argc, const char *const *argv);
1226 const char *x_resource (const char *name);
1225 void init_env (); 1227 void init_env ();
1226 void set_locale (const char *locale); 1228 void set_locale (const char *locale);
1227 void init_xlocale (); 1229 void init_xlocale ();
1228 void init_command (const char *const *argv); 1230 void init_command (const char *const *argv);
1229 void run_command (const char *const *argv); 1231 void run_command (const char *const *argv);
1264 1266
1265 /* autoconvert */ 1267 /* autoconvert */
1266 1268
1267 // command.C 1269 // command.C
1268 void lookup_key (XKeyEvent &ev); 1270 void lookup_key (XKeyEvent &ev);
1269 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1271 unsigned int cmd_write (const char *str, unsigned int count);
1270 1272
1271 unicode_t next_char (); 1273 wchar_t next_char ();
1272 unicode_t cmd_getc (); 1274 wchar_t cmd_getc ();
1273 unicode_t next_octet (); 1275 uint32_t next_octet ();
1274 unicode_t cmd_get8 (); 1276 uint32_t cmd_get8 ();
1275 1277
1276 bool cmd_parse (); 1278 bool cmd_parse ();
1277 void mouse_report (XButtonEvent &ev); 1279 void mouse_report (XButtonEvent &ev);
1278 void button_press (XButtonEvent &ev); 1280 void button_press (XButtonEvent &ev);
1279 void button_release (XButtonEvent &ev); 1281 void button_release (XButtonEvent &ev);
1288 void process_nonprinting (unicode_t ch); 1290 void process_nonprinting (unicode_t ch);
1289 void process_escape_vt52 (unicode_t ch); 1291 void process_escape_vt52 (unicode_t ch);
1290 void process_escape_seq (); 1292 void process_escape_seq ();
1291 void process_csi_seq (); 1293 void process_csi_seq ();
1292 void process_window_ops (const int *args, unsigned int nargs); 1294 void process_window_ops (const int *args, unsigned int nargs);
1293 unsigned char *get_to_st (unicode_t &ends_how); 1295 char *get_to_st (unicode_t &ends_how);
1294 void process_dcs_seq (); 1296 void process_dcs_seq ();
1295 void process_osc_seq (); 1297 void process_osc_seq ();
1296 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1298 void process_color_seq (int report, int color, const char *str, char resp);
1297 void process_xterm_seq (int op, const char *str, unsigned char resp); 1299 void process_xterm_seq (int op, const char *str, char resp);
1298 int privcases (int mode, unsigned long bit); 1300 int privcases (int mode, unsigned long bit);
1299 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1301 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1300 void process_sgr_mode (unsigned int nargs, const int *arg); 1302 void process_sgr_mode (unsigned int nargs, const int *arg);
1301 void process_graphics (); 1303 void process_graphics ();
1302 // init.C 1304 // init.C
1303 void Get_Colours (); 1305 void Get_Colours ();
1304 void get_ourmods (); 1306 void get_ourmods ();
1305 // logging.C
1306 void makeutent (const char *pty, const char *hostname);
1307 void cleanutent ();
1308 // main.C 1307 // main.C
1309 void privileged_utmp (rxvt_privaction action); 1308 void privileged_utmp (rxvt_privaction action);
1310 bool set_fonts (); 1309 bool set_fonts ();
1311 void set_string_property (Atom prop, const char *str, int len = -1); 1310 void set_string_property (Atom prop, const char *str, int len = -1);
1312 void set_utf8_property (Atom prop, const char *str, int len = -1); 1311 void set_utf8_property (Atom prop, const char *str, int len = -1);
1315 void set_window_color (int idx, const char *color); 1314 void set_window_color (int idx, const char *color);
1316 void set_colorfgbg (); 1315 void set_colorfgbg ();
1317 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1316 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1318 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1317 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1319 1318
1320#ifdef MENUBAR
1321 // menubar.C
1322 void menuitem_free (menu_t *menu, menuitem_t *item);
1323 int action_dispatch (action_t *action);
1324 void menuarrow_free (char name);
1325 void menuarrow_add (char *string);
1326 char *menu_find_base (menu_t **menu, char *path);
1327 menu_t *menu_delete (menu_t *menu);
1328 menu_t *menu_add (menu_t *parent, char *path);
1329 void drawbox_menubar (int x, int len, int state);
1330 void drawtriangle (int x, int y, int state);
1331 void drawbox_menuitem (int y, int state);
1332 void menu_show ();
1333 void menu_display (void (rxvt_term::*update) ());
1334 void menu_hide_all ();
1335 void menu_hide ();
1336 void menu_clear (menu_t *menu);
1337 void menubar_clear ();
1338 bar_t *menubar_find (const char *name);
1339 int menubar_push (const char *name);
1340 void menubar_remove (const char *name);
1341 void menubar_dump (FILE *fp);
1342 void menubar_read (const char *filename);
1343 void menubar_dispatch (char *str);
1344 void draw_Arrows (int name, int state);
1345 void menubar_expose ();
1346 int menubar_mapping (int map);
1347 int menu_select (XButtonEvent &ev);
1348 void menubar_select (XButtonEvent &ev);
1349 void menubar_control (XButtonEvent &ev);
1350 void map_menuBar (int map);
1351#endif
1352
1353 // screen.C 1319 // screen.C
1354 1320
1355 void lalloc (line_t &l) 1321 void lalloc (line_t &l) const
1356 { 1322 {
1357 l.t = (text_t *)talloc->alloc (); 1323 l.t = (text_t *)talloc->alloc ();
1358 l.r = (rend_t *)ralloc->alloc (); 1324 l.r = (rend_t *)ralloc->alloc ();
1359 } 1325 }
1360 1326
1364 talloc->free (l.t); 1330 talloc->free (l.t);
1365 ralloc->free (l.r); 1331 ralloc->free (l.r);
1366 } 1332 }
1367#endif 1333#endif
1368 1334
1369 void lresize (line_t &l) 1335 void lresize (line_t &l) const
1370 { 1336 {
1371 if (!l.t) 1337 if (!l.t)
1372 return; 1338 return;
1373 1339
1374 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1340 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1378 1344
1379 if (ncol > prev_ncol) 1345 if (ncol > prev_ncol)
1380 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1346 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1381 } 1347 }
1382 1348
1383 int fgcolor_of (rend_t r) 1349 int fgcolor_of (rend_t r) const
1384 { 1350 {
1385 int base = GET_BASEFG (r); 1351 int base = GET_BASEFG (r);
1386#ifndef NO_BRIGHTCOLOR 1352#ifndef NO_BRIGHTCOLOR
1387 if (r & RS_Bold 1353 if (r & RS_Bold
1388# if ENABLE_STYLES 1354# if ENABLE_STYLES
1392 base += minBrightCOLOR - minCOLOR; 1358 base += minBrightCOLOR - minCOLOR;
1393#endif 1359#endif
1394 return base; 1360 return base;
1395 } 1361 }
1396 1362
1397 int bgcolor_of (rend_t r) 1363 int bgcolor_of (rend_t r) const
1398 { 1364 {
1399 int base = GET_BASEBG (r); 1365 int base = GET_BASEBG (r);
1400#ifndef NO_BRIGHTCOLOR 1366#ifndef NO_BRIGHTCOLOR
1401 if (r & RS_Blink 1367 if (r & RS_Blink
1402# if ENABLE_STYLES 1368# if ENABLE_STYLES
1406 base += minBrightCOLOR - minCOLOR; 1372 base += minBrightCOLOR - minCOLOR;
1407#endif 1373#endif
1408 return base; 1374 return base;
1409 } 1375 }
1410 1376
1377 bool option (uint32_t opt) const
1378 {
1379 return OPTION (opt);
1380 }
1381
1382 void set_option (uint32_t opt, bool set)
1383 {
1384 if (set)
1385 options |= opt;
1386 else
1387 options &= ~opt;
1388 }
1389
1411 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1390 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1412 void scr_blank_screen_mem (line_t &l, rend_t efs); 1391 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1413 int scr_scroll_text (int row1, int row2, int count); 1392 int scr_scroll_text (int row1, int row2, int count);
1414 void scr_reset (); 1393 void scr_reset ();
1415 void scr_release (); 1394 void scr_release ();
1416 void scr_clear (bool really = false); 1395 void scr_clear (bool really = false);
1417 void scr_refresh (unsigned char refresh_type); 1396 void scr_refresh ();
1418 bool scr_refresh_rend (rend_t mask, rend_t value); 1397 bool scr_refresh_rend (rend_t mask, rend_t value);
1419 void scr_erase_screen (int mode); 1398 void scr_erase_screen (int mode);
1420#if ENABLE_FRILLS 1399#if ENABLE_FRILLS
1421 void scr_erase_savelines (); 1400 void scr_erase_savelines ();
1422 void scr_backindex (); 1401 void scr_backindex ();
1425 void scr_touch (bool refresh); 1404 void scr_touch (bool refresh);
1426 void scr_expose (int x, int y, int width, int height, bool refresh); 1405 void scr_expose (int x, int y, int width, int height, bool refresh);
1427 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1406 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1428 void scr_recolour (); 1407 void scr_recolour ();
1429 void scr_remap_chars (); 1408 void scr_remap_chars ();
1430 void scr_remap_chars (const line_t &l); 1409 void scr_remap_chars (line_t &l);
1431 1410
1432 void scr_poweron (); 1411 void scr_poweron ();
1433 void scr_cursor (int mode); 1412 void scr_cursor (int mode);
1434 void scr_do_wrap (); 1413 void scr_do_wrap ();
1435 int scr_change_screen (int scrn); 1414 int scr_change_screen (int scrn);
1436 void scr_color (unsigned int color, int fgbg); 1415 void scr_color (unsigned int color, int fgbg);
1437 void scr_rendition (int set, int style); 1416 void scr_rendition (int set, int style);
1438 void scr_add_lines (const unicode_t *str, int nlines, int len); 1417 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1439 void scr_backspace (); 1418 void scr_backspace ();
1440 void scr_tab (int count, bool ht = false); 1419 void scr_tab (int count, bool ht = false);
1441 void scr_gotorc (int row, int col, int relative); 1420 void scr_gotorc (int row, int col, int relative);
1442 void scr_index (enum page_dirn direction); 1421 void scr_index (enum page_dirn direction);
1443 void scr_erase_line (int mode); 1422 void scr_erase_line (int mode);
1453 void scr_rvideo_mode (int mode); 1432 void scr_rvideo_mode (int mode);
1454 void scr_report_position (); 1433 void scr_report_position ();
1455 void set_font_style (); 1434 void set_font_style ();
1456 void scr_charset_choose (int set); 1435 void scr_charset_choose (int set);
1457 void scr_charset_set (int set, unsigned int ch); 1436 void scr_charset_set (int set, unsigned int ch);
1458 int scr_move_to (int y, int len); 1437 void scr_move_to (int y, int len);
1459 int scr_page (enum page_dirn direction, int nlines); 1438 bool scr_page (enum page_dirn direction, int nlines);
1460 int scr_changeview (unsigned int oldviewstart); 1439 bool scr_changeview (int new_view_start);
1461 void scr_bell (); 1440 void scr_bell ();
1462 void scr_printscreen (int fullhist); 1441 void scr_printscreen (int fullhist);
1442 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1443 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1463 void scr_reverse_selection (); 1444 void scr_reverse_selection ();
1464 void scr_dump (int fd); 1445 void scr_dump (int fd);
1465 void selection_check (int check_more); 1446 void selection_check (int check_more);
1466 void selection_paste (Window win, Atom prop, bool delete_prop); 1447 void selection_paste (Window win, Atom prop, bool delete_prop);
1467 void selection_property (Window win, Atom prop); 1448 void selection_property (Window win, Atom prop);
1484 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1465 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1485#endif 1466#endif
1486 1467
1487#if defined(RXVT_SCROLLBAR) 1468#if defined(RXVT_SCROLLBAR)
1488 // scrollbar-rxvt.C 1469 // scrollbar-rxvt.C
1489 void Draw_button (int x, int y, int state, int dirn);
1490 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1470 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1491#endif 1471#endif
1492 1472
1493#if defined(XTERM_SCROLLBAR) 1473#if defined(XTERM_SCROLLBAR)
1494 // scrollbar-xterm.C 1474 // scrollbar-xterm.C

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines