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.148 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.174 by root, Thu Jan 12 00:11:13 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
… …
193 pty.put (); 221 pty.put ();
194} 222}
195 223
196rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
197{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 229
200 emergency_cleanup (); 230 emergency_cleanup ();
201 231
202#if ENABLE_STYLES 232#if ENABLE_STYLES
203 for (int i = RS_styleCount; --i; ) 233 for (int i = RS_styleCount; --i; )
204 if (TermWin.fontset[i] != TermWin.fontset[0]) 234 if (fontset[i] != fontset[0])
205 delete TermWin.fontset[i]; 235 delete fontset[i];
206#endif 236#endif
207 delete TermWin.fontset[0]; 237 delete fontset[0];
208 238
209 if (display) 239 if (display)
210 { 240 {
211 dDisp; 241 dDisp;
212 242
… …
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 271 if (topShadowGC) XFreeGC (disp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 272 if (botShadowGC) XFreeGC (disp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 273 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244#endif 274#endif
245 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 275 if (gc) XFreeGC (disp, gc);
246 276
247#if defined(MENUBAR) && (MENUBAR_MAX > 1) 277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable; 278 delete menuBar.drawable;
249 //if (menuBar.win) 279 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win); 280 // XDestroyWindow (disp, menuBar.win);
251#endif 281#endif
252 delete TermWin.drawable; 282 delete drawable;
253 // destroy all windows 283 // destroy all windows
254 if (TermWin.parent[0]) 284 if (parent[0])
255 XDestroyWindow (disp, TermWin.parent[0]); 285 XDestroyWindow (disp, parent[0]);
256 } 286 }
257 287
258 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
259
260 delete pix_colors_focused; 289 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
263#endif 292#endif
264 293
… …
284 delete argv; 313 delete argv;
285 314
286#ifdef KEYSYM_RESOURCE 315#ifdef KEYSYM_RESOURCE
287 delete keyboard; 316 delete keyboard;
288#endif 317#endif
318}
319
320void
321rxvt_term::child_exit ()
322{
323 cmd_pid = 0;
324
325 if (!OPTION (Opt_hold))
326 destroy ();
289} 327}
290 328
291void 329void
292rxvt_term::destroy () 330rxvt_term::destroy ()
293{ 331{
… …
441bool 479bool
442rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
443{ 481{
444 SET_R (this); 482 SET_R (this);
445 483
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
446 set_locale (""); 489 set_locale ("");
447 490
448 if (!init_vars ()) 491 if (!init_vars ())
449 return false; 492 return false;
450 493
451 init_secondary (); 494 init_secondary ();
452 495
453 const char **cmd_argv = init_resources (argc, argv); 496 cmd_argv = init_resources (argc, argv);
454 497
455#ifdef KEYSYM_RESOURCE 498#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 499 keyboard->register_done ();
457#endif 500#endif
458 501
459#if MENUBAR_MAX 502#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]); 503 menubar_read (rs[Rs_menu]);
461#endif 504#endif
462#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 506 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 507 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 508#endif
509 }
466 510
511#if ENABLE_PERL
512 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default";
514
515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
518 {
519#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520 // ignore some perl-related arguments if some bozo installed us set[ug]id
521 if (rxvt_tainted ())
522 {
523 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525 {
526 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0;
529 }
530 }
531#endif
532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
535 }
536#endif
537
538 {
539 TEMP_ENV;
540
467 create_windows (argc, argv); 541 create_windows (argc, argv);
468 542
469 dDisp; 543 dDisp;
470 544
471 init_xlocale (); 545 init_xlocale ();
472 546
473 scr_reset (); /* initialize screen */ 547 scr_reset (); // initialize screen
474 548
475#if 0 549#if 0
476 XSynchronize (disp, True); 550 XSynchronize (disp, True);
477#endif 551#endif
478 552
479#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 554 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
482#endif 556#endif
483#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
484 if (menubar_visible ()) 558 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win); 559 XMapWindow (disp, menuBar.win);
486#endif 560#endif
487#ifdef TRANSPARENT 561#ifdef TRANSPARENT
488 if (options & Opt_transparent) 562 if (OPTION (Opt_transparent))
489 { 563 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 565 check_our_parents ();
492 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
493 } 567 }
494#endif 568#endif
495 569
496 XMapWindow (disp, TermWin.vt); 570 XMapWindow (disp, vt);
497 XMapWindow (disp, TermWin.parent[0]); 571 XMapWindow (disp, parent[0]);
498 572
499 set_colorfgbg (); 573 set_colorfgbg ();
500 574
501 init_command (cmd_argv); 575 init_command (cmd_argv);
502 576
503 free (cmd_argv); 577 free (cmd_argv);
504 578
579 if (pty.pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
506 581
507 check_ev.start (); 582 check_ev.start ();
583
584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
508 586
509 return true; 587 return true;
510} 588}
511 589
512static struct sig_handlers 590static struct sig_handlers
… …
520 598
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 599 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 600 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 601 if (pid == (*t)->cmd_pid)
524 { 602 {
525 (*t)->destroy (); 603 (*t)->child_exit ();
526 break; 604 break;
527 } 605 }
528 } 606 }
529 607
530 /* 608 /*
… …
573 /* signal (SIGURG, SIG_DFL); */ 651 /* signal (SIGURG, SIG_DFL); */
574 652
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 653 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 654 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 655 XSetIOErrorHandler (rxvt_xioerror_handler);
656
657 XrmInitialize ();
578} 658}
579 659
580/* ------------------------------------------------------------------------- * 660/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 661 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 662 * ------------------------------------------------------------------------- */
… …
618 * ------------------------------------------------------------------------- */ 698 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */ 699/* take care of suid/sgid super-user (root) privileges */
620void 700void
621rxvt_privileges (rxvt_privaction action) 701rxvt_privileges (rxvt_privaction action)
622{ 702{
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__) 703#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */ 705 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a)) 706# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a)) 707# define setegid(a) setregid(-1, (a))
… …
638 case IGNORE: 713 case IGNORE:
639 /* 714 /*
640 * change effective uid/gid - not real uid/gid - so we can switch 715 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required 716 * back to root later, as required
642 */ 717 */
718 setegid (getgid ());
643 seteuid (getuid ()); 719 seteuid (getuid ());
644 setegid (getgid ());
645 break; 720 break;
646 case SAVE: 721 case SAVE:
647 euid = geteuid ();
648 egid = getegid (); 722 saved_egid = getegid ();
723 saved_euid = geteuid ();
649 break; 724 break;
650 case RESTORE: 725 case RESTORE:
651 seteuid (euid);
652 setegid (egid); 726 setegid (saved_egid);
727 seteuid (saved_euid);
653 break; 728 break;
654 } 729 }
655# else 730# else
656 switch (action) 731 switch (action)
657 { 732 {
658 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
659 setuid (getuid ()); 735 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
662 case SAVE: 737 case SAVE:
663 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
664 case RESTORE: 739 case RESTORE:
665 break; 740 break;
… …
670 745
671#ifdef UTMP_SUPPORT 746#ifdef UTMP_SUPPORT
672void 747void
673rxvt_term::privileged_utmp (rxvt_privaction action) 748rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 749{
675 if ((options & Opt_utmpInhibit) 750 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 751 || !pty.name || !*pty.name)
677 return; 752 return;
678 753
679 rxvt_privileges (RESTORE); 754 rxvt_privileges (RESTORE);
680 755
… …
691/* 766/*
692 * window size/position calculcations for XSizeHint and other storage. 767 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 768 * if width/height are non-zero then override calculated width/height
694 */ 769 */
695void 770void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 771rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 772{
698 short recalc_x, recalc_y; 773 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 774 int x, y, sb_w, mb_h, flags;
700 unsigned int w, h; 775 unsigned int w, h;
701 unsigned int max_width, max_height; 776 unsigned int max_width, max_height;
702 dDisp; 777 dDisp;
703 778
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 779 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 780 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 781
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 782 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 783 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 784 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 785
711 recalc_x = recalc_y = 0; 786 recalc_x = recalc_y = 0;
712 flags = 0; 787 flags = 0;
788
713 if (!parsed_geometry) 789 if (!parsed_geometry)
714 { 790 {
715 parsed_geometry = 1; 791 parsed_geometry = 1;
792
716 if (rs[Rs_geometry]) 793 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 794 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 795
719 if (flags & WidthValue) 796 if (flags & WidthValue)
720 { 797 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 798 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 799 szHint.flags |= USSize;
723 } 800 }
724 801
725 if (flags & HeightValue) 802 if (flags & HeightValue)
726 { 803 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 804 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 805 szHint.flags |= USSize;
729 } 806 }
730 807
731 if (flags & XValue) 808 if (flags & XValue)
732 { 809 {
733 szHint.x = x; 810 szHint.x = x;
734 szHint.flags |= USPosition; 811 szHint.flags |= USPosition;
812
735 if (flags & XNegative) 813 if (flags & XNegative)
736 { 814 {
737 recalc_x = 1; 815 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 816 szHint.win_gravity = NorthEastGravity;
739 } 817 }
… …
741 819
742 if (flags & YValue) 820 if (flags & YValue)
743 { 821 {
744 szHint.y = y; 822 szHint.y = y;
745 szHint.flags |= USPosition; 823 szHint.flags |= USPosition;
824
746 if (flags & YNegative) 825 if (flags & YNegative)
747 { 826 {
748 recalc_y = 1; 827 recalc_y = 1;
828
749 if (szHint.win_gravity == NorthEastGravity) 829 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 830 szHint.win_gravity = SouthEastGravity;
751 else 831 else
752 szHint.win_gravity = SouthWestGravity; 832 szHint.win_gravity = SouthWestGravity;
753 } 833 }
754 } 834 }
755 } 835 }
756 836
757 /* TODO: BOUNDS */ 837 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 838 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 839 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 840 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 841 max_height = MAX_ROWS * fheight;
762 842
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 843 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 844
765 sb_w = mb_h = 0; 845 sb_w = mb_h = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 846 window_vt_x = window_vt_y = int_bwidth;
767 847
768 if (scrollbar_visible ()) 848 if (scrollbar_visible ())
769 { 849 {
770 sb_w = scrollbar_TotalWidth (); 850 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 851 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 852 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 853 window_vt_x += sb_w;
774 } 854 }
775 855
776 if (menubar_visible ()) 856 if (menubar_visible ())
777 { 857 {
778 mb_h = menuBar_TotalHeight (); 858 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h; 859 szHint.base_height += mb_h;
780 window_vt_y += mb_h; 860 window_vt_y += mb_h;
781 } 861 }
782 862
783 szHint.width_inc = TermWin.fwidth; 863 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 864 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 865 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 866 szHint.min_height = szHint.base_height + szHint.height_inc;
787 867
788 if (width && width - szHint.base_width < max_width) 868 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 869 {
790 szHint.width = width; 870 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 871 width = newwidth - szHint.base_width;
792 } 872 }
793 else 873 else
794 { 874 {
795 MIN_IT (TermWin.width, max_width); 875 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 876 szHint.width = szHint.base_width + width;
797 } 877 }
798 878
799 if (height && height - szHint.base_height < max_height) 879 if (newheight && newheight - szHint.base_height < max_height)
800 { 880 {
801 szHint.height = height; 881 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 882 height = newheight - szHint.base_height;
803 } 883 }
804 else 884 else
805 { 885 {
806 MIN_IT (TermWin.height, max_height); 886 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 887 szHint.height = szHint.base_height + height;
808 } 888 }
809 889
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 890 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 891 window_sb_x = szHint.width - sb_w;
812 892
813 if (recalc_x) 893 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 894 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 895 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 896 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 897
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 898 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 899 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 900 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 901 ncol, nrow, szHint.width,
824 szHint.height)); 902 szHint.height));
825 return; 903 return;
826} 904}
827 905
828/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
… …
836 if (pty.pty < 0) 914 if (pty.pty < 0)
837 return; 915 return;
838 916
839 struct winsize ws; 917 struct winsize ws;
840 918
841 ws.ws_col = TermWin.ncol; 919 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 920 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 921 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 922 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 923 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
846 924
847#if 0 925#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 926 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 927 if (cmd_pid) /* force through to the command */
… …
873 return false; 951 return false;
874 } 952 }
875 953
876#if ENABLE_STYLES 954#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 955 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 956 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 957 delete fontset[i];
880#endif 958#endif
881 959
882 delete TermWin.fontset[0]; 960 delete fontset[0];
883 TermWin.fontset[0] = fs; 961 fontset[0] = fs;
884 962
885 prop = (*fs)[1]->properties (); 963 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 964 prop.height += lineSpace;
887 fs->set_prop (prop); 965 fs->set_prop (prop);
888 966
889 TermWin.fwidth = prop.width; 967 fwidth = prop.width;
890 TermWin.fheight = prop.height; 968 fheight = prop.height;
891 TermWin.fweight = prop.weight; 969 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 970
895 for (int style = 1; style < 4; style++) 971 for (int style = 1; style < 4; style++)
896 { 972 {
897#if ENABLE_STYLES 973#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 974 const char *res = rs[Rs_font + style];
899 975
900 if (res && !*res) 976 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 977 fontset[style] = fontset[0];
902 else 978 else
903 { 979 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 980 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 981 rxvt_fontprop prop2 = prop;
906 982
907 if (res) 983 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 984 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 985 else
910 { 986 {
911 res = TermWin.fontset[0]->fontdesc; 987 res = fontset[0]->fontdesc;
912 988
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 989 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
914 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 990 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 991 }
916 992
917 fs->populate (res); 993 fs->populate (res);
918 fs->set_prop (prop2); 994 fs->set_prop (prop2);
919 } 995 }
920#else 996#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 997 fontset[style] = fontset[0];
922#endif 998#endif
923 } 999 }
924 1000
925 if (TermWin.parent[0]) 1001 if (parent[0])
926 { 1002 {
927 resize_all_windows (0, 0, 0); 1003 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 1004 scr_remap_chars ();
929 scr_touch (true); 1005 scr_touch (true);
930 } 1006 }
… …
932 return true; 1008 return true;
933} 1009}
934 1010
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1011void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 1012{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 1013 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 1014 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1015 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 1016}
942 1017
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1018void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 1019{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 1020 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 1021 char *s = rxvt_wcstoutf8 (ws);
948 1022
949 XChangeProperty (display->display, TermWin.parent[0], 1023 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1024 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 1025 (const unsigned char *)s, strlen (s));
952 1026
953 free (s); 1027 free (s);
954 free (ws); 1028 free (ws);
… …
991 i = atoi (color); 1065 i = atoi (color);
992 1066
993 if (i >= 8 && i <= 15) 1067 if (i >= 8 && i <= 15)
994 { /* bright colors */ 1068 { /* bright colors */
995 i -= 8; 1069 i -= 8;
996# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1070 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
999 goto done; 1072 goto done;
1000# endif
1001 } 1073 }
1002 1074
1003 if (i >= 0 && i <= 7) 1075 if (i >= 0 && i <= 7)
1004 { /* normal colors */ 1076 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1077 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1117 1189
1118/* -------------------------------------------------------------------- * 1190/* -------------------------------------------------------------------- *
1119 * - WINDOW RESIZING - * 1191 * - WINDOW RESIZING - *
1120 * -------------------------------------------------------------------- */ 1192 * -------------------------------------------------------------------- */
1121void 1193void
1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1194rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123{ 1195{
1124 int fix_screen; 1196 int fix_screen;
1125#ifdef SMART_RESIZE
1126 int old_width = szHint.width, old_height = szHint.height; 1197 int old_width = szHint.width, old_height = szHint.height;
1127#endif
1128 dDisp; 1198 dDisp;
1129 1199
1130 window_calc (width, height); 1200 window_calc (newwidth, newheight);
1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1201 XSetWMNormalHints (disp, parent[0], &szHint);
1132 1202
1133 if (!ignoreparent) 1203 if (!ignoreparent)
1134 { 1204 {
1135#ifdef SMART_RESIZE 1205#ifdef SMART_RESIZE
1136 /* 1206 /*
… …
1140 int x, y, x1, y1; 1210 int x, y, x1, y1;
1141 int dx, dy; 1211 int dx, dy;
1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1212 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143 Window unused_cr; 1213 Window unused_cr;
1144 1214
1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1215 XTranslateCoordinates (disp, parent[0], display->root,
1146 0, 0, &x, &y, &unused_cr); 1216 0, 0, &x, &y, &unused_cr);
1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1217 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1218 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149 /* 1219 /*
1150 * if display->root isn't the parent window, a WM will probably have offset 1220 * if display->root isn't the parent window, a WM will probably have offset
1151 * our position for handles and decorations. Counter it 1221 * our position for handles and decorations. Counter it
1152 */ 1222 */
… …
1169 if (y < y1) /* top half */ 1239 if (y < y1) /* top half */
1170 dy = 0; 1240 dy = 0;
1171 else if (y == y1) /* exact center */ 1241 else if (y == y1) /* exact center */
1172 dy /= 2; 1242 dy /= 2;
1173 1243
1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1244 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1175 szHint.width, szHint.height); 1245 szHint.width, szHint.height);
1176#else 1246#else
1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1247 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1178#endif 1248#endif
1179 } 1249 }
1180 1250
1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1251 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1182 1252
1183 if (fix_screen || width != old_width || height != old_height) 1253 if (fix_screen || newwidth != old_width || newheight != old_height)
1184 { 1254 {
1185 if (scrollbar_visible ()) 1255 if (scrollbar_visible ())
1186 { 1256 {
1187 XMoveResizeWindow (disp, scrollBar.win, 1257 XMoveResizeWindow (disp, scrollBar.win,
1188 window_sb_x, 0, 1258 window_sb_x, 0,
… …
1191 } 1261 }
1192 1262
1193 if (menubar_visible ()) 1263 if (menubar_visible ())
1194 XMoveResizeWindow (disp, menuBar.win, 1264 XMoveResizeWindow (disp, menuBar.win,
1195 window_vt_x, 0, 1265 window_vt_x, 0,
1196 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1266 width, menuBar_TotalHeight ());
1197 1267
1198 XMoveResizeWindow (disp, TermWin.vt, 1268 XMoveResizeWindow (disp, vt,
1199 window_vt_x, window_vt_y, 1269 window_vt_x, window_vt_y,
1200 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1270 width, height);
1201 1271
1202 scr_clear (); 1272 scr_clear ();
1203#ifdef XPM_BACKGROUND 1273#ifdef XPM_BACKGROUND
1204 resize_pixmap (); 1274 resize_pixmap ();
1205#endif 1275#endif
… …
1211 int old_ncol = prev_ncol; 1281 int old_ncol = prev_ncol;
1212 1282
1213 /* scr_reset only works on the primary screen */ 1283 /* scr_reset only works on the primary screen */
1214 if (old_height) /* this is not the first time through */ 1284 if (old_height) /* this is not the first time through */
1215 { 1285 {
1216 unsigned int ncol = TermWin.ncol; 1286 unsigned int ocol = ncol;
1217 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1287 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218 curr_screen = scr_change_screen (PRIMARY); 1288 curr_screen = scr_change_screen (PRIMARY);
1219 TermWin.ncol = ncol; 1289 ncol = ocol;
1220 } 1290 }
1221 1291
1222 scr_reset (); 1292 scr_reset ();
1223 1293
1224 if (curr_screen >= 0) /* this is not the first time through */ 1294 if (curr_screen >= 0) /* this is not the first time through */
1225 { 1295 {
1226 scr_change_screen (curr_screen); 1296 scr_change_screen (curr_screen);
1227 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1297 selection_check (old_ncol != ncol ? 4 : 0);
1228 } 1298 }
1229 } 1299 }
1230 1300
1231 old_width = szHint.width; 1301 old_width = szHint.width;
1232 old_height = szHint.height; 1302 old_height = szHint.height;
1233 1303
1234#ifdef XPM_BACKGROUND 1304#ifdef XPM_BACKGROUND
1235 if (TermWin.pixmap) 1305 if (pixmap)
1236 scr_touch (false); 1306 scr_touch (false);
1237#endif 1307#endif
1238 1308
1239#ifdef USE_XIM 1309#ifdef USE_XIM
1240 IMSetStatusPosition (); 1310 IMSetStatusPosition ();
… …
1244/* 1314/*
1245 * Set the width/height of the vt window in characters. Units are pixels. 1315 * Set the width/height of the vt window in characters. Units are pixels.
1246 * good for toggling 80/132 columns 1316 * good for toggling 80/132 columns
1247 */ 1317 */
1248void 1318void
1249rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1319rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250{ 1320{
1251 XWindowAttributes wattr; 1321 XWindowAttributes wattr;
1252 1322
1253 if (width == 0 || height == 0) 1323 if (newwidth == 0 || newheight == 0)
1254 { 1324 {
1255 XGetWindowAttributes (display->display, display->root, &wattr); 1325 XGetWindowAttributes (display->display, display->root, &wattr);
1256 1326
1257 if (width == 0) 1327 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1328 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1329 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1330 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1331 }
1332
1333 if (newwidth != width || newheight != height)
1334 {
1265 width += szHint.base_width; 1335 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1336 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1337 resize_all_windows (newwidth, newheight, 0);
1268 } 1338 }
1269} 1339}
1270 1340
1271/* -------------------------------------------------------------------- * 1341/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1342 * - X INPUT METHOD ROUTINES - *
… …
1282 1352
1283void 1353void
1284rxvt_term::im_set_size (XRectangle &size) 1354rxvt_term::im_set_size (XRectangle &size)
1285{ 1355{
1286 // the int_bwidth terms make no sense to me 1356 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1357 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1358 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1359 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1360 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1361}
1292 1362
1293void 1363void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1364rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1365 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1366 const XRectangle &needed_rect)
1297{ 1367{
1298 preedit_rect.x = needed_rect.width; 1368 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1369 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1370 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1371 preedit_rect.height = fheight;
1302 1372
1303 status_rect.x = 0; 1373 status_rect.x = 0;
1304 status_rect.y = 0; 1374 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1375 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1376 status_rect.height = fheight;
1307} 1377}
1308 1378
1309/* Checking whether input method is running. */ 1379/* Checking whether input method is running. */
1310bool 1380bool
1311rxvt_term::IMisRunning () 1381rxvt_term::IMisRunning ()
… …
1339{ 1409{
1340 XPoint nspot; 1410 XPoint nspot;
1341 XVaNestedList preedit_attr; 1411 XVaNestedList preedit_attr;
1342 1412
1343 if (!Input_Context 1413 if (!Input_Context
1344 || !TermWin.focus 1414 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1415 || !(input_style & XIMPreeditPosition))
1346 return; 1416 return;
1347 1417
1348 im_set_position (nspot); 1418 im_set_position (nspot);
1349 1419
… …
1385 XRectangle rect, status_rect, needed_rect; 1455 XRectangle rect, status_rect, needed_rect;
1386 unsigned long fg, bg; 1456 unsigned long fg, bg;
1387 const char *p; 1457 const char *p;
1388 char **s; 1458 char **s;
1389 XIMStyles *xim_styles; 1459 XIMStyles *xim_styles;
1460
1461 TEMP_ENV;
1390 1462
1391 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1392 return false; 1464 return false;
1393 1465
1394 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1541 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1542 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1543 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1544 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1545 "*",
1474 TermWin.fheight, 1546 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1547 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1548 fheight - 2, fheight + 2);
1477 1549
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1550 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1551 &missing_charset_list, &missing_charset_count, &def_string);
1480 1552
1481 if (missing_charset_list) 1553 if (missing_charset_list)
… …
1527 NULL); 1599 NULL);
1528 } 1600 }
1529 1601
1530 Input_Context = XCreateIC (xim, 1602 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1603 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1604 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1605 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1606 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1607 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1608 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1609 status_attr, NULL);
1538 1610
… …
1622{ 1694{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1695 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1696 XVaNestedList preedit_attr, status_attr;
1625 1697
1626 if (!Input_Context 1698 if (!Input_Context
1627 || !TermWin.focus 1699 || !focus
1628 || !(input_style & XIMPreeditArea) 1700 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1701 || !IMisRunning ())
1630 return; 1702 return;
1631 1703
1632 /* Getting the necessary width of preedit area */ 1704 /* Getting the necessary width of preedit area */

Diff Legend

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