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.251 by root, Tue Jan 31 18:36:35 2006 UTC

… …
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
21#else 22#else
22# define ENABLE_MINIMAL 1 23# define ENABLE_MINIMAL 1
23#endif 24#endif
24 25
… …
31#if ENABLE_FRILLS 32#if ENABLE_FRILLS
32# include <X11/Xmd.h> 33# include <X11/Xmd.h>
33#endif 34#endif
34 35
35#include "encoding.h" 36#include "encoding.h"
37#include "rxvtutil.h"
36#include "rxvtfont.h" 38#include "rxvtfont.h"
37#include "rxvttoolkit.h" 39#include "rxvttoolkit.h"
38#include "iom.h" 40#include "iom.h"
39#include "salloc.h" 41#include "salloc.h"
42#include "libptytty.h"
40 43
41#include "rxvtperl.h" 44#include "rxvtperl.h"
42 45
43// try to avoid some macros to decrease code size, on some systems 46// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 47#if ENABLE_MINIMAL
… …
96# define STDERR_FILENO 2 99# define STDERR_FILENO 2
97#endif 100#endif
98 101
99/****************************************************************************/ 102/****************************************************************************/
100 103
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 104// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { }; 105class rxvt_failure_exception { };
124 106
125// exception thrown when the command parser runs out of input data 107// exception thrown when the command parser runs out of input data
126class out_of_input { }; 108class out_of_input { };
… …
141// misc.C 123// misc.C
142char * rxvt_wcstombs (const wchar_t *str, int len = -1); 124char * rxvt_wcstombs (const wchar_t *str, int len = -1);
143wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 125wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 126char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
145wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 127wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
128char * rxvt_strdup_cpp (const char *str);
146 129
147#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 130#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148 131
149char * rxvt_r_basename (const char *str) NOTHROW; 132char * rxvt_r_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 133void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
158char * rxvt_Str_trim (char *str) NOTHROW; 141char * rxvt_Str_trim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW; 142int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 143char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 144void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW; 145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163void rxvt_usleep (int usecs) NOTHROW;
164 146
165///////////////////////////////////////////////////////////////////////////// 147/////////////////////////////////////////////////////////////////////////////
166 148
167// temporarily replace the process environment 149// temporarily replace the process environment
168extern char **environ; 150extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 151extern char **rxvt_environ; // the original environ pointer
170 152
171inline void set_environ (stringvec *envv) 153inline void set_environ (stringvec *envv)
172{ 154{
155#if ENABLE_PERL
156 assert (envv);
157#else
173 if (envv) 158 if (envv)
159#endif
174 environ = (char **)envv->begin (); 160 environ = (char **)envv->begin ();
175} 161}
176 162
177inline void set_environ (char **envv) 163inline void set_environ (char **envv)
178{ 164{
165#if ENABLE_PERL
166 assert (envv);
167#else
179 if (envv) 168 if (envv)
169#endif
180 environ = envv; 170 environ = envv;
181} 171}
182 172
183/* 173/*
184 ***************************************************************************** 174 *****************************************************************************
… …
200typedef struct { 190typedef struct {
201 short w, h, x, y; 191 short w, h, x, y;
202 Pixmap pixmap; 192 Pixmap pixmap;
203} bgPixmap_t; 193} bgPixmap_t;
204#endif 194#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 195
232/* 196/*
233 * the 'essential' information for reporting Mouse Events 197 * the 'essential' information for reporting Mouse Events
234 * pared down from XButtonEvent 198 * pared down from XButtonEvent
235 */ 199 */
… …
448// fake styles 412// fake styles
449#define RS_Blink 0x00010000UL // blink 413#define RS_Blink 0x00010000UL // blink
450#define RS_RVid 0x00020000UL // reverse video 414#define RS_RVid 0x00020000UL // reverse video
451#define RS_Uline 0x00040000UL // underline 415#define RS_Uline 0x00040000UL // underline
452 416
417// toggle this to force redraw, must be != RS_Careful
418#define RS_redraw 0x01000000UL
419
453// 5 custom bits for extensions 420// 5 custom bits for extensions
454#define RS_customCount 32 421#define RS_customCount 32
455#define RS_customMask 0x00f80000UL 422#define RS_customMask 0x00f80000UL
456#define RS_customShift 19 423#define RS_customShift 19
457 424
… …
526 Rxvt_restoreFG = 39, // change default fg color 493 Rxvt_restoreFG = 39, // change default fg color
527 Rxvt_restoreBG = 49, // change default bg color 494 Rxvt_restoreBG = 49, // change default bg color
528 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 495 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
529 496
530 URxvt_locale = 701, // change locale 497 URxvt_locale = 701, // change locale
498 URxvt_version = 702, // request version
531 499
532 URxvt_Color_IT = 704, // change actual 'Italic' colour 500 URxvt_Color_IT = 704, // change actual 'Italic' colour
533 URxvt_Color_tint = 705, // change actual tint colour 501 URxvt_Color_tint = 705, // change actual tint colour
534 URxvt_Color_BD = 706, 502 URxvt_Color_BD = 706,
535 URxvt_Color_UL = 707, 503 URxvt_Color_UL = 707,
… …
620#endif 588#endif
621}; 589};
622 590
623#define Color_Bits 7 // 0 .. maxTermCOLOR 591#define Color_Bits 7 // 0 .. maxTermCOLOR
624 592
625#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
626#define NPIXCLR_BITS 32
627
628/* 593/*
629 * Resource list 594 * Resource list
630 */ 595 */
631enum { 596enum {
632# define def(name) Rs_ ## name, 597# define def(name) Rs_ ## name,
633# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 598# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
634# include "rsinc.h" 599# include "rsinc.h"
635# undef def 600# undef def
636# undef reserve 601# undef reserve
637 NUM_RESOURCES 602 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}; 603};
675 604
676/* DEC private modes */ 605/* DEC private modes */
677#define PrivMode_132 (1UL<<0) 606#define PrivMode_132 (1UL<<0)
678#define PrivMode_132OK (1UL<<1) 607#define PrivMode_132OK (1UL<<1)
… …
751 ***************************************************************************** 680 *****************************************************************************
752 * MACRO DEFINES 681 * MACRO DEFINES
753 ***************************************************************************** 682 *****************************************************************************
754 */ 683 */
755#define dLocal(type,name) type const name = this->name 684#define dLocal(type,name) type const name = this->name
756#define dDisp Display *disp = this->display->display 685
686// for speed reasons, we assume that all latin1 characters
687// are single-width (the first unicode combining character
688// is actually 0x300, but ascii is what matters most).
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
757 690
758/* convert pixel dimensions to row/column values. Everything as int32_t */ 691/* convert pixel dimensions to row/column values. Everything as int32_t */
759#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 692#define Pixel2Col(x) Pixel2Width((int32_t)(x))
760#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 693#define Pixel2Row(y) Pixel2Height((int32_t)(y))
761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
795#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 728#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
796#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 729#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
797 730
798#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 731#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
799 732
800#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 733#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
801#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 734#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
802 735
803#if ENABLE_STYLES 736#if ENABLE_STYLES
804# define FONTSET(style) fontset[GET_STYLE (style)] 737# define FONTSET(style) fontset[GET_STYLE (style)]
805#else 738#else
806# define FONTSET(style) fontset[0] 739# define FONTSET(style) fontset[0]
… …
840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 773# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
841#else 774#else
842# define XPMClearArea(a, b, c, d, e, f, g) 775# define XPMClearArea(a, b, c, d, e, f, g)
843#endif 776#endif
844 777
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; 778typedef callback1<void, const char *> log_callback;
867typedef callback1<int, int> getfd_callback; 779typedef callback1<int, int> getfd_callback;
868 780
869#define SET_LOCALE(locale) rxvt_set_locale (locale) 781#define SET_LOCALE(locale) rxvt_set_locale (locale)
870extern bool rxvt_set_locale (const char *locale) NOTHROW; 782extern bool rxvt_set_locale (const char *locale) NOTHROW;
… …
937# define COMPOSE_LO 0x40000000UL 849# define COMPOSE_LO 0x40000000UL
938# define COMPOSE_HI 0x400fffffUL 850# define COMPOSE_HI 0x400fffffUL
939# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 851# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
940#else 852#else
941# if ENABLE_PERL 853# if ENABLE_PERL
942# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 854# 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 855# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
944# else 856# else
945# define COMPOSE_LO 0xd800UL 857# define COMPOSE_LO 0xd800UL
946# define COMPOSE_HI 0xf8ffUL 858# define COMPOSE_HI 0xf8ffUL
947# endif 859# endif
… …
979 891
980#ifdef KEYSYM_RESOURCE 892#ifdef KEYSYM_RESOURCE
981 class keyboard_manager; 893 class keyboard_manager;
982#endif 894#endif
983 895
984struct rxvt_term : zero_initialized, rxvt_vars { 896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
985 log_callback *log_hook; // log error messages through this hook, if != 0 897 log_callback *log_hook; // log error messages through this hook, if != 0
986 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 898 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
987#if ENABLE_PERL 899#if ENABLE_PERL
988 rxvt_perl_term perl; 900 rxvt_perl_term perl;
989#endif 901#endif
… …
1020#endif 932#endif
1021 scrollbar_align, 933 scrollbar_align,
1022 selection_wait, 934 selection_wait,
1023 selection_type; 935 selection_type;
1024/* ---------- */ 936/* ---------- */
937 bool rvideo_state, rvideo_mode;
938#ifndef NO_BELL
1025 short rvideo; 939 bool rvideo_bell;
940#endif
1026 int num_scr; /* screen: number lines scrolled */ 941 int num_scr; /* screen: number lines scrolled */
1027 int prev_ncol, /* screen: previous number of columns */ 942 int prev_ncol, /* screen: previous number of columns */
1028 prev_nrow; /* screen: previous number of rows */ 943 prev_nrow; /* screen: previous number of rows */
1029/* ---------- */ 944/* ---------- */
1030 rend_t rstyle; 945 rend_t rstyle;
1031/* ---------- */
1032 uint32_t pixcolor_set[NPIXCLR_SETS];
1033/* ---------- */ 946/* ---------- */
1034#ifdef SELECTION_SCROLLING 947#ifdef SELECTION_SCROLLING
1035 int scroll_selection_lines; 948 int scroll_selection_lines;
1036 enum page_dirn scroll_selection_dir; 949 enum page_dirn scroll_selection_dir;
1037 int selection_save_x, 950 int selection_save_x,
… …
1064 int old_width, /* last used width in screen resize */ 977 int old_width, /* last used width in screen resize */
1065 old_height; /* last used height in screen resize */ 978 old_height; /* last used height in screen resize */
1066 unsigned long priv_modes, 979 unsigned long priv_modes,
1067 SavedModes; 980 SavedModes;
1068/* ---------- */ 981/* ---------- */
1069 Atom xa[NUM_XA]; 982 Atom *xa;
1070/* ---------- */ 983/* ---------- */
1071#ifdef RXVT_SCROLLBAR 984#ifdef RXVT_SCROLLBAR
1072 GC scrollbarGC, 985 GC scrollbarGC,
1073 topShadowGC, 986 topShadowGC,
1074 botShadowGC; 987 botShadowGC;
… …
1131 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1044 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1132#endif 1045#endif
1133 1046
1134 vector<void *> allocated; // free these memory blocks with free() 1047 vector<void *> allocated; // free these memory blocks with free()
1135 1048
1136 char *env_windowid; /* environmental variable WINDOWID */ 1049 char env_windowid[21]; /* environmental variable WINDOWID */
1050 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1137 char *env_display; /* environmental variable DISPLAY */ 1051 char *env_display; /* environmental variable DISPLAY */
1138 char *env_term; /* environmental variable TERM */ 1052 char *env_term; /* environmental variable TERM */
1139 char *env_colorfgbg; 1053
1140 char *locale; 1054 char *locale;
1141 char charsets[4]; 1055 char charsets[4];
1142 char *v_buffer; /* pointer to physical buffer */ 1056 char *v_buffer; /* pointer to physical buffer */
1143 unsigned int v_buflen; /* size of area to write */ 1057 unsigned int v_buflen; /* size of area to write */
1144 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1058 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1145 1059
1146#ifdef KEYSYM_RESOURCE 1060#ifdef KEYSYM_RESOURCE
1147 keyboard_manager *keyboard; 1061 keyboard_manager *keyboard;
1148#endif 1062#endif
1149 1063
1150 const char *rs[NUM_RESOURCES]; 1064 const char *rs[NUM_RESOURCES];
1151 /* command input buffering */ 1065 /* command input buffering */
1152 char *cmdbuf_ptr, *cmdbuf_endp; 1066 char *cmdbuf_ptr, *cmdbuf_endp;
1153 char cmdbuf_base[CBUFSIZ]; 1067 char cmdbuf_base[CBUFSIZ];
1154 1068
1155 rxvt_ptytty *pty; 1069 ptytty *pty;
1156 1070
1157 rxvt_salloc *talloc; // text line allocator 1071 rxvt_salloc *talloc; // text line allocator
1158 rxvt_salloc *ralloc; // rend line allocator 1072 rxvt_salloc *ralloc; // rend line allocator
1159 1073
1160 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1074 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1171#endif 1085#endif
1172 1086
1173 // modifies first argument(!) 1087 // modifies first argument(!)
1174 void paste (char *data, unsigned int len) NOTHROW; 1088 void paste (char *data, unsigned int len) NOTHROW;
1175 1089
1176 long vt_emask, vt_emask_perl; 1090 long vt_emask, vt_emask_perl, vt_emask_xim;
1177 1091
1178 void vt_select_input () const NOTHROW 1092 void vt_select_input () const NOTHROW
1179 { 1093 {
1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1094 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1181 } 1095 }
1182 1096
1183#if TRANSPARENT 1097#if TRANSPARENT
1184 void rootwin_cb (XEvent &xev); 1098 void rootwin_cb (XEvent &xev);
1185 xevent_watcher rootwin_ev; 1099 xevent_watcher rootwin_ev;
… …
1195 1109
1196 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1110 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1197 void check_cb (check_watcher &w); check_watcher check_ev; 1111 void check_cb (check_watcher &w); check_watcher check_ev;
1198 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1112 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1199 void flush_cb (time_watcher &w); time_watcher flush_ev; 1113 void flush_cb (time_watcher &w); time_watcher flush_ev;
1200
1201 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1114 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; 1115 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1204 1116
1205#ifdef CURSOR_BLINK 1117#ifdef CURSOR_BLINK
1206 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1118 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1207#endif 1119#endif
1208#ifdef TEXT_BLINK 1120#ifdef TEXT_BLINK
1209 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1121 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1122#endif
1123#ifndef NO_BELL
1124 void bell_cb (time_watcher &w); time_watcher bell_ev;
1210#endif 1125#endif
1211 1126
1212#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1127#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1213 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1128 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1214#endif 1129#endif
… …
1234 rxvt_term (); 1149 rxvt_term ();
1235 ~rxvt_term (); 1150 ~rxvt_term ();
1236 void destroy (); 1151 void destroy ();
1237 void emergency_cleanup (); 1152 void emergency_cleanup ();
1238 1153
1239 bool init (int argc, const char *const *argv); 1154 bool init (int argc, const char *const *argv, stringvec *envv);
1155
1156 bool init (stringvec *argv, stringvec *envv)
1157 {
1158 this->argv = argv;
1159 return init (argv->size (), argv->begin (), envv);
1160 }
1161
1240 bool init_vars (); 1162 bool init_vars ();
1241 1163
1242 bool pty_fill (); 1164 bool pty_fill ();
1243 1165
1244 void make_current () const // make this the "currently active" urxvt instance 1166 void make_current () const // make this the "currently active" urxvt instance
… …
1263 void create_windows (int argc, const char *const *argv); 1185 void create_windows (int argc, const char *const *argv);
1264 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1186 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1265 void window_calc (unsigned int newwidth, unsigned int newheight); 1187 void window_calc (unsigned int newwidth, unsigned int newheight);
1266 1188
1267#if USE_XIM 1189#if USE_XIM
1268 rxvt_xim *input_method; 1190 rxvt_xim *input_method;
1269 XIC Input_Context; 1191 XIC Input_Context;
1270 XIMStyle input_style; 1192 XIMStyle input_style;
1271 XPoint spot; // most recently sent spot position 1193 XPoint spot; // most recently sent spot position
1272 1194
1273 void im_destroy (); 1195 void im_destroy ();
1274 void im_cb (); im_watcher im_ev; 1196 void im_cb (); im_watcher im_ev;
1275 void im_set_size (XRectangle &size); 1197 void im_set_size (XRectangle &size);
1276 void im_set_position (XPoint &pos) NOTHROW; 1198 void im_set_position (XPoint &pos) NOTHROW;
… …
1329 void set_utf8_property (Atom prop, const char *str, int len = -1); 1251 void set_utf8_property (Atom prop, const char *str, int len = -1);
1330 void set_title (const char *str); 1252 void set_title (const char *str);
1331 void set_icon_name (const char *str); 1253 void set_icon_name (const char *str);
1332 void set_window_color (int idx, const char *color); 1254 void set_window_color (int idx, const char *color);
1333 void set_colorfgbg (); 1255 void set_colorfgbg ();
1334 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1256 bool set_color (rxvt_color &color, const char *name);
1335 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1257 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1336 1258
1337 // screen.C 1259 // screen.C
1338 1260
1339 void lalloc (line_t &l) const NOTHROW 1261 void lalloc (line_t &l) const
1340 { 1262 {
1341 l.t = (text_t *)talloc->alloc (); 1263 l.t = (text_t *)talloc->alloc ();
1342 l.r = (rend_t *)ralloc->alloc (); 1264 l.r = (rend_t *)ralloc->alloc ();
1343 } 1265 }
1344 1266
… …
1348 talloc->free (l.t); 1270 talloc->free (l.t);
1349 ralloc->free (l.r); 1271 ralloc->free (l.r);
1350 } 1272 }
1351#endif 1273#endif
1352 1274
1353 void lresize (line_t &l) const NOTHROW 1275 void lresize (line_t &l) const
1354 { 1276 {
1355 if (!l.t) 1277 if (!l.t)
1356 return; 1278 return;
1357 1279
1358 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1280 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1426 void scr_remap_chars () NOTHROW; 1348 void scr_remap_chars () NOTHROW;
1427 void scr_remap_chars (line_t &l) NOTHROW; 1349 void scr_remap_chars (line_t &l) NOTHROW;
1428 1350
1429 enum cursor_mode { SAVE, RESTORE }; 1351 enum cursor_mode { SAVE, RESTORE };
1430 1352
1431 void scr_poweron () NOTHROW; 1353 void scr_poweron ();
1432 void scr_cursor (cursor_mode mode) NOTHROW; 1354 void scr_cursor (cursor_mode mode) NOTHROW;
1433 void scr_do_wrap () NOTHROW; 1355 void scr_do_wrap () NOTHROW;
1356 void scr_swap_screen () NOTHROW;
1434 int scr_change_screen (int scrn) NOTHROW; 1357 void scr_change_screen (int scrn);
1435 void scr_color (unsigned int color, int fgbg) NOTHROW; 1358 void scr_color (unsigned int color, int fgbg) NOTHROW;
1436 void scr_rendition (int set, int style) NOTHROW; 1359 void scr_rendition (int set, int style) NOTHROW;
1437 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1360 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1438 void scr_backspace () NOTHROW; 1361 void scr_backspace () NOTHROW;
1439 void scr_tab (int count, bool ht = false) NOTHROW; 1362 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1447 void scr_cursor_visible (int mode) NOTHROW; 1370 void scr_cursor_visible (int mode) NOTHROW;
1448 void scr_autowrap (int mode) NOTHROW; 1371 void scr_autowrap (int mode) NOTHROW;
1449 void scr_relative_origin (int mode) NOTHROW; 1372 void scr_relative_origin (int mode) NOTHROW;
1450 void scr_insert_mode (int mode) NOTHROW; 1373 void scr_insert_mode (int mode) NOTHROW;
1451 void scr_set_tab (int mode) NOTHROW; 1374 void scr_set_tab (int mode) NOTHROW;
1452 void scr_rvideo_mode (int mode) NOTHROW; 1375 void scr_rvideo_mode (bool on) NOTHROW;
1453 void scr_report_position () NOTHROW; 1376 void scr_report_position () NOTHROW;
1454 void set_font_style () NOTHROW; 1377 void set_font_style () NOTHROW;
1455 void scr_charset_choose (int set) NOTHROW; 1378 void scr_charset_choose (int set) NOTHROW;
1456 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1379 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1457 void scr_move_to (int y, int len) NOTHROW; 1380 void scr_move_to (int y, int len) NOTHROW;
… …
1531# define __PROTO(p) p 1454# define __PROTO(p) p
1532#else 1455#else
1533# define __PROTO(p) () 1456# define __PROTO(p) ()
1534#endif 1457#endif
1535 1458
1536#ifdef DEBUG_malloc
1537# include "dmalloc.h" /* This comes last */
1538#endif
1539
1540#endif /* _RXVT_H_ */ 1459#endif /* _RXVT_H_ */
1541 1460

Diff Legend

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