… | |
… | |
46 | |
46 | |
47 | #ifdef HAVE_TERMIOS_H |
47 | #ifdef HAVE_TERMIOS_H |
48 | # include <termios.h> |
48 | # include <termios.h> |
49 | #endif |
49 | #endif |
50 | |
50 | |
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
52 | static uid_t saved_euid; |
|
|
53 | static gid_t saved_egid; |
|
|
54 | #endif |
|
|
55 | |
|
|
56 | bool |
|
|
57 | rxvt_tainted () |
|
|
58 | { |
|
|
59 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
60 | return getuid () != saved_euid || getgid () != saved_egid; |
|
|
61 | #else |
|
|
62 | return false; |
|
|
63 | #endif |
|
|
64 | } |
|
|
65 | |
|
|
66 | vector<rxvt_term *> rxvt_term::termlist; |
51 | vector<rxvt_term *> rxvt_term::termlist; |
67 | |
52 | |
68 | static char curlocale[128], savelocale[128]; |
53 | static char curlocale[128], savelocale[128]; |
69 | |
54 | |
70 | bool |
55 | bool |
… | |
… | |
87 | |
72 | |
88 | void |
73 | void |
89 | rxvt_pop_locale () |
74 | rxvt_pop_locale () |
90 | { |
75 | { |
91 | rxvt_set_locale (savelocale); |
76 | rxvt_set_locale (savelocale); |
92 | } |
|
|
93 | |
|
|
94 | void |
|
|
95 | rxvt_term::make_current () const |
|
|
96 | { |
|
|
97 | SET_R (this); |
|
|
98 | rxvt_set_locale (locale); |
|
|
99 | set_environ (envv); |
|
|
100 | } |
77 | } |
101 | |
78 | |
102 | #if ENABLE_COMBINING |
79 | #if ENABLE_COMBINING |
103 | class rxvt_composite_vec rxvt_composite; |
80 | class rxvt_composite_vec rxvt_composite; |
104 | |
81 | |
… | |
… | |
169 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
146 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
170 | #endif |
147 | #endif |
171 | #ifdef HAVE_SCROLLBARS |
148 | #ifdef HAVE_SCROLLBARS |
172 | scrollbar_ev (this, &rxvt_term::x_cb), |
149 | scrollbar_ev (this, &rxvt_term::x_cb), |
173 | #endif |
150 | #endif |
174 | #ifdef MENUBAR |
|
|
175 | menubar_ev (this, &rxvt_term::x_cb), |
|
|
176 | #endif |
|
|
177 | #ifdef CURSOR_BLINK |
151 | #ifdef CURSOR_BLINK |
178 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
152 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
179 | #endif |
153 | #endif |
180 | #ifdef TEXT_BLINK |
154 | #ifdef TEXT_BLINK |
181 | text_blink_ev (this, &rxvt_term::text_blink_cb), |
155 | text_blink_ev (this, &rxvt_term::text_blink_cb), |
… | |
… | |
195 | #ifdef USE_XIM |
169 | #ifdef USE_XIM |
196 | im_ev (this, &rxvt_term::im_cb), |
170 | im_ev (this, &rxvt_term::im_cb), |
197 | #endif |
171 | #endif |
198 | termwin_ev (this, &rxvt_term::x_cb), |
172 | termwin_ev (this, &rxvt_term::x_cb), |
199 | vt_ev (this, &rxvt_term::x_cb), |
173 | vt_ev (this, &rxvt_term::x_cb), |
|
|
174 | child_ev (this, &rxvt_term::child_cb), |
200 | check_ev (this, &rxvt_term::check_cb), |
175 | check_ev (this, &rxvt_term::check_cb), |
201 | flush_ev (this, &rxvt_term::flush_cb), |
176 | flush_ev (this, &rxvt_term::flush_cb), |
202 | destroy_ev (this, &rxvt_term::destroy_cb), |
177 | destroy_ev (this, &rxvt_term::destroy_cb), |
203 | pty_ev (this, &rxvt_term::pty_cb), |
178 | pty_ev (this, &rxvt_term::pty_cb), |
204 | incr_ev (this, &rxvt_term::incr_cb) |
179 | incr_ev (this, &rxvt_term::incr_cb) |
… | |
… | |
220 | void rxvt_term::emergency_cleanup () |
195 | void rxvt_term::emergency_cleanup () |
221 | { |
196 | { |
222 | if (cmd_pid) |
197 | if (cmd_pid) |
223 | kill (-cmd_pid, SIGHUP); |
198 | kill (-cmd_pid, SIGHUP); |
224 | |
199 | |
225 | #ifdef UTMP_SUPPORT |
200 | delete pty; pty = 0; |
226 | privileged_utmp (RESTORE); |
|
|
227 | #endif |
|
|
228 | |
|
|
229 | pty.put (); |
|
|
230 | } |
201 | } |
231 | |
202 | |
232 | rxvt_term::~rxvt_term () |
203 | rxvt_term::~rxvt_term () |
233 | { |
204 | { |
234 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
205 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
… | |
… | |
250 | |
221 | |
251 | selection_clear (); |
222 | selection_clear (); |
252 | |
223 | |
253 | #ifdef USE_XIM |
224 | #ifdef USE_XIM |
254 | im_destroy (); |
225 | im_destroy (); |
255 | #endif |
|
|
256 | #ifdef MENUBAR |
|
|
257 | if (menubarGC) XFreeGC (disp, menubarGC); |
|
|
258 | #endif |
226 | #endif |
259 | #ifdef XTERM_SCROLLBAR |
227 | #ifdef XTERM_SCROLLBAR |
260 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
228 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
261 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
229 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
262 | #endif |
230 | #endif |
… | |
… | |
273 | if (upArrow) XFreePixmap (disp, upArrow); |
241 | if (upArrow) XFreePixmap (disp, upArrow); |
274 | if (downArrow) XFreePixmap (disp, downArrow); |
242 | if (downArrow) XFreePixmap (disp, downArrow); |
275 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
243 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
276 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
244 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
277 | #endif |
245 | #endif |
278 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
246 | #ifdef RXVT_SCROLLBAR |
279 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
247 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
280 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
248 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
281 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
249 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
282 | #endif |
250 | #endif |
283 | if (gc) XFreeGC (disp, gc); |
251 | if (gc) XFreeGC (disp, gc); |
284 | |
252 | |
285 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
286 | delete menuBar.drawable; |
|
|
287 | //if (menuBar.win) |
|
|
288 | // XDestroyWindow (disp, menuBar.win); |
|
|
289 | #endif |
|
|
290 | delete drawable; |
253 | delete drawable; |
291 | // destroy all windows |
254 | // destroy all windows |
292 | if (parent[0]) |
255 | if (parent[0]) |
293 | XDestroyWindow (disp, parent[0]); |
256 | XDestroyWindow (disp, parent[0]); |
294 | } |
257 | } |
… | |
… | |
323 | #ifdef KEYSYM_RESOURCE |
286 | #ifdef KEYSYM_RESOURCE |
324 | delete keyboard; |
287 | delete keyboard; |
325 | #endif |
288 | #endif |
326 | } |
289 | } |
327 | |
290 | |
|
|
291 | // child has exited, usually destroys |
328 | void |
292 | void |
329 | rxvt_term::child_exit () |
293 | rxvt_term::child_cb (child_watcher &w, int status) |
330 | { |
294 | { |
|
|
295 | HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); |
|
|
296 | |
331 | cmd_pid = 0; |
297 | cmd_pid = 0; |
332 | |
298 | |
333 | if (!OPTION (Opt_hold)) |
299 | if (!OPTION (Opt_hold)) |
334 | destroy (); |
300 | destroy (); |
335 | } |
301 | } |
… | |
… | |
349 | #if USE_XIM |
315 | #if USE_XIM |
350 | im_ev.stop (display); |
316 | im_ev.stop (display); |
351 | #endif |
317 | #endif |
352 | #if HAVE_SCROLLBARS |
318 | #if HAVE_SCROLLBARS |
353 | scrollbar_ev.stop (display); |
319 | scrollbar_ev.stop (display); |
354 | #endif |
|
|
355 | #if MENUBAR |
|
|
356 | menubar_ev.stop (display); |
|
|
357 | #endif |
320 | #endif |
358 | #if TRANSPARENT |
321 | #if TRANSPARENT |
359 | rootwin_ev.stop (display); |
322 | rootwin_ev.stop (display); |
360 | #endif |
323 | #endif |
361 | incr_ev.stop (); |
324 | incr_ev.stop (); |
… | |
… | |
500 | |
463 | |
501 | #ifdef KEYSYM_RESOURCE |
464 | #ifdef KEYSYM_RESOURCE |
502 | keyboard->register_done (); |
465 | keyboard->register_done (); |
503 | #endif |
466 | #endif |
504 | |
467 | |
505 | #if MENUBAR_MAX |
|
|
506 | menubar_read (rs[Rs_menu]); |
|
|
507 | #endif |
|
|
508 | #ifdef HAVE_SCROLLBARS |
468 | #ifdef HAVE_SCROLLBARS |
509 | if (OPTION (Opt_scrollBar)) |
469 | if (OPTION (Opt_scrollBar)) |
510 | scrollBar.setIdle (); /* set existence for size calculations */ |
470 | scrollBar.setIdle (); /* set existence for size calculations */ |
511 | #endif |
471 | #endif |
512 | |
472 | |
… | |
… | |
516 | |
476 | |
517 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
477 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
518 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
478 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
519 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
479 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
520 | { |
480 | { |
521 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
522 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
|
|
523 | if (rxvt_tainted ()) |
|
|
524 | { |
|
|
525 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
|
|
526 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
527 | { |
|
|
528 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
|
|
529 | rs[Rs_perl_lib] = 0; |
|
|
530 | rs[Rs_perl_eval] = 0; |
|
|
531 | } |
|
|
532 | } |
|
|
533 | #endif |
|
|
534 | rxvt_perl.init (); |
481 | rxvt_perl.init (this); |
535 | setlocale (LC_CTYPE, curlocale); // perl init destroys current locale |
|
|
536 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
482 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
537 | } |
483 | } |
538 | #endif |
484 | #endif |
|
|
485 | |
|
|
486 | pty = rxvt_new_ptytty (); |
539 | |
487 | |
540 | create_windows (argc, argv); |
488 | create_windows (argc, argv); |
541 | |
489 | |
542 | dDisp; |
490 | dDisp; |
543 | |
491 | |
… | |
… | |
551 | |
499 | |
552 | #ifdef HAVE_SCROLLBARS |
500 | #ifdef HAVE_SCROLLBARS |
553 | if (OPTION (Opt_scrollBar)) |
501 | if (OPTION (Opt_scrollBar)) |
554 | resize_scrollbar (); /* create and map scrollbar */ |
502 | resize_scrollbar (); /* create and map scrollbar */ |
555 | #endif |
503 | #endif |
556 | #if (MENUBAR_MAX) |
|
|
557 | if (menubar_visible ()) |
|
|
558 | XMapWindow (disp, menuBar.win); |
|
|
559 | #endif |
|
|
560 | #ifdef TRANSPARENT |
504 | #ifdef TRANSPARENT |
561 | if (OPTION (Opt_transparent)) |
505 | if (OPTION (Opt_transparent)) |
562 | { |
506 | { |
563 | XSelectInput (disp, display->root, PropertyChangeMask); |
507 | XSelectInput (disp, display->root, PropertyChangeMask); |
564 | check_our_parents (); |
508 | check_our_parents (); |
… | |
… | |
573 | |
517 | |
574 | init_command (cmd_argv); |
518 | init_command (cmd_argv); |
575 | |
519 | |
576 | free (cmd_argv); |
520 | free (cmd_argv); |
577 | |
521 | |
578 | if (pty.pty >= 0) |
522 | if (pty->pty >= 0) |
579 | pty_ev.start (pty.pty, EVENT_READ); |
523 | pty_ev.start (pty->pty, EVENT_READ); |
580 | |
524 | |
581 | check_ev.start (); |
525 | check_ev.start (); |
582 | |
526 | |
583 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
527 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
584 | |
528 | |
585 | return true; |
529 | return true; |
586 | } |
530 | } |
587 | |
531 | |
588 | static struct sig_handlers |
532 | static struct sig_handlers |
589 | { |
533 | { |
590 | sig_watcher sw_chld, sw_term, sw_int; |
534 | sig_watcher sw_term, sw_int; |
591 | |
535 | |
592 | void sig_chld (sig_watcher &w) |
|
|
593 | { |
|
|
594 | // we are being called for every SIGCHLD, find the corresponding term |
|
|
595 | int pid; |
|
|
596 | |
|
|
597 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
|
|
598 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
|
|
599 | if (pid == (*t)->cmd_pid) |
|
|
600 | { |
|
|
601 | (*t)->child_exit (); |
|
|
602 | break; |
|
|
603 | } |
|
|
604 | } |
|
|
605 | |
|
|
606 | /* |
536 | /* |
607 | * Catch a fatal signal and tidy up before quitting |
537 | * Catch a fatal signal and tidy up before quitting |
608 | */ |
538 | */ |
609 | void |
539 | void |
610 | sig_term (sig_watcher &w) |
540 | sig_term (sig_watcher &w) |
… | |
… | |
616 | signal (w.signum, SIG_DFL); |
546 | signal (w.signum, SIG_DFL); |
617 | kill (getpid (), w.signum); |
547 | kill (getpid (), w.signum); |
618 | } |
548 | } |
619 | |
549 | |
620 | sig_handlers () |
550 | sig_handlers () |
621 | : sw_chld (this, &sig_handlers::sig_chld), |
|
|
622 | sw_term (this, &sig_handlers::sig_term), |
551 | : sw_term (this, &sig_handlers::sig_term), |
623 | sw_int (this, &sig_handlers::sig_term) |
552 | sw_int (this, &sig_handlers::sig_term) |
624 | { |
553 | { |
625 | } |
554 | } |
626 | } sig_handlers; |
555 | } sig_handlers; |
627 | |
556 | |
628 | char **rxvt_environ; // startup environment |
557 | char **rxvt_environ; // startup environment |
629 | |
558 | |
630 | void |
559 | void |
631 | rxvt_init () |
560 | rxvt_init () |
632 | { |
561 | { |
|
|
562 | uid_t uid = getuid (); |
|
|
563 | gid_t gid = getgid (); |
|
|
564 | |
|
|
565 | // before doing anything else, check for setuid/setgid operation, |
|
|
566 | // start the helper process and drop privileges |
|
|
567 | if (uid != geteuid () |
|
|
568 | || gid != getegid ()) |
|
|
569 | { |
|
|
570 | #if PTYTTY_HELPER |
|
|
571 | rxvt_ptytty_server (); |
|
|
572 | #else |
|
|
573 | rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n"); |
|
|
574 | #endif |
|
|
575 | |
|
|
576 | // drop privileges |
|
|
577 | #if HAVE_SETRESUID |
|
|
578 | setresgid (gid, gid, gid); |
|
|
579 | setresuid (uid, uid, uid); |
|
|
580 | #elif HAVE_SETREUID |
|
|
581 | setregid (gid, gid); |
|
|
582 | setreuid (uid, uid); |
|
|
583 | #elif HAVE_SETUID |
|
|
584 | setgid (gid); |
|
|
585 | setuid (uid); |
|
|
586 | #endif |
|
|
587 | |
|
|
588 | if (uid != geteuid () |
|
|
589 | || gid != getegid ()) |
|
|
590 | rxvt_fatal ("unable to drop privileges, aborting.\n"); |
|
|
591 | } |
|
|
592 | |
633 | rxvt_environ = environ; |
593 | rxvt_environ = environ; |
634 | |
|
|
635 | /* |
|
|
636 | * Save and then give up any super-user privileges |
|
|
637 | * If we need privileges in any area then we must specifically request it. |
|
|
638 | * We should only need to be root in these cases: |
|
|
639 | * 1. write utmp entries on some systems |
|
|
640 | * 2. chown tty on some systems |
|
|
641 | */ |
|
|
642 | rxvt_privileges (SAVE); |
|
|
643 | rxvt_privileges (IGNORE); |
|
|
644 | |
594 | |
645 | signal (SIGHUP, SIG_IGN); |
595 | signal (SIGHUP, SIG_IGN); |
646 | signal (SIGPIPE, SIG_IGN); |
596 | signal (SIGPIPE, SIG_IGN); |
647 | |
597 | |
648 | sig_handlers.sw_chld.start (SIGCHLD); |
|
|
649 | sig_handlers.sw_term.start (SIGTERM); |
598 | sig_handlers.sw_term.start (SIGTERM); |
650 | sig_handlers.sw_int.start (SIGINT); |
599 | sig_handlers.sw_int.start (SIGINT); |
651 | |
600 | |
652 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
601 | /* need to trap SIGURG for SVR4 (Unixware) rlogin */ |
653 | /* signal (SIGURG, SIG_DFL); */ |
602 | /* signal (SIGURG, SIG_DFL); */ |
… | |
… | |
693 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
642 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
694 | |
643 | |
695 | return p; |
644 | return p; |
696 | } |
645 | } |
697 | |
646 | |
698 | /* ------------------------------------------------------------------------- * |
|
|
699 | * PRIVILEGED OPERATIONS * |
|
|
700 | * ------------------------------------------------------------------------- */ |
|
|
701 | /* take care of suid/sgid super-user (root) privileges */ |
|
|
702 | void |
|
|
703 | rxvt_privileges (rxvt_privaction action) |
|
|
704 | { |
|
|
705 | #if ! defined(__CYGWIN32__) |
|
|
706 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
|
|
707 | /* setreuid () is the poor man's setuid (), seteuid () */ |
|
|
708 | # define seteuid(a) setreuid(-1, (a)) |
|
|
709 | # define setegid(a) setregid(-1, (a)) |
|
|
710 | # define HAVE_SETEUID |
|
|
711 | # endif |
|
|
712 | # ifdef HAVE_SETEUID |
|
|
713 | switch (action) |
|
|
714 | { |
|
|
715 | case IGNORE: |
|
|
716 | /* |
|
|
717 | * change effective uid/gid - not real uid/gid - so we can switch |
|
|
718 | * back to root later, as required |
|
|
719 | */ |
|
|
720 | setegid (getgid ()); |
|
|
721 | seteuid (getuid ()); |
|
|
722 | break; |
|
|
723 | case SAVE: |
|
|
724 | saved_egid = getegid (); |
|
|
725 | saved_euid = geteuid (); |
|
|
726 | break; |
|
|
727 | case RESTORE: |
|
|
728 | setegid (saved_egid); |
|
|
729 | seteuid (saved_euid); |
|
|
730 | break; |
|
|
731 | } |
|
|
732 | # else |
|
|
733 | switch (action) |
|
|
734 | { |
|
|
735 | case IGNORE: |
|
|
736 | setgid (getgid ()); |
|
|
737 | setuid (getuid ()); |
|
|
738 | /* FALLTHROUGH */ |
|
|
739 | case SAVE: |
|
|
740 | /* FALLTHROUGH */ |
|
|
741 | case RESTORE: |
|
|
742 | break; |
|
|
743 | } |
|
|
744 | # endif |
|
|
745 | #endif |
|
|
746 | } |
|
|
747 | |
|
|
748 | #ifdef UTMP_SUPPORT |
|
|
749 | void |
|
|
750 | rxvt_term::privileged_utmp (rxvt_privaction action) |
|
|
751 | { |
|
|
752 | if (OPTION (Opt_utmpInhibit) |
|
|
753 | || !pty.name || !*pty.name) |
|
|
754 | return; |
|
|
755 | |
|
|
756 | rxvt_privileges (RESTORE); |
|
|
757 | |
|
|
758 | if (action == SAVE) |
|
|
759 | makeutent (pty.name, rs[Rs_display_name]); |
|
|
760 | else |
|
|
761 | cleanutent (); |
|
|
762 | |
|
|
763 | rxvt_privileges (IGNORE); |
|
|
764 | } |
|
|
765 | #endif |
|
|
766 | |
|
|
767 | /*----------------------------------------------------------------------*/ |
647 | /*----------------------------------------------------------------------*/ |
768 | /* |
648 | /* |
769 | * window size/position calculcations for XSizeHint and other storage. |
649 | * window size/position calculcations for XSizeHint and other storage. |
770 | * if width/height are non-zero then override calculated width/height |
650 | * if width/height are non-zero then override calculated width/height |
771 | */ |
651 | */ |
772 | void |
652 | void |
773 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
653 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
774 | { |
654 | { |
775 | short recalc_x, recalc_y; |
655 | short recalc_x, recalc_y; |
776 | int x, y, sb_w, mb_h, flags; |
656 | int x, y, sb_w, flags; |
777 | unsigned int w, h; |
657 | unsigned int w, h; |
778 | unsigned int max_width, max_height; |
658 | unsigned int max_width, max_height; |
779 | dDisp; |
659 | dDisp; |
780 | |
660 | |
781 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
661 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
… | |
… | |
842 | max_width = MAX_COLS * fwidth; |
722 | max_width = MAX_COLS * fwidth; |
843 | max_height = MAX_ROWS * fheight; |
723 | max_height = MAX_ROWS * fheight; |
844 | |
724 | |
845 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
725 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
846 | |
726 | |
847 | sb_w = mb_h = 0; |
727 | sb_w = 0; |
848 | window_vt_x = window_vt_y = int_bwidth; |
728 | window_vt_x = window_vt_y = int_bwidth; |
849 | |
729 | |
850 | if (scrollbar_visible ()) |
730 | if (scrollBar.state) |
851 | { |
731 | { |
852 | sb_w = scrollbar_TotalWidth (); |
732 | sb_w = scrollbar_TotalWidth (); |
853 | szHint.base_width += sb_w; |
733 | szHint.base_width += sb_w; |
854 | if (!OPTION (Opt_scrollBar_right)) |
734 | if (!OPTION (Opt_scrollBar_right)) |
855 | window_vt_x += sb_w; |
735 | window_vt_x += sb_w; |
856 | } |
736 | } |
857 | |
737 | |
858 | if (menubar_visible ()) |
|
|
859 | { |
|
|
860 | mb_h = menuBar_TotalHeight (); |
|
|
861 | szHint.base_height += mb_h; |
|
|
862 | window_vt_y += mb_h; |
|
|
863 | } |
|
|
864 | |
|
|
865 | szHint.width_inc = fwidth; |
738 | szHint.width_inc = fwidth; |
866 | szHint.height_inc = fheight; |
739 | szHint.height_inc = fheight; |
867 | szHint.min_width = szHint.base_width + szHint.width_inc; |
740 | szHint.min_width = szHint.base_width + szHint.width_inc; |
868 | szHint.min_height = szHint.base_height + szHint.height_inc; |
741 | szHint.min_height = szHint.base_height + szHint.height_inc; |
869 | |
742 | |
… | |
… | |
887 | { |
760 | { |
888 | min_it (height, max_height); |
761 | min_it (height, max_height); |
889 | szHint.height = szHint.base_height + height; |
762 | szHint.height = szHint.base_height + height; |
890 | } |
763 | } |
891 | |
764 | |
892 | if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) |
765 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
893 | window_sb_x = szHint.width - sb_w; |
766 | window_sb_x = szHint.width - sb_w; |
894 | |
767 | |
895 | if (recalc_x) |
768 | if (recalc_x) |
896 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
769 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
897 | if (recalc_y) |
770 | if (recalc_y) |
… | |
… | |
911 | * Called after a window size change. |
784 | * Called after a window size change. |
912 | */ |
785 | */ |
913 | void |
786 | void |
914 | rxvt_term::tt_winch () |
787 | rxvt_term::tt_winch () |
915 | { |
788 | { |
916 | if (pty.pty < 0) |
789 | if (pty->pty < 0) |
917 | return; |
790 | return; |
918 | |
791 | |
919 | struct winsize ws; |
792 | struct winsize ws; |
920 | |
793 | |
921 | ws.ws_col = ncol; |
794 | ws.ws_col = ncol; |
922 | ws.ws_row = nrow; |
795 | ws.ws_row = nrow; |
923 | ws.ws_xpixel = width; |
796 | ws.ws_xpixel = width; |
924 | ws.ws_ypixel = height; |
797 | ws.ws_ypixel = height; |
925 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
798 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
926 | |
799 | |
927 | #if 0 |
800 | #if 0 |
928 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
801 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
929 | if (cmd_pid) /* force through to the command */ |
802 | if (cmd_pid) /* force through to the command */ |
930 | kill (-cmd_pid, SIGWINCH); |
803 | kill (-cmd_pid, SIGWINCH); |
… | |
… | |
1252 | |
1125 | |
1253 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1126 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1254 | |
1127 | |
1255 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1128 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1256 | { |
1129 | { |
1257 | if (scrollbar_visible ()) |
1130 | if (scrollBar.state) |
1258 | { |
1131 | { |
1259 | XMoveResizeWindow (disp, scrollBar.win, |
1132 | XMoveResizeWindow (disp, scrollBar.win, |
1260 | window_sb_x, 0, |
1133 | window_sb_x, 0, |
1261 | scrollbar_TotalWidth (), szHint.height); |
1134 | scrollbar_TotalWidth (), szHint.height); |
1262 | resize_scrollbar (); |
1135 | resize_scrollbar (); |
1263 | } |
1136 | } |
1264 | |
|
|
1265 | if (menubar_visible ()) |
|
|
1266 | XMoveResizeWindow (disp, menuBar.win, |
|
|
1267 | window_vt_x, 0, |
|
|
1268 | width, menuBar_TotalHeight ()); |
|
|
1269 | |
1137 | |
1270 | XMoveResizeWindow (disp, vt, |
1138 | XMoveResizeWindow (disp, vt, |
1271 | window_vt_x, window_vt_y, |
1139 | window_vt_x, window_vt_y, |
1272 | width, height); |
1140 | width, height); |
1273 | |
1141 | |