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.169 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.196 by root, Sun Jan 22 04:01:52 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 }
287 259
288 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
289
290 delete pix_colors_focused; 261 delete pix_colors_focused;
291#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
292 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
293#endif
294#if USE_XGETDEFAULT
295 XrmDestroyDatabase (xrmdatabase);
296#endif 264#endif
297 265
298 displays.put (display); 266 displays.put (display);
299 267
300 scr_release (); 268 scr_release ();
… …
319#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
320 delete keyboard; 288 delete keyboard;
321#endif 289#endif
322} 290}
323 291
292// child has exited, usually destroys
324void 293void
325rxvt_term::child_exit () 294rxvt_term::child_cb (child_watcher &w, int status)
326{ 295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
327 cmd_pid = 0; 298 cmd_pid = 0;
328 299
329 if (!OPTION (Opt_hold)) 300 if (!OPTION (Opt_hold))
330 destroy (); 301 destroy ();
331} 302}
… …
334rxvt_term::destroy () 305rxvt_term::destroy ()
335{ 306{
336 if (destroy_ev.active) 307 if (destroy_ev.active)
337 return; 308 return;
338 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
339#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
340 scr_overlay_off (); 314 scr_overlay_off ();
341#endif 315#endif
342 316
343 if (display) 317 if (display)
… …
345#if USE_XIM 319#if USE_XIM
346 im_ev.stop (display); 320 im_ev.stop (display);
347#endif 321#endif
348#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
350#endif
351#if MENUBAR
352 menubar_ev.stop (display);
353#endif 324#endif
354#if TRANSPARENT 325#if TRANSPARENT
355 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
356#endif 327#endif
357 incr_ev.stop (); 328 incr_ev.stop ();
… …
381} 352}
382 353
383void 354void
384rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
385{ 356{
386 SET_R (this); 357 make_current ();
387 358
388 delete this; 359 delete this;
389} 360}
390 361
391/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
479 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
480} 451}
481 452
482/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
483bool 454bool
484rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
485{ 456{
457 this->envv = envv;
458
486 SET_R (this); 459 SET_R (this);
487
488 set_locale (""); 460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
489 462
490 if (!init_vars ()) 463 if (!init_vars ())
491 return false; 464 return false;
492 465
493 init_secondary (); 466 init_secondary ();
… …
496 469
497#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
498 keyboard->register_done (); 471 keyboard->register_done ();
499#endif 472#endif
500 473
501#if MENUBAR_MAX
502 menubar_read (rs[Rs_menu]);
503#endif
504#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
505 if (OPTION (Opt_scrollBar)) 475 if (OPTION (Opt_scrollBar))
506 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
507#endif 477#endif
508 478
509#if ENABLE_PERL 479 pty = ptytty::create ();
510 if (!rs[Rs_perl_ext_1])
511 rs[Rs_perl_ext_1] = "default";
512
513 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
514 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
515 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
516 {
517#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
518 // ignore some perl-related arguments if some bozo installed us set[ug]id
519 if (rxvt_tainted ())
520 {
521 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
522 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
523 {
524 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
525 rs[Rs_perl_lib] = 0;
526 rs[Rs_perl_eval] = 0;
527 }
528 }
529#endif
530 rxvt_perl.init ();
531 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
532 }
533#endif
534 480
535 create_windows (argc, argv); 481 create_windows (argc, argv);
536 482
537 dDisp; 483 dDisp;
538 484
539 init_xlocale (); 485 init_xlocale ();
540 486
541 scr_reset (); /* initialize screen */ 487 scr_reset (); // initialize screen
542 488
543#if 0 489#if 0
544 XSynchronize (disp, True); 490 XSynchronize (disp, True);
545#endif 491#endif
546 492
547#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
548 if (OPTION (Opt_scrollBar)) 494 if (OPTION (Opt_scrollBar))
549 resize_scrollbar (); /* create and map scrollbar */ 495 resize_scrollbar (); /* create and map scrollbar */
550#endif 496#endif
551#if (MENUBAR_MAX)
552 if (menubar_visible ())
553 XMapWindow (disp, menuBar.win);
554#endif
555#ifdef TRANSPARENT 497#ifdef TRANSPARENT
556 if (OPTION (Opt_transparent)) 498 if (OPTION (Opt_transparent))
557 { 499 {
558 XSelectInput (disp, display->root, PropertyChangeMask); 500 XSelectInput (disp, display->root, PropertyChangeMask);
559 check_our_parents (); 501 check_our_parents ();
560 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
561 } 503 }
562#endif 504#endif
563 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
564 XMapWindow (disp, vt); 519 XMapWindow (disp, vt);
565 XMapWindow (disp, parent[0]); 520 XMapWindow (disp, parent[0]);
566 521
567 set_colorfgbg ();
568
569 init_command (cmd_argv);
570
571 free (cmd_argv);
572
573 if (pty.pty >= 0)
574 pty_ev.start (pty.pty, EVENT_READ);
575
576 check_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
579
580 return true; 522 return true;
581} 523}
582 524
583static struct sig_handlers 525static struct sig_handlers
584{ 526{
585 sig_watcher sw_chld, sw_term, sw_int; 527 sig_watcher sw_term, sw_int;
586 528
587 void sig_chld (sig_watcher &w)
588 {
589 // we are being called for every SIGCHLD, find the corresponding term
590 int pid;
591
592 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
593 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
594 if (pid == (*t)->cmd_pid)
595 {
596 (*t)->child_exit ();
597 break;
598 }
599 }
600
601 /* 529 /*
602 * Catch a fatal signal and tidy up before quitting 530 * Catch a fatal signal and tidy up before quitting
603 */ 531 */
604 void 532 void
605 sig_term (sig_watcher &w) 533 sig_term (sig_watcher &w)
… …
611 signal (w.signum, SIG_DFL); 539 signal (w.signum, SIG_DFL);
612 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
613 } 541 }
614 542
615 sig_handlers () 543 sig_handlers ()
616 : sw_chld (this, &sig_handlers::sig_chld),
617 sw_term (this, &sig_handlers::sig_term), 544 : sw_term (this, &sig_handlers::sig_term),
618 sw_int (this, &sig_handlers::sig_term) 545 sw_int (this, &sig_handlers::sig_term)
619 { 546 {
620 } 547 }
621} sig_handlers; 548} sig_handlers;
622 549
550char **rxvt_environ; // startup environment
551
623void 552void
624rxvt_init () 553rxvt_init ()
625{ 554{
626 /* 555 ptytty::init ();
627 * Save and then give up any super-user privileges 556
628 * If we need privileges in any area then we must specifically request it. 557 rxvt_environ = environ;
629 * We should only need to be root in these cases:
630 * 1. write utmp entries on some systems
631 * 2. chown tty on some systems
632 */
633 rxvt_privileges (SAVE);
634 rxvt_privileges (IGNORE);
635 558
636 signal (SIGHUP, SIG_IGN); 559 signal (SIGHUP, SIG_IGN);
637 signal (SIGPIPE, SIG_IGN); 560 signal (SIGPIPE, SIG_IGN);
638 561
639 sig_handlers.sw_chld.start (SIGCHLD);
640 sig_handlers.sw_term.start (SIGTERM); 562 sig_handlers.sw_term.start (SIGTERM);
641 sig_handlers.sw_int.start (SIGINT); 563 sig_handlers.sw_int.start (SIGINT);
642 564
643 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 565 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
644 /* signal (SIGURG, SIG_DFL); */ 566 /* signal (SIGURG, SIG_DFL); */
645 567
646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 568 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
647 // TODO: handle this with exceptions and tolerate the memory loss 569 // TODO: handle this with exceptions and tolerate the memory loss
648 XSetIOErrorHandler (rxvt_xioerror_handler); 570 XSetIOErrorHandler (rxvt_xioerror_handler);
649 571
650#ifdef USE_XGETDEFAULT
651 XrmInitialize (); 572 XrmInitialize ();
652#endif
653} 573}
654 574
655/* ------------------------------------------------------------------------- * 575/* ------------------------------------------------------------------------- *
656 * MEMORY ALLOCATION WRAPPERS * 576 * MEMORY ALLOCATION WRAPPERS *
657 * ------------------------------------------------------------------------- */ 577 * ------------------------------------------------------------------------- */
… …
675 rxvt_fatal ("memory allocation failure. aborting.\n"); 595 rxvt_fatal ("memory allocation failure. aborting.\n");
676 596
677 return p; 597 return p;
678} 598}
679 599
680void * 600void *
681rxvt_realloc (void *ptr, size_t size) 601rxvt_realloc (void *ptr, size_t size)
682{ 602{
683 void *p = realloc (ptr, size); 603 void *p = realloc (ptr, size);
684 604
685 if (!p) 605 if (!p)
686 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
687 607
688 return p; 608 return p;
689} 609}
690
691/* ------------------------------------------------------------------------- *
692 * PRIVILEGED OPERATIONS *
693 * ------------------------------------------------------------------------- */
694/* take care of suid/sgid super-user (root) privileges */
695void
696rxvt_privileges (rxvt_privaction action)
697{
698#if ! defined(__CYGWIN32__)
699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
700 /* setreuid () is the poor man's setuid (), seteuid () */
701# define seteuid(a) setreuid(-1, (a))
702# define setegid(a) setregid(-1, (a))
703# define HAVE_SETEUID
704# endif
705# ifdef HAVE_SETEUID
706 switch (action)
707 {
708 case IGNORE:
709 /*
710 * change effective uid/gid - not real uid/gid - so we can switch
711 * back to root later, as required
712 */
713 seteuid (getuid ());
714 setegid (getgid ());
715 break;
716 case SAVE:
717 saved_euid = geteuid ();
718 saved_egid = getegid ();
719 break;
720 case RESTORE:
721 seteuid (saved_euid);
722 setegid (saved_egid);
723 break;
724 }
725# else
726 switch (action)
727 {
728 case IGNORE:
729 setuid (getuid ());
730 setgid (getgid ());
731 /* FALLTHROUGH */
732 case SAVE:
733 /* FALLTHROUGH */
734 case RESTORE:
735 break;
736 }
737# endif
738#endif
739}
740
741#ifdef UTMP_SUPPORT
742void
743rxvt_term::privileged_utmp (rxvt_privaction action)
744{
745 if (OPTION (Opt_utmpInhibit)
746 || !pty.name || !*pty.name)
747 return;
748
749 rxvt_privileges (RESTORE);
750
751 if (action == SAVE)
752 makeutent (pty.name, rs[Rs_display_name]);
753 else
754 cleanutent ();
755
756 rxvt_privileges (IGNORE);
757}
758#endif
759 610
760/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
761/* 612/*
762 * window size/position calculcations for XSizeHint and other storage. 613 * window size/position calculcations for XSizeHint and other storage.
763 * if width/height are non-zero then override calculated width/height 614 * if width/height are non-zero then override calculated width/height
764 */ 615 */
765void 616void
766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767{ 618{
768 short recalc_x, recalc_y; 619 short recalc_x, recalc_y;
769 int x, y, sb_w, mb_h, flags; 620 int x, y, sb_w, flags;
770 unsigned int w, h; 621 unsigned int w, h;
771 unsigned int max_width, max_height; 622 unsigned int max_width, max_height;
772 dDisp; 623 dDisp;
773 624
774 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
835 max_width = MAX_COLS * fwidth; 686 max_width = MAX_COLS * fwidth;
836 max_height = MAX_ROWS * fheight; 687 max_height = MAX_ROWS * fheight;
837 688
838 szHint.base_width = szHint.base_height = 2 * int_bwidth; 689 szHint.base_width = szHint.base_height = 2 * int_bwidth;
839 690
840 sb_w = mb_h = 0; 691 sb_w = 0;
841 window_vt_x = window_vt_y = int_bwidth; 692 window_vt_x = window_vt_y = int_bwidth;
842 693
843 if (scrollbar_visible ()) 694 if (scrollBar.state)
844 { 695 {
845 sb_w = scrollbar_TotalWidth (); 696 sb_w = scrollbar_TotalWidth ();
846 szHint.base_width += sb_w; 697 szHint.base_width += sb_w;
847 if (!OPTION (Opt_scrollBar_right)) 698 if (!OPTION (Opt_scrollBar_right))
848 window_vt_x += sb_w; 699 window_vt_x += sb_w;
849 } 700 }
850 701
851 if (menubar_visible ())
852 {
853 mb_h = menuBar_TotalHeight ();
854 szHint.base_height += mb_h;
855 window_vt_y += mb_h;
856 }
857
858 szHint.width_inc = fwidth; 702 szHint.width_inc = fwidth;
859 szHint.height_inc = fheight; 703 szHint.height_inc = fheight;
860 szHint.min_width = szHint.base_width + szHint.width_inc; 704 szHint.min_width = szHint.base_width + szHint.width_inc;
861 szHint.min_height = szHint.base_height + szHint.height_inc; 705 szHint.min_height = szHint.base_height + szHint.height_inc;
862 706
… …
880 { 724 {
881 min_it (height, max_height); 725 min_it (height, max_height);
882 szHint.height = szHint.base_height + height; 726 szHint.height = szHint.base_height + height;
883 } 727 }
884 728
885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 729 if (scrollBar.state && OPTION (Opt_scrollBar_right))
886 window_sb_x = szHint.width - sb_w; 730 window_sb_x = szHint.width - sb_w;
887 731
888 if (recalc_x) 732 if (recalc_x)
889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890 if (recalc_y) 734 if (recalc_y)
… …
904 * Called after a window size change. 748 * Called after a window size change.
905 */ 749 */
906void 750void
907rxvt_term::tt_winch () 751rxvt_term::tt_winch ()
908{ 752{
909 if (pty.pty < 0) 753 if (pty->pty < 0)
910 return; 754 return;
911 755
912 struct winsize ws; 756 struct winsize ws;
913 757
914 ws.ws_col = ncol; 758 ws.ws_col = ncol;
915 ws.ws_row = nrow; 759 ws.ws_row = nrow;
916 ws.ws_xpixel = width; 760 ws.ws_xpixel = width;
917 ws.ws_ypixel = height; 761 ws.ws_ypixel = height;
918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 762 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919 763
920#if 0 764#if 0
921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 765 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922 if (cmd_pid) /* force through to the command */ 766 if (cmd_pid) /* force through to the command */
923 kill (-cmd_pid, SIGWINCH); 767 kill (-cmd_pid, SIGWINCH);
… …
1245 1089
1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1247 1091
1248 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1249 { 1093 {
1250 if (scrollbar_visible ()) 1094 if (scrollBar.state)
1251 { 1095 {
1252 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (disp, scrollBar.win,
1253 window_sb_x, 0, 1097 window_sb_x, 0,
1254 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1255 resize_scrollbar (); 1099 resize_scrollbar ();
1256 } 1100 }
1257
1258 if (menubar_visible ())
1259 XMoveResizeWindow (disp, menuBar.win,
1260 window_vt_x, 0,
1261 width, menuBar_TotalHeight ());
1262 1101
1263 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (disp, vt,
1264 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1265 width, height); 1104 width, height);
1266 1105
… …
1450 XRectangle rect, status_rect, needed_rect; 1289 XRectangle rect, status_rect, needed_rect;
1451 unsigned long fg, bg; 1290 unsigned long fg, bg;
1452 const char *p; 1291 const char *p;
1453 char **s; 1292 char **s;
1454 XIMStyles *xim_styles; 1293 XIMStyles *xim_styles;
1294
1295 set_environ (envv);
1455 1296
1456 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1297 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1457 return false; 1298 return false;
1458 1299
1459 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1300 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1625 int i; 1466 int i;
1626 const char *p; 1467 const char *p;
1627 char **s; 1468 char **s;
1628 char buf[IMBUFSIZ]; 1469 char buf[IMBUFSIZ];
1629 1470
1630 SET_R (this); 1471 make_current ();
1631 1472
1632 im_destroy (); 1473 im_destroy ();
1633 1474
1634 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1475 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1635 if (Input_Context) 1476 if (Input_Context)
… …
1712 XFree (preedit_attr); 1553 XFree (preedit_attr);
1713 XFree (status_attr); 1554 XFree (status_attr);
1714} 1555}
1715#endif /* USE_XIM */ 1556#endif /* USE_XIM */
1716 1557
1717/*----------------------------------------------------------------------*/
1718rxvt_t rxvt_current_term;
1719
1720/*----------------------- end-of-file (C source) -----------------------*/ 1558/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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