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.234 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.239 by root, Tue Jan 24 16:57:42 2006 UTC

… …
169extern char **environ; 169extern char **environ;
170extern char **rxvt_environ; // the original environ pointer 170extern char **rxvt_environ; // the original environ pointer
171 171
172inline void set_environ (stringvec *envv) 172inline void set_environ (stringvec *envv)
173{ 173{
174#if ENABLE_PERL
175 assert (envv);
176#else
174 if (envv) 177 if (envv)
178#endif
175 environ = (char **)envv->begin (); 179 environ = (char **)envv->begin ();
176} 180}
177 181
178inline void set_environ (char **envv) 182inline void set_environ (char **envv)
179{ 183{
184#if ENABLE_PERL
185 assert (envv);
186#else
180 if (envv) 187 if (envv)
188#endif
181 environ = envv; 189 environ = envv;
182} 190}
183 191
184/* 192/*
185 ***************************************************************************** 193 *****************************************************************************
… …
1149#endif 1157#endif
1150 1158
1151 // modifies first argument(!) 1159 // modifies first argument(!)
1152 void paste (char *data, unsigned int len) NOTHROW; 1160 void paste (char *data, unsigned int len) NOTHROW;
1153 1161
1154 long vt_emask, vt_emask_perl; 1162 long vt_emask, vt_emask_perl, vt_emask_xim;
1155 1163
1156 void vt_select_input () const NOTHROW 1164 void vt_select_input () const NOTHROW
1157 { 1165 {
1158 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1159 } 1167 }
1160 1168
1161#if TRANSPARENT 1169#if TRANSPARENT
1162 void rootwin_cb (XEvent &xev); 1170 void rootwin_cb (XEvent &xev);
1163 xevent_watcher rootwin_ev; 1171 xevent_watcher rootwin_ev;
… …
1249 void create_windows (int argc, const char *const *argv); 1257 void create_windows (int argc, const char *const *argv);
1250 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);
1251 void window_calc (unsigned int newwidth, unsigned int newheight); 1259 void window_calc (unsigned int newwidth, unsigned int newheight);
1252 1260
1253#if USE_XIM 1261#if USE_XIM
1254 rxvt_xim *input_method; 1262 rxvt_xim *input_method;
1255 XIC Input_Context; 1263 XIC Input_Context;
1256 XIMStyle input_style; 1264 XIMStyle input_style;
1257 XPoint spot; // most recently sent spot position 1265 XPoint spot; // most recently sent spot position
1258 1266
1259 void im_destroy (); 1267 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1268 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1269 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos) NOTHROW; 1270 void im_set_position (XPoint &pos) NOTHROW;
… …
1320 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1329 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 1330
1323 // screen.C 1331 // screen.C
1324 1332
1325 void lalloc (line_t &l) const NOTHROW 1333 void lalloc (line_t &l) const
1326 { 1334 {
1327 l.t = (text_t *)talloc->alloc (); 1335 l.t = (text_t *)talloc->alloc ();
1328 l.r = (rend_t *)ralloc->alloc (); 1336 l.r = (rend_t *)ralloc->alloc ();
1329 } 1337 }
1330 1338
… …
1334 talloc->free (l.t); 1342 talloc->free (l.t);
1335 ralloc->free (l.r); 1343 ralloc->free (l.r);
1336 } 1344 }
1337#endif 1345#endif
1338 1346
1339 void lresize (line_t &l) const NOTHROW 1347 void lresize (line_t &l) const
1340 { 1348 {
1341 if (!l.t) 1349 if (!l.t)
1342 return; 1350 return;
1343 1351
1344 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));
… …
1412 void scr_remap_chars () NOTHROW; 1420 void scr_remap_chars () NOTHROW;
1413 void scr_remap_chars (line_t &l) NOTHROW; 1421 void scr_remap_chars (line_t &l) NOTHROW;
1414 1422
1415 enum cursor_mode { SAVE, RESTORE }; 1423 enum cursor_mode { SAVE, RESTORE };
1416 1424
1417 void scr_poweron () NOTHROW; 1425 void scr_poweron ();
1418 void scr_cursor (cursor_mode mode) NOTHROW; 1426 void scr_cursor (cursor_mode mode) NOTHROW;
1419 void scr_do_wrap () NOTHROW; 1427 void scr_do_wrap () NOTHROW;
1428 void scr_swap_screen () NOTHROW;
1420 int scr_change_screen (int scrn) NOTHROW; 1429 void scr_change_screen (int scrn);
1421 void scr_color (unsigned int color, int fgbg) NOTHROW; 1430 void scr_color (unsigned int color, int fgbg) NOTHROW;
1422 void scr_rendition (int set, int style) NOTHROW; 1431 void scr_rendition (int set, int style) NOTHROW;
1423 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;
1424 void scr_backspace () NOTHROW; 1433 void scr_backspace () NOTHROW;
1425 void scr_tab (int count, bool ht = false) NOTHROW; 1434 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1517# define __PROTO(p) p 1526# define __PROTO(p) p
1518#else 1527#else
1519# define __PROTO(p) () 1528# define __PROTO(p) ()
1520#endif 1529#endif
1521 1530
1522#ifdef DEBUG_malloc
1523# include "dmalloc.h" /* This comes last */
1524#endif
1525
1526#endif /* _RXVT_H_ */ 1531#endif /* _RXVT_H_ */
1527 1532

Diff Legend

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