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.149 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.186 by root, Tue Jan 17 15:41:33 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"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
48# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
49#endif 54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
50 65
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
56rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
57{ 72{
58 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 74 return false;
60 75
61 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
63 return true; 78 return true;
79}
80
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
64} 92}
65 93
66#if ENABLE_COMBINING 94#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
68 96
… …
132#if TRANSPARENT 160#if TRANSPARENT
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
134#endif 162#endif
135#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif 165#endif
141#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 168#endif
144#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
184void rxvt_term::emergency_cleanup () 209void rxvt_term::emergency_cleanup ()
185{ 210{
186 if (cmd_pid) 211 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
188 213
189#ifdef UTMP_SUPPORT 214 delete pty; pty = 0;
190 privileged_utmp (RESTORE);
191#endif
192
193 pty.put ();
194} 215}
195 216
196rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
197{ 218{
219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
220
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 221 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 222
200 emergency_cleanup (); 223 emergency_cleanup ();
201 224
202#if ENABLE_STYLES 225#if ENABLE_STYLES
… …
212 235
213 selection_clear (); 236 selection_clear ();
214 237
215#ifdef USE_XIM 238#ifdef USE_XIM
216 im_destroy (); 239 im_destroy ();
217#endif
218#ifdef MENUBAR
219 if (menubarGC) XFreeGC (disp, menubarGC);
220#endif 240#endif
221#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
223 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (disp, ShadowGC);
224#endif 244#endif
… …
235 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (disp, upArrow);
236 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (disp, downArrow);
237 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (disp, upArrowHi);
238 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (disp, downArrowHi);
239#endif 259#endif
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#ifdef RXVT_SCROLLBAR
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (disp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (disp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244#endif 264#endif
245 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (disp, gc);
246 266
247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable;
249 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win);
251#endif
252 delete drawable; 267 delete drawable;
253 // destroy all windows 268 // destroy all windows
254 if (parent[0]) 269 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (disp, parent[0]);
256 } 271 }
257 272
258 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
259
260 delete pix_colors_focused; 274 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 275#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 276 delete pix_colors_unfocused;
263#endif 277#endif
264 278
… …
287 delete keyboard; 301 delete keyboard;
288#endif 302#endif
289} 303}
290 304
291void 305void
306rxvt_term::child_exit ()
307{
308 cmd_pid = 0;
309
310 if (!OPTION (Opt_hold))
311 destroy ();
312}
313
314void
292rxvt_term::destroy () 315rxvt_term::destroy ()
293{ 316{
294 if (destroy_ev.active) 317 if (destroy_ev.active)
295 return; 318 return;
296 319
… …
303#if USE_XIM 326#if USE_XIM
304 im_ev.stop (display); 327 im_ev.stop (display);
305#endif 328#endif
306#if HAVE_SCROLLBARS 329#if HAVE_SCROLLBARS
307 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
308#endif
309#if MENUBAR
310 menubar_ev.stop (display);
311#endif 331#endif
312#if TRANSPARENT 332#if TRANSPARENT
313 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
314#endif 334#endif
315 incr_ev.stop (); 335 incr_ev.stop ();
… …
339} 359}
340 360
341void 361void
342rxvt_term::destroy_cb (time_watcher &w) 362rxvt_term::destroy_cb (time_watcher &w)
343{ 363{
344 SET_R (this); 364 make_current ();
345 365
346 delete this; 366 delete this;
347} 367}
348 368
349/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
… …
440/*----------------------------------------------------------------------*/ 460/*----------------------------------------------------------------------*/
441bool 461bool
442rxvt_term::init (int argc, const char *const *argv) 462rxvt_term::init (int argc, const char *const *argv)
443{ 463{
444 SET_R (this); 464 SET_R (this);
445
446 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
447 467
448 if (!init_vars ()) 468 if (!init_vars ())
449 return false; 469 return false;
450 470
451 init_secondary (); 471 init_secondary ();
… …
454 474
455#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 476 keyboard->register_done ();
457#endif 477#endif
458 478
459#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]);
461#endif
462#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 480 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 482#endif
466 483
484#if ENABLE_PERL
485 if (!rs[Rs_perl_ext_1])
486 rs[Rs_perl_ext_1] = "default";
487
488 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
491 {
492#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493 // ignore some perl-related arguments if some bozo installed us set[ug]id
494 if (rxvt_tainted ())
495 {
496 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500 rs[Rs_perl_lib] = 0;
501 rs[Rs_perl_eval] = 0;
502 }
503 }
504#endif
505 rxvt_perl.init (this);
506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
507 }
508#endif
509
510 pty = rxvt_new_ptytty ();
511
467 create_windows (argc, argv); 512 create_windows (argc, argv);
468 513
469 dDisp; 514 dDisp;
470 515
471 init_xlocale (); 516 init_xlocale ();
472 517
473 scr_reset (); /* initialize screen */ 518 scr_reset (); // initialize screen
474 519
475#if 0 520#if 0
476 XSynchronize (disp, True); 521 XSynchronize (disp, True);
477#endif 522#endif
478 523
479#ifdef HAVE_SCROLLBARS 524#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 525 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 526 resize_scrollbar (); /* create and map scrollbar */
482#endif 527#endif
483#if (MENUBAR_MAX)
484 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win);
486#endif
487#ifdef TRANSPARENT 528#ifdef TRANSPARENT
488 if (options & Opt_transparent) 529 if (OPTION (Opt_transparent))
489 { 530 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 531 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 532 check_our_parents ();
492 rootwin_ev.start (display, display->root); 533 rootwin_ev.start (display, display->root);
493 } 534 }
… …
500 541
501 init_command (cmd_argv); 542 init_command (cmd_argv);
502 543
503 free (cmd_argv); 544 free (cmd_argv);
504 545
546 if (pty->pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 547 pty_ev.start (pty->pty, EVENT_READ);
506 548
507 check_ev.start (); 549 check_ev.start ();
550
551 HOOK_INVOKE ((this, HOOK_START, DT_END));
508 552
509 return true; 553 return true;
510} 554}
511 555
512static struct sig_handlers 556static struct sig_handlers
… …
520 564
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 565 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 566 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 567 if (pid == (*t)->cmd_pid)
524 { 568 {
525 (*t)->destroy (); 569 (*t)->child_exit ();
526 break; 570 break;
527 } 571 }
528 } 572 }
529 573
530 /* 574 /*
… …
547 sw_int (this, &sig_handlers::sig_term) 591 sw_int (this, &sig_handlers::sig_term)
548 { 592 {
549 } 593 }
550} sig_handlers; 594} sig_handlers;
551 595
596char **rxvt_environ; // startup environment
597
552void 598void
553rxvt_init () 599rxvt_init ()
554{ 600{
601 uid_t uid = getuid ();
602 gid_t gid = getgid ();
603
604 // before doing anything else, check for setuid/setgid operation,
605 // start the helper process and drop privileges
606 if (uid != geteuid ()
607 || 1 //D
608 || gid != getegid ())
609 {
610#if PTYTTY_HELPER
611 rxvt_ptytty_server ();
612#else
613 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614#endif
615
616 // drop privileges
617#if HAVE_SETRESUID
618 setresgid (gid, gid, gid);
619 setresuid (uid, uid, uid);
620#elif HAVE_SETREUID
621 setregid (gid, gid);
622 setreuid (uid, uid);
623#elif HAVE_SETUID
624 setgid (gid);
625 setuid (uid);
626#endif
627
628 if (uid != geteuid ()
629 || gid != getegid ())
630 rxvt_fatal ("unable to drop privileges, aborting.\n");
631 }
632
633 rxvt_environ = environ;
634
555 /* 635 /*
556 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
557 * If we need privileges in any area then we must specifically request it. 637 * If we need privileges in any area then we must specifically request it.
558 * We should only need to be root in these cases: 638 * We should only need to be root in these cases:
559 * 1. write utmp entries on some systems 639 * 1. write utmp entries on some systems
… …
573 /* signal (SIGURG, SIG_DFL); */ 653 /* signal (SIGURG, SIG_DFL); */
574 654
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 655 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 656 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 657 XSetIOErrorHandler (rxvt_xioerror_handler);
658
659 XrmInitialize ();
578} 660}
579 661
580/* ------------------------------------------------------------------------- * 662/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 663 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 664 * ------------------------------------------------------------------------- */
… …
618 * ------------------------------------------------------------------------- */ 700 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */ 701/* take care of suid/sgid super-user (root) privileges */
620void 702void
621rxvt_privileges (rxvt_privaction action) 703rxvt_privileges (rxvt_privaction action)
622{ 704{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__) 705#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */ 707 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a)) 708# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a)) 709# define setegid(a) setregid(-1, (a))
… …
638 case IGNORE: 715 case IGNORE:
639 /* 716 /*
640 * change effective uid/gid - not real uid/gid - so we can switch 717 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required 718 * back to root later, as required
642 */ 719 */
720 setegid (getgid ());
643 seteuid (getuid ()); 721 seteuid (getuid ());
644 setegid (getgid ());
645 break; 722 break;
646 case SAVE: 723 case SAVE:
647 euid = geteuid ();
648 egid = getegid (); 724 saved_egid = getegid ();
725 saved_euid = geteuid ();
649 break; 726 break;
650 case RESTORE: 727 case RESTORE:
651 seteuid (euid);
652 setegid (egid); 728 setegid (saved_egid);
729 seteuid (saved_euid);
653 break; 730 break;
654 } 731 }
655# else 732# else
656 switch (action) 733 switch (action)
657 { 734 {
658 case IGNORE: 735 case IGNORE:
736 setgid (getgid ());
659 setuid (getuid ()); 737 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
662 case SAVE: 739 case SAVE:
663 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
664 case RESTORE: 741 case RESTORE:
665 break; 742 break;
666 } 743 }
667# endif 744# endif
668#endif 745#endif
669} 746}
670 747
671#ifdef UTMP_SUPPORT
672void
673rxvt_term::privileged_utmp (rxvt_privaction action)
674{
675 if ((options & Opt_utmpInhibit)
676 || !pty.name || !*pty.name)
677 return;
678
679 rxvt_privileges (RESTORE);
680
681 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]);
683 else
684 cleanutent ();
685
686 rxvt_privileges (IGNORE);
687}
688#endif
689
690/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
691/* 749/*
692 * window size/position calculcations for XSizeHint and other storage. 750 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 751 * if width/height are non-zero then override calculated width/height
694 */ 752 */
695void 753void
696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 755{
698 short recalc_x, recalc_y; 756 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 757 int x, y, sb_w, flags;
700 unsigned int w, h; 758 unsigned int w, h;
701 unsigned int max_width, max_height; 759 unsigned int max_width, max_height;
702 dDisp; 760 dDisp;
703 761
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 762 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
718 if (rs[Rs_geometry]) 776 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 777 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 778
721 if (flags & WidthValue) 779 if (flags & WidthValue)
722 { 780 {
723 ncol = BOUND_POSITIVE_INT16 (w); 781 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 782 szHint.flags |= USSize;
725 } 783 }
726 784
727 if (flags & HeightValue) 785 if (flags & HeightValue)
728 { 786 {
729 nrow = BOUND_POSITIVE_INT16 (h); 787 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 788 szHint.flags |= USSize;
731 } 789 }
732 790
733 if (flags & XValue) 791 if (flags & XValue)
734 { 792 {
… …
765 max_width = MAX_COLS * fwidth; 823 max_width = MAX_COLS * fwidth;
766 max_height = MAX_ROWS * fheight; 824 max_height = MAX_ROWS * fheight;
767 825
768 szHint.base_width = szHint.base_height = 2 * int_bwidth; 826 szHint.base_width = szHint.base_height = 2 * int_bwidth;
769 827
770 sb_w = mb_h = 0; 828 sb_w = 0;
771 window_vt_x = window_vt_y = int_bwidth; 829 window_vt_x = window_vt_y = int_bwidth;
772 830
773 if (scrollbar_visible ()) 831 if (scrollBar.state)
774 { 832 {
775 sb_w = scrollbar_TotalWidth (); 833 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 834 szHint.base_width += sb_w;
777 if (!(options & Opt_scrollBar_right)) 835 if (!OPTION (Opt_scrollBar_right))
778 window_vt_x += sb_w; 836 window_vt_x += sb_w;
779 }
780
781 if (menubar_visible ())
782 {
783 mb_h = menuBar_TotalHeight ();
784 szHint.base_height += mb_h;
785 window_vt_y += mb_h;
786 } 837 }
787 838
788 szHint.width_inc = fwidth; 839 szHint.width_inc = fwidth;
789 szHint.height_inc = fheight; 840 szHint.height_inc = fheight;
790 szHint.min_width = szHint.base_width + szHint.width_inc; 841 szHint.min_width = szHint.base_width + szHint.width_inc;
… …
795 szHint.width = newwidth; 846 szHint.width = newwidth;
796 width = newwidth - szHint.base_width; 847 width = newwidth - szHint.base_width;
797 } 848 }
798 else 849 else
799 { 850 {
800 MIN_IT (width, max_width); 851 min_it (width, max_width);
801 szHint.width = szHint.base_width + width; 852 szHint.width = szHint.base_width + width;
802 } 853 }
803 854
804 if (newheight && newheight - szHint.base_height < max_height) 855 if (newheight && newheight - szHint.base_height < max_height)
805 { 856 {
806 szHint.height = newheight; 857 szHint.height = newheight;
807 height = newheight - szHint.base_height; 858 height = newheight - szHint.base_height;
808 } 859 }
809 else 860 else
810 { 861 {
811 MIN_IT (height, max_height); 862 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 863 szHint.height = szHint.base_height + height;
813 } 864 }
814 865
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 867 window_sb_x = szHint.width - sb_w;
817 868
818 if (recalc_x) 869 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
820 if (recalc_y) 871 if (recalc_y)
… …
834 * Called after a window size change. 885 * Called after a window size change.
835 */ 886 */
836void 887void
837rxvt_term::tt_winch () 888rxvt_term::tt_winch ()
838{ 889{
839 if (pty.pty < 0) 890 if (pty->pty < 0)
840 return; 891 return;
841 892
842 struct winsize ws; 893 struct winsize ws;
843 894
844 ws.ws_col = ncol; 895 ws.ws_col = ncol;
845 ws.ws_row = nrow; 896 ws.ws_row = nrow;
846 ws.ws_xpixel = width; 897 ws.ws_xpixel = width;
847 ws.ws_ypixel = height; 898 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 900
850#if 0 901#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 903 if (cmd_pid) /* force through to the command */
853 kill (-cmd_pid, SIGWINCH); 904 kill (-cmd_pid, SIGWINCH);
… …
889 prop.height += lineSpace; 940 prop.height += lineSpace;
890 fs->set_prop (prop); 941 fs->set_prop (prop);
891 942
892 fwidth = prop.width; 943 fwidth = prop.width;
893 fheight = prop.height; 944 fheight = prop.height;
894 fweight = prop.weight; 945 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 946
898 for (int style = 1; style < 4; style++) 947 for (int style = 1; style < 4; style++)
899 { 948 {
900#if ENABLE_STYLES 949#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 950 const char *res = rs[Rs_font + style];
… …
935 return true; 984 return true;
936} 985}
937 986
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 987void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 988{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 989 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 990 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 991 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 992}
945 993
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 994void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 995{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 996 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 997 char *s = rxvt_wcstoutf8 (ws);
951 998
952 XChangeProperty (display->display, parent[0], 999 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1000 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
994 i = atoi (color); 1041 i = atoi (color);
995 1042
996 if (i >= 8 && i <= 15) 1043 if (i >= 8 && i <= 15)
997 { /* bright colors */ 1044 { /* bright colors */
998 i -= 8; 1045 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1046 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 1047 SET_PIXCOLOR (idx);
1002 goto done; 1048 goto done;
1003# endif
1004 } 1049 }
1005 1050
1006 if (i >= 0 && i <= 7) 1051 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 1052 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1053 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1181 1226
1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1228
1184 if (fix_screen || newwidth != old_width || newheight != old_height) 1229 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1230 {
1186 if (scrollbar_visible ()) 1231 if (scrollBar.state)
1187 { 1232 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1233 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1234 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1235 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1236 resize_scrollbar ();
1192 } 1237 }
1193 1238
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, vt, 1239 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1240 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1241 width, height);
1202 1242
1203 scr_clear (); 1243 scr_clear ();
1204#ifdef XPM_BACKGROUND 1244#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1245 resize_pixmap ();
1206#endif 1246#endif
… …
1386 XRectangle rect, status_rect, needed_rect; 1426 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1427 unsigned long fg, bg;
1388 const char *p; 1428 const char *p;
1389 char **s; 1429 char **s;
1390 XIMStyles *xim_styles; 1430 XIMStyles *xim_styles;
1431
1432 set_environ (envv);
1391 1433
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1435 return false;
1394 1436
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1561 int i; 1603 int i;
1562 const char *p; 1604 const char *p;
1563 char **s; 1605 char **s;
1564 char buf[IMBUFSIZ]; 1606 char buf[IMBUFSIZ];
1565 1607
1566 SET_R (this); 1608 make_current ();
1567 1609
1568 im_destroy (); 1610 im_destroy ();
1569 1611
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1613 if (Input_Context)

Diff Legend

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