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.164 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.192 by root, Fri Jan 20 12:16:28 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
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 469#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 470 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 471 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 472#endif
490 473
491#if ENABLE_PERL 474 pty = rxvt_new_ptytty ();
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 }
499#endif
500 475
501 create_windows (argc, argv); 476 create_windows (argc, argv);
502 477
503 dDisp; 478 dDisp;
504 479
505 init_xlocale (); 480 init_xlocale ();
506 481
507 scr_reset (); /* initialize screen */ 482 scr_reset (); // initialize screen
508 483
509#if 0 484#if 0
510 XSynchronize (disp, True); 485 XSynchronize (disp, True);
511#endif 486#endif
512 487
513#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
514 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
516#endif 491#endif
517#if (MENUBAR_MAX)
518 if (menubar_visible ())
519 XMapWindow (disp, menuBar.win);
520#endif
521#ifdef TRANSPARENT 492#ifdef TRANSPARENT
522 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
523 { 494 {
524 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (disp, display->root, PropertyChangeMask);
525 check_our_parents (); 496 check_our_parents ();
526 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
527 } 498 }
528#endif 499#endif
529 500
501 set_colorfgbg ();
502
503 init_command (cmd_argv);
504
505 free (cmd_argv);
506
507 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ);
509
510 check_ev.start ();
511
512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
530 XMapWindow (disp, vt); 514 XMapWindow (disp, vt);
531 XMapWindow (disp, parent[0]); 515 XMapWindow (disp, parent[0]);
532 516
533 set_colorfgbg ();
534
535 init_command (cmd_argv);
536
537 free (cmd_argv);
538
539 if (pty.pty >= 0)
540 pty_ev.start (pty.pty, EVENT_READ);
541
542 check_ev.start ();
543
544 HOOK_INVOKE ((this, HOOK_START, DT_END));
545
546 return true; 517 return true;
547} 518}
548 519
549static struct sig_handlers 520static struct sig_handlers
550{ 521{
551 sig_watcher sw_chld, sw_term, sw_int; 522 sig_watcher sw_term, sw_int;
552 523
553 void sig_chld (sig_watcher &w)
554 {
555 // we are being called for every SIGCHLD, find the corresponding term
556 int pid;
557
558 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
559 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
560 if (pid == (*t)->cmd_pid)
561 {
562 (*t)->child_exit ();
563 break;
564 }
565 }
566
567 /* 524 /*
568 * Catch a fatal signal and tidy up before quitting 525 * Catch a fatal signal and tidy up before quitting
569 */ 526 */
570 void 527 void
571 sig_term (sig_watcher &w) 528 sig_term (sig_watcher &w)
… …
577 signal (w.signum, SIG_DFL); 534 signal (w.signum, SIG_DFL);
578 kill (getpid (), w.signum); 535 kill (getpid (), w.signum);
579 } 536 }
580 537
581 sig_handlers () 538 sig_handlers ()
582 : sw_chld (this, &sig_handlers::sig_chld),
583 sw_term (this, &sig_handlers::sig_term), 539 : sw_term (this, &sig_handlers::sig_term),
584 sw_int (this, &sig_handlers::sig_term) 540 sw_int (this, &sig_handlers::sig_term)
585 { 541 {
586 } 542 }
587} sig_handlers; 543} sig_handlers;
588 544
545char **rxvt_environ; // startup environment
546
589void 547void
590rxvt_init () 548rxvt_init ()
591{ 549{
592 /* 550 uid_t uid = getuid ();
593 * Save and then give up any super-user privileges 551 gid_t gid = getgid ();
594 * If we need privileges in any area then we must specifically request it. 552
595 * We should only need to be root in these cases: 553 // before doing anything else, check for setuid/setgid operation,
596 * 1. write utmp entries on some systems 554 // start the helper process and drop privileges
597 * 2. chown tty on some systems 555 if (uid != geteuid ()
598 */ 556 || gid != getegid ())
599 rxvt_privileges (SAVE); 557 {
600 rxvt_privileges (IGNORE); 558#if PTYTTY_HELPER
559 rxvt_ptytty_server ();
560#else
561 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
562#endif
563
564 // drop privileges
565#if HAVE_SETRESUID
566 setresgid (gid, gid, gid);
567 setresuid (uid, uid, uid);
568#elif HAVE_SETREUID
569 setregid (gid, gid);
570 setreuid (uid, uid);
571#elif HAVE_SETUID
572 setgid (gid);
573 setuid (uid);
574#endif
575
576 if (uid != geteuid ()
577 || gid != getegid ())
578 rxvt_fatal ("unable to drop privileges, aborting.\n");
579 }
580
581 rxvt_environ = environ;
601 582
602 signal (SIGHUP, SIG_IGN); 583 signal (SIGHUP, SIG_IGN);
603 signal (SIGPIPE, SIG_IGN); 584 signal (SIGPIPE, SIG_IGN);
604 585
605 sig_handlers.sw_chld.start (SIGCHLD);
606 sig_handlers.sw_term.start (SIGTERM); 586 sig_handlers.sw_term.start (SIGTERM);
607 sig_handlers.sw_int.start (SIGINT); 587 sig_handlers.sw_int.start (SIGINT);
608 588
609 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 589 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
610 /* signal (SIGURG, SIG_DFL); */ 590 /* signal (SIGURG, SIG_DFL); */
611 591
612 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 592 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
613 // TODO: handle this with exceptions and tolerate the memory loss 593 // TODO: handle this with exceptions and tolerate the memory loss
614 XSetIOErrorHandler (rxvt_xioerror_handler); 594 XSetIOErrorHandler (rxvt_xioerror_handler);
595
596 XrmInitialize ();
615} 597}
616 598
617/* ------------------------------------------------------------------------- * 599/* ------------------------------------------------------------------------- *
618 * MEMORY ALLOCATION WRAPPERS * 600 * MEMORY ALLOCATION WRAPPERS *
619 * ------------------------------------------------------------------------- */ 601 * ------------------------------------------------------------------------- */
… …
637 rxvt_fatal ("memory allocation failure. aborting.\n"); 619 rxvt_fatal ("memory allocation failure. aborting.\n");
638 620
639 return p; 621 return p;
640} 622}
641 623
642void * 624void *
643rxvt_realloc (void *ptr, size_t size) 625rxvt_realloc (void *ptr, size_t size)
644{ 626{
645 void *p = realloc (ptr, size); 627 void *p = realloc (ptr, size);
646 628
647 if (!p) 629 if (!p)
648 rxvt_fatal ("memory allocation failure. aborting.\n"); 630 rxvt_fatal ("memory allocation failure. aborting.\n");
649 631
650 return p; 632 return p;
651} 633}
652
653/* ------------------------------------------------------------------------- *
654 * PRIVILEGED OPERATIONS *
655 * ------------------------------------------------------------------------- */
656/* take care of suid/sgid super-user (root) privileges */
657void
658rxvt_privileges (rxvt_privaction action)
659{
660#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
661 static uid_t euid;
662 static gid_t egid;
663#endif
664
665#if ! defined(__CYGWIN32__)
666# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
667 /* setreuid () is the poor man's setuid (), seteuid () */
668# define seteuid(a) setreuid(-1, (a))
669# define setegid(a) setregid(-1, (a))
670# define HAVE_SETEUID
671# endif
672# ifdef HAVE_SETEUID
673 switch (action)
674 {
675 case IGNORE:
676 /*
677 * change effective uid/gid - not real uid/gid - so we can switch
678 * back to root later, as required
679 */
680 seteuid (getuid ());
681 setegid (getgid ());
682 break;
683 case SAVE:
684 euid = geteuid ();
685 egid = getegid ();
686 break;
687 case RESTORE:
688 seteuid (euid);
689 setegid (egid);
690 break;
691 }
692# else
693 switch (action)
694 {
695 case IGNORE:
696 setuid (getuid ());
697 setgid (getgid ());
698 /* FALLTHROUGH */
699 case SAVE:
700 /* FALLTHROUGH */
701 case RESTORE:
702 break;
703 }
704# endif
705#endif
706}
707
708#ifdef UTMP_SUPPORT
709void
710rxvt_term::privileged_utmp (rxvt_privaction action)
711{
712 if (OPTION (Opt_utmpInhibit)
713 || !pty.name || !*pty.name)
714 return;
715
716 rxvt_privileges (RESTORE);
717
718 if (action == SAVE)
719 makeutent (pty.name, rs[Rs_display_name]);
720 else
721 cleanutent ();
722
723 rxvt_privileges (IGNORE);
724}
725#endif
726 634
727/*----------------------------------------------------------------------*/ 635/*----------------------------------------------------------------------*/
728/* 636/*
729 * window size/position calculcations for XSizeHint and other storage. 637 * window size/position calculcations for XSizeHint and other storage.
730 * if width/height are non-zero then override calculated width/height 638 * if width/height are non-zero then override calculated width/height
731 */ 639 */
732void 640void
733rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 641rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
734{ 642{
735 short recalc_x, recalc_y; 643 short recalc_x, recalc_y;
736 int x, y, sb_w, mb_h, flags; 644 int x, y, sb_w, flags;
737 unsigned int w, h; 645 unsigned int w, h;
738 unsigned int max_width, max_height; 646 unsigned int max_width, max_height;
739 dDisp; 647 dDisp;
740 648
741 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 649 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
802 max_width = MAX_COLS * fwidth; 710 max_width = MAX_COLS * fwidth;
803 max_height = MAX_ROWS * fheight; 711 max_height = MAX_ROWS * fheight;
804 712
805 szHint.base_width = szHint.base_height = 2 * int_bwidth; 713 szHint.base_width = szHint.base_height = 2 * int_bwidth;
806 714
807 sb_w = mb_h = 0; 715 sb_w = 0;
808 window_vt_x = window_vt_y = int_bwidth; 716 window_vt_x = window_vt_y = int_bwidth;
809 717
810 if (scrollbar_visible ()) 718 if (scrollBar.state)
811 { 719 {
812 sb_w = scrollbar_TotalWidth (); 720 sb_w = scrollbar_TotalWidth ();
813 szHint.base_width += sb_w; 721 szHint.base_width += sb_w;
814 if (!OPTION (Opt_scrollBar_right)) 722 if (!OPTION (Opt_scrollBar_right))
815 window_vt_x += sb_w; 723 window_vt_x += sb_w;
816 } 724 }
817 725
818 if (menubar_visible ())
819 {
820 mb_h = menuBar_TotalHeight ();
821 szHint.base_height += mb_h;
822 window_vt_y += mb_h;
823 }
824
825 szHint.width_inc = fwidth; 726 szHint.width_inc = fwidth;
826 szHint.height_inc = fheight; 727 szHint.height_inc = fheight;
827 szHint.min_width = szHint.base_width + szHint.width_inc; 728 szHint.min_width = szHint.base_width + szHint.width_inc;
828 szHint.min_height = szHint.base_height + szHint.height_inc; 729 szHint.min_height = szHint.base_height + szHint.height_inc;
829 730
… …
847 { 748 {
848 min_it (height, max_height); 749 min_it (height, max_height);
849 szHint.height = szHint.base_height + height; 750 szHint.height = szHint.base_height + height;
850 } 751 }
851 752
852 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 753 if (scrollBar.state && OPTION (Opt_scrollBar_right))
853 window_sb_x = szHint.width - sb_w; 754 window_sb_x = szHint.width - sb_w;
854 755
855 if (recalc_x) 756 if (recalc_x)
856 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 757 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
857 if (recalc_y) 758 if (recalc_y)
… …
871 * Called after a window size change. 772 * Called after a window size change.
872 */ 773 */
873void 774void
874rxvt_term::tt_winch () 775rxvt_term::tt_winch ()
875{ 776{
876 if (pty.pty < 0) 777 if (pty->pty < 0)
877 return; 778 return;
878 779
879 struct winsize ws; 780 struct winsize ws;
880 781
881 ws.ws_col = ncol; 782 ws.ws_col = ncol;
882 ws.ws_row = nrow; 783 ws.ws_row = nrow;
883 ws.ws_xpixel = width; 784 ws.ws_xpixel = width;
884 ws.ws_ypixel = height; 785 ws.ws_ypixel = height;
885 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 786 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
886 787
887#if 0 788#if 0
888 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 789 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
889 if (cmd_pid) /* force through to the command */ 790 if (cmd_pid) /* force through to the command */
890 kill (-cmd_pid, SIGWINCH); 791 kill (-cmd_pid, SIGWINCH);
… …
1212 1113
1213 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1114 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1214 1115
1215 if (fix_screen || newwidth != old_width || newheight != old_height) 1116 if (fix_screen || newwidth != old_width || newheight != old_height)
1216 { 1117 {
1217 if (scrollbar_visible ()) 1118 if (scrollBar.state)
1218 { 1119 {
1219 XMoveResizeWindow (disp, scrollBar.win, 1120 XMoveResizeWindow (disp, scrollBar.win,
1220 window_sb_x, 0, 1121 window_sb_x, 0,
1221 scrollbar_TotalWidth (), szHint.height); 1122 scrollbar_TotalWidth (), szHint.height);
1222 resize_scrollbar (); 1123 resize_scrollbar ();
1223 } 1124 }
1224
1225 if (menubar_visible ())
1226 XMoveResizeWindow (disp, menuBar.win,
1227 window_vt_x, 0,
1228 width, menuBar_TotalHeight ());
1229 1125
1230 XMoveResizeWindow (disp, vt, 1126 XMoveResizeWindow (disp, vt,
1231 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1232 width, height); 1128 width, height);
1233 1129
… …
1417 XRectangle rect, status_rect, needed_rect; 1313 XRectangle rect, status_rect, needed_rect;
1418 unsigned long fg, bg; 1314 unsigned long fg, bg;
1419 const char *p; 1315 const char *p;
1420 char **s; 1316 char **s;
1421 XIMStyles *xim_styles; 1317 XIMStyles *xim_styles;
1318
1319 set_environ (envv);
1422 1320
1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424 return false; 1322 return false;
1425 1323
1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1324 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1592 int i; 1490 int i;
1593 const char *p; 1491 const char *p;
1594 char **s; 1492 char **s;
1595 char buf[IMBUFSIZ]; 1493 char buf[IMBUFSIZ];
1596 1494
1597 SET_R (this); 1495 make_current ();
1598 1496
1599 im_destroy (); 1497 im_destroy ();
1600 1498
1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1499 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602 if (Input_Context) 1500 if (Input_Context)
… …
1679 XFree (preedit_attr); 1577 XFree (preedit_attr);
1680 XFree (status_attr); 1578 XFree (status_attr);
1681} 1579}
1682#endif /* USE_XIM */ 1580#endif /* USE_XIM */
1683 1581
1684/*----------------------------------------------------------------------*/
1685rxvt_t rxvt_current_term;
1686
1687/*----------------------- end-of-file (C source) -----------------------*/ 1582/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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