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.158 by root, Tue Jan 3 23:40:58 2006 UTC vs.
Revision 1.186 by root, Tue Jan 17 15:41:33 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128], savelocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
… …
61 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
63 return true; 78 return true;
64} 79}
65 80
66bool 81void
67rxvt_push_locale (const char *locale) 82rxvt_push_locale (const char *locale)
68{ 83{
69 strcpy (savelocale, curlocale); 84 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 85 rxvt_set_locale (locale);
71} 86}
… …
145#if TRANSPARENT 160#if TRANSPARENT
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 162#endif
148#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif 165#endif
154#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 168#endif
157#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
197void rxvt_term::emergency_cleanup () 209void rxvt_term::emergency_cleanup ()
198{ 210{
199 if (cmd_pid) 211 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
201 213
202#ifdef UTMP_SUPPORT 214 delete pty; pty = 0;
203 privileged_utmp (RESTORE);
204#endif
205
206 pty.put ();
207} 215}
208 216
209rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
210{ 218{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212 220
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 221 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 222
215 emergency_cleanup (); 223 emergency_cleanup ();
216 224
… …
227 235
228 selection_clear (); 236 selection_clear ();
229 237
230#ifdef USE_XIM 238#ifdef USE_XIM
231 im_destroy (); 239 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 240#endif
236#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 244#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 259#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 264#endif
260 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (disp, gc);
261 266
262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263 delete menuBar.drawable;
264 //if (menuBar.win)
265 // XDestroyWindow (disp, menuBar.win);
266#endif
267 delete drawable; 267 delete drawable;
268 // destroy all windows 268 // destroy all windows
269 if (parent[0]) 269 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (disp, parent[0]);
271 } 271 }
272 272
273 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 274 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 275#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 276 delete pix_colors_unfocused;
278#endif 277#endif
279 278
… …
328 im_ev.stop (display); 327 im_ev.stop (display);
329#endif 328#endif
330#if HAVE_SCROLLBARS 329#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
332#endif 331#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT 332#if TRANSPARENT
337 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
338#endif 334#endif
339 incr_ev.stop (); 335 incr_ev.stop ();
340 termwin_ev.stop (display); 336 termwin_ev.stop (display);
… …
363} 359}
364 360
365void 361void
366rxvt_term::destroy_cb (time_watcher &w) 362rxvt_term::destroy_cb (time_watcher &w)
367{ 363{
368 SET_R (this); 364 make_current ();
369 365
370 delete this; 366 delete this;
371} 367}
372 368
373/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 460/*----------------------------------------------------------------------*/
465bool 461bool
466rxvt_term::init (int argc, const char *const *argv) 462rxvt_term::init (int argc, const char *const *argv)
467{ 463{
468 SET_R (this); 464 SET_R (this);
469
470 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
471 467
472 if (!init_vars ()) 468 if (!init_vars ())
473 return false; 469 return false;
474 470
475 init_secondary (); 471 init_secondary ();
… …
478 474
479#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 476 keyboard->register_done ();
481#endif 477#endif
482 478
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 482#endif
490 483
491#if ENABLE_PERL 484#if ENABLE_PERL
485 if (!rs[Rs_perl_ext_1])
486 rs[Rs_perl_ext_1] = "default";
487
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext]) 488 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
493 { 491 {
492#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493 // ignore some perl-related arguments if some bozo installed us set[ug]id
494 if (rxvt_tainted ())
495 {
496 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500 rs[Rs_perl_lib] = 0;
501 rs[Rs_perl_eval] = 0;
502 }
503 }
504#endif
494 rxvt_perl.init (); 505 rxvt_perl.init (this);
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
496 } 507 }
497#endif 508#endif
509
510 pty = rxvt_new_ptytty ();
498 511
499 create_windows (argc, argv); 512 create_windows (argc, argv);
500 513
501 dDisp; 514 dDisp;
502 515
503 init_xlocale (); 516 init_xlocale ();
504 517
505 scr_reset (); /* initialize screen */ 518 scr_reset (); // initialize screen
506 519
507#if 0 520#if 0
508 XSynchronize (disp, True); 521 XSynchronize (disp, True);
509#endif 522#endif
510 523
511#ifdef HAVE_SCROLLBARS 524#ifdef HAVE_SCROLLBARS
512 if (OPTION (Opt_scrollBar)) 525 if (OPTION (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */ 526 resize_scrollbar (); /* create and map scrollbar */
514#endif 527#endif
515#if (MENUBAR_MAX)
516 if (menubar_visible ())
517 XMapWindow (disp, menuBar.win);
518#endif
519#ifdef TRANSPARENT 528#ifdef TRANSPARENT
520 if (OPTION (Opt_transparent)) 529 if (OPTION (Opt_transparent))
521 { 530 {
522 XSelectInput (disp, display->root, PropertyChangeMask); 531 XSelectInput (disp, display->root, PropertyChangeMask);
523 check_our_parents (); 532 check_our_parents ();
… …
532 541
533 init_command (cmd_argv); 542 init_command (cmd_argv);
534 543
535 free (cmd_argv); 544 free (cmd_argv);
536 545
546 if (pty->pty >= 0)
537 pty_ev.start (pty.pty, EVENT_READ); 547 pty_ev.start (pty->pty, EVENT_READ);
538 548
539 check_ev.start (); 549 check_ev.start ();
540 550
541 PERL_INVOKE ((this, HOOK_START, DT_END)); 551 HOOK_INVOKE ((this, HOOK_START, DT_END));
542 552
543 return true; 553 return true;
544} 554}
545 555
546static struct sig_handlers 556static struct sig_handlers
… …
581 sw_int (this, &sig_handlers::sig_term) 591 sw_int (this, &sig_handlers::sig_term)
582 { 592 {
583 } 593 }
584} sig_handlers; 594} sig_handlers;
585 595
596char **rxvt_environ; // startup environment
597
586void 598void
587rxvt_init () 599rxvt_init ()
588{ 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
589 /* 635 /*
590 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
591 * 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.
592 * We should only need to be root in these cases: 638 * We should only need to be root in these cases:
593 * 1. write utmp entries on some systems 639 * 1. write utmp entries on some systems
… …
607 /* signal (SIGURG, SIG_DFL); */ 653 /* signal (SIGURG, SIG_DFL); */
608 654
609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
610 // TODO: handle this with exceptions and tolerate the memory loss 656 // TODO: handle this with exceptions and tolerate the memory loss
611 XSetIOErrorHandler (rxvt_xioerror_handler); 657 XSetIOErrorHandler (rxvt_xioerror_handler);
658
659 XrmInitialize ();
612} 660}
613 661
614/* ------------------------------------------------------------------------- * 662/* ------------------------------------------------------------------------- *
615 * MEMORY ALLOCATION WRAPPERS * 663 * MEMORY ALLOCATION WRAPPERS *
616 * ------------------------------------------------------------------------- */ 664 * ------------------------------------------------------------------------- */
… …
652 * ------------------------------------------------------------------------- */ 700 * ------------------------------------------------------------------------- */
653/* take care of suid/sgid super-user (root) privileges */ 701/* take care of suid/sgid super-user (root) privileges */
654void 702void
655rxvt_privileges (rxvt_privaction action) 703rxvt_privileges (rxvt_privaction action)
656{ 704{
657#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
658 static uid_t euid;
659 static gid_t egid;
660#endif
661
662#if ! defined(__CYGWIN32__) 705#if ! defined(__CYGWIN32__)
663# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
664 /* setreuid () is the poor man's setuid (), seteuid () */ 707 /* setreuid () is the poor man's setuid (), seteuid () */
665# define seteuid(a) setreuid(-1, (a)) 708# define seteuid(a) setreuid(-1, (a))
666# define setegid(a) setregid(-1, (a)) 709# define setegid(a) setregid(-1, (a))
… …
672 case IGNORE: 715 case IGNORE:
673 /* 716 /*
674 * 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
675 * back to root later, as required 718 * back to root later, as required
676 */ 719 */
720 setegid (getgid ());
677 seteuid (getuid ()); 721 seteuid (getuid ());
678 setegid (getgid ());
679 break; 722 break;
680 case SAVE: 723 case SAVE:
681 euid = geteuid ();
682 egid = getegid (); 724 saved_egid = getegid ();
725 saved_euid = geteuid ();
683 break; 726 break;
684 case RESTORE: 727 case RESTORE:
685 seteuid (euid);
686 setegid (egid); 728 setegid (saved_egid);
729 seteuid (saved_euid);
687 break; 730 break;
688 } 731 }
689# else 732# else
690 switch (action) 733 switch (action)
691 { 734 {
692 case IGNORE: 735 case IGNORE:
736 setgid (getgid ());
693 setuid (getuid ()); 737 setuid (getuid ());
694 setgid (getgid ());
695 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
696 case SAVE: 739 case SAVE:
697 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
698 case RESTORE: 741 case RESTORE:
699 break; 742 break;
700 } 743 }
701# endif 744# endif
702#endif 745#endif
703} 746}
704 747
705#ifdef UTMP_SUPPORT
706void
707rxvt_term::privileged_utmp (rxvt_privaction action)
708{
709 if (OPTION (Opt_utmpInhibit)
710 || !pty.name || !*pty.name)
711 return;
712
713 rxvt_privileges (RESTORE);
714
715 if (action == SAVE)
716 makeutent (pty.name, rs[Rs_display_name]);
717 else
718 cleanutent ();
719
720 rxvt_privileges (IGNORE);
721}
722#endif
723
724/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
725/* 749/*
726 * window size/position calculcations for XSizeHint and other storage. 750 * window size/position calculcations for XSizeHint and other storage.
727 * if width/height are non-zero then override calculated width/height 751 * if width/height are non-zero then override calculated width/height
728 */ 752 */
729void 753void
730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
731{ 755{
732 short recalc_x, recalc_y; 756 short recalc_x, recalc_y;
733 int x, y, sb_w, mb_h, flags; 757 int x, y, sb_w, flags;
734 unsigned int w, h; 758 unsigned int w, h;
735 unsigned int max_width, max_height; 759 unsigned int max_width, max_height;
736 dDisp; 760 dDisp;
737 761
738 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",
… …
799 max_width = MAX_COLS * fwidth; 823 max_width = MAX_COLS * fwidth;
800 max_height = MAX_ROWS * fheight; 824 max_height = MAX_ROWS * fheight;
801 825
802 szHint.base_width = szHint.base_height = 2 * int_bwidth; 826 szHint.base_width = szHint.base_height = 2 * int_bwidth;
803 827
804 sb_w = mb_h = 0; 828 sb_w = 0;
805 window_vt_x = window_vt_y = int_bwidth; 829 window_vt_x = window_vt_y = int_bwidth;
806 830
807 if (scrollbar_visible ()) 831 if (scrollBar.state)
808 { 832 {
809 sb_w = scrollbar_TotalWidth (); 833 sb_w = scrollbar_TotalWidth ();
810 szHint.base_width += sb_w; 834 szHint.base_width += sb_w;
811 if (!OPTION (Opt_scrollBar_right)) 835 if (!OPTION (Opt_scrollBar_right))
812 window_vt_x += sb_w; 836 window_vt_x += sb_w;
813 } 837 }
814 838
815 if (menubar_visible ())
816 {
817 mb_h = menuBar_TotalHeight ();
818 szHint.base_height += mb_h;
819 window_vt_y += mb_h;
820 }
821
822 szHint.width_inc = fwidth; 839 szHint.width_inc = fwidth;
823 szHint.height_inc = fheight; 840 szHint.height_inc = fheight;
824 szHint.min_width = szHint.base_width + szHint.width_inc; 841 szHint.min_width = szHint.base_width + szHint.width_inc;
825 szHint.min_height = szHint.base_height + szHint.height_inc; 842 szHint.min_height = szHint.base_height + szHint.height_inc;
826 843
… …
844 { 861 {
845 min_it (height, max_height); 862 min_it (height, max_height);
846 szHint.height = szHint.base_height + height; 863 szHint.height = szHint.base_height + height;
847 } 864 }
848 865
849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
850 window_sb_x = szHint.width - sb_w; 867 window_sb_x = szHint.width - sb_w;
851 868
852 if (recalc_x) 869 if (recalc_x)
853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
854 if (recalc_y) 871 if (recalc_y)
… …
868 * Called after a window size change. 885 * Called after a window size change.
869 */ 886 */
870void 887void
871rxvt_term::tt_winch () 888rxvt_term::tt_winch ()
872{ 889{
873 if (pty.pty < 0) 890 if (pty->pty < 0)
874 return; 891 return;
875 892
876 struct winsize ws; 893 struct winsize ws;
877 894
878 ws.ws_col = ncol; 895 ws.ws_col = ncol;
879 ws.ws_row = nrow; 896 ws.ws_row = nrow;
880 ws.ws_xpixel = width; 897 ws.ws_xpixel = width;
881 ws.ws_ypixel = height; 898 ws.ws_ypixel = height;
882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
883 900
884#if 0 901#if 0
885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
886 if (cmd_pid) /* force through to the command */ 903 if (cmd_pid) /* force through to the command */
887 kill (-cmd_pid, SIGWINCH); 904 kill (-cmd_pid, SIGWINCH);
… …
1024 i = atoi (color); 1041 i = atoi (color);
1025 1042
1026 if (i >= 8 && i <= 15) 1043 if (i >= 8 && i <= 15)
1027 { /* bright colors */ 1044 { /* bright colors */
1028 i -= 8; 1045 i -= 8;
1029# ifndef NO_BRIGHTCOLOR
1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1046 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1031 SET_PIXCOLOR (idx); 1047 SET_PIXCOLOR (idx);
1032 goto done; 1048 goto done;
1033# endif
1034 } 1049 }
1035 1050
1036 if (i >= 0 && i <= 7) 1051 if (i >= 0 && i <= 7)
1037 { /* normal colors */ 1052 { /* normal colors */
1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1053 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1211 1226
1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1213 1228
1214 if (fix_screen || newwidth != old_width || newheight != old_height) 1229 if (fix_screen || newwidth != old_width || newheight != old_height)
1215 { 1230 {
1216 if (scrollbar_visible ()) 1231 if (scrollBar.state)
1217 { 1232 {
1218 XMoveResizeWindow (disp, scrollBar.win, 1233 XMoveResizeWindow (disp, scrollBar.win,
1219 window_sb_x, 0, 1234 window_sb_x, 0,
1220 scrollbar_TotalWidth (), szHint.height); 1235 scrollbar_TotalWidth (), szHint.height);
1221 resize_scrollbar (); 1236 resize_scrollbar ();
1222 } 1237 }
1223 1238
1224 if (menubar_visible ())
1225 XMoveResizeWindow (disp, menuBar.win,
1226 window_vt_x, 0,
1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
1228
1229 XMoveResizeWindow (disp, vt, 1239 XMoveResizeWindow (disp, vt,
1230 window_vt_x, window_vt_y, 1240 window_vt_x, window_vt_y,
1231 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1241 width, height);
1232 1242
1233 scr_clear (); 1243 scr_clear ();
1234#ifdef XPM_BACKGROUND 1244#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1245 resize_pixmap ();
1236#endif 1246#endif
… …
1416 XRectangle rect, status_rect, needed_rect; 1426 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1427 unsigned long fg, bg;
1418 const char *p; 1428 const char *p;
1419 char **s; 1429 char **s;
1420 XIMStyles *xim_styles; 1430 XIMStyles *xim_styles;
1431
1432 set_environ (envv);
1421 1433
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1435 return false;
1424 1436
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1591 int i; 1603 int i;
1592 const char *p; 1604 const char *p;
1593 char **s; 1605 char **s;
1594 char buf[IMBUFSIZ]; 1606 char buf[IMBUFSIZ];
1595 1607
1596 SET_R (this); 1608 make_current ();
1597 1609
1598 im_destroy (); 1610 im_destroy ();
1599 1611
1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601 if (Input_Context) 1613 if (Input_Context)

Diff Legend

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