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.246 by root, Sat Jan 28 20:33:31 2006 UTC

510 Rxvt_restoreFG = 39, // change default fg color 510 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 511 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 513
514 URxvt_locale = 701, // change locale 514 URxvt_locale = 701, // change locale
515 URxvt_version = 702, // request version
515 516
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 517 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 518 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 519 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 520 URxvt_Color_UL = 707,
617# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 618# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
618# include "rsinc.h" 619# include "rsinc.h"
619# undef def 620# undef def
620# undef reserve 621# undef reserve
621 NUM_RESOURCES 622 NUM_RESOURCES
622};
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}; 623};
659 624
660/* DEC private modes */ 625/* DEC private modes */
661#define PrivMode_132 (1UL<<0) 626#define PrivMode_132 (1UL<<0)
662#define PrivMode_132OK (1UL<<1) 627#define PrivMode_132OK (1UL<<1)
735 ***************************************************************************** 700 *****************************************************************************
736 * MACRO DEFINES 701 * MACRO DEFINES
737 ***************************************************************************** 702 *****************************************************************************
738 */ 703 */
739#define dLocal(type,name) type const name = this->name 704#define dLocal(type,name) type const name = this->name
740#define dDisp Display *disp = this->display->display
741 705
742// for speed reasons, we assume that all latin1 characters 706// for speed reasons, we assume that all latin1 characters
743// are single-width (the first unicdoe combining character 707// are single-width (the first unicode combining character
744// is actually 0x300, but ascii is what matters most). 708// is actually 0x300, but ascii is what matters most).
745#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c)) 709#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
746 710
747/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
748#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
749#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
750#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
947 911
948#ifdef KEYSYM_RESOURCE 912#ifdef KEYSYM_RESOURCE
949 class keyboard_manager; 913 class keyboard_manager;
950#endif 914#endif
951 915
952struct rxvt_term : zero_initialized, rxvt_vars { 916struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
953 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
954 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
955#if ENABLE_PERL 919#if ENABLE_PERL
956 rxvt_perl_term perl; 920 rxvt_perl_term perl;
957#endif 921#endif
1035 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1036 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1037 unsigned long priv_modes, 1001 unsigned long priv_modes,
1038 SavedModes; 1002 SavedModes;
1039/* ---------- */ 1003/* ---------- */
1040 Atom xa[NUM_XA]; 1004 Atom *xa;
1041/* ---------- */ 1005/* ---------- */
1042#ifdef RXVT_SCROLLBAR 1006#ifdef RXVT_SCROLLBAR
1043 GC scrollbarGC, 1007 GC scrollbarGC,
1044 topShadowGC, 1008 topShadowGC,
1045 botShadowGC; 1009 botShadowGC;
1102 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;
1103#endif 1067#endif
1104 1068
1105 vector<void *> allocated; // free these memory blocks with free() 1069 vector<void *> allocated; // free these memory blocks with free()
1106 1070
1107 char *env_windowid; /* environmental variable WINDOWID */ 1071 char env_windowid[21]; /* environmental variable WINDOWID */
1072 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1108 char *env_display; /* environmental variable DISPLAY */ 1073 char *env_display; /* environmental variable DISPLAY */
1109 char *env_term; /* environmental variable TERM */ 1074 char *env_term; /* environmental variable TERM */
1110 char *env_colorfgbg; 1075
1111 char *locale; 1076 char *locale;
1112 char charsets[4]; 1077 char charsets[4];
1113 char *v_buffer; /* pointer to physical buffer */ 1078 char *v_buffer; /* pointer to physical buffer */
1114 unsigned int v_buflen; /* size of area to write */ 1079 unsigned int v_buflen; /* size of area to write */
1115 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1080 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1116 1081
1117#ifdef KEYSYM_RESOURCE 1082#ifdef KEYSYM_RESOURCE
1118 keyboard_manager *keyboard; 1083 keyboard_manager *keyboard;
1119#endif 1084#endif
1120 1085
1146 1111
1147 long vt_emask, vt_emask_perl, vt_emask_xim; 1112 long vt_emask, vt_emask_perl, vt_emask_xim;
1148 1113
1149 void vt_select_input () const NOTHROW 1114 void vt_select_input () const NOTHROW
1150 { 1115 {
1151 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1116 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1152 } 1117 }
1153 1118
1154#if TRANSPARENT 1119#if TRANSPARENT
1155 void rootwin_cb (XEvent &xev); 1120 void rootwin_cb (XEvent &xev);
1156 xevent_watcher rootwin_ev; 1121 xevent_watcher rootwin_ev;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines