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

Diff Legend

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