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.174 by root, Thu Jan 12 00:11:13 2006 UTC vs.
Revision 1.194 by root, Sun Jan 22 00:36:59 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__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
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
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
73 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
74 return false; 62 return false;
75 63
76 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
78 return true; 66 return true;
79} 67}
80 68
81void 69void
82rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
83{ 71{
84 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
86} 74}
87 75
88void 76void
89rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
90{ 78{
91 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
92} 80}
93 81
94#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 150#endif
163#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 153#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif
169#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 156#endif
172#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
185 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
186#endif 171#endif
187#ifdef USE_XIM 172#ifdef USE_XIM
188 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
189#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
190 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
191 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
192 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
193 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
194 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
195 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
196 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
199 188
200 termlist.push_back (this); 189 termlist.push_back (this);
201 190
202#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
203 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
204
205 if (!keyboard)
206 rxvt_fatal ("out of memory, aborting.\n");
207#endif 193#endif
208} 194}
209 195
210// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
211// for use before an emergency exit 197// for use before an emergency exit
212void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
213{ 199{
214 if (cmd_pid) 200 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
216 202
217#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
218 privileged_utmp (RESTORE);
219#endif
220
221 pty.put ();
222} 204}
223 205
224rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
225{ 207{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
229 209
230 emergency_cleanup (); 210 emergency_cleanup ();
231 211
232#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
242 222
243 selection_clear (); 223 selection_clear ();
244 224
245#ifdef USE_XIM 225#ifdef USE_XIM
246 im_destroy (); 226 im_destroy ();
247#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif 227#endif
251#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
254#endif 231#endif
… …
265 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
269#endif 246#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274#endif 251#endif
275 if (gc) XFreeGC (disp, gc); 252 if (gc) XFreeGC (disp, gc);
276 253
277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278 delete menuBar.drawable;
279 //if (menuBar.win)
280 // XDestroyWindow (disp, menuBar.win);
281#endif
282 delete drawable; 254 delete drawable;
283 // destroy all windows 255 // destroy all windows
284 if (parent[0]) 256 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 257 XDestroyWindow (disp, parent[0]);
286 } 258 }
… …
315#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
316 delete keyboard; 288 delete keyboard;
317#endif 289#endif
318} 290}
319 291
292// child has exited, usually destroys
320void 293void
321rxvt_term::child_exit () 294rxvt_term::child_cb (child_watcher &w, int status)
322{ 295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
323 cmd_pid = 0; 298 cmd_pid = 0;
324 299
325 if (!OPTION (Opt_hold)) 300 if (!OPTION (Opt_hold))
326 destroy (); 301 destroy ();
327} 302}
… …
330rxvt_term::destroy () 305rxvt_term::destroy ()
331{ 306{
332 if (destroy_ev.active) 307 if (destroy_ev.active)
333 return; 308 return;
334 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
335#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
336 scr_overlay_off (); 314 scr_overlay_off ();
337#endif 315#endif
338 316
339 if (display) 317 if (display)
… …
341#if USE_XIM 319#if USE_XIM
342 im_ev.stop (display); 320 im_ev.stop (display);
343#endif 321#endif
344#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
346#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif 324#endif
350#if TRANSPARENT 325#if TRANSPARENT
351 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
352#endif 327#endif
353 incr_ev.stop (); 328 incr_ev.stop ();
… …
377} 352}
378 353
379void 354void
380rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
381{ 356{
382 SET_R (this); 357 make_current ();
383 358
384 delete this; 359 delete this;
385} 360}
386 361
387/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
475 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
476} 451}
477 452
478/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
479bool 454bool
480rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
481{ 456{
457 this->envv = envv;
458
482 SET_R (this); 459 SET_R (this);
460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
483 462
484 const char **cmd_argv; 463 if (!init_vars ())
464 return false;
465
466 init_secondary ();
467
468 const char **cmd_argv = init_resources (argc, argv);
469
470#ifdef KEYSYM_RESOURCE
471 keyboard->register_done ();
472#endif
473
474#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */
477#endif
478
479 pty = rxvt_new_ptytty ();
480
481 create_windows (argc, argv);
482
483 dDisp;
484
485 init_xlocale ();
486
487 scr_reset (); // initialize screen
488
489#if 0
490 XSynchronize (disp, True);
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */
496#endif
497#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent))
499 {
500 XSelectInput (disp, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root);
503 }
504#endif
505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
522 return true;
523}
524
525static struct sig_handlers
526{
527 sig_watcher sw_term, sw_int;
485 528
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
489 set_locale ("");
490
491 if (!init_vars ())
492 return false;
493
494 init_secondary ();
495
496 cmd_argv = init_resources (argc, argv);
497
498#ifdef KEYSYM_RESOURCE
499 keyboard->register_done ();
500#endif
501
502#if MENUBAR_MAX
503 menubar_read (rs[Rs_menu]);
504#endif
505#ifdef HAVE_SCROLLBARS
506 if (OPTION (Opt_scrollBar))
507 scrollBar.setIdle (); /* set existence for size calculations */
508#endif
509 }
510
511#if ENABLE_PERL
512 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default";
514
515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
518 {
519#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520 // ignore some perl-related arguments if some bozo installed us set[ug]id
521 if (rxvt_tainted ())
522 {
523 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525 {
526 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0;
529 }
530 }
531#endif
532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
535 }
536#endif
537
538 {
539 TEMP_ENV;
540
541 create_windows (argc, argv);
542
543 dDisp;
544
545 init_xlocale ();
546
547 scr_reset (); // initialize screen
548
549#if 0
550 XSynchronize (disp, True);
551#endif
552
553#ifdef HAVE_SCROLLBARS
554 if (OPTION (Opt_scrollBar))
555 resize_scrollbar (); /* create and map scrollbar */
556#endif
557#if (MENUBAR_MAX)
558 if (menubar_visible ())
559 XMapWindow (disp, menuBar.win);
560#endif
561#ifdef TRANSPARENT
562 if (OPTION (Opt_transparent))
563 {
564 XSelectInput (disp, display->root, PropertyChangeMask);
565 check_our_parents ();
566 rootwin_ev.start (display, display->root);
567 }
568#endif
569
570 XMapWindow (disp, vt);
571 XMapWindow (disp, parent[0]);
572
573 set_colorfgbg ();
574
575 init_command (cmd_argv);
576
577 free (cmd_argv);
578
579 if (pty.pty >= 0)
580 pty_ev.start (pty.pty, EVENT_READ);
581
582 check_ev.start ();
583
584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
586
587 return true;
588}
589
590static struct sig_handlers
591{
592 sig_watcher sw_chld, sw_term, sw_int;
593
594 void sig_chld (sig_watcher &w)
595 {
596 // we are being called for every SIGCHLD, find the corresponding term
597 int pid;
598
599 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
600 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
601 if (pid == (*t)->cmd_pid)
602 {
603 (*t)->child_exit ();
604 break;
605 }
606 }
607
608 /* 529 /*
609 * Catch a fatal signal and tidy up before quitting 530 * Catch a fatal signal and tidy up before quitting
610 */ 531 */
611 void 532 void
612 sig_term (sig_watcher &w) 533 sig_term (sig_watcher &w)
… …
618 signal (w.signum, SIG_DFL); 539 signal (w.signum, SIG_DFL);
619 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
620 } 541 }
621 542
622 sig_handlers () 543 sig_handlers ()
623 : sw_chld (this, &sig_handlers::sig_chld),
624 sw_term (this, &sig_handlers::sig_term), 544 : sw_term (this, &sig_handlers::sig_term),
625 sw_int (this, &sig_handlers::sig_term) 545 sw_int (this, &sig_handlers::sig_term)
626 { 546 {
627 } 547 }
628} sig_handlers; 548} sig_handlers;
629 549
550char **rxvt_environ; // startup environment
551
630void 552void
631rxvt_init () 553rxvt_init ()
632{ 554{
633 /* 555 uid_t uid = getuid ();
634 * Save and then give up any super-user privileges 556 gid_t gid = getgid ();
635 * If we need privileges in any area then we must specifically request it. 557
636 * We should only need to be root in these cases: 558 // before doing anything else, check for setuid/setgid operation,
637 * 1. write utmp entries on some systems 559 // start the helper process and drop privileges
638 * 2. chown tty on some systems 560 if (uid != geteuid ()
639 */ 561 || gid != getegid ())
640 rxvt_privileges (SAVE); 562 {
641 rxvt_privileges (IGNORE); 563#if PTYTTY_HELPER
564 rxvt_ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585
586 rxvt_environ = environ;
642 587
643 signal (SIGHUP, SIG_IGN); 588 signal (SIGHUP, SIG_IGN);
644 signal (SIGPIPE, SIG_IGN); 589 signal (SIGPIPE, SIG_IGN);
645 590
646 sig_handlers.sw_chld.start (SIGCHLD);
647 sig_handlers.sw_term.start (SIGTERM); 591 sig_handlers.sw_term.start (SIGTERM);
648 sig_handlers.sw_int.start (SIGINT); 592 sig_handlers.sw_int.start (SIGINT);
649 593
650 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
651 /* signal (SIGURG, SIG_DFL); */ 595 /* signal (SIGURG, SIG_DFL); */
… …
680 rxvt_fatal ("memory allocation failure. aborting.\n"); 624 rxvt_fatal ("memory allocation failure. aborting.\n");
681 625
682 return p; 626 return p;
683} 627}
684 628
685void * 629void *
686rxvt_realloc (void *ptr, size_t size) 630rxvt_realloc (void *ptr, size_t size)
687{ 631{
688 void *p = realloc (ptr, size); 632 void *p = realloc (ptr, size);
689 633
690 if (!p) 634 if (!p)
691 rxvt_fatal ("memory allocation failure. aborting.\n"); 635 rxvt_fatal ("memory allocation failure. aborting.\n");
692 636
693 return p; 637 return p;
694} 638}
695
696/* ------------------------------------------------------------------------- *
697 * PRIVILEGED OPERATIONS *
698 * ------------------------------------------------------------------------- */
699/* take care of suid/sgid super-user (root) privileges */
700void
701rxvt_privileges (rxvt_privaction action)
702{
703#if ! defined(__CYGWIN32__)
704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
705 /* setreuid () is the poor man's setuid (), seteuid () */
706# define seteuid(a) setreuid(-1, (a))
707# define setegid(a) setregid(-1, (a))
708# define HAVE_SETEUID
709# endif
710# ifdef HAVE_SETEUID
711 switch (action)
712 {
713 case IGNORE:
714 /*
715 * change effective uid/gid - not real uid/gid - so we can switch
716 * back to root later, as required
717 */
718 setegid (getgid ());
719 seteuid (getuid ());
720 break;
721 case SAVE:
722 saved_egid = getegid ();
723 saved_euid = geteuid ();
724 break;
725 case RESTORE:
726 setegid (saved_egid);
727 seteuid (saved_euid);
728 break;
729 }
730# else
731 switch (action)
732 {
733 case IGNORE:
734 setgid (getgid ());
735 setuid (getuid ());
736 /* FALLTHROUGH */
737 case SAVE:
738 /* FALLTHROUGH */
739 case RESTORE:
740 break;
741 }
742# endif
743#endif
744}
745
746#ifdef UTMP_SUPPORT
747void
748rxvt_term::privileged_utmp (rxvt_privaction action)
749{
750 if (OPTION (Opt_utmpInhibit)
751 || !pty.name || !*pty.name)
752 return;
753
754 rxvt_privileges (RESTORE);
755
756 if (action == SAVE)
757 makeutent (pty.name, rs[Rs_display_name]);
758 else
759 cleanutent ();
760
761 rxvt_privileges (IGNORE);
762}
763#endif
764 639
765/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
766/* 641/*
767 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculcations for XSizeHint and other storage.
768 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
769 */ 644 */
770void 645void
771rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
772{ 647{
773 short recalc_x, recalc_y; 648 short recalc_x, recalc_y;
774 int x, y, sb_w, mb_h, flags; 649 int x, y, sb_w, flags;
775 unsigned int w, h; 650 unsigned int w, h;
776 unsigned int max_width, max_height; 651 unsigned int max_width, max_height;
777 dDisp; 652 dDisp;
778 653
779 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
840 max_width = MAX_COLS * fwidth; 715 max_width = MAX_COLS * fwidth;
841 max_height = MAX_ROWS * fheight; 716 max_height = MAX_ROWS * fheight;
842 717
843 szHint.base_width = szHint.base_height = 2 * int_bwidth; 718 szHint.base_width = szHint.base_height = 2 * int_bwidth;
844 719
845 sb_w = mb_h = 0; 720 sb_w = 0;
846 window_vt_x = window_vt_y = int_bwidth; 721 window_vt_x = window_vt_y = int_bwidth;
847 722
848 if (scrollbar_visible ()) 723 if (scrollBar.state)
849 { 724 {
850 sb_w = scrollbar_TotalWidth (); 725 sb_w = scrollbar_TotalWidth ();
851 szHint.base_width += sb_w; 726 szHint.base_width += sb_w;
852 if (!OPTION (Opt_scrollBar_right)) 727 if (!OPTION (Opt_scrollBar_right))
853 window_vt_x += sb_w; 728 window_vt_x += sb_w;
854 } 729 }
855 730
856 if (menubar_visible ())
857 {
858 mb_h = menuBar_TotalHeight ();
859 szHint.base_height += mb_h;
860 window_vt_y += mb_h;
861 }
862
863 szHint.width_inc = fwidth; 731 szHint.width_inc = fwidth;
864 szHint.height_inc = fheight; 732 szHint.height_inc = fheight;
865 szHint.min_width = szHint.base_width + szHint.width_inc; 733 szHint.min_width = szHint.base_width + szHint.width_inc;
866 szHint.min_height = szHint.base_height + szHint.height_inc; 734 szHint.min_height = szHint.base_height + szHint.height_inc;
867 735
… …
885 { 753 {
886 min_it (height, max_height); 754 min_it (height, max_height);
887 szHint.height = szHint.base_height + height; 755 szHint.height = szHint.base_height + height;
888 } 756 }
889 757
890 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 758 if (scrollBar.state && OPTION (Opt_scrollBar_right))
891 window_sb_x = szHint.width - sb_w; 759 window_sb_x = szHint.width - sb_w;
892 760
893 if (recalc_x) 761 if (recalc_x)
894 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
895 if (recalc_y) 763 if (recalc_y)
… …
909 * Called after a window size change. 777 * Called after a window size change.
910 */ 778 */
911void 779void
912rxvt_term::tt_winch () 780rxvt_term::tt_winch ()
913{ 781{
914 if (pty.pty < 0) 782 if (pty->pty < 0)
915 return; 783 return;
916 784
917 struct winsize ws; 785 struct winsize ws;
918 786
919 ws.ws_col = ncol; 787 ws.ws_col = ncol;
920 ws.ws_row = nrow; 788 ws.ws_row = nrow;
921 ws.ws_xpixel = width; 789 ws.ws_xpixel = width;
922 ws.ws_ypixel = height; 790 ws.ws_ypixel = height;
923 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
924 792
925#if 0 793#if 0
926 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
927 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
928 kill (-cmd_pid, SIGWINCH); 796 kill (-cmd_pid, SIGWINCH);
… …
1250 1118
1251 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1252 1120
1253 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1254 { 1122 {
1255 if (scrollbar_visible ()) 1123 if (scrollBar.state)
1256 { 1124 {
1257 XMoveResizeWindow (disp, scrollBar.win, 1125 XMoveResizeWindow (disp, scrollBar.win,
1258 window_sb_x, 0, 1126 window_sb_x, 0,
1259 scrollbar_TotalWidth (), szHint.height); 1127 scrollbar_TotalWidth (), szHint.height);
1260 resize_scrollbar (); 1128 resize_scrollbar ();
1261 } 1129 }
1262
1263 if (menubar_visible ())
1264 XMoveResizeWindow (disp, menuBar.win,
1265 window_vt_x, 0,
1266 width, menuBar_TotalHeight ());
1267 1130
1268 XMoveResizeWindow (disp, vt, 1131 XMoveResizeWindow (disp, vt,
1269 window_vt_x, window_vt_y, 1132 window_vt_x, window_vt_y,
1270 width, height); 1133 width, height);
1271 1134
… …
1456 unsigned long fg, bg; 1319 unsigned long fg, bg;
1457 const char *p; 1320 const char *p;
1458 char **s; 1321 char **s;
1459 XIMStyles *xim_styles; 1322 XIMStyles *xim_styles;
1460 1323
1461 TEMP_ENV; 1324 set_environ (envv);
1462 1325
1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1464 return false; 1327 return false;
1465 1328
1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1632 int i; 1495 int i;
1633 const char *p; 1496 const char *p;
1634 char **s; 1497 char **s;
1635 char buf[IMBUFSIZ]; 1498 char buf[IMBUFSIZ];
1636 1499
1637 SET_R (this); 1500 make_current ();
1638 1501
1639 im_destroy (); 1502 im_destroy ();
1640 1503
1641 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1642 if (Input_Context) 1505 if (Input_Context)
… …
1719 XFree (preedit_attr); 1582 XFree (preedit_attr);
1720 XFree (status_attr); 1583 XFree (status_attr);
1721} 1584}
1722#endif /* USE_XIM */ 1585#endif /* USE_XIM */
1723 1586
1724/*----------------------------------------------------------------------*/
1725rxvt_t rxvt_current_term;
1726
1727/*----------------------- end-of-file (C source) -----------------------*/ 1587/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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