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.232 by root, Sat Jan 21 23:50:33 2006 UTC vs.
Revision 1.239 by root, Tue Jan 24 16:57:42 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;
… …
167extern char **environ; 169extern char **environ;
168extern char **rxvt_environ; // the original environ pointer 170extern char **rxvt_environ; // the original environ pointer
169 171
170inline void set_environ (stringvec *envv) 172inline void set_environ (stringvec *envv)
171{ 173{
174#if ENABLE_PERL
175 assert (envv);
176#else
172 if (envv) 177 if (envv)
178#endif
173 environ = (char **)envv->begin (); 179 environ = (char **)envv->begin ();
174} 180}
175 181
176inline void set_environ (char **envv) 182inline void set_environ (char **envv)
177{ 183{
184#if ENABLE_PERL
185 assert (envv);
186#else
178 if (envv) 187 if (envv)
188#endif
179 environ = envv; 189 environ = envv;
180} 190}
181 191
182/* 192/*
183 ***************************************************************************** 193 *****************************************************************************
… …
199typedef struct { 209typedef struct {
200 short w, h, x, y; 210 short w, h, x, y;
201 Pixmap pixmap; 211 Pixmap pixmap;
202} bgPixmap_t; 212} bgPixmap_t;
203#endif 213#endif
204
205struct rxvt_ptytty {
206 int pty; // pty file descriptor; connected to rxvt
207 int tty; // tty file descriptor; connected to child
208
209 rxvt_ptytty ()
210 : pty(-1), tty(-1)
211 {
212 }
213
214 virtual ~rxvt_ptytty ()
215 {
216 }
217
218 virtual bool get () = 0;
219#if UTMP_SUPPORT
220 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
221#endif
222
223 void close_tty ();
224 bool make_controlling_tty ();
225 void set_utf8_mode (bool on);
226};
227
228rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
229void rxvt_ptytty_server (); // start the ptytty server process
230 214
231/* 215/*
232 * the 'essential' information for reporting Mouse Events 216 * the 'essential' information for reporting Mouse Events
233 * pared down from XButtonEvent 217 * pared down from XButtonEvent
234 */ 218 */
… …
1152 const char *rs[NUM_RESOURCES]; 1136 const char *rs[NUM_RESOURCES];
1153 /* command input buffering */ 1137 /* command input buffering */
1154 char *cmdbuf_ptr, *cmdbuf_endp; 1138 char *cmdbuf_ptr, *cmdbuf_endp;
1155 char cmdbuf_base[CBUFSIZ]; 1139 char cmdbuf_base[CBUFSIZ];
1156 1140
1157 rxvt_ptytty *pty; 1141 ptytty *pty;
1158 1142
1159 rxvt_salloc *talloc; // text line allocator 1143 rxvt_salloc *talloc; // text line allocator
1160 rxvt_salloc *ralloc; // rend line allocator 1144 rxvt_salloc *ralloc; // rend line allocator
1161 1145
1162 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
… …
1173#endif 1157#endif
1174 1158
1175 // modifies first argument(!) 1159 // modifies first argument(!)
1176 void paste (char *data, unsigned int len) NOTHROW; 1160 void paste (char *data, unsigned int len) NOTHROW;
1177 1161
1178 long vt_emask, vt_emask_perl; 1162 long vt_emask, vt_emask_perl, vt_emask_xim;
1179 1163
1180 void vt_select_input () const NOTHROW 1164 void vt_select_input () const NOTHROW
1181 { 1165 {
1182 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1183 } 1167 }
1184 1168
1185#if TRANSPARENT 1169#if TRANSPARENT
1186 void rootwin_cb (XEvent &xev); 1170 void rootwin_cb (XEvent &xev);
1187 xevent_watcher rootwin_ev; 1171 xevent_watcher rootwin_ev;
… …
1237 rxvt_term (); 1221 rxvt_term ();
1238 ~rxvt_term (); 1222 ~rxvt_term ();
1239 void destroy (); 1223 void destroy ();
1240 void emergency_cleanup (); 1224 void emergency_cleanup ();
1241 1225
1242 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
1243 bool init_vars (); 1234 bool init_vars ();
1244 1235
1245 bool pty_fill (); 1236 bool pty_fill ();
1246 1237
1247 void make_current () const // make this the "currently active" urxvt instance 1238 void make_current () const // make this the "currently active" urxvt instance
… …
1266 void create_windows (int argc, const char *const *argv); 1257 void create_windows (int argc, const char *const *argv);
1267 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1258 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1268 void window_calc (unsigned int newwidth, unsigned int newheight); 1259 void window_calc (unsigned int newwidth, unsigned int newheight);
1269 1260
1270#if USE_XIM 1261#if USE_XIM
1271 rxvt_xim *input_method; 1262 rxvt_xim *input_method;
1272 XIC Input_Context; 1263 XIC Input_Context;
1273 XIMStyle input_style; 1264 XIMStyle input_style;
1274 XPoint spot; // most recently sent spot position 1265 XPoint spot; // most recently sent spot position
1275 1266
1276 void im_destroy (); 1267 void im_destroy ();
1277 void im_cb (); im_watcher im_ev; 1268 void im_cb (); im_watcher im_ev;
1278 void im_set_size (XRectangle &size); 1269 void im_set_size (XRectangle &size);
1279 void im_set_position (XPoint &pos) NOTHROW; 1270 void im_set_position (XPoint &pos) NOTHROW;
… …
1337 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1338 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1329 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1339 1330
1340 // screen.C 1331 // screen.C
1341 1332
1342 void lalloc (line_t &l) const NOTHROW 1333 void lalloc (line_t &l) const
1343 { 1334 {
1344 l.t = (text_t *)talloc->alloc (); 1335 l.t = (text_t *)talloc->alloc ();
1345 l.r = (rend_t *)ralloc->alloc (); 1336 l.r = (rend_t *)ralloc->alloc ();
1346 } 1337 }
1347 1338
… …
1351 talloc->free (l.t); 1342 talloc->free (l.t);
1352 ralloc->free (l.r); 1343 ralloc->free (l.r);
1353 } 1344 }
1354#endif 1345#endif
1355 1346
1356 void lresize (line_t &l) const NOTHROW 1347 void lresize (line_t &l) const
1357 { 1348 {
1358 if (!l.t) 1349 if (!l.t)
1359 return; 1350 return;
1360 1351
1361 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1352 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1429 void scr_remap_chars () NOTHROW; 1420 void scr_remap_chars () NOTHROW;
1430 void scr_remap_chars (line_t &l) NOTHROW; 1421 void scr_remap_chars (line_t &l) NOTHROW;
1431 1422
1432 enum cursor_mode { SAVE, RESTORE }; 1423 enum cursor_mode { SAVE, RESTORE };
1433 1424
1434 void scr_poweron () NOTHROW; 1425 void scr_poweron ();
1435 void scr_cursor (cursor_mode mode) NOTHROW; 1426 void scr_cursor (cursor_mode mode) NOTHROW;
1436 void scr_do_wrap () NOTHROW; 1427 void scr_do_wrap () NOTHROW;
1428 void scr_swap_screen () NOTHROW;
1437 int scr_change_screen (int scrn) NOTHROW; 1429 void scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg) NOTHROW; 1430 void scr_color (unsigned int color, int fgbg) NOTHROW;
1439 void scr_rendition (int set, int style) NOTHROW; 1431 void scr_rendition (int set, int style) NOTHROW;
1440 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1432 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1441 void scr_backspace () NOTHROW; 1433 void scr_backspace () NOTHROW;
1442 void scr_tab (int count, bool ht = false) NOTHROW; 1434 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1534# define __PROTO(p) p 1526# define __PROTO(p) p
1535#else 1527#else
1536# define __PROTO(p) () 1528# define __PROTO(p) ()
1537#endif 1529#endif
1538 1530
1539#ifdef DEBUG_malloc
1540# include "dmalloc.h" /* This comes last */
1541#endif
1542
1543#endif /* _RXVT_H_ */ 1531#endif /* _RXVT_H_ */
1544 1532

Diff Legend

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