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.152 by root, Thu Dec 22 16:44:10 2005 UTC

… …
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 35
36#include <limits>
37
36#include <csignal> 38#include <csignal>
37#include <cstring> 39#include <cstring>
38 40
39#ifdef TTY_GID_SUPPORT 41#ifdef TTY_GID_SUPPORT
40# include <grp.h> 42# include <grp.h>
… …
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 (!(options & Opt_hold))
299 destroy ();
289} 300}
290 301
291void 302void
292rxvt_term::destroy () 303rxvt_term::destroy ()
293{ 304{
… …
491 check_our_parents (); 502 check_our_parents ();
492 rootwin_ev.start (display, display->root); 503 rootwin_ev.start (display, display->root);
493 } 504 }
494#endif 505#endif
495 506
496 XMapWindow (disp, TermWin.vt); 507 XMapWindow (disp, vt);
497 XMapWindow (disp, TermWin.parent[0]); 508 XMapWindow (disp, parent[0]);
498 509
499 set_colorfgbg (); 510 set_colorfgbg ();
500 511
501 init_command (cmd_argv); 512 init_command (cmd_argv);
502 513
… …
520 531
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid) 534 if (pid == (*t)->cmd_pid)
524 { 535 {
525 (*t)->destroy (); 536 (*t)->child_exit ();
526 break; 537 break;
527 } 538 }
528 } 539 }
529 540
530 /* 541 /*
… …
691/* 702/*
692 * window size/position calculcations for XSizeHint and other storage. 703 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 704 * if width/height are non-zero then override calculated width/height
694 */ 705 */
695void 706void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 708{
698 short recalc_x, recalc_y; 709 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 710 int x, y, sb_w, mb_h, flags;
700 unsigned int w, h; 711 unsigned int w, h;
701 unsigned int max_width, max_height; 712 unsigned int max_width, max_height;
702 dDisp; 713 dDisp;
703 714
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 716 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 717
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 719 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 721
711 recalc_x = recalc_y = 0; 722 recalc_x = recalc_y = 0;
712 flags = 0; 723 flags = 0;
724
713 if (!parsed_geometry) 725 if (!parsed_geometry)
714 { 726 {
715 parsed_geometry = 1; 727 parsed_geometry = 1;
728
716 if (rs[Rs_geometry]) 729 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 730 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 731
719 if (flags & WidthValue) 732 if (flags & WidthValue)
720 { 733 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 734 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 735 szHint.flags |= USSize;
723 } 736 }
724 737
725 if (flags & HeightValue) 738 if (flags & HeightValue)
726 { 739 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 740 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 741 szHint.flags |= USSize;
729 } 742 }
730 743
731 if (flags & XValue) 744 if (flags & XValue)
732 { 745 {
733 szHint.x = x; 746 szHint.x = x;
734 szHint.flags |= USPosition; 747 szHint.flags |= USPosition;
748
735 if (flags & XNegative) 749 if (flags & XNegative)
736 { 750 {
737 recalc_x = 1; 751 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 752 szHint.win_gravity = NorthEastGravity;
739 } 753 }
… …
741 755
742 if (flags & YValue) 756 if (flags & YValue)
743 { 757 {
744 szHint.y = y; 758 szHint.y = y;
745 szHint.flags |= USPosition; 759 szHint.flags |= USPosition;
760
746 if (flags & YNegative) 761 if (flags & YNegative)
747 { 762 {
748 recalc_y = 1; 763 recalc_y = 1;
764
749 if (szHint.win_gravity == NorthEastGravity) 765 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 766 szHint.win_gravity = SouthEastGravity;
751 else 767 else
752 szHint.win_gravity = SouthWestGravity; 768 szHint.win_gravity = SouthWestGravity;
753 } 769 }
754 } 770 }
755 } 771 }
756 772
757 /* TODO: BOUNDS */ 773 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 774 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 775 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 776 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 777 max_height = MAX_ROWS * fheight;
762 778
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 779 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 780
765 sb_w = mb_h = 0; 781 sb_w = mb_h = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 782 window_vt_x = window_vt_y = int_bwidth;
767 783
768 if (scrollbar_visible ()) 784 if (scrollbar_visible ())
769 { 785 {
770 sb_w = scrollbar_TotalWidth (); 786 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 787 szHint.base_width += sb_w;
… …
778 mb_h = menuBar_TotalHeight (); 794 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h; 795 szHint.base_height += mb_h;
780 window_vt_y += mb_h; 796 window_vt_y += mb_h;
781 } 797 }
782 798
783 szHint.width_inc = TermWin.fwidth; 799 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 800 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 801 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 802 szHint.min_height = szHint.base_height + szHint.height_inc;
787 803
788 if (width && width - szHint.base_width < max_width) 804 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 805 {
790 szHint.width = width; 806 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 807 width = newwidth - szHint.base_width;
792 } 808 }
793 else 809 else
794 { 810 {
795 MIN_IT (TermWin.width, max_width); 811 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 812 szHint.width = szHint.base_width + width;
797 } 813 }
798 814
799 if (height && height - szHint.base_height < max_height) 815 if (newheight && newheight - szHint.base_height < max_height)
800 { 816 {
801 szHint.height = height; 817 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 818 height = newheight - szHint.base_height;
803 } 819 }
804 else 820 else
805 { 821 {
806 MIN_IT (TermWin.height, max_height); 822 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 823 szHint.height = szHint.base_height + height;
808 } 824 }
809 825
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 826 if (scrollbar_visible () && (options & Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 827 window_sb_x = szHint.width - sb_w;
812 828
813 if (recalc_x) 829 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 831 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 833
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 834 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 835 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 836 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 837 ncol, nrow, szHint.width,
824 szHint.height)); 838 szHint.height));
825 return; 839 return;
826} 840}
827 841
828/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
… …
836 if (pty.pty < 0) 850 if (pty.pty < 0)
837 return; 851 return;
838 852
839 struct winsize ws; 853 struct winsize ws;
840 854
841 ws.ws_col = TermWin.ncol; 855 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 856 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 857 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 858 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
846 860
847#if 0 861#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 863 if (cmd_pid) /* force through to the command */
… …
873 return false; 887 return false;
874 } 888 }
875 889
876#if ENABLE_STYLES 890#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 891 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 892 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 893 delete fontset[i];
880#endif 894#endif
881 895
882 delete TermWin.fontset[0]; 896 delete fontset[0];
883 TermWin.fontset[0] = fs; 897 fontset[0] = fs;
884 898
885 prop = (*fs)[1]->properties (); 899 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 900 prop.height += lineSpace;
887 fs->set_prop (prop); 901 fs->set_prop (prop);
888 902
889 TermWin.fwidth = prop.width; 903 fwidth = prop.width;
890 TermWin.fheight = prop.height; 904 fheight = prop.height;
891 TermWin.fweight = prop.weight;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent; 905 fbase = (*fs)[1]->ascent;
894 906
895 for (int style = 1; style < 4; style++) 907 for (int style = 1; style < 4; style++)
896 { 908 {
897#if ENABLE_STYLES 909#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 910 const char *res = rs[Rs_font + style];
899 911
900 if (res && !*res) 912 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 913 fontset[style] = fontset[0];
902 else 914 else
903 { 915 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 916 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 917 rxvt_fontprop prop2 = prop;
906 918
907 if (res) 919 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 920 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 921 else
910 { 922 {
911 res = TermWin.fontset[0]->fontdesc; 923 res = fontset[0]->fontdesc;
912 924
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 925 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; 926 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 927 }
916 928
917 fs->populate (res); 929 fs->populate (res);
918 fs->set_prop (prop2); 930 fs->set_prop (prop2);
919 } 931 }
920#else 932#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 933 fontset[style] = fontset[0];
922#endif 934#endif
923 } 935 }
924 936
925 if (TermWin.parent[0]) 937 if (parent[0])
926 { 938 {
927 resize_all_windows (0, 0, 0); 939 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 940 scr_remap_chars ();
929 scr_touch (true); 941 scr_touch (true);
930 } 942 }
… …
933} 945}
934 946
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 947void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 948{
937 // TODO: SMART_WINDOW_TITLE 949 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 950 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 951 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 952 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 953}
942 954
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 955void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 956{
945 // TODO: SMART_WINDOW_TITLE 957 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 958 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 959 char *s = rxvt_wcstoutf8 (ws);
948 960
949 XChangeProperty (display->display, TermWin.parent[0], 961 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 962 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 963 (const unsigned char *)s, strlen (s));
952 964
953 free (s); 965 free (s);
954 free (ws); 966 free (ws);
… …
1117 1129
1118/* -------------------------------------------------------------------- * 1130/* -------------------------------------------------------------------- *
1119 * - WINDOW RESIZING - * 1131 * - WINDOW RESIZING - *
1120 * -------------------------------------------------------------------- */ 1132 * -------------------------------------------------------------------- */
1121void 1133void
1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1134rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1123{ 1135{
1124 int fix_screen; 1136 int fix_screen;
1125#ifdef SMART_RESIZE
1126 int old_width = szHint.width, old_height = szHint.height; 1137 int old_width = szHint.width, old_height = szHint.height;
1127#endif
1128 dDisp; 1138 dDisp;
1129 1139
1130 window_calc (width, height); 1140 window_calc (newwidth, newheight);
1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1141 XSetWMNormalHints (disp, parent[0], &szHint);
1132 1142
1133 if (!ignoreparent) 1143 if (!ignoreparent)
1134 { 1144 {
1135#ifdef SMART_RESIZE 1145#ifdef SMART_RESIZE
1136 /* 1146 /*
… …
1140 int x, y, x1, y1; 1150 int x, y, x1, y1;
1141 int dx, dy; 1151 int dx, dy;
1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1152 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1143 Window unused_cr; 1153 Window unused_cr;
1144 1154
1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1155 XTranslateCoordinates (disp, parent[0], display->root,
1146 0, 0, &x, &y, &unused_cr); 1156 0, 0, &x, &y, &unused_cr);
1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1157 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1158 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1149 /* 1159 /*
1150 * if display->root isn't the parent window, a WM will probably have offset 1160 * if display->root isn't the parent window, a WM will probably have offset
1151 * our position for handles and decorations. Counter it 1161 * our position for handles and decorations. Counter it
1152 */ 1162 */
… …
1169 if (y < y1) /* top half */ 1179 if (y < y1) /* top half */
1170 dy = 0; 1180 dy = 0;
1171 else if (y == y1) /* exact center */ 1181 else if (y == y1) /* exact center */
1172 dy /= 2; 1182 dy /= 2;
1173 1183
1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1184 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1175 szHint.width, szHint.height); 1185 szHint.width, szHint.height);
1176#else 1186#else
1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1187 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1178#endif 1188#endif
1179 } 1189 }
1180 1190
1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1191 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1182 1192
1183 if (fix_screen || width != old_width || height != old_height) 1193 if (fix_screen || newwidth != old_width || newheight != old_height)
1184 { 1194 {
1185 if (scrollbar_visible ()) 1195 if (scrollbar_visible ())
1186 { 1196 {
1187 XMoveResizeWindow (disp, scrollBar.win, 1197 XMoveResizeWindow (disp, scrollBar.win,
1188 window_sb_x, 0, 1198 window_sb_x, 0,
… …
1193 if (menubar_visible ()) 1203 if (menubar_visible ())
1194 XMoveResizeWindow (disp, menuBar.win, 1204 XMoveResizeWindow (disp, menuBar.win,
1195 window_vt_x, 0, 1205 window_vt_x, 0,
1196 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1206 TermWin_TotalWidth (), menuBar_TotalHeight ());
1197 1207
1198 XMoveResizeWindow (disp, TermWin.vt, 1208 XMoveResizeWindow (disp, vt,
1199 window_vt_x, window_vt_y, 1209 window_vt_x, window_vt_y,
1200 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1210 TermWin_TotalWidth (), TermWin_TotalHeight ());
1201 1211
1202 scr_clear (); 1212 scr_clear ();
1203#ifdef XPM_BACKGROUND 1213#ifdef XPM_BACKGROUND
… …
1211 int old_ncol = prev_ncol; 1221 int old_ncol = prev_ncol;
1212 1222
1213 /* scr_reset only works on the primary screen */ 1223 /* scr_reset only works on the primary screen */
1214 if (old_height) /* this is not the first time through */ 1224 if (old_height) /* this is not the first time through */
1215 { 1225 {
1216 unsigned int ncol = TermWin.ncol; 1226 unsigned int ocol = ncol;
1217 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1227 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1218 curr_screen = scr_change_screen (PRIMARY); 1228 curr_screen = scr_change_screen (PRIMARY);
1219 TermWin.ncol = ncol; 1229 ncol = ocol;
1220 } 1230 }
1221 1231
1222 scr_reset (); 1232 scr_reset ();
1223 1233
1224 if (curr_screen >= 0) /* this is not the first time through */ 1234 if (curr_screen >= 0) /* this is not the first time through */
1225 { 1235 {
1226 scr_change_screen (curr_screen); 1236 scr_change_screen (curr_screen);
1227 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1237 selection_check (old_ncol != ncol ? 4 : 0);
1228 } 1238 }
1229 } 1239 }
1230 1240
1231 old_width = szHint.width; 1241 old_width = szHint.width;
1232 old_height = szHint.height; 1242 old_height = szHint.height;
1233 1243
1234#ifdef XPM_BACKGROUND 1244#ifdef XPM_BACKGROUND
1235 if (TermWin.pixmap) 1245 if (pixmap)
1236 scr_touch (false); 1246 scr_touch (false);
1237#endif 1247#endif
1238 1248
1239#ifdef USE_XIM 1249#ifdef USE_XIM
1240 IMSetStatusPosition (); 1250 IMSetStatusPosition ();
… …
1244/* 1254/*
1245 * Set the width/height of the vt window in characters. Units are pixels. 1255 * Set the width/height of the vt window in characters. Units are pixels.
1246 * good for toggling 80/132 columns 1256 * good for toggling 80/132 columns
1247 */ 1257 */
1248void 1258void
1249rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1259rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1250{ 1260{
1251 XWindowAttributes wattr; 1261 XWindowAttributes wattr;
1252 1262
1253 if (width == 0 || height == 0) 1263 if (newwidth == 0 || newheight == 0)
1254 { 1264 {
1255 XGetWindowAttributes (display->display, display->root, &wattr); 1265 XGetWindowAttributes (display->display, display->root, &wattr);
1256 1266
1257 if (width == 0) 1267 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1268 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1269 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1270 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1271 }
1272
1273 if (newwidth != width || newheight != height)
1274 {
1265 width += szHint.base_width; 1275 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1276 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1277 resize_all_windows (newwidth, newheight, 0);
1268 } 1278 }
1269} 1279}
1270 1280
1271/* -------------------------------------------------------------------- * 1281/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1282 * - X INPUT METHOD ROUTINES - *
… …
1282 1292
1283void 1293void
1284rxvt_term::im_set_size (XRectangle &size) 1294rxvt_term::im_set_size (XRectangle &size)
1285{ 1295{
1286 // the int_bwidth terms make no sense to me 1296 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1297 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1298 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1299 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1300 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1301}
1292 1302
1293void 1303void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1304rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1305 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1306 const XRectangle &needed_rect)
1297{ 1307{
1298 preedit_rect.x = needed_rect.width; 1308 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1309 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1310 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1311 preedit_rect.height = fheight;
1302 1312
1303 status_rect.x = 0; 1313 status_rect.x = 0;
1304 status_rect.y = 0; 1314 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1315 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1316 status_rect.height = fheight;
1307} 1317}
1308 1318
1309/* Checking whether input method is running. */ 1319/* Checking whether input method is running. */
1310bool 1320bool
1311rxvt_term::IMisRunning () 1321rxvt_term::IMisRunning ()
… …
1339{ 1349{
1340 XPoint nspot; 1350 XPoint nspot;
1341 XVaNestedList preedit_attr; 1351 XVaNestedList preedit_attr;
1342 1352
1343 if (!Input_Context 1353 if (!Input_Context
1344 || !TermWin.focus 1354 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1355 || !(input_style & XIMPreeditPosition))
1346 return; 1356 return;
1347 1357
1348 im_set_position (nspot); 1358 im_set_position (nspot);
1349 1359
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1479 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1480 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1481 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1482 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1483 "*",
1474 TermWin.fheight, 1484 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1485 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1486 fheight - 2, fheight + 2);
1477 1487
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1488 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1489 &missing_charset_list, &missing_charset_count, &def_string);
1480 1490
1481 if (missing_charset_list) 1491 if (missing_charset_list)
… …
1527 NULL); 1537 NULL);
1528 } 1538 }
1529 1539
1530 Input_Context = XCreateIC (xim, 1540 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1541 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1542 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1543 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1544 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1545 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1546 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1547 status_attr, NULL);
1538 1548
… …
1622{ 1632{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1633 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1634 XVaNestedList preedit_attr, status_attr;
1625 1635
1626 if (!Input_Context 1636 if (!Input_Context
1627 || !TermWin.focus 1637 || !focus
1628 || !(input_style & XIMPreeditArea) 1638 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1639 || !IMisRunning ())
1630 return; 1640 return;
1631 1641
1632 /* Getting the necessary width of preedit area */ 1642 /* Getting the necessary width of preedit area */

Diff Legend

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