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

699 ***************************************************************************** 699 *****************************************************************************
700 * MACRO DEFINES 700 * MACRO DEFINES
701 ***************************************************************************** 701 *****************************************************************************
702 */ 702 */
703#define dLocal(type,name) type const name = this->name 703#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 704
706// for speed reasons, we assume that all latin1 characters 705// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicdoe combining character 706// are single-width (the first unicode combining character
708// is actually 0x300, but ascii is what matters most). 707// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c)) 708#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
710 709
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 710/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 711#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 712#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 713#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
911 910
912#ifdef KEYSYM_RESOURCE 911#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 912 class keyboard_manager;
914#endif 913#endif
915 914
916struct rxvt_term : zero_initialized, rxvt_vars { 915struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
917 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
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 917 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 918#if ENABLE_PERL
920 rxvt_perl_term perl; 919 rxvt_perl_term perl;
921#endif 920#endif
1066 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;
1067#endif 1066#endif
1068 1067
1069 vector<void *> allocated; // free these memory blocks with free() 1068 vector<void *> allocated; // free these memory blocks with free()
1070 1069
1071 char *env_windowid; /* environmental variable WINDOWID */ 1070 char env_windowid[21]; /* environmental variable WINDOWID */
1071 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1072 char *env_display; /* environmental variable DISPLAY */ 1072 char *env_display; /* environmental variable DISPLAY */
1073 char *env_term; /* environmental variable TERM */ 1073 char *env_term; /* environmental variable TERM */
1074 char *env_colorfgbg; 1074
1075 char *locale; 1075 char *locale;
1076 char charsets[4]; 1076 char charsets[4];
1077 char *v_buffer; /* pointer to physical buffer */ 1077 char *v_buffer; /* pointer to physical buffer */
1078 unsigned int v_buflen; /* size of area to write */ 1078 unsigned int v_buflen; /* size of area to write */
1079 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1079 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1080 1080
1081#ifdef KEYSYM_RESOURCE 1081#ifdef KEYSYM_RESOURCE
1082 keyboard_manager *keyboard; 1082 keyboard_manager *keyboard;
1083#endif 1083#endif
1084 1084
1110 1110
1111 long vt_emask, vt_emask_perl, vt_emask_xim; 1111 long vt_emask, vt_emask_perl, vt_emask_xim;
1112 1112
1113 void vt_select_input () const NOTHROW 1113 void vt_select_input () const NOTHROW
1114 { 1114 {
1115 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1115 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1116 } 1116 }
1117 1117
1118#if TRANSPARENT 1118#if TRANSPARENT
1119 void rootwin_cb (XEvent &xev); 1119 void rootwin_cb (XEvent &xev);
1120 xevent_watcher rootwin_ev; 1120 xevent_watcher rootwin_ev;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines