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.233 by root, Sun Jan 22 00:36:59 2006 UTC vs.
Revision 1.242 by root, Wed Jan 25 02:42:06 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 */
… …
633# undef def 619# undef def
634# undef reserve 620# undef reserve
635 NUM_RESOURCES 621 NUM_RESOURCES
636}; 622};
637 623
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};
673
674/* DEC private modes */ 624/* DEC private modes */
675#define PrivMode_132 (1UL<<0) 625#define PrivMode_132 (1UL<<0)
676#define PrivMode_132OK (1UL<<1) 626#define PrivMode_132OK (1UL<<1)
677#define PrivMode_rVideo (1UL<<2) 627#define PrivMode_rVideo (1UL<<2)
678#define PrivMode_relOrigin (1UL<<3) 628#define PrivMode_relOrigin (1UL<<3)
… …
751 ***************************************************************************** 701 *****************************************************************************
752 */ 702 */
753#define dLocal(type,name) type const name = this->name 703#define dLocal(type,name) type const name = this->name
754#define dDisp Display *disp = this->display->display 704#define dDisp Display *disp = this->display->display
755 705
706// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicdoe combining character
708// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
710
756/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
757#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
758#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
759#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
760#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight) 715#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
… …
836 791
837#ifdef XPM_BACKGROUND 792#ifdef XPM_BACKGROUND
838# 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))
839#else 794#else
840# define XPMClearArea(a, b, c, d, e, f, g) 795# 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 796#endif
863 797
864typedef callback1<void, const char *> log_callback; 798typedef callback1<void, const char *> log_callback;
865typedef callback1<int, int> getfd_callback; 799typedef callback1<int, int> getfd_callback;
866 800
… …
1065 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1066 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1067 unsigned long priv_modes, 1001 unsigned long priv_modes,
1068 SavedModes; 1002 SavedModes;
1069/* ---------- */ 1003/* ---------- */
1070 Atom xa[NUM_XA]; 1004 Atom *xa;
1071/* ---------- */ 1005/* ---------- */
1072#ifdef RXVT_SCROLLBAR 1006#ifdef RXVT_SCROLLBAR
1073 GC scrollbarGC, 1007 GC scrollbarGC,
1074 topShadowGC, 1008 topShadowGC,
1075 botShadowGC; 1009 botShadowGC;
… …
1151 const char *rs[NUM_RESOURCES]; 1085 const char *rs[NUM_RESOURCES];
1152 /* command input buffering */ 1086 /* command input buffering */
1153 char *cmdbuf_ptr, *cmdbuf_endp; 1087 char *cmdbuf_ptr, *cmdbuf_endp;
1154 char cmdbuf_base[CBUFSIZ]; 1088 char cmdbuf_base[CBUFSIZ];
1155 1089
1156 rxvt_ptytty *pty; 1090 ptytty *pty;
1157 1091
1158 rxvt_salloc *talloc; // text line allocator 1092 rxvt_salloc *talloc; // text line allocator
1159 rxvt_salloc *ralloc; // rend line allocator 1093 rxvt_salloc *ralloc; // rend line allocator
1160 1094
1161 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1095 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1172#endif 1106#endif
1173 1107
1174 // modifies first argument(!) 1108 // modifies first argument(!)
1175 void paste (char *data, unsigned int len) NOTHROW; 1109 void paste (char *data, unsigned int len) NOTHROW;
1176 1110
1177 long vt_emask, vt_emask_perl; 1111 long vt_emask, vt_emask_perl, vt_emask_xim;
1178 1112
1179 void vt_select_input () const NOTHROW 1113 void vt_select_input () const NOTHROW
1180 { 1114 {
1181 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1115 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1182 } 1116 }
1183 1117
1184#if TRANSPARENT 1118#if TRANSPARENT
1185 void rootwin_cb (XEvent &xev); 1119 void rootwin_cb (XEvent &xev);
1186 xevent_watcher rootwin_ev; 1120 xevent_watcher rootwin_ev;
… …
1272 void create_windows (int argc, const char *const *argv); 1206 void create_windows (int argc, const char *const *argv);
1273 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1207 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1274 void window_calc (unsigned int newwidth, unsigned int newheight); 1208 void window_calc (unsigned int newwidth, unsigned int newheight);
1275 1209
1276#if USE_XIM 1210#if USE_XIM
1277 rxvt_xim *input_method; 1211 rxvt_xim *input_method;
1278 XIC Input_Context; 1212 XIC Input_Context;
1279 XIMStyle input_style; 1213 XIMStyle input_style;
1280 XPoint spot; // most recently sent spot position 1214 XPoint spot; // most recently sent spot position
1281 1215
1282 void im_destroy (); 1216 void im_destroy ();
1283 void im_cb (); im_watcher im_ev; 1217 void im_cb (); im_watcher im_ev;
1284 void im_set_size (XRectangle &size); 1218 void im_set_size (XRectangle &size);
1285 void im_set_position (XPoint &pos) NOTHROW; 1219 void im_set_position (XPoint &pos) NOTHROW;
… …
1343 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1277 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1344 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1278 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1345 1279
1346 // screen.C 1280 // screen.C
1347 1281
1348 void lalloc (line_t &l) const NOTHROW 1282 void lalloc (line_t &l) const
1349 { 1283 {
1350 l.t = (text_t *)talloc->alloc (); 1284 l.t = (text_t *)talloc->alloc ();
1351 l.r = (rend_t *)ralloc->alloc (); 1285 l.r = (rend_t *)ralloc->alloc ();
1352 } 1286 }
1353 1287
… …
1357 talloc->free (l.t); 1291 talloc->free (l.t);
1358 ralloc->free (l.r); 1292 ralloc->free (l.r);
1359 } 1293 }
1360#endif 1294#endif
1361 1295
1362 void lresize (line_t &l) const NOTHROW 1296 void lresize (line_t &l) const
1363 { 1297 {
1364 if (!l.t) 1298 if (!l.t)
1365 return; 1299 return;
1366 1300
1367 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1301 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1435 void scr_remap_chars () NOTHROW; 1369 void scr_remap_chars () NOTHROW;
1436 void scr_remap_chars (line_t &l) NOTHROW; 1370 void scr_remap_chars (line_t &l) NOTHROW;
1437 1371
1438 enum cursor_mode { SAVE, RESTORE }; 1372 enum cursor_mode { SAVE, RESTORE };
1439 1373
1440 void scr_poweron () NOTHROW; 1374 void scr_poweron ();
1441 void scr_cursor (cursor_mode mode) NOTHROW; 1375 void scr_cursor (cursor_mode mode) NOTHROW;
1442 void scr_do_wrap () NOTHROW; 1376 void scr_do_wrap () NOTHROW;
1377 void scr_swap_screen () NOTHROW;
1443 int scr_change_screen (int scrn) NOTHROW; 1378 void scr_change_screen (int scrn);
1444 void scr_color (unsigned int color, int fgbg) NOTHROW; 1379 void scr_color (unsigned int color, int fgbg) NOTHROW;
1445 void scr_rendition (int set, int style) NOTHROW; 1380 void scr_rendition (int set, int style) NOTHROW;
1446 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1381 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1447 void scr_backspace () NOTHROW; 1382 void scr_backspace () NOTHROW;
1448 void scr_tab (int count, bool ht = false) NOTHROW; 1383 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1540# define __PROTO(p) p 1475# define __PROTO(p) p
1541#else 1476#else
1542# define __PROTO(p) () 1477# define __PROTO(p) ()
1543#endif 1478#endif
1544 1479
1545#ifdef DEBUG_malloc
1546# include "dmalloc.h" /* This comes last */
1547#endif
1548
1549#endif /* _RXVT_H_ */ 1480#endif /* _RXVT_H_ */
1550 1481

Diff Legend

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