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.233 by root, Sun Jan 22 00:36:59 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
… …
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 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
221
222 void close_tty ();
223 bool make_controlling_tty ();
224 void set_utf8_mode (bool on);
225};
226
227rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
228void rxvt_ptytty_server (); // start the ptytty server process
229 214
230/* 215/*
231 * the 'essential' information for reporting Mouse Events 216 * the 'essential' information for reporting Mouse Events
232 * pared down from XButtonEvent 217 * pared down from XButtonEvent
233 */ 218 */
… …
1151 const char *rs[NUM_RESOURCES]; 1136 const char *rs[NUM_RESOURCES];
1152 /* command input buffering */ 1137 /* command input buffering */
1153 char *cmdbuf_ptr, *cmdbuf_endp; 1138 char *cmdbuf_ptr, *cmdbuf_endp;
1154 char cmdbuf_base[CBUFSIZ]; 1139 char cmdbuf_base[CBUFSIZ];
1155 1140
1156 rxvt_ptytty *pty; 1141 ptytty *pty;
1157 1142
1158 rxvt_salloc *talloc; // text line allocator 1143 rxvt_salloc *talloc; // text line allocator
1159 rxvt_salloc *ralloc; // rend line allocator 1144 rxvt_salloc *ralloc; // rend line allocator
1160 1145
1161 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
… …
1172#endif 1157#endif
1173 1158
1174 // modifies first argument(!) 1159 // modifies first argument(!)
1175 void paste (char *data, unsigned int len) NOTHROW; 1160 void paste (char *data, unsigned int len) NOTHROW;
1176 1161
1177 long vt_emask, vt_emask_perl; 1162 long vt_emask, vt_emask_perl, vt_emask_xim;
1178 1163
1179 void vt_select_input () const NOTHROW 1164 void vt_select_input () const NOTHROW
1180 { 1165 {
1181 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1182 } 1167 }
1183 1168
1184#if TRANSPARENT 1169#if TRANSPARENT
1185 void rootwin_cb (XEvent &xev); 1170 void rootwin_cb (XEvent &xev);
1186 xevent_watcher rootwin_ev; 1171 xevent_watcher rootwin_ev;
… …
1272 void create_windows (int argc, const char *const *argv); 1257 void create_windows (int argc, const char *const *argv);
1273 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);
1274 void window_calc (unsigned int newwidth, unsigned int newheight); 1259 void window_calc (unsigned int newwidth, unsigned int newheight);
1275 1260
1276#if USE_XIM 1261#if USE_XIM
1277 rxvt_xim *input_method; 1262 rxvt_xim *input_method;
1278 XIC Input_Context; 1263 XIC Input_Context;
1279 XIMStyle input_style; 1264 XIMStyle input_style;
1280 XPoint spot; // most recently sent spot position 1265 XPoint spot; // most recently sent spot position
1281 1266
1282 void im_destroy (); 1267 void im_destroy ();
1283 void im_cb (); im_watcher im_ev; 1268 void im_cb (); im_watcher im_ev;
1284 void im_set_size (XRectangle &size); 1269 void im_set_size (XRectangle &size);
1285 void im_set_position (XPoint &pos) NOTHROW; 1270 void im_set_position (XPoint &pos) NOTHROW;
… …
1343 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1344 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1329 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1345 1330
1346 // screen.C 1331 // screen.C
1347 1332
1348 void lalloc (line_t &l) const NOTHROW 1333 void lalloc (line_t &l) const
1349 { 1334 {
1350 l.t = (text_t *)talloc->alloc (); 1335 l.t = (text_t *)talloc->alloc ();
1351 l.r = (rend_t *)ralloc->alloc (); 1336 l.r = (rend_t *)ralloc->alloc ();
1352 } 1337 }
1353 1338
… …
1357 talloc->free (l.t); 1342 talloc->free (l.t);
1358 ralloc->free (l.r); 1343 ralloc->free (l.r);
1359 } 1344 }
1360#endif 1345#endif
1361 1346
1362 void lresize (line_t &l) const NOTHROW 1347 void lresize (line_t &l) const
1363 { 1348 {
1364 if (!l.t) 1349 if (!l.t)
1365 return; 1350 return;
1366 1351
1367 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));
… …
1435 void scr_remap_chars () NOTHROW; 1420 void scr_remap_chars () NOTHROW;
1436 void scr_remap_chars (line_t &l) NOTHROW; 1421 void scr_remap_chars (line_t &l) NOTHROW;
1437 1422
1438 enum cursor_mode { SAVE, RESTORE }; 1423 enum cursor_mode { SAVE, RESTORE };
1439 1424
1440 void scr_poweron () NOTHROW; 1425 void scr_poweron ();
1441 void scr_cursor (cursor_mode mode) NOTHROW; 1426 void scr_cursor (cursor_mode mode) NOTHROW;
1442 void scr_do_wrap () NOTHROW; 1427 void scr_do_wrap () NOTHROW;
1428 void scr_swap_screen () NOTHROW;
1443 int scr_change_screen (int scrn) NOTHROW; 1429 void scr_change_screen (int scrn);
1444 void scr_color (unsigned int color, int fgbg) NOTHROW; 1430 void scr_color (unsigned int color, int fgbg) NOTHROW;
1445 void scr_rendition (int set, int style) NOTHROW; 1431 void scr_rendition (int set, int style) NOTHROW;
1446 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;
1447 void scr_backspace () NOTHROW; 1433 void scr_backspace () NOTHROW;
1448 void scr_tab (int count, bool ht = false) NOTHROW; 1434 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1540# define __PROTO(p) p 1526# define __PROTO(p) p
1541#else 1527#else
1542# define __PROTO(p) () 1528# define __PROTO(p) ()
1543#endif 1529#endif
1544 1530
1545#ifdef DEBUG_malloc
1546# include "dmalloc.h" /* This comes last */
1547#endif
1548
1549#endif /* _RXVT_H_ */ 1531#endif /* _RXVT_H_ */
1550 1532

Diff Legend

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