ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.168 by root, Sun Jan 8 08:49:20 2006 UTC vs.
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC

… …
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__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
55
56bool
57rxvt_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
66vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
67 52
68static char curlocale[128], savelocale[128]; 53static char curlocale[128], savelocale[128];
69 54
70bool 55bool
… …
76 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
78 return true; 63 return true;
79} 64}
80 65
81bool 66void
82rxvt_push_locale (const char *locale) 67rxvt_push_locale (const char *locale)
83{ 68{
84 strcpy (savelocale, curlocale); 69 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 70 rxvt_set_locale (locale);
86} 71}
… …
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 147#endif
163#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 150#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif
169#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 153#endif
172#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
187#ifdef USE_XIM 169#ifdef USE_XIM
188 im_ev (this, &rxvt_term::im_cb), 170 im_ev (this, &rxvt_term::im_cb),
189#endif 171#endif
190 termwin_ev (this, &rxvt_term::x_cb), 172 termwin_ev (this, &rxvt_term::x_cb),
191 vt_ev (this, &rxvt_term::x_cb), 173 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb),
192 check_ev (this, &rxvt_term::check_cb), 175 check_ev (this, &rxvt_term::check_cb),
193 flush_ev (this, &rxvt_term::flush_cb), 176 flush_ev (this, &rxvt_term::flush_cb),
194 destroy_ev (this, &rxvt_term::destroy_cb), 177 destroy_ev (this, &rxvt_term::destroy_cb),
195 pty_ev (this, &rxvt_term::pty_cb), 178 pty_ev (this, &rxvt_term::pty_cb),
196 incr_ev (this, &rxvt_term::incr_cb) 179 incr_ev (this, &rxvt_term::incr_cb)
… …
212void rxvt_term::emergency_cleanup () 195void rxvt_term::emergency_cleanup ()
213{ 196{
214 if (cmd_pid) 197 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 198 kill (-cmd_pid, SIGHUP);
216 199
217#ifdef UTMP_SUPPORT 200 delete pty; pty = 0;
218 privileged_utmp (RESTORE);
219#endif
220
221 pty.put ();
222} 201}
223 202
224rxvt_term::~rxvt_term () 203rxvt_term::~rxvt_term ()
225{ 204{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
242 221
243 selection_clear (); 222 selection_clear ();
244 223
245#ifdef USE_XIM 224#ifdef USE_XIM
246 im_destroy (); 225 im_destroy ();
247#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif 226#endif
251#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (disp, ShadowGC);
254#endif 230#endif
… …
265 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (disp, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (disp, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (disp, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (disp, downArrowHi);
269#endif 245#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 246#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (disp, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (disp, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274#endif 250#endif
275 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (disp, gc);
276 252
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; 253 delete drawable;
283 // destroy all windows 254 // destroy all windows
284 if (parent[0]) 255 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (disp, parent[0]);
286 } 257 }
287 258
288 // TODO: free pixcolours, colours should become part of rxvt_display 259 // TODO: free pixcolours, colours should become part of rxvt_display
289
290 delete pix_colors_focused; 260 delete pix_colors_focused;
291#if OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
292 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
293#endif
294#if USE_XGETDEFAULT
295 XrmDestroyDatabase (xrmdatabase);
296#endif 263#endif
297 264
298 displays.put (display); 265 displays.put (display);
299 266
300 scr_release (); 267 scr_release ();
… …
319#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
320 delete keyboard; 287 delete keyboard;
321#endif 288#endif
322} 289}
323 290
291// child has exited, usually destroys
324void 292void
325rxvt_term::child_exit () 293rxvt_term::child_cb (child_watcher &w, int status)
326{ 294{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296
327 cmd_pid = 0; 297 cmd_pid = 0;
328 298
329 if (!OPTION (Opt_hold)) 299 if (!OPTION (Opt_hold))
330 destroy (); 300 destroy ();
331} 301}
… …
345#if USE_XIM 315#if USE_XIM
346 im_ev.stop (display); 316 im_ev.stop (display);
347#endif 317#endif
348#if HAVE_SCROLLBARS 318#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
350#endif
351#if MENUBAR
352 menubar_ev.stop (display);
353#endif 320#endif
354#if TRANSPARENT 321#if TRANSPARENT
355 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
356#endif 323#endif
357 incr_ev.stop (); 324 incr_ev.stop ();
… …
381} 348}
382 349
383void 350void
384rxvt_term::destroy_cb (time_watcher &w) 351rxvt_term::destroy_cb (time_watcher &w)
385{ 352{
386 SET_R (this); 353 make_current ();
387 354
388 delete this; 355 delete this;
389} 356}
390 357
391/*----------------------------------------------------------------------*/ 358/*----------------------------------------------------------------------*/
… …
482/*----------------------------------------------------------------------*/ 449/*----------------------------------------------------------------------*/
483bool 450bool
484rxvt_term::init (int argc, const char *const *argv) 451rxvt_term::init (int argc, const char *const *argv)
485{ 452{
486 SET_R (this); 453 SET_R (this);
487
488 set_locale (""); 454 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :(
489 456
490 if (!init_vars ()) 457 if (!init_vars ())
491 return false; 458 return false;
492 459
493 init_secondary (); 460 init_secondary ();
… …
496 463
497#ifdef KEYSYM_RESOURCE 464#ifdef KEYSYM_RESOURCE
498 keyboard->register_done (); 465 keyboard->register_done ();
499#endif 466#endif
500 467
501#if MENUBAR_MAX
502 menubar_read (rs[Rs_menu]);
503#endif
504#ifdef HAVE_SCROLLBARS 468#ifdef HAVE_SCROLLBARS
505 if (OPTION (Opt_scrollBar)) 469 if (OPTION (Opt_scrollBar))
506 scrollBar.setIdle (); /* set existence for size calculations */ 470 scrollBar.setIdle (); /* set existence for size calculations */
507#endif 471#endif
508 472
… …
512 476
513 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
514 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
515 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
516 { 480 {
517#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
518 // ignore some perl-related arguments if some bozo installed us set[ug]id
519 if (rxvt_tainted ())
520 {
521 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
522 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
523 {
524 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
525 rs[Rs_perl_lib] = 0;
526 rs[Rs_perl_eval] = 0;
527 }
528 }
529#endif
530 rxvt_perl.init (); 481 rxvt_perl.init (this);
531 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
532 } 483 }
533#endif 484#endif
534 485
486 pty = rxvt_new_ptytty ();
487
535 create_windows (argc, argv); 488 create_windows (argc, argv);
536 489
537 dDisp; 490 dDisp;
538 491
539 init_xlocale (); 492 init_xlocale ();
540 493
541 scr_reset (); /* initialize screen */ 494 scr_reset (); // initialize screen
542 495
543#if 0 496#if 0
544 XSynchronize (disp, True); 497 XSynchronize (disp, True);
545#endif 498#endif
546 499
547#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
548 if (OPTION (Opt_scrollBar)) 501 if (OPTION (Opt_scrollBar))
549 resize_scrollbar (); /* create and map scrollbar */ 502 resize_scrollbar (); /* create and map scrollbar */
550#endif 503#endif
551#if (MENUBAR_MAX)
552 if (menubar_visible ())
553 XMapWindow (disp, menuBar.win);
554#endif
555#ifdef TRANSPARENT 504#ifdef TRANSPARENT
556 if (OPTION (Opt_transparent)) 505 if (OPTION (Opt_transparent))
557 { 506 {
558 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
559 check_our_parents (); 508 check_our_parents ();
… …
568 517
569 init_command (cmd_argv); 518 init_command (cmd_argv);
570 519
571 free (cmd_argv); 520 free (cmd_argv);
572 521
573 if (pty.pty >= 0) 522 if (pty->pty >= 0)
574 pty_ev.start (pty.pty, EVENT_READ); 523 pty_ev.start (pty->pty, EVENT_READ);
575 524
576 check_ev.start (); 525 check_ev.start ();
577 526
578 HOOK_INVOKE ((this, HOOK_START, DT_END)); 527 HOOK_INVOKE ((this, HOOK_START, DT_END));
579 528
580 return true; 529 return true;
581} 530}
582 531
583static struct sig_handlers 532static struct sig_handlers
584{ 533{
585 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
586 535
587 void sig_chld (sig_watcher &w)
588 {
589 // we are being called for every SIGCHLD, find the corresponding term
590 int pid;
591
592 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
593 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
594 if (pid == (*t)->cmd_pid)
595 {
596 (*t)->child_exit ();
597 break;
598 }
599 }
600
601 /* 536 /*
602 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
603 */ 538 */
604 void 539 void
605 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
… …
611 signal (w.signum, SIG_DFL); 546 signal (w.signum, SIG_DFL);
612 kill (getpid (), w.signum); 547 kill (getpid (), w.signum);
613 } 548 }
614 549
615 sig_handlers () 550 sig_handlers ()
616 : sw_chld (this, &sig_handlers::sig_chld),
617 sw_term (this, &sig_handlers::sig_term), 551 : sw_term (this, &sig_handlers::sig_term),
618 sw_int (this, &sig_handlers::sig_term) 552 sw_int (this, &sig_handlers::sig_term)
619 { 553 {
620 } 554 }
621} sig_handlers; 555} sig_handlers;
622 556
557char **rxvt_environ; // startup environment
558
623void 559void
624rxvt_init () 560rxvt_init ()
625{ 561{
626 /* 562 uid_t uid = getuid ();
627 * Save and then give up any super-user privileges 563 gid_t gid = getgid ();
628 * If we need privileges in any area then we must specifically request it. 564
629 * We should only need to be root in these cases: 565 // before doing anything else, check for setuid/setgid operation,
630 * 1. write utmp entries on some systems 566 // start the helper process and drop privileges
631 * 2. chown tty on some systems 567 if (uid != geteuid ()
632 */ 568 || gid != getegid ())
633 rxvt_privileges (SAVE); 569 {
634 rxvt_privileges (IGNORE); 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
593 rxvt_environ = environ;
635 594
636 signal (SIGHUP, SIG_IGN); 595 signal (SIGHUP, SIG_IGN);
637 signal (SIGPIPE, SIG_IGN); 596 signal (SIGPIPE, SIG_IGN);
638 597
639 sig_handlers.sw_chld.start (SIGCHLD);
640 sig_handlers.sw_term.start (SIGTERM); 598 sig_handlers.sw_term.start (SIGTERM);
641 sig_handlers.sw_int.start (SIGINT); 599 sig_handlers.sw_int.start (SIGINT);
642 600
643 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 601 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
644 /* signal (SIGURG, SIG_DFL); */ 602 /* signal (SIGURG, SIG_DFL); */
645 603
646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 604 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
647 // TODO: handle this with exceptions and tolerate the memory loss 605 // TODO: handle this with exceptions and tolerate the memory loss
648 XSetIOErrorHandler (rxvt_xioerror_handler); 606 XSetIOErrorHandler (rxvt_xioerror_handler);
649 607
650#ifdef USE_XGETDEFAULT
651 XrmInitialize (); 608 XrmInitialize ();
652#endif
653} 609}
654 610
655/* ------------------------------------------------------------------------- * 611/* ------------------------------------------------------------------------- *
656 * MEMORY ALLOCATION WRAPPERS * 612 * MEMORY ALLOCATION WRAPPERS *
657 * ------------------------------------------------------------------------- */ 613 * ------------------------------------------------------------------------- */
… …
686 rxvt_fatal ("memory allocation failure. aborting.\n"); 642 rxvt_fatal ("memory allocation failure. aborting.\n");
687 643
688 return p; 644 return p;
689} 645}
690 646
691/* ------------------------------------------------------------------------- *
692 * PRIVILEGED OPERATIONS *
693 * ------------------------------------------------------------------------- */
694/* take care of suid/sgid super-user (root) privileges */
695void
696rxvt_privileges (rxvt_privaction action)
697{
698#if ! defined(__CYGWIN32__)
699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
700 /* setreuid () is the poor man's setuid (), seteuid () */
701# define seteuid(a) setreuid(-1, (a))
702# define setegid(a) setregid(-1, (a))
703# define HAVE_SETEUID
704# endif
705# ifdef HAVE_SETEUID
706 switch (action)
707 {
708 case IGNORE:
709 /*
710 * change effective uid/gid - not real uid/gid - so we can switch
711 * back to root later, as required
712 */
713 seteuid (getuid ());
714 setegid (getgid ());
715 break;
716 case SAVE:
717 saved_euid = geteuid ();
718 saved_egid = getegid ();
719 break;
720 case RESTORE:
721 seteuid (saved_euid);
722 setegid (saved_egid);
723 break;
724 }
725# else
726 switch (action)
727 {
728 case IGNORE:
729 setuid (getuid ());
730 setgid (getgid ());
731 /* FALLTHROUGH */
732 case SAVE:
733 /* FALLTHROUGH */
734 case RESTORE:
735 break;
736 }
737# endif
738#endif
739}
740
741#ifdef UTMP_SUPPORT
742void
743rxvt_term::privileged_utmp (rxvt_privaction action)
744{
745 if (OPTION (Opt_utmpInhibit)
746 || !pty.name || !*pty.name)
747 return;
748
749 rxvt_privileges (RESTORE);
750
751 if (action == SAVE)
752 makeutent (pty.name, rs[Rs_display_name]);
753 else
754 cleanutent ();
755
756 rxvt_privileges (IGNORE);
757}
758#endif
759
760/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
761/* 648/*
762 * window size/position calculcations for XSizeHint and other storage. 649 * window size/position calculcations for XSizeHint and other storage.
763 * if width/height are non-zero then override calculated width/height 650 * if width/height are non-zero then override calculated width/height
764 */ 651 */
765void 652void
766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767{ 654{
768 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
769 int x, y, sb_w, mb_h, flags; 656 int x, y, sb_w, flags;
770 unsigned int w, h; 657 unsigned int w, h;
771 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
772 dDisp; 659 dDisp;
773 660
774 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",
… …
835 max_width = MAX_COLS * fwidth; 722 max_width = MAX_COLS * fwidth;
836 max_height = MAX_ROWS * fheight; 723 max_height = MAX_ROWS * fheight;
837 724
838 szHint.base_width = szHint.base_height = 2 * int_bwidth; 725 szHint.base_width = szHint.base_height = 2 * int_bwidth;
839 726
840 sb_w = mb_h = 0; 727 sb_w = 0;
841 window_vt_x = window_vt_y = int_bwidth; 728 window_vt_x = window_vt_y = int_bwidth;
842 729
843 if (scrollbar_visible ()) 730 if (scrollBar.state)
844 { 731 {
845 sb_w = scrollbar_TotalWidth (); 732 sb_w = scrollbar_TotalWidth ();
846 szHint.base_width += sb_w; 733 szHint.base_width += sb_w;
847 if (!OPTION (Opt_scrollBar_right)) 734 if (!OPTION (Opt_scrollBar_right))
848 window_vt_x += sb_w; 735 window_vt_x += sb_w;
849 } 736 }
850 737
851 if (menubar_visible ())
852 {
853 mb_h = menuBar_TotalHeight ();
854 szHint.base_height += mb_h;
855 window_vt_y += mb_h;
856 }
857
858 szHint.width_inc = fwidth; 738 szHint.width_inc = fwidth;
859 szHint.height_inc = fheight; 739 szHint.height_inc = fheight;
860 szHint.min_width = szHint.base_width + szHint.width_inc; 740 szHint.min_width = szHint.base_width + szHint.width_inc;
861 szHint.min_height = szHint.base_height + szHint.height_inc; 741 szHint.min_height = szHint.base_height + szHint.height_inc;
862 742
… …
880 { 760 {
881 min_it (height, max_height); 761 min_it (height, max_height);
882 szHint.height = szHint.base_height + height; 762 szHint.height = szHint.base_height + height;
883 } 763 }
884 764
885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 765 if (scrollBar.state && OPTION (Opt_scrollBar_right))
886 window_sb_x = szHint.width - sb_w; 766 window_sb_x = szHint.width - sb_w;
887 767
888 if (recalc_x) 768 if (recalc_x)
889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890 if (recalc_y) 770 if (recalc_y)
… …
904 * Called after a window size change. 784 * Called after a window size change.
905 */ 785 */
906void 786void
907rxvt_term::tt_winch () 787rxvt_term::tt_winch ()
908{ 788{
909 if (pty.pty < 0) 789 if (pty->pty < 0)
910 return; 790 return;
911 791
912 struct winsize ws; 792 struct winsize ws;
913 793
914 ws.ws_col = ncol; 794 ws.ws_col = ncol;
915 ws.ws_row = nrow; 795 ws.ws_row = nrow;
916 ws.ws_xpixel = width; 796 ws.ws_xpixel = width;
917 ws.ws_ypixel = height; 797 ws.ws_ypixel = height;
918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 798 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919 799
920#if 0 800#if 0
921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 801 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922 if (cmd_pid) /* force through to the command */ 802 if (cmd_pid) /* force through to the command */
923 kill (-cmd_pid, SIGWINCH); 803 kill (-cmd_pid, SIGWINCH);
… …
1245 1125
1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1247 1127
1248 if (fix_screen || newwidth != old_width || newheight != old_height) 1128 if (fix_screen || newwidth != old_width || newheight != old_height)
1249 { 1129 {
1250 if (scrollbar_visible ()) 1130 if (scrollBar.state)
1251 { 1131 {
1252 XMoveResizeWindow (disp, scrollBar.win, 1132 XMoveResizeWindow (disp, scrollBar.win,
1253 window_sb_x, 0, 1133 window_sb_x, 0,
1254 scrollbar_TotalWidth (), szHint.height); 1134 scrollbar_TotalWidth (), szHint.height);
1255 resize_scrollbar (); 1135 resize_scrollbar ();
1256 } 1136 }
1257
1258 if (menubar_visible ())
1259 XMoveResizeWindow (disp, menuBar.win,
1260 window_vt_x, 0,
1261 width, menuBar_TotalHeight ());
1262 1137
1263 XMoveResizeWindow (disp, vt, 1138 XMoveResizeWindow (disp, vt,
1264 window_vt_x, window_vt_y, 1139 window_vt_x, window_vt_y,
1265 width, height); 1140 width, height);
1266 1141
… …
1450 XRectangle rect, status_rect, needed_rect; 1325 XRectangle rect, status_rect, needed_rect;
1451 unsigned long fg, bg; 1326 unsigned long fg, bg;
1452 const char *p; 1327 const char *p;
1453 char **s; 1328 char **s;
1454 XIMStyles *xim_styles; 1329 XIMStyles *xim_styles;
1330
1331 set_environ (envv);
1455 1332
1456 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1457 return false; 1334 return false;
1458 1335
1459 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1625 int i; 1502 int i;
1626 const char *p; 1503 const char *p;
1627 char **s; 1504 char **s;
1628 char buf[IMBUFSIZ]; 1505 char buf[IMBUFSIZ];
1629 1506
1630 SET_R (this); 1507 make_current ();
1631 1508
1632 im_destroy (); 1509 im_destroy ();
1633 1510
1634 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1635 if (Input_Context) 1512 if (Input_Context)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines