… | |
… | |
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 unicode 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) & ~0xff ? wcwidth (c) : 1) |
708 | #define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1) |
… | |
… | |
911 | |
910 | |
912 | #ifdef KEYSYM_RESOURCE |
911 | #ifdef KEYSYM_RESOURCE |
913 | class keyboard_manager; |
912 | class keyboard_manager; |
914 | #endif |
913 | #endif |
915 | |
914 | |
916 | struct rxvt_term : zero_initialized, rxvt_vars { |
915 | struct 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 |
… | |
… | |
1111 | |
1110 | |
1112 | long vt_emask, vt_emask_perl, vt_emask_xim; |
1111 | long vt_emask, vt_emask_perl, vt_emask_xim; |
1113 | |
1112 | |
1114 | void vt_select_input () const NOTHROW |
1113 | void vt_select_input () const NOTHROW |
1115 | { |
1114 | { |
1116 | XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); |
1115 | XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); |
1117 | } |
1116 | } |
1118 | |
1117 | |
1119 | #if TRANSPARENT |
1118 | #if TRANSPARENT |
1120 | void rootwin_cb (XEvent &xev); |
1119 | void rootwin_cb (XEvent &xev); |
1121 | xevent_watcher rootwin_ev; |
1120 | xevent_watcher rootwin_ev; |