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.154 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.190 by root, Thu Jan 19 20:30:36 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
… …
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE
50# include "keyboard.h"
51#endif
52
53vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
54 52
55static char curlocale[128]; 53static char curlocale[128], savelocale[128];
56 54
57bool 55bool
58rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
59{ 57{
60 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 59 return false;
62 60
63 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
65 return true; 63 return true;
64}
65
66void
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
66} 77}
67 78
68#if ENABLE_COMBINING 79#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
70 81
… …
135 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
136#endif 147#endif
137#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
138 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
139#endif 150#endif
140#ifdef MENUBAR
141 menubar_ev (this, &rxvt_term::x_cb),
142#endif
143#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
144 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145#endif 153#endif
146#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
147 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
161#ifdef USE_XIM 169#ifdef USE_XIM
162 im_ev (this, &rxvt_term::im_cb), 170 im_ev (this, &rxvt_term::im_cb),
163#endif 171#endif
164 termwin_ev (this, &rxvt_term::x_cb), 172 termwin_ev (this, &rxvt_term::x_cb),
165 vt_ev (this, &rxvt_term::x_cb), 173 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb),
166 check_ev (this, &rxvt_term::check_cb), 175 check_ev (this, &rxvt_term::check_cb),
167 flush_ev (this, &rxvt_term::flush_cb), 176 flush_ev (this, &rxvt_term::flush_cb),
168 destroy_ev (this, &rxvt_term::destroy_cb), 177 destroy_ev (this, &rxvt_term::destroy_cb),
169 pty_ev (this, &rxvt_term::pty_cb), 178 pty_ev (this, &rxvt_term::pty_cb),
170 incr_ev (this, &rxvt_term::incr_cb) 179 incr_ev (this, &rxvt_term::incr_cb)
… …
186void rxvt_term::emergency_cleanup () 195void rxvt_term::emergency_cleanup ()
187{ 196{
188 if (cmd_pid) 197 if (cmd_pid)
189 kill (-cmd_pid, SIGHUP); 198 kill (-cmd_pid, SIGHUP);
190 199
191#ifdef UTMP_SUPPORT 200 delete pty; pty = 0;
192 privileged_utmp (RESTORE);
193#endif
194
195 pty.put ();
196} 201}
197 202
198rxvt_term::~rxvt_term () 203rxvt_term::~rxvt_term ()
199{ 204{
205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 207 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 208
202 emergency_cleanup (); 209 emergency_cleanup ();
203 210
204#if ENABLE_STYLES 211#if ENABLE_STYLES
… …
214 221
215 selection_clear (); 222 selection_clear ();
216 223
217#ifdef USE_XIM 224#ifdef USE_XIM
218 im_destroy (); 225 im_destroy ();
219#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif 226#endif
223#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (disp, ShadowGC);
226#endif 230#endif
… …
237 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (disp, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (disp, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (disp, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (disp, downArrowHi);
241#endif 245#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 246#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (disp, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (disp, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246#endif 250#endif
247 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (disp, gc);
248 252
249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250 delete menuBar.drawable;
251 //if (menuBar.win)
252 // XDestroyWindow (disp, menuBar.win);
253#endif
254 delete drawable; 253 delete drawable;
255 // destroy all windows 254 // destroy all windows
256 if (parent[0]) 255 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (disp, parent[0]);
258 } 257 }
259 258
260 // TODO: free pixcolours, colours should become part of rxvt_display 259 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 260 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
265#endif 263#endif
266 264
… …
288#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
289 delete keyboard; 287 delete keyboard;
290#endif 288#endif
291} 289}
292 290
291// child has exited, usually destroys
293void 292void
294rxvt_term::child_exit () 293rxvt_term::child_cb (child_watcher &w, int status)
295{ 294{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296
296 cmd_pid = 0; 297 cmd_pid = 0;
297 298
298 if (!OPTION (Opt_hold)) 299 if (!OPTION (Opt_hold))
299 destroy (); 300 destroy ();
300} 301}
… …
314#if USE_XIM 315#if USE_XIM
315 im_ev.stop (display); 316 im_ev.stop (display);
316#endif 317#endif
317#if HAVE_SCROLLBARS 318#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
319#endif
320#if MENUBAR
321 menubar_ev.stop (display);
322#endif 320#endif
323#if TRANSPARENT 321#if TRANSPARENT
324 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
325#endif 323#endif
326 incr_ev.stop (); 324 incr_ev.stop ();
… …
350} 348}
351 349
352void 350void
353rxvt_term::destroy_cb (time_watcher &w) 351rxvt_term::destroy_cb (time_watcher &w)
354{ 352{
355 SET_R (this); 353 make_current ();
356 354
357 delete this; 355 delete this;
358} 356}
359 357
360/*----------------------------------------------------------------------*/ 358/*----------------------------------------------------------------------*/
… …
451/*----------------------------------------------------------------------*/ 449/*----------------------------------------------------------------------*/
452bool 450bool
453rxvt_term::init (int argc, const char *const *argv) 451rxvt_term::init (int argc, const char *const *argv)
454{ 452{
455 SET_R (this); 453 SET_R (this);
456
457 set_locale (""); 454 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :(
458 456
459 if (!init_vars ()) 457 if (!init_vars ())
460 return false; 458 return false;
461 459
462 init_secondary (); 460 init_secondary ();
… …
465 463
466#ifdef KEYSYM_RESOURCE 464#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 465 keyboard->register_done ();
468#endif 466#endif
469 467
470#if MENUBAR_MAX 468#if ENABLE_PERL
471 menubar_read (rs[Rs_menu]); 469 if (!rs[Rs_perl_ext_1])
470 rs[Rs_perl_ext_1] = "default";
471
472 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
473 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
474 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
475 {
476 rxvt_perl.init (this);
477 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
478 }
472#endif 479#endif
480
473#ifdef HAVE_SCROLLBARS 481#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 482 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 483 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 484#endif
477 485
486 pty = rxvt_new_ptytty ();
487
478 create_windows (argc, argv); 488 create_windows (argc, argv);
479 489
480 dDisp; 490 dDisp;
481 491
482 init_xlocale (); 492 init_xlocale ();
483 493
484 scr_reset (); /* initialize screen */ 494 scr_reset (); // initialize screen
485 495
486#if 0 496#if 0
487 XSynchronize (disp, True); 497 XSynchronize (disp, True);
488#endif 498#endif
489 499
490#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 501 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 502 resize_scrollbar (); /* create and map scrollbar */
493#endif 503#endif
494#if (MENUBAR_MAX)
495 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win);
497#endif
498#ifdef TRANSPARENT 504#ifdef TRANSPARENT
499 if (OPTION (Opt_transparent)) 505 if (OPTION (Opt_transparent))
500 { 506 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
502 check_our_parents (); 508 check_our_parents ();
… …
511 517
512 init_command (cmd_argv); 518 init_command (cmd_argv);
513 519
514 free (cmd_argv); 520 free (cmd_argv);
515 521
522 if (pty->pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 523 pty_ev.start (pty->pty, EVENT_READ);
517 524
518 check_ev.start (); 525 check_ev.start ();
519 526
527 HOOK_INVOKE ((this, HOOK_START, DT_END));
528
520 return true; 529 return true;
521} 530}
522 531
523static struct sig_handlers 532static struct sig_handlers
524{ 533{
525 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
526 535
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /* 536 /*
542 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
543 */ 538 */
544 void 539 void
545 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
… …
551 signal (w.signum, SIG_DFL); 546 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum); 547 kill (getpid (), w.signum);
553 } 548 }
554 549
555 sig_handlers () 550 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term), 551 : sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term) 552 sw_int (this, &sig_handlers::sig_term)
559 { 553 {
560 } 554 }
561} sig_handlers; 555} sig_handlers;
562 556
557char **rxvt_environ; // startup environment
558
563void 559void
564rxvt_init () 560rxvt_init ()
565{ 561{
566 /* 562 uid_t uid = getuid ();
567 * Save and then give up any super-user privileges 563 gid_t gid = getgid ();
568 * If we need privileges in any area then we must specifically request it. 564
569 * We should only need to be root in these cases: 565 // before doing anything else, check for setuid/setgid operation,
570 * 1. write utmp entries on some systems 566 // start the helper process and drop privileges
571 * 2. chown tty on some systems 567 if (uid != geteuid ()
572 */ 568 || gid != getegid ())
573 rxvt_privileges (SAVE); 569 {
574 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;
575 594
576 signal (SIGHUP, SIG_IGN); 595 signal (SIGHUP, SIG_IGN);
577 signal (SIGPIPE, SIG_IGN); 596 signal (SIGPIPE, SIG_IGN);
578 597
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM); 598 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT); 599 sig_handlers.sw_int.start (SIGINT);
582 600
583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 601 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
584 /* signal (SIGURG, SIG_DFL); */ 602 /* signal (SIGURG, SIG_DFL); */
585 603
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 604 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 605 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 606 XSetIOErrorHandler (rxvt_xioerror_handler);
607
608 XrmInitialize ();
589} 609}
590 610
591/* ------------------------------------------------------------------------- * 611/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 612 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 613 * ------------------------------------------------------------------------- */
… …
622 rxvt_fatal ("memory allocation failure. aborting.\n"); 642 rxvt_fatal ("memory allocation failure. aborting.\n");
623 643
624 return p; 644 return p;
625} 645}
626 646
627/* ------------------------------------------------------------------------- *
628 * PRIVILEGED OPERATIONS *
629 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */
631void
632rxvt_privileges (rxvt_privaction action)
633{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a))
644# define HAVE_SETEUID
645# endif
646# ifdef HAVE_SETEUID
647 switch (action)
648 {
649 case IGNORE:
650 /*
651 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required
653 */
654 seteuid (getuid ());
655 setegid (getgid ());
656 break;
657 case SAVE:
658 euid = geteuid ();
659 egid = getegid ();
660 break;
661 case RESTORE:
662 seteuid (euid);
663 setegid (egid);
664 break;
665 }
666# else
667 switch (action)
668 {
669 case IGNORE:
670 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */
673 case SAVE:
674 /* FALLTHROUGH */
675 case RESTORE:
676 break;
677 }
678# endif
679#endif
680}
681
682#ifdef UTMP_SUPPORT
683void
684rxvt_term::privileged_utmp (rxvt_privaction action)
685{
686 if (OPTION (Opt_utmpInhibit)
687 || !pty.name || !*pty.name)
688 return;
689
690 rxvt_privileges (RESTORE);
691
692 if (action == SAVE)
693 makeutent (pty.name, rs[Rs_display_name]);
694 else
695 cleanutent ();
696
697 rxvt_privileges (IGNORE);
698}
699#endif
700
701/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
702/* 648/*
703 * window size/position calculcations for XSizeHint and other storage. 649 * window size/position calculcations for XSizeHint and other storage.
704 * if width/height are non-zero then override calculated width/height 650 * if width/height are non-zero then override calculated width/height
705 */ 651 */
706void 652void
707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708{ 654{
709 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
710 int x, y, sb_w, mb_h, flags; 656 int x, y, sb_w, flags;
711 unsigned int w, h; 657 unsigned int w, h;
712 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
713 dDisp; 659 dDisp;
714 660
715 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",
… …
776 max_width = MAX_COLS * fwidth; 722 max_width = MAX_COLS * fwidth;
777 max_height = MAX_ROWS * fheight; 723 max_height = MAX_ROWS * fheight;
778 724
779 szHint.base_width = szHint.base_height = 2 * int_bwidth; 725 szHint.base_width = szHint.base_height = 2 * int_bwidth;
780 726
781 sb_w = mb_h = 0; 727 sb_w = 0;
782 window_vt_x = window_vt_y = int_bwidth; 728 window_vt_x = window_vt_y = int_bwidth;
783 729
784 if (scrollbar_visible ()) 730 if (scrollBar.state)
785 { 731 {
786 sb_w = scrollbar_TotalWidth (); 732 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 733 szHint.base_width += sb_w;
788 if (!OPTION (Opt_scrollBar_right)) 734 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 735 window_vt_x += sb_w;
790 } 736 }
791 737
792 if (menubar_visible ())
793 {
794 mb_h = menuBar_TotalHeight ();
795 szHint.base_height += mb_h;
796 window_vt_y += mb_h;
797 }
798
799 szHint.width_inc = fwidth; 738 szHint.width_inc = fwidth;
800 szHint.height_inc = fheight; 739 szHint.height_inc = fheight;
801 szHint.min_width = szHint.base_width + szHint.width_inc; 740 szHint.min_width = szHint.base_width + szHint.width_inc;
802 szHint.min_height = szHint.base_height + szHint.height_inc; 741 szHint.min_height = szHint.base_height + szHint.height_inc;
803 742
… …
821 { 760 {
822 min_it (height, max_height); 761 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 762 szHint.height = szHint.base_height + height;
824 } 763 }
825 764
826 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 765 if (scrollBar.state && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 766 window_sb_x = szHint.width - sb_w;
828 767
829 if (recalc_x) 768 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831 if (recalc_y) 770 if (recalc_y)
… …
845 * Called after a window size change. 784 * Called after a window size change.
846 */ 785 */
847void 786void
848rxvt_term::tt_winch () 787rxvt_term::tt_winch ()
849{ 788{
850 if (pty.pty < 0) 789 if (pty->pty < 0)
851 return; 790 return;
852 791
853 struct winsize ws; 792 struct winsize ws;
854 793
855 ws.ws_col = ncol; 794 ws.ws_col = ncol;
856 ws.ws_row = nrow; 795 ws.ws_row = nrow;
857 ws.ws_xpixel = width; 796 ws.ws_xpixel = width;
858 ws.ws_ypixel = height; 797 ws.ws_ypixel = height;
859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 798 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860 799
861#if 0 800#if 0
862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 801 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863 if (cmd_pid) /* force through to the command */ 802 if (cmd_pid) /* force through to the command */
864 kill (-cmd_pid, SIGWINCH); 803 kill (-cmd_pid, SIGWINCH);
… …
900 prop.height += lineSpace; 839 prop.height += lineSpace;
901 fs->set_prop (prop); 840 fs->set_prop (prop);
902 841
903 fwidth = prop.width; 842 fwidth = prop.width;
904 fheight = prop.height; 843 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 844 fbase = prop.ascent;
906 845
907 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
908 { 847 {
909#if ENABLE_STYLES 848#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 849 const char *res = rs[Rs_font + style];
… …
1001 i = atoi (color); 940 i = atoi (color);
1002 941
1003 if (i >= 8 && i <= 15) 942 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 943 { /* bright colors */
1005 i -= 8; 944 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx); 946 SET_PIXCOLOR (idx);
1009 goto done; 947 goto done;
1010# endif
1011 } 948 }
1012 949
1013 if (i >= 0 && i <= 7) 950 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 951 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1188 1125
1189 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1190 1127
1191 if (fix_screen || newwidth != old_width || newheight != old_height) 1128 if (fix_screen || newwidth != old_width || newheight != old_height)
1192 { 1129 {
1193 if (scrollbar_visible ()) 1130 if (scrollBar.state)
1194 { 1131 {
1195 XMoveResizeWindow (disp, scrollBar.win, 1132 XMoveResizeWindow (disp, scrollBar.win,
1196 window_sb_x, 0, 1133 window_sb_x, 0,
1197 scrollbar_TotalWidth (), szHint.height); 1134 scrollbar_TotalWidth (), szHint.height);
1198 resize_scrollbar (); 1135 resize_scrollbar ();
1199 } 1136 }
1200 1137
1201 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ());
1205
1206 XMoveResizeWindow (disp, vt, 1138 XMoveResizeWindow (disp, vt,
1207 window_vt_x, window_vt_y, 1139 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1140 width, height);
1209 1141
1210 scr_clear (); 1142 scr_clear ();
1211#ifdef XPM_BACKGROUND 1143#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1144 resize_pixmap ();
1213#endif 1145#endif
… …
1393 XRectangle rect, status_rect, needed_rect; 1325 XRectangle rect, status_rect, needed_rect;
1394 unsigned long fg, bg; 1326 unsigned long fg, bg;
1395 const char *p; 1327 const char *p;
1396 char **s; 1328 char **s;
1397 XIMStyles *xim_styles; 1329 XIMStyles *xim_styles;
1330
1331 set_environ (envv);
1398 1332
1399 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400 return false; 1334 return false;
1401 1335
1402 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1568 int i; 1502 int i;
1569 const char *p; 1503 const char *p;
1570 char **s; 1504 char **s;
1571 char buf[IMBUFSIZ]; 1505 char buf[IMBUFSIZ];
1572 1506
1573 SET_R (this); 1507 make_current ();
1574 1508
1575 im_destroy (); 1509 im_destroy ();
1576 1510
1577 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578 if (Input_Context) 1512 if (Input_Context)

Diff Legend

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