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.160 by root, Wed Jan 4 05:35:34 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
… …
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
48# include "keyboard.h"
49#endif
50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128], savelocale[128];
54 54
55bool 55bool
56rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
57{ 57{
58 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 59 return false;
60 60
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
64} 77}
65 78
66#if ENABLE_COMBINING 79#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
68 81
… …
193 pty.put (); 206 pty.put ();
194} 207}
195 208
196rxvt_term::~rxvt_term () 209rxvt_term::~rxvt_term ()
197{ 210{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 213 termlist.erase (find (termlist.begin (), termlist.end(), this));
199 214
200 emergency_cleanup (); 215 emergency_cleanup ();
201 216
202#if ENABLE_STYLES 217#if ENABLE_STYLES
203 for (int i = RS_styleCount; --i; ) 218 for (int i = RS_styleCount; --i; )
204 if (TermWin.fontset[i] != TermWin.fontset[0]) 219 if (fontset[i] != fontset[0])
205 delete TermWin.fontset[i]; 220 delete fontset[i];
206#endif 221#endif
207 delete TermWin.fontset[0]; 222 delete fontset[0];
208 223
209 if (display) 224 if (display)
210 { 225 {
211 dDisp; 226 dDisp;
212 227
… …
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 256 if (topShadowGC) XFreeGC (disp, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 257 if (botShadowGC) XFreeGC (disp, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 258 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
244#endif 259#endif
245 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 260 if (gc) XFreeGC (disp, gc);
246 261
247#if defined(MENUBAR) && (MENUBAR_MAX > 1) 262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable; 263 delete menuBar.drawable;
249 //if (menuBar.win) 264 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win); 265 // XDestroyWindow (disp, menuBar.win);
251#endif 266#endif
252 delete TermWin.drawable; 267 delete drawable;
253 // destroy all windows 268 // destroy all windows
254 if (TermWin.parent[0]) 269 if (parent[0])
255 XDestroyWindow (disp, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
256 } 271 }
257 272
258 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
259 274
260 delete pix_colors_focused; 275 delete pix_colors_focused;
… …
284 delete argv; 299 delete argv;
285 300
286#ifdef KEYSYM_RESOURCE 301#ifdef KEYSYM_RESOURCE
287 delete keyboard; 302 delete keyboard;
288#endif 303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
289} 313}
290 314
291void 315void
292rxvt_term::destroy () 316rxvt_term::destroy ()
293{ 317{
… …
458 482
459#if MENUBAR_MAX 483#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
461#endif 485#endif
462#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491#if ENABLE_PERL
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 PERL_INVOKE ((this, HOOK_INIT, DT_END));
498 }
465#endif 499#endif
466 500
467 create_windows (argc, argv); 501 create_windows (argc, argv);
468 502
469 dDisp; 503 dDisp;
… …
475#if 0 509#if 0
476 XSynchronize (disp, True); 510 XSynchronize (disp, True);
477#endif 511#endif
478 512
479#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 514 if (OPTION (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 515 resize_scrollbar (); /* create and map scrollbar */
482#endif 516#endif
483#if (MENUBAR_MAX) 517#if (MENUBAR_MAX)
484 if (menubar_visible ()) 518 if (menubar_visible ())
485 XMapWindow (disp, menuBar.win); 519 XMapWindow (disp, menuBar.win);
486#endif 520#endif
487#ifdef TRANSPARENT 521#ifdef TRANSPARENT
488 if (options & Opt_transparent) 522 if (OPTION (Opt_transparent))
489 { 523 {
490 XSelectInput (disp, display->root, PropertyChangeMask); 524 XSelectInput (disp, display->root, PropertyChangeMask);
491 check_our_parents (); 525 check_our_parents ();
492 rootwin_ev.start (display, display->root); 526 rootwin_ev.start (display, display->root);
493 } 527 }
494#endif 528#endif
495 529
496 XMapWindow (disp, TermWin.vt); 530 XMapWindow (disp, vt);
497 XMapWindow (disp, TermWin.parent[0]); 531 XMapWindow (disp, parent[0]);
498 532
499 set_colorfgbg (); 533 set_colorfgbg ();
500 534
501 init_command (cmd_argv); 535 init_command (cmd_argv);
502 536
503 free (cmd_argv); 537 free (cmd_argv);
504 538
505 pty_ev.start (pty.pty, EVENT_READ); 539 pty_ev.start (pty.pty, EVENT_READ);
506 540
507 check_ev.start (); 541 check_ev.start ();
542
543 PERL_INVOKE ((this, HOOK_START, DT_END));
508 544
509 return true; 545 return true;
510} 546}
511 547
512static struct sig_handlers 548static struct sig_handlers
… …
520 556
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 557 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 558 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 559 if (pid == (*t)->cmd_pid)
524 { 560 {
525 (*t)->destroy (); 561 (*t)->child_exit ();
526 break; 562 break;
527 } 563 }
528 } 564 }
529 565
530 /* 566 /*
… …
670 706
671#ifdef UTMP_SUPPORT 707#ifdef UTMP_SUPPORT
672void 708void
673rxvt_term::privileged_utmp (rxvt_privaction action) 709rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 710{
675 if ((options & Opt_utmpInhibit) 711 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 712 || !pty.name || !*pty.name)
677 return; 713 return;
678 714
679 rxvt_privileges (RESTORE); 715 rxvt_privileges (RESTORE);
680 716
… …
691/* 727/*
692 * window size/position calculcations for XSizeHint and other storage. 728 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 729 * if width/height are non-zero then override calculated width/height
694 */ 730 */
695void 731void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 732rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 733{
698 short recalc_x, recalc_y; 734 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 735 int x, y, sb_w, mb_h, flags;
700 unsigned int w, h; 736 unsigned int w, h;
701 unsigned int max_width, max_height; 737 unsigned int max_width, max_height;
702 dDisp; 738 dDisp;
703 739
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 740 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 741 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 742
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 743 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 744 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 745 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 746
711 recalc_x = recalc_y = 0; 747 recalc_x = recalc_y = 0;
712 flags = 0; 748 flags = 0;
749
713 if (!parsed_geometry) 750 if (!parsed_geometry)
714 { 751 {
715 parsed_geometry = 1; 752 parsed_geometry = 1;
753
716 if (rs[Rs_geometry]) 754 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 755 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 756
719 if (flags & WidthValue) 757 if (flags & WidthValue)
720 { 758 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 759 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 760 szHint.flags |= USSize;
723 } 761 }
724 762
725 if (flags & HeightValue) 763 if (flags & HeightValue)
726 { 764 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 765 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 766 szHint.flags |= USSize;
729 } 767 }
730 768
731 if (flags & XValue) 769 if (flags & XValue)
732 { 770 {
733 szHint.x = x; 771 szHint.x = x;
734 szHint.flags |= USPosition; 772 szHint.flags |= USPosition;
773
735 if (flags & XNegative) 774 if (flags & XNegative)
736 { 775 {
737 recalc_x = 1; 776 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 777 szHint.win_gravity = NorthEastGravity;
739 } 778 }
… …
741 780
742 if (flags & YValue) 781 if (flags & YValue)
743 { 782 {
744 szHint.y = y; 783 szHint.y = y;
745 szHint.flags |= USPosition; 784 szHint.flags |= USPosition;
785
746 if (flags & YNegative) 786 if (flags & YNegative)
747 { 787 {
748 recalc_y = 1; 788 recalc_y = 1;
789
749 if (szHint.win_gravity == NorthEastGravity) 790 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 791 szHint.win_gravity = SouthEastGravity;
751 else 792 else
752 szHint.win_gravity = SouthWestGravity; 793 szHint.win_gravity = SouthWestGravity;
753 } 794 }
754 } 795 }
755 } 796 }
756 797
757 /* TODO: BOUNDS */ 798 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 799 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 800 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 801 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 802 max_height = MAX_ROWS * fheight;
762 803
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 804 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 805
765 sb_w = mb_h = 0; 806 sb_w = mb_h = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 807 window_vt_x = window_vt_y = int_bwidth;
767 808
768 if (scrollbar_visible ()) 809 if (scrollbar_visible ())
769 { 810 {
770 sb_w = scrollbar_TotalWidth (); 811 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 812 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 813 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 814 window_vt_x += sb_w;
774 } 815 }
775 816
776 if (menubar_visible ()) 817 if (menubar_visible ())
777 { 818 {
778 mb_h = menuBar_TotalHeight (); 819 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h; 820 szHint.base_height += mb_h;
780 window_vt_y += mb_h; 821 window_vt_y += mb_h;
781 } 822 }
782 823
783 szHint.width_inc = TermWin.fwidth; 824 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 825 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 826 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 827 szHint.min_height = szHint.base_height + szHint.height_inc;
787 828
788 if (width && width - szHint.base_width < max_width) 829 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 830 {
790 szHint.width = width; 831 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 832 width = newwidth - szHint.base_width;
792 } 833 }
793 else 834 else
794 { 835 {
795 MIN_IT (TermWin.width, max_width); 836 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 837 szHint.width = szHint.base_width + width;
797 } 838 }
798 839
799 if (height && height - szHint.base_height < max_height) 840 if (newheight && newheight - szHint.base_height < max_height)
800 { 841 {
801 szHint.height = height; 842 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 843 height = newheight - szHint.base_height;
803 } 844 }
804 else 845 else
805 { 846 {
806 MIN_IT (TermWin.height, max_height); 847 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 848 szHint.height = szHint.base_height + height;
808 } 849 }
809 850
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 851 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 852 window_sb_x = szHint.width - sb_w;
812 853
813 if (recalc_x) 854 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 855 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 856 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 857 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 858
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 859 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 860 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 861 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 862 ncol, nrow, szHint.width,
824 szHint.height)); 863 szHint.height));
825 return; 864 return;
826} 865}
827 866
828/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
… …
836 if (pty.pty < 0) 875 if (pty.pty < 0)
837 return; 876 return;
838 877
839 struct winsize ws; 878 struct winsize ws;
840 879
841 ws.ws_col = TermWin.ncol; 880 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 881 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 882 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 883 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 884 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
846 885
847#if 0 886#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 887 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 888 if (cmd_pid) /* force through to the command */
… …
873 return false; 912 return false;
874 } 913 }
875 914
876#if ENABLE_STYLES 915#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 916 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 917 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 918 delete fontset[i];
880#endif 919#endif
881 920
882 delete TermWin.fontset[0]; 921 delete fontset[0];
883 TermWin.fontset[0] = fs; 922 fontset[0] = fs;
884 923
885 prop = (*fs)[1]->properties (); 924 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 925 prop.height += lineSpace;
887 fs->set_prop (prop); 926 fs->set_prop (prop);
888 927
889 TermWin.fwidth = prop.width; 928 fwidth = prop.width;
890 TermWin.fheight = prop.height; 929 fheight = prop.height;
891 TermWin.fweight = prop.weight; 930 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 931
895 for (int style = 1; style < 4; style++) 932 for (int style = 1; style < 4; style++)
896 { 933 {
897#if ENABLE_STYLES 934#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 935 const char *res = rs[Rs_font + style];
899 936
900 if (res && !*res) 937 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 938 fontset[style] = fontset[0];
902 else 939 else
903 { 940 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 941 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 942 rxvt_fontprop prop2 = prop;
906 943
907 if (res) 944 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 945 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 946 else
910 { 947 {
911 res = TermWin.fontset[0]->fontdesc; 948 res = fontset[0]->fontdesc;
912 949
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 950 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; 951 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 952 }
916 953
917 fs->populate (res); 954 fs->populate (res);
918 fs->set_prop (prop2); 955 fs->set_prop (prop2);
919 } 956 }
920#else 957#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 958 fontset[style] = fontset[0];
922#endif 959#endif
923 } 960 }
924 961
925 if (TermWin.parent[0]) 962 if (parent[0])
926 { 963 {
927 resize_all_windows (0, 0, 0); 964 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 965 scr_remap_chars ();
929 scr_touch (true); 966 scr_touch (true);
930 } 967 }
… …
932 return true; 969 return true;
933} 970}
934 971
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 972void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 973{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 974 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 975 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 976 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 977}
942 978
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 979void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 980{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 981 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 982 char *s = rxvt_wcstoutf8 (ws);
948 983
949 XChangeProperty (display->display, TermWin.parent[0], 984 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 985 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 986 (const unsigned char *)s, strlen (s));
952 987
953 free (s); 988 free (s);
954 free (ws); 989 free (ws);
… …
1117 1152
1118/* -------------------------------------------------------------------- * 1153/* -------------------------------------------------------------------- *
1119 * - WINDOW RESIZING - * 1154 * - WINDOW RESIZING - *
1120 * -------------------------------------------------------------------- */ 1155 * -------------------------------------------------------------------- */
1121void 1156void
1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1157rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123{ 1158{
1124 int fix_screen; 1159 int fix_screen;
1125#ifdef SMART_RESIZE
1126 int old_width = szHint.width, old_height = szHint.height; 1160 int old_width = szHint.width, old_height = szHint.height;
1127#endif
1128 dDisp; 1161 dDisp;
1129 1162
1130 window_calc (width, height); 1163 window_calc (newwidth, newheight);
1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1164 XSetWMNormalHints (disp, parent[0], &szHint);
1132 1165
1133 if (!ignoreparent) 1166 if (!ignoreparent)
1134 { 1167 {
1135#ifdef SMART_RESIZE 1168#ifdef SMART_RESIZE
1136 /* 1169 /*
… …
1140 int x, y, x1, y1; 1173 int x, y, x1, y1;
1141 int dx, dy; 1174 int dx, dy;
1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1175 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143 Window unused_cr; 1176 Window unused_cr;
1144 1177
1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1178 XTranslateCoordinates (disp, parent[0], display->root,
1146 0, 0, &x, &y, &unused_cr); 1179 0, 0, &x, &y, &unused_cr);
1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1180 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1181 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149 /* 1182 /*
1150 * if display->root isn't the parent window, a WM will probably have offset 1183 * if display->root isn't the parent window, a WM will probably have offset
1151 * our position for handles and decorations. Counter it 1184 * our position for handles and decorations. Counter it
1152 */ 1185 */
… …
1169 if (y < y1) /* top half */ 1202 if (y < y1) /* top half */
1170 dy = 0; 1203 dy = 0;
1171 else if (y == y1) /* exact center */ 1204 else if (y == y1) /* exact center */
1172 dy /= 2; 1205 dy /= 2;
1173 1206
1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1207 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1175 szHint.width, szHint.height); 1208 szHint.width, szHint.height);
1176#else 1209#else
1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1210 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1178#endif 1211#endif
1179 } 1212 }
1180 1213
1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1214 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1182 1215
1183 if (fix_screen || width != old_width || height != old_height) 1216 if (fix_screen || newwidth != old_width || newheight != old_height)
1184 { 1217 {
1185 if (scrollbar_visible ()) 1218 if (scrollbar_visible ())
1186 { 1219 {
1187 XMoveResizeWindow (disp, scrollBar.win, 1220 XMoveResizeWindow (disp, scrollBar.win,
1188 window_sb_x, 0, 1221 window_sb_x, 0,
… …
1191 } 1224 }
1192 1225
1193 if (menubar_visible ()) 1226 if (menubar_visible ())
1194 XMoveResizeWindow (disp, menuBar.win, 1227 XMoveResizeWindow (disp, menuBar.win,
1195 window_vt_x, 0, 1228 window_vt_x, 0,
1196 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1229 width, menuBar_TotalHeight ());
1197 1230
1198 XMoveResizeWindow (disp, TermWin.vt, 1231 XMoveResizeWindow (disp, vt,
1199 window_vt_x, window_vt_y, 1232 window_vt_x, window_vt_y,
1200 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1233 width, height);
1201 1234
1202 scr_clear (); 1235 scr_clear ();
1203#ifdef XPM_BACKGROUND 1236#ifdef XPM_BACKGROUND
1204 resize_pixmap (); 1237 resize_pixmap ();
1205#endif 1238#endif
… …
1211 int old_ncol = prev_ncol; 1244 int old_ncol = prev_ncol;
1212 1245
1213 /* scr_reset only works on the primary screen */ 1246 /* scr_reset only works on the primary screen */
1214 if (old_height) /* this is not the first time through */ 1247 if (old_height) /* this is not the first time through */
1215 { 1248 {
1216 unsigned int ncol = TermWin.ncol; 1249 unsigned int ocol = ncol;
1217 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1250 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218 curr_screen = scr_change_screen (PRIMARY); 1251 curr_screen = scr_change_screen (PRIMARY);
1219 TermWin.ncol = ncol; 1252 ncol = ocol;
1220 } 1253 }
1221 1254
1222 scr_reset (); 1255 scr_reset ();
1223 1256
1224 if (curr_screen >= 0) /* this is not the first time through */ 1257 if (curr_screen >= 0) /* this is not the first time through */
1225 { 1258 {
1226 scr_change_screen (curr_screen); 1259 scr_change_screen (curr_screen);
1227 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1260 selection_check (old_ncol != ncol ? 4 : 0);
1228 } 1261 }
1229 } 1262 }
1230 1263
1231 old_width = szHint.width; 1264 old_width = szHint.width;
1232 old_height = szHint.height; 1265 old_height = szHint.height;
1233 1266
1234#ifdef XPM_BACKGROUND 1267#ifdef XPM_BACKGROUND
1235 if (TermWin.pixmap) 1268 if (pixmap)
1236 scr_touch (false); 1269 scr_touch (false);
1237#endif 1270#endif
1238 1271
1239#ifdef USE_XIM 1272#ifdef USE_XIM
1240 IMSetStatusPosition (); 1273 IMSetStatusPosition ();
… …
1244/* 1277/*
1245 * Set the width/height of the vt window in characters. Units are pixels. 1278 * Set the width/height of the vt window in characters. Units are pixels.
1246 * good for toggling 80/132 columns 1279 * good for toggling 80/132 columns
1247 */ 1280 */
1248void 1281void
1249rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1282rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250{ 1283{
1251 XWindowAttributes wattr; 1284 XWindowAttributes wattr;
1252 1285
1253 if (width == 0 || height == 0) 1286 if (newwidth == 0 || newheight == 0)
1254 { 1287 {
1255 XGetWindowAttributes (display->display, display->root, &wattr); 1288 XGetWindowAttributes (display->display, display->root, &wattr);
1256 1289
1257 if (width == 0) 1290 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1291 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1292 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1293 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1294 }
1295
1296 if (newwidth != width || newheight != height)
1297 {
1265 width += szHint.base_width; 1298 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1299 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1300 resize_all_windows (newwidth, newheight, 0);
1268 } 1301 }
1269} 1302}
1270 1303
1271/* -------------------------------------------------------------------- * 1304/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1305 * - X INPUT METHOD ROUTINES - *
… …
1282 1315
1283void 1316void
1284rxvt_term::im_set_size (XRectangle &size) 1317rxvt_term::im_set_size (XRectangle &size)
1285{ 1318{
1286 // the int_bwidth terms make no sense to me 1319 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1320 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1321 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1322 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1323 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1324}
1292 1325
1293void 1326void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1327rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1328 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1329 const XRectangle &needed_rect)
1297{ 1330{
1298 preedit_rect.x = needed_rect.width; 1331 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1332 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1333 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1334 preedit_rect.height = fheight;
1302 1335
1303 status_rect.x = 0; 1336 status_rect.x = 0;
1304 status_rect.y = 0; 1337 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1338 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1339 status_rect.height = fheight;
1307} 1340}
1308 1341
1309/* Checking whether input method is running. */ 1342/* Checking whether input method is running. */
1310bool 1343bool
1311rxvt_term::IMisRunning () 1344rxvt_term::IMisRunning ()
… …
1339{ 1372{
1340 XPoint nspot; 1373 XPoint nspot;
1341 XVaNestedList preedit_attr; 1374 XVaNestedList preedit_attr;
1342 1375
1343 if (!Input_Context 1376 if (!Input_Context
1344 || !TermWin.focus 1377 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1378 || !(input_style & XIMPreeditPosition))
1346 return; 1379 return;
1347 1380
1348 im_set_position (nspot); 1381 im_set_position (nspot);
1349 1382
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1504 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1505 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1506 "*",
1474 TermWin.fheight, 1507 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1508 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1509 fheight - 2, fheight + 2);
1477 1510
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1511 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1512 &missing_charset_list, &missing_charset_count, &def_string);
1480 1513
1481 if (missing_charset_list) 1514 if (missing_charset_list)
… …
1527 NULL); 1560 NULL);
1528 } 1561 }
1529 1562
1530 Input_Context = XCreateIC (xim, 1563 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1564 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1565 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1566 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1567 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1568 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1569 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1570 status_attr, NULL);
1538 1571
… …
1622{ 1655{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1656 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1657 XVaNestedList preedit_attr, status_attr;
1625 1658
1626 if (!Input_Context 1659 if (!Input_Context
1627 || !TermWin.focus 1660 || !focus
1628 || !(input_style & XIMPreeditArea) 1661 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1662 || !IMisRunning ())
1630 return; 1663 return;
1631 1664
1632 /* Getting the necessary width of preedit area */ 1665 /* Getting the necessary width of preedit area */

Diff Legend

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