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

Diff Legend

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