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.231 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.235 by root, Sun Jan 22 11:57:06 2006 UTC

… …
35#include "encoding.h" 35#include "encoding.h"
36#include "rxvtfont.h" 36#include "rxvtfont.h"
37#include "rxvttoolkit.h" 37#include "rxvttoolkit.h"
38#include "iom.h" 38#include "iom.h"
39#include "salloc.h" 39#include "salloc.h"
40#include "libptytty.h"
40 41
41#include "rxvtperl.h" 42#include "rxvtperl.h"
42 43
43// try to avoid some macros to decrease code size, on some systems 44// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 45#if ENABLE_MINIMAL
… …
141// misc.C 142// misc.C
142char * rxvt_wcstombs (const wchar_t *str, int len = -1); 143char * rxvt_wcstombs (const wchar_t *str, int len = -1);
143wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 144wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 145char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
145wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 146wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
147char * rxvt_strdup_cpp (const char *str);
146 148
147#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 149#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148 150
149char * rxvt_r_basename (const char *str) NOTHROW; 151char * rxvt_r_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 152void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
158char * rxvt_Str_trim (char *str) NOTHROW; 160char * rxvt_Str_trim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW; 161int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 162char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 163void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW; 164char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163void rxvt_usleep (int usecs) NOTHROW;
164 165
165///////////////////////////////////////////////////////////////////////////// 166/////////////////////////////////////////////////////////////////////////////
166 167
167// temporarily replace the process environment 168// temporarily replace the process environment
168extern char **environ; 169extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 170extern char **rxvt_environ; // the original environ pointer
170 171
171inline void set_environ (stringvec *envv) 172inline void set_environ (stringvec *envv)
172{ 173{
174#if ENABLE_PERL
175 assert (envv);
176#else
173 if (envv) 177 if (envv)
178#endif
174 environ = (char **)envv->begin (); 179 environ = (char **)envv->begin ();
175} 180}
176 181
177inline void set_environ (char **envv) 182inline void set_environ (char **envv)
178{ 183{
184#if ENABLE_PERL
185 assert (envv);
186#else
179 if (envv) 187 if (envv)
188#endif
180 environ = envv; 189 environ = envv;
181} 190}
182 191
183/* 192/*
184 ***************************************************************************** 193 *****************************************************************************
… …
200typedef struct { 209typedef struct {
201 short w, h, x, y; 210 short w, h, x, y;
202 Pixmap pixmap; 211 Pixmap pixmap;
203} bgPixmap_t; 212} bgPixmap_t;
204#endif 213#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 214
232/* 215/*
233 * the 'essential' information for reporting Mouse Events 216 * the 'essential' information for reporting Mouse Events
234 * pared down from XButtonEvent 217 * pared down from XButtonEvent
235 */ 218 */
… …
1153 const char *rs[NUM_RESOURCES]; 1136 const char *rs[NUM_RESOURCES];
1154 /* command input buffering */ 1137 /* command input buffering */
1155 char *cmdbuf_ptr, *cmdbuf_endp; 1138 char *cmdbuf_ptr, *cmdbuf_endp;
1156 char cmdbuf_base[CBUFSIZ]; 1139 char cmdbuf_base[CBUFSIZ];
1157 1140
1158 rxvt_ptytty *pty; 1141 ptytty *pty;
1159 1142
1160 rxvt_salloc *talloc; // text line allocator 1143 rxvt_salloc *talloc; // text line allocator
1161 rxvt_salloc *ralloc; // rend line allocator 1144 rxvt_salloc *ralloc; // rend line allocator
1162 1145
1163 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1146 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1238 rxvt_term (); 1221 rxvt_term ();
1239 ~rxvt_term (); 1222 ~rxvt_term ();
1240 void destroy (); 1223 void destroy ();
1241 void emergency_cleanup (); 1224 void emergency_cleanup ();
1242 1225
1243 bool init (int argc, const char *const *argv); 1226 bool init (int argc, const char *const *argv, stringvec *envv);
1227
1228 bool init (stringvec *argv, stringvec *envv)
1229 {
1230 this->argv = argv;
1231 return init (argv->size (), argv->begin (), envv);
1232 }
1233
1244 bool init_vars (); 1234 bool init_vars ();
1245 1235
1246 bool pty_fill (); 1236 bool pty_fill ();
1247 1237
1248 void make_current () const // make this the "currently active" urxvt instance 1238 void make_current () const // make this the "currently active" urxvt instance

Diff Legend

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