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.174 by root, Thu Jan 12 00:11:13 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
… …
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 }
… …
315#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
316 delete keyboard; 287 delete keyboard;
317#endif 288#endif
318} 289}
319 290
291// child has exited, usually destroys
320void 292void
321rxvt_term::child_exit () 293rxvt_term::child_cb (child_watcher &w, int status)
322{ 294{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296
323 cmd_pid = 0; 297 cmd_pid = 0;
324 298
325 if (!OPTION (Opt_hold)) 299 if (!OPTION (Opt_hold))
326 destroy (); 300 destroy ();
327} 301}
… …
341#if USE_XIM 315#if USE_XIM
342 im_ev.stop (display); 316 im_ev.stop (display);
343#endif 317#endif
344#if HAVE_SCROLLBARS 318#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
346#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif 320#endif
350#if TRANSPARENT 321#if TRANSPARENT
351 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
352#endif 323#endif
353 incr_ev.stop (); 324 incr_ev.stop ();
… …
377} 348}
378 349
379void 350void
380rxvt_term::destroy_cb (time_watcher &w) 351rxvt_term::destroy_cb (time_watcher &w)
381{ 352{
382 SET_R (this); 353 make_current ();
383 354
384 delete this; 355 delete this;
385} 356}
386 357
387/*----------------------------------------------------------------------*/ 358/*----------------------------------------------------------------------*/
… …
478/*----------------------------------------------------------------------*/ 449/*----------------------------------------------------------------------*/
479bool 450bool
480rxvt_term::init (int argc, const char *const *argv) 451rxvt_term::init (int argc, const char *const *argv)
481{ 452{
482 SET_R (this); 453 SET_R (this);
483
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
489 set_locale (""); 454 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :(
490 456
491 if (!init_vars ()) 457 if (!init_vars ())
492 return false; 458 return false;
493 459
494 init_secondary (); 460 init_secondary ();
495 461
496 cmd_argv = init_resources (argc, argv); 462 const char **cmd_argv = init_resources (argc, argv);
497 463
498#ifdef KEYSYM_RESOURCE 464#ifdef KEYSYM_RESOURCE
499 keyboard->register_done (); 465 keyboard->register_done ();
500#endif 466#endif
501 467
502#if MENUBAR_MAX
503 menubar_read (rs[Rs_menu]);
504#endif
505#ifdef HAVE_SCROLLBARS 468#ifdef HAVE_SCROLLBARS
506 if (OPTION (Opt_scrollBar)) 469 if (OPTION (Opt_scrollBar))
507 scrollBar.setIdle (); /* set existence for size calculations */ 470 scrollBar.setIdle (); /* set existence for size calculations */
508#endif 471#endif
509 }
510 472
511#if ENABLE_PERL 473#if ENABLE_PERL
512 if (!rs[Rs_perl_ext_1]) 474 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default"; 475 rs[Rs_perl_ext_1] = "default";
514 476
515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
518 { 480 {
519#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520 // ignore some perl-related arguments if some bozo installed us set[ug]id
521 if (rxvt_tainted ())
522 {
523 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525 {
526 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0;
529 }
530 }
531#endif
532 rxvt_perl.init (); 481 rxvt_perl.init (this);
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
534 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
535 } 483 }
536#endif 484#endif
537 485
538 { 486 pty = rxvt_new_ptytty ();
539 TEMP_ENV;
540 487
541 create_windows (argc, argv); 488 create_windows (argc, argv);
542 489
543 dDisp; 490 dDisp;
544 491
545 init_xlocale (); 492 init_xlocale ();
546 493
547 scr_reset (); // initialize screen 494 scr_reset (); // initialize screen
548 495
549#if 0 496#if 0
550 XSynchronize (disp, True); 497 XSynchronize (disp, True);
551#endif 498#endif
552 499
553#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
554 if (OPTION (Opt_scrollBar)) 501 if (OPTION (Opt_scrollBar))
555 resize_scrollbar (); /* create and map scrollbar */ 502 resize_scrollbar (); /* create and map scrollbar */
556#endif
557#if (MENUBAR_MAX)
558 if (menubar_visible ())
559 XMapWindow (disp, menuBar.win);
560#endif 503#endif
561#ifdef TRANSPARENT 504#ifdef TRANSPARENT
562 if (OPTION (Opt_transparent)) 505 if (OPTION (Opt_transparent))
563 { 506 {
564 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
565 check_our_parents (); 508 check_our_parents ();
566 rootwin_ev.start (display, display->root); 509 rootwin_ev.start (display, display->root);
567 } 510 }
568#endif 511#endif
569 512
570 XMapWindow (disp, vt); 513 XMapWindow (disp, vt);
571 XMapWindow (disp, parent[0]); 514 XMapWindow (disp, parent[0]);
572 515
573 set_colorfgbg (); 516 set_colorfgbg ();
574 517
575 init_command (cmd_argv); 518 init_command (cmd_argv);
576 519
577 free (cmd_argv); 520 free (cmd_argv);
578 521
579 if (pty.pty >= 0) 522 if (pty->pty >= 0)
580 pty_ev.start (pty.pty, EVENT_READ); 523 pty_ev.start (pty->pty, EVENT_READ);
581 524
582 check_ev.start (); 525 check_ev.start ();
583 526
584 HOOK_INVOKE ((this, HOOK_START, DT_END)); 527 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
586 528
587 return true; 529 return true;
588} 530}
589 531
590static struct sig_handlers 532static struct sig_handlers
591{ 533{
592 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
593 535
594 void sig_chld (sig_watcher &w)
595 {
596 // we are being called for every SIGCHLD, find the corresponding term
597 int pid;
598
599 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
600 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
601 if (pid == (*t)->cmd_pid)
602 {
603 (*t)->child_exit ();
604 break;
605 }
606 }
607
608 /* 536 /*
609 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
610 */ 538 */
611 void 539 void
612 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
… …
618 signal (w.signum, SIG_DFL); 546 signal (w.signum, SIG_DFL);
619 kill (getpid (), w.signum); 547 kill (getpid (), w.signum);
620 } 548 }
621 549
622 sig_handlers () 550 sig_handlers ()
623 : sw_chld (this, &sig_handlers::sig_chld),
624 sw_term (this, &sig_handlers::sig_term), 551 : sw_term (this, &sig_handlers::sig_term),
625 sw_int (this, &sig_handlers::sig_term) 552 sw_int (this, &sig_handlers::sig_term)
626 { 553 {
627 } 554 }
628} sig_handlers; 555} sig_handlers;
629 556
557char **rxvt_environ; // startup environment
558
630void 559void
631rxvt_init () 560rxvt_init ()
632{ 561{
633 /* 562 uid_t uid = getuid ();
634 * Save and then give up any super-user privileges 563 gid_t gid = getgid ();
635 * If we need privileges in any area then we must specifically request it. 564
636 * We should only need to be root in these cases: 565 // before doing anything else, check for setuid/setgid operation,
637 * 1. write utmp entries on some systems 566 // start the helper process and drop privileges
638 * 2. chown tty on some systems 567 if (uid != geteuid ()
639 */ 568 || gid != getegid ())
640 rxvt_privileges (SAVE); 569 {
641 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;
642 594
643 signal (SIGHUP, SIG_IGN); 595 signal (SIGHUP, SIG_IGN);
644 signal (SIGPIPE, SIG_IGN); 596 signal (SIGPIPE, SIG_IGN);
645 597
646 sig_handlers.sw_chld.start (SIGCHLD);
647 sig_handlers.sw_term.start (SIGTERM); 598 sig_handlers.sw_term.start (SIGTERM);
648 sig_handlers.sw_int.start (SIGINT); 599 sig_handlers.sw_int.start (SIGINT);
649 600
650 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 601 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
651 /* signal (SIGURG, SIG_DFL); */ 602 /* signal (SIGURG, SIG_DFL); */
… …
691 rxvt_fatal ("memory allocation failure. aborting.\n"); 642 rxvt_fatal ("memory allocation failure. aborting.\n");
692 643
693 return p; 644 return p;
694} 645}
695 646
696/* ------------------------------------------------------------------------- *
697 * PRIVILEGED OPERATIONS *
698 * ------------------------------------------------------------------------- */
699/* take care of suid/sgid super-user (root) privileges */
700void
701rxvt_privileges (rxvt_privaction action)
702{
703#if ! defined(__CYGWIN32__)
704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
705 /* setreuid () is the poor man's setuid (), seteuid () */
706# define seteuid(a) setreuid(-1, (a))
707# define setegid(a) setregid(-1, (a))
708# define HAVE_SETEUID
709# endif
710# ifdef HAVE_SETEUID
711 switch (action)
712 {
713 case IGNORE:
714 /*
715 * change effective uid/gid - not real uid/gid - so we can switch
716 * back to root later, as required
717 */
718 setegid (getgid ());
719 seteuid (getuid ());
720 break;
721 case SAVE:
722 saved_egid = getegid ();
723 saved_euid = geteuid ();
724 break;
725 case RESTORE:
726 setegid (saved_egid);
727 seteuid (saved_euid);
728 break;
729 }
730# else
731 switch (action)
732 {
733 case IGNORE:
734 setgid (getgid ());
735 setuid (getuid ());
736 /* FALLTHROUGH */
737 case SAVE:
738 /* FALLTHROUGH */
739 case RESTORE:
740 break;
741 }
742# endif
743#endif
744}
745
746#ifdef UTMP_SUPPORT
747void
748rxvt_term::privileged_utmp (rxvt_privaction action)
749{
750 if (OPTION (Opt_utmpInhibit)
751 || !pty.name || !*pty.name)
752 return;
753
754 rxvt_privileges (RESTORE);
755
756 if (action == SAVE)
757 makeutent (pty.name, rs[Rs_display_name]);
758 else
759 cleanutent ();
760
761 rxvt_privileges (IGNORE);
762}
763#endif
764
765/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
766/* 648/*
767 * window size/position calculcations for XSizeHint and other storage. 649 * window size/position calculcations for XSizeHint and other storage.
768 * if width/height are non-zero then override calculated width/height 650 * if width/height are non-zero then override calculated width/height
769 */ 651 */
770void 652void
771rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
772{ 654{
773 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
774 int x, y, sb_w, mb_h, flags; 656 int x, y, sb_w, flags;
775 unsigned int w, h; 657 unsigned int w, h;
776 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
777 dDisp; 659 dDisp;
778 660
779 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",
… …
840 max_width = MAX_COLS * fwidth; 722 max_width = MAX_COLS * fwidth;
841 max_height = MAX_ROWS * fheight; 723 max_height = MAX_ROWS * fheight;
842 724
843 szHint.base_width = szHint.base_height = 2 * int_bwidth; 725 szHint.base_width = szHint.base_height = 2 * int_bwidth;
844 726
845 sb_w = mb_h = 0; 727 sb_w = 0;
846 window_vt_x = window_vt_y = int_bwidth; 728 window_vt_x = window_vt_y = int_bwidth;
847 729
848 if (scrollbar_visible ()) 730 if (scrollBar.state)
849 { 731 {
850 sb_w = scrollbar_TotalWidth (); 732 sb_w = scrollbar_TotalWidth ();
851 szHint.base_width += sb_w; 733 szHint.base_width += sb_w;
852 if (!OPTION (Opt_scrollBar_right)) 734 if (!OPTION (Opt_scrollBar_right))
853 window_vt_x += sb_w; 735 window_vt_x += sb_w;
854 } 736 }
855 737
856 if (menubar_visible ())
857 {
858 mb_h = menuBar_TotalHeight ();
859 szHint.base_height += mb_h;
860 window_vt_y += mb_h;
861 }
862
863 szHint.width_inc = fwidth; 738 szHint.width_inc = fwidth;
864 szHint.height_inc = fheight; 739 szHint.height_inc = fheight;
865 szHint.min_width = szHint.base_width + szHint.width_inc; 740 szHint.min_width = szHint.base_width + szHint.width_inc;
866 szHint.min_height = szHint.base_height + szHint.height_inc; 741 szHint.min_height = szHint.base_height + szHint.height_inc;
867 742
… …
885 { 760 {
886 min_it (height, max_height); 761 min_it (height, max_height);
887 szHint.height = szHint.base_height + height; 762 szHint.height = szHint.base_height + height;
888 } 763 }
889 764
890 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 765 if (scrollBar.state && OPTION (Opt_scrollBar_right))
891 window_sb_x = szHint.width - sb_w; 766 window_sb_x = szHint.width - sb_w;
892 767
893 if (recalc_x) 768 if (recalc_x)
894 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
895 if (recalc_y) 770 if (recalc_y)
… …
909 * Called after a window size change. 784 * Called after a window size change.
910 */ 785 */
911void 786void
912rxvt_term::tt_winch () 787rxvt_term::tt_winch ()
913{ 788{
914 if (pty.pty < 0) 789 if (pty->pty < 0)
915 return; 790 return;
916 791
917 struct winsize ws; 792 struct winsize ws;
918 793
919 ws.ws_col = ncol; 794 ws.ws_col = ncol;
920 ws.ws_row = nrow; 795 ws.ws_row = nrow;
921 ws.ws_xpixel = width; 796 ws.ws_xpixel = width;
922 ws.ws_ypixel = height; 797 ws.ws_ypixel = height;
923 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 798 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
924 799
925#if 0 800#if 0
926 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 801 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
927 if (cmd_pid) /* force through to the command */ 802 if (cmd_pid) /* force through to the command */
928 kill (-cmd_pid, SIGWINCH); 803 kill (-cmd_pid, SIGWINCH);
… …
1250 1125
1251 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1252 1127
1253 if (fix_screen || newwidth != old_width || newheight != old_height) 1128 if (fix_screen || newwidth != old_width || newheight != old_height)
1254 { 1129 {
1255 if (scrollbar_visible ()) 1130 if (scrollBar.state)
1256 { 1131 {
1257 XMoveResizeWindow (disp, scrollBar.win, 1132 XMoveResizeWindow (disp, scrollBar.win,
1258 window_sb_x, 0, 1133 window_sb_x, 0,
1259 scrollbar_TotalWidth (), szHint.height); 1134 scrollbar_TotalWidth (), szHint.height);
1260 resize_scrollbar (); 1135 resize_scrollbar ();
1261 } 1136 }
1262
1263 if (menubar_visible ())
1264 XMoveResizeWindow (disp, menuBar.win,
1265 window_vt_x, 0,
1266 width, menuBar_TotalHeight ());
1267 1137
1268 XMoveResizeWindow (disp, vt, 1138 XMoveResizeWindow (disp, vt,
1269 window_vt_x, window_vt_y, 1139 window_vt_x, window_vt_y,
1270 width, height); 1140 width, height);
1271 1141
… …
1456 unsigned long fg, bg; 1326 unsigned long fg, bg;
1457 const char *p; 1327 const char *p;
1458 char **s; 1328 char **s;
1459 XIMStyles *xim_styles; 1329 XIMStyles *xim_styles;
1460 1330
1461 TEMP_ENV; 1331 set_environ (envv);
1462 1332
1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1464 return false; 1334 return false;
1465 1335
1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1632 int i; 1502 int i;
1633 const char *p; 1503 const char *p;
1634 char **s; 1504 char **s;
1635 char buf[IMBUFSIZ]; 1505 char buf[IMBUFSIZ];
1636 1506
1637 SET_R (this); 1507 make_current ();
1638 1508
1639 im_destroy (); 1509 im_destroy ();
1640 1510
1641 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1642 if (Input_Context) 1512 if (Input_Context)

Diff Legend

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