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.230 by root, Fri Jan 20 22:49:34 2006 UTC vs.
Revision 1.259 by root, Thu Jul 6 18:56:10 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
… …
96# define STDERR_FILENO 2 100# define STDERR_FILENO 2
97#endif 101#endif
98 102
99/****************************************************************************/ 103/****************************************************************************/
100 104
101#ifndef __attribute__
102# if __GNUC__
103# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
104# define __attribute__(x)
105# endif
106# endif
107# define __attribute__(x)
108#endif
109
110#define NORETURN __attribute__ ((noreturn))
111#define UNUSED __attribute__ ((unused))
112
113// increases code size unless -fno-enforce-eh-specs
114#if __GNUC__
115# define NOTHROW
116# define THROW(x)
117#else
118# define NOTHROW throw()
119# define THROW(x) throw x
120#endif
121
122// exception thrown on fatal (per-instance) errors 105// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { }; 106class rxvt_failure_exception { };
124 107
125// exception thrown when the command parser runs out of input data 108// exception thrown when the command parser runs out of input data
126class out_of_input { }; 109class out_of_input { };
… …
141// misc.C 124// misc.C
142char * rxvt_wcstombs (const wchar_t *str, int len = -1); 125char * rxvt_wcstombs (const wchar_t *str, int len = -1);
143wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 126wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 127char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
145wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 128wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
129char * rxvt_strdup_cpp (const char *str);
146 130
147#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 131#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148 132
149char * rxvt_r_basename (const char *str) NOTHROW; 133char * rxvt_r_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 134void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
158char * rxvt_Str_trim (char *str) NOTHROW; 142char * rxvt_Str_trim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW; 143int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 144char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 145void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW; 146char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163void rxvt_usleep (int usecs) NOTHROW;
164 147
165///////////////////////////////////////////////////////////////////////////// 148/////////////////////////////////////////////////////////////////////////////
166 149
167// temporarily replace the process environment 150// temporarily replace the process environment
168extern char **environ; 151extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 152extern char **rxvt_environ; // the original environ pointer
170 153
171inline void set_environ (stringvec *envv) 154inline void set_environ (stringvec *envv)
172{ 155{
156#if ENABLE_PERL
157 assert (envv);
158#else
173 if (envv) 159 if (envv)
160#endif
174 environ = (char **)envv->begin (); 161 environ = (char **)envv->begin ();
175} 162}
176 163
177inline void set_environ (char **envv) 164inline void set_environ (char **envv)
178{ 165{
166#if ENABLE_PERL
167 assert (envv);
168#else
179 if (envv) 169 if (envv)
170#endif
180 environ = envv; 171 environ = envv;
181} 172}
182 173
183/* 174/*
184 ***************************************************************************** 175 *****************************************************************************
… …
200typedef struct { 191typedef struct {
201 short w, h, x, y; 192 short w, h, x, y;
202 Pixmap pixmap; 193 Pixmap pixmap;
203} bgPixmap_t; 194} bgPixmap_t;
204#endif 195#endif
205
206struct rxvt_ptytty {
207 int pty; // pty file descriptor; connected to rxvt
208 int tty; // tty file descriptor; connected to child
209
210 rxvt_ptytty ()
211 : pty(-1), tty(-1)
212 {
213 }
214
215 virtual ~rxvt_ptytty ()
216 {
217 }
218
219 virtual bool get () = 0;
220#if UTMP_SUPPORT
221 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
222#endif
223
224 void close_tty ();
225 bool make_controlling_tty ();
226 void set_utf8_mode (bool on);
227};
228
229rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
230void rxvt_ptytty_server (); // start the ptytty server process
231 196
232/* 197/*
233 * the 'essential' information for reporting Mouse Events 198 * the 'essential' information for reporting Mouse Events
234 * pared down from XButtonEvent 199 * pared down from XButtonEvent
235 */ 200 */
… …
448// fake styles 413// fake styles
449#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
450#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
451#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
452 417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
420
453// 5 custom bits for extensions 421// 5 custom bits for extensions
454#define RS_customCount 32 422#define RS_customCount 32
455#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
456#define RS_customShift 19 424#define RS_customShift 19
457 425
… …
526 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
527 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
528 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
529 497
530 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
531 500
532 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
533 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
534 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
535 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
620#endif 589#endif
621}; 590};
622 591
623#define Color_Bits 7 // 0 .. maxTermCOLOR 592#define Color_Bits 7 // 0 .. maxTermCOLOR
624 593
625#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
626#define NPIXCLR_BITS 32
627
628/* 594/*
629 * Resource list 595 * Resource list
630 */ 596 */
631enum { 597enum {
632# define def(name) Rs_ ## name, 598# define def(name) Rs_ ## name,
633# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 599# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
634# include "rsinc.h" 600# include "rsinc.h"
635# undef def 601# undef def
636# undef reserve 602# undef reserve
637 NUM_RESOURCES 603 NUM_RESOURCES
638};
639
640// see init.C:xa_names, which must be kept in sync
641enum {
642 XA_TEXT = 0,
643 XA_COMPOUND_TEXT,
644 XA_UTF8_STRING,
645 XA_MULTIPLE,
646 XA_TARGETS,
647 XA_TIMESTAMP,
648 XA_VT_SELECTION,
649 XA_INCR,
650 XA_WM_PROTOCOLS,
651 XA_WM_DELETE_WINDOW,
652 XA_CLIPBOARD,
653#if ENABLE_FRILLS
654 XA_MOTIF_WM_HINTS,
655#endif
656#if ENABLE_EWMH
657 XA_NET_WM_PID,
658 XA_NET_WM_NAME,
659 XA_NET_WM_ICON_NAME,
660 XA_NET_WM_PING,
661#endif
662#if USE_XIM
663 XA_WM_LOCALE_NAME,
664#endif
665#if TRANSPARENT
666 XA_XROOTPMAP_ID,
667 XA_ESETROOT_PMAP_ID,
668#endif
669#if ENABLE_XEMBED
670 XA_XEMBED,
671 XA_XEMBED_INFO,
672#endif
673 NUM_XA
674}; 604};
675 605
676/* DEC private modes */ 606/* DEC private modes */
677#define PrivMode_132 (1UL<<0) 607#define PrivMode_132 (1UL<<0)
678#define PrivMode_132OK (1UL<<1) 608#define PrivMode_132OK (1UL<<1)
… …
751 ***************************************************************************** 681 *****************************************************************************
752 * MACRO DEFINES 682 * MACRO DEFINES
753 ***************************************************************************** 683 *****************************************************************************
754 */ 684 */
755#define dLocal(type,name) type const name = this->name 685#define dLocal(type,name) type const name = this->name
756#define dDisp Display *disp = this->display->display 686
687// for speed reasons, we assume that all latin1 characters
688// are single-width (the first unicode combining character
689// is actually 0x300, but ascii is what matters most).
690#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
757 691
758/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
759#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
760#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 695#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
795#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
796#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 730#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
797 731
798#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 732#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
799 733
800#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
801#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
802 736
803#if ENABLE_STYLES 737#if ENABLE_STYLES
804# define FONTSET(style) fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
805#else 739#else
806# define FONTSET(style) fontset[0] 740# define FONTSET(style) fontset[0]
… …
840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 774# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
841#else 775#else
842# define XPMClearArea(a, b, c, d, e, f, g) 776# define XPMClearArea(a, b, c, d, e, f, g)
843#endif 777#endif
844 778
845#ifdef DEBUG_CMD
846# define D_CMD(x) fprintf x ; fputc('\n', stderr)
847#else
848# define D_CMD(x)
849#endif
850#ifdef DEBUG_INIT
851# define D_INIT(x) fprintf x ; fputc('\n', stderr)
852#else
853# define D_INIT(x)
854#endif
855#ifdef DEBUG_MAIN
856# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
857#else
858# define D_MAIN(x)
859#endif
860#ifdef DEBUG_SIZE
861# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
862#else
863# define D_SIZE(x)
864#endif
865
866typedef callback1<void, const char *> log_callback; 779typedef callback<void (const char *)> log_callback;
867typedef callback1<int, int> getfd_callback; 780typedef callback<int (int)> getfd_callback;
868 781
869#define SET_LOCALE(locale) rxvt_set_locale (locale) 782#define SET_LOCALE(locale) rxvt_set_locale (locale)
870extern bool rxvt_set_locale (const char *locale) NOTHROW; 783extern bool rxvt_set_locale (const char *locale) NOTHROW;
871extern void rxvt_push_locale (const char *locale) NOTHROW; 784extern void rxvt_push_locale (const char *locale) NOTHROW;
872extern void rxvt_pop_locale () NOTHROW; 785extern void rxvt_pop_locale () NOTHROW;
… …
937# define COMPOSE_LO 0x40000000UL 850# define COMPOSE_LO 0x40000000UL
938# define COMPOSE_HI 0x400fffffUL 851# define COMPOSE_HI 0x400fffffUL
939# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 852# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
940#else 853#else
941# if ENABLE_PERL 854# if ENABLE_PERL
942# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 855# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
943# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 856# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
944# else 857# else
945# define COMPOSE_LO 0xd800UL 858# define COMPOSE_LO 0xd800UL
946# define COMPOSE_HI 0xf8ffUL 859# define COMPOSE_HI 0xf8ffUL
947# endif 860# endif
… …
976#endif 889#endif
977 890
978/****************************************************************************/ 891/****************************************************************************/
979 892
980#ifdef KEYSYM_RESOURCE 893#ifdef KEYSYM_RESOURCE
981 class keyboard_manager; 894class keyboard_manager;
982#endif 895#endif
983 896
984struct rxvt_term : zero_initialized, rxvt_vars { 897struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
898
899 // special markers with magic addresses
900 static const char resval_undef []; // options specifically unset
901 static const char resval_on []; // boolean options switched on
902 static const char resval_off []; // or off
903
985 log_callback *log_hook; // log error messages through this hook, if != 0 904 log_callback *log_hook; // log error messages through this hook, if != 0
986 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 905 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
987#if ENABLE_PERL 906#if ENABLE_PERL
988 rxvt_perl_term perl; 907 rxvt_perl_term perl;
989#endif 908#endif
990 struct mbstate mbstate; // current input multibyte state 909 struct mbstate mbstate; // current input multibyte state
… …
1020#endif 939#endif
1021 scrollbar_align, 940 scrollbar_align,
1022 selection_wait, 941 selection_wait,
1023 selection_type; 942 selection_type;
1024/* ---------- */ 943/* ---------- */
944 bool rvideo_state, rvideo_mode;
945#ifndef NO_BELL
1025 short rvideo; 946 bool rvideo_bell;
947#endif
1026 int num_scr; /* screen: number lines scrolled */ 948 int num_scr; /* screen: number lines scrolled */
1027 int prev_ncol, /* screen: previous number of columns */ 949 int prev_ncol, /* screen: previous number of columns */
1028 prev_nrow; /* screen: previous number of rows */ 950 prev_nrow; /* screen: previous number of rows */
1029/* ---------- */ 951/* ---------- */
1030 rend_t rstyle; 952 rend_t rstyle;
1031/* ---------- */
1032 uint32_t pixcolor_set[NPIXCLR_SETS];
1033/* ---------- */ 953/* ---------- */
1034#ifdef SELECTION_SCROLLING 954#ifdef SELECTION_SCROLLING
1035 int scroll_selection_lines; 955 int scroll_selection_lines;
1036 enum page_dirn scroll_selection_dir; 956 enum page_dirn scroll_selection_dir;
1037 int selection_save_x, 957 int selection_save_x,
… …
1064 int old_width, /* last used width in screen resize */ 984 int old_width, /* last used width in screen resize */
1065 old_height; /* last used height in screen resize */ 985 old_height; /* last used height in screen resize */
1066 unsigned long priv_modes, 986 unsigned long priv_modes,
1067 SavedModes; 987 SavedModes;
1068/* ---------- */ 988/* ---------- */
1069 Atom xa[NUM_XA]; 989 Atom *xa;
1070/* ---------- */ 990/* ---------- */
1071#ifdef RXVT_SCROLLBAR 991#ifdef RXVT_SCROLLBAR
1072 GC scrollbarGC, 992 GC scrollbarGC,
1073 topShadowGC, 993 topShadowGC,
1074 botShadowGC; 994 botShadowGC;
… …
1131 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1051 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1132#endif 1052#endif
1133 1053
1134 vector<void *> allocated; // free these memory blocks with free() 1054 vector<void *> allocated; // free these memory blocks with free()
1135 1055
1136 char *env_windowid; /* environmental variable WINDOWID */ 1056 char env_windowid[21]; /* environmental variable WINDOWID */
1057 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1137 char *env_display; /* environmental variable DISPLAY */ 1058 char *env_display; /* environmental variable DISPLAY */
1138 char *env_term; /* environmental variable TERM */ 1059 char *env_term; /* environmental variable TERM */
1139 char *env_colorfgbg; 1060
1140 char *locale; 1061 char *locale;
1141 char charsets[4]; 1062 char charsets[4];
1142 char *v_buffer; /* pointer to physical buffer */ 1063 char *v_buffer; /* pointer to physical buffer */
1143 unsigned int v_buflen; /* size of area to write */ 1064 unsigned int v_buflen; /* size of area to write */
1144 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1065 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1145 1066
1146#ifdef KEYSYM_RESOURCE 1067#ifdef KEYSYM_RESOURCE
1147 keyboard_manager *keyboard; 1068 keyboard_manager *keyboard;
1148#endif 1069#endif
1149 1070
1150 const char *rs[NUM_RESOURCES]; 1071 const char *rs[NUM_RESOURCES];
1151 /* command input buffering */ 1072 /* command input buffering */
1152 char *cmdbuf_ptr, *cmdbuf_endp; 1073 char *cmdbuf_ptr, *cmdbuf_endp;
1153 char cmdbuf_base[CBUFSIZ]; 1074 char cmdbuf_base[CBUFSIZ];
1154 1075
1155 rxvt_ptytty *pty; 1076 ptytty *pty;
1156 1077
1157 rxvt_salloc *talloc; // text line allocator 1078 rxvt_salloc *talloc; // text line allocator
1158 rxvt_salloc *ralloc; // rend line allocator 1079 rxvt_salloc *ralloc; // rend line allocator
1159 1080
1160 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1081 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1171#endif 1092#endif
1172 1093
1173 // modifies first argument(!) 1094 // modifies first argument(!)
1174 void paste (char *data, unsigned int len) NOTHROW; 1095 void paste (char *data, unsigned int len) NOTHROW;
1175 1096
1176 long vt_emask, vt_emask_perl; 1097 long vt_emask, vt_emask_perl, vt_emask_xim;
1177 1098
1178 void vt_select_input () const NOTHROW 1099 void vt_select_input () const NOTHROW
1179 { 1100 {
1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1101 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1181 } 1102 }
1182 1103
1183#if TRANSPARENT 1104#if TRANSPARENT
1184 void rootwin_cb (XEvent &xev); 1105 void rootwin_cb (XEvent &xev);
1185 xevent_watcher rootwin_ev; 1106 xevent_watcher rootwin_ev;
… …
1195 1116
1196 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1117 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1197 void check_cb (check_watcher &w); check_watcher check_ev; 1118 void check_cb (check_watcher &w); check_watcher check_ev;
1198 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1119 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1199 void flush_cb (time_watcher &w); time_watcher flush_ev; 1120 void flush_cb (time_watcher &w); time_watcher flush_ev;
1200
1201 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1121 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1202
1203 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1122 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1204 1123
1205#ifdef CURSOR_BLINK 1124#ifdef CURSOR_BLINK
1206 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1125 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1207#endif 1126#endif
1208#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1209 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1128 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1129#endif
1130#ifndef NO_BELL
1131 void bell_cb (time_watcher &w); time_watcher bell_ev;
1210#endif 1132#endif
1211 1133
1212#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1213 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1135 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1214#endif 1136#endif
… …
1234 rxvt_term (); 1156 rxvt_term ();
1235 ~rxvt_term (); 1157 ~rxvt_term ();
1236 void destroy (); 1158 void destroy ();
1237 void emergency_cleanup (); 1159 void emergency_cleanup ();
1238 1160
1239 bool init (int argc, const char *const *argv); 1161 bool init (int argc, const char *const *argv, stringvec *envv);
1162
1163 bool init (stringvec *argv, stringvec *envv)
1164 {
1165 this->argv = argv;
1166 return init (argv->size (), argv->begin (), envv);
1167 }
1168
1240 bool init_vars (); 1169 bool init_vars ();
1241 1170
1242 bool pty_fill (); 1171 bool pty_fill ();
1243 1172
1244 void make_current () const // make this the "currently active" urxvt instance 1173 void make_current () const // make this the "currently active" urxvt instance
… …
1263 void create_windows (int argc, const char *const *argv); 1192 void create_windows (int argc, const char *const *argv);
1264 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1193 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1265 void window_calc (unsigned int newwidth, unsigned int newheight); 1194 void window_calc (unsigned int newwidth, unsigned int newheight);
1266 1195
1267#if USE_XIM 1196#if USE_XIM
1268 rxvt_xim *input_method; 1197 rxvt_xim *input_method;
1269 XIC Input_Context; 1198 XIC Input_Context;
1270 XIMStyle input_style; 1199 XIMStyle input_style;
1271 XPoint spot; // most recently sent spot position 1200 XPoint spot; // most recently sent spot position
1272 1201
1273 void im_destroy (); 1202 void im_destroy ();
1274 void im_cb (); im_watcher im_ev; 1203 void im_cb (); im_watcher im_ev;
1275 void im_set_size (XRectangle &size); 1204 void im_set_size (XRectangle &size);
1276 void im_set_position (XPoint &pos) NOTHROW; 1205 void im_set_position (XPoint &pos) NOTHROW;
… …
1278 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1207 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1279 1208
1280 bool IMisRunning (); 1209 bool IMisRunning ();
1281 void IMSendSpot (); 1210 void IMSendSpot ();
1282 bool IM_get_IC (const char *modifiers); 1211 bool IM_get_IC (const char *modifiers);
1283 void IMSetStatusPosition (); 1212 void IMSetPosition ();
1284#endif 1213#endif
1285 1214
1286 void resize_scrollbar (); 1215 void resize_scrollbar ();
1287 1216
1288 // command.C 1217 // command.C
1289 void lookup_key (XKeyEvent &ev); 1218 void key_press (XKeyEvent &ev);
1219 void key_release (XKeyEvent &ev);
1290 unsigned int cmd_write (const char *str, unsigned int count); 1220 unsigned int cmd_write (const char *str, unsigned int count);
1291 1221
1292 wchar_t next_char () NOTHROW; 1222 wchar_t next_char () NOTHROW;
1293 wchar_t cmd_getc () THROW ((class out_of_input)); 1223 wchar_t cmd_getc () THROW ((class out_of_input));
1294 uint32_t next_octet () NOTHROW; 1224 uint32_t next_octet () NOTHROW;
… …
1298 void mouse_report (XButtonEvent &ev); 1228 void mouse_report (XButtonEvent &ev);
1299 void button_press (XButtonEvent &ev); 1229 void button_press (XButtonEvent &ev);
1300 void button_release (XButtonEvent &ev); 1230 void button_release (XButtonEvent &ev);
1301 void focus_in (); 1231 void focus_in ();
1302 void focus_out (); 1232 void focus_out ();
1233 void update_fade_color (unsigned int idx);
1303 int check_our_parents (); 1234 int check_our_parents ();
1304#ifdef PRINTPIPE 1235#ifdef PRINTPIPE
1305 FILE *popen_printer (); 1236 FILE *popen_printer ();
1306 int pclose_printer (FILE *stream); 1237 int pclose_printer (FILE *stream);
1307#endif 1238#endif
… …
1329 void set_utf8_property (Atom prop, const char *str, int len = -1); 1260 void set_utf8_property (Atom prop, const char *str, int len = -1);
1330 void set_title (const char *str); 1261 void set_title (const char *str);
1331 void set_icon_name (const char *str); 1262 void set_icon_name (const char *str);
1332 void set_window_color (int idx, const char *color); 1263 void set_window_color (int idx, const char *color);
1333 void set_colorfgbg (); 1264 void set_colorfgbg ();
1334 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1265 bool set_color (rxvt_color &color, const char *name);
1266 void alias_color (int dst, int src);
1335 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1267 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1336 1268
1337 // screen.C 1269 // screen.C
1338 1270
1339 void lalloc (line_t &l) const NOTHROW 1271 void lalloc (line_t &l) const
1340 { 1272 {
1341 l.t = (text_t *)talloc->alloc (); 1273 l.t = (text_t *)talloc->alloc ();
1342 l.r = (rend_t *)ralloc->alloc (); 1274 l.r = (rend_t *)ralloc->alloc ();
1343 } 1275 }
1344 1276
… …
1348 talloc->free (l.t); 1280 talloc->free (l.t);
1349 ralloc->free (l.r); 1281 ralloc->free (l.r);
1350 } 1282 }
1351#endif 1283#endif
1352 1284
1353 void lresize (line_t &l) const NOTHROW 1285 void lresize (line_t &l) const
1354 { 1286 {
1355 if (!l.t) 1287 if (!l.t)
1356 return; 1288 return;
1357 1289
1358 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1290 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1426 void scr_remap_chars () NOTHROW; 1358 void scr_remap_chars () NOTHROW;
1427 void scr_remap_chars (line_t &l) NOTHROW; 1359 void scr_remap_chars (line_t &l) NOTHROW;
1428 1360
1429 enum cursor_mode { SAVE, RESTORE }; 1361 enum cursor_mode { SAVE, RESTORE };
1430 1362
1431 void scr_poweron () NOTHROW; 1363 void scr_poweron ();
1432 void scr_cursor (cursor_mode mode) NOTHROW; 1364 void scr_cursor (cursor_mode mode) NOTHROW;
1433 void scr_do_wrap () NOTHROW; 1365 void scr_do_wrap () NOTHROW;
1366 void scr_swap_screen () NOTHROW;
1434 int scr_change_screen (int scrn) NOTHROW; 1367 void scr_change_screen (int scrn);
1435 void scr_color (unsigned int color, int fgbg) NOTHROW; 1368 void scr_color (unsigned int color, int fgbg) NOTHROW;
1436 void scr_rendition (int set, int style) NOTHROW; 1369 void scr_rendition (int set, int style) NOTHROW;
1437 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1370 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1438 void scr_backspace () NOTHROW; 1371 void scr_backspace () NOTHROW;
1439 void scr_tab (int count, bool ht = false) NOTHROW; 1372 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1447 void scr_cursor_visible (int mode) NOTHROW; 1380 void scr_cursor_visible (int mode) NOTHROW;
1448 void scr_autowrap (int mode) NOTHROW; 1381 void scr_autowrap (int mode) NOTHROW;
1449 void scr_relative_origin (int mode) NOTHROW; 1382 void scr_relative_origin (int mode) NOTHROW;
1450 void scr_insert_mode (int mode) NOTHROW; 1383 void scr_insert_mode (int mode) NOTHROW;
1451 void scr_set_tab (int mode) NOTHROW; 1384 void scr_set_tab (int mode) NOTHROW;
1452 void scr_rvideo_mode (int mode) NOTHROW; 1385 void scr_rvideo_mode (bool on) NOTHROW;
1453 void scr_report_position () NOTHROW; 1386 void scr_report_position () NOTHROW;
1454 void set_font_style () NOTHROW; 1387 void set_font_style () NOTHROW;
1455 void scr_charset_choose (int set) NOTHROW; 1388 void scr_charset_choose (int set) NOTHROW;
1456 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1389 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1457 void scr_move_to (int y, int len) NOTHROW; 1390 void scr_move_to (int y, int len) NOTHROW;
… …
1531# define __PROTO(p) p 1464# define __PROTO(p) p
1532#else 1465#else
1533# define __PROTO(p) () 1466# define __PROTO(p) ()
1534#endif 1467#endif
1535 1468
1536#ifdef DEBUG_malloc
1537# include "dmalloc.h" /* This comes last */
1538#endif
1539
1540#endif /* _RXVT_H_ */ 1469#endif /* _RXVT_H_ */
1541 1470

Diff Legend

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