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.247 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.317 by ayin, Sat Nov 3 16:43:24 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#include "background.h"
88# ifdef XPM_INC_X11
89# include <X11/xpm.h>
90# else
91# include <xpm.h>
92# endif
93#endif
94 79
95#ifndef STDIN_FILENO 80#ifndef STDIN_FILENO
96# define STDIN_FILENO 0 81# define STDIN_FILENO 0
97# define STDOUT_FILENO 1 82# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 83# define STDERR_FILENO 2
99#endif 84#endif
100 85
101/****************************************************************************/ 86/****************************************************************************/
102 87
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
124// exception thrown on fatal (per-instance) errors 88// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 89class rxvt_failure_exception { };
126 90
127// exception thrown when the command parser runs out of input data 91// exception thrown when the command parser runs out of input data
128class out_of_input { }; 92class out_of_input { };
129 93
130/* 94/*
131 ***************************************************************************** 95 *****************************************************************************
132 * PROTOTYPES 96 * PROTOTYPES
133 ***************************************************************************** 97 *****************************************************************************
134 */ 98 */
135// main.C 99// 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); 100void * rxvt_malloc (size_t size);
140void * rxvt_calloc (size_t number, size_t size); 101void * rxvt_calloc (size_t number, size_t size);
141void * rxvt_realloc (void *ptr, size_t size); 102void * rxvt_realloc (void *ptr, size_t size);
142 103
143// misc.C 104// misc.C
144char * rxvt_wcstombs (const wchar_t *str, int len = -1); 105char * rxvt_wcstombs (const wchar_t *str, int len = -1);
145wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 106wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 107char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
147wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 108wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
148char * rxvt_strdup_cpp (const char *str);
149 109
150#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
151
152char * rxvt_r_basename (const char *str) NOTHROW; 110char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 111void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 112void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 113void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 114void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 115void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158 116
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; 117char * rxvt_strtrim (char *str) NOTHROW;
162int rxvt_Str_escaped (char *str) NOTHROW;
163char ** rxvt_splitcommastring (const char *cs) NOTHROW; 118char ** rxvt_splitcommastring (const char *cs) NOTHROW;
164void rxvt_freecommastring (char **cs) NOTHROW; 119void rxvt_freecommastring (char **cs) NOTHROW;
165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
166 120
167///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
168 122
169// temporarily replace the process environment 123// temporarily replace the process environment
170extern char **environ; 124extern char **environ;
171extern char **rxvt_environ; // the original environ pointer 125extern char **rxvt_environ; // the original environ pointer
172 126
173inline void set_environ (stringvec *envv) 127static inline void set_environ (stringvec *envv)
174{ 128{
175#if ENABLE_PERL 129#if ENABLE_PERL
176 assert (envv); 130 assert (envv);
177#else 131#else
178 if (envv) 132 if (envv)
179#endif 133#endif
180 environ = (char **)envv->begin (); 134 environ = (char **)envv->begin ();
181} 135}
182 136
183inline void set_environ (char **envv) 137static inline void set_environ (char **envv)
184{ 138{
185#if ENABLE_PERL 139#if ENABLE_PERL
186 assert (envv); 140 assert (envv);
187#else 141#else
188 if (envv) 142 if (envv)
… …
202 */ 156 */
203#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 157#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
204# define KEEP_SCROLLCOLOR 1 158# define KEEP_SCROLLCOLOR 1
205#else 159#else
206# undef KEEP_SCROLLCOLOR 160# 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 161#endif
215 162
216/* 163/*
217 * the 'essential' information for reporting Mouse Events 164 * the 'essential' information for reporting Mouse Events
218 * pared down from XButtonEvent 165 * pared down from XButtonEvent
… …
234} MWMHints; 181} MWMHints;
235#endif 182#endif
236 183
237#if ENABLE_XEMBED 184#if ENABLE_XEMBED
238// XEMBED messages 185// XEMBED messages
239# define XEMBED_EMBEDDED_NOTIFY 0 186# define XEMBED_EMBEDDED_NOTIFY 0
240# define XEMBED_WINDOW_ACTIVATE 1 187# define XEMBED_WINDOW_ACTIVATE 1
241# define XEMBED_WINDOW_DEACTIVATE 2 188# define XEMBED_WINDOW_DEACTIVATE 2
242# define XEMBED_REQUEST_FOCUS 3 189# define XEMBED_REQUEST_FOCUS 3
243# define XEMBED_FOCUS_IN 4 190# define XEMBED_FOCUS_IN 4
244# define XEMBED_FOCUS_OUT 5 191# define XEMBED_FOCUS_OUT 5
245# define XEMBED_FOCUS_NEXT 6 192# define XEMBED_FOCUS_NEXT 6
246# define XEMBED_FOCUS_PREV 7 193# define XEMBED_FOCUS_PREV 7
247 194
248# define XEMBED_MODALITY_ON 10 195# define XEMBED_MODALITY_ON 10
249# define XEMBED_MODALITY_OFF 11 196# define XEMBED_MODALITY_OFF 11
250# define XEMBED_REGISTER_ACCELERATOR 12 197# define XEMBED_REGISTER_ACCELERATOR 12
251# define XEMBED_UNREGISTER_ACCELERATOR 13 198# define XEMBED_UNREGISTER_ACCELERATOR 13
252# define XEMBED_ACTIVATE_ACCELERATOR 14 199# define XEMBED_ACTIVATE_ACCELERATOR 14
253 200
254// XEMBED detail code 201// XEMBED detail code
255# define XEMBED_FOCUS_CURRENT 0 202# define XEMBED_FOCUS_CURRENT 0
256# define XEMBED_FOCUS_FIRST 1 203# define XEMBED_FOCUS_FIRST 1
257# define XEMBED_FOCUS_LAST 2 204# define XEMBED_FOCUS_LAST 2
258 205
259# define XEMBED_MAPPED (1 << 0) 206# define XEMBED_MAPPED (1 << 0)
260#endif 207#endif
261 208
… …
265 ***************************************************************************** 212 *****************************************************************************
266 */ 213 */
267 214
268/* COLORTERM, TERM environment variables */ 215/* COLORTERM, TERM environment variables */
269#define COLORTERMENV "rxvt" 216#define COLORTERMENV "rxvt"
270#ifdef XPM_BACKGROUND 217#ifdef BG_IMAGE_FROM_FILE
271# define COLORTERMENVFULL COLORTERMENV "-xpm" 218# define COLORTERMENVFULL COLORTERMENV "-xpm"
272#else 219#else
273# define COLORTERMENVFULL COLORTERMENV 220# define COLORTERMENVFULL COLORTERMENV
274#endif 221#endif
275#ifndef TERMENV 222#ifndef TERMENV
… …
474 C0_NUL = 0x00, 421 C0_NUL = 0x00,
475 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 422 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
476 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 423 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
477 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 424 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
478 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, 425 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
479}; 426};
480#define CHAR_ST 0x9c /* 0234 */ 427#define CHAR_ST 0x9c /* 0234 */
481 428
482/* 429/*
483 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 430 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
484 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 431 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
… …
539 * on the unnecessary items, e.g. Color_pointer, but won't bother 486 * on the unnecessary items, e.g. Color_pointer, but won't bother
540 * until we need to. Also, be aware of usage in pixcolor_set 487 * until we need to. Also, be aware of usage in pixcolor_set
541 */ 488 */
542 489
543enum colour_list { 490enum colour_list {
491 Color_none = -2,
492 Color_transparent = -1,
544 Color_fg = 0, 493 Color_fg = 0,
545 Color_bg, 494 Color_bg,
546 minCOLOR, /* 2 */ 495 minCOLOR, /* 2 */
547 Color_Black = minCOLOR, 496 Color_Black = minCOLOR,
548 Color_Red3, 497 Color_Red3,
… …
590#endif 539#endif
591#ifdef KEEP_SCROLLCOLOR 540#ifdef KEEP_SCROLLCOLOR
592 Color_scroll, 541 Color_scroll,
593 Color_trough, 542 Color_trough,
594#endif 543#endif
595#if TINTING 544#if ENABLE_TRANSPARENCY
596 Color_tint, 545 Color_tint,
597#endif 546#endif
598#if OFF_FOCUS_FADING 547#if OFF_FOCUS_FADING
599 Color_fade, 548 Color_fade,
600#endif 549#endif
… …
607 TOTAL_COLORS = NRS_COLORS 556 TOTAL_COLORS = NRS_COLORS
608#endif 557#endif
609}; 558};
610 559
611#define Color_Bits 7 // 0 .. maxTermCOLOR 560#define Color_Bits 7 // 0 .. maxTermCOLOR
612
613#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
614#define NPIXCLR_BITS 32
615 561
616/* 562/*
617 * Resource list 563 * Resource list
618 */ 564 */
619enum { 565enum {
… …
644#define PrivMode_TtyOutputInh (1UL<<15) 590#define PrivMode_TtyOutputInh (1UL<<15)
645#define PrivMode_Keypress (1UL<<16) 591#define PrivMode_Keypress (1UL<<16)
646#define PrivMode_smoothScroll (1UL<<17) 592#define PrivMode_smoothScroll (1UL<<17)
647#define PrivMode_vt52 (1UL<<18) 593#define PrivMode_vt52 (1UL<<18)
648#define PrivMode_LFNL (1UL<<19) 594#define PrivMode_LFNL (1UL<<19)
595#define PrivMode_MouseBtnEvent (1UL<<20)
596#define PrivMode_MouseAnyEvent (1UL<<21)
649/* too annoying to implement X11 highlight tracking */ 597/* too annoying to implement X11 highlight tracking */
650/* #define PrivMode_MouseX11Track (1LU<<20) */ 598/* #define PrivMode_MouseX11Track (1LU<<20) */
651 599
652#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 600#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
653#define PrivMode(test,bit) \
654 if (test) \
655 priv_modes |= (bit); \
656 else \
657 priv_modes &= ~(bit)
658 601
659#ifdef ALLOW_132_MODE 602#ifdef ALLOW_132_MODE
660# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 603# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
661#else 604#else
662# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 605# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
704 * MACRO DEFINES 647 * MACRO DEFINES
705 ***************************************************************************** 648 *****************************************************************************
706 */ 649 */
707#define dLocal(type,name) type const name = this->name 650#define dLocal(type,name) type const name = this->name
708 651
709// for speed reasons, we assume that all latin1 characters 652// for speed reasons, we assume that all codepoints 32 to 126 are
710// are single-width (the first unicode combining character 653// single-width.
711// is actually 0x300, but ascii is what matters most). 654#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
712#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
713 655
714/* convert pixel dimensions to row/column values. Everything as int32_t */ 656/* convert pixel dimensions to row/column values. Everything as int32_t */
715#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 657#define Pixel2Col(x) Pixel2Width((int32_t)(x))
716#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 658#define Pixel2Row(y) Pixel2Height((int32_t)(y))
717#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 659#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
719#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 661#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
720#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 662#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
721#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 663#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
722#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 664#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
723 665
724#define OPTION(opt) (options & (opt))
725#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
726 | Opt_jumpScroll | Opt_secondaryScreen \
727 | Opt_pastableTabs | Opt_intensityStyles)
728
729// for m >= -n, ensure remainder lies between 0..n-1 666// for m >= -n, ensure remainder lies between 0..n-1
730#define MOD(m,n) (((m) + (n)) % (n)) 667#define MOD(m,n) (((m) + (n)) % (n))
731 668
732#define LINENO(n) MOD (term_start + int(n), total_rows) 669#define LINENO(n) MOD (term_start + int(n), total_rows)
733#define ROW(n) row_buf [LINENO (n)] 670#define ROW(n) row_buf [LINENO (n)]
… …
751#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 688#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
752#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 689#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
753 690
754#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 691#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
755 692
756#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 693#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
757#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 694#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
758 695
759#if ENABLE_STYLES 696#if ENABLE_STYLES
760# define FONTSET(style) fontset[GET_STYLE (style)] 697# define FONTSET(style) fontset[GET_STYLE (style)]
761#else 698#else
762# define FONTSET(style) fontset[0] 699# define FONTSET(style) fontset[0]
… …
790#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 727#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
791#define scrollbar_position(y) ((y) - scrollBar.beg) 728#define scrollbar_position(y) ((y) - scrollBar.beg)
792#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 729#define scrollbar_size() (scrollBar.end - scrollBar.beg \
793 - scrollbar_minheight ()) 730 - scrollbar_minheight ())
794 731
795#ifdef XPM_BACKGROUND
796# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
797#else
798# define XPMClearArea(a, b, c, d, e, f, g)
799#endif
800
801typedef callback1<void, const char *> log_callback; 732typedef callback<void (const char *)> log_callback;
802typedef callback1<int, int> getfd_callback; 733typedef callback<int (int)> getfd_callback;
803 734
804#define SET_LOCALE(locale) rxvt_set_locale (locale) 735#define SET_LOCALE(locale) rxvt_set_locale (locale)
805extern bool rxvt_set_locale (const char *locale) NOTHROW; 736extern bool rxvt_set_locale (const char *locale) NOTHROW;
806extern void rxvt_push_locale (const char *locale) NOTHROW; 737extern void rxvt_push_locale (const char *locale) NOTHROW;
807extern void rxvt_pop_locale () NOTHROW; 738extern void rxvt_pop_locale () NOTHROW;
… …
809/****************************************************************************/ 740/****************************************************************************/
810 741
811#define LINE_LONGER 0x0001 // line is continued on the next row 742#define LINE_LONGER 0x0001 // line is continued on the next row
812#define LINE_FILTERED 0x0002 // line has been filtered 743#define LINE_FILTERED 0x0002 // line has been filtered
813#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 744#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
745#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
746#define LINE_BIDI 0x0010 // line needs bidi (NYI)
814 747
815struct line_t { 748struct line_t {
816 text_t *t; // terminal the text 749 text_t *t; // terminal the text
817 rend_t *r; // rendition, uses RS_ flags 750 rend_t *r; // rendition, uses RS_ flags
818 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 751 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
853 } 786 }
854}; 787};
855 788
856/****************************************************************************/ 789/****************************************************************************/
857 790
858// primivite wrapper around mbstate_t to ensure initialisation 791// primitive wrapper around mbstate_t to ensure initialisation
859struct mbstate { 792struct mbstate {
860 mbstate_t mbs; 793 mbstate_t mbs;
861 794
862 operator mbstate_t *() { return &mbs; } 795 operator mbstate_t *() { return &mbs; }
863 void reset () { memset (&mbs, 0, sizeof (mbs)); } 796 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
872# define COMPOSE_LO 0x40000000UL 805# define COMPOSE_LO 0x40000000UL
873# define COMPOSE_HI 0x400fffffUL 806# define COMPOSE_HI 0x400fffffUL
874# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 807# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
875#else 808#else
876# if ENABLE_PERL 809# if ENABLE_PERL
877# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 810# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
878# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 811# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
879# else 812# else
880# define COMPOSE_LO 0xd800UL 813# define COMPOSE_LO 0xd800UL
881# define COMPOSE_HI 0xf8ffUL 814# define COMPOSE_HI 0xf8ffUL
882# endif 815# endif
… …
911#endif 844#endif
912 845
913/****************************************************************************/ 846/****************************************************************************/
914 847
915#ifdef KEYSYM_RESOURCE 848#ifdef KEYSYM_RESOURCE
916 class keyboard_manager; 849class keyboard_manager;
917#endif 850#endif
918 851
919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 852struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
853
854 // special markers with magic addresses
855 static const char resval_undef []; // options specifically unset
856 static const char resval_on []; // boolean options switched on
857 static const char resval_off []; // or off
858
920 log_callback *log_hook; // log error messages through this hook, if != 0 859 log_callback *log_hook; // log error messages through this hook, if != 0
921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 860 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
922#if ENABLE_PERL 861#if ENABLE_PERL
923 rxvt_perl_term perl; 862 rxvt_perl_term perl;
924#endif 863#endif
925 struct mbstate mbstate; // current input multibyte state 864 struct mbstate mbstate; // current input multibyte state
926 865
927 unsigned char want_refresh:1, 866 unsigned char want_refresh:1,
928#ifdef TRANSPARENT
929 want_full_refresh:1, /* awaiting full screen refresh */
930#endif
931#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
932 am_transparent:1, /* is a transparent term */
933 am_pixmap_trans:1, /* transparency w/known root pixmap */
934#endif
935 current_screen:1, /* primary or secondary */ 867 current_screen:1, /* primary or secondary */
936 num_scr_allow:1, 868 num_scr_allow:1,
937 bypass_keystate:1, 869 bypass_keystate:1,
938#ifdef CURSOR_BLINK 870#ifdef CURSOR_BLINK
939 hidden_cursor:1, 871 hidden_cursor:1,
… …
965 int prev_ncol, /* screen: previous number of columns */ 897 int prev_ncol, /* screen: previous number of columns */
966 prev_nrow; /* screen: previous number of rows */ 898 prev_nrow; /* screen: previous number of rows */
967/* ---------- */ 899/* ---------- */
968 rend_t rstyle; 900 rend_t rstyle;
969/* ---------- */ 901/* ---------- */
970 uint32_t pixcolor_set[NPIXCLR_SETS];
971/* ---------- */
972#ifdef SELECTION_SCROLLING 902#ifdef SELECTION_SCROLLING
973 int scroll_selection_lines; 903 int scroll_selection_lines;
974 enum page_dirn scroll_selection_dir; 904 enum page_dirn scroll_selection_dir;
975 int selection_save_x, 905 int selection_save_x,
976 selection_save_y, 906 selection_save_y,
… …
981 /* give proper Scroll behaviour */ 911 /* give proper Scroll behaviour */
982#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 912#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
983 mouse_slip_wheel_speed, 913 mouse_slip_wheel_speed,
984#endif 914#endif
985 refresh_count, 915 refresh_count,
986 refresh_limit,
987 last_bot, /* scrollbar last bottom position */ 916 last_bot, /* scrollbar last bottom position */
988 last_top, /* scrollbar last top position */ 917 last_top, /* scrollbar last top position */
989 last_state, /* scrollbar last state */ 918 last_state, /* scrollbar last state */
990 scrollbar_len, 919 scrollbar_len,
991 window_vt_x, 920 window_vt_x,
992 window_vt_y, 921 window_vt_y,
993 window_sb_x, 922 window_sb_x,
923 mouse_row,
924 mouse_col,
994# ifdef POINTER_BLANK 925# ifdef POINTER_BLANK
995 pointerBlankDelay, 926 pointerBlankDelay,
996# endif 927# endif
997 allowedxerror; 928 allowedxerror;
998/* ---------- */ 929/* ---------- */
… …
1037 char * incr_buf; 968 char * incr_buf;
1038 size_t incr_buf_size, incr_buf_fill; 969 size_t incr_buf_size, incr_buf_fill;
1039/* ---------- */ 970/* ---------- */
1040 Cursor leftptr_cursor; 971 Cursor leftptr_cursor;
1041/* ---------- */ 972/* ---------- */
1042#ifndef NO_BACKSPACE_KEY
1043 const char *key_backspace;
1044#endif
1045#ifndef NO_DELETE_KEY
1046 const char *key_delete;
1047#endif
1048 struct mouse_event MEvent; 973 struct mouse_event MEvent;
1049 XComposeStatus compose; 974 XComposeStatus compose;
1050 ttymode_t tio; 975 ttymode_t tio;
1051 row_col_t oldcursor; 976 row_col_t oldcursor;
1052#ifdef XPM_BACKGROUND 977#ifdef HAVE_BG_PIXMAP
1053 bgPixmap_t bgPixmap; 978 bgPixmap_t bgPixmap;
1054 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 979#endif
980#ifdef HAVE_AFTERIMAGE
981 ASVisual *asv;
982 ASImageManager *asimman;
1055#endif 983#endif
1056 984
1057#if ENABLE_OVERLAY 985#if ENABLE_OVERLAY
1058 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 986 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1059 text_t **ov_text; 987 text_t **ov_text;
… …
1107 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1035 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1108 void iso14755_54 (int x, int y); 1036 void iso14755_54 (int x, int y);
1109# endif 1037# endif
1110#endif 1038#endif
1111 1039
1112 // modifies first argument(!)
1113 void paste (char *data, unsigned int len) NOTHROW;
1114
1115 long vt_emask, vt_emask_perl, vt_emask_xim; 1040 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1116 1041
1117 void vt_select_input () const NOTHROW 1042 void vt_select_input () const NOTHROW
1118 { 1043 {
1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1044 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1120 } 1045 }
1121 1046
1122#if TRANSPARENT 1047#if ENABLE_TRANSPARENCY || ENABLE_PERL
1123 void rootwin_cb (XEvent &xev); 1048 void rootwin_cb (XEvent &xev);
1124 xevent_watcher rootwin_ev; 1049 xevent_watcher rootwin_ev;
1125#endif 1050#endif
1051#ifdef HAVE_BG_PIXMAP
1052 int update_background ();
1053 void update_background_cb (time_watcher &w);
1054 time_watcher update_background_ev;
1055#endif
1126 1056
1127 void x_cb (XEvent &xev); 1057 void x_cb (XEvent &xev);
1128 void flush ();
1129 xevent_watcher termwin_ev; 1058 xevent_watcher termwin_ev;
1130 xevent_watcher vt_ev; 1059 xevent_watcher vt_ev;
1131#ifdef HAVE_SCROLLBARS 1060#ifdef HAVE_SCROLLBARS
1132 xevent_watcher scrollbar_ev; 1061 xevent_watcher scrollbar_ev;
1133#endif 1062#endif
1134 1063
1135 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1064 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1136 void check_cb (check_watcher &w); check_watcher check_ev; 1065 void check_cb (check_watcher &w); check_watcher check_ev;
1137 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1066 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1067 void flush ();
1138 void flush_cb (time_watcher &w); time_watcher flush_ev; 1068 void flush_cb (time_watcher &w); time_watcher flush_ev;
1069 bool pty_fill ();
1139 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1070 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1140 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1071 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1141 1072
1142#ifdef CURSOR_BLINK 1073#ifdef CURSOR_BLINK
1143 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1074 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1144#endif 1075#endif
1145#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1146 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1077 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1147#endif 1078#endif
1148#ifndef NO_BELL 1079#ifndef NO_BELL
1149 void bell_cb (time_watcher &w); time_watcher bell_ev; 1080 void bell_cb (time_watcher &w); time_watcher bell_ev;
1150#endif 1081#endif
1151 1082
1152#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1153 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1084 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
… …
1166 void pointer_unblank (); 1097 void pointer_unblank ();
1167 1098
1168 void tt_printf (const char *fmt,...); 1099 void tt_printf (const char *fmt,...);
1169 void tt_write (const char *data, unsigned int len); 1100 void tt_write (const char *data, unsigned int len);
1170 void pty_write (); 1101 void pty_write ();
1171
1172 void tt_winch ();
1173
1174 rxvt_term ();
1175 ~rxvt_term ();
1176 void destroy ();
1177 void emergency_cleanup ();
1178
1179 bool init (int argc, const char *const *argv, stringvec *envv);
1180 1102
1181 bool init (stringvec *argv, stringvec *envv) 1103 bool init (stringvec *argv, stringvec *envv)
1182 { 1104 {
1183 this->argv = argv; 1105 this->argv = argv;
1184 return init (argv->size (), argv->begin (), envv); 1106 return init (argv->size (), argv->begin (), envv);
1185 } 1107 }
1186
1187 bool init_vars ();
1188
1189 bool pty_fill ();
1190 1108
1191 void make_current () const // make this the "currently active" urxvt instance 1109 void make_current () const // make this the "currently active" urxvt instance
1192 { 1110 {
1193 SET_R (this); 1111 SET_R (this);
1112 set_environ (envv);
1194 rxvt_set_locale (locale); 1113 rxvt_set_locale (locale);
1195 set_environ (envv);
1196 } 1114 }
1197
1198 void init_secondary ();
1199 const char **init_resources (int argc, const char *const *argv);
1200 const char *x_resource (const char *name);
1201 void init_env ();
1202 void set_locale (const char *locale);
1203 void init_xlocale ();
1204 void init_command (const char *const *argv);
1205 void run_command (const char *const *argv);
1206 int run_child (const char *const *argv);
1207
1208 void color_aliases (int idx);
1209 void recolour_cursor ();
1210 void create_windows (int argc, const char *const *argv);
1211 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1212 void window_calc (unsigned int newwidth, unsigned int newheight);
1213 1115
1214#if USE_XIM 1116#if USE_XIM
1215 rxvt_xim *input_method; 1117 rxvt_xim *input_method;
1216 XIC Input_Context; 1118 XIC Input_Context;
1217 XIMStyle input_style; 1119 XIMStyle input_style;
… …
1225 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1127 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1226 1128
1227 bool IMisRunning (); 1129 bool IMisRunning ();
1228 void IMSendSpot (); 1130 void IMSendSpot ();
1229 bool IM_get_IC (const char *modifiers); 1131 bool IM_get_IC (const char *modifiers);
1230 void IMSetStatusPosition (); 1132 void IMSetPosition ();
1231#endif 1133#endif
1232
1233 void resize_scrollbar ();
1234 1134
1235 // command.C 1135 // command.C
1236 void lookup_key (XKeyEvent &ev); 1136 void key_press (XKeyEvent &ev);
1137 void key_release (XKeyEvent &ev);
1237 unsigned int cmd_write (const char *str, unsigned int count); 1138 unsigned int cmd_write (const char *str, unsigned int count);
1238 1139
1239 wchar_t next_char () NOTHROW; 1140 wchar_t next_char () NOTHROW;
1240 wchar_t cmd_getc () THROW ((class out_of_input)); 1141 wchar_t cmd_getc () THROW ((class out_of_input));
1241 uint32_t next_octet () NOTHROW; 1142 uint32_t next_octet () NOTHROW;
… …
1245 void mouse_report (XButtonEvent &ev); 1146 void mouse_report (XButtonEvent &ev);
1246 void button_press (XButtonEvent &ev); 1147 void button_press (XButtonEvent &ev);
1247 void button_release (XButtonEvent &ev); 1148 void button_release (XButtonEvent &ev);
1248 void focus_in (); 1149 void focus_in ();
1249 void focus_out (); 1150 void focus_out ();
1250 int check_our_parents (); 1151 void update_fade_color (unsigned int idx);
1251#ifdef PRINTPIPE 1152#ifdef PRINTPIPE
1252 FILE *popen_printer (); 1153 FILE *popen_printer ();
1253 int pclose_printer (FILE *stream); 1154 int pclose_printer (FILE *stream);
1254#endif 1155#endif
1255 void process_print_pipe (); 1156 void process_print_pipe ();
… …
1266 int privcases (int mode, unsigned long bit); 1167 int privcases (int mode, unsigned long bit);
1267 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1168 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1268 void process_sgr_mode (unsigned int nargs, const int *arg); 1169 void process_sgr_mode (unsigned int nargs, const int *arg);
1269 void process_graphics (); 1170 void process_graphics ();
1270 // init.C 1171 // init.C
1172 bool init_vars ();
1173 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv);
1175 void init_env ();
1176 void set_locale (const char *locale);
1177 void init_xlocale ();
1178 void init_command (const char *const *argv);
1179 void run_command (const char *const *argv);
1180 int run_child (const char *const *argv);
1181 void color_aliases (int idx);
1182 void create_windows (int argc, const char *const *argv);
1271 void Get_Colours (); 1183 void Get_Colours ();
1272 void get_ourmods (); 1184 void get_ourmods ();
1273 // main.C 1185 // main.C
1186 void tt_winch ();
1187 rxvt_term ();
1188 ~rxvt_term ();
1189 void destroy ();
1190 void emergency_cleanup ();
1191 bool init (int argc, const char *const *argv, stringvec *envv);
1192 void recolour_cursor ();
1193 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1194 void window_calc (unsigned int newwidth, unsigned int newheight);
1274 bool set_fonts (); 1195 bool set_fonts ();
1275 void set_string_property (Atom prop, const char *str, int len = -1); 1196 void set_string_property (Atom prop, const char *str, int len = -1);
1276 void set_utf8_property (Atom prop, const char *str, int len = -1); 1197 void set_utf8_property (Atom prop, const char *str, int len = -1);
1277 void set_title (const char *str); 1198 void set_title (const char *str);
1278 void set_icon_name (const char *str); 1199 void set_icon_name (const char *str);
1279 void set_window_color (int idx, const char *color); 1200 void set_window_color (int idx, const char *color);
1280 void set_colorfgbg (); 1201 void set_colorfgbg ();
1281 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1202 bool set_color (rxvt_color &color, const char *name);
1203 void alias_color (int dst, int src);
1282 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1204 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1205 void get_window_origin (int &x, int &y);
1206 Pixmap get_pixmap_property (int prop_id);
1283 1207
1284 // screen.C 1208 // screen.C
1285 1209
1286 void lalloc (line_t &l) const 1210 void lalloc (line_t &l) const
1287 { 1211 {
… …
1315 { 1239 {
1316 int base = GET_BASEFG (r); 1240 int base = GET_BASEFG (r);
1317#ifndef NO_BRIGHTCOLOR 1241#ifndef NO_BRIGHTCOLOR
1318 if (r & RS_Bold 1242 if (r & RS_Bold
1319# if ENABLE_STYLES 1243# if ENABLE_STYLES
1320 && OPTION (Opt_intensityStyles) 1244 && option (Opt_intensityStyles)
1321# endif 1245# endif
1322 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1246 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1323 base += minBrightCOLOR - minCOLOR; 1247 base += minBrightCOLOR - minCOLOR;
1324#endif 1248#endif
1325 return base; 1249 return base;
… …
1329 { 1253 {
1330 int base = GET_BASEBG (r); 1254 int base = GET_BASEBG (r);
1331#ifndef NO_BRIGHTCOLOR 1255#ifndef NO_BRIGHTCOLOR
1332 if (r & RS_Blink 1256 if (r & RS_Blink
1333# if ENABLE_STYLES 1257# if ENABLE_STYLES
1334 && OPTION (Opt_intensityStyles) 1258 && option (Opt_intensityStyles)
1335# endif 1259# endif
1336 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1260 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1337 base += minBrightCOLOR - minCOLOR; 1261 base += minBrightCOLOR - minCOLOR;
1338#endif 1262#endif
1339 return base; 1263 return base;
1340 } 1264 }
1341 1265
1342 bool option (uint32_t opt) const NOTHROW 1266 bool option (uint8_t opt) const NOTHROW
1343 { 1267 {
1344 return OPTION (opt); 1268 return options[opt >> 3] & (1 << (opt & 7));
1345 } 1269 }
1346 1270
1347 void set_option (uint32_t opt, bool set) NOTHROW 1271 void set_option (uint8_t opt, bool set = true) NOTHROW
1348 { 1272 {
1349 if (set) 1273 if (set)
1350 options |= opt; 1274 options[opt >> 3] |= (1 << (opt & 7));
1351 else 1275 else
1352 options &= ~opt; 1276 options[opt >> 3] &= ~(1 << (opt & 7));
1353 } 1277 }
1354 1278
1279 void PrivMode (int set, unsigned bit) NOTHROW
1280 {
1281 if (set)
1282 priv_modes |= bit;
1283 else
1284 priv_modes &= ~bit;
1285 }
1286
1287 // modifies first argument(!)
1288 void paste (char *data, unsigned int len) NOTHROW;
1355 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1289 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1356 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1290 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1357 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1291 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1358 void scr_reset (); 1292 void scr_reset ();
1359 void scr_release () NOTHROW; 1293 void scr_release () NOTHROW;
… …
1366 void scr_backindex () NOTHROW; 1300 void scr_backindex () NOTHROW;
1367 void scr_forwardindex () NOTHROW; 1301 void scr_forwardindex () NOTHROW;
1368#endif 1302#endif
1369 void scr_touch (bool refresh) NOTHROW; 1303 void scr_touch (bool refresh) NOTHROW;
1370 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1304 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1371 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1372 void scr_recolour () NOTHROW; 1305 void scr_recolour () NOTHROW;
1373 void scr_remap_chars () NOTHROW; 1306 void scr_remap_chars () NOTHROW;
1374 void scr_remap_chars (line_t &l) NOTHROW; 1307 void scr_remap_chars (line_t &l) NOTHROW;
1375 1308
1376 enum cursor_mode { SAVE, RESTORE }; 1309 enum cursor_mode { SAVE, RESTORE };
… …
1427 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1360 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1428 void selection_click (int clicks, int x, int y) NOTHROW; 1361 void selection_click (int clicks, int x, int y) NOTHROW;
1429 void selection_extend (int x, int y, int flag) NOTHROW; 1362 void selection_extend (int x, int y, int flag) NOTHROW;
1430 void selection_rotate (int x, int y) NOTHROW; 1363 void selection_rotate (int x, int y) NOTHROW;
1431 1364
1432 void pixel_position (int *x, int *y) NOTHROW;
1433
1434#if defined(NEXT_SCROLLBAR) 1365#if defined(NEXT_SCROLLBAR)
1435 // scrollbar-next.C 1366 // scrollbar-next.C
1436 Pixmap renderPixmap (const char *const *data, int width, int height); 1367 Pixmap renderPixmap (const char *const *data, int width, int height);
1437 void init_scrollbar_stuff (); 1368 void init_scrollbar_stuff ();
1438 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1369 void drawBevel (Drawable d, int x1, int y1, int w, int h);
… …
1453 // scrollbar-plain.C 1384 // scrollbar-plain.C
1454 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); 1385 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1455#endif 1386#endif
1456 1387
1457 // scrollbar.C 1388 // scrollbar.C
1389 void resize_scrollbar ();
1458 int scrollbar_mapping (int map); 1390 int scrollbar_mapping (int map);
1459 int scrollbar_show (int update); 1391 int scrollbar_show (int update);
1460 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); 1392 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1461 1393
1462 // xdefaults.C 1394 // xdefaults.C
1463 void get_options (int argc, const char *const *argv); 1395 void get_options (int argc, const char *const *argv);
1464 int parse_keysym (const char *str, const char *arg); 1396 int parse_keysym (const char *str, const char *arg);
1465 void get_xdefaults (FILE *stream, const char *name); 1397 const char *x_resource (const char *name);
1466 void extract_resources (); 1398 void extract_resources ();
1467 // xpm.C
1468 int scale_pixmap (const char *geom);
1469 void resize_pixmap ();
1470 Pixmap set_bgPixmap (const char *file);
1471}; 1399};
1472 1400
1473/*
1474 *****************************************************************************
1475 * PROTOTYPES
1476 *****************************************************************************
1477 */
1478#ifdef PROTOTYPES
1479# define __PROTO(p) p
1480#else
1481# define __PROTO(p) ()
1482#endif
1483
1484#endif /* _RXVT_H_ */ 1401#endif /* _RXVT_H_ */
1485 1402

Diff Legend

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