… | |
… | |
161 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
161 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
162 | #endif |
162 | #endif |
163 | #ifdef HAVE_SCROLLBARS |
163 | #ifdef HAVE_SCROLLBARS |
164 | scrollbar_ev (this, &rxvt_term::x_cb), |
164 | scrollbar_ev (this, &rxvt_term::x_cb), |
165 | #endif |
165 | #endif |
166 | #ifdef MENUBAR |
|
|
167 | menubar_ev (this, &rxvt_term::x_cb), |
|
|
168 | #endif |
|
|
169 | #ifdef CURSOR_BLINK |
166 | #ifdef CURSOR_BLINK |
170 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
167 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
171 | #endif |
168 | #endif |
172 | #ifdef TEXT_BLINK |
169 | #ifdef TEXT_BLINK |
173 | text_blink_ev (this, &rxvt_term::text_blink_cb), |
170 | text_blink_ev (this, &rxvt_term::text_blink_cb), |
… | |
… | |
242 | |
239 | |
243 | selection_clear (); |
240 | selection_clear (); |
244 | |
241 | |
245 | #ifdef USE_XIM |
242 | #ifdef USE_XIM |
246 | im_destroy (); |
243 | im_destroy (); |
247 | #endif |
|
|
248 | #ifdef MENUBAR |
|
|
249 | if (menubarGC) XFreeGC (disp, menubarGC); |
|
|
250 | #endif |
244 | #endif |
251 | #ifdef XTERM_SCROLLBAR |
245 | #ifdef XTERM_SCROLLBAR |
252 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
246 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
253 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
247 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
254 | #endif |
248 | #endif |
… | |
… | |
265 | if (upArrow) XFreePixmap (disp, upArrow); |
259 | if (upArrow) XFreePixmap (disp, upArrow); |
266 | if (downArrow) XFreePixmap (disp, downArrow); |
260 | if (downArrow) XFreePixmap (disp, downArrow); |
267 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
261 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
268 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
262 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
269 | #endif |
263 | #endif |
270 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
264 | #ifdef RXVT_SCROLLBAR |
271 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
265 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
272 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
266 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
273 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
267 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
274 | #endif |
268 | #endif |
275 | if (gc) XFreeGC (disp, gc); |
269 | if (gc) XFreeGC (disp, gc); |
276 | |
270 | |
277 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
278 | delete menuBar.drawable; |
|
|
279 | //if (menuBar.win) |
|
|
280 | // XDestroyWindow (disp, menuBar.win); |
|
|
281 | #endif |
|
|
282 | delete drawable; |
271 | delete drawable; |
283 | // destroy all windows |
272 | // destroy all windows |
284 | if (parent[0]) |
273 | if (parent[0]) |
285 | XDestroyWindow (disp, parent[0]); |
274 | XDestroyWindow (disp, parent[0]); |
286 | } |
275 | } |
… | |
… | |
341 | #if USE_XIM |
330 | #if USE_XIM |
342 | im_ev.stop (display); |
331 | im_ev.stop (display); |
343 | #endif |
332 | #endif |
344 | #if HAVE_SCROLLBARS |
333 | #if HAVE_SCROLLBARS |
345 | scrollbar_ev.stop (display); |
334 | scrollbar_ev.stop (display); |
346 | #endif |
|
|
347 | #if MENUBAR |
|
|
348 | menubar_ev.stop (display); |
|
|
349 | #endif |
335 | #endif |
350 | #if TRANSPARENT |
336 | #if TRANSPARENT |
351 | rootwin_ev.stop (display); |
337 | rootwin_ev.stop (display); |
352 | #endif |
338 | #endif |
353 | incr_ev.stop (); |
339 | incr_ev.stop (); |
… | |
… | |
492 | |
478 | |
493 | #ifdef KEYSYM_RESOURCE |
479 | #ifdef KEYSYM_RESOURCE |
494 | keyboard->register_done (); |
480 | keyboard->register_done (); |
495 | #endif |
481 | #endif |
496 | |
482 | |
497 | #if MENUBAR_MAX |
|
|
498 | menubar_read (rs[Rs_menu]); |
|
|
499 | #endif |
|
|
500 | #ifdef HAVE_SCROLLBARS |
483 | #ifdef HAVE_SCROLLBARS |
501 | if (OPTION (Opt_scrollBar)) |
484 | if (OPTION (Opt_scrollBar)) |
502 | scrollBar.setIdle (); /* set existence for size calculations */ |
485 | scrollBar.setIdle (); /* set existence for size calculations */ |
503 | #endif |
486 | #endif |
504 | |
487 | |
… | |
… | |
541 | #endif |
524 | #endif |
542 | |
525 | |
543 | #ifdef HAVE_SCROLLBARS |
526 | #ifdef HAVE_SCROLLBARS |
544 | if (OPTION (Opt_scrollBar)) |
527 | if (OPTION (Opt_scrollBar)) |
545 | resize_scrollbar (); /* create and map scrollbar */ |
528 | resize_scrollbar (); /* create and map scrollbar */ |
546 | #endif |
|
|
547 | #if (MENUBAR_MAX) |
|
|
548 | if (menubar_visible ()) |
|
|
549 | XMapWindow (disp, menuBar.win); |
|
|
550 | #endif |
529 | #endif |
551 | #ifdef TRANSPARENT |
530 | #ifdef TRANSPARENT |
552 | if (OPTION (Opt_transparent)) |
531 | if (OPTION (Opt_transparent)) |
553 | { |
532 | { |
554 | XSelectInput (disp, display->root, PropertyChangeMask); |
533 | XSelectInput (disp, display->root, PropertyChangeMask); |
… | |
… | |
745 | return; |
724 | return; |
746 | |
725 | |
747 | rxvt_privileges (RESTORE); |
726 | rxvt_privileges (RESTORE); |
748 | |
727 | |
749 | if (action == SAVE) |
728 | if (action == SAVE) |
750 | makeutent (pty.name, rs[Rs_display_name]); |
729 | session.login (pty.name, cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
751 | else |
730 | else |
752 | cleanutent (); |
731 | session.logout (); |
753 | |
732 | |
754 | rxvt_privileges (IGNORE); |
733 | rxvt_privileges (IGNORE); |
755 | } |
734 | } |
756 | #endif |
735 | #endif |
757 | |
736 | |
… | |
… | |
762 | */ |
741 | */ |
763 | void |
742 | void |
764 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
743 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
765 | { |
744 | { |
766 | short recalc_x, recalc_y; |
745 | short recalc_x, recalc_y; |
767 | int x, y, sb_w, mb_h, flags; |
746 | int x, y, sb_w, flags; |
768 | unsigned int w, h; |
747 | unsigned int w, h; |
769 | unsigned int max_width, max_height; |
748 | unsigned int max_width, max_height; |
770 | dDisp; |
749 | dDisp; |
771 | |
750 | |
772 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
751 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
… | |
… | |
833 | max_width = MAX_COLS * fwidth; |
812 | max_width = MAX_COLS * fwidth; |
834 | max_height = MAX_ROWS * fheight; |
813 | max_height = MAX_ROWS * fheight; |
835 | |
814 | |
836 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
815 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
837 | |
816 | |
838 | sb_w = mb_h = 0; |
817 | sb_w = 0; |
839 | window_vt_x = window_vt_y = int_bwidth; |
818 | window_vt_x = window_vt_y = int_bwidth; |
840 | |
819 | |
841 | if (scrollbar_visible ()) |
820 | if (scrollBar.state) |
842 | { |
821 | { |
843 | sb_w = scrollbar_TotalWidth (); |
822 | sb_w = scrollbar_TotalWidth (); |
844 | szHint.base_width += sb_w; |
823 | szHint.base_width += sb_w; |
845 | if (!OPTION (Opt_scrollBar_right)) |
824 | if (!OPTION (Opt_scrollBar_right)) |
846 | window_vt_x += sb_w; |
825 | window_vt_x += sb_w; |
847 | } |
826 | } |
848 | |
827 | |
849 | if (menubar_visible ()) |
|
|
850 | { |
|
|
851 | mb_h = menuBar_TotalHeight (); |
|
|
852 | szHint.base_height += mb_h; |
|
|
853 | window_vt_y += mb_h; |
|
|
854 | } |
|
|
855 | |
|
|
856 | szHint.width_inc = fwidth; |
828 | szHint.width_inc = fwidth; |
857 | szHint.height_inc = fheight; |
829 | szHint.height_inc = fheight; |
858 | szHint.min_width = szHint.base_width + szHint.width_inc; |
830 | szHint.min_width = szHint.base_width + szHint.width_inc; |
859 | szHint.min_height = szHint.base_height + szHint.height_inc; |
831 | szHint.min_height = szHint.base_height + szHint.height_inc; |
860 | |
832 | |
… | |
… | |
878 | { |
850 | { |
879 | min_it (height, max_height); |
851 | min_it (height, max_height); |
880 | szHint.height = szHint.base_height + height; |
852 | szHint.height = szHint.base_height + height; |
881 | } |
853 | } |
882 | |
854 | |
883 | if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) |
855 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
884 | window_sb_x = szHint.width - sb_w; |
856 | window_sb_x = szHint.width - sb_w; |
885 | |
857 | |
886 | if (recalc_x) |
858 | if (recalc_x) |
887 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
859 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
888 | if (recalc_y) |
860 | if (recalc_y) |
… | |
… | |
1243 | |
1215 | |
1244 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1216 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1245 | |
1217 | |
1246 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1218 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1247 | { |
1219 | { |
1248 | if (scrollbar_visible ()) |
1220 | if (scrollBar.state) |
1249 | { |
1221 | { |
1250 | XMoveResizeWindow (disp, scrollBar.win, |
1222 | XMoveResizeWindow (disp, scrollBar.win, |
1251 | window_sb_x, 0, |
1223 | window_sb_x, 0, |
1252 | scrollbar_TotalWidth (), szHint.height); |
1224 | scrollbar_TotalWidth (), szHint.height); |
1253 | resize_scrollbar (); |
1225 | resize_scrollbar (); |
1254 | } |
1226 | } |
1255 | |
|
|
1256 | if (menubar_visible ()) |
|
|
1257 | XMoveResizeWindow (disp, menuBar.win, |
|
|
1258 | window_vt_x, 0, |
|
|
1259 | width, menuBar_TotalHeight ()); |
|
|
1260 | |
1227 | |
1261 | XMoveResizeWindow (disp, vt, |
1228 | XMoveResizeWindow (disp, vt, |
1262 | window_vt_x, window_vt_y, |
1229 | window_vt_x, window_vt_y, |
1263 | width, height); |
1230 | width, height); |
1264 | |
1231 | |