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.230 by root, Fri Jan 20 22:49:34 2006 UTC vs.
Revision 1.241 by root, Wed Jan 25 00:42:20 2006 UTC

… …
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
21#else 22#else
22# define ENABLE_MINIMAL 1 23# define ENABLE_MINIMAL 1
23#endif 24#endif
24 25
… …
35#include "encoding.h" 36#include "encoding.h"
36#include "rxvtfont.h" 37#include "rxvtfont.h"
37#include "rxvttoolkit.h" 38#include "rxvttoolkit.h"
38#include "iom.h" 39#include "iom.h"
39#include "salloc.h" 40#include "salloc.h"
41#include "libptytty.h"
40 42
41#include "rxvtperl.h" 43#include "rxvtperl.h"
42 44
43// try to avoid some macros to decrease code size, on some systems 45// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 46#if ENABLE_MINIMAL
… …
141// misc.C 143// misc.C
142char * rxvt_wcstombs (const wchar_t *str, int len = -1); 144char * rxvt_wcstombs (const wchar_t *str, int len = -1);
143wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 145wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
145wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 147wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
148char * rxvt_strdup_cpp (const char *str);
146 149
147#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 150#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148 151
149char * rxvt_r_basename (const char *str) NOTHROW; 152char * rxvt_r_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
158char * rxvt_Str_trim (char *str) NOTHROW; 161char * rxvt_Str_trim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW; 162int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 163char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 164void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW; 165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163void rxvt_usleep (int usecs) NOTHROW;
164 166
165///////////////////////////////////////////////////////////////////////////// 167/////////////////////////////////////////////////////////////////////////////
166 168
167// temporarily replace the process environment 169// temporarily replace the process environment
168extern char **environ; 170extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 171extern char **rxvt_environ; // the original environ pointer
170 172
171inline void set_environ (stringvec *envv) 173inline void set_environ (stringvec *envv)
172{ 174{
175#if ENABLE_PERL
176 assert (envv);
177#else
173 if (envv) 178 if (envv)
179#endif
174 environ = (char **)envv->begin (); 180 environ = (char **)envv->begin ();
175} 181}
176 182
177inline void set_environ (char **envv) 183inline void set_environ (char **envv)
178{ 184{
185#if ENABLE_PERL
186 assert (envv);
187#else
179 if (envv) 188 if (envv)
189#endif
180 environ = envv; 190 environ = envv;
181} 191}
182 192
183/* 193/*
184 ***************************************************************************** 194 *****************************************************************************
… …
200typedef struct { 210typedef struct {
201 short w, h, x, y; 211 short w, h, x, y;
202 Pixmap pixmap; 212 Pixmap pixmap;
203} bgPixmap_t; 213} bgPixmap_t;
204#endif 214#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 215
232/* 216/*
233 * the 'essential' information for reporting Mouse Events 217 * the 'essential' information for reporting Mouse Events
234 * pared down from XButtonEvent 218 * pared down from XButtonEvent
235 */ 219 */
… …
753 ***************************************************************************** 737 *****************************************************************************
754 */ 738 */
755#define dLocal(type,name) type const name = this->name 739#define dLocal(type,name) type const name = this->name
756#define dDisp Display *disp = this->display->display 740#define dDisp Display *disp = this->display->display
757 741
742// for speed reasons, we assume that all latin1 characters
743// are single-width (the first unicdoe combining character
744// is actually 0x300, but ascii is what matters most).
745#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
746
758/* convert pixel dimensions to row/column values. Everything as int32_t */ 747/* convert pixel dimensions to row/column values. Everything as int32_t */
759#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 748#define Pixel2Col(x) Pixel2Width((int32_t)(x))
760#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 749#define Pixel2Row(y) Pixel2Height((int32_t)(y))
761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 750#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
762#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight) 751#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
… …
838 827
839#ifdef XPM_BACKGROUND 828#ifdef XPM_BACKGROUND
840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 829# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
841#else 830#else
842# define XPMClearArea(a, b, c, d, e, f, g) 831# define XPMClearArea(a, b, c, d, e, f, g)
843#endif
844
845#ifdef DEBUG_CMD
846# define D_CMD(x) fprintf x ; fputc('\n', stderr)
847#else
848# define D_CMD(x)
849#endif
850#ifdef DEBUG_INIT
851# define D_INIT(x) fprintf x ; fputc('\n', stderr)
852#else
853# define D_INIT(x)
854#endif
855#ifdef DEBUG_MAIN
856# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
857#else
858# define D_MAIN(x)
859#endif
860#ifdef DEBUG_SIZE
861# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
862#else
863# define D_SIZE(x)
864#endif 832#endif
865 833
866typedef callback1<void, const char *> log_callback; 834typedef callback1<void, const char *> log_callback;
867typedef callback1<int, int> getfd_callback; 835typedef callback1<int, int> getfd_callback;
868 836
… …
1020#endif 988#endif
1021 scrollbar_align, 989 scrollbar_align,
1022 selection_wait, 990 selection_wait,
1023 selection_type; 991 selection_type;
1024/* ---------- */ 992/* ---------- */
993 bool rvideo_state, rvideo_mode;
994#ifndef NO_BELL
1025 short rvideo; 995 bool rvideo_bell;
996#endif
1026 int num_scr; /* screen: number lines scrolled */ 997 int num_scr; /* screen: number lines scrolled */
1027 int prev_ncol, /* screen: previous number of columns */ 998 int prev_ncol, /* screen: previous number of columns */
1028 prev_nrow; /* screen: previous number of rows */ 999 prev_nrow; /* screen: previous number of rows */
1029/* ---------- */ 1000/* ---------- */
1030 rend_t rstyle; 1001 rend_t rstyle;
… …
1150 const char *rs[NUM_RESOURCES]; 1121 const char *rs[NUM_RESOURCES];
1151 /* command input buffering */ 1122 /* command input buffering */
1152 char *cmdbuf_ptr, *cmdbuf_endp; 1123 char *cmdbuf_ptr, *cmdbuf_endp;
1153 char cmdbuf_base[CBUFSIZ]; 1124 char cmdbuf_base[CBUFSIZ];
1154 1125
1155 rxvt_ptytty *pty; 1126 ptytty *pty;
1156 1127
1157 rxvt_salloc *talloc; // text line allocator 1128 rxvt_salloc *talloc; // text line allocator
1158 rxvt_salloc *ralloc; // rend line allocator 1129 rxvt_salloc *ralloc; // rend line allocator
1159 1130
1160 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1131 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1171#endif 1142#endif
1172 1143
1173 // modifies first argument(!) 1144 // modifies first argument(!)
1174 void paste (char *data, unsigned int len) NOTHROW; 1145 void paste (char *data, unsigned int len) NOTHROW;
1175 1146
1176 long vt_emask, vt_emask_perl; 1147 long vt_emask, vt_emask_perl, vt_emask_xim;
1177 1148
1178 void vt_select_input () const NOTHROW 1149 void vt_select_input () const NOTHROW
1179 { 1150 {
1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1151 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1181 } 1152 }
1182 1153
1183#if TRANSPARENT 1154#if TRANSPARENT
1184 void rootwin_cb (XEvent &xev); 1155 void rootwin_cb (XEvent &xev);
1185 xevent_watcher rootwin_ev; 1156 xevent_watcher rootwin_ev;
… …
1195 1166
1196 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1167 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1197 void check_cb (check_watcher &w); check_watcher check_ev; 1168 void check_cb (check_watcher &w); check_watcher check_ev;
1198 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1169 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1199 void flush_cb (time_watcher &w); time_watcher flush_ev; 1170 void flush_cb (time_watcher &w); time_watcher flush_ev;
1200
1201 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1171 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1202
1203 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1172 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1204 1173
1205#ifdef CURSOR_BLINK 1174#ifdef CURSOR_BLINK
1206 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1175 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1207#endif 1176#endif
1208#ifdef TEXT_BLINK 1177#ifdef TEXT_BLINK
1209 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1178 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1179#endif
1180#ifndef NO_BELL
1181 void bell_cb (time_watcher &w); time_watcher bell_ev;
1210#endif 1182#endif
1211 1183
1212#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1184#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1213 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1185 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1214#endif 1186#endif
… …
1234 rxvt_term (); 1206 rxvt_term ();
1235 ~rxvt_term (); 1207 ~rxvt_term ();
1236 void destroy (); 1208 void destroy ();
1237 void emergency_cleanup (); 1209 void emergency_cleanup ();
1238 1210
1239 bool init (int argc, const char *const *argv); 1211 bool init (int argc, const char *const *argv, stringvec *envv);
1212
1213 bool init (stringvec *argv, stringvec *envv)
1214 {
1215 this->argv = argv;
1216 return init (argv->size (), argv->begin (), envv);
1217 }
1218
1240 bool init_vars (); 1219 bool init_vars ();
1241 1220
1242 bool pty_fill (); 1221 bool pty_fill ();
1243 1222
1244 void make_current () const // make this the "currently active" urxvt instance 1223 void make_current () const // make this the "currently active" urxvt instance
… …
1263 void create_windows (int argc, const char *const *argv); 1242 void create_windows (int argc, const char *const *argv);
1264 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1243 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1265 void window_calc (unsigned int newwidth, unsigned int newheight); 1244 void window_calc (unsigned int newwidth, unsigned int newheight);
1266 1245
1267#if USE_XIM 1246#if USE_XIM
1268 rxvt_xim *input_method; 1247 rxvt_xim *input_method;
1269 XIC Input_Context; 1248 XIC Input_Context;
1270 XIMStyle input_style; 1249 XIMStyle input_style;
1271 XPoint spot; // most recently sent spot position 1250 XPoint spot; // most recently sent spot position
1272 1251
1273 void im_destroy (); 1252 void im_destroy ();
1274 void im_cb (); im_watcher im_ev; 1253 void im_cb (); im_watcher im_ev;
1275 void im_set_size (XRectangle &size); 1254 void im_set_size (XRectangle &size);
1276 void im_set_position (XPoint &pos) NOTHROW; 1255 void im_set_position (XPoint &pos) NOTHROW;
… …
1334 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1313 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1335 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1314 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1336 1315
1337 // screen.C 1316 // screen.C
1338 1317
1339 void lalloc (line_t &l) const NOTHROW 1318 void lalloc (line_t &l) const
1340 { 1319 {
1341 l.t = (text_t *)talloc->alloc (); 1320 l.t = (text_t *)talloc->alloc ();
1342 l.r = (rend_t *)ralloc->alloc (); 1321 l.r = (rend_t *)ralloc->alloc ();
1343 } 1322 }
1344 1323
… …
1348 talloc->free (l.t); 1327 talloc->free (l.t);
1349 ralloc->free (l.r); 1328 ralloc->free (l.r);
1350 } 1329 }
1351#endif 1330#endif
1352 1331
1353 void lresize (line_t &l) const NOTHROW 1332 void lresize (line_t &l) const
1354 { 1333 {
1355 if (!l.t) 1334 if (!l.t)
1356 return; 1335 return;
1357 1336
1358 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1337 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1426 void scr_remap_chars () NOTHROW; 1405 void scr_remap_chars () NOTHROW;
1427 void scr_remap_chars (line_t &l) NOTHROW; 1406 void scr_remap_chars (line_t &l) NOTHROW;
1428 1407
1429 enum cursor_mode { SAVE, RESTORE }; 1408 enum cursor_mode { SAVE, RESTORE };
1430 1409
1431 void scr_poweron () NOTHROW; 1410 void scr_poweron ();
1432 void scr_cursor (cursor_mode mode) NOTHROW; 1411 void scr_cursor (cursor_mode mode) NOTHROW;
1433 void scr_do_wrap () NOTHROW; 1412 void scr_do_wrap () NOTHROW;
1413 void scr_swap_screen () NOTHROW;
1434 int scr_change_screen (int scrn) NOTHROW; 1414 void scr_change_screen (int scrn);
1435 void scr_color (unsigned int color, int fgbg) NOTHROW; 1415 void scr_color (unsigned int color, int fgbg) NOTHROW;
1436 void scr_rendition (int set, int style) NOTHROW; 1416 void scr_rendition (int set, int style) NOTHROW;
1437 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1417 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1438 void scr_backspace () NOTHROW; 1418 void scr_backspace () NOTHROW;
1439 void scr_tab (int count, bool ht = false) NOTHROW; 1419 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1447 void scr_cursor_visible (int mode) NOTHROW; 1427 void scr_cursor_visible (int mode) NOTHROW;
1448 void scr_autowrap (int mode) NOTHROW; 1428 void scr_autowrap (int mode) NOTHROW;
1449 void scr_relative_origin (int mode) NOTHROW; 1429 void scr_relative_origin (int mode) NOTHROW;
1450 void scr_insert_mode (int mode) NOTHROW; 1430 void scr_insert_mode (int mode) NOTHROW;
1451 void scr_set_tab (int mode) NOTHROW; 1431 void scr_set_tab (int mode) NOTHROW;
1452 void scr_rvideo_mode (int mode) NOTHROW; 1432 void scr_rvideo_mode (bool on) NOTHROW;
1453 void scr_report_position () NOTHROW; 1433 void scr_report_position () NOTHROW;
1454 void set_font_style () NOTHROW; 1434 void set_font_style () NOTHROW;
1455 void scr_charset_choose (int set) NOTHROW; 1435 void scr_charset_choose (int set) NOTHROW;
1456 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1436 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1457 void scr_move_to (int y, int len) NOTHROW; 1437 void scr_move_to (int y, int len) NOTHROW;
… …
1531# define __PROTO(p) p 1511# define __PROTO(p) p
1532#else 1512#else
1533# define __PROTO(p) () 1513# define __PROTO(p) ()
1534#endif 1514#endif
1535 1515
1536#ifdef DEBUG_malloc
1537# include "dmalloc.h" /* This comes last */
1538#endif
1539
1540#endif /* _RXVT_H_ */ 1516#endif /* _RXVT_H_ */
1541 1517

Diff Legend

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