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.231 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.244 by root, Wed Jan 25 13:24:45 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 */
… …
635# undef def 619# undef def
636# undef reserve 620# undef reserve
637 NUM_RESOURCES 621 NUM_RESOURCES
638}; 622};
639 623
640// see init.C:xa_names, which must be kept in sync
641enum {
642 XA_TEXT = 0,
643 XA_COMPOUND_TEXT,
644 XA_UTF8_STRING,
645 XA_MULTIPLE,
646 XA_TARGETS,
647 XA_TIMESTAMP,
648 XA_VT_SELECTION,
649 XA_INCR,
650 XA_WM_PROTOCOLS,
651 XA_WM_DELETE_WINDOW,
652 XA_CLIPBOARD,
653#if ENABLE_FRILLS
654 XA_MOTIF_WM_HINTS,
655#endif
656#if ENABLE_EWMH
657 XA_NET_WM_PID,
658 XA_NET_WM_NAME,
659 XA_NET_WM_ICON_NAME,
660 XA_NET_WM_PING,
661#endif
662#if USE_XIM
663 XA_WM_LOCALE_NAME,
664#endif
665#if TRANSPARENT
666 XA_XROOTPMAP_ID,
667 XA_ESETROOT_PMAP_ID,
668#endif
669#if ENABLE_XEMBED
670 XA_XEMBED,
671 XA_XEMBED_INFO,
672#endif
673 NUM_XA
674};
675
676/* DEC private modes */ 624/* DEC private modes */
677#define PrivMode_132 (1UL<<0) 625#define PrivMode_132 (1UL<<0)
678#define PrivMode_132OK (1UL<<1) 626#define PrivMode_132OK (1UL<<1)
679#define PrivMode_rVideo (1UL<<2) 627#define PrivMode_rVideo (1UL<<2)
680#define PrivMode_relOrigin (1UL<<3) 628#define PrivMode_relOrigin (1UL<<3)
… …
753 ***************************************************************************** 701 *****************************************************************************
754 */ 702 */
755#define dLocal(type,name) type const name = this->name 703#define dLocal(type,name) type const name = this->name
756#define dDisp Display *disp = this->display->display 704#define dDisp Display *disp = this->display->display
757 705
706// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicode combining character
708// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
710
758/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
759#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
760#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
762#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight) 715#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
… …
838 791
839#ifdef XPM_BACKGROUND 792#ifdef XPM_BACKGROUND
840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 793# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
841#else 794#else
842# define XPMClearArea(a, b, c, d, e, f, g) 795# 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 796#endif
865 797
866typedef callback1<void, const char *> log_callback; 798typedef callback1<void, const char *> log_callback;
867typedef callback1<int, int> getfd_callback; 799typedef callback1<int, int> getfd_callback;
868 800
… …
1067 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1068 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1069 unsigned long priv_modes, 1001 unsigned long priv_modes,
1070 SavedModes; 1002 SavedModes;
1071/* ---------- */ 1003/* ---------- */
1072 Atom xa[NUM_XA]; 1004 Atom *xa;
1073/* ---------- */ 1005/* ---------- */
1074#ifdef RXVT_SCROLLBAR 1006#ifdef RXVT_SCROLLBAR
1075 GC scrollbarGC, 1007 GC scrollbarGC,
1076 topShadowGC, 1008 topShadowGC,
1077 botShadowGC; 1009 botShadowGC;
… …
1134 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1066 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1135#endif 1067#endif
1136 1068
1137 vector<void *> allocated; // free these memory blocks with free() 1069 vector<void *> allocated; // free these memory blocks with free()
1138 1070
1139 char *env_windowid; /* environmental variable WINDOWID */ 1071 char env_windowid[21]; /* environmental variable WINDOWID */
1072 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1140 char *env_display; /* environmental variable DISPLAY */ 1073 char *env_display; /* environmental variable DISPLAY */
1141 char *env_term; /* environmental variable TERM */ 1074 char *env_term; /* environmental variable TERM */
1142 char *env_colorfgbg; 1075
1143 char *locale; 1076 char *locale;
1144 char charsets[4]; 1077 char charsets[4];
1145 char *v_buffer; /* pointer to physical buffer */ 1078 char *v_buffer; /* pointer to physical buffer */
1146 unsigned int v_buflen; /* size of area to write */ 1079 unsigned int v_buflen; /* size of area to write */
1147 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1080 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1148 1081
1149#ifdef KEYSYM_RESOURCE 1082#ifdef KEYSYM_RESOURCE
1150 keyboard_manager *keyboard; 1083 keyboard_manager *keyboard;
1151#endif 1084#endif
1152 1085
1153 const char *rs[NUM_RESOURCES]; 1086 const char *rs[NUM_RESOURCES];
1154 /* command input buffering */ 1087 /* command input buffering */
1155 char *cmdbuf_ptr, *cmdbuf_endp; 1088 char *cmdbuf_ptr, *cmdbuf_endp;
1156 char cmdbuf_base[CBUFSIZ]; 1089 char cmdbuf_base[CBUFSIZ];
1157 1090
1158 rxvt_ptytty *pty; 1091 ptytty *pty;
1159 1092
1160 rxvt_salloc *talloc; // text line allocator 1093 rxvt_salloc *talloc; // text line allocator
1161 rxvt_salloc *ralloc; // rend line allocator 1094 rxvt_salloc *ralloc; // rend line allocator
1162 1095
1163 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1096 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1174#endif 1107#endif
1175 1108
1176 // modifies first argument(!) 1109 // modifies first argument(!)
1177 void paste (char *data, unsigned int len) NOTHROW; 1110 void paste (char *data, unsigned int len) NOTHROW;
1178 1111
1179 long vt_emask, vt_emask_perl; 1112 long vt_emask, vt_emask_perl, vt_emask_xim;
1180 1113
1181 void vt_select_input () const NOTHROW 1114 void vt_select_input () const NOTHROW
1182 { 1115 {
1183 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1116 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1184 } 1117 }
1185 1118
1186#if TRANSPARENT 1119#if TRANSPARENT
1187 void rootwin_cb (XEvent &xev); 1120 void rootwin_cb (XEvent &xev);
1188 xevent_watcher rootwin_ev; 1121 xevent_watcher rootwin_ev;
… …
1238 rxvt_term (); 1171 rxvt_term ();
1239 ~rxvt_term (); 1172 ~rxvt_term ();
1240 void destroy (); 1173 void destroy ();
1241 void emergency_cleanup (); 1174 void emergency_cleanup ();
1242 1175
1243 bool init (int argc, const char *const *argv); 1176 bool init (int argc, const char *const *argv, stringvec *envv);
1177
1178 bool init (stringvec *argv, stringvec *envv)
1179 {
1180 this->argv = argv;
1181 return init (argv->size (), argv->begin (), envv);
1182 }
1183
1244 bool init_vars (); 1184 bool init_vars ();
1245 1185
1246 bool pty_fill (); 1186 bool pty_fill ();
1247 1187
1248 void make_current () const // make this the "currently active" urxvt instance 1188 void make_current () const // make this the "currently active" urxvt instance
… …
1267 void create_windows (int argc, const char *const *argv); 1207 void create_windows (int argc, const char *const *argv);
1268 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1208 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1269 void window_calc (unsigned int newwidth, unsigned int newheight); 1209 void window_calc (unsigned int newwidth, unsigned int newheight);
1270 1210
1271#if USE_XIM 1211#if USE_XIM
1272 rxvt_xim *input_method; 1212 rxvt_xim *input_method;
1273 XIC Input_Context; 1213 XIC Input_Context;
1274 XIMStyle input_style; 1214 XIMStyle input_style;
1275 XPoint spot; // most recently sent spot position 1215 XPoint spot; // most recently sent spot position
1276 1216
1277 void im_destroy (); 1217 void im_destroy ();
1278 void im_cb (); im_watcher im_ev; 1218 void im_cb (); im_watcher im_ev;
1279 void im_set_size (XRectangle &size); 1219 void im_set_size (XRectangle &size);
1280 void im_set_position (XPoint &pos) NOTHROW; 1220 void im_set_position (XPoint &pos) NOTHROW;
… …
1338 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1339 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1279 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1340 1280
1341 // screen.C 1281 // screen.C
1342 1282
1343 void lalloc (line_t &l) const NOTHROW 1283 void lalloc (line_t &l) const
1344 { 1284 {
1345 l.t = (text_t *)talloc->alloc (); 1285 l.t = (text_t *)talloc->alloc ();
1346 l.r = (rend_t *)ralloc->alloc (); 1286 l.r = (rend_t *)ralloc->alloc ();
1347 } 1287 }
1348 1288
… …
1352 talloc->free (l.t); 1292 talloc->free (l.t);
1353 ralloc->free (l.r); 1293 ralloc->free (l.r);
1354 } 1294 }
1355#endif 1295#endif
1356 1296
1357 void lresize (line_t &l) const NOTHROW 1297 void lresize (line_t &l) const
1358 { 1298 {
1359 if (!l.t) 1299 if (!l.t)
1360 return; 1300 return;
1361 1301
1362 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1302 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1430 void scr_remap_chars () NOTHROW; 1370 void scr_remap_chars () NOTHROW;
1431 void scr_remap_chars (line_t &l) NOTHROW; 1371 void scr_remap_chars (line_t &l) NOTHROW;
1432 1372
1433 enum cursor_mode { SAVE, RESTORE }; 1373 enum cursor_mode { SAVE, RESTORE };
1434 1374
1435 void scr_poweron () NOTHROW; 1375 void scr_poweron ();
1436 void scr_cursor (cursor_mode mode) NOTHROW; 1376 void scr_cursor (cursor_mode mode) NOTHROW;
1437 void scr_do_wrap () NOTHROW; 1377 void scr_do_wrap () NOTHROW;
1378 void scr_swap_screen () NOTHROW;
1438 int scr_change_screen (int scrn) NOTHROW; 1379 void scr_change_screen (int scrn);
1439 void scr_color (unsigned int color, int fgbg) NOTHROW; 1380 void scr_color (unsigned int color, int fgbg) NOTHROW;
1440 void scr_rendition (int set, int style) NOTHROW; 1381 void scr_rendition (int set, int style) NOTHROW;
1441 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1382 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1442 void scr_backspace () NOTHROW; 1383 void scr_backspace () NOTHROW;
1443 void scr_tab (int count, bool ht = false) NOTHROW; 1384 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1535# define __PROTO(p) p 1476# define __PROTO(p) p
1536#else 1477#else
1537# define __PROTO(p) () 1478# define __PROTO(p) ()
1538#endif 1479#endif
1539 1480
1540#ifdef DEBUG_malloc
1541# include "dmalloc.h" /* This comes last */
1542#endif
1543
1544#endif /* _RXVT_H_ */ 1481#endif /* _RXVT_H_ */
1545 1482

Diff Legend

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