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.185 by root, Tue Jan 17 15:17:39 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
… …
201 213
202#ifdef UTMP_SUPPORT 214#ifdef UTMP_SUPPORT
203 privileged_utmp (RESTORE); 215 privileged_utmp (RESTORE);
204#endif 216#endif
205 217
206 pty.put (); 218 delete pty; pty = 0;
207} 219}
208 220
209rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
210{ 222{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212 224
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 225 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 226
215 emergency_cleanup (); 227 emergency_cleanup ();
216 228
… …
227 239
228 selection_clear (); 240 selection_clear ();
229 241
230#ifdef USE_XIM 242#ifdef USE_XIM
231 im_destroy (); 243 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 244#endif
236#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 248#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 263#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 268#endif
260 if (gc) XFreeGC (disp, gc); 269 if (gc) XFreeGC (disp, gc);
261 270
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; 271 delete drawable;
268 // destroy all windows 272 // destroy all windows
269 if (parent[0]) 273 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 274 XDestroyWindow (disp, parent[0]);
271 } 275 }
272 276
273 // TODO: free pixcolours, colours should become part of rxvt_display 277 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 278 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 280 delete pix_colors_unfocused;
278#endif 281#endif
279 282
… …
328 im_ev.stop (display); 331 im_ev.stop (display);
329#endif 332#endif
330#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
332#endif 335#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif
336#if TRANSPARENT 336#if TRANSPARENT
337 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
338#endif 338#endif
339 incr_ev.stop (); 339 incr_ev.stop ();
340 termwin_ev.stop (display); 340 termwin_ev.stop (display);
… …
363} 363}
364 364
365void 365void
366rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
367{ 367{
368 SET_R (this); 368 make_current ();
369 369
370 delete this; 370 delete this;
371} 371}
372 372
373/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
465bool 465bool
466rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
467{ 467{
468 SET_R (this); 468 SET_R (this);
469
470 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
471 471
472 if (!init_vars ()) 472 if (!init_vars ())
473 return false; 473 return false;
474 474
475 init_secondary (); 475 init_secondary ();
… …
478 478
479#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 480 keyboard->register_done ();
481#endif 481#endif
482 482
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 486#endif
490 487
491#if ENABLE_PERL 488#if ENABLE_PERL
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext]) 492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
493 { 495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
494 rxvt_perl.init (); 509 rxvt_perl.init (this);
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
496 } 511 }
497#endif 512#endif
513
514 pty = rxvt_new_ptytty ();
498 515
499 create_windows (argc, argv); 516 create_windows (argc, argv);
500 517
501 dDisp; 518 dDisp;
502 519
503 init_xlocale (); 520 init_xlocale ();
504 521
505 scr_reset (); /* initialize screen */ 522 scr_reset (); // initialize screen
506 523
507#if 0 524#if 0
508 XSynchronize (disp, True); 525 XSynchronize (disp, True);
509#endif 526#endif
510 527
511#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
512 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
514#endif 531#endif
515#if (MENUBAR_MAX)
516 if (menubar_visible ())
517 XMapWindow (disp, menuBar.win);
518#endif
519#ifdef TRANSPARENT 532#ifdef TRANSPARENT
520 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
521 { 534 {
522 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
523 check_our_parents (); 536 check_our_parents ();
… …
532 545
533 init_command (cmd_argv); 546 init_command (cmd_argv);
534 547
535 free (cmd_argv); 548 free (cmd_argv);
536 549
550 if (pty->pty >= 0)
537 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
538 552
539 check_ev.start (); 553 check_ev.start ();
540 554
541 PERL_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
542 556
543 return true; 557 return true;
544} 558}
545 559
546static struct sig_handlers 560static struct sig_handlers
… …
581 sw_int (this, &sig_handlers::sig_term) 595 sw_int (this, &sig_handlers::sig_term)
582 { 596 {
583 } 597 }
584} sig_handlers; 598} sig_handlers;
585 599
600char **rxvt_environ; // startup environment
601
586void 602void
587rxvt_init () 603rxvt_init ()
588{ 604{
605 rxvt_environ = environ;
606
589 /* 607 /*
590 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
591 * If we need privileges in any area then we must specifically request it. 609 * If we need privileges in any area then we must specifically request it.
592 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
593 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
… …
607 /* signal (SIGURG, SIG_DFL); */ 625 /* signal (SIGURG, SIG_DFL); */
608 626
609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
610 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
611 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
630
631 XrmInitialize ();
612} 632}
613 633
614/* ------------------------------------------------------------------------- * 634/* ------------------------------------------------------------------------- *
615 * MEMORY ALLOCATION WRAPPERS * 635 * MEMORY ALLOCATION WRAPPERS *
616 * ------------------------------------------------------------------------- */ 636 * ------------------------------------------------------------------------- */
… …
652 * ------------------------------------------------------------------------- */ 672 * ------------------------------------------------------------------------- */
653/* take care of suid/sgid super-user (root) privileges */ 673/* take care of suid/sgid super-user (root) privileges */
654void 674void
655rxvt_privileges (rxvt_privaction action) 675rxvt_privileges (rxvt_privaction action)
656{ 676{
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__) 677#if ! defined(__CYGWIN32__)
663# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
664 /* setreuid () is the poor man's setuid (), seteuid () */ 679 /* setreuid () is the poor man's setuid (), seteuid () */
665# define seteuid(a) setreuid(-1, (a)) 680# define seteuid(a) setreuid(-1, (a))
666# define setegid(a) setregid(-1, (a)) 681# define setegid(a) setregid(-1, (a))
… …
672 case IGNORE: 687 case IGNORE:
673 /* 688 /*
674 * change effective uid/gid - not real uid/gid - so we can switch 689 * change effective uid/gid - not real uid/gid - so we can switch
675 * back to root later, as required 690 * back to root later, as required
676 */ 691 */
692 setegid (getgid ());
677 seteuid (getuid ()); 693 seteuid (getuid ());
678 setegid (getgid ());
679 break; 694 break;
680 case SAVE: 695 case SAVE:
681 euid = geteuid ();
682 egid = getegid (); 696 saved_egid = getegid ();
697 saved_euid = geteuid ();
683 break; 698 break;
684 case RESTORE: 699 case RESTORE:
685 seteuid (euid);
686 setegid (egid); 700 setegid (saved_egid);
701 seteuid (saved_euid);
687 break; 702 break;
688 } 703 }
689# else 704# else
690 switch (action) 705 switch (action)
691 { 706 {
692 case IGNORE: 707 case IGNORE:
708 setgid (getgid ());
693 setuid (getuid ()); 709 setuid (getuid ());
694 setgid (getgid ());
695 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
696 case SAVE: 711 case SAVE:
697 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
698 case RESTORE: 713 case RESTORE:
699 break; 714 break;
700 } 715 }
701# endif 716# endif
702#endif 717#endif
703} 718}
704 719
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/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
725/* 721/*
726 * window size/position calculcations for XSizeHint and other storage. 722 * window size/position calculcations for XSizeHint and other storage.
727 * if width/height are non-zero then override calculated width/height 723 * if width/height are non-zero then override calculated width/height
728 */ 724 */
729void 725void
730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 726rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
731{ 727{
732 short recalc_x, recalc_y; 728 short recalc_x, recalc_y;
733 int x, y, sb_w, mb_h, flags; 729 int x, y, sb_w, flags;
734 unsigned int w, h; 730 unsigned int w, h;
735 unsigned int max_width, max_height; 731 unsigned int max_width, max_height;
736 dDisp; 732 dDisp;
737 733
738 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
799 max_width = MAX_COLS * fwidth; 795 max_width = MAX_COLS * fwidth;
800 max_height = MAX_ROWS * fheight; 796 max_height = MAX_ROWS * fheight;
801 797
802 szHint.base_width = szHint.base_height = 2 * int_bwidth; 798 szHint.base_width = szHint.base_height = 2 * int_bwidth;
803 799
804 sb_w = mb_h = 0; 800 sb_w = 0;
805 window_vt_x = window_vt_y = int_bwidth; 801 window_vt_x = window_vt_y = int_bwidth;
806 802
807 if (scrollbar_visible ()) 803 if (scrollBar.state)
808 { 804 {
809 sb_w = scrollbar_TotalWidth (); 805 sb_w = scrollbar_TotalWidth ();
810 szHint.base_width += sb_w; 806 szHint.base_width += sb_w;
811 if (!OPTION (Opt_scrollBar_right)) 807 if (!OPTION (Opt_scrollBar_right))
812 window_vt_x += sb_w; 808 window_vt_x += sb_w;
813 } 809 }
814 810
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; 811 szHint.width_inc = fwidth;
823 szHint.height_inc = fheight; 812 szHint.height_inc = fheight;
824 szHint.min_width = szHint.base_width + szHint.width_inc; 813 szHint.min_width = szHint.base_width + szHint.width_inc;
825 szHint.min_height = szHint.base_height + szHint.height_inc; 814 szHint.min_height = szHint.base_height + szHint.height_inc;
826 815
… …
844 { 833 {
845 min_it (height, max_height); 834 min_it (height, max_height);
846 szHint.height = szHint.base_height + height; 835 szHint.height = szHint.base_height + height;
847 } 836 }
848 837
849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 838 if (scrollBar.state && OPTION (Opt_scrollBar_right))
850 window_sb_x = szHint.width - sb_w; 839 window_sb_x = szHint.width - sb_w;
851 840
852 if (recalc_x) 841 if (recalc_x)
853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
854 if (recalc_y) 843 if (recalc_y)
… …
868 * Called after a window size change. 857 * Called after a window size change.
869 */ 858 */
870void 859void
871rxvt_term::tt_winch () 860rxvt_term::tt_winch ()
872{ 861{
873 if (pty.pty < 0) 862 if (pty->pty < 0)
874 return; 863 return;
875 864
876 struct winsize ws; 865 struct winsize ws;
877 866
878 ws.ws_col = ncol; 867 ws.ws_col = ncol;
879 ws.ws_row = nrow; 868 ws.ws_row = nrow;
880 ws.ws_xpixel = width; 869 ws.ws_xpixel = width;
881 ws.ws_ypixel = height; 870 ws.ws_ypixel = height;
882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 871 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
883 872
884#if 0 873#if 0
885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 874 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
886 if (cmd_pid) /* force through to the command */ 875 if (cmd_pid) /* force through to the command */
887 kill (-cmd_pid, SIGWINCH); 876 kill (-cmd_pid, SIGWINCH);
… …
1024 i = atoi (color); 1013 i = atoi (color);
1025 1014
1026 if (i >= 8 && i <= 15) 1015 if (i >= 8 && i <= 15)
1027 { /* bright colors */ 1016 { /* bright colors */
1028 i -= 8; 1017 i -= 8;
1029# ifndef NO_BRIGHTCOLOR
1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1031 SET_PIXCOLOR (idx); 1019 SET_PIXCOLOR (idx);
1032 goto done; 1020 goto done;
1033# endif
1034 } 1021 }
1035 1022
1036 if (i >= 0 && i <= 7) 1023 if (i >= 0 && i <= 7)
1037 { /* normal colors */ 1024 { /* normal colors */
1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1211 1198
1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1213 1200
1214 if (fix_screen || newwidth != old_width || newheight != old_height) 1201 if (fix_screen || newwidth != old_width || newheight != old_height)
1215 { 1202 {
1216 if (scrollbar_visible ()) 1203 if (scrollBar.state)
1217 { 1204 {
1218 XMoveResizeWindow (disp, scrollBar.win, 1205 XMoveResizeWindow (disp, scrollBar.win,
1219 window_sb_x, 0, 1206 window_sb_x, 0,
1220 scrollbar_TotalWidth (), szHint.height); 1207 scrollbar_TotalWidth (), szHint.height);
1221 resize_scrollbar (); 1208 resize_scrollbar ();
1222 } 1209 }
1223 1210
1224 if (menubar_visible ())
1225 XMoveResizeWindow (disp, menuBar.win,
1226 window_vt_x, 0,
1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
1228
1229 XMoveResizeWindow (disp, vt, 1211 XMoveResizeWindow (disp, vt,
1230 window_vt_x, window_vt_y, 1212 window_vt_x, window_vt_y,
1231 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1213 width, height);
1232 1214
1233 scr_clear (); 1215 scr_clear ();
1234#ifdef XPM_BACKGROUND 1216#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1217 resize_pixmap ();
1236#endif 1218#endif
… …
1416 XRectangle rect, status_rect, needed_rect; 1398 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1399 unsigned long fg, bg;
1418 const char *p; 1400 const char *p;
1419 char **s; 1401 char **s;
1420 XIMStyles *xim_styles; 1402 XIMStyles *xim_styles;
1403
1404 set_environ (envv);
1421 1405
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1407 return false;
1424 1408
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1591 int i; 1575 int i;
1592 const char *p; 1576 const char *p;
1593 char **s; 1577 char **s;
1594 char buf[IMBUFSIZ]; 1578 char buf[IMBUFSIZ];
1595 1579
1596 SET_R (this); 1580 make_current ();
1597 1581
1598 im_destroy (); 1582 im_destroy ();
1599 1583
1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601 if (Input_Context) 1585 if (Input_Context)

Diff Legend

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