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.241 by root, Wed Jan 25 00:42:20 2006 UTC vs.
Revision 1.245 by root, Wed Jan 25 21:03:04 2006 UTC

619# undef def 619# undef def
620# undef reserve 620# undef reserve
621 NUM_RESOURCES 621 NUM_RESOURCES
622}; 622};
623 623
624// see init.C:xa_names, which must be kept in sync
625enum {
626 XA_TEXT = 0,
627 XA_COMPOUND_TEXT,
628 XA_UTF8_STRING,
629 XA_MULTIPLE,
630 XA_TARGETS,
631 XA_TIMESTAMP,
632 XA_VT_SELECTION,
633 XA_INCR,
634 XA_WM_PROTOCOLS,
635 XA_WM_DELETE_WINDOW,
636 XA_CLIPBOARD,
637#if ENABLE_FRILLS
638 XA_MOTIF_WM_HINTS,
639#endif
640#if ENABLE_EWMH
641 XA_NET_WM_PID,
642 XA_NET_WM_NAME,
643 XA_NET_WM_ICON_NAME,
644 XA_NET_WM_PING,
645#endif
646#if USE_XIM
647 XA_WM_LOCALE_NAME,
648#endif
649#if TRANSPARENT
650 XA_XROOTPMAP_ID,
651 XA_ESETROOT_PMAP_ID,
652#endif
653#if ENABLE_XEMBED
654 XA_XEMBED,
655 XA_XEMBED_INFO,
656#endif
657 NUM_XA
658};
659
660/* DEC private modes */ 624/* DEC private modes */
661#define PrivMode_132 (1UL<<0) 625#define PrivMode_132 (1UL<<0)
662#define PrivMode_132OK (1UL<<1) 626#define PrivMode_132OK (1UL<<1)
663#define PrivMode_rVideo (1UL<<2) 627#define PrivMode_rVideo (1UL<<2)
664#define PrivMode_relOrigin (1UL<<3) 628#define PrivMode_relOrigin (1UL<<3)
735 ***************************************************************************** 699 *****************************************************************************
736 * MACRO DEFINES 700 * MACRO DEFINES
737 ***************************************************************************** 701 *****************************************************************************
738 */ 702 */
739#define dLocal(type,name) type const name = this->name 703#define dLocal(type,name) type const name = this->name
740#define dDisp Display *disp = this->display->display
741 704
742// for speed reasons, we assume that all latin1 characters 705// for speed reasons, we assume that all latin1 characters
743// are single-width (the first unicdoe combining character 706// are single-width (the first unicode combining character
744// is actually 0x300, but ascii is what matters most). 707// is actually 0x300, but ascii is what matters most).
745#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c)) 708#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
746 709
747/* convert pixel dimensions to row/column values. Everything as int32_t */ 710/* convert pixel dimensions to row/column values. Everything as int32_t */
748#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 711#define Pixel2Col(x) Pixel2Width((int32_t)(x))
749#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 712#define Pixel2Row(y) Pixel2Height((int32_t)(y))
750#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 713#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
947 910
948#ifdef KEYSYM_RESOURCE 911#ifdef KEYSYM_RESOURCE
949 class keyboard_manager; 912 class keyboard_manager;
950#endif 913#endif
951 914
952struct rxvt_term : zero_initialized, rxvt_vars { 915struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
953 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
954 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 917 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
955#if ENABLE_PERL 918#if ENABLE_PERL
956 rxvt_perl_term perl; 919 rxvt_perl_term perl;
957#endif 920#endif
1035 int old_width, /* last used width in screen resize */ 998 int old_width, /* last used width in screen resize */
1036 old_height; /* last used height in screen resize */ 999 old_height; /* last used height in screen resize */
1037 unsigned long priv_modes, 1000 unsigned long priv_modes,
1038 SavedModes; 1001 SavedModes;
1039/* ---------- */ 1002/* ---------- */
1040 Atom xa[NUM_XA]; 1003 Atom *xa;
1041/* ---------- */ 1004/* ---------- */
1042#ifdef RXVT_SCROLLBAR 1005#ifdef RXVT_SCROLLBAR
1043 GC scrollbarGC, 1006 GC scrollbarGC,
1044 topShadowGC, 1007 topShadowGC,
1045 botShadowGC; 1008 botShadowGC;
1102 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;
1103#endif 1066#endif
1104 1067
1105 vector<void *> allocated; // free these memory blocks with free() 1068 vector<void *> allocated; // free these memory blocks with free()
1106 1069
1107 char *env_windowid; /* environmental variable WINDOWID */ 1070 char env_windowid[21]; /* environmental variable WINDOWID */
1071 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1108 char *env_display; /* environmental variable DISPLAY */ 1072 char *env_display; /* environmental variable DISPLAY */
1109 char *env_term; /* environmental variable TERM */ 1073 char *env_term; /* environmental variable TERM */
1110 char *env_colorfgbg; 1074
1111 char *locale; 1075 char *locale;
1112 char charsets[4]; 1076 char charsets[4];
1113 char *v_buffer; /* pointer to physical buffer */ 1077 char *v_buffer; /* pointer to physical buffer */
1114 unsigned int v_buflen; /* size of area to write */ 1078 unsigned int v_buflen; /* size of area to write */
1115 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1079 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1116 1080
1117#ifdef KEYSYM_RESOURCE 1081#ifdef KEYSYM_RESOURCE
1118 keyboard_manager *keyboard; 1082 keyboard_manager *keyboard;
1119#endif 1083#endif
1120 1084
1146 1110
1147 long vt_emask, vt_emask_perl, vt_emask_xim; 1111 long vt_emask, vt_emask_perl, vt_emask_xim;
1148 1112
1149 void vt_select_input () const NOTHROW 1113 void vt_select_input () const NOTHROW
1150 { 1114 {
1151 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1115 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1152 } 1116 }
1153 1117
1154#if TRANSPARENT 1118#if TRANSPARENT
1155 void rootwin_cb (XEvent &xev); 1119 void rootwin_cb (XEvent &xev);
1156 xevent_watcher rootwin_ev; 1120 xevent_watcher rootwin_ev;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines