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.241 by root, Wed Jan 25 00:42:20 2006 UTC vs.
Revision 1.313 by ayin, Wed Oct 24 10:39:58 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1 20# define ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
22#else 23#else
23# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
24#endif 25#endif
25 26
26#include <limits.h> 27#include <limits.h>
… …
32#if ENABLE_FRILLS 33#if ENABLE_FRILLS
33# include <X11/Xmd.h> 34# include <X11/Xmd.h>
34#endif 35#endif
35 36
36#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
37#include "rxvtfont.h" 39#include "rxvtfont.h"
38#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
39#include "iom.h" 41#include "iom.h"
40#include "salloc.h" 42#include "salloc.h"
41#include "libptytty.h" 43#include "libptytty.h"
… …
68 70
69#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
70typedef char *XPointer; 72typedef char *XPointer;
71#endif 73#endif
72 74
73#ifdef HAVE_TERMIOS_H
74# include <termios.h> 75#include <termios.h>
75typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
76#else
77# include <sgtty.h>
78typedef struct {
79 struct sgttyb sg;
80 struct tchars tc;
81 struct ltchars lc;
82 int line;
83 int local;
84} ttymode_t;
85#endif
86 77
87#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
88# ifdef XPM_INC_X11 79# include <afterimage.h>
89# include <X11/xpm.h> 80#undef min
90# else 81#undef max
91# include <xpm.h>
92# endif 82#endif
93#endif 83
84#include "background.h"
94 85
95#ifndef STDIN_FILENO 86#ifndef STDIN_FILENO
96# define STDIN_FILENO 0 87# define STDIN_FILENO 0
97# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 89# define STDERR_FILENO 2
99#endif 90#endif
100 91
101/****************************************************************************/ 92/****************************************************************************/
102
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123 93
124// exception thrown on fatal (per-instance) errors 94// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 95class rxvt_failure_exception { };
126 96
127// exception thrown when the command parser runs out of input data 97// exception thrown when the command parser runs out of input data
… …
131 ***************************************************************************** 101 *****************************************************************************
132 * PROTOTYPES 102 * PROTOTYPES
133 ***************************************************************************** 103 *****************************************************************************
134 */ 104 */
135// main.C 105// main.C
136RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
137RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
138void rxvt_clean_exit () NOTHROW;
139void * rxvt_malloc (size_t size); 106void * rxvt_malloc (size_t size);
140void * rxvt_calloc (size_t number, size_t size); 107void * rxvt_calloc (size_t number, size_t size);
141void * rxvt_realloc (void *ptr, size_t size); 108void * rxvt_realloc (void *ptr, size_t size);
142 109
143// misc.C 110// misc.C
144char * rxvt_wcstombs (const wchar_t *str, int len = -1); 111char * rxvt_wcstombs (const wchar_t *str, int len = -1);
145wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 112wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 113char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
147wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 114wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
148char * rxvt_strdup_cpp (const char *str);
149 115
150#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 116#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
151 117
152char * rxvt_r_basename (const char *str) NOTHROW; 118char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 119void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 120void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 121void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 122void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 123void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158 124
159int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
160const char * rxvt_Str_skip_space (const char *str) NOTHROW;
161char * rxvt_Str_trim (char *str) NOTHROW; 125char * rxvt_strtrim (char *str) NOTHROW;
162int rxvt_Str_escaped (char *str) NOTHROW;
163char ** rxvt_splitcommastring (const char *cs) NOTHROW; 126char ** rxvt_splitcommastring (const char *cs) NOTHROW;
164void rxvt_freecommastring (char **cs) NOTHROW; 127void rxvt_freecommastring (char **cs) NOTHROW;
165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
166 128
167///////////////////////////////////////////////////////////////////////////// 129/////////////////////////////////////////////////////////////////////////////
168 130
169// temporarily replace the process environment 131// temporarily replace the process environment
170extern char **environ; 132extern char **environ;
171extern char **rxvt_environ; // the original environ pointer 133extern char **rxvt_environ; // the original environ pointer
172 134
173inline void set_environ (stringvec *envv) 135static inline void set_environ (stringvec *envv)
174{ 136{
175#if ENABLE_PERL 137#if ENABLE_PERL
176 assert (envv); 138 assert (envv);
177#else 139#else
178 if (envv) 140 if (envv)
179#endif 141#endif
180 environ = (char **)envv->begin (); 142 environ = (char **)envv->begin ();
181} 143}
182 144
183inline void set_environ (char **envv) 145static inline void set_environ (char **envv)
184{ 146{
185#if ENABLE_PERL 147#if ENABLE_PERL
186 assert (envv); 148 assert (envv);
187#else 149#else
188 if (envv) 150 if (envv)
… …
202 */ 164 */
203#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 165#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
204# define KEEP_SCROLLCOLOR 1 166# define KEEP_SCROLLCOLOR 1
205#else 167#else
206# undef KEEP_SCROLLCOLOR 168# undef KEEP_SCROLLCOLOR
207#endif
208
209#ifdef XPM_BACKGROUND
210typedef struct {
211 short w, h, x, y;
212 Pixmap pixmap;
213} bgPixmap_t;
214#endif 169#endif
215 170
216/* 171/*
217 * the 'essential' information for reporting Mouse Events 172 * the 'essential' information for reporting Mouse Events
218 * pared down from XButtonEvent 173 * pared down from XButtonEvent
… …
265 ***************************************************************************** 220 *****************************************************************************
266 */ 221 */
267 222
268/* COLORTERM, TERM environment variables */ 223/* COLORTERM, TERM environment variables */
269#define COLORTERMENV "rxvt" 224#define COLORTERMENV "rxvt"
270#ifdef XPM_BACKGROUND 225#ifdef BG_IMAGE_FROM_FILE
271# define COLORTERMENVFULL COLORTERMENV "-xpm" 226# define COLORTERMENVFULL COLORTERMENV "-xpm"
272#else 227#else
273# define COLORTERMENVFULL COLORTERMENV 228# define COLORTERMENVFULL COLORTERMENV
274#endif 229#endif
275#ifndef TERMENV 230#ifndef TERMENV
… …
432// fake styles 387// fake styles
433#define RS_Blink 0x00010000UL // blink 388#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 389#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 390#define RS_Uline 0x00040000UL // underline
436 391
392// toggle this to force redraw, must be != RS_Careful
393#define RS_redraw 0x01000000UL
394
437// 5 custom bits for extensions 395// 5 custom bits for extensions
438#define RS_customCount 32 396#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 397#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 398#define RS_customShift 19
441 399
… …
510 Rxvt_restoreFG = 39, // change default fg color 468 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 469 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 470 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 471
514 URxvt_locale = 701, // change locale 472 URxvt_locale = 701, // change locale
473 URxvt_version = 702, // request version
515 474
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 475 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 476 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 477 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 478 URxvt_Color_UL = 707,
… …
535 * on the unnecessary items, e.g. Color_pointer, but won't bother 494 * on the unnecessary items, e.g. Color_pointer, but won't bother
536 * until we need to. Also, be aware of usage in pixcolor_set 495 * until we need to. Also, be aware of usage in pixcolor_set
537 */ 496 */
538 497
539enum colour_list { 498enum colour_list {
499 Color_none = -2,
500 Color_transparent = -1,
540 Color_fg = 0, 501 Color_fg = 0,
541 Color_bg, 502 Color_bg,
542 minCOLOR, /* 2 */ 503 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 504 Color_Black = minCOLOR,
544 Color_Red3, 505 Color_Red3,
… …
586#endif 547#endif
587#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
588 Color_scroll, 549 Color_scroll,
589 Color_trough, 550 Color_trough,
590#endif 551#endif
591#if TINTING 552#if ENABLE_TRANSPARENCY
592 Color_tint, 553 Color_tint,
593#endif 554#endif
594#if OFF_FOCUS_FADING 555#if OFF_FOCUS_FADING
595 Color_fade, 556 Color_fade,
596#endif 557#endif
… …
603 TOTAL_COLORS = NRS_COLORS 564 TOTAL_COLORS = NRS_COLORS
604#endif 565#endif
605}; 566};
606 567
607#define Color_Bits 7 // 0 .. maxTermCOLOR 568#define Color_Bits 7 // 0 .. maxTermCOLOR
608
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611 569
612/* 570/*
613 * Resource list 571 * Resource list
614 */ 572 */
615enum { 573enum {
… …
617# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 575# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
618# include "rsinc.h" 576# include "rsinc.h"
619# undef def 577# undef def
620# undef reserve 578# undef reserve
621 NUM_RESOURCES 579 NUM_RESOURCES
622};
623
624// see init.C:xa_names, which must be kept in sync
625enum {
626 XA_TEXT = 0,
627 XA_COMPOUND_TEXT,
628 XA_UTF8_STRING,
629 XA_MULTIPLE,
630 XA_TARGETS,
631 XA_TIMESTAMP,
632 XA_VT_SELECTION,
633 XA_INCR,
634 XA_WM_PROTOCOLS,
635 XA_WM_DELETE_WINDOW,
636 XA_CLIPBOARD,
637#if ENABLE_FRILLS
638 XA_MOTIF_WM_HINTS,
639#endif
640#if ENABLE_EWMH
641 XA_NET_WM_PID,
642 XA_NET_WM_NAME,
643 XA_NET_WM_ICON_NAME,
644 XA_NET_WM_PING,
645#endif
646#if USE_XIM
647 XA_WM_LOCALE_NAME,
648#endif
649#if TRANSPARENT
650 XA_XROOTPMAP_ID,
651 XA_ESETROOT_PMAP_ID,
652#endif
653#if ENABLE_XEMBED
654 XA_XEMBED,
655 XA_XEMBED_INFO,
656#endif
657 NUM_XA
658}; 580};
659 581
660/* DEC private modes */ 582/* DEC private modes */
661#define PrivMode_132 (1UL<<0) 583#define PrivMode_132 (1UL<<0)
662#define PrivMode_132OK (1UL<<1) 584#define PrivMode_132OK (1UL<<1)
… …
676#define PrivMode_TtyOutputInh (1UL<<15) 598#define PrivMode_TtyOutputInh (1UL<<15)
677#define PrivMode_Keypress (1UL<<16) 599#define PrivMode_Keypress (1UL<<16)
678#define PrivMode_smoothScroll (1UL<<17) 600#define PrivMode_smoothScroll (1UL<<17)
679#define PrivMode_vt52 (1UL<<18) 601#define PrivMode_vt52 (1UL<<18)
680#define PrivMode_LFNL (1UL<<19) 602#define PrivMode_LFNL (1UL<<19)
603#define PrivMode_MouseBtnEvent (1UL<<20)
604#define PrivMode_MouseAnyEvent (1UL<<21)
681/* too annoying to implement X11 highlight tracking */ 605/* too annoying to implement X11 highlight tracking */
682/* #define PrivMode_MouseX11Track (1LU<<20) */ 606/* #define PrivMode_MouseX11Track (1LU<<20) */
683 607
684#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 608#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
685#define PrivMode(test,bit) \
686 if (test) \
687 priv_modes |= (bit); \
688 else \
689 priv_modes &= ~(bit)
690 609
691#ifdef ALLOW_132_MODE 610#ifdef ALLOW_132_MODE
692# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 611# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
693#else 612#else
694# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 613# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
735 ***************************************************************************** 654 *****************************************************************************
736 * MACRO DEFINES 655 * MACRO DEFINES
737 ***************************************************************************** 656 *****************************************************************************
738 */ 657 */
739#define dLocal(type,name) type const name = this->name 658#define dLocal(type,name) type const name = this->name
740#define dDisp Display *disp = this->display->display
741 659
742// for speed reasons, we assume that all latin1 characters 660// for speed reasons, we assume that all codepoints 32 to 126 are
743// are single-width (the first unicdoe combining character 661// single-width.
744// is actually 0x300, but ascii is what matters most). 662#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
745#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
746 663
747/* convert pixel dimensions to row/column values. Everything as int32_t */ 664/* convert pixel dimensions to row/column values. Everything as int32_t */
748#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 665#define Pixel2Col(x) Pixel2Width((int32_t)(x))
749#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 666#define Pixel2Row(y) Pixel2Height((int32_t)(y))
750#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 667#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
752#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 669#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
753#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 670#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
754#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 671#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
755#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 672#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
756 673
757#define OPTION(opt) (options & (opt))
758#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
759 | Opt_jumpScroll | Opt_secondaryScreen \
760 | Opt_pastableTabs | Opt_intensityStyles)
761
762// for m >= -n, ensure remainder lies between 0..n-1 674// for m >= -n, ensure remainder lies between 0..n-1
763#define MOD(m,n) (((m) + (n)) % (n)) 675#define MOD(m,n) (((m) + (n)) % (n))
764 676
765#define LINENO(n) MOD (term_start + int(n), total_rows) 677#define LINENO(n) MOD (term_start + int(n), total_rows)
766#define ROW(n) row_buf [LINENO (n)] 678#define ROW(n) row_buf [LINENO (n)]
… …
784#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 696#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
785#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 697#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
786 698
787#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 699#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
788 700
789#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 701#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
790#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 702#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
791 703
792#if ENABLE_STYLES 704#if ENABLE_STYLES
793# define FONTSET(style) fontset[GET_STYLE (style)] 705# define FONTSET(style) fontset[GET_STYLE (style)]
794#else 706#else
795# define FONTSET(style) fontset[0] 707# define FONTSET(style) fontset[0]
… …
823#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 735#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
824#define scrollbar_position(y) ((y) - scrollBar.beg) 736#define scrollbar_position(y) ((y) - scrollBar.beg)
825#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 737#define scrollbar_size() (scrollBar.end - scrollBar.beg \
826 - scrollbar_minheight ()) 738 - scrollbar_minheight ())
827 739
828#ifdef XPM_BACKGROUND
829# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
830#else
831# define XPMClearArea(a, b, c, d, e, f, g)
832#endif
833
834typedef callback1<void, const char *> log_callback; 740typedef callback<void (const char *)> log_callback;
835typedef callback1<int, int> getfd_callback; 741typedef callback<int (int)> getfd_callback;
836 742
837#define SET_LOCALE(locale) rxvt_set_locale (locale) 743#define SET_LOCALE(locale) rxvt_set_locale (locale)
838extern bool rxvt_set_locale (const char *locale) NOTHROW; 744extern bool rxvt_set_locale (const char *locale) NOTHROW;
839extern void rxvt_push_locale (const char *locale) NOTHROW; 745extern void rxvt_push_locale (const char *locale) NOTHROW;
840extern void rxvt_pop_locale () NOTHROW; 746extern void rxvt_pop_locale () NOTHROW;
… …
842/****************************************************************************/ 748/****************************************************************************/
843 749
844#define LINE_LONGER 0x0001 // line is continued on the next row 750#define LINE_LONGER 0x0001 // line is continued on the next row
845#define LINE_FILTERED 0x0002 // line has been filtered 751#define LINE_FILTERED 0x0002 // line has been filtered
846#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 752#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
753#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
754#define LINE_BIDI 0x0010 // line needs bidi (NYI)
847 755
848struct line_t { 756struct line_t {
849 text_t *t; // terminal the text 757 text_t *t; // terminal the text
850 rend_t *r; // rendition, uses RS_ flags 758 rend_t *r; // rendition, uses RS_ flags
851 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 759 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
905# define COMPOSE_LO 0x40000000UL 813# define COMPOSE_LO 0x40000000UL
906# define COMPOSE_HI 0x400fffffUL 814# define COMPOSE_HI 0x400fffffUL
907# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 815# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
908#else 816#else
909# if ENABLE_PERL 817# if ENABLE_PERL
910# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 818# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
911# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 819# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
912# else 820# else
913# define COMPOSE_LO 0xd800UL 821# define COMPOSE_LO 0xd800UL
914# define COMPOSE_HI 0xf8ffUL 822# define COMPOSE_HI 0xf8ffUL
915# endif 823# endif
… …
944#endif 852#endif
945 853
946/****************************************************************************/ 854/****************************************************************************/
947 855
948#ifdef KEYSYM_RESOURCE 856#ifdef KEYSYM_RESOURCE
949 class keyboard_manager; 857class keyboard_manager;
950#endif 858#endif
951 859
952struct rxvt_term : zero_initialized, rxvt_vars { 860struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
861
862 // special markers with magic addresses
863 static const char resval_undef []; // options specifically unset
864 static const char resval_on []; // boolean options switched on
865 static const char resval_off []; // or off
866
953 log_callback *log_hook; // log error messages through this hook, if != 0 867 log_callback *log_hook; // log error messages through this hook, if != 0
954 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 868 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
955#if ENABLE_PERL 869#if ENABLE_PERL
956 rxvt_perl_term perl; 870 rxvt_perl_term perl;
957#endif 871#endif
958 struct mbstate mbstate; // current input multibyte state 872 struct mbstate mbstate; // current input multibyte state
959 873
960 unsigned char want_refresh:1, 874 unsigned char want_refresh:1,
961#ifdef TRANSPARENT
962 want_full_refresh:1, /* awaiting full screen refresh */
963#endif
964#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
965 am_transparent:1, /* is a transparent term */
966 am_pixmap_trans:1, /* transparency w/known root pixmap */
967#endif
968 current_screen:1, /* primary or secondary */ 875 current_screen:1, /* primary or secondary */
969 num_scr_allow:1, 876 num_scr_allow:1,
970 bypass_keystate:1, 877 bypass_keystate:1,
971#ifdef CURSOR_BLINK 878#ifdef CURSOR_BLINK
972 hidden_cursor:1, 879 hidden_cursor:1,
… …
998 int prev_ncol, /* screen: previous number of columns */ 905 int prev_ncol, /* screen: previous number of columns */
999 prev_nrow; /* screen: previous number of rows */ 906 prev_nrow; /* screen: previous number of rows */
1000/* ---------- */ 907/* ---------- */
1001 rend_t rstyle; 908 rend_t rstyle;
1002/* ---------- */ 909/* ---------- */
1003 uint32_t pixcolor_set[NPIXCLR_SETS];
1004/* ---------- */
1005#ifdef SELECTION_SCROLLING 910#ifdef SELECTION_SCROLLING
1006 int scroll_selection_lines; 911 int scroll_selection_lines;
1007 enum page_dirn scroll_selection_dir; 912 enum page_dirn scroll_selection_dir;
1008 int selection_save_x, 913 int selection_save_x,
1009 selection_save_y, 914 selection_save_y,
… …
1014 /* give proper Scroll behaviour */ 919 /* give proper Scroll behaviour */
1015#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 920#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1016 mouse_slip_wheel_speed, 921 mouse_slip_wheel_speed,
1017#endif 922#endif
1018 refresh_count, 923 refresh_count,
1019 refresh_limit,
1020 last_bot, /* scrollbar last bottom position */ 924 last_bot, /* scrollbar last bottom position */
1021 last_top, /* scrollbar last top position */ 925 last_top, /* scrollbar last top position */
1022 last_state, /* scrollbar last state */ 926 last_state, /* scrollbar last state */
1023 scrollbar_len, 927 scrollbar_len,
1024 window_vt_x, 928 window_vt_x,
1025 window_vt_y, 929 window_vt_y,
1026 window_sb_x, 930 window_sb_x,
931 mouse_row,
932 mouse_col,
1027# ifdef POINTER_BLANK 933# ifdef POINTER_BLANK
1028 pointerBlankDelay, 934 pointerBlankDelay,
1029# endif 935# endif
1030 allowedxerror; 936 allowedxerror;
1031/* ---------- */ 937/* ---------- */
… …
1035 int old_width, /* last used width in screen resize */ 941 int old_width, /* last used width in screen resize */
1036 old_height; /* last used height in screen resize */ 942 old_height; /* last used height in screen resize */
1037 unsigned long priv_modes, 943 unsigned long priv_modes,
1038 SavedModes; 944 SavedModes;
1039/* ---------- */ 945/* ---------- */
1040 Atom xa[NUM_XA]; 946 Atom *xa;
1041/* ---------- */ 947/* ---------- */
1042#ifdef RXVT_SCROLLBAR 948#ifdef RXVT_SCROLLBAR
1043 GC scrollbarGC, 949 GC scrollbarGC,
1044 topShadowGC, 950 topShadowGC,
1045 botShadowGC; 951 botShadowGC;
… …
1070 char * incr_buf; 976 char * incr_buf;
1071 size_t incr_buf_size, incr_buf_fill; 977 size_t incr_buf_size, incr_buf_fill;
1072/* ---------- */ 978/* ---------- */
1073 Cursor leftptr_cursor; 979 Cursor leftptr_cursor;
1074/* ---------- */ 980/* ---------- */
1075#ifndef NO_BACKSPACE_KEY
1076 const char *key_backspace;
1077#endif
1078#ifndef NO_DELETE_KEY
1079 const char *key_delete;
1080#endif
1081 struct mouse_event MEvent; 981 struct mouse_event MEvent;
1082 XComposeStatus compose; 982 XComposeStatus compose;
1083 ttymode_t tio; 983 ttymode_t tio;
1084 row_col_t oldcursor; 984 row_col_t oldcursor;
1085#ifdef XPM_BACKGROUND 985#ifdef HAVE_BG_PIXMAP
1086 bgPixmap_t bgPixmap; 986 bgPixmap_t bgPixmap;
1087 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 987#endif
988#ifdef HAVE_AFTERIMAGE
989 ASVisual *asv;
990 ASImageManager *asimman;
1088#endif 991#endif
1089 992
1090#if ENABLE_OVERLAY 993#if ENABLE_OVERLAY
1091 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 994 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1092 text_t **ov_text; 995 text_t **ov_text;
… …
1102 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1005 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1103#endif 1006#endif
1104 1007
1105 vector<void *> allocated; // free these memory blocks with free() 1008 vector<void *> allocated; // free these memory blocks with free()
1106 1009
1107 char *env_windowid; /* environmental variable WINDOWID */ 1010 char env_windowid[21]; /* environmental variable WINDOWID */
1011 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1108 char *env_display; /* environmental variable DISPLAY */ 1012 char *env_display; /* environmental variable DISPLAY */
1109 char *env_term; /* environmental variable TERM */ 1013 char *env_term; /* environmental variable TERM */
1110 char *env_colorfgbg; 1014
1111 char *locale; 1015 char *locale;
1112 char charsets[4]; 1016 char charsets[4];
1113 char *v_buffer; /* pointer to physical buffer */ 1017 char *v_buffer; /* pointer to physical buffer */
1114 unsigned int v_buflen; /* size of area to write */ 1018 unsigned int v_buflen; /* size of area to write */
1115 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1019 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1116 1020
1117#ifdef KEYSYM_RESOURCE 1021#ifdef KEYSYM_RESOURCE
1118 keyboard_manager *keyboard; 1022 keyboard_manager *keyboard;
1119#endif 1023#endif
1120 1024
… …
1139 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1043 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1140 void iso14755_54 (int x, int y); 1044 void iso14755_54 (int x, int y);
1141# endif 1045# endif
1142#endif 1046#endif
1143 1047
1144 // modifies first argument(!)
1145 void paste (char *data, unsigned int len) NOTHROW;
1146
1147 long vt_emask, vt_emask_perl, vt_emask_xim; 1048 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1148 1049
1149 void vt_select_input () const NOTHROW 1050 void vt_select_input () const NOTHROW
1150 { 1051 {
1151 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1052 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1152 } 1053 }
1153 1054
1154#if TRANSPARENT 1055#if ENABLE_TRANSPARENCY || ENABLE_PERL
1155 void rootwin_cb (XEvent &xev); 1056 void rootwin_cb (XEvent &xev);
1156 xevent_watcher rootwin_ev; 1057 xevent_watcher rootwin_ev;
1157#endif 1058#endif
1059#ifdef HAVE_BG_PIXMAP
1060 int update_background ();
1061 void update_background_cb (time_watcher &w);
1062 time_watcher update_background_ev;
1063#endif
1158 1064
1159 void x_cb (XEvent &xev); 1065 void x_cb (XEvent &xev);
1160 void flush ();
1161 xevent_watcher termwin_ev; 1066 xevent_watcher termwin_ev;
1162 xevent_watcher vt_ev; 1067 xevent_watcher vt_ev;
1163#ifdef HAVE_SCROLLBARS 1068#ifdef HAVE_SCROLLBARS
1164 xevent_watcher scrollbar_ev; 1069 xevent_watcher scrollbar_ev;
1165#endif 1070#endif
1166 1071
1167 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1072 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1168 void check_cb (check_watcher &w); check_watcher check_ev; 1073 void check_cb (check_watcher &w); check_watcher check_ev;
1169 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1074 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1075 void flush ();
1170 void flush_cb (time_watcher &w); time_watcher flush_ev; 1076 void flush_cb (time_watcher &w); time_watcher flush_ev;
1077 bool pty_fill ();
1171 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1078 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1172 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1079 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1173 1080
1174#ifdef CURSOR_BLINK 1081#ifdef CURSOR_BLINK
1175 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1082 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1198 void pointer_unblank (); 1105 void pointer_unblank ();
1199 1106
1200 void tt_printf (const char *fmt,...); 1107 void tt_printf (const char *fmt,...);
1201 void tt_write (const char *data, unsigned int len); 1108 void tt_write (const char *data, unsigned int len);
1202 void pty_write (); 1109 void pty_write ();
1203
1204 void tt_winch ();
1205
1206 rxvt_term ();
1207 ~rxvt_term ();
1208 void destroy ();
1209 void emergency_cleanup ();
1210
1211 bool init (int argc, const char *const *argv, stringvec *envv);
1212 1110
1213 bool init (stringvec *argv, stringvec *envv) 1111 bool init (stringvec *argv, stringvec *envv)
1214 { 1112 {
1215 this->argv = argv; 1113 this->argv = argv;
1216 return init (argv->size (), argv->begin (), envv); 1114 return init (argv->size (), argv->begin (), envv);
1217 } 1115 }
1218
1219 bool init_vars ();
1220
1221 bool pty_fill ();
1222 1116
1223 void make_current () const // make this the "currently active" urxvt instance 1117 void make_current () const // make this the "currently active" urxvt instance
1224 { 1118 {
1225 SET_R (this); 1119 SET_R (this);
1120 set_environ (envv);
1226 rxvt_set_locale (locale); 1121 rxvt_set_locale (locale);
1227 set_environ (envv);
1228 } 1122 }
1229
1230 void init_secondary ();
1231 const char **init_resources (int argc, const char *const *argv);
1232 const char *x_resource (const char *name);
1233 void init_env ();
1234 void set_locale (const char *locale);
1235 void init_xlocale ();
1236 void init_command (const char *const *argv);
1237 void run_command (const char *const *argv);
1238 int run_child (const char *const *argv);
1239
1240 void color_aliases (int idx);
1241 void recolour_cursor ();
1242 void create_windows (int argc, const char *const *argv);
1243 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1244 void window_calc (unsigned int newwidth, unsigned int newheight);
1245 1123
1246#if USE_XIM 1124#if USE_XIM
1247 rxvt_xim *input_method; 1125 rxvt_xim *input_method;
1248 XIC Input_Context; 1126 XIC Input_Context;
1249 XIMStyle input_style; 1127 XIMStyle input_style;
… …
1257 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1135 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1258 1136
1259 bool IMisRunning (); 1137 bool IMisRunning ();
1260 void IMSendSpot (); 1138 void IMSendSpot ();
1261 bool IM_get_IC (const char *modifiers); 1139 bool IM_get_IC (const char *modifiers);
1262 void IMSetStatusPosition (); 1140 void IMSetPosition ();
1263#endif 1141#endif
1264
1265 void resize_scrollbar ();
1266 1142
1267 // command.C 1143 // command.C
1268 void lookup_key (XKeyEvent &ev); 1144 void key_press (XKeyEvent &ev);
1145 void key_release (XKeyEvent &ev);
1269 unsigned int cmd_write (const char *str, unsigned int count); 1146 unsigned int cmd_write (const char *str, unsigned int count);
1270 1147
1271 wchar_t next_char () NOTHROW; 1148 wchar_t next_char () NOTHROW;
1272 wchar_t cmd_getc () THROW ((class out_of_input)); 1149 wchar_t cmd_getc () THROW ((class out_of_input));
1273 uint32_t next_octet () NOTHROW; 1150 uint32_t next_octet () NOTHROW;
… …
1277 void mouse_report (XButtonEvent &ev); 1154 void mouse_report (XButtonEvent &ev);
1278 void button_press (XButtonEvent &ev); 1155 void button_press (XButtonEvent &ev);
1279 void button_release (XButtonEvent &ev); 1156 void button_release (XButtonEvent &ev);
1280 void focus_in (); 1157 void focus_in ();
1281 void focus_out (); 1158 void focus_out ();
1282 int check_our_parents (); 1159 void update_fade_color (unsigned int idx);
1283#ifdef PRINTPIPE 1160#ifdef PRINTPIPE
1284 FILE *popen_printer (); 1161 FILE *popen_printer ();
1285 int pclose_printer (FILE *stream); 1162 int pclose_printer (FILE *stream);
1286#endif 1163#endif
1287 void process_print_pipe (); 1164 void process_print_pipe ();
… …
1298 int privcases (int mode, unsigned long bit); 1175 int privcases (int mode, unsigned long bit);
1299 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1176 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); 1177 void process_sgr_mode (unsigned int nargs, const int *arg);
1301 void process_graphics (); 1178 void process_graphics ();
1302 // init.C 1179 // init.C
1180 bool init_vars ();
1181 void init_secondary ();
1182 const char **init_resources (int argc, const char *const *argv);
1183 void init_env ();
1184 void set_locale (const char *locale);
1185 void init_xlocale ();
1186 void init_command (const char *const *argv);
1187 void run_command (const char *const *argv);
1188 int run_child (const char *const *argv);
1189 void color_aliases (int idx);
1190 void create_windows (int argc, const char *const *argv);
1303 void Get_Colours (); 1191 void Get_Colours ();
1304 void get_ourmods (); 1192 void get_ourmods ();
1305 // main.C 1193 // main.C
1194 void tt_winch ();
1195 rxvt_term ();
1196 ~rxvt_term ();
1197 void destroy ();
1198 void emergency_cleanup ();
1199 bool init (int argc, const char *const *argv, stringvec *envv);
1200 void recolour_cursor ();
1201 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1202 void window_calc (unsigned int newwidth, unsigned int newheight);
1306 bool set_fonts (); 1203 bool set_fonts ();
1307 void set_string_property (Atom prop, const char *str, int len = -1); 1204 void set_string_property (Atom prop, const char *str, int len = -1);
1308 void set_utf8_property (Atom prop, const char *str, int len = -1); 1205 void set_utf8_property (Atom prop, const char *str, int len = -1);
1309 void set_title (const char *str); 1206 void set_title (const char *str);
1310 void set_icon_name (const char *str); 1207 void set_icon_name (const char *str);
1311 void set_window_color (int idx, const char *color); 1208 void set_window_color (int idx, const char *color);
1312 void set_colorfgbg (); 1209 void set_colorfgbg ();
1313 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1210 bool set_color (rxvt_color &color, const char *name);
1211 void alias_color (int dst, int src);
1314 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1212 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1213 void get_window_origin (int &x, int &y);
1214 Pixmap get_pixmap_property (int prop_id);
1315 1215
1316 // screen.C 1216 // screen.C
1317 1217
1318 void lalloc (line_t &l) const 1218 void lalloc (line_t &l) const
1319 { 1219 {
… …
1347 { 1247 {
1348 int base = GET_BASEFG (r); 1248 int base = GET_BASEFG (r);
1349#ifndef NO_BRIGHTCOLOR 1249#ifndef NO_BRIGHTCOLOR
1350 if (r & RS_Bold 1250 if (r & RS_Bold
1351# if ENABLE_STYLES 1251# if ENABLE_STYLES
1352 && OPTION (Opt_intensityStyles) 1252 && option (Opt_intensityStyles)
1353# endif 1253# endif
1354 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1254 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1355 base += minBrightCOLOR - minCOLOR; 1255 base += minBrightCOLOR - minCOLOR;
1356#endif 1256#endif
1357 return base; 1257 return base;
… …
1361 { 1261 {
1362 int base = GET_BASEBG (r); 1262 int base = GET_BASEBG (r);
1363#ifndef NO_BRIGHTCOLOR 1263#ifndef NO_BRIGHTCOLOR
1364 if (r & RS_Blink 1264 if (r & RS_Blink
1365# if ENABLE_STYLES 1265# if ENABLE_STYLES
1366 && OPTION (Opt_intensityStyles) 1266 && option (Opt_intensityStyles)
1367# endif 1267# endif
1368 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1268 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1369 base += minBrightCOLOR - minCOLOR; 1269 base += minBrightCOLOR - minCOLOR;
1370#endif 1270#endif
1371 return base; 1271 return base;
1372 } 1272 }
1373 1273
1374 bool option (uint32_t opt) const NOTHROW 1274 bool option (uint8_t opt) const NOTHROW
1375 { 1275 {
1376 return OPTION (opt); 1276 return options[opt >> 3] & (1 << (opt & 7));
1377 } 1277 }
1378 1278
1379 void set_option (uint32_t opt, bool set) NOTHROW 1279 void set_option (uint8_t opt, bool set = true) NOTHROW
1380 { 1280 {
1381 if (set) 1281 if (set)
1382 options |= opt; 1282 options[opt >> 3] |= (1 << (opt & 7));
1383 else 1283 else
1384 options &= ~opt; 1284 options[opt >> 3] &= ~(1 << (opt & 7));
1385 } 1285 }
1386 1286
1287 void PrivMode (int set, unsigned bit) NOTHROW
1288 {
1289 if (set)
1290 priv_modes |= bit;
1291 else
1292 priv_modes &= ~bit;
1293 }
1294
1295 // modifies first argument(!)
1296 void paste (char *data, unsigned int len) NOTHROW;
1387 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1297 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1388 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1298 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1389 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1299 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1390 void scr_reset (); 1300 void scr_reset ();
1391 void scr_release () NOTHROW; 1301 void scr_release () NOTHROW;
… …
1398 void scr_backindex () NOTHROW; 1308 void scr_backindex () NOTHROW;
1399 void scr_forwardindex () NOTHROW; 1309 void scr_forwardindex () NOTHROW;
1400#endif 1310#endif
1401 void scr_touch (bool refresh) NOTHROW; 1311 void scr_touch (bool refresh) NOTHROW;
1402 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1312 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1403 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1404 void scr_recolour () NOTHROW; 1313 void scr_recolour () NOTHROW;
1405 void scr_remap_chars () NOTHROW; 1314 void scr_remap_chars () NOTHROW;
1406 void scr_remap_chars (line_t &l) NOTHROW; 1315 void scr_remap_chars (line_t &l) NOTHROW;
1407 1316
1408 enum cursor_mode { SAVE, RESTORE }; 1317 enum cursor_mode { SAVE, RESTORE };
… …
1459 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1368 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1460 void selection_click (int clicks, int x, int y) NOTHROW; 1369 void selection_click (int clicks, int x, int y) NOTHROW;
1461 void selection_extend (int x, int y, int flag) NOTHROW; 1370 void selection_extend (int x, int y, int flag) NOTHROW;
1462 void selection_rotate (int x, int y) NOTHROW; 1371 void selection_rotate (int x, int y) NOTHROW;
1463 1372
1464 void pixel_position (int *x, int *y) NOTHROW;
1465
1466#if defined(NEXT_SCROLLBAR) 1373#if defined(NEXT_SCROLLBAR)
1467 // scrollbar-next.C 1374 // scrollbar-next.C
1468 Pixmap renderPixmap (const char *const *data, int width, int height); 1375 Pixmap renderPixmap (const char *const *data, int width, int height);
1469 void init_scrollbar_stuff (); 1376 void init_scrollbar_stuff ();
1470 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1377 void drawBevel (Drawable d, int x1, int y1, int w, int h);
… …
1485 // scrollbar-plain.C 1392 // scrollbar-plain.C
1486 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); 1393 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1487#endif 1394#endif
1488 1395
1489 // scrollbar.C 1396 // scrollbar.C
1397 void resize_scrollbar ();
1490 int scrollbar_mapping (int map); 1398 int scrollbar_mapping (int map);
1491 int scrollbar_show (int update); 1399 int scrollbar_show (int update);
1492 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); 1400 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1493 1401
1494 // xdefaults.C 1402 // xdefaults.C
1495 void get_options (int argc, const char *const *argv); 1403 void get_options (int argc, const char *const *argv);
1496 int parse_keysym (const char *str, const char *arg); 1404 int parse_keysym (const char *str, const char *arg);
1497 void get_xdefaults (FILE *stream, const char *name); 1405 const char *x_resource (const char *name);
1498 void extract_resources (); 1406 void extract_resources ();
1499 // xpm.C
1500 int scale_pixmap (const char *geom);
1501 void resize_pixmap ();
1502 Pixmap set_bgPixmap (const char *file);
1503}; 1407};
1504 1408
1505/*
1506 *****************************************************************************
1507 * PROTOTYPES
1508 *****************************************************************************
1509 */
1510#ifdef PROTOTYPES
1511# define __PROTO(p) p
1512#else
1513# define __PROTO(p) ()
1514#endif
1515
1516#endif /* _RXVT_H_ */ 1409#endif /* _RXVT_H_ */
1517 1410

Diff Legend

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