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.227 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.236 by root, Sun Jan 22 17:10:01 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 */
… …
664#endif 647#endif
665#if TRANSPARENT 648#if TRANSPARENT
666 XA_XROOTPMAP_ID, 649 XA_XROOTPMAP_ID,
667 XA_ESETROOT_PMAP_ID, 650 XA_ESETROOT_PMAP_ID,
668#endif 651#endif
669#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
670 XA_DNDPROTOCOL,
671 XA_DNDSELECTION,
672#endif
673#if ENABLE_XEMBED 652#if ENABLE_XEMBED
674 XA_XEMBED, 653 XA_XEMBED,
675 XA_XEMBED_INFO, 654 XA_XEMBED_INFO,
676#endif 655#endif
677 NUM_XA 656 NUM_XA
… …
1000#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 979#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1001 am_transparent:1, /* is a transparent term */ 980 am_transparent:1, /* is a transparent term */
1002 am_pixmap_trans:1, /* transparency w/known root pixmap */ 981 am_pixmap_trans:1, /* transparency w/known root pixmap */
1003#endif 982#endif
1004 current_screen:1, /* primary or secondary */ 983 current_screen:1, /* primary or secondary */
1005 hate_those_clicks:1, /* a.k.a. keep mark position */
1006 num_scr_allow:1, 984 num_scr_allow:1,
1007 bypass_keystate:1, 985 bypass_keystate:1,
1008#ifdef CURSOR_BLINK 986#ifdef CURSOR_BLINK
1009 hidden_cursor:1, 987 hidden_cursor:1,
1010#endif 988#endif
… …
1025#endif 1003#endif
1026 scrollbar_align, 1004 scrollbar_align,
1027 selection_wait, 1005 selection_wait,
1028 selection_type; 1006 selection_type;
1029/* ---------- */ 1007/* ---------- */
1008 bool rvideo_state, rvideo_mode;
1009#ifndef NO_BELL
1030 short rvideo; 1010 bool rvideo_bell;
1011#endif
1031 int num_scr; /* screen: number lines scrolled */ 1012 int num_scr; /* screen: number lines scrolled */
1032 int prev_ncol, /* screen: previous number of columns */ 1013 int prev_ncol, /* screen: previous number of columns */
1033 prev_nrow; /* screen: previous number of rows */ 1014 prev_nrow; /* screen: previous number of rows */
1034/* ---------- */ 1015/* ---------- */
1035 rend_t rstyle; 1016 rend_t rstyle;
… …
1155 const char *rs[NUM_RESOURCES]; 1136 const char *rs[NUM_RESOURCES];
1156 /* command input buffering */ 1137 /* command input buffering */
1157 char *cmdbuf_ptr, *cmdbuf_endp; 1138 char *cmdbuf_ptr, *cmdbuf_endp;
1158 char cmdbuf_base[CBUFSIZ]; 1139 char cmdbuf_base[CBUFSIZ];
1159 1140
1160 rxvt_ptytty *pty; 1141 ptytty *pty;
1161 1142
1162 rxvt_salloc *talloc; // text line allocator 1143 rxvt_salloc *talloc; // text line allocator
1163 rxvt_salloc *ralloc; // rend line allocator 1144 rxvt_salloc *ralloc; // rend line allocator
1164 1145
1165 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
… …
1200 1181
1201 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1182 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1202 void check_cb (check_watcher &w); check_watcher check_ev; 1183 void check_cb (check_watcher &w); check_watcher check_ev;
1203 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1184 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1204 void flush_cb (time_watcher &w); time_watcher flush_ev; 1185 void flush_cb (time_watcher &w); time_watcher flush_ev;
1205
1206 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1186 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1207
1208 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1187 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1209 1188
1210#ifdef CURSOR_BLINK 1189#ifdef CURSOR_BLINK
1211 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1190 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1212#endif 1191#endif
1213#ifdef TEXT_BLINK 1192#ifdef TEXT_BLINK
1214 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1193 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1194#endif
1195#ifndef NO_BELL
1196 void bell_cb (time_watcher &w); time_watcher bell_ev;
1215#endif 1197#endif
1216 1198
1217#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1199#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1218 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1200 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1219#endif 1201#endif
… …
1239 rxvt_term (); 1221 rxvt_term ();
1240 ~rxvt_term (); 1222 ~rxvt_term ();
1241 void destroy (); 1223 void destroy ();
1242 void emergency_cleanup (); 1224 void emergency_cleanup ();
1243 1225
1244 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
1245 bool init_vars (); 1234 bool init_vars ();
1246 1235
1247 bool pty_fill (); 1236 bool pty_fill ();
1248 1237
1249 void make_current () const // make this the "currently active" urxvt instance 1238 void make_current () const // make this the "currently active" urxvt instance
… …
1268 void create_windows (int argc, const char *const *argv); 1257 void create_windows (int argc, const char *const *argv);
1269 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);
1270 void window_calc (unsigned int newwidth, unsigned int newheight); 1259 void window_calc (unsigned int newwidth, unsigned int newheight);
1271 1260
1272#if USE_XIM 1261#if USE_XIM
1273 rxvt_xim *input_method; 1262 rxvt_xim *input_method;
1274 XIC Input_Context; 1263 XIC Input_Context;
1275 XIMStyle input_style; 1264 XIMStyle input_style;
1276 XPoint spot; // most recently sent spot position 1265 XPoint spot; // most recently sent spot position
1277 1266
1278 void im_destroy (); 1267 void im_destroy ();
1279 void im_cb (); im_watcher im_ev; 1268 void im_cb (); im_watcher im_ev;
1280 void im_set_size (XRectangle &size); 1269 void im_set_size (XRectangle &size);
1281 void im_set_position (XPoint &pos) NOTHROW; 1270 void im_set_position (XPoint &pos) NOTHROW;
… …
1452 void scr_cursor_visible (int mode) NOTHROW; 1441 void scr_cursor_visible (int mode) NOTHROW;
1453 void scr_autowrap (int mode) NOTHROW; 1442 void scr_autowrap (int mode) NOTHROW;
1454 void scr_relative_origin (int mode) NOTHROW; 1443 void scr_relative_origin (int mode) NOTHROW;
1455 void scr_insert_mode (int mode) NOTHROW; 1444 void scr_insert_mode (int mode) NOTHROW;
1456 void scr_set_tab (int mode) NOTHROW; 1445 void scr_set_tab (int mode) NOTHROW;
1457 void scr_rvideo_mode (int mode) NOTHROW; 1446 void scr_rvideo_mode (bool on) NOTHROW;
1458 void scr_report_position () NOTHROW; 1447 void scr_report_position () NOTHROW;
1459 void set_font_style () NOTHROW; 1448 void set_font_style () NOTHROW;
1460 void scr_charset_choose (int set) NOTHROW; 1449 void scr_charset_choose (int set) NOTHROW;
1461 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1450 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1462 void scr_move_to (int y, int len) NOTHROW; 1451 void scr_move_to (int y, int len) NOTHROW;
… …
1470 void scr_dump (int fd) NOTHROW; 1459 void scr_dump (int fd) NOTHROW;
1471 1460
1472 void selection_check (int check_more) NOTHROW; 1461 void selection_check (int check_more) NOTHROW;
1473 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1462 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1474 void selection_property (Window win, Atom prop) NOTHROW; 1463 void selection_property (Window win, Atom prop) NOTHROW;
1475 void selection_request (Time tm, int selnum) NOTHROW; 1464 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1476 int selection_request_other (Atom target, int selnum) NOTHROW; 1465 int selection_request_other (Atom target, int selnum) NOTHROW;
1477 void selection_clear () NOTHROW; 1466 void selection_clear () NOTHROW;
1478 void selection_make (Time tm); 1467 void selection_make (Time tm);
1479 bool selection_grab (Time tm) NOTHROW; 1468 bool selection_grab (Time tm) NOTHROW;
1480 void selection_start_colrow (int col, int row) NOTHROW; 1469 void selection_start_colrow (int col, int row) NOTHROW;

Diff Legend

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