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.166 by root, Sun Jan 8 07:55:36 2006 UTC vs.
Revision 1.186 by root, Tue Jan 17 15:41:33 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
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 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
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
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
281#endif 277#endif
282 278
283 displays.put (display); 279 displays.put (display);
284 280
285 scr_release (); 281 scr_release ();
… …
331 im_ev.stop (display); 327 im_ev.stop (display);
332#endif 328#endif
333#if HAVE_SCROLLBARS 329#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
335#endif 331#endif
336#if MENUBAR
337 menubar_ev.stop (display);
338#endif
339#if TRANSPARENT 332#if TRANSPARENT
340 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
341#endif 334#endif
342 incr_ev.stop (); 335 incr_ev.stop ();
343 termwin_ev.stop (display); 336 termwin_ev.stop (display);
… …
366} 359}
367 360
368void 361void
369rxvt_term::destroy_cb (time_watcher &w) 362rxvt_term::destroy_cb (time_watcher &w)
370{ 363{
371 SET_R (this); 364 make_current ();
372 365
373 delete this; 366 delete this;
374} 367}
375 368
376/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
… …
467/*----------------------------------------------------------------------*/ 460/*----------------------------------------------------------------------*/
468bool 461bool
469rxvt_term::init (int argc, const char *const *argv) 462rxvt_term::init (int argc, const char *const *argv)
470{ 463{
471 SET_R (this); 464 SET_R (this);
472
473 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
474 467
475 if (!init_vars ()) 468 if (!init_vars ())
476 return false; 469 return false;
477 470
478 init_secondary (); 471 init_secondary ();
… …
481 474
482#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
483 keyboard->register_done (); 476 keyboard->register_done ();
484#endif 477#endif
485 478
486#if MENUBAR_MAX
487 menubar_read (rs[Rs_menu]);
488#endif
489#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
490 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
492#endif 482#endif
493 483
… …
497 487
498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 488 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 489 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 490 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
501 { 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
502 rxvt_perl.init (); 505 rxvt_perl.init (this);
503 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
504 } 507 }
505#endif 508#endif
506 509
510 pty = rxvt_new_ptytty ();
511
507 create_windows (argc, argv); 512 create_windows (argc, argv);
508 513
509 dDisp; 514 dDisp;
510 515
511 init_xlocale (); 516 init_xlocale ();
512 517
513 scr_reset (); /* initialize screen */ 518 scr_reset (); // initialize screen
514 519
515#if 0 520#if 0
516 XSynchronize (disp, True); 521 XSynchronize (disp, True);
517#endif 522#endif
518 523
519#ifdef HAVE_SCROLLBARS 524#ifdef HAVE_SCROLLBARS
520 if (OPTION (Opt_scrollBar)) 525 if (OPTION (Opt_scrollBar))
521 resize_scrollbar (); /* create and map scrollbar */ 526 resize_scrollbar (); /* create and map scrollbar */
522#endif 527#endif
523#if (MENUBAR_MAX)
524 if (menubar_visible ())
525 XMapWindow (disp, menuBar.win);
526#endif
527#ifdef TRANSPARENT 528#ifdef TRANSPARENT
528 if (OPTION (Opt_transparent)) 529 if (OPTION (Opt_transparent))
529 { 530 {
530 XSelectInput (disp, display->root, PropertyChangeMask); 531 XSelectInput (disp, display->root, PropertyChangeMask);
531 check_our_parents (); 532 check_our_parents ();
… …
540 541
541 init_command (cmd_argv); 542 init_command (cmd_argv);
542 543
543 free (cmd_argv); 544 free (cmd_argv);
544 545
545 if (pty.pty >= 0) 546 if (pty->pty >= 0)
546 pty_ev.start (pty.pty, EVENT_READ); 547 pty_ev.start (pty->pty, EVENT_READ);
547 548
548 check_ev.start (); 549 check_ev.start ();
549 550
550 HOOK_INVOKE ((this, HOOK_START, DT_END)); 551 HOOK_INVOKE ((this, HOOK_START, DT_END));
551 552
… …
590 sw_int (this, &sig_handlers::sig_term) 591 sw_int (this, &sig_handlers::sig_term)
591 { 592 {
592 } 593 }
593} sig_handlers; 594} sig_handlers;
594 595
596char **rxvt_environ; // startup environment
597
595void 598void
596rxvt_init () 599rxvt_init ()
597{ 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
598 /* 635 /*
599 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
600 * 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.
601 * We should only need to be root in these cases: 638 * We should only need to be root in these cases:
602 * 1. write utmp entries on some systems 639 * 1. write utmp entries on some systems
… …
617 654
618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
619 // TODO: handle this with exceptions and tolerate the memory loss 656 // TODO: handle this with exceptions and tolerate the memory loss
620 XSetIOErrorHandler (rxvt_xioerror_handler); 657 XSetIOErrorHandler (rxvt_xioerror_handler);
621 658
622#ifdef USE_XGETDEFAULT
623 XrmInitialize (); 659 XrmInitialize ();
624#endif
625} 660}
626 661
627/* ------------------------------------------------------------------------- * 662/* ------------------------------------------------------------------------- *
628 * MEMORY ALLOCATION WRAPPERS * 663 * MEMORY ALLOCATION WRAPPERS *
629 * ------------------------------------------------------------------------- */ 664 * ------------------------------------------------------------------------- */
… …
665 * ------------------------------------------------------------------------- */ 700 * ------------------------------------------------------------------------- */
666/* take care of suid/sgid super-user (root) privileges */ 701/* take care of suid/sgid super-user (root) privileges */
667void 702void
668rxvt_privileges (rxvt_privaction action) 703rxvt_privileges (rxvt_privaction action)
669{ 704{
670#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
671 static uid_t euid;
672 static gid_t egid;
673#endif
674
675#if ! defined(__CYGWIN32__) 705#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */ 707 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a)) 708# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a)) 709# define setegid(a) setregid(-1, (a))
… …
685 case IGNORE: 715 case IGNORE:
686 /* 716 /*
687 * 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
688 * back to root later, as required 718 * back to root later, as required
689 */ 719 */
720 setegid (getgid ());
690 seteuid (getuid ()); 721 seteuid (getuid ());
691 setegid (getgid ());
692 break; 722 break;
693 case SAVE: 723 case SAVE:
694 euid = geteuid ();
695 egid = getegid (); 724 saved_egid = getegid ();
725 saved_euid = geteuid ();
696 break; 726 break;
697 case RESTORE: 727 case RESTORE:
698 seteuid (euid);
699 setegid (egid); 728 setegid (saved_egid);
729 seteuid (saved_euid);
700 break; 730 break;
701 } 731 }
702# else 732# else
703 switch (action) 733 switch (action)
704 { 734 {
705 case IGNORE: 735 case IGNORE:
736 setgid (getgid ());
706 setuid (getuid ()); 737 setuid (getuid ());
707 setgid (getgid ());
708 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
709 case SAVE: 739 case SAVE:
710 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
711 case RESTORE: 741 case RESTORE:
712 break; 742 break;
713 } 743 }
714# endif 744# endif
715#endif 745#endif
716} 746}
717 747
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit)
723 || !pty.name || !*pty.name)
724 return;
725
726 rxvt_privileges (RESTORE);
727
728 if (action == SAVE)
729 makeutent (pty.name, rs[Rs_display_name]);
730 else
731 cleanutent ();
732
733 rxvt_privileges (IGNORE);
734}
735#endif
736
737/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
738/* 749/*
739 * window size/position calculcations for XSizeHint and other storage. 750 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 751 * if width/height are non-zero then override calculated width/height
741 */ 752 */
742void 753void
743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
744{ 755{
745 short recalc_x, recalc_y; 756 short recalc_x, recalc_y;
746 int x, y, sb_w, mb_h, flags; 757 int x, y, sb_w, flags;
747 unsigned int w, h; 758 unsigned int w, h;
748 unsigned int max_width, max_height; 759 unsigned int max_width, max_height;
749 dDisp; 760 dDisp;
750 761
751 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",
… …
812 max_width = MAX_COLS * fwidth; 823 max_width = MAX_COLS * fwidth;
813 max_height = MAX_ROWS * fheight; 824 max_height = MAX_ROWS * fheight;
814 825
815 szHint.base_width = szHint.base_height = 2 * int_bwidth; 826 szHint.base_width = szHint.base_height = 2 * int_bwidth;
816 827
817 sb_w = mb_h = 0; 828 sb_w = 0;
818 window_vt_x = window_vt_y = int_bwidth; 829 window_vt_x = window_vt_y = int_bwidth;
819 830
820 if (scrollbar_visible ()) 831 if (scrollBar.state)
821 { 832 {
822 sb_w = scrollbar_TotalWidth (); 833 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 834 szHint.base_width += sb_w;
824 if (!OPTION (Opt_scrollBar_right)) 835 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 836 window_vt_x += sb_w;
826 } 837 }
827 838
828 if (menubar_visible ())
829 {
830 mb_h = menuBar_TotalHeight ();
831 szHint.base_height += mb_h;
832 window_vt_y += mb_h;
833 }
834
835 szHint.width_inc = fwidth; 839 szHint.width_inc = fwidth;
836 szHint.height_inc = fheight; 840 szHint.height_inc = fheight;
837 szHint.min_width = szHint.base_width + szHint.width_inc; 841 szHint.min_width = szHint.base_width + szHint.width_inc;
838 szHint.min_height = szHint.base_height + szHint.height_inc; 842 szHint.min_height = szHint.base_height + szHint.height_inc;
839 843
… …
857 { 861 {
858 min_it (height, max_height); 862 min_it (height, max_height);
859 szHint.height = szHint.base_height + height; 863 szHint.height = szHint.base_height + height;
860 } 864 }
861 865
862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
863 window_sb_x = szHint.width - sb_w; 867 window_sb_x = szHint.width - sb_w;
864 868
865 if (recalc_x) 869 if (recalc_x)
866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
867 if (recalc_y) 871 if (recalc_y)
… …
881 * Called after a window size change. 885 * Called after a window size change.
882 */ 886 */
883void 887void
884rxvt_term::tt_winch () 888rxvt_term::tt_winch ()
885{ 889{
886 if (pty.pty < 0) 890 if (pty->pty < 0)
887 return; 891 return;
888 892
889 struct winsize ws; 893 struct winsize ws;
890 894
891 ws.ws_col = ncol; 895 ws.ws_col = ncol;
892 ws.ws_row = nrow; 896 ws.ws_row = nrow;
893 ws.ws_xpixel = width; 897 ws.ws_xpixel = width;
894 ws.ws_ypixel = height; 898 ws.ws_ypixel = height;
895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
896 900
897#if 0 901#if 0
898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
899 if (cmd_pid) /* force through to the command */ 903 if (cmd_pid) /* force through to the command */
900 kill (-cmd_pid, SIGWINCH); 904 kill (-cmd_pid, SIGWINCH);
… …
1222 1226
1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1224 1228
1225 if (fix_screen || newwidth != old_width || newheight != old_height) 1229 if (fix_screen || newwidth != old_width || newheight != old_height)
1226 { 1230 {
1227 if (scrollbar_visible ()) 1231 if (scrollBar.state)
1228 { 1232 {
1229 XMoveResizeWindow (disp, scrollBar.win, 1233 XMoveResizeWindow (disp, scrollBar.win,
1230 window_sb_x, 0, 1234 window_sb_x, 0,
1231 scrollbar_TotalWidth (), szHint.height); 1235 scrollbar_TotalWidth (), szHint.height);
1232 resize_scrollbar (); 1236 resize_scrollbar ();
1233 } 1237 }
1234
1235 if (menubar_visible ())
1236 XMoveResizeWindow (disp, menuBar.win,
1237 window_vt_x, 0,
1238 width, menuBar_TotalHeight ());
1239 1238
1240 XMoveResizeWindow (disp, vt, 1239 XMoveResizeWindow (disp, vt,
1241 window_vt_x, window_vt_y, 1240 window_vt_x, window_vt_y,
1242 width, height); 1241 width, height);
1243 1242
… …
1427 XRectangle rect, status_rect, needed_rect; 1426 XRectangle rect, status_rect, needed_rect;
1428 unsigned long fg, bg; 1427 unsigned long fg, bg;
1429 const char *p; 1428 const char *p;
1430 char **s; 1429 char **s;
1431 XIMStyles *xim_styles; 1430 XIMStyles *xim_styles;
1431
1432 set_environ (envv);
1432 1433
1433 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1434 return false; 1435 return false;
1435 1436
1436 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1602 int i; 1603 int i;
1603 const char *p; 1604 const char *p;
1604 char **s; 1605 char **s;
1605 char buf[IMBUFSIZ]; 1606 char buf[IMBUFSIZ];
1606 1607
1607 SET_R (this); 1608 make_current ();
1608 1609
1609 im_destroy (); 1610 im_destroy ();
1610 1611
1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1612 if (Input_Context) 1613 if (Input_Context)

Diff Legend

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