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.156 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.183 by root, Tue Jan 17 10:19:13 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
… …
206 pty.put (); 218 pty.put ();
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_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
492 rxvt_perl.init (); 509 rxvt_perl.init (this);
493#endif
494
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
496 513
497 create_windows (argc, argv); 514 create_windows (argc, argv);
498 515
499 dDisp; 516 dDisp;
500 517
501 init_xlocale (); 518 init_xlocale ();
502 519
503 scr_reset (); /* initialize screen */ 520 scr_reset (); // initialize screen
504 521
505#if 0 522#if 0
506 XSynchronize (disp, True); 523 XSynchronize (disp, True);
507#endif 524#endif
508 525
509#ifdef HAVE_SCROLLBARS 526#ifdef HAVE_SCROLLBARS
510 if (OPTION (Opt_scrollBar)) 527 if (OPTION (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */ 528 resize_scrollbar (); /* create and map scrollbar */
512#endif 529#endif
513#if (MENUBAR_MAX)
514 if (menubar_visible ())
515 XMapWindow (disp, menuBar.win);
516#endif
517#ifdef TRANSPARENT 530#ifdef TRANSPARENT
518 if (OPTION (Opt_transparent)) 531 if (OPTION (Opt_transparent))
519 { 532 {
520 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (disp, display->root, PropertyChangeMask);
521 check_our_parents (); 534 check_our_parents ();
… …
530 543
531 init_command (cmd_argv); 544 init_command (cmd_argv);
532 545
533 free (cmd_argv); 546 free (cmd_argv);
534 547
548 if (pty.pty >= 0)
535 pty_ev.start (pty.pty, EVENT_READ); 549 pty_ev.start (pty.pty, EVENT_READ);
536 550
537 check_ev.start (); 551 check_ev.start ();
538 552
539 PERL_INVOKE ((this, HOOK_START, DT_END)); 553 HOOK_INVOKE ((this, HOOK_START, DT_END));
540 554
541 return true; 555 return true;
542} 556}
543 557
544static struct sig_handlers 558static struct sig_handlers
… …
579 sw_int (this, &sig_handlers::sig_term) 593 sw_int (this, &sig_handlers::sig_term)
580 { 594 {
581 } 595 }
582} sig_handlers; 596} sig_handlers;
583 597
598char **rxvt_environ; // startup environment
599
584void 600void
585rxvt_init () 601rxvt_init ()
586{ 602{
603 rxvt_environ = environ;
604
587 /* 605 /*
588 * Save and then give up any super-user privileges 606 * Save and then give up any super-user privileges
589 * 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.
590 * We should only need to be root in these cases: 608 * We should only need to be root in these cases:
591 * 1. write utmp entries on some systems 609 * 1. write utmp entries on some systems
… …
605 /* signal (SIGURG, SIG_DFL); */ 623 /* signal (SIGURG, SIG_DFL); */
606 624
607 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 625 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
608 // TODO: handle this with exceptions and tolerate the memory loss 626 // TODO: handle this with exceptions and tolerate the memory loss
609 XSetIOErrorHandler (rxvt_xioerror_handler); 627 XSetIOErrorHandler (rxvt_xioerror_handler);
628
629 XrmInitialize ();
610} 630}
611 631
612/* ------------------------------------------------------------------------- * 632/* ------------------------------------------------------------------------- *
613 * MEMORY ALLOCATION WRAPPERS * 633 * MEMORY ALLOCATION WRAPPERS *
614 * ------------------------------------------------------------------------- */ 634 * ------------------------------------------------------------------------- */
… …
650 * ------------------------------------------------------------------------- */ 670 * ------------------------------------------------------------------------- */
651/* take care of suid/sgid super-user (root) privileges */ 671/* take care of suid/sgid super-user (root) privileges */
652void 672void
653rxvt_privileges (rxvt_privaction action) 673rxvt_privileges (rxvt_privaction action)
654{ 674{
655#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
656 static uid_t euid;
657 static gid_t egid;
658#endif
659
660#if ! defined(__CYGWIN32__) 675#if ! defined(__CYGWIN32__)
661# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
662 /* setreuid () is the poor man's setuid (), seteuid () */ 677 /* setreuid () is the poor man's setuid (), seteuid () */
663# define seteuid(a) setreuid(-1, (a)) 678# define seteuid(a) setreuid(-1, (a))
664# define setegid(a) setregid(-1, (a)) 679# define setegid(a) setregid(-1, (a))
… …
670 case IGNORE: 685 case IGNORE:
671 /* 686 /*
672 * 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
673 * back to root later, as required 688 * back to root later, as required
674 */ 689 */
690 setegid (getgid ());
675 seteuid (getuid ()); 691 seteuid (getuid ());
676 setegid (getgid ());
677 break; 692 break;
678 case SAVE: 693 case SAVE:
679 euid = geteuid ();
680 egid = getegid (); 694 saved_egid = getegid ();
695 saved_euid = geteuid ();
681 break; 696 break;
682 case RESTORE: 697 case RESTORE:
683 seteuid (euid);
684 setegid (egid); 698 setegid (saved_egid);
699 seteuid (saved_euid);
685 break; 700 break;
686 } 701 }
687# else 702# else
688 switch (action) 703 switch (action)
689 { 704 {
690 case IGNORE: 705 case IGNORE:
706 setgid (getgid ());
691 setuid (getuid ()); 707 setuid (getuid ());
692 setgid (getgid ());
693 /* FALLTHROUGH */ 708 /* FALLTHROUGH */
694 case SAVE: 709 case SAVE:
695 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
696 case RESTORE: 711 case RESTORE:
697 break; 712 break;
… …
702 717
703#ifdef UTMP_SUPPORT 718#ifdef UTMP_SUPPORT
704void 719void
705rxvt_term::privileged_utmp (rxvt_privaction action) 720rxvt_term::privileged_utmp (rxvt_privaction action)
706{ 721{
707 if (OPTION (Opt_utmpInhibit) 722 if (OPTION (Opt_utmpInhibit))
708 || !pty.name || !*pty.name)
709 return; 723 return;
710 724
711 rxvt_privileges (RESTORE); 725 rxvt_privileges (RESTORE);
712 726
713 if (action == SAVE) 727 if (action == SAVE)
714 makeutent (pty.name, rs[Rs_display_name]); 728 pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
715 else 729 else
716 cleanutent (); 730 pty.logout ();
717 731
718 rxvt_privileges (IGNORE); 732 rxvt_privileges (IGNORE);
719} 733}
720#endif 734#endif
721 735
… …
726 */ 740 */
727void 741void
728rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 742rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
729{ 743{
730 short recalc_x, recalc_y; 744 short recalc_x, recalc_y;
731 int x, y, sb_w, mb_h, flags; 745 int x, y, sb_w, flags;
732 unsigned int w, h; 746 unsigned int w, h;
733 unsigned int max_width, max_height; 747 unsigned int max_width, max_height;
734 dDisp; 748 dDisp;
735 749
736 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 750 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
797 max_width = MAX_COLS * fwidth; 811 max_width = MAX_COLS * fwidth;
798 max_height = MAX_ROWS * fheight; 812 max_height = MAX_ROWS * fheight;
799 813
800 szHint.base_width = szHint.base_height = 2 * int_bwidth; 814 szHint.base_width = szHint.base_height = 2 * int_bwidth;
801 815
802 sb_w = mb_h = 0; 816 sb_w = 0;
803 window_vt_x = window_vt_y = int_bwidth; 817 window_vt_x = window_vt_y = int_bwidth;
804 818
805 if (scrollbar_visible ()) 819 if (scrollBar.state)
806 { 820 {
807 sb_w = scrollbar_TotalWidth (); 821 sb_w = scrollbar_TotalWidth ();
808 szHint.base_width += sb_w; 822 szHint.base_width += sb_w;
809 if (!OPTION (Opt_scrollBar_right)) 823 if (!OPTION (Opt_scrollBar_right))
810 window_vt_x += sb_w; 824 window_vt_x += sb_w;
811 } 825 }
812 826
813 if (menubar_visible ())
814 {
815 mb_h = menuBar_TotalHeight ();
816 szHint.base_height += mb_h;
817 window_vt_y += mb_h;
818 }
819
820 szHint.width_inc = fwidth; 827 szHint.width_inc = fwidth;
821 szHint.height_inc = fheight; 828 szHint.height_inc = fheight;
822 szHint.min_width = szHint.base_width + szHint.width_inc; 829 szHint.min_width = szHint.base_width + szHint.width_inc;
823 szHint.min_height = szHint.base_height + szHint.height_inc; 830 szHint.min_height = szHint.base_height + szHint.height_inc;
824 831
… …
842 { 849 {
843 min_it (height, max_height); 850 min_it (height, max_height);
844 szHint.height = szHint.base_height + height; 851 szHint.height = szHint.base_height + height;
845 } 852 }
846 853
847 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 854 if (scrollBar.state && OPTION (Opt_scrollBar_right))
848 window_sb_x = szHint.width - sb_w; 855 window_sb_x = szHint.width - sb_w;
849 856
850 if (recalc_x) 857 if (recalc_x)
851 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 858 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
852 if (recalc_y) 859 if (recalc_y)
… …
921 prop.height += lineSpace; 928 prop.height += lineSpace;
922 fs->set_prop (prop); 929 fs->set_prop (prop);
923 930
924 fwidth = prop.width; 931 fwidth = prop.width;
925 fheight = prop.height; 932 fheight = prop.height;
926 fbase = (*fs)[1]->ascent; 933 fbase = prop.ascent;
927 934
928 for (int style = 1; style < 4; style++) 935 for (int style = 1; style < 4; style++)
929 { 936 {
930#if ENABLE_STYLES 937#if ENABLE_STYLES
931 const char *res = rs[Rs_font + style]; 938 const char *res = rs[Rs_font + style];
… …
1022 i = atoi (color); 1029 i = atoi (color);
1023 1030
1024 if (i >= 8 && i <= 15) 1031 if (i >= 8 && i <= 15)
1025 { /* bright colors */ 1032 { /* bright colors */
1026 i -= 8; 1033 i -= 8;
1027# ifndef NO_BRIGHTCOLOR
1028 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1034 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1029 SET_PIXCOLOR (idx); 1035 SET_PIXCOLOR (idx);
1030 goto done; 1036 goto done;
1031# endif
1032 } 1037 }
1033 1038
1034 if (i >= 0 && i <= 7) 1039 if (i >= 0 && i <= 7)
1035 { /* normal colors */ 1040 { /* normal colors */
1036 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1041 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1209 1214
1210 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1215 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1211 1216
1212 if (fix_screen || newwidth != old_width || newheight != old_height) 1217 if (fix_screen || newwidth != old_width || newheight != old_height)
1213 { 1218 {
1214 if (scrollbar_visible ()) 1219 if (scrollBar.state)
1215 { 1220 {
1216 XMoveResizeWindow (disp, scrollBar.win, 1221 XMoveResizeWindow (disp, scrollBar.win,
1217 window_sb_x, 0, 1222 window_sb_x, 0,
1218 scrollbar_TotalWidth (), szHint.height); 1223 scrollbar_TotalWidth (), szHint.height);
1219 resize_scrollbar (); 1224 resize_scrollbar ();
1220 } 1225 }
1221 1226
1222 if (menubar_visible ())
1223 XMoveResizeWindow (disp, menuBar.win,
1224 window_vt_x, 0,
1225 TermWin_TotalWidth (), menuBar_TotalHeight ());
1226
1227 XMoveResizeWindow (disp, vt, 1227 XMoveResizeWindow (disp, vt,
1228 window_vt_x, window_vt_y, 1228 window_vt_x, window_vt_y,
1229 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1229 width, height);
1230 1230
1231 scr_clear (); 1231 scr_clear ();
1232#ifdef XPM_BACKGROUND 1232#ifdef XPM_BACKGROUND
1233 resize_pixmap (); 1233 resize_pixmap ();
1234#endif 1234#endif
… …
1414 XRectangle rect, status_rect, needed_rect; 1414 XRectangle rect, status_rect, needed_rect;
1415 unsigned long fg, bg; 1415 unsigned long fg, bg;
1416 const char *p; 1416 const char *p;
1417 char **s; 1417 char **s;
1418 XIMStyles *xim_styles; 1418 XIMStyles *xim_styles;
1419
1420 set_environ (envv);
1419 1421
1420 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1421 return false; 1423 return false;
1422 1424
1423 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1589 int i; 1591 int i;
1590 const char *p; 1592 const char *p;
1591 char **s; 1593 char **s;
1592 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1593 1595
1594 SET_R (this); 1596 make_current ();
1595 1597
1596 im_destroy (); 1598 im_destroy ();
1597 1599
1598 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1599 if (Input_Context) 1601 if (Input_Context)

Diff Legend

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