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.195 by root, Sun Jan 22 00:48:13 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),
… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
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#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
184 188
185 termlist.push_back (this); 189 termlist.push_back (this);
186 190
187#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif 193#endif
193} 194}
194 195
195// 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.
196// for use before an emergency exit 197// for use before an emergency exit
197void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
198{ 199{
199 if (cmd_pid) 200 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
201 202
202#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
203 privileged_utmp (RESTORE);
204#endif
205
206 pty.put ();
207} 204}
208 205
209rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
210{ 207{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 209
215 emergency_cleanup (); 210 emergency_cleanup ();
216 211
217#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
227 222
228 selection_clear (); 223 selection_clear ();
229 224
230#ifdef USE_XIM 225#ifdef USE_XIM
231 im_destroy (); 226 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 227#endif
236#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 231#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 246#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 251#endif
260 if (gc) XFreeGC (disp, gc); 252 if (gc) XFreeGC (disp, gc);
261 253
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; 254 delete drawable;
268 // destroy all windows 255 // destroy all windows
269 if (parent[0]) 256 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 257 XDestroyWindow (disp, parent[0]);
271 } 258 }
272 259
273 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 261 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
278#endif
279#if USE_XGETDEFAULT
280 XrmDestroyDatabase (xrmdatabase);
281#endif 264#endif
282 265
283 displays.put (display); 266 displays.put (display);
284 267
285 scr_release (); 268 scr_release ();
… …
304#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
305 delete keyboard; 288 delete keyboard;
306#endif 289#endif
307} 290}
308 291
292// child has exited, usually destroys
309void 293void
310rxvt_term::child_exit () 294rxvt_term::child_cb (child_watcher &w, int status)
311{ 295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
312 cmd_pid = 0; 298 cmd_pid = 0;
313 299
314 if (!OPTION (Opt_hold)) 300 if (!OPTION (Opt_hold))
315 destroy (); 301 destroy ();
316} 302}
… …
319rxvt_term::destroy () 305rxvt_term::destroy ()
320{ 306{
321 if (destroy_ev.active) 307 if (destroy_ev.active)
322 return; 308 return;
323 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
324#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
325 scr_overlay_off (); 314 scr_overlay_off ();
326#endif 315#endif
327 316
328 if (display) 317 if (display)
… …
330#if USE_XIM 319#if USE_XIM
331 im_ev.stop (display); 320 im_ev.stop (display);
332#endif 321#endif
333#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
335#endif
336#if MENUBAR
337 menubar_ev.stop (display);
338#endif 324#endif
339#if TRANSPARENT 325#if TRANSPARENT
340 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
341#endif 327#endif
342 incr_ev.stop (); 328 incr_ev.stop ();
… …
366} 352}
367 353
368void 354void
369rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
370{ 356{
371 SET_R (this); 357 make_current ();
372 358
373 delete this; 359 delete this;
374} 360}
375 361
376/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
464 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
465} 451}
466 452
467/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
468bool 454bool
469rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{ 456{
457 this->envv = envv;
458
471 SET_R (this); 459 SET_R (this);
472
473 set_locale (""); 460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
474 462
475 if (!init_vars ()) 463 if (!init_vars ())
476 return false; 464 return false;
477 465
478 init_secondary (); 466 init_secondary ();
… …
481 469
482#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
483 keyboard->register_done (); 471 keyboard->register_done ();
484#endif 472#endif
485 473
486#if MENUBAR_MAX
487 menubar_read (rs[Rs_menu]);
488#endif
489#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
490 if (OPTION (Opt_scrollBar)) 475 if (OPTION (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
492#endif 477#endif
493 478
494#if ENABLE_PERL 479 pty = ptytty_new ();
495 if (!rs[Rs_perl_ext_1])
496 rs[Rs_perl_ext_1] = "default";
497
498 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
499 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
500 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
501 {
502 rxvt_perl.init ();
503 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
504 }
505#endif
506 480
507 create_windows (argc, argv); 481 create_windows (argc, argv);
508 482
509 dDisp; 483 dDisp;
510 484
511 init_xlocale (); 485 init_xlocale ();
512 486
513 scr_reset (); /* initialize screen */ 487 scr_reset (); // initialize screen
514 488
515#if 0 489#if 0
516 XSynchronize (disp, True); 490 XSynchronize (disp, True);
517#endif 491#endif
518 492
519#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
520 if (OPTION (Opt_scrollBar)) 494 if (OPTION (Opt_scrollBar))
521 resize_scrollbar (); /* create and map scrollbar */ 495 resize_scrollbar (); /* create and map scrollbar */
522#endif 496#endif
523#if (MENUBAR_MAX)
524 if (menubar_visible ())
525 XMapWindow (disp, menuBar.win);
526#endif
527#ifdef TRANSPARENT 497#ifdef TRANSPARENT
528 if (OPTION (Opt_transparent)) 498 if (OPTION (Opt_transparent))
529 { 499 {
530 XSelectInput (disp, display->root, PropertyChangeMask); 500 XSelectInput (disp, display->root, PropertyChangeMask);
531 check_our_parents (); 501 check_our_parents ();
532 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
533 } 503 }
534#endif 504#endif
535 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
536 XMapWindow (disp, vt); 519 XMapWindow (disp, vt);
537 XMapWindow (disp, parent[0]); 520 XMapWindow (disp, parent[0]);
538 521
539 set_colorfgbg ();
540
541 init_command (cmd_argv);
542
543 free (cmd_argv);
544
545 if (pty.pty >= 0)
546 pty_ev.start (pty.pty, EVENT_READ);
547
548 check_ev.start ();
549
550 HOOK_INVOKE ((this, HOOK_START, DT_END));
551
552 return true; 522 return true;
553} 523}
554 524
555static struct sig_handlers 525static struct sig_handlers
556{ 526{
557 sig_watcher sw_chld, sw_term, sw_int; 527 sig_watcher sw_term, sw_int;
558 528
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 /* 529 /*
574 * Catch a fatal signal and tidy up before quitting 530 * Catch a fatal signal and tidy up before quitting
575 */ 531 */
576 void 532 void
577 sig_term (sig_watcher &w) 533 sig_term (sig_watcher &w)
… …
583 signal (w.signum, SIG_DFL); 539 signal (w.signum, SIG_DFL);
584 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
585 } 541 }
586 542
587 sig_handlers () 543 sig_handlers ()
588 : sw_chld (this, &sig_handlers::sig_chld),
589 sw_term (this, &sig_handlers::sig_term), 544 : sw_term (this, &sig_handlers::sig_term),
590 sw_int (this, &sig_handlers::sig_term) 545 sw_int (this, &sig_handlers::sig_term)
591 { 546 {
592 } 547 }
593} sig_handlers; 548} sig_handlers;
594 549
550char **rxvt_environ; // startup environment
551
595void 552void
596rxvt_init () 553rxvt_init ()
597{ 554{
598 /* 555 uid_t uid = getuid ();
599 * Save and then give up any super-user privileges 556 gid_t gid = getgid ();
600 * If we need privileges in any area then we must specifically request it. 557
601 * We should only need to be root in these cases: 558 // before doing anything else, check for setuid/setgid operation,
602 * 1. write utmp entries on some systems 559 // start the helper process and drop privileges
603 * 2. chown tty on some systems 560 if (uid != geteuid ()
604 */ 561 || gid != getegid ())
605 rxvt_privileges (SAVE); 562 {
606 rxvt_privileges (IGNORE); 563#if PTYTTY_HELPER
564 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;
607 587
608 signal (SIGHUP, SIG_IGN); 588 signal (SIGHUP, SIG_IGN);
609 signal (SIGPIPE, SIG_IGN); 589 signal (SIGPIPE, SIG_IGN);
610 590
611 sig_handlers.sw_chld.start (SIGCHLD);
612 sig_handlers.sw_term.start (SIGTERM); 591 sig_handlers.sw_term.start (SIGTERM);
613 sig_handlers.sw_int.start (SIGINT); 592 sig_handlers.sw_int.start (SIGINT);
614 593
615 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
616 /* signal (SIGURG, SIG_DFL); */ 595 /* signal (SIGURG, SIG_DFL); */
617 596
618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 597 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
619 // TODO: handle this with exceptions and tolerate the memory loss 598 // TODO: handle this with exceptions and tolerate the memory loss
620 XSetIOErrorHandler (rxvt_xioerror_handler); 599 XSetIOErrorHandler (rxvt_xioerror_handler);
621 600
622#ifdef USE_XGETDEFAULT
623 XrmInitialize (); 601 XrmInitialize ();
624#endif
625} 602}
626 603
627/* ------------------------------------------------------------------------- * 604/* ------------------------------------------------------------------------- *
628 * MEMORY ALLOCATION WRAPPERS * 605 * MEMORY ALLOCATION WRAPPERS *
629 * ------------------------------------------------------------------------- */ 606 * ------------------------------------------------------------------------- */
… …
647 rxvt_fatal ("memory allocation failure. aborting.\n"); 624 rxvt_fatal ("memory allocation failure. aborting.\n");
648 625
649 return p; 626 return p;
650} 627}
651 628
652void * 629void *
653rxvt_realloc (void *ptr, size_t size) 630rxvt_realloc (void *ptr, size_t size)
654{ 631{
655 void *p = realloc (ptr, size); 632 void *p = realloc (ptr, size);
656 633
657 if (!p) 634 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n"); 635 rxvt_fatal ("memory allocation failure. aborting.\n");
659 636
660 return p; 637 return p;
661} 638}
662
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 639
737/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
738/* 641/*
739 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
741 */ 644 */
742void 645void
743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
744{ 647{
745 short recalc_x, recalc_y; 648 short recalc_x, recalc_y;
746 int x, y, sb_w, mb_h, flags; 649 int x, y, sb_w, flags;
747 unsigned int w, h; 650 unsigned int w, h;
748 unsigned int max_width, max_height; 651 unsigned int max_width, max_height;
749 dDisp; 652 dDisp;
750 653
751 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",
… …
812 max_width = MAX_COLS * fwidth; 715 max_width = MAX_COLS * fwidth;
813 max_height = MAX_ROWS * fheight; 716 max_height = MAX_ROWS * fheight;
814 717
815 szHint.base_width = szHint.base_height = 2 * int_bwidth; 718 szHint.base_width = szHint.base_height = 2 * int_bwidth;
816 719
817 sb_w = mb_h = 0; 720 sb_w = 0;
818 window_vt_x = window_vt_y = int_bwidth; 721 window_vt_x = window_vt_y = int_bwidth;
819 722
820 if (scrollbar_visible ()) 723 if (scrollBar.state)
821 { 724 {
822 sb_w = scrollbar_TotalWidth (); 725 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 726 szHint.base_width += sb_w;
824 if (!OPTION (Opt_scrollBar_right)) 727 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 728 window_vt_x += sb_w;
826 } 729 }
827 730
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; 731 szHint.width_inc = fwidth;
836 szHint.height_inc = fheight; 732 szHint.height_inc = fheight;
837 szHint.min_width = szHint.base_width + szHint.width_inc; 733 szHint.min_width = szHint.base_width + szHint.width_inc;
838 szHint.min_height = szHint.base_height + szHint.height_inc; 734 szHint.min_height = szHint.base_height + szHint.height_inc;
839 735
… …
857 { 753 {
858 min_it (height, max_height); 754 min_it (height, max_height);
859 szHint.height = szHint.base_height + height; 755 szHint.height = szHint.base_height + height;
860 } 756 }
861 757
862 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 758 if (scrollBar.state && OPTION (Opt_scrollBar_right))
863 window_sb_x = szHint.width - sb_w; 759 window_sb_x = szHint.width - sb_w;
864 760
865 if (recalc_x) 761 if (recalc_x)
866 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
867 if (recalc_y) 763 if (recalc_y)
… …
881 * Called after a window size change. 777 * Called after a window size change.
882 */ 778 */
883void 779void
884rxvt_term::tt_winch () 780rxvt_term::tt_winch ()
885{ 781{
886 if (pty.pty < 0) 782 if (pty->pty < 0)
887 return; 783 return;
888 784
889 struct winsize ws; 785 struct winsize ws;
890 786
891 ws.ws_col = ncol; 787 ws.ws_col = ncol;
892 ws.ws_row = nrow; 788 ws.ws_row = nrow;
893 ws.ws_xpixel = width; 789 ws.ws_xpixel = width;
894 ws.ws_ypixel = height; 790 ws.ws_ypixel = height;
895 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
896 792
897#if 0 793#if 0
898 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
899 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
900 kill (-cmd_pid, SIGWINCH); 796 kill (-cmd_pid, SIGWINCH);
… …
1222 1118
1223 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1224 1120
1225 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1226 { 1122 {
1227 if (scrollbar_visible ()) 1123 if (scrollBar.state)
1228 { 1124 {
1229 XMoveResizeWindow (disp, scrollBar.win, 1125 XMoveResizeWindow (disp, scrollBar.win,
1230 window_sb_x, 0, 1126 window_sb_x, 0,
1231 scrollbar_TotalWidth (), szHint.height); 1127 scrollbar_TotalWidth (), szHint.height);
1232 resize_scrollbar (); 1128 resize_scrollbar ();
1233 } 1129 }
1234
1235 if (menubar_visible ())
1236 XMoveResizeWindow (disp, menuBar.win,
1237 window_vt_x, 0,
1238 width, menuBar_TotalHeight ());
1239 1130
1240 XMoveResizeWindow (disp, vt, 1131 XMoveResizeWindow (disp, vt,
1241 window_vt_x, window_vt_y, 1132 window_vt_x, window_vt_y,
1242 width, height); 1133 width, height);
1243 1134
… …
1427 XRectangle rect, status_rect, needed_rect; 1318 XRectangle rect, status_rect, needed_rect;
1428 unsigned long fg, bg; 1319 unsigned long fg, bg;
1429 const char *p; 1320 const char *p;
1430 char **s; 1321 char **s;
1431 XIMStyles *xim_styles; 1322 XIMStyles *xim_styles;
1323
1324 set_environ (envv);
1432 1325
1433 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1434 return false; 1327 return false;
1435 1328
1436 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1602 int i; 1495 int i;
1603 const char *p; 1496 const char *p;
1604 char **s; 1497 char **s;
1605 char buf[IMBUFSIZ]; 1498 char buf[IMBUFSIZ];
1606 1499
1607 SET_R (this); 1500 make_current ();
1608 1501
1609 im_destroy (); 1502 im_destroy ();
1610 1503
1611 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1612 if (Input_Context) 1505 if (Input_Context)
… …
1689 XFree (preedit_attr); 1582 XFree (preedit_attr);
1690 XFree (status_attr); 1583 XFree (status_attr);
1691} 1584}
1692#endif /* USE_XIM */ 1585#endif /* USE_XIM */
1693 1586
1694/*----------------------------------------------------------------------*/
1695rxvt_t rxvt_current_term;
1696
1697/*----------------------- end-of-file (C source) -----------------------*/ 1587/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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