ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.231 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.247 by root, Mon Jan 30 04:27:17 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 */
… …
448// fake styles 432// fake styles
449#define RS_Blink 0x00010000UL // blink 433#define RS_Blink 0x00010000UL // blink
450#define RS_RVid 0x00020000UL // reverse video 434#define RS_RVid 0x00020000UL // reverse video
451#define RS_Uline 0x00040000UL // underline 435#define RS_Uline 0x00040000UL // underline
452 436
437// toggle this to force redraw, must be != RS_Careful
438#define RS_redraw 0x01000000UL
439
453// 5 custom bits for extensions 440// 5 custom bits for extensions
454#define RS_customCount 32 441#define RS_customCount 32
455#define RS_customMask 0x00f80000UL 442#define RS_customMask 0x00f80000UL
456#define RS_customShift 19 443#define RS_customShift 19
457 444
… …
526 Rxvt_restoreFG = 39, // change default fg color 513 Rxvt_restoreFG = 39, // change default fg color
527 Rxvt_restoreBG = 49, // change default bg color 514 Rxvt_restoreBG = 49, // change default bg color
528 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 515 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
529 516
530 URxvt_locale = 701, // change locale 517 URxvt_locale = 701, // change locale
518 URxvt_version = 702, // request version
531 519
532 URxvt_Color_IT = 704, // change actual 'Italic' colour 520 URxvt_Color_IT = 704, // change actual 'Italic' colour
533 URxvt_Color_tint = 705, // change actual tint colour 521 URxvt_Color_tint = 705, // change actual tint colour
534 URxvt_Color_BD = 706, 522 URxvt_Color_BD = 706,
535 URxvt_Color_UL = 707, 523 URxvt_Color_UL = 707,
… …
633# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 621# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
634# include "rsinc.h" 622# include "rsinc.h"
635# undef def 623# undef def
636# undef reserve 624# undef reserve
637 NUM_RESOURCES 625 NUM_RESOURCES
638};
639
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}; 626};
675 627
676/* DEC private modes */ 628/* DEC private modes */
677#define PrivMode_132 (1UL<<0) 629#define PrivMode_132 (1UL<<0)
678#define PrivMode_132OK (1UL<<1) 630#define PrivMode_132OK (1UL<<1)
… …
751 ***************************************************************************** 703 *****************************************************************************
752 * MACRO DEFINES 704 * MACRO DEFINES
753 ***************************************************************************** 705 *****************************************************************************
754 */ 706 */
755#define dLocal(type,name) type const name = this->name 707#define dLocal(type,name) type const name = this->name
756#define dDisp Display *disp = this->display->display 708
709// for speed reasons, we assume that all latin1 characters
710// are single-width (the first unicode combining character
711// is actually 0x300, but ascii is what matters most).
712#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
757 713
758/* convert pixel dimensions to row/column values. Everything as int32_t */ 714/* convert pixel dimensions to row/column values. Everything as int32_t */
759#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 715#define Pixel2Col(x) Pixel2Width((int32_t)(x))
760#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 716#define Pixel2Row(y) Pixel2Height((int32_t)(y))
761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 717#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
838 794
839#ifdef XPM_BACKGROUND 795#ifdef XPM_BACKGROUND
840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 796# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
841#else 797#else
842# define XPMClearArea(a, b, c, d, e, f, g) 798# 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 799#endif
865 800
866typedef callback1<void, const char *> log_callback; 801typedef callback1<void, const char *> log_callback;
867typedef callback1<int, int> getfd_callback; 802typedef callback1<int, int> getfd_callback;
868 803
… …
979 914
980#ifdef KEYSYM_RESOURCE 915#ifdef KEYSYM_RESOURCE
981 class keyboard_manager; 916 class keyboard_manager;
982#endif 917#endif
983 918
984struct rxvt_term : zero_initialized, rxvt_vars { 919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
985 log_callback *log_hook; // log error messages through this hook, if != 0 920 log_callback *log_hook; // log error messages through this hook, if != 0
986 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
987#if ENABLE_PERL 922#if ENABLE_PERL
988 rxvt_perl_term perl; 923 rxvt_perl_term perl;
989#endif 924#endif
… …
1067 int old_width, /* last used width in screen resize */ 1002 int old_width, /* last used width in screen resize */
1068 old_height; /* last used height in screen resize */ 1003 old_height; /* last used height in screen resize */
1069 unsigned long priv_modes, 1004 unsigned long priv_modes,
1070 SavedModes; 1005 SavedModes;
1071/* ---------- */ 1006/* ---------- */
1072 Atom xa[NUM_XA]; 1007 Atom *xa;
1073/* ---------- */ 1008/* ---------- */
1074#ifdef RXVT_SCROLLBAR 1009#ifdef RXVT_SCROLLBAR
1075 GC scrollbarGC, 1010 GC scrollbarGC,
1076 topShadowGC, 1011 topShadowGC,
1077 botShadowGC; 1012 botShadowGC;
… …
1134 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1069 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1135#endif 1070#endif
1136 1071
1137 vector<void *> allocated; // free these memory blocks with free() 1072 vector<void *> allocated; // free these memory blocks with free()
1138 1073
1139 char *env_windowid; /* environmental variable WINDOWID */ 1074 char env_windowid[21]; /* environmental variable WINDOWID */
1075 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1140 char *env_display; /* environmental variable DISPLAY */ 1076 char *env_display; /* environmental variable DISPLAY */
1141 char *env_term; /* environmental variable TERM */ 1077 char *env_term; /* environmental variable TERM */
1142 char *env_colorfgbg; 1078
1143 char *locale; 1079 char *locale;
1144 char charsets[4]; 1080 char charsets[4];
1145 char *v_buffer; /* pointer to physical buffer */ 1081 char *v_buffer; /* pointer to physical buffer */
1146 unsigned int v_buflen; /* size of area to write */ 1082 unsigned int v_buflen; /* size of area to write */
1147 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1083 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1148 1084
1149#ifdef KEYSYM_RESOURCE 1085#ifdef KEYSYM_RESOURCE
1150 keyboard_manager *keyboard; 1086 keyboard_manager *keyboard;
1151#endif 1087#endif
1152 1088
1153 const char *rs[NUM_RESOURCES]; 1089 const char *rs[NUM_RESOURCES];
1154 /* command input buffering */ 1090 /* command input buffering */
1155 char *cmdbuf_ptr, *cmdbuf_endp; 1091 char *cmdbuf_ptr, *cmdbuf_endp;
1156 char cmdbuf_base[CBUFSIZ]; 1092 char cmdbuf_base[CBUFSIZ];
1157 1093
1158 rxvt_ptytty *pty; 1094 ptytty *pty;
1159 1095
1160 rxvt_salloc *talloc; // text line allocator 1096 rxvt_salloc *talloc; // text line allocator
1161 rxvt_salloc *ralloc; // rend line allocator 1097 rxvt_salloc *ralloc; // rend line allocator
1162 1098
1163 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1099 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1174#endif 1110#endif
1175 1111
1176 // modifies first argument(!) 1112 // modifies first argument(!)
1177 void paste (char *data, unsigned int len) NOTHROW; 1113 void paste (char *data, unsigned int len) NOTHROW;
1178 1114
1179 long vt_emask, vt_emask_perl; 1115 long vt_emask, vt_emask_perl, vt_emask_xim;
1180 1116
1181 void vt_select_input () const NOTHROW 1117 void vt_select_input () const NOTHROW
1182 { 1118 {
1183 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1184 } 1120 }
1185 1121
1186#if TRANSPARENT 1122#if TRANSPARENT
1187 void rootwin_cb (XEvent &xev); 1123 void rootwin_cb (XEvent &xev);
1188 xevent_watcher rootwin_ev; 1124 xevent_watcher rootwin_ev;
… …
1238 rxvt_term (); 1174 rxvt_term ();
1239 ~rxvt_term (); 1175 ~rxvt_term ();
1240 void destroy (); 1176 void destroy ();
1241 void emergency_cleanup (); 1177 void emergency_cleanup ();
1242 1178
1243 bool init (int argc, const char *const *argv); 1179 bool init (int argc, const char *const *argv, stringvec *envv);
1180
1181 bool init (stringvec *argv, stringvec *envv)
1182 {
1183 this->argv = argv;
1184 return init (argv->size (), argv->begin (), envv);
1185 }
1186
1244 bool init_vars (); 1187 bool init_vars ();
1245 1188
1246 bool pty_fill (); 1189 bool pty_fill ();
1247 1190
1248 void make_current () const // make this the "currently active" urxvt instance 1191 void make_current () const // make this the "currently active" urxvt instance
… …
1267 void create_windows (int argc, const char *const *argv); 1210 void create_windows (int argc, const char *const *argv);
1268 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1211 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1269 void window_calc (unsigned int newwidth, unsigned int newheight); 1212 void window_calc (unsigned int newwidth, unsigned int newheight);
1270 1213
1271#if USE_XIM 1214#if USE_XIM
1272 rxvt_xim *input_method; 1215 rxvt_xim *input_method;
1273 XIC Input_Context; 1216 XIC Input_Context;
1274 XIMStyle input_style; 1217 XIMStyle input_style;
1275 XPoint spot; // most recently sent spot position 1218 XPoint spot; // most recently sent spot position
1276 1219
1277 void im_destroy (); 1220 void im_destroy ();
1278 void im_cb (); im_watcher im_ev; 1221 void im_cb (); im_watcher im_ev;
1279 void im_set_size (XRectangle &size); 1222 void im_set_size (XRectangle &size);
1280 void im_set_position (XPoint &pos) NOTHROW; 1223 void im_set_position (XPoint &pos) NOTHROW;
… …
1338 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1281 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1339 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1282 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1340 1283
1341 // screen.C 1284 // screen.C
1342 1285
1343 void lalloc (line_t &l) const NOTHROW 1286 void lalloc (line_t &l) const
1344 { 1287 {
1345 l.t = (text_t *)talloc->alloc (); 1288 l.t = (text_t *)talloc->alloc ();
1346 l.r = (rend_t *)ralloc->alloc (); 1289 l.r = (rend_t *)ralloc->alloc ();
1347 } 1290 }
1348 1291
… …
1352 talloc->free (l.t); 1295 talloc->free (l.t);
1353 ralloc->free (l.r); 1296 ralloc->free (l.r);
1354 } 1297 }
1355#endif 1298#endif
1356 1299
1357 void lresize (line_t &l) const NOTHROW 1300 void lresize (line_t &l) const
1358 { 1301 {
1359 if (!l.t) 1302 if (!l.t)
1360 return; 1303 return;
1361 1304
1362 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1305 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1430 void scr_remap_chars () NOTHROW; 1373 void scr_remap_chars () NOTHROW;
1431 void scr_remap_chars (line_t &l) NOTHROW; 1374 void scr_remap_chars (line_t &l) NOTHROW;
1432 1375
1433 enum cursor_mode { SAVE, RESTORE }; 1376 enum cursor_mode { SAVE, RESTORE };
1434 1377
1435 void scr_poweron () NOTHROW; 1378 void scr_poweron ();
1436 void scr_cursor (cursor_mode mode) NOTHROW; 1379 void scr_cursor (cursor_mode mode) NOTHROW;
1437 void scr_do_wrap () NOTHROW; 1380 void scr_do_wrap () NOTHROW;
1381 void scr_swap_screen () NOTHROW;
1438 int scr_change_screen (int scrn) NOTHROW; 1382 void scr_change_screen (int scrn);
1439 void scr_color (unsigned int color, int fgbg) NOTHROW; 1383 void scr_color (unsigned int color, int fgbg) NOTHROW;
1440 void scr_rendition (int set, int style) NOTHROW; 1384 void scr_rendition (int set, int style) NOTHROW;
1441 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1385 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1442 void scr_backspace () NOTHROW; 1386 void scr_backspace () NOTHROW;
1443 void scr_tab (int count, bool ht = false) NOTHROW; 1387 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1535# define __PROTO(p) p 1479# define __PROTO(p) p
1536#else 1480#else
1537# define __PROTO(p) () 1481# define __PROTO(p) ()
1538#endif 1482#endif
1539 1483
1540#ifdef DEBUG_malloc
1541# include "dmalloc.h" /* This comes last */
1542#endif
1543
1544#endif /* _RXVT_H_ */ 1484#endif /* _RXVT_H_ */
1545 1485

Diff Legend

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