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.239 by root, Tue Jan 24 16:57:42 2006 UTC vs.
Revision 1.243 by root, Wed Jan 25 02:53:13 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)
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#define dDisp Display *disp = this->display->display
740 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
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
745#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight) 715#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
821 791
822#ifdef XPM_BACKGROUND 792#ifdef XPM_BACKGROUND
823# 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))
824#else 794#else
825# define XPMClearArea(a, b, c, d, e, f, g) 795# 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 796#endif
848 797
849typedef callback1<void, const char *> log_callback; 798typedef callback1<void, const char *> log_callback;
850typedef callback1<int, int> getfd_callback; 799typedef callback1<int, int> getfd_callback;
851 800
1050 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1051 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1052 unsigned long priv_modes, 1001 unsigned long priv_modes,
1053 SavedModes; 1002 SavedModes;
1054/* ---------- */ 1003/* ---------- */
1055 Atom xa[NUM_XA]; 1004 Atom *xa;
1056/* ---------- */ 1005/* ---------- */
1057#ifdef RXVT_SCROLLBAR 1006#ifdef RXVT_SCROLLBAR
1058 GC scrollbarGC, 1007 GC scrollbarGC,
1059 topShadowGC, 1008 topShadowGC,
1060 botShadowGC; 1009 botShadowGC;
1117 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;
1118#endif 1067#endif
1119 1068
1120 vector<void *> allocated; // free these memory blocks with free() 1069 vector<void *> allocated; // free these memory blocks with free()
1121 1070
1122 char *env_windowid; /* environmental variable WINDOWID */ 1071 char env_windowid[21]; /* environmental variable WINDOWID */
1072 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1123 char *env_display; /* environmental variable DISPLAY */ 1073 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1074 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1075
1126 char *locale; 1076 char *locale;
1127 char charsets[4]; 1077 char charsets[4];
1128 char *v_buffer; /* pointer to physical buffer */ 1078 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1079 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1080 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1131 1081
1132#ifdef KEYSYM_RESOURCE 1082#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1083 keyboard_manager *keyboard;
1134#endif 1084#endif
1135 1085

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines