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.240 by root, Tue Jan 24 19:40:12 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
… …
509 Rxvt_restoreFG = 39, // change default fg color 510 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 511 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 513
513 URxvt_locale = 701, // change locale 514 URxvt_locale = 701, // change locale
515 URxvt_version = 702, // request version
514 516
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 517 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 518 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 519 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 520 URxvt_Color_UL = 707,
… …
616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 618# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
617# include "rsinc.h" 619# include "rsinc.h"
618# undef def 620# undef def
619# undef reserve 621# undef reserve
620 NUM_RESOURCES 622 NUM_RESOURCES
621};
622
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}; 623};
658 624
659/* DEC private modes */ 625/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 626#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 627#define PrivMode_132OK (1UL<<1)
… …
734 ***************************************************************************** 700 *****************************************************************************
735 * MACRO DEFINES 701 * MACRO DEFINES
736 ***************************************************************************** 702 *****************************************************************************
737 */ 703 */
738#define dLocal(type,name) type const name = this->name 704#define dLocal(type,name) type const name = this->name
739#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)
740 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)
… …
941 911
942#ifdef KEYSYM_RESOURCE 912#ifdef KEYSYM_RESOURCE
943 class keyboard_manager; 913 class keyboard_manager;
944#endif 914#endif
945 915
946struct rxvt_term : zero_initialized, rxvt_vars { 916struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
947 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
948 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
949#if ENABLE_PERL 919#if ENABLE_PERL
950 rxvt_perl_term perl; 920 rxvt_perl_term perl;
951#endif 921#endif
… …
1029 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1030 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1031 unsigned long priv_modes, 1001 unsigned long priv_modes,
1032 SavedModes; 1002 SavedModes;
1033/* ---------- */ 1003/* ---------- */
1034 Atom xa[NUM_XA]; 1004 Atom *xa;
1035/* ---------- */ 1005/* ---------- */
1036#ifdef RXVT_SCROLLBAR 1006#ifdef RXVT_SCROLLBAR
1037 GC scrollbarGC, 1007 GC scrollbarGC,
1038 topShadowGC, 1008 topShadowGC,
1039 botShadowGC; 1009 botShadowGC;
… …
1096 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;
1097#endif 1067#endif
1098 1068
1099 vector<void *> allocated; // free these memory blocks with free() 1069 vector<void *> allocated; // free these memory blocks with free()
1100 1070
1101 char *env_windowid; /* environmental variable WINDOWID */ 1071 char env_windowid[21]; /* environmental variable WINDOWID */
1072 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1102 char *env_display; /* environmental variable DISPLAY */ 1073 char *env_display; /* environmental variable DISPLAY */
1103 char *env_term; /* environmental variable TERM */ 1074 char *env_term; /* environmental variable TERM */
1104 char *env_colorfgbg; 1075
1105 char *locale; 1076 char *locale;
1106 char charsets[4]; 1077 char charsets[4];
1107 char *v_buffer; /* pointer to physical buffer */ 1078 char *v_buffer; /* pointer to physical buffer */
1108 unsigned int v_buflen; /* size of area to write */ 1079 unsigned int v_buflen; /* size of area to write */
1109 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1080 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1110 1081
1111#ifdef KEYSYM_RESOURCE 1082#ifdef KEYSYM_RESOURCE
1112 keyboard_manager *keyboard; 1083 keyboard_manager *keyboard;
1113#endif 1084#endif
1114 1085
… …
1140 1111
1141 long vt_emask, vt_emask_perl, vt_emask_xim; 1112 long vt_emask, vt_emask_perl, vt_emask_xim;
1142 1113
1143 void vt_select_input () const NOTHROW 1114 void vt_select_input () const NOTHROW
1144 { 1115 {
1145 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1116 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1146 } 1117 }
1147 1118
1148#if TRANSPARENT 1119#if TRANSPARENT
1149 void rootwin_cb (XEvent &xev); 1120 void rootwin_cb (XEvent &xev);
1150 xevent_watcher rootwin_ev; 1121 xevent_watcher rootwin_ev;

Diff Legend

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