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.189 by root, Thu Jan 19 09:47:15 2006 UTC

… …
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64} 64}
65 65
66bool 66void
67rxvt_push_locale (const char *locale) 67rxvt_push_locale (const char *locale)
68{ 68{
69 strcpy (savelocale, curlocale); 69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 70 rxvt_set_locale (locale);
71} 71}
… …
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 147#endif
148#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 153#endif
157#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
172#ifdef USE_XIM 169#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 170 im_ev (this, &rxvt_term::im_cb),
174#endif 171#endif
175 termwin_ev (this, &rxvt_term::x_cb), 172 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 173 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 175 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 176 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 177 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 178 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 179 incr_ev (this, &rxvt_term::incr_cb)
… …
197void rxvt_term::emergency_cleanup () 195void rxvt_term::emergency_cleanup ()
198{ 196{
199 if (cmd_pid) 197 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 198 kill (-cmd_pid, SIGHUP);
201 199
202#ifdef UTMP_SUPPORT 200 delete pty; pty = 0;
203 privileged_utmp (RESTORE);
204#endif
205
206 pty.put ();
207} 201}
208 202
209rxvt_term::~rxvt_term () 203rxvt_term::~rxvt_term ()
210{ 204{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
227 221
228 selection_clear (); 222 selection_clear ();
229 223
230#ifdef USE_XIM 224#ifdef USE_XIM
231 im_destroy (); 225 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 226#endif
236#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 230#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 245#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 246#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 250#endif
260 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (disp, gc);
261 252
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; 253 delete drawable;
268 // destroy all windows 254 // destroy all windows
269 if (parent[0]) 255 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (disp, parent[0]);
271 } 257 }
272 258
273 // TODO: free pixcolours, colours should become part of rxvt_display 259 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 260 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
278#endif
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
281#endif 263#endif
282 264
283 displays.put (display); 265 displays.put (display);
284 266
285 scr_release (); 267 scr_release ();
… …
304#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
305 delete keyboard; 287 delete keyboard;
306#endif 288#endif
307} 289}
308 290
291// child has exited, usually destroys
309void 292void
310rxvt_term::child_exit () 293rxvt_term::child_cb (child_watcher &w, int status)
311{ 294{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296
312 cmd_pid = 0; 297 cmd_pid = 0;
313 298
314 if (!OPTION (Opt_hold)) 299 if (!OPTION (Opt_hold))
315 destroy (); 300 destroy ();
316} 301}
… …
330#if USE_XIM 315#if USE_XIM
331 im_ev.stop (display); 316 im_ev.stop (display);
332#endif 317#endif
333#if HAVE_SCROLLBARS 318#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
335#endif
336#if MENUBAR
337 menubar_ev.stop (display);
338#endif 320#endif
339#if TRANSPARENT 321#if TRANSPARENT
340 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
341#endif 323#endif
342 incr_ev.stop (); 324 incr_ev.stop ();
… …
366} 348}
367 349
368void 350void
369rxvt_term::destroy_cb (time_watcher &w) 351rxvt_term::destroy_cb (time_watcher &w)
370{ 352{
371 SET_R (this); 353 make_current ();
372 354
373 delete this; 355 delete this;
374} 356}
375 357
376/*----------------------------------------------------------------------*/ 358/*----------------------------------------------------------------------*/
… …
467/*----------------------------------------------------------------------*/ 449/*----------------------------------------------------------------------*/
468bool 450bool
469rxvt_term::init (int argc, const char *const *argv) 451rxvt_term::init (int argc, const char *const *argv)
470{ 452{
471 SET_R (this); 453 SET_R (this);
472
473 set_locale (""); 454 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :(
474 456
475 if (!init_vars ()) 457 if (!init_vars ())
476 return false; 458 return false;
477 459
478 init_secondary (); 460 init_secondary ();
… …
481 463
482#ifdef KEYSYM_RESOURCE 464#ifdef KEYSYM_RESOURCE
483 keyboard->register_done (); 465 keyboard->register_done ();
484#endif 466#endif
485 467
486#if MENUBAR_MAX
487 menubar_read (rs[Rs_menu]);
488#endif
489#ifdef HAVE_SCROLLBARS 468#ifdef HAVE_SCROLLBARS
490 if (OPTION (Opt_scrollBar)) 469 if (OPTION (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */ 470 scrollBar.setIdle (); /* set existence for size calculations */
492#endif 471#endif
493 472
… …
497 476
498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
501 { 480 {
502 rxvt_perl.init (); 481 rxvt_perl.init (this);
503 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
504 } 483 }
505#endif 484#endif
506 485
486 pty = rxvt_new_ptytty ();
487
507 create_windows (argc, argv); 488 create_windows (argc, argv);
508 489
509 dDisp; 490 dDisp;
510 491
511 init_xlocale (); 492 init_xlocale ();
512 493
513 scr_reset (); /* initialize screen */ 494 scr_reset (); // initialize screen
514 495
515#if 0 496#if 0
516 XSynchronize (disp, True); 497 XSynchronize (disp, True);
517#endif 498#endif
518 499
519#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
520 if (OPTION (Opt_scrollBar)) 501 if (OPTION (Opt_scrollBar))
521 resize_scrollbar (); /* create and map scrollbar */ 502 resize_scrollbar (); /* create and map scrollbar */
522#endif 503#endif
523#if (MENUBAR_MAX)
524 if (menubar_visible ())
525 XMapWindow (disp, menuBar.win);
526#endif
527#ifdef TRANSPARENT 504#ifdef TRANSPARENT
528 if (OPTION (Opt_transparent)) 505 if (OPTION (Opt_transparent))
529 { 506 {
530 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
531 check_our_parents (); 508 check_our_parents ();
… …
540 517
541 init_command (cmd_argv); 518 init_command (cmd_argv);
542 519
543 free (cmd_argv); 520 free (cmd_argv);
544 521
545 if (pty.pty >= 0) 522 if (pty->pty >= 0)
546 pty_ev.start (pty.pty, EVENT_READ); 523 pty_ev.start (pty->pty, EVENT_READ);
547 524
548 check_ev.start (); 525 check_ev.start ();
549 526
550 HOOK_INVOKE ((this, HOOK_START, DT_END)); 527 HOOK_INVOKE ((this, HOOK_START, DT_END));
551 528
552 return true; 529 return true;
553} 530}
554 531
555static struct sig_handlers 532static struct sig_handlers
556{ 533{
557 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
558 535
559 void sig_chld (sig_watcher &w)
560 {
561 // we are being called for every SIGCHLD, find the corresponding term
562 int pid;
563
564 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
565 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
566 if (pid == (*t)->cmd_pid)
567 {
568 (*t)->child_exit ();
569 break;
570 }
571 }
572
573 /* 536 /*
574 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
575 */ 538 */
576 void 539 void
577 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
… …
583 signal (w.signum, SIG_DFL); 546 signal (w.signum, SIG_DFL);
584 kill (getpid (), w.signum); 547 kill (getpid (), w.signum);
585 } 548 }
586 549
587 sig_handlers () 550 sig_handlers ()
588 : sw_chld (this, &sig_handlers::sig_chld),
589 sw_term (this, &sig_handlers::sig_term), 551 : sw_term (this, &sig_handlers::sig_term),
590 sw_int (this, &sig_handlers::sig_term) 552 sw_int (this, &sig_handlers::sig_term)
591 { 553 {
592 } 554 }
593} sig_handlers; 555} sig_handlers;
594 556
557char **rxvt_environ; // startup environment
558
595void 559void
596rxvt_init () 560rxvt_init ()
597{ 561{
598 /* 562 uid_t uid = getuid ();
599 * Save and then give up any super-user privileges 563 gid_t gid = getgid ();
600 * If we need privileges in any area then we must specifically request it. 564
601 * We should only need to be root in these cases: 565 // before doing anything else, check for setuid/setgid operation,
602 * 1. write utmp entries on some systems 566 // start the helper process and drop privileges
603 * 2. chown tty on some systems 567 if (uid != geteuid ()
604 */ 568 || gid != getegid ())
605 rxvt_privileges (SAVE); 569 {
606 rxvt_privileges (IGNORE); 570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575
576 // drop privileges
577#if HAVE_SETRESUID
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592
593 rxvt_environ = environ;
607 594
608 signal (SIGHUP, SIG_IGN); 595 signal (SIGHUP, SIG_IGN);
609 signal (SIGPIPE, SIG_IGN); 596 signal (SIGPIPE, SIG_IGN);
610 597
611 sig_handlers.sw_chld.start (SIGCHLD);
612 sig_handlers.sw_term.start (SIGTERM); 598 sig_handlers.sw_term.start (SIGTERM);
613 sig_handlers.sw_int.start (SIGINT); 599 sig_handlers.sw_int.start (SIGINT);
614 600
615 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 601 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
616 /* signal (SIGURG, SIG_DFL); */ 602 /* signal (SIGURG, SIG_DFL); */
617 603
618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 604 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
619 // TODO: handle this with exceptions and tolerate the memory loss 605 // TODO: handle this with exceptions and tolerate the memory loss
620 XSetIOErrorHandler (rxvt_xioerror_handler); 606 XSetIOErrorHandler (rxvt_xioerror_handler);
621 607
622#ifdef USE_XGETDEFAULT
623 XrmInitialize (); 608 XrmInitialize ();
624#endif
625} 609}
626 610
627/* ------------------------------------------------------------------------- * 611/* ------------------------------------------------------------------------- *
628 * MEMORY ALLOCATION WRAPPERS * 612 * MEMORY ALLOCATION WRAPPERS *
629 * ------------------------------------------------------------------------- */ 613 * ------------------------------------------------------------------------- */
… …
658 rxvt_fatal ("memory allocation failure. aborting.\n"); 642 rxvt_fatal ("memory allocation failure. aborting.\n");
659 643
660 return p; 644 return p;
661} 645}
662 646
663/* ------------------------------------------------------------------------- *
664 * PRIVILEGED OPERATIONS *
665 * ------------------------------------------------------------------------- */
666/* take care of suid/sgid super-user (root) privileges */
667void
668rxvt_privileges (rxvt_privaction action)
669{
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__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 seteuid (getuid ());
691 setegid (getgid ());
692 break;
693 case SAVE:
694 euid = geteuid ();
695 egid = getegid ();
696 break;
697 case RESTORE:
698 seteuid (euid);
699 setegid (egid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setuid (getuid ());
707 setgid (getgid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
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/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
738/* 648/*
739 * window size/position calculcations for XSizeHint and other storage. 649 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 650 * if width/height are non-zero then override calculated width/height
741 */ 651 */
742void 652void
743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
744{ 654{
745 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
746 int x, y, sb_w, mb_h, flags; 656 int x, y, sb_w, flags;
747 unsigned int w, h; 657 unsigned int w, h;
748 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
749 dDisp; 659 dDisp;
750 660
751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
812 max_width = MAX_COLS * fwidth; 722 max_width = MAX_COLS * fwidth;
813 max_height = MAX_ROWS * fheight; 723 max_height = MAX_ROWS * fheight;
814 724
815 szHint.base_width = szHint.base_height = 2 * int_bwidth; 725 szHint.base_width = szHint.base_height = 2 * int_bwidth;
816 726
817 sb_w = mb_h = 0; 727 sb_w = 0;
818 window_vt_x = window_vt_y = int_bwidth; 728 window_vt_x = window_vt_y = int_bwidth;
819 729
820 if (scrollbar_visible ()) 730 if (scrollBar.state)
821 { 731 {
822 sb_w = scrollbar_TotalWidth (); 732 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 733 szHint.base_width += sb_w;
824 if (!OPTION (Opt_scrollBar_right)) 734 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 735 window_vt_x += sb_w;
826 } 736 }
827 737
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; 738 szHint.width_inc = fwidth;
836 szHint.height_inc = fheight; 739 szHint.height_inc = fheight;
837 szHint.min_width = szHint.base_width + szHint.width_inc; 740 szHint.min_width = szHint.base_width + szHint.width_inc;
838 szHint.min_height = szHint.base_height + szHint.height_inc; 741 szHint.min_height = szHint.base_height + szHint.height_inc;
839 742
… …
857 { 760 {
858 min_it (height, max_height); 761 min_it (height, max_height);
859 szHint.height = szHint.base_height + height; 762 szHint.height = szHint.base_height + height;
860 } 763 }
861 764
862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 765 if (scrollBar.state && OPTION (Opt_scrollBar_right))
863 window_sb_x = szHint.width - sb_w; 766 window_sb_x = szHint.width - sb_w;
864 767
865 if (recalc_x) 768 if (recalc_x)
866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
867 if (recalc_y) 770 if (recalc_y)
… …
881 * Called after a window size change. 784 * Called after a window size change.
882 */ 785 */
883void 786void
884rxvt_term::tt_winch () 787rxvt_term::tt_winch ()
885{ 788{
886 if (pty.pty < 0) 789 if (pty->pty < 0)
887 return; 790 return;
888 791
889 struct winsize ws; 792 struct winsize ws;
890 793
891 ws.ws_col = ncol; 794 ws.ws_col = ncol;
892 ws.ws_row = nrow; 795 ws.ws_row = nrow;
893 ws.ws_xpixel = width; 796 ws.ws_xpixel = width;
894 ws.ws_ypixel = height; 797 ws.ws_ypixel = height;
895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 798 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
896 799
897#if 0 800#if 0
898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 801 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
899 if (cmd_pid) /* force through to the command */ 802 if (cmd_pid) /* force through to the command */
900 kill (-cmd_pid, SIGWINCH); 803 kill (-cmd_pid, SIGWINCH);
… …
1222 1125
1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1224 1127
1225 if (fix_screen || newwidth != old_width || newheight != old_height) 1128 if (fix_screen || newwidth != old_width || newheight != old_height)
1226 { 1129 {
1227 if (scrollbar_visible ()) 1130 if (scrollBar.state)
1228 { 1131 {
1229 XMoveResizeWindow (disp, scrollBar.win, 1132 XMoveResizeWindow (disp, scrollBar.win,
1230 window_sb_x, 0, 1133 window_sb_x, 0,
1231 scrollbar_TotalWidth (), szHint.height); 1134 scrollbar_TotalWidth (), szHint.height);
1232 resize_scrollbar (); 1135 resize_scrollbar ();
1233 } 1136 }
1234
1235 if (menubar_visible ())
1236 XMoveResizeWindow (disp, menuBar.win,
1237 window_vt_x, 0,
1238 width, menuBar_TotalHeight ());
1239 1137
1240 XMoveResizeWindow (disp, vt, 1138 XMoveResizeWindow (disp, vt,
1241 window_vt_x, window_vt_y, 1139 window_vt_x, window_vt_y,
1242 width, height); 1140 width, height);
1243 1141
… …
1427 XRectangle rect, status_rect, needed_rect; 1325 XRectangle rect, status_rect, needed_rect;
1428 unsigned long fg, bg; 1326 unsigned long fg, bg;
1429 const char *p; 1327 const char *p;
1430 char **s; 1328 char **s;
1431 XIMStyles *xim_styles; 1329 XIMStyles *xim_styles;
1330
1331 set_environ (envv);
1432 1332
1433 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1434 return false; 1334 return false;
1435 1335
1436 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1602 int i; 1502 int i;
1603 const char *p; 1503 const char *p;
1604 char **s; 1504 char **s;
1605 char buf[IMBUFSIZ]; 1505 char buf[IMBUFSIZ];
1606 1506
1607 SET_R (this); 1507 make_current ();
1608 1508
1609 im_destroy (); 1509 im_destroy ();
1610 1510
1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1612 if (Input_Context) 1512 if (Input_Context)

Diff Legend

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