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.236 by root, Sun Jan 22 17:10:01 2006 UTC vs.
Revision 1.245 by root, Wed Jan 25 21:03:04 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
… …
618# undef def 619# undef def
619# undef reserve 620# undef reserve
620 NUM_RESOURCES 621 NUM_RESOURCES
621}; 622};
622 623
623// see init.C:xa_names, which must be kept in sync
624enum {
625 XA_TEXT = 0,
626 XA_COMPOUND_TEXT,
627 XA_UTF8_STRING,
628 XA_MULTIPLE,
629 XA_TARGETS,
630 XA_TIMESTAMP,
631 XA_VT_SELECTION,
632 XA_INCR,
633 XA_WM_PROTOCOLS,
634 XA_WM_DELETE_WINDOW,
635 XA_CLIPBOARD,
636#if ENABLE_FRILLS
637 XA_MOTIF_WM_HINTS,
638#endif
639#if ENABLE_EWMH
640 XA_NET_WM_PID,
641 XA_NET_WM_NAME,
642 XA_NET_WM_ICON_NAME,
643 XA_NET_WM_PING,
644#endif
645#if USE_XIM
646 XA_WM_LOCALE_NAME,
647#endif
648#if TRANSPARENT
649 XA_XROOTPMAP_ID,
650 XA_ESETROOT_PMAP_ID,
651#endif
652#if ENABLE_XEMBED
653 XA_XEMBED,
654 XA_XEMBED_INFO,
655#endif
656 NUM_XA
657};
658
659/* DEC private modes */ 624/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 625#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 626#define PrivMode_132OK (1UL<<1)
662#define PrivMode_rVideo (1UL<<2) 627#define PrivMode_rVideo (1UL<<2)
663#define PrivMode_relOrigin (1UL<<3) 628#define PrivMode_relOrigin (1UL<<3)
… …
734 ***************************************************************************** 699 *****************************************************************************
735 * MACRO DEFINES 700 * MACRO DEFINES
736 ***************************************************************************** 701 *****************************************************************************
737 */ 702 */
738#define dLocal(type,name) type const name = this->name 703#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 704
705// for speed reasons, we assume that all latin1 characters
706// are single-width (the first unicode combining character
707// is actually 0x300, but ascii is what matters most).
708#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
740 709
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 710/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 711#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 712#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 713#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
821 790
822#ifdef XPM_BACKGROUND 791#ifdef XPM_BACKGROUND
823# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 792# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
824#else 793#else
825# define XPMClearArea(a, b, c, d, e, f, g) 794# define XPMClearArea(a, b, c, d, e, f, g)
826#endif
827
828#ifdef DEBUG_CMD
829# define D_CMD(x) fprintf x ; fputc('\n', stderr)
830#else
831# define D_CMD(x)
832#endif
833#ifdef DEBUG_INIT
834# define D_INIT(x) fprintf x ; fputc('\n', stderr)
835#else
836# define D_INIT(x)
837#endif
838#ifdef DEBUG_MAIN
839# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
840#else
841# define D_MAIN(x)
842#endif
843#ifdef DEBUG_SIZE
844# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
845#else
846# define D_SIZE(x)
847#endif 795#endif
848 796
849typedef callback1<void, const char *> log_callback; 797typedef callback1<void, const char *> log_callback;
850typedef callback1<int, int> getfd_callback; 798typedef callback1<int, int> getfd_callback;
851 799
… …
962 910
963#ifdef KEYSYM_RESOURCE 911#ifdef KEYSYM_RESOURCE
964 class keyboard_manager; 912 class keyboard_manager;
965#endif 913#endif
966 914
967struct rxvt_term : zero_initialized, rxvt_vars { 915struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
968 log_callback *log_hook; // log error messages through this hook, if != 0 916 log_callback *log_hook; // log error messages through this hook, if != 0
969 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 917 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
970#if ENABLE_PERL 918#if ENABLE_PERL
971 rxvt_perl_term perl; 919 rxvt_perl_term perl;
972#endif 920#endif
… …
1050 int old_width, /* last used width in screen resize */ 998 int old_width, /* last used width in screen resize */
1051 old_height; /* last used height in screen resize */ 999 old_height; /* last used height in screen resize */
1052 unsigned long priv_modes, 1000 unsigned long priv_modes,
1053 SavedModes; 1001 SavedModes;
1054/* ---------- */ 1002/* ---------- */
1055 Atom xa[NUM_XA]; 1003 Atom *xa;
1056/* ---------- */ 1004/* ---------- */
1057#ifdef RXVT_SCROLLBAR 1005#ifdef RXVT_SCROLLBAR
1058 GC scrollbarGC, 1006 GC scrollbarGC,
1059 topShadowGC, 1007 topShadowGC,
1060 botShadowGC; 1008 botShadowGC;
… …
1117 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1065 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1118#endif 1066#endif
1119 1067
1120 vector<void *> allocated; // free these memory blocks with free() 1068 vector<void *> allocated; // free these memory blocks with free()
1121 1069
1122 char *env_windowid; /* environmental variable WINDOWID */ 1070 char env_windowid[21]; /* environmental variable WINDOWID */
1071 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1123 char *env_display; /* environmental variable DISPLAY */ 1072 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1073 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1074
1126 char *locale; 1075 char *locale;
1127 char charsets[4]; 1076 char charsets[4];
1128 char *v_buffer; /* pointer to physical buffer */ 1077 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1078 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1079 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1131 1080
1132#ifdef KEYSYM_RESOURCE 1081#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1082 keyboard_manager *keyboard;
1134#endif 1083#endif
1135 1084
… …
1157#endif 1106#endif
1158 1107
1159 // modifies first argument(!) 1108 // modifies first argument(!)
1160 void paste (char *data, unsigned int len) NOTHROW; 1109 void paste (char *data, unsigned int len) NOTHROW;
1161 1110
1162 long vt_emask, vt_emask_perl; 1111 long vt_emask, vt_emask_perl, vt_emask_xim;
1163 1112
1164 void vt_select_input () const NOTHROW 1113 void vt_select_input () const NOTHROW
1165 { 1114 {
1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1115 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1167 } 1116 }
1168 1117
1169#if TRANSPARENT 1118#if TRANSPARENT
1170 void rootwin_cb (XEvent &xev); 1119 void rootwin_cb (XEvent &xev);
1171 xevent_watcher rootwin_ev; 1120 xevent_watcher rootwin_ev;
… …
1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1277 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1329 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1278 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1330 1279
1331 // screen.C 1280 // screen.C
1332 1281
1333 void lalloc (line_t &l) const NOTHROW 1282 void lalloc (line_t &l) const
1334 { 1283 {
1335 l.t = (text_t *)talloc->alloc (); 1284 l.t = (text_t *)talloc->alloc ();
1336 l.r = (rend_t *)ralloc->alloc (); 1285 l.r = (rend_t *)ralloc->alloc ();
1337 } 1286 }
1338 1287
… …
1342 talloc->free (l.t); 1291 talloc->free (l.t);
1343 ralloc->free (l.r); 1292 ralloc->free (l.r);
1344 } 1293 }
1345#endif 1294#endif
1346 1295
1347 void lresize (line_t &l) const NOTHROW 1296 void lresize (line_t &l) const
1348 { 1297 {
1349 if (!l.t) 1298 if (!l.t)
1350 return; 1299 return;
1351 1300
1352 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));
… …
1420 void scr_remap_chars () NOTHROW; 1369 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1370 void scr_remap_chars (line_t &l) NOTHROW;
1422 1371
1423 enum cursor_mode { SAVE, RESTORE }; 1372 enum cursor_mode { SAVE, RESTORE };
1424 1373
1425 void scr_poweron () NOTHROW; 1374 void scr_poweron ();
1426 void scr_cursor (cursor_mode mode) NOTHROW; 1375 void scr_cursor (cursor_mode mode) NOTHROW;
1427 void scr_do_wrap () NOTHROW; 1376 void scr_do_wrap () NOTHROW;
1377 void scr_swap_screen () NOTHROW;
1428 int scr_change_screen (int scrn) NOTHROW; 1378 void scr_change_screen (int scrn);
1429 void scr_color (unsigned int color, int fgbg) NOTHROW; 1379 void scr_color (unsigned int color, int fgbg) NOTHROW;
1430 void scr_rendition (int set, int style) NOTHROW; 1380 void scr_rendition (int set, int style) NOTHROW;
1431 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;
1432 void scr_backspace () NOTHROW; 1382 void scr_backspace () NOTHROW;
1433 void scr_tab (int count, bool ht = false) NOTHROW; 1383 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1525# define __PROTO(p) p 1475# define __PROTO(p) p
1526#else 1476#else
1527# define __PROTO(p) () 1477# define __PROTO(p) ()
1528#endif 1478#endif
1529 1479
1530#ifdef DEBUG_malloc
1531# include "dmalloc.h" /* This comes last */
1532#endif
1533
1534#endif /* _RXVT_H_ */ 1480#endif /* _RXVT_H_ */
1535 1481

Diff Legend

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