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.155 by root, Mon Jan 2 15:35:43 2006 UTC

… …
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
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif
46
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128];
… …
193 pty.put (); 193 pty.put ();
194} 194}
195 195
196rxvt_term::~rxvt_term () 196rxvt_term::~rxvt_term ()
197{ 197{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
199
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 200 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 201
200 emergency_cleanup (); 202 emergency_cleanup ();
201 203
202#if ENABLE_STYLES 204#if ENABLE_STYLES
203 for (int i = RS_styleCount; --i; ) 205 for (int i = RS_styleCount; --i; )
204 if (TermWin.fontset[i] != TermWin.fontset[0]) 206 if (fontset[i] != fontset[0])
205 delete TermWin.fontset[i]; 207 delete fontset[i];
206#endif 208#endif
207 delete TermWin.fontset[0]; 209 delete fontset[0];
208 210
209 if (display) 211 if (display)
210 { 212 {
211 dDisp; 213 dDisp;
212 214
… …
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 243 if (topShadowGC) XFreeGC (disp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 244 if (botShadowGC) XFreeGC (disp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 245 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244#endif 246#endif
245 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 247 if (gc) XFreeGC (disp, gc);
246 248
247#if defined(MENUBAR) && (MENUBAR_MAX > 1) 249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable; 250 delete menuBar.drawable;
249 //if (menuBar.win) 251 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win); 252 // XDestroyWindow (disp, menuBar.win);
251#endif 253#endif
252 delete TermWin.drawable; 254 delete drawable;
253 // destroy all windows 255 // destroy all windows
254 if (TermWin.parent[0]) 256 if (parent[0])
255 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
256 } 258 }
257 259
258 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
259 261
260 delete pix_colors_focused; 262 delete pix_colors_focused;
… …
284 delete argv; 286 delete argv;
285 287
286#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
287 delete keyboard; 289 delete keyboard;
288#endif 290#endif
291}
292
293void
294rxvt_term::child_exit ()
295{
296 cmd_pid = 0;
297
298 if (!OPTION (Opt_hold))
299 destroy ();
289} 300}
290 301
291void 302void
292rxvt_term::destroy () 303rxvt_term::destroy ()
293{ 304{
… …
458 469
459#if MENUBAR_MAX 470#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]); 471 menubar_read (rs[Rs_menu]);
461#endif 472#endif
462#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 474 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 476#endif
477
478#if ENABLE_PERL
479 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END));
466 483
467 create_windows (argc, argv); 484 create_windows (argc, argv);
468 485
469 dDisp; 486 dDisp;
470 487
… …
475#if 0 492#if 0
476 XSynchronize (disp, True); 493 XSynchronize (disp, True);
477#endif 494#endif
478 495
479#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 497 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
482#endif 499#endif
483#if (MENUBAR_MAX) 500#if (MENUBAR_MAX)
484 if (menubar_visible ()) 501 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win); 502 XMapWindow (disp, menuBar.win);
486#endif 503#endif
487#ifdef TRANSPARENT 504#ifdef TRANSPARENT
488 if (options & Opt_transparent) 505 if (OPTION (Opt_transparent))
489 { 506 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 508 check_our_parents ();
492 rootwin_ev.start (display, display->root); 509 rootwin_ev.start (display, display->root);
493 } 510 }
494#endif 511#endif
495 512
496 XMapWindow (disp, TermWin.vt); 513 XMapWindow (disp, vt);
497 XMapWindow (disp, TermWin.parent[0]); 514 XMapWindow (disp, parent[0]);
498 515
499 set_colorfgbg (); 516 set_colorfgbg ();
500 517
501 init_command (cmd_argv); 518 init_command (cmd_argv);
502 519
503 free (cmd_argv); 520 free (cmd_argv);
504 521
505 pty_ev.start (pty.pty, EVENT_READ); 522 pty_ev.start (pty.pty, EVENT_READ);
506 523
507 check_ev.start (); 524 check_ev.start ();
525
526 PERL_INVOKE ((this, HOOK_START, DT_END));
508 527
509 return true; 528 return true;
510} 529}
511 530
512static struct sig_handlers 531static struct sig_handlers
… …
520 539
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 540 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 541 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 542 if (pid == (*t)->cmd_pid)
524 { 543 {
525 (*t)->destroy (); 544 (*t)->child_exit ();
526 break; 545 break;
527 } 546 }
528 } 547 }
529 548
530 /* 549 /*
… …
670 689
671#ifdef UTMP_SUPPORT 690#ifdef UTMP_SUPPORT
672void 691void
673rxvt_term::privileged_utmp (rxvt_privaction action) 692rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 693{
675 if ((options & Opt_utmpInhibit) 694 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 695 || !pty.name || !*pty.name)
677 return; 696 return;
678 697
679 rxvt_privileges (RESTORE); 698 rxvt_privileges (RESTORE);
680 699
… …
691/* 710/*
692 * window size/position calculcations for XSizeHint and other storage. 711 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 712 * if width/height are non-zero then override calculated width/height
694 */ 713 */
695void 714void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 715rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 716{
698 short recalc_x, recalc_y; 717 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 718 int x, y, sb_w, mb_h, flags;
700 unsigned int w, h; 719 unsigned int w, h;
701 unsigned int max_width, max_height; 720 unsigned int max_width, max_height;
702 dDisp; 721 dDisp;
703 722
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 723 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 724 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 725
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 726 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 727 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 728 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 729
711 recalc_x = recalc_y = 0; 730 recalc_x = recalc_y = 0;
712 flags = 0; 731 flags = 0;
732
713 if (!parsed_geometry) 733 if (!parsed_geometry)
714 { 734 {
715 parsed_geometry = 1; 735 parsed_geometry = 1;
736
716 if (rs[Rs_geometry]) 737 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 738 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 739
719 if (flags & WidthValue) 740 if (flags & WidthValue)
720 { 741 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 742 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 743 szHint.flags |= USSize;
723 } 744 }
724 745
725 if (flags & HeightValue) 746 if (flags & HeightValue)
726 { 747 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 748 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 749 szHint.flags |= USSize;
729 } 750 }
730 751
731 if (flags & XValue) 752 if (flags & XValue)
732 { 753 {
733 szHint.x = x; 754 szHint.x = x;
734 szHint.flags |= USPosition; 755 szHint.flags |= USPosition;
756
735 if (flags & XNegative) 757 if (flags & XNegative)
736 { 758 {
737 recalc_x = 1; 759 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 760 szHint.win_gravity = NorthEastGravity;
739 } 761 }
… …
741 763
742 if (flags & YValue) 764 if (flags & YValue)
743 { 765 {
744 szHint.y = y; 766 szHint.y = y;
745 szHint.flags |= USPosition; 767 szHint.flags |= USPosition;
768
746 if (flags & YNegative) 769 if (flags & YNegative)
747 { 770 {
748 recalc_y = 1; 771 recalc_y = 1;
772
749 if (szHint.win_gravity == NorthEastGravity) 773 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 774 szHint.win_gravity = SouthEastGravity;
751 else 775 else
752 szHint.win_gravity = SouthWestGravity; 776 szHint.win_gravity = SouthWestGravity;
753 } 777 }
754 } 778 }
755 } 779 }
756 780
757 /* TODO: BOUNDS */ 781 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 782 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 783 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 784 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 785 max_height = MAX_ROWS * fheight;
762 786
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 787 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 788
765 sb_w = mb_h = 0; 789 sb_w = mb_h = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 790 window_vt_x = window_vt_y = int_bwidth;
767 791
768 if (scrollbar_visible ()) 792 if (scrollbar_visible ())
769 { 793 {
770 sb_w = scrollbar_TotalWidth (); 794 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 795 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 796 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 797 window_vt_x += sb_w;
774 } 798 }
775 799
776 if (menubar_visible ()) 800 if (menubar_visible ())
777 { 801 {
778 mb_h = menuBar_TotalHeight (); 802 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h; 803 szHint.base_height += mb_h;
780 window_vt_y += mb_h; 804 window_vt_y += mb_h;
781 } 805 }
782 806
783 szHint.width_inc = TermWin.fwidth; 807 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 808 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 809 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 810 szHint.min_height = szHint.base_height + szHint.height_inc;
787 811
788 if (width && width - szHint.base_width < max_width) 812 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 813 {
790 szHint.width = width; 814 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 815 width = newwidth - szHint.base_width;
792 } 816 }
793 else 817 else
794 { 818 {
795 MIN_IT (TermWin.width, max_width); 819 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 820 szHint.width = szHint.base_width + width;
797 } 821 }
798 822
799 if (height && height - szHint.base_height < max_height) 823 if (newheight && newheight - szHint.base_height < max_height)
800 { 824 {
801 szHint.height = height; 825 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 826 height = newheight - szHint.base_height;
803 } 827 }
804 else 828 else
805 { 829 {
806 MIN_IT (TermWin.height, max_height); 830 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 831 szHint.height = szHint.base_height + height;
808 } 832 }
809 833
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 834 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 835 window_sb_x = szHint.width - sb_w;
812 836
813 if (recalc_x) 837 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 838 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 839 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 840 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 841
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 842 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 843 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 844 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 845 ncol, nrow, szHint.width,
824 szHint.height)); 846 szHint.height));
825 return; 847 return;
826} 848}
827 849
828/*----------------------------------------------------------------------*/ 850/*----------------------------------------------------------------------*/
… …
836 if (pty.pty < 0) 858 if (pty.pty < 0)
837 return; 859 return;
838 860
839 struct winsize ws; 861 struct winsize ws;
840 862
841 ws.ws_col = TermWin.ncol; 863 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 864 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 865 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 866 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 867 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
846 868
847#if 0 869#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 870 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 871 if (cmd_pid) /* force through to the command */
… …
873 return false; 895 return false;
874 } 896 }
875 897
876#if ENABLE_STYLES 898#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 899 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 900 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 901 delete fontset[i];
880#endif 902#endif
881 903
882 delete TermWin.fontset[0]; 904 delete fontset[0];
883 TermWin.fontset[0] = fs; 905 fontset[0] = fs;
884 906
885 prop = (*fs)[1]->properties (); 907 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 908 prop.height += lineSpace;
887 fs->set_prop (prop); 909 fs->set_prop (prop);
888 910
889 TermWin.fwidth = prop.width; 911 fwidth = prop.width;
890 TermWin.fheight = prop.height; 912 fheight = prop.height;
891 TermWin.fweight = prop.weight;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent; 913 fbase = (*fs)[1]->ascent;
894 914
895 for (int style = 1; style < 4; style++) 915 for (int style = 1; style < 4; style++)
896 { 916 {
897#if ENABLE_STYLES 917#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 918 const char *res = rs[Rs_font + style];
899 919
900 if (res && !*res) 920 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 921 fontset[style] = fontset[0];
902 else 922 else
903 { 923 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 924 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 925 rxvt_fontprop prop2 = prop;
906 926
907 if (res) 927 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 928 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 929 else
910 { 930 {
911 res = TermWin.fontset[0]->fontdesc; 931 res = fontset[0]->fontdesc;
912 932
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 933 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; 934 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 935 }
916 936
917 fs->populate (res); 937 fs->populate (res);
918 fs->set_prop (prop2); 938 fs->set_prop (prop2);
919 } 939 }
920#else 940#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 941 fontset[style] = fontset[0];
922#endif 942#endif
923 } 943 }
924 944
925 if (TermWin.parent[0]) 945 if (parent[0])
926 { 946 {
927 resize_all_windows (0, 0, 0); 947 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 948 scr_remap_chars ();
929 scr_touch (true); 949 scr_touch (true);
930 } 950 }
… …
932 return true; 952 return true;
933} 953}
934 954
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 955void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 956{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 957 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 958 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 959 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 960}
942 961
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 962void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 963{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 964 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 965 char *s = rxvt_wcstoutf8 (ws);
948 966
949 XChangeProperty (display->display, TermWin.parent[0], 967 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 968 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 969 (const unsigned char *)s, strlen (s));
952 970
953 free (s); 971 free (s);
954 free (ws); 972 free (ws);
… …
1117 1135
1118/* -------------------------------------------------------------------- * 1136/* -------------------------------------------------------------------- *
1119 * - WINDOW RESIZING - * 1137 * - WINDOW RESIZING - *
1120 * -------------------------------------------------------------------- */ 1138 * -------------------------------------------------------------------- */
1121void 1139void
1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1140rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123{ 1141{
1124 int fix_screen; 1142 int fix_screen;
1125#ifdef SMART_RESIZE
1126 int old_width = szHint.width, old_height = szHint.height; 1143 int old_width = szHint.width, old_height = szHint.height;
1127#endif
1128 dDisp; 1144 dDisp;
1129 1145
1130 window_calc (width, height); 1146 window_calc (newwidth, newheight);
1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1147 XSetWMNormalHints (disp, parent[0], &szHint);
1132 1148
1133 if (!ignoreparent) 1149 if (!ignoreparent)
1134 { 1150 {
1135#ifdef SMART_RESIZE 1151#ifdef SMART_RESIZE
1136 /* 1152 /*
… …
1140 int x, y, x1, y1; 1156 int x, y, x1, y1;
1141 int dx, dy; 1157 int dx, dy;
1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1158 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143 Window unused_cr; 1159 Window unused_cr;
1144 1160
1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1161 XTranslateCoordinates (disp, parent[0], display->root,
1146 0, 0, &x, &y, &unused_cr); 1162 0, 0, &x, &y, &unused_cr);
1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1163 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1164 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149 /* 1165 /*
1150 * if display->root isn't the parent window, a WM will probably have offset 1166 * if display->root isn't the parent window, a WM will probably have offset
1151 * our position for handles and decorations. Counter it 1167 * our position for handles and decorations. Counter it
1152 */ 1168 */
… …
1169 if (y < y1) /* top half */ 1185 if (y < y1) /* top half */
1170 dy = 0; 1186 dy = 0;
1171 else if (y == y1) /* exact center */ 1187 else if (y == y1) /* exact center */
1172 dy /= 2; 1188 dy /= 2;
1173 1189
1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1190 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1175 szHint.width, szHint.height); 1191 szHint.width, szHint.height);
1176#else 1192#else
1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1193 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1178#endif 1194#endif
1179 } 1195 }
1180 1196
1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1197 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1182 1198
1183 if (fix_screen || width != old_width || height != old_height) 1199 if (fix_screen || newwidth != old_width || newheight != old_height)
1184 { 1200 {
1185 if (scrollbar_visible ()) 1201 if (scrollbar_visible ())
1186 { 1202 {
1187 XMoveResizeWindow (disp, scrollBar.win, 1203 XMoveResizeWindow (disp, scrollBar.win,
1188 window_sb_x, 0, 1204 window_sb_x, 0,
… …
1193 if (menubar_visible ()) 1209 if (menubar_visible ())
1194 XMoveResizeWindow (disp, menuBar.win, 1210 XMoveResizeWindow (disp, menuBar.win,
1195 window_vt_x, 0, 1211 window_vt_x, 0,
1196 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1212 TermWin_TotalWidth (), menuBar_TotalHeight ());
1197 1213
1198 XMoveResizeWindow (disp, TermWin.vt, 1214 XMoveResizeWindow (disp, vt,
1199 window_vt_x, window_vt_y, 1215 window_vt_x, window_vt_y,
1200 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1216 TermWin_TotalWidth (), TermWin_TotalHeight ());
1201 1217
1202 scr_clear (); 1218 scr_clear ();
1203#ifdef XPM_BACKGROUND 1219#ifdef XPM_BACKGROUND
… …
1211 int old_ncol = prev_ncol; 1227 int old_ncol = prev_ncol;
1212 1228
1213 /* scr_reset only works on the primary screen */ 1229 /* scr_reset only works on the primary screen */
1214 if (old_height) /* this is not the first time through */ 1230 if (old_height) /* this is not the first time through */
1215 { 1231 {
1216 unsigned int ncol = TermWin.ncol; 1232 unsigned int ocol = ncol;
1217 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1233 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218 curr_screen = scr_change_screen (PRIMARY); 1234 curr_screen = scr_change_screen (PRIMARY);
1219 TermWin.ncol = ncol; 1235 ncol = ocol;
1220 } 1236 }
1221 1237
1222 scr_reset (); 1238 scr_reset ();
1223 1239
1224 if (curr_screen >= 0) /* this is not the first time through */ 1240 if (curr_screen >= 0) /* this is not the first time through */
1225 { 1241 {
1226 scr_change_screen (curr_screen); 1242 scr_change_screen (curr_screen);
1227 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1243 selection_check (old_ncol != ncol ? 4 : 0);
1228 } 1244 }
1229 } 1245 }
1230 1246
1231 old_width = szHint.width; 1247 old_width = szHint.width;
1232 old_height = szHint.height; 1248 old_height = szHint.height;
1233 1249
1234#ifdef XPM_BACKGROUND 1250#ifdef XPM_BACKGROUND
1235 if (TermWin.pixmap) 1251 if (pixmap)
1236 scr_touch (false); 1252 scr_touch (false);
1237#endif 1253#endif
1238 1254
1239#ifdef USE_XIM 1255#ifdef USE_XIM
1240 IMSetStatusPosition (); 1256 IMSetStatusPosition ();
… …
1244/* 1260/*
1245 * Set the width/height of the vt window in characters. Units are pixels. 1261 * Set the width/height of the vt window in characters. Units are pixels.
1246 * good for toggling 80/132 columns 1262 * good for toggling 80/132 columns
1247 */ 1263 */
1248void 1264void
1249rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1265rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250{ 1266{
1251 XWindowAttributes wattr; 1267 XWindowAttributes wattr;
1252 1268
1253 if (width == 0 || height == 0) 1269 if (newwidth == 0 || newheight == 0)
1254 { 1270 {
1255 XGetWindowAttributes (display->display, display->root, &wattr); 1271 XGetWindowAttributes (display->display, display->root, &wattr);
1256 1272
1257 if (width == 0) 1273 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1274 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1275 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1276 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1277 }
1278
1279 if (newwidth != width || newheight != height)
1280 {
1265 width += szHint.base_width; 1281 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1282 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1283 resize_all_windows (newwidth, newheight, 0);
1268 } 1284 }
1269} 1285}
1270 1286
1271/* -------------------------------------------------------------------- * 1287/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1288 * - X INPUT METHOD ROUTINES - *
… …
1282 1298
1283void 1299void
1284rxvt_term::im_set_size (XRectangle &size) 1300rxvt_term::im_set_size (XRectangle &size)
1285{ 1301{
1286 // the int_bwidth terms make no sense to me 1302 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1303 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1304 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1305 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1306 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1307}
1292 1308
1293void 1309void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1310rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1311 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1312 const XRectangle &needed_rect)
1297{ 1313{
1298 preedit_rect.x = needed_rect.width; 1314 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1315 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1316 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1317 preedit_rect.height = fheight;
1302 1318
1303 status_rect.x = 0; 1319 status_rect.x = 0;
1304 status_rect.y = 0; 1320 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1321 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1322 status_rect.height = fheight;
1307} 1323}
1308 1324
1309/* Checking whether input method is running. */ 1325/* Checking whether input method is running. */
1310bool 1326bool
1311rxvt_term::IMisRunning () 1327rxvt_term::IMisRunning ()
… …
1339{ 1355{
1340 XPoint nspot; 1356 XPoint nspot;
1341 XVaNestedList preedit_attr; 1357 XVaNestedList preedit_attr;
1342 1358
1343 if (!Input_Context 1359 if (!Input_Context
1344 || !TermWin.focus 1360 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1361 || !(input_style & XIMPreeditPosition))
1346 return; 1362 return;
1347 1363
1348 im_set_position (nspot); 1364 im_set_position (nspot);
1349 1365
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1485 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1486 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1487 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1488 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1489 "*",
1474 TermWin.fheight, 1490 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1491 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1492 fheight - 2, fheight + 2);
1477 1493
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1494 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1495 &missing_charset_list, &missing_charset_count, &def_string);
1480 1496
1481 if (missing_charset_list) 1497 if (missing_charset_list)
… …
1527 NULL); 1543 NULL);
1528 } 1544 }
1529 1545
1530 Input_Context = XCreateIC (xim, 1546 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1547 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1548 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1549 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1550 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1551 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1552 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1553 status_attr, NULL);
1538 1554
… …
1622{ 1638{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1639 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1640 XVaNestedList preedit_attr, status_attr;
1625 1641
1626 if (!Input_Context 1642 if (!Input_Context
1627 || !TermWin.focus 1643 || !focus
1628 || !(input_style & XIMPreeditArea) 1644 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1645 || !IMisRunning ())
1630 return; 1646 return;
1631 1647
1632 /* Getting the necessary width of preedit area */ 1648 /* Getting the necessary width of preedit area */

Diff Legend

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