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

Diff Legend

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