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.157 by root, Tue Jan 3 18:11:34 2006 UTC vs.
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64} 64}
65 65
66bool 66void
67rxvt_push_locale (const char *locale) 67rxvt_push_locale (const char *locale)
68{ 68{
69 strcpy (savelocale, curlocale); 69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 70 rxvt_set_locale (locale);
71} 71}
… …
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 147#endif
148#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 153#endif
157#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
172#ifdef USE_XIM 169#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 170 im_ev (this, &rxvt_term::im_cb),
174#endif 171#endif
175 termwin_ev (this, &rxvt_term::x_cb), 172 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 173 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 175 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 176 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 177 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 178 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 179 incr_ev (this, &rxvt_term::incr_cb)
… …
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 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212 206
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 207 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 208
215 emergency_cleanup (); 209 emergency_cleanup ();
216 210
… …
227 221
228 selection_clear (); 222 selection_clear ();
229 223
230#ifdef USE_XIM 224#ifdef USE_XIM
231 im_destroy (); 225 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 226#endif
236#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 230#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 245#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 246#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 250#endif
260 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (disp, gc);
261 252
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; 253 delete drawable;
268 // destroy all windows 254 // destroy all windows
269 if (parent[0]) 255 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (disp, parent[0]);
271 } 257 }
272 258
273 // TODO: free pixcolours, colours should become part of rxvt_display 259 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 260 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
278#endif 263#endif
279 264
… …
301#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
302 delete keyboard; 287 delete keyboard;
303#endif 288#endif
304} 289}
305 290
291// child has exited, usually destroys
306void 292void
307rxvt_term::child_exit () 293rxvt_term::child_cb (child_watcher &w, int status)
308{ 294{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296
309 cmd_pid = 0; 297 cmd_pid = 0;
310 298
311 if (!OPTION (Opt_hold)) 299 if (!OPTION (Opt_hold))
312 destroy (); 300 destroy ();
313} 301}
… …
327#if USE_XIM 315#if USE_XIM
328 im_ev.stop (display); 316 im_ev.stop (display);
329#endif 317#endif
330#if HAVE_SCROLLBARS 318#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
332#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif 320#endif
336#if TRANSPARENT 321#if TRANSPARENT
337 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
338#endif 323#endif
339 incr_ev.stop (); 324 incr_ev.stop ();
… …
363} 348}
364 349
365void 350void
366rxvt_term::destroy_cb (time_watcher &w) 351rxvt_term::destroy_cb (time_watcher &w)
367{ 352{
368 SET_R (this); 353 make_current ();
369 354
370 delete this; 355 delete this;
371} 356}
372 357
373/*----------------------------------------------------------------------*/ 358/*----------------------------------------------------------------------*/
… …
464/*----------------------------------------------------------------------*/ 449/*----------------------------------------------------------------------*/
465bool 450bool
466rxvt_term::init (int argc, const char *const *argv) 451rxvt_term::init (int argc, const char *const *argv)
467{ 452{
468 SET_R (this); 453 SET_R (this);
469
470 set_locale (""); 454 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :(
471 456
472 if (!init_vars ()) 457 if (!init_vars ())
473 return false; 458 return false;
474 459
475 init_secondary (); 460 init_secondary ();
… …
478 463
479#ifdef KEYSYM_RESOURCE 464#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 465 keyboard->register_done ();
481#endif 466#endif
482 467
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 468#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 469 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 470 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 471#endif
490 472
491#if ENABLE_PERL 473#if ENABLE_PERL
474 if (!rs[Rs_perl_ext_1])
475 rs[Rs_perl_ext_1] = "default";
476
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext]) 477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
493 { 480 {
494 rxvt_perl.init (); 481 rxvt_perl.init (this);
495 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
496 } 483 }
497#endif 484#endif
485
486 pty = rxvt_new_ptytty ();
498 487
499 create_windows (argc, argv); 488 create_windows (argc, argv);
500 489
501 dDisp; 490 dDisp;
502 491
503 init_xlocale (); 492 init_xlocale ();
504 493
505 scr_reset (); /* initialize screen */ 494 scr_reset (); // initialize screen
506 495
507#if 0 496#if 0
508 XSynchronize (disp, True); 497 XSynchronize (disp, True);
509#endif 498#endif
510 499
511#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
512 if (OPTION (Opt_scrollBar)) 501 if (OPTION (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */ 502 resize_scrollbar (); /* create and map scrollbar */
514#endif 503#endif
515#if (MENUBAR_MAX)
516 if (menubar_visible ())
517 XMapWindow (disp, menuBar.win);
518#endif
519#ifdef TRANSPARENT 504#ifdef TRANSPARENT
520 if (OPTION (Opt_transparent)) 505 if (OPTION (Opt_transparent))
521 { 506 {
522 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
523 check_our_parents (); 508 check_our_parents ();
… …
532 517
533 init_command (cmd_argv); 518 init_command (cmd_argv);
534 519
535 free (cmd_argv); 520 free (cmd_argv);
536 521
522 if (pty->pty >= 0)
537 pty_ev.start (pty.pty, EVENT_READ); 523 pty_ev.start (pty->pty, EVENT_READ);
538 524
539 check_ev.start (); 525 check_ev.start ();
540 526
541 PERL_INVOKE ((this, HOOK_START, DT_END)); 527 HOOK_INVOKE ((this, HOOK_START, DT_END));
542 528
543 return true; 529 return true;
544} 530}
545 531
546static struct sig_handlers 532static struct sig_handlers
547{ 533{
548 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
549 535
550 void sig_chld (sig_watcher &w)
551 {
552 // we are being called for every SIGCHLD, find the corresponding term
553 int pid;
554
555 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
556 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
557 if (pid == (*t)->cmd_pid)
558 {
559 (*t)->child_exit ();
560 break;
561 }
562 }
563
564 /* 536 /*
565 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
566 */ 538 */
567 void 539 void
568 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
… …
574 signal (w.signum, SIG_DFL); 546 signal (w.signum, SIG_DFL);
575 kill (getpid (), w.signum); 547 kill (getpid (), w.signum);
576 } 548 }
577 549
578 sig_handlers () 550 sig_handlers ()
579 : sw_chld (this, &sig_handlers::sig_chld),
580 sw_term (this, &sig_handlers::sig_term), 551 : sw_term (this, &sig_handlers::sig_term),
581 sw_int (this, &sig_handlers::sig_term) 552 sw_int (this, &sig_handlers::sig_term)
582 { 553 {
583 } 554 }
584} sig_handlers; 555} sig_handlers;
585 556
557char **rxvt_environ; // startup environment
558
586void 559void
587rxvt_init () 560rxvt_init ()
588{ 561{
589 /* 562 uid_t uid = getuid ();
590 * Save and then give up any super-user privileges 563 gid_t gid = getgid ();
591 * If we need privileges in any area then we must specifically request it. 564
592 * We should only need to be root in these cases: 565 // before doing anything else, check for setuid/setgid operation,
593 * 1. write utmp entries on some systems 566 // start the helper process and drop privileges
594 * 2. chown tty on some systems 567 if (uid != geteuid ()
595 */ 568 || gid != getegid ())
596 rxvt_privileges (SAVE); 569 {
597 rxvt_privileges (IGNORE); 570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575
576 // drop privileges
577#if HAVE_SETRESUID
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592
593 rxvt_environ = environ;
598 594
599 signal (SIGHUP, SIG_IGN); 595 signal (SIGHUP, SIG_IGN);
600 signal (SIGPIPE, SIG_IGN); 596 signal (SIGPIPE, SIG_IGN);
601 597
602 sig_handlers.sw_chld.start (SIGCHLD);
603 sig_handlers.sw_term.start (SIGTERM); 598 sig_handlers.sw_term.start (SIGTERM);
604 sig_handlers.sw_int.start (SIGINT); 599 sig_handlers.sw_int.start (SIGINT);
605 600
606 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 601 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
607 /* signal (SIGURG, SIG_DFL); */ 602 /* signal (SIGURG, SIG_DFL); */
608 603
609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 604 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
610 // TODO: handle this with exceptions and tolerate the memory loss 605 // TODO: handle this with exceptions and tolerate the memory loss
611 XSetIOErrorHandler (rxvt_xioerror_handler); 606 XSetIOErrorHandler (rxvt_xioerror_handler);
607
608 XrmInitialize ();
612} 609}
613 610
614/* ------------------------------------------------------------------------- * 611/* ------------------------------------------------------------------------- *
615 * MEMORY ALLOCATION WRAPPERS * 612 * MEMORY ALLOCATION WRAPPERS *
616 * ------------------------------------------------------------------------- */ 613 * ------------------------------------------------------------------------- */
… …
645 rxvt_fatal ("memory allocation failure. aborting.\n"); 642 rxvt_fatal ("memory allocation failure. aborting.\n");
646 643
647 return p; 644 return p;
648} 645}
649 646
650/* ------------------------------------------------------------------------- *
651 * PRIVILEGED OPERATIONS *
652 * ------------------------------------------------------------------------- */
653/* take care of suid/sgid super-user (root) privileges */
654void
655rxvt_privileges (rxvt_privaction action)
656{
657#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
658 static uid_t euid;
659 static gid_t egid;
660#endif
661
662#if ! defined(__CYGWIN32__)
663# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
664 /* setreuid () is the poor man's setuid (), seteuid () */
665# define seteuid(a) setreuid(-1, (a))
666# define setegid(a) setregid(-1, (a))
667# define HAVE_SETEUID
668# endif
669# ifdef HAVE_SETEUID
670 switch (action)
671 {
672 case IGNORE:
673 /*
674 * change effective uid/gid - not real uid/gid - so we can switch
675 * back to root later, as required
676 */
677 seteuid (getuid ());
678 setegid (getgid ());
679 break;
680 case SAVE:
681 euid = geteuid ();
682 egid = getegid ();
683 break;
684 case RESTORE:
685 seteuid (euid);
686 setegid (egid);
687 break;
688 }
689# else
690 switch (action)
691 {
692 case IGNORE:
693 setuid (getuid ());
694 setgid (getgid ());
695 /* FALLTHROUGH */
696 case SAVE:
697 /* FALLTHROUGH */
698 case RESTORE:
699 break;
700 }
701# endif
702#endif
703}
704
705#ifdef UTMP_SUPPORT
706void
707rxvt_term::privileged_utmp (rxvt_privaction action)
708{
709 if (OPTION (Opt_utmpInhibit)
710 || !pty.name || !*pty.name)
711 return;
712
713 rxvt_privileges (RESTORE);
714
715 if (action == SAVE)
716 makeutent (pty.name, rs[Rs_display_name]);
717 else
718 cleanutent ();
719
720 rxvt_privileges (IGNORE);
721}
722#endif
723
724/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
725/* 648/*
726 * window size/position calculcations for XSizeHint and other storage. 649 * window size/position calculcations for XSizeHint and other storage.
727 * if width/height are non-zero then override calculated width/height 650 * if width/height are non-zero then override calculated width/height
728 */ 651 */
729void 652void
730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
731{ 654{
732 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
733 int x, y, sb_w, mb_h, flags; 656 int x, y, sb_w, flags;
734 unsigned int w, h; 657 unsigned int w, h;
735 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
736 dDisp; 659 dDisp;
737 660
738 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
799 max_width = MAX_COLS * fwidth; 722 max_width = MAX_COLS * fwidth;
800 max_height = MAX_ROWS * fheight; 723 max_height = MAX_ROWS * fheight;
801 724
802 szHint.base_width = szHint.base_height = 2 * int_bwidth; 725 szHint.base_width = szHint.base_height = 2 * int_bwidth;
803 726
804 sb_w = mb_h = 0; 727 sb_w = 0;
805 window_vt_x = window_vt_y = int_bwidth; 728 window_vt_x = window_vt_y = int_bwidth;
806 729
807 if (scrollbar_visible ()) 730 if (scrollBar.state)
808 { 731 {
809 sb_w = scrollbar_TotalWidth (); 732 sb_w = scrollbar_TotalWidth ();
810 szHint.base_width += sb_w; 733 szHint.base_width += sb_w;
811 if (!OPTION (Opt_scrollBar_right)) 734 if (!OPTION (Opt_scrollBar_right))
812 window_vt_x += sb_w; 735 window_vt_x += sb_w;
813 } 736 }
814 737
815 if (menubar_visible ())
816 {
817 mb_h = menuBar_TotalHeight ();
818 szHint.base_height += mb_h;
819 window_vt_y += mb_h;
820 }
821
822 szHint.width_inc = fwidth; 738 szHint.width_inc = fwidth;
823 szHint.height_inc = fheight; 739 szHint.height_inc = fheight;
824 szHint.min_width = szHint.base_width + szHint.width_inc; 740 szHint.min_width = szHint.base_width + szHint.width_inc;
825 szHint.min_height = szHint.base_height + szHint.height_inc; 741 szHint.min_height = szHint.base_height + szHint.height_inc;
826 742
… …
844 { 760 {
845 min_it (height, max_height); 761 min_it (height, max_height);
846 szHint.height = szHint.base_height + height; 762 szHint.height = szHint.base_height + height;
847 } 763 }
848 764
849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 765 if (scrollBar.state && OPTION (Opt_scrollBar_right))
850 window_sb_x = szHint.width - sb_w; 766 window_sb_x = szHint.width - sb_w;
851 767
852 if (recalc_x) 768 if (recalc_x)
853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
854 if (recalc_y) 770 if (recalc_y)
… …
868 * Called after a window size change. 784 * Called after a window size change.
869 */ 785 */
870void 786void
871rxvt_term::tt_winch () 787rxvt_term::tt_winch ()
872{ 788{
873 if (pty.pty < 0) 789 if (pty->pty < 0)
874 return; 790 return;
875 791
876 struct winsize ws; 792 struct winsize ws;
877 793
878 ws.ws_col = ncol; 794 ws.ws_col = ncol;
879 ws.ws_row = nrow; 795 ws.ws_row = nrow;
880 ws.ws_xpixel = width; 796 ws.ws_xpixel = width;
881 ws.ws_ypixel = height; 797 ws.ws_ypixel = height;
882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 798 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
883 799
884#if 0 800#if 0
885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 801 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
886 if (cmd_pid) /* force through to the command */ 802 if (cmd_pid) /* force through to the command */
887 kill (-cmd_pid, SIGWINCH); 803 kill (-cmd_pid, SIGWINCH);
… …
923 prop.height += lineSpace; 839 prop.height += lineSpace;
924 fs->set_prop (prop); 840 fs->set_prop (prop);
925 841
926 fwidth = prop.width; 842 fwidth = prop.width;
927 fheight = prop.height; 843 fheight = prop.height;
928 fbase = (*fs)[1]->ascent; 844 fbase = prop.ascent;
929 845
930 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
931 { 847 {
932#if ENABLE_STYLES 848#if ENABLE_STYLES
933 const char *res = rs[Rs_font + style]; 849 const char *res = rs[Rs_font + style];
… …
1024 i = atoi (color); 940 i = atoi (color);
1025 941
1026 if (i >= 8 && i <= 15) 942 if (i >= 8 && i <= 15)
1027 { /* bright colors */ 943 { /* bright colors */
1028 i -= 8; 944 i -= 8;
1029# ifndef NO_BRIGHTCOLOR
1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1031 SET_PIXCOLOR (idx); 946 SET_PIXCOLOR (idx);
1032 goto done; 947 goto done;
1033# endif
1034 } 948 }
1035 949
1036 if (i >= 0 && i <= 7) 950 if (i >= 0 && i <= 7)
1037 { /* normal colors */ 951 { /* normal colors */
1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1211 1125
1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1213 1127
1214 if (fix_screen || newwidth != old_width || newheight != old_height) 1128 if (fix_screen || newwidth != old_width || newheight != old_height)
1215 { 1129 {
1216 if (scrollbar_visible ()) 1130 if (scrollBar.state)
1217 { 1131 {
1218 XMoveResizeWindow (disp, scrollBar.win, 1132 XMoveResizeWindow (disp, scrollBar.win,
1219 window_sb_x, 0, 1133 window_sb_x, 0,
1220 scrollbar_TotalWidth (), szHint.height); 1134 scrollbar_TotalWidth (), szHint.height);
1221 resize_scrollbar (); 1135 resize_scrollbar ();
1222 } 1136 }
1223 1137
1224 if (menubar_visible ())
1225 XMoveResizeWindow (disp, menuBar.win,
1226 window_vt_x, 0,
1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
1228
1229 XMoveResizeWindow (disp, vt, 1138 XMoveResizeWindow (disp, vt,
1230 window_vt_x, window_vt_y, 1139 window_vt_x, window_vt_y,
1231 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1140 width, height);
1232 1141
1233 scr_clear (); 1142 scr_clear ();
1234#ifdef XPM_BACKGROUND 1143#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1144 resize_pixmap ();
1236#endif 1145#endif
… …
1416 XRectangle rect, status_rect, needed_rect; 1325 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1326 unsigned long fg, bg;
1418 const char *p; 1327 const char *p;
1419 char **s; 1328 char **s;
1420 XIMStyles *xim_styles; 1329 XIMStyles *xim_styles;
1330
1331 set_environ (envv);
1421 1332
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1334 return false;
1424 1335
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1591 int i; 1502 int i;
1592 const char *p; 1503 const char *p;
1593 char **s; 1504 char **s;
1594 char buf[IMBUFSIZ]; 1505 char buf[IMBUFSIZ];
1595 1506
1596 SET_R (this); 1507 make_current ();
1597 1508
1598 im_destroy (); 1509 im_destroy ();
1599 1510
1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1601 if (Input_Context) 1512 if (Input_Context)

Diff Legend

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