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.243 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.247 by root, Mon Jan 30 04:27:17 2006 UTC

… …
432// fake styles 432// fake styles
433#define RS_Blink 0x00010000UL // blink 433#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 434#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 435#define RS_Uline 0x00040000UL // underline
436 436
437// toggle this to force redraw, must be != RS_Careful
438#define RS_redraw 0x01000000UL
439
437// 5 custom bits for extensions 440// 5 custom bits for extensions
438#define RS_customCount 32 441#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 442#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 443#define RS_customShift 19
441 444
… …
510 Rxvt_restoreFG = 39, // change default fg color 513 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 514 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 515 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 516
514 URxvt_locale = 701, // change locale 517 URxvt_locale = 701, // change locale
518 URxvt_version = 702, // request version
515 519
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 520 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 521 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 522 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 523 URxvt_Color_UL = 707,
… …
699 ***************************************************************************** 703 *****************************************************************************
700 * MACRO DEFINES 704 * MACRO DEFINES
701 ***************************************************************************** 705 *****************************************************************************
702 */ 706 */
703#define dLocal(type,name) type const name = this->name 707#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 708
706// for speed reasons, we assume that all latin1 characters 709// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicdoe combining character 710// are single-width (the first unicode combining character
708// is actually 0x300, but ascii is what matters most). 711// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c)) 712#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
710 713
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 714/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 715#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 716#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 717#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
911 914
912#ifdef KEYSYM_RESOURCE 915#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 916 class keyboard_manager;
914#endif 917#endif
915 918
916struct rxvt_term : zero_initialized, rxvt_vars { 919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
917 log_callback *log_hook; // log error messages through this hook, if != 0 920 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 922#if ENABLE_PERL
920 rxvt_perl_term perl; 923 rxvt_perl_term perl;
921#endif 924#endif
… …
1111 1114
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1115 long vt_emask, vt_emask_perl, vt_emask_xim;
1113 1116
1114 void vt_select_input () const NOTHROW 1117 void vt_select_input () const NOTHROW
1115 { 1118 {
1116 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 } 1120 }
1118 1121
1119#if TRANSPARENT 1122#if TRANSPARENT
1120 void rootwin_cb (XEvent &xev); 1123 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1124 xevent_watcher rootwin_ev;

Diff Legend

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