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.221 by root, Tue Jan 17 16:50:42 2006 UTC vs.
Revision 1.263 by root, Thu Nov 2 17:23:50 2006 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 CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
43#include "libptytty.h"
40 44
41#include "rxvtperl.h" 45#include "rxvtperl.h"
42 46
43// try to avoid some macros to decrease code size, on some systems 47// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 48#if ENABLE_MINIMAL
… …
94# define STDIN_FILENO 0 98# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 99# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 100# define STDERR_FILENO 2
97#endif 101#endif
98 102
99enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };//TODO 103/****************************************************************************/
104
105// exception thrown on fatal (per-instance) errors
106class rxvt_failure_exception { };
107
108// exception thrown when the command parser runs out of input data
109class out_of_input { };
100 110
101/* 111/*
102 ***************************************************************************** 112 *****************************************************************************
103 * PROTOTYPES 113 * PROTOTYPES
104 ***************************************************************************** 114 *****************************************************************************
105 */ 115 */
106// main.C 116// main.C
107RETSIGTYPE rxvt_Child_signal (int sig); 117RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
108RETSIGTYPE rxvt_Exit_signal (int sig); 118RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
109void rxvt_clean_exit (); 119void rxvt_clean_exit () NOTHROW;
110void * rxvt_malloc (size_t size); 120void * rxvt_malloc (size_t size);
111void * rxvt_calloc (size_t number, size_t size); 121void * rxvt_calloc (size_t number, size_t size);
112void * rxvt_realloc (void *ptr, size_t size); 122void * rxvt_realloc (void *ptr, size_t size);
113void rxvt_privileges (rxvt_privaction action);
114 123
115// util.C 124// misc.C
116char * rxvt_wcstombs (const wchar_t *str, int len = -1); 125char * rxvt_wcstombs (const wchar_t *str, int len = -1);
117wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 126wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
118char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 127char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
119wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 128wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
120char * rxvt_strdup (const char *str); 129char * rxvt_strdup_cpp (const char *str);
121 130
122// misc.C 131#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
132
123char * rxvt_r_basename (const char *str); 133char * rxvt_r_basename (const char *str) NOTHROW;
124void rxvt_vlog (const char *fmt, va_list arg_ptr); 134void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
125void rxvt_log (const char *fmt,...); 135void rxvt_log (const char *fmt,...) NOTHROW;
126void rxvt_warn (const char *fmt,...); 136void rxvt_warn (const char *fmt,...) NOTHROW;
127void rxvt_fatal (const char *fmt,...); 137void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
128void rxvt_exit_failure (); 138void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
139
129int rxvt_Str_match (const char *s1, const char *s2); 140int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
130const char * rxvt_Str_skip_space (const char *str); 141const char * rxvt_Str_skip_space (const char *str) NOTHROW;
131char * rxvt_Str_trim (char *str); 142char * rxvt_Str_trim (char *str) NOTHROW;
132int rxvt_Str_escaped (char *str); 143int rxvt_Str_escaped (char *str) NOTHROW;
133char ** rxvt_splitcommastring (const char *cs); 144char ** rxvt_splitcommastring (const char *cs) NOTHROW;
134void rxvt_freecommastring (char **cs); 145void rxvt_freecommastring (char **cs) NOTHROW;
135char * rxvt_File_find (const char *file, const char *ext, const char *path); 146char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
136void rxvt_usleep (int usecs);
137 147
138///////////////////////////////////////////////////////////////////////////// 148/////////////////////////////////////////////////////////////////////////////
139 149
140// temporarily replace the process environment 150// temporarily replace the process environment
141extern char **environ; 151extern char **environ;
142extern char **rxvt_environ; // the original environ pointer 152extern char **rxvt_environ; // the original environ pointer
143 153
144inline void set_environ (stringvec *envv) 154inline void set_environ (stringvec *envv)
145{ 155{
156#if ENABLE_PERL
157 assert (envv);
158#else
146 if (envv) 159 if (envv)
160#endif
147 environ = (char **)envv->begin (); 161 environ = (char **)envv->begin ();
148} 162}
149 163
150inline void set_environ (char **envv) 164inline void set_environ (char **envv)
151{ 165{
166#if ENABLE_PERL
167 assert (envv);
168#else
152 if (envv) 169 if (envv)
170#endif
153 environ = envv; 171 environ = envv;
154} 172}
155 173
156/* 174/*
157 ***************************************************************************** 175 *****************************************************************************
… …
173typedef struct { 191typedef struct {
174 short w, h, x, y; 192 short w, h, x, y;
175 Pixmap pixmap; 193 Pixmap pixmap;
176} bgPixmap_t; 194} bgPixmap_t;
177#endif 195#endif
178
179struct rxvt_ptytty {
180 int pty; // pty file descriptor; connected to rxvt
181 int tty; // tty file descriptor; connected to child
182
183 virtual ~rxvt_ptytty ()
184 {
185 //
186 }
187
188 virtual bool get () = 0;
189#if UTMP_SUPPORT
190 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
191#endif
192
193 void close_tty ();
194 bool make_controlling_tty ();
195 void set_utf8_mode (bool on);
196};
197
198rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
199void rxvt_ptytty_server (); // start the ptytty server process
200 196
201/* 197/*
202 * the 'essential' information for reporting Mouse Events 198 * the 'essential' information for reporting Mouse Events
203 * pared down from XButtonEvent 199 * pared down from XButtonEvent
204 */ 200 */
… …
417// fake styles 413// fake styles
418#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
419#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
420#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
421 417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
420
422// 5 custom bits for extensions 421// 5 custom bits for extensions
423#define RS_customCount 32 422#define RS_customCount 32
424#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
425#define RS_customShift 19 424#define RS_customShift 19
426 425
… …
495 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
496 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
497 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
498 497
499 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
500 500
501 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
502 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
503 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
504 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
520 * on the unnecessary items, e.g. Color_pointer, but won't bother 520 * on the unnecessary items, e.g. Color_pointer, but won't bother
521 * until we need to. Also, be aware of usage in pixcolor_set 521 * until we need to. Also, be aware of usage in pixcolor_set
522 */ 522 */
523 523
524enum colour_list { 524enum colour_list {
525 Color_none = -2,
526 Color_transparent = -1,
525 Color_fg = 0, 527 Color_fg = 0,
526 Color_bg, 528 Color_bg,
527 minCOLOR, /* 2 */ 529 minCOLOR, /* 2 */
528 Color_Black = minCOLOR, 530 Color_Black = minCOLOR,
529 Color_Red3, 531 Color_Red3,
… …
589#endif 591#endif
590}; 592};
591 593
592#define Color_Bits 7 // 0 .. maxTermCOLOR 594#define Color_Bits 7 // 0 .. maxTermCOLOR
593 595
594#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
595#define NPIXCLR_BITS 32
596
597/* 596/*
598 * Resource list 597 * Resource list
599 */ 598 */
600enum { 599enum {
601# define def(name) Rs_ ## name, 600# define def(name) Rs_ ## name,
602# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 601# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
603# include "rsinc.h" 602# include "rsinc.h"
604# undef def 603# undef def
605# undef reserve 604# undef reserve
606 NUM_RESOURCES 605 NUM_RESOURCES
607};
608
609// see init.C:xa_names, which must be kept in sync
610enum {
611 XA_TEXT = 0,
612 XA_COMPOUND_TEXT,
613 XA_UTF8_STRING,
614 XA_MULTIPLE,
615 XA_TARGETS,
616 XA_TIMESTAMP,
617 XA_VT_SELECTION,
618 XA_INCR,
619 XA_WM_PROTOCOLS,
620 XA_WM_DELETE_WINDOW,
621 XA_CLIPBOARD,
622#if ENABLE_FRILLS
623 XA_MOTIF_WM_HINTS,
624#endif
625#if ENABLE_EWMH
626 XA_NET_WM_PID,
627 XA_NET_WM_NAME,
628 XA_NET_WM_ICON_NAME,
629 XA_NET_WM_PING,
630#endif
631#if USE_XIM
632 XA_WM_LOCALE_NAME,
633#endif
634#if TRANSPARENT
635 XA_XROOTPMAP_ID,
636 XA_ESETROOT_PMAP_ID,
637#endif
638#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
639 XA_DNDPROTOCOL,
640 XA_DNDSELECTION,
641#endif
642#if ENABLE_XEMBED
643 XA_XEMBED,
644 XA_XEMBED_INFO,
645#endif
646 NUM_XA
647}; 606};
648 607
649/* DEC private modes */ 608/* DEC private modes */
650#define PrivMode_132 (1UL<<0) 609#define PrivMode_132 (1UL<<0)
651#define PrivMode_132OK (1UL<<1) 610#define PrivMode_132OK (1UL<<1)
… …
724 ***************************************************************************** 683 *****************************************************************************
725 * MACRO DEFINES 684 * MACRO DEFINES
726 ***************************************************************************** 685 *****************************************************************************
727 */ 686 */
728#define dLocal(type,name) type const name = this->name 687#define dLocal(type,name) type const name = this->name
729#define dDisp Display *disp = this->display->display 688
689// for speed reasons, we assume that all latin1 characters
690// are single-width (the first unicode combining character
691// is actually 0x300, but ascii is what matters most).
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
730 693
731/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
732#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
733#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
734#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
768#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
769#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
770 733
771#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
772 735
773#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 736#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
774#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 737#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
775 738
776#if ENABLE_STYLES 739#if ENABLE_STYLES
777# define FONTSET(style) fontset[GET_STYLE (style)] 740# define FONTSET(style) fontset[GET_STYLE (style)]
778#else 741#else
779# define FONTSET(style) fontset[0] 742# define FONTSET(style) fontset[0]
… …
813# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
814#else 777#else
815# define XPMClearArea(a, b, c, d, e, f, g) 778# define XPMClearArea(a, b, c, d, e, f, g)
816#endif 779#endif
817 780
818#ifdef DEBUG_CMD
819# define D_CMD(x) fprintf x ; fputc('\n', stderr)
820#else
821# define D_CMD(x)
822#endif
823#ifdef DEBUG_INIT
824# define D_INIT(x) fprintf x ; fputc('\n', stderr)
825#else
826# define D_INIT(x)
827#endif
828#ifdef DEBUG_MAIN
829# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
830#else
831# define D_MAIN(x)
832#endif
833#ifdef DEBUG_SIZE
834# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
835#else
836# define D_SIZE(x)
837#endif
838
839extern class rxvt_failure_exception { } rxvt_failure_exception;
840
841typedef callback1<void, const char *> log_callback; 781typedef callback<void (const char *)> log_callback;
842typedef callback1<int, int> getfd_callback; 782typedef callback<int (int)> getfd_callback;
843
844extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
845extern void rxvt_log (const char *fmt, ...);
846extern void rxvt_warn (const char *fmt, ...);
847extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
848extern void rxvt_exit_failure () __attribute__ ((noreturn));
849 783
850#define SET_LOCALE(locale) rxvt_set_locale (locale) 784#define SET_LOCALE(locale) rxvt_set_locale (locale)
851extern bool rxvt_set_locale (const char *locale); 785extern bool rxvt_set_locale (const char *locale) NOTHROW;
852extern void rxvt_push_locale (const char *locale); 786extern void rxvt_push_locale (const char *locale) NOTHROW;
853extern void rxvt_pop_locale (); 787extern void rxvt_pop_locale () NOTHROW;
854
855/****************************************************************************/
856
857#define BLINK_INTERVAL 0.5
858#define TEXT_BLINK_INTERVAL 0.5
859
860#ifndef __attribute__
861# ifdef __GNUC__
862# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
863# define __attribute__(x)
864# endif
865# endif
866# define __attribute__(x)
867#endif
868 788
869/****************************************************************************/ 789/****************************************************************************/
870 790
871#define LINE_LONGER 0x0001 // line is continued on the next row 791#define LINE_LONGER 0x0001 // line is continued on the next row
872#define LINE_FILTERED 0x0002 // line has been filtered 792#define LINE_FILTERED 0x0002 // line has been filtered
873#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
794#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
795#define LINE_BIDI 0x0010 // line needs bidi (NYI)
874 796
875struct line_t { 797struct line_t {
876 text_t *t; // terminal the text 798 text_t *t; // terminal the text
877 rend_t *r; // rendition, uses RS_ flags 799 rend_t *r; // rendition, uses RS_ flags
878 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 800 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
932# define COMPOSE_LO 0x40000000UL 854# define COMPOSE_LO 0x40000000UL
933# define COMPOSE_HI 0x400fffffUL 855# define COMPOSE_HI 0x400fffffUL
934# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 856# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
935#else 857#else
936# if ENABLE_PERL 858# if ENABLE_PERL
937# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 859# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
938# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 860# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
939# else 861# else
940# define COMPOSE_LO 0xd800UL 862# define COMPOSE_LO 0xd800UL
941# define COMPOSE_HI 0xf8ffUL 863# define COMPOSE_HI 0xf8ffUL
942# endif 864# endif
… …
971#endif 893#endif
972 894
973/****************************************************************************/ 895/****************************************************************************/
974 896
975#ifdef KEYSYM_RESOURCE 897#ifdef KEYSYM_RESOURCE
976 class keyboard_manager; 898class keyboard_manager;
977#endif 899#endif
978 900
979struct rxvt_term : zero_initialized, rxvt_vars { 901struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
902
903 // special markers with magic addresses
904 static const char resval_undef []; // options specifically unset
905 static const char resval_on []; // boolean options switched on
906 static const char resval_off []; // or off
907
980 log_callback *log_hook; // log error messages through this hook, if != 0 908 log_callback *log_hook; // log error messages through this hook, if != 0
981 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 909 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
982#if ENABLE_PERL 910#if ENABLE_PERL
983 rxvt_perl_term perl; 911 rxvt_perl_term perl;
984#endif 912#endif
985 struct mbstate mbstate; // current input multibyte state 913 struct mbstate mbstate; // current input multibyte state
… …
991#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 919#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
992 am_transparent:1, /* is a transparent term */ 920 am_transparent:1, /* is a transparent term */
993 am_pixmap_trans:1, /* transparency w/known root pixmap */ 921 am_pixmap_trans:1, /* transparency w/known root pixmap */
994#endif 922#endif
995 current_screen:1, /* primary or secondary */ 923 current_screen:1, /* primary or secondary */
996 hate_those_clicks:1, /* a.k.a. keep mark position */
997 num_scr_allow:1, 924 num_scr_allow:1,
998 bypass_keystate:1, 925 bypass_keystate:1,
999#ifdef CURSOR_BLINK 926#ifdef CURSOR_BLINK
1000 hidden_cursor:1, 927 hidden_cursor:1,
1001#endif 928#endif
… …
1016#endif 943#endif
1017 scrollbar_align, 944 scrollbar_align,
1018 selection_wait, 945 selection_wait,
1019 selection_type; 946 selection_type;
1020/* ---------- */ 947/* ---------- */
948 bool rvideo_state, rvideo_mode;
949#ifndef NO_BELL
1021 short rvideo; 950 bool rvideo_bell;
951#endif
1022 int num_scr; /* screen: number lines scrolled */ 952 int num_scr; /* screen: number lines scrolled */
1023 int prev_ncol, /* screen: previous number of columns */ 953 int prev_ncol, /* screen: previous number of columns */
1024 prev_nrow; /* screen: previous number of rows */ 954 prev_nrow; /* screen: previous number of rows */
1025/* ---------- */ 955/* ---------- */
1026 rend_t rstyle; 956 rend_t rstyle;
1027/* ---------- */
1028 uint32_t pixcolor_set[NPIXCLR_SETS];
1029/* ---------- */ 957/* ---------- */
1030#ifdef SELECTION_SCROLLING 958#ifdef SELECTION_SCROLLING
1031 int scroll_selection_lines; 959 int scroll_selection_lines;
1032 enum page_dirn scroll_selection_dir; 960 enum page_dirn scroll_selection_dir;
1033 int selection_save_x, 961 int selection_save_x,
… …
1060 int old_width, /* last used width in screen resize */ 988 int old_width, /* last used width in screen resize */
1061 old_height; /* last used height in screen resize */ 989 old_height; /* last used height in screen resize */
1062 unsigned long priv_modes, 990 unsigned long priv_modes,
1063 SavedModes; 991 SavedModes;
1064/* ---------- */ 992/* ---------- */
1065 Atom xa[NUM_XA]; 993 Atom *xa;
1066/* ---------- */ 994/* ---------- */
1067#ifdef RXVT_SCROLLBAR 995#ifdef RXVT_SCROLLBAR
1068 GC scrollbarGC, 996 GC scrollbarGC,
1069 topShadowGC, 997 topShadowGC,
1070 botShadowGC; 998 botShadowGC;
… …
1115#if ENABLE_OVERLAY 1043#if ENABLE_OVERLAY
1116 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1044 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1117 text_t **ov_text; 1045 text_t **ov_text;
1118 rend_t **ov_rend; 1046 rend_t **ov_rend;
1119 1047
1120 void scr_swap_overlay (); 1048 void scr_swap_overlay () NOTHROW;
1121 void scr_overlay_new (int x, int y, int w, int h); 1049 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1122 void scr_overlay_off (); 1050 void scr_overlay_off () NOTHROW;
1123 void scr_overlay_set (int x, int y, 1051 void scr_overlay_set (int x, int y,
1124 text_t text, 1052 text_t text,
1125 rend_t rend = OVERLAY_RSTYLE); 1053 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1126 void scr_overlay_set (int x, int y, const char *s); 1054 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1127 void scr_overlay_set (int x, int y, const wchar_t *s); 1055 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1128#endif 1056#endif
1129 1057
1130 vector<void *> allocated; // free these memory blocks with free() 1058 vector<void *> allocated; // free these memory blocks with free()
1131 1059
1132 char *env_windowid; /* environmental variable WINDOWID */ 1060 char env_windowid[21]; /* environmental variable WINDOWID */
1061 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1133 char *env_display; /* environmental variable DISPLAY */ 1062 char *env_display; /* environmental variable DISPLAY */
1134 char *env_term; /* environmental variable TERM */ 1063 char *env_term; /* environmental variable TERM */
1135 char *env_colorfgbg; 1064
1136 char *locale; 1065 char *locale;
1137 char charsets[4]; 1066 char charsets[4];
1138 char *v_buffer; /* pointer to physical buffer */ 1067 char *v_buffer; /* pointer to physical buffer */
1139 unsigned int v_buflen; /* size of area to write */ 1068 unsigned int v_buflen; /* size of area to write */
1140 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1069 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1141 1070
1142#ifdef KEYSYM_RESOURCE 1071#ifdef KEYSYM_RESOURCE
1143 keyboard_manager *keyboard; 1072 keyboard_manager *keyboard;
1144#endif 1073#endif
1145 1074
1146 const char *rs[NUM_RESOURCES]; 1075 const char *rs[NUM_RESOURCES];
1147 /* command input buffering */ 1076 /* command input buffering */
1148 char *cmdbuf_ptr, *cmdbuf_endp; 1077 char *cmdbuf_ptr, *cmdbuf_endp;
1149 char cmdbuf_base[CBUFSIZ]; 1078 char cmdbuf_base[CBUFSIZ];
1150 1079
1151 rxvt_ptytty *pty; 1080 ptytty *pty;
1152 1081
1153 rxvt_salloc *talloc; // text line allocator 1082 rxvt_salloc *talloc; // text line allocator
1154 rxvt_salloc *ralloc; // rend line allocator 1083 rxvt_salloc *ralloc; // rend line allocator
1155 1084
1156 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1085 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1165 void iso14755_54 (int x, int y); 1094 void iso14755_54 (int x, int y);
1166# endif 1095# endif
1167#endif 1096#endif
1168 1097
1169 // modifies first argument(!) 1098 // modifies first argument(!)
1170 void paste (char *data, unsigned int len); 1099 void paste (char *data, unsigned int len) NOTHROW;
1171 1100
1172 long vt_emask, vt_emask_perl; 1101 long vt_emask, vt_emask_perl, vt_emask_xim;
1173 1102
1174 void vt_select_input () const 1103 void vt_select_input () const NOTHROW
1175 { 1104 {
1176 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1105 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1177 } 1106 }
1178 1107
1179#if TRANSPARENT 1108#if TRANSPARENT || ENABLE_PERL
1180 void rootwin_cb (XEvent &xev); 1109 void rootwin_cb (XEvent &xev);
1181 xevent_watcher rootwin_ev; 1110 xevent_watcher rootwin_ev;
1182#endif 1111#endif
1183 1112
1184 void x_cb (XEvent &xev); 1113 void x_cb (XEvent &xev);
… …
1187 xevent_watcher vt_ev; 1116 xevent_watcher vt_ev;
1188#ifdef HAVE_SCROLLBARS 1117#ifdef HAVE_SCROLLBARS
1189 xevent_watcher scrollbar_ev; 1118 xevent_watcher scrollbar_ev;
1190#endif 1119#endif
1191 1120
1121 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1192 void check_cb (check_watcher &w); check_watcher check_ev; 1122 void check_cb (check_watcher &w); check_watcher check_ev;
1193 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1123 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1194 void flush_cb (time_watcher &w); time_watcher flush_ev; 1124 void flush_cb (time_watcher &w); time_watcher flush_ev;
1195
1196 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1125 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1197
1198 void incr_cb (time_watcher &w); time_watcher incr_ev; 1126 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1199 1127
1200#ifdef CURSOR_BLINK 1128#ifdef CURSOR_BLINK
1201 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1129 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1202#endif 1130#endif
1203#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1204 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1132 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1133#endif
1134#ifndef NO_BELL
1135 void bell_cb (time_watcher &w); time_watcher bell_ev;
1205#endif 1136#endif
1206 1137
1207#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1138#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1208 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1139 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1209#endif 1140#endif
… …
1226 1157
1227 void tt_winch (); 1158 void tt_winch ();
1228 1159
1229 rxvt_term (); 1160 rxvt_term ();
1230 ~rxvt_term (); 1161 ~rxvt_term ();
1231 void child_exit (); // child has exited, usually destroys
1232 void destroy (); 1162 void destroy ();
1233 void emergency_cleanup (); 1163 void emergency_cleanup ();
1234 1164
1235 bool init (int argc, const char *const *argv); 1165 bool init (int argc, const char *const *argv, stringvec *envv);
1166
1167 bool init (stringvec *argv, stringvec *envv)
1168 {
1169 this->argv = argv;
1170 return init (argv->size (), argv->begin (), envv);
1171 }
1172
1236 bool init_vars (); 1173 bool init_vars ();
1237 1174
1238 bool pty_fill (); 1175 bool pty_fill ();
1239 1176
1240 void make_current () const // make this the "currently active" urxvt instance 1177 void make_current () const // make this the "currently active" urxvt instance
1241 { 1178 {
1242 SET_R (this); 1179 SET_R (this);
1180 set_environ (envv);
1243 rxvt_set_locale (locale); 1181 rxvt_set_locale (locale);
1244 set_environ (envv);
1245 } 1182 }
1246 1183
1247 void init_secondary (); 1184 void init_secondary ();
1248 const char **init_resources (int argc, const char *const *argv); 1185 const char **init_resources (int argc, const char *const *argv);
1249 const char *x_resource (const char *name); 1186 const char *x_resource (const char *name);
… …
1259 void create_windows (int argc, const char *const *argv); 1196 void create_windows (int argc, const char *const *argv);
1260 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1197 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1261 void window_calc (unsigned int newwidth, unsigned int newheight); 1198 void window_calc (unsigned int newwidth, unsigned int newheight);
1262 1199
1263#if USE_XIM 1200#if USE_XIM
1264 rxvt_xim *input_method; 1201 rxvt_xim *input_method;
1265 XIC Input_Context; 1202 XIC Input_Context;
1266 XIMStyle input_style; 1203 XIMStyle input_style;
1267 XPoint spot; // most recently sent spot position 1204 XPoint spot; // most recently sent spot position
1268 1205
1269 void im_destroy (); 1206 void im_destroy ();
1270 void im_cb (); im_watcher im_ev; 1207 void im_cb (); im_watcher im_ev;
1271 void im_set_size (XRectangle &size); 1208 void im_set_size (XRectangle &size);
1272 void im_set_position (XPoint &pos); 1209 void im_set_position (XPoint &pos) NOTHROW;
1273 void im_set_color (unsigned long &fg, unsigned long &bg); 1210 void im_set_color (unsigned long &fg, unsigned long &bg);
1274 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1211 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1275 1212
1276 bool IMisRunning (); 1213 bool IMisRunning ();
1277 void IMSendSpot (); 1214 void IMSendSpot ();
1278 bool IM_get_IC (const char *modifiers); 1215 bool IM_get_IC (const char *modifiers);
1279 void IMSetStatusPosition (); 1216 void IMSetPosition ();
1280#endif 1217#endif
1281 1218
1282 void resize_scrollbar (); 1219 void resize_scrollbar ();
1283 1220
1284 void pixel_position (int *x, int *y);
1285
1286 void selection_click (int clicks, int x, int y);
1287 void selection_extend (int x, int y, int flag);
1288 void selection_rotate (int x, int y);
1289
1290 /* autoconvert */
1291
1292 // command.C 1221 // command.C
1293 void lookup_key (XKeyEvent &ev); 1222 void key_press (XKeyEvent &ev);
1223 void key_release (XKeyEvent &ev);
1294 unsigned int cmd_write (const char *str, unsigned int count); 1224 unsigned int cmd_write (const char *str, unsigned int count);
1295 1225
1296 wchar_t next_char (); 1226 wchar_t next_char () NOTHROW;
1297 wchar_t cmd_getc (); 1227 wchar_t cmd_getc () THROW ((class out_of_input));
1298 uint32_t next_octet (); 1228 uint32_t next_octet () NOTHROW;
1299 uint32_t cmd_get8 (); 1229 uint32_t cmd_get8 () THROW ((class out_of_input));
1300 1230
1301 bool cmd_parse (); 1231 bool cmd_parse ();
1302 void mouse_report (XButtonEvent &ev); 1232 void mouse_report (XButtonEvent &ev);
1303 void button_press (XButtonEvent &ev); 1233 void button_press (XButtonEvent &ev);
1304 void button_release (XButtonEvent &ev); 1234 void button_release (XButtonEvent &ev);
1305 void focus_in (); 1235 void focus_in ();
1306 void focus_out (); 1236 void focus_out ();
1237 void update_fade_color (unsigned int idx);
1307 int check_our_parents (); 1238 int check_our_parents ();
1308#ifdef PRINTPIPE 1239#ifdef PRINTPIPE
1309 FILE *popen_printer (); 1240 FILE *popen_printer ();
1310 int pclose_printer (FILE *stream); 1241 int pclose_printer (FILE *stream);
1311#endif 1242#endif
… …
1326 void process_graphics (); 1257 void process_graphics ();
1327 // init.C 1258 // init.C
1328 void Get_Colours (); 1259 void Get_Colours ();
1329 void get_ourmods (); 1260 void get_ourmods ();
1330 // main.C 1261 // main.C
1331 void privileged_utmp (rxvt_privaction action);
1332 bool set_fonts (); 1262 bool set_fonts ();
1333 void set_string_property (Atom prop, const char *str, int len = -1); 1263 void set_string_property (Atom prop, const char *str, int len = -1);
1334 void set_utf8_property (Atom prop, const char *str, int len = -1); 1264 void set_utf8_property (Atom prop, const char *str, int len = -1);
1335 void set_title (const char *str); 1265 void set_title (const char *str);
1336 void set_icon_name (const char *str); 1266 void set_icon_name (const char *str);
1337 void set_window_color (int idx, const char *color); 1267 void set_window_color (int idx, const char *color);
1338 void set_colorfgbg (); 1268 void set_colorfgbg ();
1339 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1269 bool set_color (rxvt_color &color, const char *name);
1270 void alias_color (int dst, int src);
1340 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1271 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1341 1272
1342 // screen.C 1273 // screen.C
1343 1274
1344 void lalloc (line_t &l) const 1275 void lalloc (line_t &l) const
… …
1367 1298
1368 if (ncol > prev_ncol) 1299 if (ncol > prev_ncol)
1369 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1300 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1370 } 1301 }
1371 1302
1372 int fgcolor_of (rend_t r) const 1303 int fgcolor_of (rend_t r) const NOTHROW
1373 { 1304 {
1374 int base = GET_BASEFG (r); 1305 int base = GET_BASEFG (r);
1375#ifndef NO_BRIGHTCOLOR 1306#ifndef NO_BRIGHTCOLOR
1376 if (r & RS_Bold 1307 if (r & RS_Bold
1377# if ENABLE_STYLES 1308# if ENABLE_STYLES
… …
1381 base += minBrightCOLOR - minCOLOR; 1312 base += minBrightCOLOR - minCOLOR;
1382#endif 1313#endif
1383 return base; 1314 return base;
1384 } 1315 }
1385 1316
1386 int bgcolor_of (rend_t r) const 1317 int bgcolor_of (rend_t r) const NOTHROW
1387 { 1318 {
1388 int base = GET_BASEBG (r); 1319 int base = GET_BASEBG (r);
1389#ifndef NO_BRIGHTCOLOR 1320#ifndef NO_BRIGHTCOLOR
1390 if (r & RS_Blink 1321 if (r & RS_Blink
1391# if ENABLE_STYLES 1322# if ENABLE_STYLES
… …
1395 base += minBrightCOLOR - minCOLOR; 1326 base += minBrightCOLOR - minCOLOR;
1396#endif 1327#endif
1397 return base; 1328 return base;
1398 } 1329 }
1399 1330
1400 bool option (uint32_t opt) const 1331 bool option (uint32_t opt) const NOTHROW
1401 { 1332 {
1402 return OPTION (opt); 1333 return OPTION (opt);
1403 } 1334 }
1404 1335
1405 void set_option (uint32_t opt, bool set) 1336 void set_option (uint32_t opt, bool set) NOTHROW
1406 { 1337 {
1407 if (set) 1338 if (set)
1408 options |= opt; 1339 options |= opt;
1409 else 1340 else
1410 options &= ~opt; 1341 options &= ~opt;
1411 } 1342 }
1412 1343
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1344 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1414 void scr_blank_screen_mem (line_t &l, rend_t efs) const; 1345 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1415 int scr_scroll_text (int row1, int row2, int count); 1346 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1416 void scr_reset (); 1347 void scr_reset ();
1417 void scr_release (); 1348 void scr_release () NOTHROW;
1418 void scr_clear (bool really = false); 1349 void scr_clear (bool really = false) NOTHROW;
1419 void scr_refresh (); 1350 void scr_refresh () NOTHROW;
1420 bool scr_refresh_rend (rend_t mask, rend_t value); 1351 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1421 void scr_erase_screen (int mode); 1352 void scr_erase_screen (int mode) NOTHROW;
1422#if ENABLE_FRILLS 1353#if ENABLE_FRILLS
1423 void scr_erase_savelines (); 1354 void scr_erase_savelines () NOTHROW;
1424 void scr_backindex (); 1355 void scr_backindex () NOTHROW;
1425 void scr_forwardindex (); 1356 void scr_forwardindex () NOTHROW;
1426#endif 1357#endif
1427 void scr_touch (bool refresh); 1358 void scr_touch (bool refresh) NOTHROW;
1428 void scr_expose (int x, int y, int width, int height, bool refresh); 1359 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1429 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1360 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430 void scr_recolour (); 1361 void scr_recolour () NOTHROW;
1431 void scr_remap_chars (); 1362 void scr_remap_chars () NOTHROW;
1432 void scr_remap_chars (line_t &l); 1363 void scr_remap_chars (line_t &l) NOTHROW;
1364
1365 enum cursor_mode { SAVE, RESTORE };
1433 1366
1434 void scr_poweron (); 1367 void scr_poweron ();
1435 void scr_cursor (int mode); 1368 void scr_cursor (cursor_mode mode) NOTHROW;
1436 void scr_do_wrap (); 1369 void scr_do_wrap () NOTHROW;
1370 void scr_swap_screen () NOTHROW;
1437 int scr_change_screen (int scrn); 1371 void scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg); 1372 void scr_color (unsigned int color, int fgbg) NOTHROW;
1439 void scr_rendition (int set, int style); 1373 void scr_rendition (int set, int style) NOTHROW;
1440 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1374 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1441 void scr_backspace (); 1375 void scr_backspace () NOTHROW;
1442 void scr_tab (int count, bool ht = false); 1376 void scr_tab (int count, bool ht = false) NOTHROW;
1443 void scr_gotorc (int row, int col, int relative); 1377 void scr_gotorc (int row, int col, int relative) NOTHROW;
1444 void scr_index (enum page_dirn direction); 1378 void scr_index (enum page_dirn direction) NOTHROW;
1445 void scr_erase_line (int mode); 1379 void scr_erase_line (int mode) NOTHROW;
1446 void scr_E (); 1380 void scr_E () NOTHROW;
1447 void scr_insdel_lines (int count, int insdel); 1381 void scr_insdel_lines (int count, int insdel) NOTHROW;
1448 void scr_insdel_chars (int count, int insdel); 1382 void scr_insdel_chars (int count, int insdel) NOTHROW;
1449 void scr_scroll_region (int top, int bot); 1383 void scr_scroll_region (int top, int bot) NOTHROW;
1450 void scr_cursor_visible (int mode); 1384 void scr_cursor_visible (int mode) NOTHROW;
1451 void scr_autowrap (int mode); 1385 void scr_autowrap (int mode) NOTHROW;
1452 void scr_relative_origin (int mode); 1386 void scr_relative_origin (int mode) NOTHROW;
1453 void scr_insert_mode (int mode); 1387 void scr_insert_mode (int mode) NOTHROW;
1454 void scr_set_tab (int mode); 1388 void scr_set_tab (int mode) NOTHROW;
1455 void scr_rvideo_mode (int mode); 1389 void scr_rvideo_mode (bool on) NOTHROW;
1456 void scr_report_position (); 1390 void scr_report_position () NOTHROW;
1457 void set_font_style (); 1391 void set_font_style () NOTHROW;
1458 void scr_charset_choose (int set); 1392 void scr_charset_choose (int set) NOTHROW;
1459 void scr_charset_set (int set, unsigned int ch); 1393 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1460 void scr_move_to (int y, int len); 1394 void scr_move_to (int y, int len) NOTHROW;
1461 bool scr_page (enum page_dirn direction, int nlines); 1395 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1462 bool scr_changeview (int new_view_start); 1396 bool scr_changeview (int new_view_start) NOTHROW;
1463 void scr_bell (); 1397 void scr_bell () NOTHROW;
1464 void scr_printscreen (int fullhist); 1398 void scr_printscreen (int fullhist) NOTHROW;
1465 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1399 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1466 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1400 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1467 void scr_reverse_selection (); 1401 void scr_reverse_selection () NOTHROW;
1468 void scr_dump (int fd); 1402 void scr_dump (int fd) NOTHROW;
1403
1469 void selection_check (int check_more); 1404 void selection_check (int check_more) NOTHROW;
1470 void selection_paste (Window win, Atom prop, bool delete_prop); 1405 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1471 void selection_property (Window win, Atom prop); 1406 void selection_property (Window win, Atom prop) NOTHROW;
1472 void selection_request (Time tm, int x, int y); 1407 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1473 int selection_request_other (Atom target, int selnum); 1408 int selection_request_other (Atom target, int selnum) NOTHROW;
1474 void selection_clear (); 1409 void selection_clear () NOTHROW;
1475 void selection_make (Time tm); 1410 void selection_make (Time tm);
1476 bool selection_grab (Time tm); 1411 bool selection_grab (Time tm) NOTHROW;
1477 void selection_start_colrow (int col, int row); 1412 void selection_start_colrow (int col, int row) NOTHROW;
1478 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1413 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1479 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1414 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1480 void selection_remove_trailing_spaces (); 1415 void selection_remove_trailing_spaces () NOTHROW;
1481 void selection_send (const XSelectionRequestEvent &rq); 1416 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1417 void selection_click (int clicks, int x, int y) NOTHROW;
1418 void selection_extend (int x, int y, int flag) NOTHROW;
1419 void selection_rotate (int x, int y) NOTHROW;
1420
1421 void pixel_position (int *x, int *y) NOTHROW;
1482 1422
1483#if defined(NEXT_SCROLLBAR) 1423#if defined(NEXT_SCROLLBAR)
1484 // scrollbar-next.C 1424 // scrollbar-next.C
1485 Pixmap renderPixmap (const char *const *data, int width, int height); 1425 Pixmap renderPixmap (const char *const *data, int width, int height);
1486 void init_scrollbar_stuff (); 1426 void init_scrollbar_stuff ();
… …
1528# define __PROTO(p) p 1468# define __PROTO(p) p
1529#else 1469#else
1530# define __PROTO(p) () 1470# define __PROTO(p) ()
1531#endif 1471#endif
1532 1472
1533#ifdef DEBUG_malloc
1534# include "dmalloc.h" /* This comes last */
1535#endif
1536
1537#endif /* _RXVT_H_ */ 1473#endif /* _RXVT_H_ */
1538 1474

Diff Legend

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