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

Diff Legend

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