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

Diff Legend

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