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.229 by root, Fri Jan 20 11:02:46 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 */
… …
996#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 979#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
997 am_transparent:1, /* is a transparent term */ 980 am_transparent:1, /* is a transparent term */
998 am_pixmap_trans:1, /* transparency w/known root pixmap */ 981 am_pixmap_trans:1, /* transparency w/known root pixmap */
999#endif 982#endif
1000 current_screen:1, /* primary or secondary */ 983 current_screen:1, /* primary or secondary */
1001 hate_those_clicks:1, /* a.k.a. keep mark position */
1002 num_scr_allow:1, 984 num_scr_allow:1,
1003 bypass_keystate:1, 985 bypass_keystate:1,
1004#ifdef CURSOR_BLINK 986#ifdef CURSOR_BLINK
1005 hidden_cursor:1, 987 hidden_cursor:1,
1006#endif 988#endif
… …
1021#endif 1003#endif
1022 scrollbar_align, 1004 scrollbar_align,
1023 selection_wait, 1005 selection_wait,
1024 selection_type; 1006 selection_type;
1025/* ---------- */ 1007/* ---------- */
1008 bool rvideo_state, rvideo_mode;
1009#ifndef NO_BELL
1026 short rvideo; 1010 bool rvideo_bell;
1011#endif
1027 int num_scr; /* screen: number lines scrolled */ 1012 int num_scr; /* screen: number lines scrolled */
1028 int prev_ncol, /* screen: previous number of columns */ 1013 int prev_ncol, /* screen: previous number of columns */
1029 prev_nrow; /* screen: previous number of rows */ 1014 prev_nrow; /* screen: previous number of rows */
1030/* ---------- */ 1015/* ---------- */
1031 rend_t rstyle; 1016 rend_t rstyle;
… …
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
… …
1196 1181
1197 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;
1198 void check_cb (check_watcher &w); check_watcher check_ev; 1183 void check_cb (check_watcher &w); check_watcher check_ev;
1199 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1184 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1200 void flush_cb (time_watcher &w); time_watcher flush_ev; 1185 void flush_cb (time_watcher &w); time_watcher flush_ev;
1201
1202 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;
1203
1204 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1187 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1205 1188
1206#ifdef CURSOR_BLINK 1189#ifdef CURSOR_BLINK
1207 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;
1208#endif 1191#endif
1209#ifdef TEXT_BLINK 1192#ifdef TEXT_BLINK
1210 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;
1211#endif 1197#endif
1212 1198
1213#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1199#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1214 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;
1215#endif 1201#endif
… …
1235 rxvt_term (); 1221 rxvt_term ();
1236 ~rxvt_term (); 1222 ~rxvt_term ();
1237 void destroy (); 1223 void destroy ();
1238 void emergency_cleanup (); 1224 void emergency_cleanup ();
1239 1225
1240 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
1241 bool init_vars (); 1234 bool init_vars ();
1242 1235
1243 bool pty_fill (); 1236 bool pty_fill ();
1244 1237
1245 void make_current () const // make this the "currently active" urxvt instance 1238 void make_current () const // make this the "currently active" urxvt instance
… …
1264 void create_windows (int argc, const char *const *argv); 1257 void create_windows (int argc, const char *const *argv);
1265 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);
1266 void window_calc (unsigned int newwidth, unsigned int newheight); 1259 void window_calc (unsigned int newwidth, unsigned int newheight);
1267 1260
1268#if USE_XIM 1261#if USE_XIM
1269 rxvt_xim *input_method; 1262 rxvt_xim *input_method;
1270 XIC Input_Context; 1263 XIC Input_Context;
1271 XIMStyle input_style; 1264 XIMStyle input_style;
1272 XPoint spot; // most recently sent spot position 1265 XPoint spot; // most recently sent spot position
1273 1266
1274 void im_destroy (); 1267 void im_destroy ();
1275 void im_cb (); im_watcher im_ev; 1268 void im_cb (); im_watcher im_ev;
1276 void im_set_size (XRectangle &size); 1269 void im_set_size (XRectangle &size);
1277 void im_set_position (XPoint &pos) NOTHROW; 1270 void im_set_position (XPoint &pos) NOTHROW;
… …
1448 void scr_cursor_visible (int mode) NOTHROW; 1441 void scr_cursor_visible (int mode) NOTHROW;
1449 void scr_autowrap (int mode) NOTHROW; 1442 void scr_autowrap (int mode) NOTHROW;
1450 void scr_relative_origin (int mode) NOTHROW; 1443 void scr_relative_origin (int mode) NOTHROW;
1451 void scr_insert_mode (int mode) NOTHROW; 1444 void scr_insert_mode (int mode) NOTHROW;
1452 void scr_set_tab (int mode) NOTHROW; 1445 void scr_set_tab (int mode) NOTHROW;
1453 void scr_rvideo_mode (int mode) NOTHROW; 1446 void scr_rvideo_mode (bool on) NOTHROW;
1454 void scr_report_position () NOTHROW; 1447 void scr_report_position () NOTHROW;
1455 void set_font_style () NOTHROW; 1448 void set_font_style () NOTHROW;
1456 void scr_charset_choose (int set) NOTHROW; 1449 void scr_charset_choose (int set) NOTHROW;
1457 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1450 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1458 void scr_move_to (int y, int len) NOTHROW; 1451 void scr_move_to (int y, int len) NOTHROW;

Diff Legend

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