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.234 by root, Sun Jan 22 00:48:13 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
… …
169extern char **environ; 170extern char **environ;
170extern char **rxvt_environ; // the original environ pointer 171extern char **rxvt_environ; // the original environ pointer
171 172
172inline void set_environ (stringvec *envv) 173inline void set_environ (stringvec *envv)
173{ 174{
175#if ENABLE_PERL
176 assert (envv);
177#else
174 if (envv) 178 if (envv)
179#endif
175 environ = (char **)envv->begin (); 180 environ = (char **)envv->begin ();
176} 181}
177 182
178inline void set_environ (char **envv) 183inline void set_environ (char **envv)
179{ 184{
185#if ENABLE_PERL
186 assert (envv);
187#else
180 if (envv) 188 if (envv)
189#endif
181 environ = envv; 190 environ = envv;
182} 191}
183 192
184/* 193/*
185 ***************************************************************************** 194 *****************************************************************************
… …
423// fake styles 432// fake styles
424#define RS_Blink 0x00010000UL // blink 433#define RS_Blink 0x00010000UL // blink
425#define RS_RVid 0x00020000UL // reverse video 434#define RS_RVid 0x00020000UL // reverse video
426#define RS_Uline 0x00040000UL // underline 435#define RS_Uline 0x00040000UL // underline
427 436
437// toggle this to force redraw, must be != RS_Careful
438#define RS_redraw 0x01000000UL
439
428// 5 custom bits for extensions 440// 5 custom bits for extensions
429#define RS_customCount 32 441#define RS_customCount 32
430#define RS_customMask 0x00f80000UL 442#define RS_customMask 0x00f80000UL
431#define RS_customShift 19 443#define RS_customShift 19
432 444
… …
501 Rxvt_restoreFG = 39, // change default fg color 513 Rxvt_restoreFG = 39, // change default fg color
502 Rxvt_restoreBG = 49, // change default bg color 514 Rxvt_restoreBG = 49, // change default bg color
503 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 515 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
504 516
505 URxvt_locale = 701, // change locale 517 URxvt_locale = 701, // change locale
518 URxvt_version = 702, // request version
506 519
507 URxvt_Color_IT = 704, // change actual 'Italic' colour 520 URxvt_Color_IT = 704, // change actual 'Italic' colour
508 URxvt_Color_tint = 705, // change actual tint colour 521 URxvt_Color_tint = 705, // change actual tint colour
509 URxvt_Color_BD = 706, 522 URxvt_Color_BD = 706,
510 URxvt_Color_UL = 707, 523 URxvt_Color_UL = 707,
… …
608# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 621# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
609# include "rsinc.h" 622# include "rsinc.h"
610# undef def 623# undef def
611# undef reserve 624# undef reserve
612 NUM_RESOURCES 625 NUM_RESOURCES
613};
614
615// see init.C:xa_names, which must be kept in sync
616enum {
617 XA_TEXT = 0,
618 XA_COMPOUND_TEXT,
619 XA_UTF8_STRING,
620 XA_MULTIPLE,
621 XA_TARGETS,
622 XA_TIMESTAMP,
623 XA_VT_SELECTION,
624 XA_INCR,
625 XA_WM_PROTOCOLS,
626 XA_WM_DELETE_WINDOW,
627 XA_CLIPBOARD,
628#if ENABLE_FRILLS
629 XA_MOTIF_WM_HINTS,
630#endif
631#if ENABLE_EWMH
632 XA_NET_WM_PID,
633 XA_NET_WM_NAME,
634 XA_NET_WM_ICON_NAME,
635 XA_NET_WM_PING,
636#endif
637#if USE_XIM
638 XA_WM_LOCALE_NAME,
639#endif
640#if TRANSPARENT
641 XA_XROOTPMAP_ID,
642 XA_ESETROOT_PMAP_ID,
643#endif
644#if ENABLE_XEMBED
645 XA_XEMBED,
646 XA_XEMBED_INFO,
647#endif
648 NUM_XA
649}; 626};
650 627
651/* DEC private modes */ 628/* DEC private modes */
652#define PrivMode_132 (1UL<<0) 629#define PrivMode_132 (1UL<<0)
653#define PrivMode_132OK (1UL<<1) 630#define PrivMode_132OK (1UL<<1)
… …
726 ***************************************************************************** 703 *****************************************************************************
727 * MACRO DEFINES 704 * MACRO DEFINES
728 ***************************************************************************** 705 *****************************************************************************
729 */ 706 */
730#define dLocal(type,name) type const name = this->name 707#define dLocal(type,name) type const name = this->name
731#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)
732 713
733/* convert pixel dimensions to row/column values. Everything as int32_t */ 714/* convert pixel dimensions to row/column values. Everything as int32_t */
734#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 715#define Pixel2Col(x) Pixel2Width((int32_t)(x))
735#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 716#define Pixel2Row(y) Pixel2Height((int32_t)(y))
736#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 717#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
813 794
814#ifdef XPM_BACKGROUND 795#ifdef XPM_BACKGROUND
815# 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))
816#else 797#else
817# define XPMClearArea(a, b, c, d, e, f, g) 798# define XPMClearArea(a, b, c, d, e, f, g)
818#endif
819
820#ifdef DEBUG_CMD
821# define D_CMD(x) fprintf x ; fputc('\n', stderr)
822#else
823# define D_CMD(x)
824#endif
825#ifdef DEBUG_INIT
826# define D_INIT(x) fprintf x ; fputc('\n', stderr)
827#else
828# define D_INIT(x)
829#endif
830#ifdef DEBUG_MAIN
831# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
832#else
833# define D_MAIN(x)
834#endif
835#ifdef DEBUG_SIZE
836# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
837#else
838# define D_SIZE(x)
839#endif 799#endif
840 800
841typedef callback1<void, const char *> log_callback; 801typedef callback1<void, const char *> log_callback;
842typedef callback1<int, int> getfd_callback; 802typedef callback1<int, int> getfd_callback;
843 803
… …
954 914
955#ifdef KEYSYM_RESOURCE 915#ifdef KEYSYM_RESOURCE
956 class keyboard_manager; 916 class keyboard_manager;
957#endif 917#endif
958 918
959struct rxvt_term : zero_initialized, rxvt_vars { 919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
960 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
961 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
962#if ENABLE_PERL 922#if ENABLE_PERL
963 rxvt_perl_term perl; 923 rxvt_perl_term perl;
964#endif 924#endif
… …
1042 int old_width, /* last used width in screen resize */ 1002 int old_width, /* last used width in screen resize */
1043 old_height; /* last used height in screen resize */ 1003 old_height; /* last used height in screen resize */
1044 unsigned long priv_modes, 1004 unsigned long priv_modes,
1045 SavedModes; 1005 SavedModes;
1046/* ---------- */ 1006/* ---------- */
1047 Atom xa[NUM_XA]; 1007 Atom *xa;
1048/* ---------- */ 1008/* ---------- */
1049#ifdef RXVT_SCROLLBAR 1009#ifdef RXVT_SCROLLBAR
1050 GC scrollbarGC, 1010 GC scrollbarGC,
1051 topShadowGC, 1011 topShadowGC,
1052 botShadowGC; 1012 botShadowGC;
… …
1109 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;
1110#endif 1070#endif
1111 1071
1112 vector<void *> allocated; // free these memory blocks with free() 1072 vector<void *> allocated; // free these memory blocks with free()
1113 1073
1114 char *env_windowid; /* environmental variable WINDOWID */ 1074 char env_windowid[21]; /* environmental variable WINDOWID */
1075 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1115 char *env_display; /* environmental variable DISPLAY */ 1076 char *env_display; /* environmental variable DISPLAY */
1116 char *env_term; /* environmental variable TERM */ 1077 char *env_term; /* environmental variable TERM */
1117 char *env_colorfgbg; 1078
1118 char *locale; 1079 char *locale;
1119 char charsets[4]; 1080 char charsets[4];
1120 char *v_buffer; /* pointer to physical buffer */ 1081 char *v_buffer; /* pointer to physical buffer */
1121 unsigned int v_buflen; /* size of area to write */ 1082 unsigned int v_buflen; /* size of area to write */
1122 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1083 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1123 1084
1124#ifdef KEYSYM_RESOURCE 1085#ifdef KEYSYM_RESOURCE
1125 keyboard_manager *keyboard; 1086 keyboard_manager *keyboard;
1126#endif 1087#endif
1127 1088
… …
1149#endif 1110#endif
1150 1111
1151 // modifies first argument(!) 1112 // modifies first argument(!)
1152 void paste (char *data, unsigned int len) NOTHROW; 1113 void paste (char *data, unsigned int len) NOTHROW;
1153 1114
1154 long vt_emask, vt_emask_perl; 1115 long vt_emask, vt_emask_perl, vt_emask_xim;
1155 1116
1156 void vt_select_input () const NOTHROW 1117 void vt_select_input () const NOTHROW
1157 { 1118 {
1158 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1159 } 1120 }
1160 1121
1161#if TRANSPARENT 1122#if TRANSPARENT
1162 void rootwin_cb (XEvent &xev); 1123 void rootwin_cb (XEvent &xev);
1163 xevent_watcher rootwin_ev; 1124 xevent_watcher rootwin_ev;
… …
1249 void create_windows (int argc, const char *const *argv); 1210 void create_windows (int argc, const char *const *argv);
1250 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);
1251 void window_calc (unsigned int newwidth, unsigned int newheight); 1212 void window_calc (unsigned int newwidth, unsigned int newheight);
1252 1213
1253#if USE_XIM 1214#if USE_XIM
1254 rxvt_xim *input_method; 1215 rxvt_xim *input_method;
1255 XIC Input_Context; 1216 XIC Input_Context;
1256 XIMStyle input_style; 1217 XIMStyle input_style;
1257 XPoint spot; // most recently sent spot position 1218 XPoint spot; // most recently sent spot position
1258 1219
1259 void im_destroy (); 1220 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1221 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1222 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos) NOTHROW; 1223 void im_set_position (XPoint &pos) NOTHROW;
… …
1320 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1281 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1282 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 1283
1323 // screen.C 1284 // screen.C
1324 1285
1325 void lalloc (line_t &l) const NOTHROW 1286 void lalloc (line_t &l) const
1326 { 1287 {
1327 l.t = (text_t *)talloc->alloc (); 1288 l.t = (text_t *)talloc->alloc ();
1328 l.r = (rend_t *)ralloc->alloc (); 1289 l.r = (rend_t *)ralloc->alloc ();
1329 } 1290 }
1330 1291
… …
1334 talloc->free (l.t); 1295 talloc->free (l.t);
1335 ralloc->free (l.r); 1296 ralloc->free (l.r);
1336 } 1297 }
1337#endif 1298#endif
1338 1299
1339 void lresize (line_t &l) const NOTHROW 1300 void lresize (line_t &l) const
1340 { 1301 {
1341 if (!l.t) 1302 if (!l.t)
1342 return; 1303 return;
1343 1304
1344 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));
… …
1412 void scr_remap_chars () NOTHROW; 1373 void scr_remap_chars () NOTHROW;
1413 void scr_remap_chars (line_t &l) NOTHROW; 1374 void scr_remap_chars (line_t &l) NOTHROW;
1414 1375
1415 enum cursor_mode { SAVE, RESTORE }; 1376 enum cursor_mode { SAVE, RESTORE };
1416 1377
1417 void scr_poweron () NOTHROW; 1378 void scr_poweron ();
1418 void scr_cursor (cursor_mode mode) NOTHROW; 1379 void scr_cursor (cursor_mode mode) NOTHROW;
1419 void scr_do_wrap () NOTHROW; 1380 void scr_do_wrap () NOTHROW;
1381 void scr_swap_screen () NOTHROW;
1420 int scr_change_screen (int scrn) NOTHROW; 1382 void scr_change_screen (int scrn);
1421 void scr_color (unsigned int color, int fgbg) NOTHROW; 1383 void scr_color (unsigned int color, int fgbg) NOTHROW;
1422 void scr_rendition (int set, int style) NOTHROW; 1384 void scr_rendition (int set, int style) NOTHROW;
1423 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;
1424 void scr_backspace () NOTHROW; 1386 void scr_backspace () NOTHROW;
1425 void scr_tab (int count, bool ht = false) NOTHROW; 1387 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1517# define __PROTO(p) p 1479# define __PROTO(p) p
1518#else 1480#else
1519# define __PROTO(p) () 1481# define __PROTO(p) ()
1520#endif 1482#endif
1521 1483
1522#ifdef DEBUG_malloc
1523# include "dmalloc.h" /* This comes last */
1524#endif
1525
1526#endif /* _RXVT_H_ */ 1484#endif /* _RXVT_H_ */
1527 1485

Diff Legend

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