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.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC

… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66bool 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 150#endif
148#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 153#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 156#endif
157#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 178 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 179 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 180 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 181 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 182 incr_ev (this, &rxvt_term::incr_cb)
… …
184 185
185 termlist.push_back (this); 186 termlist.push_back (this);
186 187
187#ifdef KEYSYM_RESOURCE 188#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager; 189 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif 190#endif
193} 191}
194 192
195// clean up the most important stuff, do *not* call x or free mem etc. 193// clean up the most important stuff, do *not* call x or free mem etc.
196// for use before an emergency exit 194// for use before an emergency exit
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));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 205 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 206
215 emergency_cleanup (); 207 emergency_cleanup ();
216 208
217#if ENABLE_STYLES 209#if ENABLE_STYLES
… …
227 219
228 selection_clear (); 220 selection_clear ();
229 221
230#ifdef USE_XIM 222#ifdef USE_XIM
231 im_destroy (); 223 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 224#endif
236#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 228#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 243#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 248#endif
260 if (gc) XFreeGC (disp, gc); 249 if (gc) XFreeGC (disp, gc);
261 250
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; 251 delete drawable;
268 // destroy all windows 252 // destroy all windows
269 if (parent[0]) 253 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 254 XDestroyWindow (disp, parent[0]);
271 } 255 }
272 256
273 // TODO: free pixcolours, colours should become part of rxvt_display 257 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 258 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 260 delete pix_colors_unfocused;
278#endif 261#endif
279 262
… …
301#ifdef KEYSYM_RESOURCE 284#ifdef KEYSYM_RESOURCE
302 delete keyboard; 285 delete keyboard;
303#endif 286#endif
304} 287}
305 288
289// child has exited, usually destroys
306void 290void
307rxvt_term::child_exit () 291rxvt_term::child_cb (child_watcher &w, int status)
308{ 292{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294
309 cmd_pid = 0; 295 cmd_pid = 0;
310 296
311 if (!OPTION (Opt_hold)) 297 if (!OPTION (Opt_hold))
312 destroy (); 298 destroy ();
313} 299}
… …
316rxvt_term::destroy () 302rxvt_term::destroy ()
317{ 303{
318 if (destroy_ev.active) 304 if (destroy_ev.active)
319 return; 305 return;
320 306
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
308 return;
309
321#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
322 scr_overlay_off (); 311 scr_overlay_off ();
323#endif 312#endif
324 313
325 if (display) 314 if (display)
… …
327#if USE_XIM 316#if USE_XIM
328 im_ev.stop (display); 317 im_ev.stop (display);
329#endif 318#endif
330#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
332#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif 321#endif
336#if TRANSPARENT 322#if TRANSPARENT
337 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
338#endif 324#endif
339 incr_ev.stop (); 325 incr_ev.stop ();
… …
363} 349}
364 350
365void 351void
366rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
367{ 353{
368 SET_R (this); 354 make_current ();
369 355
370 delete this; 356 delete this;
371} 357}
372 358
373/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
465bool 451bool
466rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv)
467{ 453{
468 SET_R (this); 454 SET_R (this);
469
470 set_locale (""); 455 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :(
471 457
472 if (!init_vars ()) 458 if (!init_vars ())
473 return false; 459 return false;
474 460
475 init_secondary (); 461 init_secondary ();
… …
478 464
479#ifdef KEYSYM_RESOURCE 465#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 466 keyboard->register_done ();
481#endif 467#endif
482 468
483#if MENUBAR_MAX 469#if ENABLE_PERL
484 menubar_read (rs[Rs_menu]); 470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
485#endif 480#endif
481
486#ifdef HAVE_SCROLLBARS 482#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 483 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 484 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 485#endif
490 486
491#if ENABLE_PERL 487 pty = rxvt_new_ptytty ();
492 if (!rs[Rs_perl_ext_1])
493 rs[Rs_perl_ext_1] = "default";
494
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_perl.init ();
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 }
502#endif
503 488
504 create_windows (argc, argv); 489 create_windows (argc, argv);
505 490
506 dDisp; 491 dDisp;
507 492
508 init_xlocale (); 493 init_xlocale ();
509 494
510 scr_reset (); /* initialize screen */ 495 scr_reset (); // initialize screen
511 496
512#if 0 497#if 0
513 XSynchronize (disp, True); 498 XSynchronize (disp, True);
514#endif 499#endif
515 500
516#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
517 if (OPTION (Opt_scrollBar)) 502 if (OPTION (Opt_scrollBar))
518 resize_scrollbar (); /* create and map scrollbar */ 503 resize_scrollbar (); /* create and map scrollbar */
519#endif 504#endif
520#if (MENUBAR_MAX)
521 if (menubar_visible ())
522 XMapWindow (disp, menuBar.win);
523#endif
524#ifdef TRANSPARENT 505#ifdef TRANSPARENT
525 if (OPTION (Opt_transparent)) 506 if (OPTION (Opt_transparent))
526 { 507 {
527 XSelectInput (disp, display->root, PropertyChangeMask); 508 XSelectInput (disp, display->root, PropertyChangeMask);
528 check_our_parents (); 509 check_our_parents ();
529 rootwin_ev.start (display, display->root); 510 rootwin_ev.start (display, display->root);
530 } 511 }
531#endif 512#endif
532 513
514 set_colorfgbg ();
515
516 init_command (cmd_argv);
517
518 free (cmd_argv);
519
520 if (pty->pty >= 0)
521 pty_ev.start (pty->pty, EVENT_READ);
522
523 check_ev.start ();
524
525 HOOK_INVOKE ((this, HOOK_START, DT_END));
526
533 XMapWindow (disp, vt); 527 XMapWindow (disp, vt);
534 XMapWindow (disp, parent[0]); 528 XMapWindow (disp, parent[0]);
535 529
536 set_colorfgbg ();
537
538 init_command (cmd_argv);
539
540 free (cmd_argv);
541
542 if (pty.pty >= 0)
543 pty_ev.start (pty.pty, EVENT_READ);
544
545 check_ev.start ();
546
547 HOOK_INVOKE ((this, HOOK_START, DT_END));
548
549 return true; 530 return true;
550} 531}
551 532
552static struct sig_handlers 533static struct sig_handlers
553{ 534{
554 sig_watcher sw_chld, sw_term, sw_int; 535 sig_watcher sw_term, sw_int;
555 536
556 void sig_chld (sig_watcher &w)
557 {
558 // we are being called for every SIGCHLD, find the corresponding term
559 int pid;
560
561 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
562 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
563 if (pid == (*t)->cmd_pid)
564 {
565 (*t)->child_exit ();
566 break;
567 }
568 }
569
570 /* 537 /*
571 * Catch a fatal signal and tidy up before quitting 538 * Catch a fatal signal and tidy up before quitting
572 */ 539 */
573 void 540 void
574 sig_term (sig_watcher &w) 541 sig_term (sig_watcher &w)
… …
580 signal (w.signum, SIG_DFL); 547 signal (w.signum, SIG_DFL);
581 kill (getpid (), w.signum); 548 kill (getpid (), w.signum);
582 } 549 }
583 550
584 sig_handlers () 551 sig_handlers ()
585 : sw_chld (this, &sig_handlers::sig_chld),
586 sw_term (this, &sig_handlers::sig_term), 552 : sw_term (this, &sig_handlers::sig_term),
587 sw_int (this, &sig_handlers::sig_term) 553 sw_int (this, &sig_handlers::sig_term)
588 { 554 {
589 } 555 }
590} sig_handlers; 556} sig_handlers;
591 557
558char **rxvt_environ; // startup environment
559
592void 560void
593rxvt_init () 561rxvt_init ()
594{ 562{
595 /* 563 uid_t uid = getuid ();
596 * Save and then give up any super-user privileges 564 gid_t gid = getgid ();
597 * If we need privileges in any area then we must specifically request it. 565
598 * We should only need to be root in these cases: 566 // before doing anything else, check for setuid/setgid operation,
599 * 1. write utmp entries on some systems 567 // start the helper process and drop privileges
600 * 2. chown tty on some systems 568 if (uid != geteuid ()
601 */ 569 || gid != getegid ())
602 rxvt_privileges (SAVE); 570 {
603 rxvt_privileges (IGNORE); 571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576
577 // drop privileges
578#if HAVE_SETRESUID
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593
594 rxvt_environ = environ;
604 595
605 signal (SIGHUP, SIG_IGN); 596 signal (SIGHUP, SIG_IGN);
606 signal (SIGPIPE, SIG_IGN); 597 signal (SIGPIPE, SIG_IGN);
607 598
608 sig_handlers.sw_chld.start (SIGCHLD);
609 sig_handlers.sw_term.start (SIGTERM); 599 sig_handlers.sw_term.start (SIGTERM);
610 sig_handlers.sw_int.start (SIGINT); 600 sig_handlers.sw_int.start (SIGINT);
611 601
612 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 602 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
613 /* signal (SIGURG, SIG_DFL); */ 603 /* signal (SIGURG, SIG_DFL); */
614 604
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 605 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 606 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 607 XSetIOErrorHandler (rxvt_xioerror_handler);
608
609 XrmInitialize ();
618} 610}
619 611
620/* ------------------------------------------------------------------------- * 612/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 613 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 614 * ------------------------------------------------------------------------- */
… …
640 rxvt_fatal ("memory allocation failure. aborting.\n"); 632 rxvt_fatal ("memory allocation failure. aborting.\n");
641 633
642 return p; 634 return p;
643} 635}
644 636
645void * 637void *
646rxvt_realloc (void *ptr, size_t size) 638rxvt_realloc (void *ptr, size_t size)
647{ 639{
648 void *p = realloc (ptr, size); 640 void *p = realloc (ptr, size);
649 641
650 if (!p) 642 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n"); 643 rxvt_fatal ("memory allocation failure. aborting.\n");
652 644
653 return p; 645 return p;
654} 646}
655
656/* ------------------------------------------------------------------------- *
657 * PRIVILEGED OPERATIONS *
658 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */
660void
661rxvt_privileges (rxvt_privaction action)
662{
663#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
664 static uid_t euid;
665 static gid_t egid;
666#endif
667
668#if ! defined(__CYGWIN32__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a))
673# define HAVE_SETEUID
674# endif
675# ifdef HAVE_SETEUID
676 switch (action)
677 {
678 case IGNORE:
679 /*
680 * change effective uid/gid - not real uid/gid - so we can switch
681 * back to root later, as required
682 */
683 seteuid (getuid ());
684 setegid (getgid ());
685 break;
686 case SAVE:
687 euid = geteuid ();
688 egid = getegid ();
689 break;
690 case RESTORE:
691 seteuid (euid);
692 setegid (egid);
693 break;
694 }
695# else
696 switch (action)
697 {
698 case IGNORE:
699 setuid (getuid ());
700 setgid (getgid ());
701 /* FALLTHROUGH */
702 case SAVE:
703 /* FALLTHROUGH */
704 case RESTORE:
705 break;
706 }
707# endif
708#endif
709}
710
711#ifdef UTMP_SUPPORT
712void
713rxvt_term::privileged_utmp (rxvt_privaction action)
714{
715 if (OPTION (Opt_utmpInhibit)
716 || !pty.name || !*pty.name)
717 return;
718
719 rxvt_privileges (RESTORE);
720
721 if (action == SAVE)
722 makeutent (pty.name, rs[Rs_display_name]);
723 else
724 cleanutent ();
725
726 rxvt_privileges (IGNORE);
727}
728#endif
729 647
730/*----------------------------------------------------------------------*/ 648/*----------------------------------------------------------------------*/
731/* 649/*
732 * window size/position calculcations for XSizeHint and other storage. 650 * window size/position calculcations for XSizeHint and other storage.
733 * if width/height are non-zero then override calculated width/height 651 * if width/height are non-zero then override calculated width/height
734 */ 652 */
735void 653void
736rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 654rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
737{ 655{
738 short recalc_x, recalc_y; 656 short recalc_x, recalc_y;
739 int x, y, sb_w, mb_h, flags; 657 int x, y, sb_w, flags;
740 unsigned int w, h; 658 unsigned int w, h;
741 unsigned int max_width, max_height; 659 unsigned int max_width, max_height;
742 dDisp; 660 dDisp;
743 661
744 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
805 max_width = MAX_COLS * fwidth; 723 max_width = MAX_COLS * fwidth;
806 max_height = MAX_ROWS * fheight; 724 max_height = MAX_ROWS * fheight;
807 725
808 szHint.base_width = szHint.base_height = 2 * int_bwidth; 726 szHint.base_width = szHint.base_height = 2 * int_bwidth;
809 727
810 sb_w = mb_h = 0; 728 sb_w = 0;
811 window_vt_x = window_vt_y = int_bwidth; 729 window_vt_x = window_vt_y = int_bwidth;
812 730
813 if (scrollbar_visible ()) 731 if (scrollBar.state)
814 { 732 {
815 sb_w = scrollbar_TotalWidth (); 733 sb_w = scrollbar_TotalWidth ();
816 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
817 if (!OPTION (Opt_scrollBar_right)) 735 if (!OPTION (Opt_scrollBar_right))
818 window_vt_x += sb_w; 736 window_vt_x += sb_w;
819 } 737 }
820 738
821 if (menubar_visible ())
822 {
823 mb_h = menuBar_TotalHeight ();
824 szHint.base_height += mb_h;
825 window_vt_y += mb_h;
826 }
827
828 szHint.width_inc = fwidth; 739 szHint.width_inc = fwidth;
829 szHint.height_inc = fheight; 740 szHint.height_inc = fheight;
830 szHint.min_width = szHint.base_width + szHint.width_inc; 741 szHint.min_width = szHint.base_width + szHint.width_inc;
831 szHint.min_height = szHint.base_height + szHint.height_inc; 742 szHint.min_height = szHint.base_height + szHint.height_inc;
832 743
… …
850 { 761 {
851 min_it (height, max_height); 762 min_it (height, max_height);
852 szHint.height = szHint.base_height + height; 763 szHint.height = szHint.base_height + height;
853 } 764 }
854 765
855 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 766 if (scrollBar.state && OPTION (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 767 window_sb_x = szHint.width - sb_w;
857 768
858 if (recalc_x) 769 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
860 if (recalc_y) 771 if (recalc_y)
… …
874 * Called after a window size change. 785 * Called after a window size change.
875 */ 786 */
876void 787void
877rxvt_term::tt_winch () 788rxvt_term::tt_winch ()
878{ 789{
879 if (pty.pty < 0) 790 if (pty->pty < 0)
880 return; 791 return;
881 792
882 struct winsize ws; 793 struct winsize ws;
883 794
884 ws.ws_col = ncol; 795 ws.ws_col = ncol;
885 ws.ws_row = nrow; 796 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 797 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 798 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 799 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 800
890#if 0 801#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 802 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
… …
1215 1126
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1128
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1129 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1130 {
1220 if (scrollbar_visible ()) 1131 if (scrollBar.state)
1221 { 1132 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1133 XMoveResizeWindow (disp, scrollBar.win,
1223 window_sb_x, 0, 1134 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1135 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1136 resize_scrollbar ();
1226 } 1137 }
1227
1228 if (menubar_visible ())
1229 XMoveResizeWindow (disp, menuBar.win,
1230 window_vt_x, 0,
1231 width, menuBar_TotalHeight ());
1232 1138
1233 XMoveResizeWindow (disp, vt, 1139 XMoveResizeWindow (disp, vt,
1234 window_vt_x, window_vt_y, 1140 window_vt_x, window_vt_y,
1235 width, height); 1141 width, height);
1236 1142
… …
1420 XRectangle rect, status_rect, needed_rect; 1326 XRectangle rect, status_rect, needed_rect;
1421 unsigned long fg, bg; 1327 unsigned long fg, bg;
1422 const char *p; 1328 const char *p;
1423 char **s; 1329 char **s;
1424 XIMStyles *xim_styles; 1330 XIMStyles *xim_styles;
1331
1332 set_environ (envv);
1425 1333
1426 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427 return false; 1335 return false;
1428 1336
1429 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1595 int i; 1503 int i;
1596 const char *p; 1504 const char *p;
1597 char **s; 1505 char **s;
1598 char buf[IMBUFSIZ]; 1506 char buf[IMBUFSIZ];
1599 1507
1600 SET_R (this); 1508 make_current ();
1601 1509
1602 im_destroy (); 1510 im_destroy ();
1603 1511
1604 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1605 if (Input_Context) 1513 if (Input_Context)
… …
1682 XFree (preedit_attr); 1590 XFree (preedit_attr);
1683 XFree (status_attr); 1591 XFree (status_attr);
1684} 1592}
1685#endif /* USE_XIM */ 1593#endif /* USE_XIM */
1686 1594
1687/*----------------------------------------------------------------------*/
1688rxvt_t rxvt_current_term;
1689
1690/*----------------------- end-of-file (C source) -----------------------*/ 1595/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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