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

Diff Legend

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