| … | |
… | |
| 155 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
155 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
| 156 | #endif |
156 | #endif |
| 157 | #ifdef TEXT_BLINK |
157 | #ifdef TEXT_BLINK |
| 158 | text_blink_ev (this, &rxvt_term::text_blink_cb), |
158 | text_blink_ev (this, &rxvt_term::text_blink_cb), |
| 159 | #endif |
159 | #endif |
|
|
160 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
161 | cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), |
|
|
162 | #endif |
|
|
163 | #ifdef SELECTION_SCROLLING |
|
|
164 | sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), |
|
|
165 | #endif |
|
|
166 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
167 | slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), |
|
|
168 | #endif |
| 160 | #ifdef POINTER_BLANK |
169 | #ifdef POINTER_BLANK |
| 161 | pointer_ev (this, &rxvt_term::pointer_cb), |
170 | pointer_ev (this, &rxvt_term::pointer_cb), |
| 162 | #endif |
171 | #endif |
| 163 | #ifdef USE_XIM |
172 | #ifdef USE_XIM |
| 164 | im_ev (this, &rxvt_term::im_cb), |
173 | im_ev (this, &rxvt_term::im_cb), |
| … | |
… | |
| 285 | #ifdef CURSOR_BLINK |
294 | #ifdef CURSOR_BLINK |
| 286 | cursor_blink_ev.stop (); |
295 | cursor_blink_ev.stop (); |
| 287 | #endif |
296 | #endif |
| 288 | #ifdef TEXT_BLINK |
297 | #ifdef TEXT_BLINK |
| 289 | text_blink_ev.stop (); |
298 | text_blink_ev.stop (); |
|
|
299 | #endif |
|
|
300 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
301 | cont_scroll_ev.stop (); |
|
|
302 | #endif |
|
|
303 | #ifdef SELECTION_SCROLLING |
|
|
304 | sel_scroll_ev.stop (); |
| 290 | #endif |
305 | #endif |
| 291 | #ifdef POINTER_BLANK |
306 | #ifdef POINTER_BLANK |
| 292 | pointer_ev.stop (); |
307 | pointer_ev.stop (); |
| 293 | #endif |
308 | #endif |
| 294 | |
309 | |
| … | |
… | |
| 740 | max_height = MAX_ROWS * TermWin.fheight; |
755 | max_height = MAX_ROWS * TermWin.fheight; |
| 741 | |
756 | |
| 742 | szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; |
757 | szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; |
| 743 | |
758 | |
| 744 | sb_w = mb_h = 0; |
759 | sb_w = mb_h = 0; |
| 745 | window_vt_x = window_vt_y = 0; |
760 | window_vt_x = window_vt_y = TermWin.int_bwidth; |
| 746 | |
761 | |
| 747 | if (scrollbar_visible ()) |
762 | if (scrollbar_visible ()) |
| 748 | { |
763 | { |
| 749 | sb_w = scrollbar_TotalWidth (); |
764 | sb_w = scrollbar_TotalWidth (); |
| 750 | szHint.base_width += sb_w; |
765 | szHint.base_width += sb_w; |
| 751 | if (! (Options & Opt_scrollBar_right)) |
766 | if (!(Options & Opt_scrollBar_right)) |
| 752 | window_vt_x = sb_w; |
767 | window_vt_x += sb_w; |
| 753 | } |
768 | } |
| 754 | |
769 | |
| 755 | if (menubar_visible ()) |
770 | if (menubar_visible ()) |
| 756 | { |
771 | { |
| 757 | mb_h = menuBar_TotalHeight (); |
772 | mb_h = menuBar_TotalHeight (); |
| 758 | szHint.base_height += mb_h; |
773 | szHint.base_height += mb_h; |
| 759 | window_vt_y = mb_h; |
774 | window_vt_y += mb_h; |
| 760 | } |
775 | } |
| 761 | |
776 | |
| 762 | szHint.width_inc = TermWin.fwidth; |
777 | szHint.width_inc = TermWin.fwidth; |
| 763 | szHint.height_inc = TermWin.fheight; |
778 | szHint.height_inc = TermWin.fheight; |
| 764 | szHint.min_width = szHint.base_width + szHint.width_inc; |
779 | szHint.min_width = szHint.base_width + szHint.width_inc; |
