… | |
… | |
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
52 | static uid_t saved_euid; |
52 | static uid_t saved_euid; |
53 | static gid_t saved_egid; |
53 | static gid_t saved_egid; |
54 | #endif |
54 | #endif |
55 | |
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 | |
56 | vector<rxvt_term *> rxvt_term::termlist; |
66 | vector<rxvt_term *> rxvt_term::termlist; |
57 | |
67 | |
58 | static char curlocale[128], savelocale[128]; |
68 | static char curlocale[128], savelocale[128]; |
59 | |
69 | |
60 | bool |
70 | bool |
… | |
… | |
66 | strncpy (curlocale, locale, 128); |
76 | strncpy (curlocale, locale, 128); |
67 | setlocale (LC_CTYPE, curlocale); |
77 | setlocale (LC_CTYPE, curlocale); |
68 | return true; |
78 | return true; |
69 | } |
79 | } |
70 | |
80 | |
71 | bool |
81 | void |
72 | rxvt_push_locale (const char *locale) |
82 | rxvt_push_locale (const char *locale) |
73 | { |
83 | { |
74 | strcpy (savelocale, curlocale); |
84 | strcpy (savelocale, curlocale); |
75 | rxvt_set_locale (locale); |
85 | rxvt_set_locale (locale); |
76 | } |
86 | } |
… | |
… | |
150 | #if TRANSPARENT |
160 | #if TRANSPARENT |
151 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
161 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
152 | #endif |
162 | #endif |
153 | #ifdef HAVE_SCROLLBARS |
163 | #ifdef HAVE_SCROLLBARS |
154 | scrollbar_ev (this, &rxvt_term::x_cb), |
164 | scrollbar_ev (this, &rxvt_term::x_cb), |
155 | #endif |
|
|
156 | #ifdef MENUBAR |
|
|
157 | menubar_ev (this, &rxvt_term::x_cb), |
|
|
158 | #endif |
165 | #endif |
159 | #ifdef CURSOR_BLINK |
166 | #ifdef CURSOR_BLINK |
160 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
167 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
161 | #endif |
168 | #endif |
162 | #ifdef TEXT_BLINK |
169 | #ifdef TEXT_BLINK |
… | |
… | |
202 | void rxvt_term::emergency_cleanup () |
209 | void rxvt_term::emergency_cleanup () |
203 | { |
210 | { |
204 | if (cmd_pid) |
211 | if (cmd_pid) |
205 | kill (-cmd_pid, SIGHUP); |
212 | kill (-cmd_pid, SIGHUP); |
206 | |
213 | |
207 | #ifdef UTMP_SUPPORT |
214 | delete pty; pty = 0; |
208 | privileged_utmp (RESTORE); |
|
|
209 | #endif |
|
|
210 | |
|
|
211 | pty.put (); |
|
|
212 | } |
215 | } |
213 | |
216 | |
214 | rxvt_term::~rxvt_term () |
217 | rxvt_term::~rxvt_term () |
215 | { |
218 | { |
216 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
219 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
… | |
… | |
232 | |
235 | |
233 | selection_clear (); |
236 | selection_clear (); |
234 | |
237 | |
235 | #ifdef USE_XIM |
238 | #ifdef USE_XIM |
236 | im_destroy (); |
239 | im_destroy (); |
237 | #endif |
|
|
238 | #ifdef MENUBAR |
|
|
239 | if (menubarGC) XFreeGC (disp, menubarGC); |
|
|
240 | #endif |
240 | #endif |
241 | #ifdef XTERM_SCROLLBAR |
241 | #ifdef XTERM_SCROLLBAR |
242 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
242 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
243 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
243 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
244 | #endif |
244 | #endif |
… | |
… | |
255 | if (upArrow) XFreePixmap (disp, upArrow); |
255 | if (upArrow) XFreePixmap (disp, upArrow); |
256 | if (downArrow) XFreePixmap (disp, downArrow); |
256 | if (downArrow) XFreePixmap (disp, downArrow); |
257 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
257 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
258 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
258 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
259 | #endif |
259 | #endif |
260 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
260 | #ifdef RXVT_SCROLLBAR |
261 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
261 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
262 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
262 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
263 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
263 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
264 | #endif |
264 | #endif |
265 | if (gc) XFreeGC (disp, gc); |
265 | if (gc) XFreeGC (disp, gc); |
266 | |
266 | |
267 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
268 | delete menuBar.drawable; |
|
|
269 | //if (menuBar.win) |
|
|
270 | // XDestroyWindow (disp, menuBar.win); |
|
|
271 | #endif |
|
|
272 | delete drawable; |
267 | delete drawable; |
273 | // destroy all windows |
268 | // destroy all windows |
274 | if (parent[0]) |
269 | if (parent[0]) |
275 | XDestroyWindow (disp, parent[0]); |
270 | XDestroyWindow (disp, parent[0]); |
276 | } |
271 | } |
277 | |
272 | |
278 | // TODO: free pixcolours, colours should become part of rxvt_display |
273 | // TODO: free pixcolours, colours should become part of rxvt_display |
279 | |
|
|
280 | delete pix_colors_focused; |
274 | delete pix_colors_focused; |
281 | #if OFF_FOCUS_FADING |
275 | #if OFF_FOCUS_FADING |
282 | delete pix_colors_unfocused; |
276 | delete pix_colors_unfocused; |
283 | #endif |
|
|
284 | #if USE_XGETDEFAULT |
|
|
285 | XrmDestroyDatabase (xrmdatabase); |
|
|
286 | #endif |
277 | #endif |
287 | |
278 | |
288 | displays.put (display); |
279 | displays.put (display); |
289 | |
280 | |
290 | scr_release (); |
281 | scr_release (); |
… | |
… | |
336 | im_ev.stop (display); |
327 | im_ev.stop (display); |
337 | #endif |
328 | #endif |
338 | #if HAVE_SCROLLBARS |
329 | #if HAVE_SCROLLBARS |
339 | scrollbar_ev.stop (display); |
330 | scrollbar_ev.stop (display); |
340 | #endif |
331 | #endif |
341 | #if MENUBAR |
|
|
342 | menubar_ev.stop (display); |
|
|
343 | #endif |
|
|
344 | #if TRANSPARENT |
332 | #if TRANSPARENT |
345 | rootwin_ev.stop (display); |
333 | rootwin_ev.stop (display); |
346 | #endif |
334 | #endif |
347 | incr_ev.stop (); |
335 | incr_ev.stop (); |
348 | termwin_ev.stop (display); |
336 | termwin_ev.stop (display); |
… | |
… | |
371 | } |
359 | } |
372 | |
360 | |
373 | void |
361 | void |
374 | rxvt_term::destroy_cb (time_watcher &w) |
362 | rxvt_term::destroy_cb (time_watcher &w) |
375 | { |
363 | { |
376 | SET_R (this); |
364 | make_current (); |
377 | |
365 | |
378 | delete this; |
366 | delete this; |
379 | } |
367 | } |
380 | |
368 | |
381 | /*----------------------------------------------------------------------*/ |
369 | /*----------------------------------------------------------------------*/ |
… | |
… | |
472 | /*----------------------------------------------------------------------*/ |
460 | /*----------------------------------------------------------------------*/ |
473 | bool |
461 | bool |
474 | rxvt_term::init (int argc, const char *const *argv) |
462 | rxvt_term::init (int argc, const char *const *argv) |
475 | { |
463 | { |
476 | SET_R (this); |
464 | SET_R (this); |
477 | |
|
|
478 | set_locale (""); |
465 | set_locale (""); |
|
|
466 | set_environ (envv); // few things in X do not call setlocale :( |
479 | |
467 | |
480 | if (!init_vars ()) |
468 | if (!init_vars ()) |
481 | return false; |
469 | return false; |
482 | |
470 | |
483 | init_secondary (); |
471 | init_secondary (); |
… | |
… | |
486 | |
474 | |
487 | #ifdef KEYSYM_RESOURCE |
475 | #ifdef KEYSYM_RESOURCE |
488 | keyboard->register_done (); |
476 | keyboard->register_done (); |
489 | #endif |
477 | #endif |
490 | |
478 | |
491 | #if MENUBAR_MAX |
|
|
492 | menubar_read (rs[Rs_menu]); |
|
|
493 | #endif |
|
|
494 | #ifdef HAVE_SCROLLBARS |
479 | #ifdef HAVE_SCROLLBARS |
495 | if (OPTION (Opt_scrollBar)) |
480 | if (OPTION (Opt_scrollBar)) |
496 | scrollBar.setIdle (); /* set existence for size calculations */ |
481 | scrollBar.setIdle (); /* set existence for size calculations */ |
497 | #endif |
482 | #endif |
498 | |
483 | |
… | |
… | |
502 | |
487 | |
503 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
488 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
504 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
489 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
505 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
490 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
506 | { |
491 | { |
507 | bool tainted = false; |
|
|
508 | |
|
|
509 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
492 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
510 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
493 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
511 | if (getuid () != saved_euid || getgid () != saved_egid) |
494 | if (rxvt_tainted ()) |
512 | { |
495 | { |
513 | tainted = true; |
|
|
514 | |
|
|
515 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
496 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
516 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
497 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
517 | { |
498 | { |
518 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
499 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
519 | rs[Rs_perl_lib] = 0; |
500 | rs[Rs_perl_lib] = 0; |
520 | rs[Rs_perl_eval] = "our $tainted = 1"; |
501 | rs[Rs_perl_eval] = 0; |
521 | } |
502 | } |
522 | } |
503 | } |
523 | #endif |
504 | #endif |
524 | rxvt_perl.init (tainted); |
505 | rxvt_perl.init (this); |
525 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
506 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
526 | } |
507 | } |
527 | #endif |
508 | #endif |
528 | |
509 | |
|
|
510 | pty = rxvt_new_ptytty (); |
|
|
511 | |
529 | create_windows (argc, argv); |
512 | create_windows (argc, argv); |
530 | |
513 | |
531 | dDisp; |
514 | dDisp; |
532 | |
515 | |
533 | init_xlocale (); |
516 | init_xlocale (); |
534 | |
517 | |
535 | scr_reset (); /* initialize screen */ |
518 | scr_reset (); // initialize screen |
536 | |
519 | |
537 | #if 0 |
520 | #if 0 |
538 | XSynchronize (disp, True); |
521 | XSynchronize (disp, True); |
539 | #endif |
522 | #endif |
540 | |
523 | |
541 | #ifdef HAVE_SCROLLBARS |
524 | #ifdef HAVE_SCROLLBARS |
542 | if (OPTION (Opt_scrollBar)) |
525 | if (OPTION (Opt_scrollBar)) |
543 | resize_scrollbar (); /* create and map scrollbar */ |
526 | resize_scrollbar (); /* create and map scrollbar */ |
544 | #endif |
527 | #endif |
545 | #if (MENUBAR_MAX) |
|
|
546 | if (menubar_visible ()) |
|
|
547 | XMapWindow (disp, menuBar.win); |
|
|
548 | #endif |
|
|
549 | #ifdef TRANSPARENT |
528 | #ifdef TRANSPARENT |
550 | if (OPTION (Opt_transparent)) |
529 | if (OPTION (Opt_transparent)) |
551 | { |
530 | { |
552 | XSelectInput (disp, display->root, PropertyChangeMask); |
531 | XSelectInput (disp, display->root, PropertyChangeMask); |
553 | check_our_parents (); |
532 | check_our_parents (); |
… | |
… | |
562 | |
541 | |
563 | init_command (cmd_argv); |
542 | init_command (cmd_argv); |
564 | |
543 | |
565 | free (cmd_argv); |
544 | free (cmd_argv); |
566 | |
545 | |
567 | if (pty.pty >= 0) |
546 | if (pty->pty >= 0) |
568 | pty_ev.start (pty.pty, EVENT_READ); |
547 | pty_ev.start (pty->pty, EVENT_READ); |
569 | |
548 | |
570 | check_ev.start (); |
549 | check_ev.start (); |
571 | |
550 | |
572 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
551 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
573 | |
552 | |
… | |
… | |
612 | sw_int (this, &sig_handlers::sig_term) |
591 | sw_int (this, &sig_handlers::sig_term) |
613 | { |
592 | { |
614 | } |
593 | } |
615 | } sig_handlers; |
594 | } sig_handlers; |
616 | |
595 | |
|
|
596 | char **rxvt_environ; // startup environment |
|
|
597 | |
617 | void |
598 | void |
618 | rxvt_init () |
599 | rxvt_init () |
619 | { |
600 | { |
|
|
601 | uid_t uid = getuid (); |
|
|
602 | gid_t gid = getgid (); |
|
|
603 | |
|
|
604 | // before doing anything else, check for setuid/setgid operation, |
|
|
605 | // start the helper process and drop privileges |
|
|
606 | if (uid != geteuid () |
|
|
607 | || 1 //D |
|
|
608 | || gid != getegid ()) |
|
|
609 | { |
|
|
610 | #if PTYTTY_HELPER |
|
|
611 | rxvt_ptytty_server (); |
|
|
612 | #else |
|
|
613 | rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n"); |
|
|
614 | #endif |
|
|
615 | |
|
|
616 | // drop privileges |
|
|
617 | #if HAVE_SETRESUID |
|
|
618 | setresgid (gid, gid, gid); |
|
|
619 | setresuid (uid, uid, uid); |
|
|
620 | #elif HAVE_SETREUID |
|
|
621 | setregid (gid, gid); |
|
|
622 | setreuid (uid, uid); |
|
|
623 | #elif HAVE_SETUID |
|
|
624 | setgid (gid); |
|
|
625 | setuid (uid); |
|
|
626 | #endif |
|
|
627 | |
|
|
628 | if (uid != geteuid () |
|
|
629 | || gid != getegid ()) |
|
|
630 | rxvt_fatal ("unable to drop privileges, aborting.\n"); |
|
|
631 | } |
|
|
632 | |
|
|
633 | rxvt_environ = environ; |
|
|
634 | |
620 | /* |
635 | /* |
621 | * Save and then give up any super-user privileges |
636 | * Save and then give up any super-user privileges |
622 | * If we need privileges in any area then we must specifically request it. |
637 | * If we need privileges in any area then we must specifically request it. |
623 | * We should only need to be root in these cases: |
638 | * We should only need to be root in these cases: |
624 | * 1. write utmp entries on some systems |
639 | * 1. write utmp entries on some systems |
… | |
… | |
639 | |
654 | |
640 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
655 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
641 | // TODO: handle this with exceptions and tolerate the memory loss |
656 | // TODO: handle this with exceptions and tolerate the memory loss |
642 | XSetIOErrorHandler (rxvt_xioerror_handler); |
657 | XSetIOErrorHandler (rxvt_xioerror_handler); |
643 | |
658 | |
644 | #ifdef USE_XGETDEFAULT |
|
|
645 | XrmInitialize (); |
659 | XrmInitialize (); |
646 | #endif |
|
|
647 | } |
660 | } |
648 | |
661 | |
649 | /* ------------------------------------------------------------------------- * |
662 | /* ------------------------------------------------------------------------- * |
650 | * MEMORY ALLOCATION WRAPPERS * |
663 | * MEMORY ALLOCATION WRAPPERS * |
651 | * ------------------------------------------------------------------------- */ |
664 | * ------------------------------------------------------------------------- */ |
… | |
… | |
702 | case IGNORE: |
715 | case IGNORE: |
703 | /* |
716 | /* |
704 | * change effective uid/gid - not real uid/gid - so we can switch |
717 | * change effective uid/gid - not real uid/gid - so we can switch |
705 | * back to root later, as required |
718 | * back to root later, as required |
706 | */ |
719 | */ |
|
|
720 | setegid (getgid ()); |
707 | seteuid (getuid ()); |
721 | seteuid (getuid ()); |
708 | setegid (getgid ()); |
|
|
709 | break; |
722 | break; |
710 | case SAVE: |
723 | case SAVE: |
|
|
724 | saved_egid = getegid (); |
711 | saved_euid = geteuid (); |
725 | saved_euid = geteuid (); |
712 | saved_egid = getegid (); |
|
|
713 | break; |
726 | break; |
714 | case RESTORE: |
727 | case RESTORE: |
|
|
728 | setegid (saved_egid); |
715 | seteuid (saved_euid); |
729 | seteuid (saved_euid); |
716 | setegid (saved_egid); |
|
|
717 | break; |
730 | break; |
718 | } |
731 | } |
719 | # else |
732 | # else |
720 | switch (action) |
733 | switch (action) |
721 | { |
734 | { |
722 | case IGNORE: |
735 | case IGNORE: |
|
|
736 | setgid (getgid ()); |
723 | setuid (getuid ()); |
737 | setuid (getuid ()); |
724 | setgid (getgid ()); |
|
|
725 | /* FALLTHROUGH */ |
738 | /* FALLTHROUGH */ |
726 | case SAVE: |
739 | case SAVE: |
727 | /* FALLTHROUGH */ |
740 | /* FALLTHROUGH */ |
728 | case RESTORE: |
741 | case RESTORE: |
729 | break; |
742 | break; |
730 | } |
743 | } |
731 | # endif |
744 | # endif |
732 | #endif |
745 | #endif |
733 | } |
746 | } |
734 | |
747 | |
735 | #ifdef UTMP_SUPPORT |
|
|
736 | void |
|
|
737 | rxvt_term::privileged_utmp (rxvt_privaction action) |
|
|
738 | { |
|
|
739 | if (OPTION (Opt_utmpInhibit) |
|
|
740 | || !pty.name || !*pty.name) |
|
|
741 | return; |
|
|
742 | |
|
|
743 | rxvt_privileges (RESTORE); |
|
|
744 | |
|
|
745 | if (action == SAVE) |
|
|
746 | makeutent (pty.name, rs[Rs_display_name]); |
|
|
747 | else |
|
|
748 | cleanutent (); |
|
|
749 | |
|
|
750 | rxvt_privileges (IGNORE); |
|
|
751 | } |
|
|
752 | #endif |
|
|
753 | |
|
|
754 | /*----------------------------------------------------------------------*/ |
748 | /*----------------------------------------------------------------------*/ |
755 | /* |
749 | /* |
756 | * window size/position calculcations for XSizeHint and other storage. |
750 | * window size/position calculcations for XSizeHint and other storage. |
757 | * if width/height are non-zero then override calculated width/height |
751 | * if width/height are non-zero then override calculated width/height |
758 | */ |
752 | */ |
759 | void |
753 | void |
760 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
754 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
761 | { |
755 | { |
762 | short recalc_x, recalc_y; |
756 | short recalc_x, recalc_y; |
763 | int x, y, sb_w, mb_h, flags; |
757 | int x, y, sb_w, flags; |
764 | unsigned int w, h; |
758 | unsigned int w, h; |
765 | unsigned int max_width, max_height; |
759 | unsigned int max_width, max_height; |
766 | dDisp; |
760 | dDisp; |
767 | |
761 | |
768 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
762 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
… | |
… | |
829 | max_width = MAX_COLS * fwidth; |
823 | max_width = MAX_COLS * fwidth; |
830 | max_height = MAX_ROWS * fheight; |
824 | max_height = MAX_ROWS * fheight; |
831 | |
825 | |
832 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
826 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
833 | |
827 | |
834 | sb_w = mb_h = 0; |
828 | sb_w = 0; |
835 | window_vt_x = window_vt_y = int_bwidth; |
829 | window_vt_x = window_vt_y = int_bwidth; |
836 | |
830 | |
837 | if (scrollbar_visible ()) |
831 | if (scrollBar.state) |
838 | { |
832 | { |
839 | sb_w = scrollbar_TotalWidth (); |
833 | sb_w = scrollbar_TotalWidth (); |
840 | szHint.base_width += sb_w; |
834 | szHint.base_width += sb_w; |
841 | if (!OPTION (Opt_scrollBar_right)) |
835 | if (!OPTION (Opt_scrollBar_right)) |
842 | window_vt_x += sb_w; |
836 | window_vt_x += sb_w; |
843 | } |
837 | } |
844 | |
838 | |
845 | if (menubar_visible ()) |
|
|
846 | { |
|
|
847 | mb_h = menuBar_TotalHeight (); |
|
|
848 | szHint.base_height += mb_h; |
|
|
849 | window_vt_y += mb_h; |
|
|
850 | } |
|
|
851 | |
|
|
852 | szHint.width_inc = fwidth; |
839 | szHint.width_inc = fwidth; |
853 | szHint.height_inc = fheight; |
840 | szHint.height_inc = fheight; |
854 | szHint.min_width = szHint.base_width + szHint.width_inc; |
841 | szHint.min_width = szHint.base_width + szHint.width_inc; |
855 | szHint.min_height = szHint.base_height + szHint.height_inc; |
842 | szHint.min_height = szHint.base_height + szHint.height_inc; |
856 | |
843 | |
… | |
… | |
874 | { |
861 | { |
875 | min_it (height, max_height); |
862 | min_it (height, max_height); |
876 | szHint.height = szHint.base_height + height; |
863 | szHint.height = szHint.base_height + height; |
877 | } |
864 | } |
878 | |
865 | |
879 | if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) |
866 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
880 | window_sb_x = szHint.width - sb_w; |
867 | window_sb_x = szHint.width - sb_w; |
881 | |
868 | |
882 | if (recalc_x) |
869 | if (recalc_x) |
883 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
870 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
884 | if (recalc_y) |
871 | if (recalc_y) |
… | |
… | |
898 | * Called after a window size change. |
885 | * Called after a window size change. |
899 | */ |
886 | */ |
900 | void |
887 | void |
901 | rxvt_term::tt_winch () |
888 | rxvt_term::tt_winch () |
902 | { |
889 | { |
903 | if (pty.pty < 0) |
890 | if (pty->pty < 0) |
904 | return; |
891 | return; |
905 | |
892 | |
906 | struct winsize ws; |
893 | struct winsize ws; |
907 | |
894 | |
908 | ws.ws_col = ncol; |
895 | ws.ws_col = ncol; |
909 | ws.ws_row = nrow; |
896 | ws.ws_row = nrow; |
910 | ws.ws_xpixel = width; |
897 | ws.ws_xpixel = width; |
911 | ws.ws_ypixel = height; |
898 | ws.ws_ypixel = height; |
912 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
899 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
913 | |
900 | |
914 | #if 0 |
901 | #if 0 |
915 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
902 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
916 | if (cmd_pid) /* force through to the command */ |
903 | if (cmd_pid) /* force through to the command */ |
917 | kill (-cmd_pid, SIGWINCH); |
904 | kill (-cmd_pid, SIGWINCH); |
… | |
… | |
1239 | |
1226 | |
1240 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1227 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1241 | |
1228 | |
1242 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1229 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1243 | { |
1230 | { |
1244 | if (scrollbar_visible ()) |
1231 | if (scrollBar.state) |
1245 | { |
1232 | { |
1246 | XMoveResizeWindow (disp, scrollBar.win, |
1233 | XMoveResizeWindow (disp, scrollBar.win, |
1247 | window_sb_x, 0, |
1234 | window_sb_x, 0, |
1248 | scrollbar_TotalWidth (), szHint.height); |
1235 | scrollbar_TotalWidth (), szHint.height); |
1249 | resize_scrollbar (); |
1236 | resize_scrollbar (); |
1250 | } |
1237 | } |
1251 | |
|
|
1252 | if (menubar_visible ()) |
|
|
1253 | XMoveResizeWindow (disp, menuBar.win, |
|
|
1254 | window_vt_x, 0, |
|
|
1255 | width, menuBar_TotalHeight ()); |
|
|
1256 | |
1238 | |
1257 | XMoveResizeWindow (disp, vt, |
1239 | XMoveResizeWindow (disp, vt, |
1258 | window_vt_x, window_vt_y, |
1240 | window_vt_x, window_vt_y, |
1259 | width, height); |
1241 | width, height); |
1260 | |
1242 | |
… | |
… | |
1444 | XRectangle rect, status_rect, needed_rect; |
1426 | XRectangle rect, status_rect, needed_rect; |
1445 | unsigned long fg, bg; |
1427 | unsigned long fg, bg; |
1446 | const char *p; |
1428 | const char *p; |
1447 | char **s; |
1429 | char **s; |
1448 | XIMStyles *xim_styles; |
1430 | XIMStyles *xim_styles; |
|
|
1431 | |
|
|
1432 | set_environ (envv); |
1449 | |
1433 | |
1450 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1434 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1451 | return false; |
1435 | return false; |
1452 | |
1436 | |
1453 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1437 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
… | |
… | |
1619 | int i; |
1603 | int i; |
1620 | const char *p; |
1604 | const char *p; |
1621 | char **s; |
1605 | char **s; |
1622 | char buf[IMBUFSIZ]; |
1606 | char buf[IMBUFSIZ]; |
1623 | |
1607 | |
1624 | SET_R (this); |
1608 | make_current (); |
1625 | |
1609 | |
1626 | im_destroy (); |
1610 | im_destroy (); |
1627 | |
1611 | |
1628 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1612 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1629 | if (Input_Context) |
1613 | if (Input_Context) |