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.152 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.180 by root, Mon Jan 16 15:00:20 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
… …
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
50# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
51#endif 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}
52 65
53vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
54 67
55static char curlocale[128]; 68static char curlocale[128], savelocale[128];
56 69
57bool 70bool
58rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
59{ 72{
60 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 74 return false;
62 75
63 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
65 return true; 78 return true;
79}
80
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
66} 92}
67 93
68#if ENABLE_COMBINING 94#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
70 96
… …
134#if TRANSPARENT 160#if TRANSPARENT
135 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
136#endif 162#endif
137#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
138 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
139#endif
140#ifdef MENUBAR
141 menubar_ev (this, &rxvt_term::x_cb),
142#endif 165#endif
143#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
144 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145#endif 168#endif
146#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
195 pty.put (); 218 pty.put ();
196} 219}
197 220
198rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
199{ 222{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 225 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 226
202 emergency_cleanup (); 227 emergency_cleanup ();
203 228
204#if ENABLE_STYLES 229#if ENABLE_STYLES
… …
214 239
215 selection_clear (); 240 selection_clear ();
216 241
217#ifdef USE_XIM 242#ifdef USE_XIM
218 im_destroy (); 243 im_destroy ();
219#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif 244#endif
223#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
226#endif 248#endif
… …
237 if (upArrow) XFreePixmap (disp, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
241#endif 263#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246#endif 268#endif
247 if (gc) XFreeGC (disp, gc); 269 if (gc) XFreeGC (disp, gc);
248 270
249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250 delete menuBar.drawable;
251 //if (menuBar.win)
252 // XDestroyWindow (disp, menuBar.win);
253#endif
254 delete drawable; 271 delete drawable;
255 // destroy all windows 272 // destroy all windows
256 if (parent[0]) 273 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 274 XDestroyWindow (disp, parent[0]);
258 } 275 }
259 276
260 // TODO: free pixcolours, colours should become part of rxvt_display 277 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 278 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 280 delete pix_colors_unfocused;
265#endif 281#endif
266 282
… …
293void 309void
294rxvt_term::child_exit () 310rxvt_term::child_exit ()
295{ 311{
296 cmd_pid = 0; 312 cmd_pid = 0;
297 313
298 if (!(options & Opt_hold)) 314 if (!OPTION (Opt_hold))
299 destroy (); 315 destroy ();
300} 316}
301 317
302void 318void
303rxvt_term::destroy () 319rxvt_term::destroy ()
… …
314#if USE_XIM 330#if USE_XIM
315 im_ev.stop (display); 331 im_ev.stop (display);
316#endif 332#endif
317#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
319#endif
320#if MENUBAR
321 menubar_ev.stop (display);
322#endif 335#endif
323#if TRANSPARENT 336#if TRANSPARENT
324 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
325#endif 338#endif
326 incr_ev.stop (); 339 incr_ev.stop ();
… …
350} 363}
351 364
352void 365void
353rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
354{ 367{
355 SET_R (this); 368 make_current ();
356 369
357 delete this; 370 delete this;
358} 371}
359 372
360/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
451/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
452bool 465bool
453rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
454{ 467{
455 SET_R (this); 468 SET_R (this);
456
457 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
458 471
459 if (!init_vars ()) 472 if (!init_vars ())
460 return false; 473 return false;
461 474
462 init_secondary (); 475 init_secondary ();
… …
465 478
466#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 480 keyboard->register_done ();
468#endif 481#endif
469 482
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
474 if (options & Opt_scrollBar) 484 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 486#endif
477 487
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_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]))
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
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513
478 create_windows (argc, argv); 514 create_windows (argc, argv);
479 515
480 dDisp; 516 dDisp;
481 517
482 init_xlocale (); 518 init_xlocale ();
483 519
484 scr_reset (); /* initialize screen */ 520 scr_reset (); // initialize screen
485 521
486#if 0 522#if 0
487 XSynchronize (disp, True); 523 XSynchronize (disp, True);
488#endif 524#endif
489 525
490#ifdef HAVE_SCROLLBARS 526#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 527 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 528 resize_scrollbar (); /* create and map scrollbar */
493#endif 529#endif
494#if (MENUBAR_MAX)
495 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win);
497#endif
498#ifdef TRANSPARENT 530#ifdef TRANSPARENT
499 if (options & Opt_transparent) 531 if (OPTION (Opt_transparent))
500 { 532 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (disp, display->root, PropertyChangeMask);
502 check_our_parents (); 534 check_our_parents ();
503 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
504 } 536 }
… …
511 543
512 init_command (cmd_argv); 544 init_command (cmd_argv);
513 545
514 free (cmd_argv); 546 free (cmd_argv);
515 547
548 if (pty.pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 549 pty_ev.start (pty.pty, EVENT_READ);
517 550
518 check_ev.start (); 551 check_ev.start ();
552
553 HOOK_INVOKE ((this, HOOK_START, DT_END));
519 554
520 return true; 555 return true;
521} 556}
522 557
523static struct sig_handlers 558static struct sig_handlers
… …
558 sw_int (this, &sig_handlers::sig_term) 593 sw_int (this, &sig_handlers::sig_term)
559 { 594 {
560 } 595 }
561} sig_handlers; 596} sig_handlers;
562 597
598char **rxvt_environ; // startup environment
599
563void 600void
564rxvt_init () 601rxvt_init ()
565{ 602{
603 rxvt_environ = environ;
604
566 /* 605 /*
567 * Save and then give up any super-user privileges 606 * Save and then give up any super-user privileges
568 * If we need privileges in any area then we must specifically request it. 607 * If we need privileges in any area then we must specifically request it.
569 * We should only need to be root in these cases: 608 * We should only need to be root in these cases:
570 * 1. write utmp entries on some systems 609 * 1. write utmp entries on some systems
… …
584 /* signal (SIGURG, SIG_DFL); */ 623 /* signal (SIGURG, SIG_DFL); */
585 624
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 625 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 626 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 627 XSetIOErrorHandler (rxvt_xioerror_handler);
628
629 XrmInitialize ();
589} 630}
590 631
591/* ------------------------------------------------------------------------- * 632/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 633 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 634 * ------------------------------------------------------------------------- */
… …
629 * ------------------------------------------------------------------------- */ 670 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */ 671/* take care of suid/sgid super-user (root) privileges */
631void 672void
632rxvt_privileges (rxvt_privaction action) 673rxvt_privileges (rxvt_privaction action)
633{ 674{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__) 675#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */ 677 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a)) 678# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a)) 679# define setegid(a) setregid(-1, (a))
… …
649 case IGNORE: 685 case IGNORE:
650 /* 686 /*
651 * change effective uid/gid - not real uid/gid - so we can switch 687 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required 688 * back to root later, as required
653 */ 689 */
690 setegid (getgid ());
654 seteuid (getuid ()); 691 seteuid (getuid ());
655 setegid (getgid ());
656 break; 692 break;
657 case SAVE: 693 case SAVE:
658 euid = geteuid ();
659 egid = getegid (); 694 saved_egid = getegid ();
695 saved_euid = geteuid ();
660 break; 696 break;
661 case RESTORE: 697 case RESTORE:
662 seteuid (euid);
663 setegid (egid); 698 setegid (saved_egid);
699 seteuid (saved_euid);
664 break; 700 break;
665 } 701 }
666# else 702# else
667 switch (action) 703 switch (action)
668 { 704 {
669 case IGNORE: 705 case IGNORE:
706 setgid (getgid ());
670 setuid (getuid ()); 707 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */ 708 /* FALLTHROUGH */
673 case SAVE: 709 case SAVE:
674 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
675 case RESTORE: 711 case RESTORE:
676 break; 712 break;
… …
681 717
682#ifdef UTMP_SUPPORT 718#ifdef UTMP_SUPPORT
683void 719void
684rxvt_term::privileged_utmp (rxvt_privaction action) 720rxvt_term::privileged_utmp (rxvt_privaction action)
685{ 721{
686 if ((options & Opt_utmpInhibit) 722 if (OPTION (Opt_utmpInhibit)
687 || !pty.name || !*pty.name) 723 || !pty.name || !*pty.name)
688 return; 724 return;
689 725
690 rxvt_privileges (RESTORE); 726 rxvt_privileges (RESTORE);
691 727
… …
705 */ 741 */
706void 742void
707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708{ 744{
709 short recalc_x, recalc_y; 745 short recalc_x, recalc_y;
710 int x, y, sb_w, mb_h, flags; 746 int x, y, sb_w, flags;
711 unsigned int w, h; 747 unsigned int w, h;
712 unsigned int max_width, max_height; 748 unsigned int max_width, max_height;
713 dDisp; 749 dDisp;
714 750
715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
776 max_width = MAX_COLS * fwidth; 812 max_width = MAX_COLS * fwidth;
777 max_height = MAX_ROWS * fheight; 813 max_height = MAX_ROWS * fheight;
778 814
779 szHint.base_width = szHint.base_height = 2 * int_bwidth; 815 szHint.base_width = szHint.base_height = 2 * int_bwidth;
780 816
781 sb_w = mb_h = 0; 817 sb_w = 0;
782 window_vt_x = window_vt_y = int_bwidth; 818 window_vt_x = window_vt_y = int_bwidth;
783 819
784 if (scrollbar_visible ()) 820 if (scrollBar.state)
785 { 821 {
786 sb_w = scrollbar_TotalWidth (); 822 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 823 szHint.base_width += sb_w;
788 if (!(options & Opt_scrollBar_right)) 824 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 825 window_vt_x += sb_w;
790 }
791
792 if (menubar_visible ())
793 {
794 mb_h = menuBar_TotalHeight ();
795 szHint.base_height += mb_h;
796 window_vt_y += mb_h;
797 } 826 }
798 827
799 szHint.width_inc = fwidth; 828 szHint.width_inc = fwidth;
800 szHint.height_inc = fheight; 829 szHint.height_inc = fheight;
801 szHint.min_width = szHint.base_width + szHint.width_inc; 830 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
821 { 850 {
822 min_it (height, max_height); 851 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 852 szHint.height = szHint.base_height + height;
824 } 853 }
825 854
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 855 if (scrollBar.state && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 856 window_sb_x = szHint.width - sb_w;
828 857
829 if (recalc_x) 858 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831 if (recalc_y) 860 if (recalc_y)
… …
900 prop.height += lineSpace; 929 prop.height += lineSpace;
901 fs->set_prop (prop); 930 fs->set_prop (prop);
902 931
903 fwidth = prop.width; 932 fwidth = prop.width;
904 fheight = prop.height; 933 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 934 fbase = prop.ascent;
906 935
907 for (int style = 1; style < 4; style++) 936 for (int style = 1; style < 4; style++)
908 { 937 {
909#if ENABLE_STYLES 938#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 939 const char *res = rs[Rs_font + style];
… …
944 return true; 973 return true;
945} 974}
946 975
947void rxvt_term::set_string_property (Atom prop, const char *str, int len) 976void rxvt_term::set_string_property (Atom prop, const char *str, int len)
948{ 977{
949 // TODO: SMART_WINDOW_TITLE
950 XChangeProperty (display->display, parent[0], 978 XChangeProperty (display->display, parent[0],
951 prop, XA_STRING, 8, PropModeReplace, 979 prop, XA_STRING, 8, PropModeReplace,
952 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 980 (const unsigned char *)str, len >= 0 ? len : strlen (str));
953} 981}
954 982
955void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 983void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
956{ 984{
957 // TODO: SMART_WINDOW_TITLE
958 wchar_t *ws = rxvt_mbstowcs (str, len); 985 wchar_t *ws = rxvt_mbstowcs (str, len);
959 char *s = rxvt_wcstoutf8 (ws); 986 char *s = rxvt_wcstoutf8 (ws);
960 987
961 XChangeProperty (display->display, parent[0], 988 XChangeProperty (display->display, parent[0],
962 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 989 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
1003 i = atoi (color); 1030 i = atoi (color);
1004 1031
1005 if (i >= 8 && i <= 15) 1032 if (i >= 8 && i <= 15)
1006 { /* bright colors */ 1033 { /* bright colors */
1007 i -= 8; 1034 i -= 8;
1008# ifndef NO_BRIGHTCOLOR
1009 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1010 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
1011 goto done; 1037 goto done;
1012# endif
1013 } 1038 }
1014 1039
1015 if (i >= 0 && i <= 7) 1040 if (i >= 0 && i <= 7)
1016 { /* normal colors */ 1041 { /* normal colors */
1017 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1190 1215
1191 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1192 1217
1193 if (fix_screen || newwidth != old_width || newheight != old_height) 1218 if (fix_screen || newwidth != old_width || newheight != old_height)
1194 { 1219 {
1195 if (scrollbar_visible ()) 1220 if (scrollBar.state)
1196 { 1221 {
1197 XMoveResizeWindow (disp, scrollBar.win, 1222 XMoveResizeWindow (disp, scrollBar.win,
1198 window_sb_x, 0, 1223 window_sb_x, 0,
1199 scrollbar_TotalWidth (), szHint.height); 1224 scrollbar_TotalWidth (), szHint.height);
1200 resize_scrollbar (); 1225 resize_scrollbar ();
1201 } 1226 }
1202 1227
1203 if (menubar_visible ())
1204 XMoveResizeWindow (disp, menuBar.win,
1205 window_vt_x, 0,
1206 TermWin_TotalWidth (), menuBar_TotalHeight ());
1207
1208 XMoveResizeWindow (disp, vt, 1228 XMoveResizeWindow (disp, vt,
1209 window_vt_x, window_vt_y, 1229 window_vt_x, window_vt_y,
1210 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1230 width, height);
1211 1231
1212 scr_clear (); 1232 scr_clear ();
1213#ifdef XPM_BACKGROUND 1233#ifdef XPM_BACKGROUND
1214 resize_pixmap (); 1234 resize_pixmap ();
1215#endif 1235#endif
… …
1395 XRectangle rect, status_rect, needed_rect; 1415 XRectangle rect, status_rect, needed_rect;
1396 unsigned long fg, bg; 1416 unsigned long fg, bg;
1397 const char *p; 1417 const char *p;
1398 char **s; 1418 char **s;
1399 XIMStyles *xim_styles; 1419 XIMStyles *xim_styles;
1420
1421 set_environ (envv);
1400 1422
1401 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1402 return false; 1424 return false;
1403 1425
1404 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1570 int i; 1592 int i;
1571 const char *p; 1593 const char *p;
1572 char **s; 1594 char **s;
1573 char buf[IMBUFSIZ]; 1595 char buf[IMBUFSIZ];
1574 1596
1575 SET_R (this); 1597 make_current ();
1576 1598
1577 im_destroy (); 1599 im_destroy ();
1578 1600
1579 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1580 if (Input_Context) 1602 if (Input_Context)

Diff Legend

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