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.233 by root, Sun Jan 22 00:36:59 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
… …
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 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
221
222 void close_tty ();
223 bool make_controlling_tty ();
224 void set_utf8_mode (bool on);
225};
226
227rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
228void rxvt_ptytty_server (); // start the ptytty server process
229 215
230/* 216/*
231 * the 'essential' information for reporting Mouse Events 217 * the 'essential' information for reporting Mouse Events
232 * pared down from XButtonEvent 218 * pared down from XButtonEvent
233 */ 219 */
… …
446// fake styles 432// fake styles
447#define RS_Blink 0x00010000UL // blink 433#define RS_Blink 0x00010000UL // blink
448#define RS_RVid 0x00020000UL // reverse video 434#define RS_RVid 0x00020000UL // reverse video
449#define RS_Uline 0x00040000UL // underline 435#define RS_Uline 0x00040000UL // underline
450 436
437// toggle this to force redraw, must be != RS_Careful
438#define RS_redraw 0x01000000UL
439
451// 5 custom bits for extensions 440// 5 custom bits for extensions
452#define RS_customCount 32 441#define RS_customCount 32
453#define RS_customMask 0x00f80000UL 442#define RS_customMask 0x00f80000UL
454#define RS_customShift 19 443#define RS_customShift 19
455 444
… …
524 Rxvt_restoreFG = 39, // change default fg color 513 Rxvt_restoreFG = 39, // change default fg color
525 Rxvt_restoreBG = 49, // change default bg color 514 Rxvt_restoreBG = 49, // change default bg color
526 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 515 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
527 516
528 URxvt_locale = 701, // change locale 517 URxvt_locale = 701, // change locale
518 URxvt_version = 702, // request version
529 519
530 URxvt_Color_IT = 704, // change actual 'Italic' colour 520 URxvt_Color_IT = 704, // change actual 'Italic' colour
531 URxvt_Color_tint = 705, // change actual tint colour 521 URxvt_Color_tint = 705, // change actual tint colour
532 URxvt_Color_BD = 706, 522 URxvt_Color_BD = 706,
533 URxvt_Color_UL = 707, 523 URxvt_Color_UL = 707,
… …
631# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 621# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
632# include "rsinc.h" 622# include "rsinc.h"
633# undef def 623# undef def
634# undef reserve 624# undef reserve
635 NUM_RESOURCES 625 NUM_RESOURCES
636};
637
638// see init.C:xa_names, which must be kept in sync
639enum {
640 XA_TEXT = 0,
641 XA_COMPOUND_TEXT,
642 XA_UTF8_STRING,
643 XA_MULTIPLE,
644 XA_TARGETS,
645 XA_TIMESTAMP,
646 XA_VT_SELECTION,
647 XA_INCR,
648 XA_WM_PROTOCOLS,
649 XA_WM_DELETE_WINDOW,
650 XA_CLIPBOARD,
651#if ENABLE_FRILLS
652 XA_MOTIF_WM_HINTS,
653#endif
654#if ENABLE_EWMH
655 XA_NET_WM_PID,
656 XA_NET_WM_NAME,
657 XA_NET_WM_ICON_NAME,
658 XA_NET_WM_PING,
659#endif
660#if USE_XIM
661 XA_WM_LOCALE_NAME,
662#endif
663#if TRANSPARENT
664 XA_XROOTPMAP_ID,
665 XA_ESETROOT_PMAP_ID,
666#endif
667#if ENABLE_XEMBED
668 XA_XEMBED,
669 XA_XEMBED_INFO,
670#endif
671 NUM_XA
672}; 626};
673 627
674/* DEC private modes */ 628/* DEC private modes */
675#define PrivMode_132 (1UL<<0) 629#define PrivMode_132 (1UL<<0)
676#define PrivMode_132OK (1UL<<1) 630#define PrivMode_132OK (1UL<<1)
… …
749 ***************************************************************************** 703 *****************************************************************************
750 * MACRO DEFINES 704 * MACRO DEFINES
751 ***************************************************************************** 705 *****************************************************************************
752 */ 706 */
753#define dLocal(type,name) type const name = this->name 707#define dLocal(type,name) type const name = this->name
754#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)
755 713
756/* convert pixel dimensions to row/column values. Everything as int32_t */ 714/* convert pixel dimensions to row/column values. Everything as int32_t */
757#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 715#define Pixel2Col(x) Pixel2Width((int32_t)(x))
758#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 716#define Pixel2Row(y) Pixel2Height((int32_t)(y))
759#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 717#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
836 794
837#ifdef XPM_BACKGROUND 795#ifdef XPM_BACKGROUND
838# 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))
839#else 797#else
840# define XPMClearArea(a, b, c, d, e, f, g) 798# define XPMClearArea(a, b, c, d, e, f, g)
841#endif
842
843#ifdef DEBUG_CMD
844# define D_CMD(x) fprintf x ; fputc('\n', stderr)
845#else
846# define D_CMD(x)
847#endif
848#ifdef DEBUG_INIT
849# define D_INIT(x) fprintf x ; fputc('\n', stderr)
850#else
851# define D_INIT(x)
852#endif
853#ifdef DEBUG_MAIN
854# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
855#else
856# define D_MAIN(x)
857#endif
858#ifdef DEBUG_SIZE
859# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
860#else
861# define D_SIZE(x)
862#endif 799#endif
863 800
864typedef callback1<void, const char *> log_callback; 801typedef callback1<void, const char *> log_callback;
865typedef callback1<int, int> getfd_callback; 802typedef callback1<int, int> getfd_callback;
866 803
… …
977 914
978#ifdef KEYSYM_RESOURCE 915#ifdef KEYSYM_RESOURCE
979 class keyboard_manager; 916 class keyboard_manager;
980#endif 917#endif
981 918
982struct rxvt_term : zero_initialized, rxvt_vars { 919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
983 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
984 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
985#if ENABLE_PERL 922#if ENABLE_PERL
986 rxvt_perl_term perl; 923 rxvt_perl_term perl;
987#endif 924#endif
… …
1065 int old_width, /* last used width in screen resize */ 1002 int old_width, /* last used width in screen resize */
1066 old_height; /* last used height in screen resize */ 1003 old_height; /* last used height in screen resize */
1067 unsigned long priv_modes, 1004 unsigned long priv_modes,
1068 SavedModes; 1005 SavedModes;
1069/* ---------- */ 1006/* ---------- */
1070 Atom xa[NUM_XA]; 1007 Atom *xa;
1071/* ---------- */ 1008/* ---------- */
1072#ifdef RXVT_SCROLLBAR 1009#ifdef RXVT_SCROLLBAR
1073 GC scrollbarGC, 1010 GC scrollbarGC,
1074 topShadowGC, 1011 topShadowGC,
1075 botShadowGC; 1012 botShadowGC;
… …
1132 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;
1133#endif 1070#endif
1134 1071
1135 vector<void *> allocated; // free these memory blocks with free() 1072 vector<void *> allocated; // free these memory blocks with free()
1136 1073
1137 char *env_windowid; /* environmental variable WINDOWID */ 1074 char env_windowid[21]; /* environmental variable WINDOWID */
1075 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1138 char *env_display; /* environmental variable DISPLAY */ 1076 char *env_display; /* environmental variable DISPLAY */
1139 char *env_term; /* environmental variable TERM */ 1077 char *env_term; /* environmental variable TERM */
1140 char *env_colorfgbg; 1078
1141 char *locale; 1079 char *locale;
1142 char charsets[4]; 1080 char charsets[4];
1143 char *v_buffer; /* pointer to physical buffer */ 1081 char *v_buffer; /* pointer to physical buffer */
1144 unsigned int v_buflen; /* size of area to write */ 1082 unsigned int v_buflen; /* size of area to write */
1145 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1083 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1146 1084
1147#ifdef KEYSYM_RESOURCE 1085#ifdef KEYSYM_RESOURCE
1148 keyboard_manager *keyboard; 1086 keyboard_manager *keyboard;
1149#endif 1087#endif
1150 1088
1151 const char *rs[NUM_RESOURCES]; 1089 const char *rs[NUM_RESOURCES];
1152 /* command input buffering */ 1090 /* command input buffering */
1153 char *cmdbuf_ptr, *cmdbuf_endp; 1091 char *cmdbuf_ptr, *cmdbuf_endp;
1154 char cmdbuf_base[CBUFSIZ]; 1092 char cmdbuf_base[CBUFSIZ];
1155 1093
1156 rxvt_ptytty *pty; 1094 ptytty *pty;
1157 1095
1158 rxvt_salloc *talloc; // text line allocator 1096 rxvt_salloc *talloc; // text line allocator
1159 rxvt_salloc *ralloc; // rend line allocator 1097 rxvt_salloc *ralloc; // rend line allocator
1160 1098
1161 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
… …
1172#endif 1110#endif
1173 1111
1174 // modifies first argument(!) 1112 // modifies first argument(!)
1175 void paste (char *data, unsigned int len) NOTHROW; 1113 void paste (char *data, unsigned int len) NOTHROW;
1176 1114
1177 long vt_emask, vt_emask_perl; 1115 long vt_emask, vt_emask_perl, vt_emask_xim;
1178 1116
1179 void vt_select_input () const NOTHROW 1117 void vt_select_input () const NOTHROW
1180 { 1118 {
1181 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1182 } 1120 }
1183 1121
1184#if TRANSPARENT 1122#if TRANSPARENT
1185 void rootwin_cb (XEvent &xev); 1123 void rootwin_cb (XEvent &xev);
1186 xevent_watcher rootwin_ev; 1124 xevent_watcher rootwin_ev;
… …
1272 void create_windows (int argc, const char *const *argv); 1210 void create_windows (int argc, const char *const *argv);
1273 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);
1274 void window_calc (unsigned int newwidth, unsigned int newheight); 1212 void window_calc (unsigned int newwidth, unsigned int newheight);
1275 1213
1276#if USE_XIM 1214#if USE_XIM
1277 rxvt_xim *input_method; 1215 rxvt_xim *input_method;
1278 XIC Input_Context; 1216 XIC Input_Context;
1279 XIMStyle input_style; 1217 XIMStyle input_style;
1280 XPoint spot; // most recently sent spot position 1218 XPoint spot; // most recently sent spot position
1281 1219
1282 void im_destroy (); 1220 void im_destroy ();
1283 void im_cb (); im_watcher im_ev; 1221 void im_cb (); im_watcher im_ev;
1284 void im_set_size (XRectangle &size); 1222 void im_set_size (XRectangle &size);
1285 void im_set_position (XPoint &pos) NOTHROW; 1223 void im_set_position (XPoint &pos) NOTHROW;
… …
1343 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1281 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1344 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1282 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1345 1283
1346 // screen.C 1284 // screen.C
1347 1285
1348 void lalloc (line_t &l) const NOTHROW 1286 void lalloc (line_t &l) const
1349 { 1287 {
1350 l.t = (text_t *)talloc->alloc (); 1288 l.t = (text_t *)talloc->alloc ();
1351 l.r = (rend_t *)ralloc->alloc (); 1289 l.r = (rend_t *)ralloc->alloc ();
1352 } 1290 }
1353 1291
… …
1357 talloc->free (l.t); 1295 talloc->free (l.t);
1358 ralloc->free (l.r); 1296 ralloc->free (l.r);
1359 } 1297 }
1360#endif 1298#endif
1361 1299
1362 void lresize (line_t &l) const NOTHROW 1300 void lresize (line_t &l) const
1363 { 1301 {
1364 if (!l.t) 1302 if (!l.t)
1365 return; 1303 return;
1366 1304
1367 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));
… …
1435 void scr_remap_chars () NOTHROW; 1373 void scr_remap_chars () NOTHROW;
1436 void scr_remap_chars (line_t &l) NOTHROW; 1374 void scr_remap_chars (line_t &l) NOTHROW;
1437 1375
1438 enum cursor_mode { SAVE, RESTORE }; 1376 enum cursor_mode { SAVE, RESTORE };
1439 1377
1440 void scr_poweron () NOTHROW; 1378 void scr_poweron ();
1441 void scr_cursor (cursor_mode mode) NOTHROW; 1379 void scr_cursor (cursor_mode mode) NOTHROW;
1442 void scr_do_wrap () NOTHROW; 1380 void scr_do_wrap () NOTHROW;
1381 void scr_swap_screen () NOTHROW;
1443 int scr_change_screen (int scrn) NOTHROW; 1382 void scr_change_screen (int scrn);
1444 void scr_color (unsigned int color, int fgbg) NOTHROW; 1383 void scr_color (unsigned int color, int fgbg) NOTHROW;
1445 void scr_rendition (int set, int style) NOTHROW; 1384 void scr_rendition (int set, int style) NOTHROW;
1446 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;
1447 void scr_backspace () NOTHROW; 1386 void scr_backspace () NOTHROW;
1448 void scr_tab (int count, bool ht = false) NOTHROW; 1387 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1540# define __PROTO(p) p 1479# define __PROTO(p) p
1541#else 1480#else
1542# define __PROTO(p) () 1481# define __PROTO(p) ()
1543#endif 1482#endif
1544 1483
1545#ifdef DEBUG_malloc
1546# include "dmalloc.h" /* This comes last */
1547#endif
1548
1549#endif /* _RXVT_H_ */ 1484#endif /* _RXVT_H_ */
1550 1485

Diff Legend

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