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.232 by root, Sat Jan 21 23:50:33 2006 UTC vs.
Revision 1.246 by root, Sat Jan 28 20:33:31 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;
… …
167extern char **environ; 170extern char **environ;
168extern char **rxvt_environ; // the original environ pointer 171extern char **rxvt_environ; // the original environ pointer
169 172
170inline void set_environ (stringvec *envv) 173inline void set_environ (stringvec *envv)
171{ 174{
175#if ENABLE_PERL
176 assert (envv);
177#else
172 if (envv) 178 if (envv)
179#endif
173 environ = (char **)envv->begin (); 180 environ = (char **)envv->begin ();
174} 181}
175 182
176inline void set_environ (char **envv) 183inline void set_environ (char **envv)
177{ 184{
185#if ENABLE_PERL
186 assert (envv);
187#else
178 if (envv) 188 if (envv)
189#endif
179 environ = envv; 190 environ = envv;
180} 191}
181 192
182/* 193/*
183 ***************************************************************************** 194 *****************************************************************************
… …
199typedef struct { 210typedef struct {
200 short w, h, x, y; 211 short w, h, x, y;
201 Pixmap pixmap; 212 Pixmap pixmap;
202} bgPixmap_t; 213} bgPixmap_t;
203#endif 214#endif
204
205struct rxvt_ptytty {
206 int pty; // pty file descriptor; connected to rxvt
207 int tty; // tty file descriptor; connected to child
208
209 rxvt_ptytty ()
210 : pty(-1), tty(-1)
211 {
212 }
213
214 virtual ~rxvt_ptytty ()
215 {
216 }
217
218 virtual bool get () = 0;
219#if UTMP_SUPPORT
220 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
221#endif
222
223 void close_tty ();
224 bool make_controlling_tty ();
225 void set_utf8_mode (bool on);
226};
227
228rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
229void rxvt_ptytty_server (); // start the ptytty server process
230 215
231/* 216/*
232 * the 'essential' information for reporting Mouse Events 217 * the 'essential' information for reporting Mouse Events
233 * pared down from XButtonEvent 218 * pared down from XButtonEvent
234 */ 219 */
… …
525 Rxvt_restoreFG = 39, // change default fg color 510 Rxvt_restoreFG = 39, // change default fg color
526 Rxvt_restoreBG = 49, // change default bg color 511 Rxvt_restoreBG = 49, // change default bg color
527 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
528 513
529 URxvt_locale = 701, // change locale 514 URxvt_locale = 701, // change locale
515 URxvt_version = 702, // request version
530 516
531 URxvt_Color_IT = 704, // change actual 'Italic' colour 517 URxvt_Color_IT = 704, // change actual 'Italic' colour
532 URxvt_Color_tint = 705, // change actual tint colour 518 URxvt_Color_tint = 705, // change actual tint colour
533 URxvt_Color_BD = 706, 519 URxvt_Color_BD = 706,
534 URxvt_Color_UL = 707, 520 URxvt_Color_UL = 707,
… …
632# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 618# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
633# include "rsinc.h" 619# include "rsinc.h"
634# undef def 620# undef def
635# undef reserve 621# undef reserve
636 NUM_RESOURCES 622 NUM_RESOURCES
637};
638
639// see init.C:xa_names, which must be kept in sync
640enum {
641 XA_TEXT = 0,
642 XA_COMPOUND_TEXT,
643 XA_UTF8_STRING,
644 XA_MULTIPLE,
645 XA_TARGETS,
646 XA_TIMESTAMP,
647 XA_VT_SELECTION,
648 XA_INCR,
649 XA_WM_PROTOCOLS,
650 XA_WM_DELETE_WINDOW,
651 XA_CLIPBOARD,
652#if ENABLE_FRILLS
653 XA_MOTIF_WM_HINTS,
654#endif
655#if ENABLE_EWMH
656 XA_NET_WM_PID,
657 XA_NET_WM_NAME,
658 XA_NET_WM_ICON_NAME,
659 XA_NET_WM_PING,
660#endif
661#if USE_XIM
662 XA_WM_LOCALE_NAME,
663#endif
664#if TRANSPARENT
665 XA_XROOTPMAP_ID,
666 XA_ESETROOT_PMAP_ID,
667#endif
668#if ENABLE_XEMBED
669 XA_XEMBED,
670 XA_XEMBED_INFO,
671#endif
672 NUM_XA
673}; 623};
674 624
675/* DEC private modes */ 625/* DEC private modes */
676#define PrivMode_132 (1UL<<0) 626#define PrivMode_132 (1UL<<0)
677#define PrivMode_132OK (1UL<<1) 627#define PrivMode_132OK (1UL<<1)
… …
750 ***************************************************************************** 700 *****************************************************************************
751 * MACRO DEFINES 701 * MACRO DEFINES
752 ***************************************************************************** 702 *****************************************************************************
753 */ 703 */
754#define dLocal(type,name) type const name = this->name 704#define dLocal(type,name) type const name = this->name
755#define dDisp Display *disp = this->display->display 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)
756 710
757/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
758#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
759#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
760#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
837 791
838#ifdef XPM_BACKGROUND 792#ifdef XPM_BACKGROUND
839# 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))
840#else 794#else
841# define XPMClearArea(a, b, c, d, e, f, g) 795# define XPMClearArea(a, b, c, d, e, f, g)
842#endif
843
844#ifdef DEBUG_CMD
845# define D_CMD(x) fprintf x ; fputc('\n', stderr)
846#else
847# define D_CMD(x)
848#endif
849#ifdef DEBUG_INIT
850# define D_INIT(x) fprintf x ; fputc('\n', stderr)
851#else
852# define D_INIT(x)
853#endif
854#ifdef DEBUG_MAIN
855# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
856#else
857# define D_MAIN(x)
858#endif
859#ifdef DEBUG_SIZE
860# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
861#else
862# define D_SIZE(x)
863#endif 796#endif
864 797
865typedef callback1<void, const char *> log_callback; 798typedef callback1<void, const char *> log_callback;
866typedef callback1<int, int> getfd_callback; 799typedef callback1<int, int> getfd_callback;
867 800
… …
978 911
979#ifdef KEYSYM_RESOURCE 912#ifdef KEYSYM_RESOURCE
980 class keyboard_manager; 913 class keyboard_manager;
981#endif 914#endif
982 915
983struct rxvt_term : zero_initialized, rxvt_vars { 916struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
984 log_callback *log_hook; // log error messages through this hook, if != 0 917 log_callback *log_hook; // log error messages through this hook, if != 0
985 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
986#if ENABLE_PERL 919#if ENABLE_PERL
987 rxvt_perl_term perl; 920 rxvt_perl_term perl;
988#endif 921#endif
… …
1066 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1067 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1068 unsigned long priv_modes, 1001 unsigned long priv_modes,
1069 SavedModes; 1002 SavedModes;
1070/* ---------- */ 1003/* ---------- */
1071 Atom xa[NUM_XA]; 1004 Atom *xa;
1072/* ---------- */ 1005/* ---------- */
1073#ifdef RXVT_SCROLLBAR 1006#ifdef RXVT_SCROLLBAR
1074 GC scrollbarGC, 1007 GC scrollbarGC,
1075 topShadowGC, 1008 topShadowGC,
1076 botShadowGC; 1009 botShadowGC;
… …
1133 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;
1134#endif 1067#endif
1135 1068
1136 vector<void *> allocated; // free these memory blocks with free() 1069 vector<void *> allocated; // free these memory blocks with free()
1137 1070
1138 char *env_windowid; /* environmental variable WINDOWID */ 1071 char env_windowid[21]; /* environmental variable WINDOWID */
1072 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1139 char *env_display; /* environmental variable DISPLAY */ 1073 char *env_display; /* environmental variable DISPLAY */
1140 char *env_term; /* environmental variable TERM */ 1074 char *env_term; /* environmental variable TERM */
1141 char *env_colorfgbg; 1075
1142 char *locale; 1076 char *locale;
1143 char charsets[4]; 1077 char charsets[4];
1144 char *v_buffer; /* pointer to physical buffer */ 1078 char *v_buffer; /* pointer to physical buffer */
1145 unsigned int v_buflen; /* size of area to write */ 1079 unsigned int v_buflen; /* size of area to write */
1146 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1080 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1147 1081
1148#ifdef KEYSYM_RESOURCE 1082#ifdef KEYSYM_RESOURCE
1149 keyboard_manager *keyboard; 1083 keyboard_manager *keyboard;
1150#endif 1084#endif
1151 1085
1152 const char *rs[NUM_RESOURCES]; 1086 const char *rs[NUM_RESOURCES];
1153 /* command input buffering */ 1087 /* command input buffering */
1154 char *cmdbuf_ptr, *cmdbuf_endp; 1088 char *cmdbuf_ptr, *cmdbuf_endp;
1155 char cmdbuf_base[CBUFSIZ]; 1089 char cmdbuf_base[CBUFSIZ];
1156 1090
1157 rxvt_ptytty *pty; 1091 ptytty *pty;
1158 1092
1159 rxvt_salloc *talloc; // text line allocator 1093 rxvt_salloc *talloc; // text line allocator
1160 rxvt_salloc *ralloc; // rend line allocator 1094 rxvt_salloc *ralloc; // rend line allocator
1161 1095
1162 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
… …
1173#endif 1107#endif
1174 1108
1175 // modifies first argument(!) 1109 // modifies first argument(!)
1176 void paste (char *data, unsigned int len) NOTHROW; 1110 void paste (char *data, unsigned int len) NOTHROW;
1177 1111
1178 long vt_emask, vt_emask_perl; 1112 long vt_emask, vt_emask_perl, vt_emask_xim;
1179 1113
1180 void vt_select_input () const NOTHROW 1114 void vt_select_input () const NOTHROW
1181 { 1115 {
1182 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1116 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1183 } 1117 }
1184 1118
1185#if TRANSPARENT 1119#if TRANSPARENT
1186 void rootwin_cb (XEvent &xev); 1120 void rootwin_cb (XEvent &xev);
1187 xevent_watcher rootwin_ev; 1121 xevent_watcher rootwin_ev;
… …
1237 rxvt_term (); 1171 rxvt_term ();
1238 ~rxvt_term (); 1172 ~rxvt_term ();
1239 void destroy (); 1173 void destroy ();
1240 void emergency_cleanup (); 1174 void emergency_cleanup ();
1241 1175
1242 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
1243 bool init_vars (); 1184 bool init_vars ();
1244 1185
1245 bool pty_fill (); 1186 bool pty_fill ();
1246 1187
1247 void make_current () const // make this the "currently active" urxvt instance 1188 void make_current () const // make this the "currently active" urxvt instance
… …
1266 void create_windows (int argc, const char *const *argv); 1207 void create_windows (int argc, const char *const *argv);
1267 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);
1268 void window_calc (unsigned int newwidth, unsigned int newheight); 1209 void window_calc (unsigned int newwidth, unsigned int newheight);
1269 1210
1270#if USE_XIM 1211#if USE_XIM
1271 rxvt_xim *input_method; 1212 rxvt_xim *input_method;
1272 XIC Input_Context; 1213 XIC Input_Context;
1273 XIMStyle input_style; 1214 XIMStyle input_style;
1274 XPoint spot; // most recently sent spot position 1215 XPoint spot; // most recently sent spot position
1275 1216
1276 void im_destroy (); 1217 void im_destroy ();
1277 void im_cb (); im_watcher im_ev; 1218 void im_cb (); im_watcher im_ev;
1278 void im_set_size (XRectangle &size); 1219 void im_set_size (XRectangle &size);
1279 void im_set_position (XPoint &pos) NOTHROW; 1220 void im_set_position (XPoint &pos) NOTHROW;
… …
1337 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1338 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1279 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1339 1280
1340 // screen.C 1281 // screen.C
1341 1282
1342 void lalloc (line_t &l) const NOTHROW 1283 void lalloc (line_t &l) const
1343 { 1284 {
1344 l.t = (text_t *)talloc->alloc (); 1285 l.t = (text_t *)talloc->alloc ();
1345 l.r = (rend_t *)ralloc->alloc (); 1286 l.r = (rend_t *)ralloc->alloc ();
1346 } 1287 }
1347 1288
… …
1351 talloc->free (l.t); 1292 talloc->free (l.t);
1352 ralloc->free (l.r); 1293 ralloc->free (l.r);
1353 } 1294 }
1354#endif 1295#endif
1355 1296
1356 void lresize (line_t &l) const NOTHROW 1297 void lresize (line_t &l) const
1357 { 1298 {
1358 if (!l.t) 1299 if (!l.t)
1359 return; 1300 return;
1360 1301
1361 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));
… …
1429 void scr_remap_chars () NOTHROW; 1370 void scr_remap_chars () NOTHROW;
1430 void scr_remap_chars (line_t &l) NOTHROW; 1371 void scr_remap_chars (line_t &l) NOTHROW;
1431 1372
1432 enum cursor_mode { SAVE, RESTORE }; 1373 enum cursor_mode { SAVE, RESTORE };
1433 1374
1434 void scr_poweron () NOTHROW; 1375 void scr_poweron ();
1435 void scr_cursor (cursor_mode mode) NOTHROW; 1376 void scr_cursor (cursor_mode mode) NOTHROW;
1436 void scr_do_wrap () NOTHROW; 1377 void scr_do_wrap () NOTHROW;
1378 void scr_swap_screen () NOTHROW;
1437 int scr_change_screen (int scrn) NOTHROW; 1379 void scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg) NOTHROW; 1380 void scr_color (unsigned int color, int fgbg) NOTHROW;
1439 void scr_rendition (int set, int style) NOTHROW; 1381 void scr_rendition (int set, int style) NOTHROW;
1440 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;
1441 void scr_backspace () NOTHROW; 1383 void scr_backspace () NOTHROW;
1442 void scr_tab (int count, bool ht = false) NOTHROW; 1384 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1534# define __PROTO(p) p 1476# define __PROTO(p) p
1535#else 1477#else
1536# define __PROTO(p) () 1478# define __PROTO(p) ()
1537#endif 1479#endif
1538 1480
1539#ifdef DEBUG_malloc
1540# include "dmalloc.h" /* This comes last */
1541#endif
1542
1543#endif /* _RXVT_H_ */ 1481#endif /* _RXVT_H_ */
1544 1482

Diff Legend

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