| … | |
… | |
| 199 | |
199 | |
| 200 | emergency_cleanup (); |
200 | emergency_cleanup (); |
| 201 | |
201 | |
| 202 | #if ENABLE_STYLES |
202 | #if ENABLE_STYLES |
| 203 | for (int i = RS_styleCount; --i; ) |
203 | for (int i = RS_styleCount; --i; ) |
| 204 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
204 | if (fontset[i] != fontset[0]) |
| 205 | delete TermWin.fontset[i]; |
205 | delete fontset[i]; |
| 206 | #endif |
206 | #endif |
| 207 | delete TermWin.fontset[0]; |
207 | delete fontset[0]; |
| 208 | |
208 | |
| 209 | if (display) |
209 | if (display) |
| 210 | { |
210 | { |
| 211 | dDisp; |
211 | dDisp; |
| 212 | |
212 | |
| … | |
… | |
| 240 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
240 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
| 241 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
241 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
| 242 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
242 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
| 243 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
243 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
| 244 | #endif |
244 | #endif |
| 245 | if (TermWin.gc) XFreeGC (disp, TermWin.gc); |
245 | if (gc) XFreeGC (disp, gc); |
| 246 | |
246 | |
| 247 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
247 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
| 248 | delete menuBar.drawable; |
248 | delete menuBar.drawable; |
| 249 | //if (menuBar.win) |
249 | //if (menuBar.win) |
| 250 | // XDestroyWindow (disp, menuBar.win); |
250 | // XDestroyWindow (disp, menuBar.win); |
| 251 | #endif |
251 | #endif |
| 252 | delete TermWin.drawable; |
252 | delete drawable; |
| 253 | // destroy all windows |
253 | // destroy all windows |
| 254 | if (TermWin.parent[0]) |
254 | if (parent[0]) |
| 255 | XDestroyWindow (disp, TermWin.parent[0]); |
255 | XDestroyWindow (disp, parent[0]); |
| 256 | } |
256 | } |
| 257 | |
257 | |
| 258 | // TODO: free pixcolours, colours should become part of rxvt_display |
258 | // TODO: free pixcolours, colours should become part of rxvt_display |
| 259 | |
259 | |
| 260 | delete pix_colors_focused; |
260 | delete pix_colors_focused; |
| … | |
… | |
| 491 | check_our_parents (); |
491 | check_our_parents (); |
| 492 | rootwin_ev.start (display, display->root); |
492 | rootwin_ev.start (display, display->root); |
| 493 | } |
493 | } |
| 494 | #endif |
494 | #endif |
| 495 | |
495 | |
| 496 | XMapWindow (disp, TermWin.vt); |
496 | XMapWindow (disp, vt); |
| 497 | XMapWindow (disp, TermWin.parent[0]); |
497 | XMapWindow (disp, parent[0]); |
| 498 | |
498 | |
| 499 | set_colorfgbg (); |
499 | set_colorfgbg (); |
| 500 | |
500 | |
| 501 | init_command (cmd_argv); |
501 | init_command (cmd_argv); |
| 502 | |
502 | |
| … | |
… | |
| 691 | /* |
691 | /* |
| 692 | * window size/position calculcations for XSizeHint and other storage. |
692 | * window size/position calculcations for XSizeHint and other storage. |
| 693 | * if width/height are non-zero then override calculated width/height |
693 | * if width/height are non-zero then override calculated width/height |
| 694 | */ |
694 | */ |
| 695 | void |
695 | void |
| 696 | rxvt_term::window_calc (unsigned int width, unsigned int height) |
696 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
| 697 | { |
697 | { |
| 698 | short recalc_x, recalc_y; |
698 | short recalc_x, recalc_y; |
| 699 | int x, y, sb_w, mb_h, flags; |
699 | int x, y, sb_w, mb_h, flags; |
| 700 | unsigned int w, h; |
700 | unsigned int w, h; |
| 701 | unsigned int max_width, max_height; |
701 | unsigned int max_width, max_height; |
| 702 | dDisp; |
702 | dDisp; |
| 703 | |
703 | |
| 704 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
704 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
| 705 | TermWin.ncol, TermWin.nrow, szHint.width, |
705 | ncol, nrow, szHint.width, szHint.height)); |
| 706 | szHint.height)); |
706 | |
| 707 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
707 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
| 708 | szHint.win_gravity = NorthWestGravity; |
708 | szHint.win_gravity = NorthWestGravity; |
| 709 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
709 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
| 710 | |
710 | |
| 711 | recalc_x = recalc_y = 0; |
711 | recalc_x = recalc_y = 0; |
| 712 | flags = 0; |
712 | flags = 0; |
|
|
713 | |
| 713 | if (!parsed_geometry) |
714 | if (!parsed_geometry) |
| 714 | { |
715 | { |
| 715 | parsed_geometry = 1; |
716 | parsed_geometry = 1; |
|
|
717 | |
| 716 | if (rs[Rs_geometry]) |
718 | if (rs[Rs_geometry]) |
| 717 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
719 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
| 718 | |
720 | |
| 719 | if (flags & WidthValue) |
721 | if (flags & WidthValue) |
| 720 | { |
722 | { |
| 721 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
723 | ncol = BOUND_POSITIVE_INT16 (w); |
| 722 | szHint.flags |= USSize; |
724 | szHint.flags |= USSize; |
| 723 | } |
725 | } |
| 724 | |
726 | |
| 725 | if (flags & HeightValue) |
727 | if (flags & HeightValue) |
| 726 | { |
728 | { |
| 727 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
729 | nrow = BOUND_POSITIVE_INT16 (h); |
| 728 | szHint.flags |= USSize; |
730 | szHint.flags |= USSize; |
| 729 | } |
731 | } |
| 730 | |
732 | |
| 731 | if (flags & XValue) |
733 | if (flags & XValue) |
| 732 | { |
734 | { |
| 733 | szHint.x = x; |
735 | szHint.x = x; |
| 734 | szHint.flags |= USPosition; |
736 | szHint.flags |= USPosition; |
|
|
737 | |
| 735 | if (flags & XNegative) |
738 | if (flags & XNegative) |
| 736 | { |
739 | { |
| 737 | recalc_x = 1; |
740 | recalc_x = 1; |
| 738 | szHint.win_gravity = NorthEastGravity; |
741 | szHint.win_gravity = NorthEastGravity; |
| 739 | } |
742 | } |
| … | |
… | |
| 741 | |
744 | |
| 742 | if (flags & YValue) |
745 | if (flags & YValue) |
| 743 | { |
746 | { |
| 744 | szHint.y = y; |
747 | szHint.y = y; |
| 745 | szHint.flags |= USPosition; |
748 | szHint.flags |= USPosition; |
|
|
749 | |
| 746 | if (flags & YNegative) |
750 | if (flags & YNegative) |
| 747 | { |
751 | { |
| 748 | recalc_y = 1; |
752 | recalc_y = 1; |
|
|
753 | |
| 749 | if (szHint.win_gravity == NorthEastGravity) |
754 | if (szHint.win_gravity == NorthEastGravity) |
| 750 | szHint.win_gravity = SouthEastGravity; |
755 | szHint.win_gravity = SouthEastGravity; |
| 751 | else |
756 | else |
| 752 | szHint.win_gravity = SouthWestGravity; |
757 | szHint.win_gravity = SouthWestGravity; |
| 753 | } |
758 | } |
| 754 | } |
759 | } |
| 755 | } |
760 | } |
| 756 | |
761 | |
| 757 | /* TODO: BOUNDS */ |
762 | /* TODO: BOUNDS */ |
| 758 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
763 | width = ncol * fwidth; |
| 759 | TermWin.height = TermWin.nrow * TermWin.fheight; |
764 | height = nrow * fheight; |
| 760 | max_width = MAX_COLS * TermWin.fwidth; |
765 | max_width = MAX_COLS * fwidth; |
| 761 | max_height = MAX_ROWS * TermWin.fheight; |
766 | max_height = MAX_ROWS * fheight; |
| 762 | |
767 | |
| 763 | szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; |
768 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
| 764 | |
769 | |
| 765 | sb_w = mb_h = 0; |
770 | sb_w = mb_h = 0; |
| 766 | window_vt_x = window_vt_y = TermWin.int_bwidth; |
771 | window_vt_x = window_vt_y = int_bwidth; |
| 767 | |
772 | |
| 768 | if (scrollbar_visible ()) |
773 | if (scrollbar_visible ()) |
| 769 | { |
774 | { |
| 770 | sb_w = scrollbar_TotalWidth (); |
775 | sb_w = scrollbar_TotalWidth (); |
| 771 | szHint.base_width += sb_w; |
776 | szHint.base_width += sb_w; |
| … | |
… | |
| 778 | mb_h = menuBar_TotalHeight (); |
783 | mb_h = menuBar_TotalHeight (); |
| 779 | szHint.base_height += mb_h; |
784 | szHint.base_height += mb_h; |
| 780 | window_vt_y += mb_h; |
785 | window_vt_y += mb_h; |
| 781 | } |
786 | } |
| 782 | |
787 | |
| 783 | szHint.width_inc = TermWin.fwidth; |
788 | szHint.width_inc = fwidth; |
| 784 | szHint.height_inc = TermWin.fheight; |
789 | szHint.height_inc = fheight; |
| 785 | szHint.min_width = szHint.base_width + szHint.width_inc; |
790 | szHint.min_width = szHint.base_width + szHint.width_inc; |
| 786 | szHint.min_height = szHint.base_height + szHint.height_inc; |
791 | szHint.min_height = szHint.base_height + szHint.height_inc; |
| 787 | |
792 | |
| 788 | if (width && width - szHint.base_width < max_width) |
793 | if (newwidth && newwidth - szHint.base_width < max_width) |
| 789 | { |
794 | { |
| 790 | szHint.width = width; |
795 | szHint.width = newwidth; |
| 791 | TermWin.width = width - szHint.base_width; |
796 | width = newwidth - szHint.base_width; |
| 792 | } |
797 | } |
| 793 | else |
798 | else |
| 794 | { |
799 | { |
| 795 | MIN_IT (TermWin.width, max_width); |
800 | MIN_IT (width, max_width); |
| 796 | szHint.width = szHint.base_width + TermWin.width; |
801 | szHint.width = szHint.base_width + width; |
| 797 | } |
802 | } |
| 798 | |
803 | |
| 799 | if (height && height - szHint.base_height < max_height) |
804 | if (newheight && newheight - szHint.base_height < max_height) |
| 800 | { |
805 | { |
| 801 | szHint.height = height; |
806 | szHint.height = newheight; |
| 802 | TermWin.height = height - szHint.base_height; |
807 | height = newheight - szHint.base_height; |
| 803 | } |
808 | } |
| 804 | else |
809 | else |
| 805 | { |
810 | { |
| 806 | MIN_IT (TermWin.height, max_height); |
811 | MIN_IT (height, max_height); |
| 807 | szHint.height = szHint.base_height + TermWin.height; |
812 | szHint.height = szHint.base_height + height; |
| 808 | } |
813 | } |
| 809 | |
814 | |
| 810 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
815 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
| 811 | window_sb_x = szHint.width - sb_w; |
816 | window_sb_x = szHint.width - sb_w; |
| 812 | |
817 | |
| 813 | if (recalc_x) |
818 | if (recalc_x) |
| 814 | szHint.x += (DisplayWidth (disp, display->screen) |
819 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
| 815 | - szHint.width - 2 * TermWin.ext_bwidth); |
|
|
| 816 | if (recalc_y) |
820 | if (recalc_y) |
| 817 | szHint.y += (DisplayHeight (disp, display->screen) |
821 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
| 818 | - szHint.height - 2 * TermWin.ext_bwidth); |
|
|
| 819 | |
822 | |
| 820 | TermWin.ncol = TermWin.width / TermWin.fwidth; |
823 | ncol = width / fwidth; |
| 821 | TermWin.nrow = TermWin.height / TermWin.fheight; |
824 | nrow = height / fheight; |
| 822 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
825 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
| 823 | TermWin.ncol, TermWin.nrow, szHint.width, |
826 | ncol, nrow, szHint.width, |
| 824 | szHint.height)); |
827 | szHint.height)); |
| 825 | return; |
828 | return; |
| 826 | } |
829 | } |
| 827 | |
830 | |
| 828 | /*----------------------------------------------------------------------*/ |
831 | /*----------------------------------------------------------------------*/ |
| … | |
… | |
| 836 | if (pty.pty < 0) |
839 | if (pty.pty < 0) |
| 837 | return; |
840 | return; |
| 838 | |
841 | |
| 839 | struct winsize ws; |
842 | struct winsize ws; |
| 840 | |
843 | |
| 841 | ws.ws_col = TermWin.ncol; |
844 | ws.ws_col = ncol; |
| 842 | ws.ws_row = TermWin.nrow; |
845 | ws.ws_row = nrow; |
| 843 | ws.ws_xpixel = TermWin.width; |
846 | ws.ws_xpixel = width; |
| 844 | ws.ws_ypixel = TermWin.height; |
847 | ws.ws_ypixel = height; |
| 845 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
848 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
| 846 | |
849 | |
| 847 | #if 0 |
850 | #if 0 |
| 848 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
851 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
| 849 | if (cmd_pid) /* force through to the command */ |
852 | if (cmd_pid) /* force through to the command */ |
| … | |
… | |
| 873 | return false; |
876 | return false; |
| 874 | } |
877 | } |
| 875 | |
878 | |
| 876 | #if ENABLE_STYLES |
879 | #if ENABLE_STYLES |
| 877 | for (int i = RS_styleCount; --i; ) |
880 | for (int i = RS_styleCount; --i; ) |
| 878 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
881 | if (fontset[i] != fontset[0]) |
| 879 | delete TermWin.fontset[i]; |
882 | delete fontset[i]; |
| 880 | #endif |
883 | #endif |
| 881 | |
884 | |
| 882 | delete TermWin.fontset[0]; |
885 | delete fontset[0]; |
| 883 | TermWin.fontset[0] = fs; |
886 | fontset[0] = fs; |
| 884 | |
887 | |
| 885 | prop = (*fs)[1]->properties (); |
888 | prop = (*fs)[1]->properties (); |
| 886 | prop.height += TermWin.lineSpace; |
889 | prop.height += lineSpace; |
| 887 | fs->set_prop (prop); |
890 | fs->set_prop (prop); |
| 888 | |
891 | |
| 889 | TermWin.fwidth = prop.width; |
892 | fwidth = prop.width; |
| 890 | TermWin.fheight = prop.height; |
893 | fheight = prop.height; |
| 891 | TermWin.fweight = prop.weight; |
894 | fweight = prop.weight; |
| 892 | TermWin.fslant = prop.slant; |
895 | fslant = prop.slant; |
| 893 | TermWin.fbase = (*fs)[1]->ascent; |
896 | fbase = (*fs)[1]->ascent; |
| 894 | |
897 | |
| 895 | for (int style = 1; style < 4; style++) |
898 | for (int style = 1; style < 4; style++) |
| 896 | { |
899 | { |
| 897 | #if ENABLE_STYLES |
900 | #if ENABLE_STYLES |
| 898 | const char *res = rs[Rs_font + style]; |
901 | const char *res = rs[Rs_font + style]; |
| 899 | |
902 | |
| 900 | if (res && !*res) |
903 | if (res && !*res) |
| 901 | TermWin.fontset[style] = TermWin.fontset[0]; |
904 | fontset[style] = fontset[0]; |
| 902 | else |
905 | else |
| 903 | { |
906 | { |
| 904 | TermWin.fontset[style] = fs = new rxvt_fontset (this); |
907 | fontset[style] = fs = new rxvt_fontset (this); |
| 905 | rxvt_fontprop prop2 = prop; |
908 | rxvt_fontprop prop2 = prop; |
| 906 | |
909 | |
| 907 | if (res) |
910 | if (res) |
| 908 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
911 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
| 909 | else |
912 | else |
| 910 | { |
913 | { |
| 911 | res = TermWin.fontset[0]->fontdesc; |
914 | res = fontset[0]->fontdesc; |
| 912 | |
915 | |
| 913 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
916 | 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; |
917 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
| 915 | } |
918 | } |
| 916 | |
919 | |
| 917 | fs->populate (res); |
920 | fs->populate (res); |
| 918 | fs->set_prop (prop2); |
921 | fs->set_prop (prop2); |
| 919 | } |
922 | } |
| 920 | #else |
923 | #else |
| 921 | TermWin.fontset[style] = TermWin.fontset[0]; |
924 | fontset[style] = fontset[0]; |
| 922 | #endif |
925 | #endif |
| 923 | } |
926 | } |
| 924 | |
927 | |
| 925 | if (TermWin.parent[0]) |
928 | if (parent[0]) |
| 926 | { |
929 | { |
| 927 | resize_all_windows (0, 0, 0); |
930 | resize_all_windows (0, 0, 0); |
| 928 | scr_remap_chars (); |
931 | scr_remap_chars (); |
| 929 | scr_touch (true); |
932 | scr_touch (true); |
| 930 | } |
933 | } |
| … | |
… | |
| 933 | } |
936 | } |
| 934 | |
937 | |
| 935 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
938 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
| 936 | { |
939 | { |
| 937 | // TODO: SMART_WINDOW_TITLE |
940 | // TODO: SMART_WINDOW_TITLE |
| 938 | XChangeProperty (display->display, TermWin.parent[0], |
941 | XChangeProperty (display->display, parent[0], |
| 939 | prop, XA_STRING, 8, PropModeReplace, |
942 | prop, XA_STRING, 8, PropModeReplace, |
| 940 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
943 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
| 941 | } |
944 | } |
| 942 | |
945 | |
| 943 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
946 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
| 944 | { |
947 | { |
| 945 | // TODO: SMART_WINDOW_TITLE |
948 | // TODO: SMART_WINDOW_TITLE |
| 946 | wchar_t *ws = rxvt_mbstowcs (str, len); |
949 | wchar_t *ws = rxvt_mbstowcs (str, len); |
| 947 | char *s = rxvt_wcstoutf8 (ws); |
950 | char *s = rxvt_wcstoutf8 (ws); |
| 948 | |
951 | |
| 949 | XChangeProperty (display->display, TermWin.parent[0], |
952 | XChangeProperty (display->display, parent[0], |
| 950 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
953 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
| 951 | (const unsigned char *)s, strlen (s)); |
954 | (const unsigned char *)s, strlen (s)); |
| 952 | |
955 | |
| 953 | free (s); |
956 | free (s); |
| 954 | free (ws); |
957 | free (ws); |
| … | |
… | |
| 1117 | |
1120 | |
| 1118 | /* -------------------------------------------------------------------- * |
1121 | /* -------------------------------------------------------------------- * |
| 1119 | * - WINDOW RESIZING - * |
1122 | * - WINDOW RESIZING - * |
| 1120 | * -------------------------------------------------------------------- */ |
1123 | * -------------------------------------------------------------------- */ |
| 1121 | void |
1124 | void |
| 1122 | rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) |
1125 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
| 1123 | { |
1126 | { |
| 1124 | int fix_screen; |
1127 | int fix_screen; |
| 1125 | #ifdef SMART_RESIZE |
|
|
| 1126 | int old_width = szHint.width, old_height = szHint.height; |
1128 | int old_width = szHint.width, old_height = szHint.height; |
| 1127 | #endif |
|
|
| 1128 | dDisp; |
1129 | dDisp; |
| 1129 | |
1130 | |
| 1130 | window_calc (width, height); |
1131 | window_calc (newwidth, newheight); |
| 1131 | XSetWMNormalHints (disp, TermWin.parent[0], &szHint); |
1132 | XSetWMNormalHints (disp, parent[0], &szHint); |
| 1132 | |
1133 | |
| 1133 | if (!ignoreparent) |
1134 | if (!ignoreparent) |
| 1134 | { |
1135 | { |
| 1135 | #ifdef SMART_RESIZE |
1136 | #ifdef SMART_RESIZE |
| 1136 | /* |
1137 | /* |
| … | |
… | |
| 1140 | int x, y, x1, y1; |
1141 | int x, y, x1, y1; |
| 1141 | int dx, dy; |
1142 | int dx, dy; |
| 1142 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1143 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
| 1143 | Window unused_cr; |
1144 | Window unused_cr; |
| 1144 | |
1145 | |
| 1145 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
1146 | XTranslateCoordinates (disp, parent[0], display->root, |
| 1146 | 0, 0, &x, &y, &unused_cr); |
1147 | 0, 0, &x, &y, &unused_cr); |
| 1147 | XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, |
1148 | XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, |
| 1148 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1149 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
| 1149 | /* |
1150 | /* |
| 1150 | * if display->root isn't the parent window, a WM will probably have offset |
1151 | * if display->root isn't the parent window, a WM will probably have offset |
| 1151 | * our position for handles and decorations. Counter it |
1152 | * our position for handles and decorations. Counter it |
| 1152 | */ |
1153 | */ |
| … | |
… | |
| 1169 | if (y < y1) /* top half */ |
1170 | if (y < y1) /* top half */ |
| 1170 | dy = 0; |
1171 | dy = 0; |
| 1171 | else if (y == y1) /* exact center */ |
1172 | else if (y == y1) /* exact center */ |
| 1172 | dy /= 2; |
1173 | dy /= 2; |
| 1173 | |
1174 | |
| 1174 | XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, |
1175 | XMoveResizeWindow (disp, parent[0], x + dx, y + dy, |
| 1175 | szHint.width, szHint.height); |
1176 | szHint.width, szHint.height); |
| 1176 | #else |
1177 | #else |
| 1177 | XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); |
1178 | XResizeWindow (disp, parent[0], szHint.width, szHint.height); |
| 1178 | #endif |
1179 | #endif |
| 1179 | } |
1180 | } |
| 1180 | |
1181 | |
| 1181 | fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; |
1182 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
| 1182 | |
1183 | |
| 1183 | if (fix_screen || width != old_width || height != old_height) |
1184 | if (fix_screen || newwidth != old_width || newheight != old_height) |
| 1184 | { |
1185 | { |
| 1185 | if (scrollbar_visible ()) |
1186 | if (scrollbar_visible ()) |
| 1186 | { |
1187 | { |
| 1187 | XMoveResizeWindow (disp, scrollBar.win, |
1188 | XMoveResizeWindow (disp, scrollBar.win, |
| 1188 | window_sb_x, 0, |
1189 | window_sb_x, 0, |
| … | |
… | |
| 1193 | if (menubar_visible ()) |
1194 | if (menubar_visible ()) |
| 1194 | XMoveResizeWindow (disp, menuBar.win, |
1195 | XMoveResizeWindow (disp, menuBar.win, |
| 1195 | window_vt_x, 0, |
1196 | window_vt_x, 0, |
| 1196 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
1197 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
| 1197 | |
1198 | |
| 1198 | XMoveResizeWindow (disp, TermWin.vt, |
1199 | XMoveResizeWindow (disp, vt, |
| 1199 | window_vt_x, window_vt_y, |
1200 | window_vt_x, window_vt_y, |
| 1200 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1201 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
| 1201 | |
1202 | |
| 1202 | scr_clear (); |
1203 | scr_clear (); |
| 1203 | #ifdef XPM_BACKGROUND |
1204 | #ifdef XPM_BACKGROUND |
| … | |
… | |
| 1211 | int old_ncol = prev_ncol; |
1212 | int old_ncol = prev_ncol; |
| 1212 | |
1213 | |
| 1213 | /* scr_reset only works on the primary screen */ |
1214 | /* scr_reset only works on the primary screen */ |
| 1214 | if (old_height) /* this is not the first time through */ |
1215 | if (old_height) /* this is not the first time through */ |
| 1215 | { |
1216 | { |
| 1216 | unsigned int ncol = TermWin.ncol; |
1217 | unsigned int ocol = ncol; |
| 1217 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
1218 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
| 1218 | curr_screen = scr_change_screen (PRIMARY); |
1219 | curr_screen = scr_change_screen (PRIMARY); |
| 1219 | TermWin.ncol = ncol; |
1220 | ncol = ocol; |
| 1220 | } |
1221 | } |
| 1221 | |
1222 | |
| 1222 | scr_reset (); |
1223 | scr_reset (); |
| 1223 | |
1224 | |
| 1224 | if (curr_screen >= 0) /* this is not the first time through */ |
1225 | if (curr_screen >= 0) /* this is not the first time through */ |
| 1225 | { |
1226 | { |
| 1226 | scr_change_screen (curr_screen); |
1227 | scr_change_screen (curr_screen); |
| 1227 | selection_check (old_ncol != TermWin.ncol ? 4 : 0); |
1228 | selection_check (old_ncol != ncol ? 4 : 0); |
| 1228 | } |
1229 | } |
| 1229 | } |
1230 | } |
| 1230 | |
1231 | |
| 1231 | old_width = szHint.width; |
1232 | old_width = szHint.width; |
| 1232 | old_height = szHint.height; |
1233 | old_height = szHint.height; |
| 1233 | |
1234 | |
| 1234 | #ifdef XPM_BACKGROUND |
1235 | #ifdef XPM_BACKGROUND |
| 1235 | if (TermWin.pixmap) |
1236 | if (pixmap) |
| 1236 | scr_touch (false); |
1237 | scr_touch (false); |
| 1237 | #endif |
1238 | #endif |
| 1238 | |
1239 | |
| 1239 | #ifdef USE_XIM |
1240 | #ifdef USE_XIM |
| 1240 | IMSetStatusPosition (); |
1241 | IMSetStatusPosition (); |
| … | |
… | |
| 1244 | /* |
1245 | /* |
| 1245 | * Set the width/height of the vt window in characters. Units are pixels. |
1246 | * Set the width/height of the vt window in characters. Units are pixels. |
| 1246 | * good for toggling 80/132 columns |
1247 | * good for toggling 80/132 columns |
| 1247 | */ |
1248 | */ |
| 1248 | void |
1249 | void |
| 1249 | rxvt_term::set_widthheight (unsigned int width, unsigned int height) |
1250 | rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight) |
| 1250 | { |
1251 | { |
| 1251 | XWindowAttributes wattr; |
1252 | XWindowAttributes wattr; |
| 1252 | |
1253 | |
| 1253 | if (width == 0 || height == 0) |
1254 | if (newwidth == 0 || newheight == 0) |
| 1254 | { |
1255 | { |
| 1255 | XGetWindowAttributes (display->display, display->root, &wattr); |
1256 | XGetWindowAttributes (display->display, display->root, &wattr); |
| 1256 | |
1257 | |
| 1257 | if (width == 0) |
1258 | if (newwidth == 0) |
| 1258 | width = wattr.width - szHint.base_width; |
1259 | newwidth = wattr.width - szHint.base_width; |
| 1259 | if (height == 0) |
1260 | if (newheight == 0) |
| 1260 | height = wattr.height - szHint.base_height; |
1261 | newheight = wattr.height - szHint.base_height; |
| 1261 | } |
|
|
| 1262 | |
|
|
| 1263 | if (width != TermWin.width || height != TermWin.height) |
|
|
| 1264 | { |
1262 | } |
|
|
1263 | |
|
|
1264 | if (newwidth != width || newheight != height) |
|
|
1265 | { |
| 1265 | width += szHint.base_width; |
1266 | newwidth += szHint.base_width; |
| 1266 | height += szHint.base_height; |
1267 | newheight += szHint.base_height; |
| 1267 | resize_all_windows (width, height, 0); |
1268 | resize_all_windows (newwidth, newheight, 0); |
| 1268 | } |
1269 | } |
| 1269 | } |
1270 | } |
| 1270 | |
1271 | |
| 1271 | /* -------------------------------------------------------------------- * |
1272 | /* -------------------------------------------------------------------- * |
| 1272 | * - X INPUT METHOD ROUTINES - * |
1273 | * - X INPUT METHOD ROUTINES - * |
| … | |
… | |
| 1282 | |
1283 | |
| 1283 | void |
1284 | void |
| 1284 | rxvt_term::im_set_size (XRectangle &size) |
1285 | rxvt_term::im_set_size (XRectangle &size) |
| 1285 | { |
1286 | { |
| 1286 | // the int_bwidth terms make no sense to me |
1287 | // the int_bwidth terms make no sense to me |
| 1287 | size.x = TermWin.int_bwidth; |
1288 | size.x = int_bwidth; |
| 1288 | size.y = TermWin.int_bwidth; |
1289 | size.y = int_bwidth; |
| 1289 | size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; |
1290 | size.width = Width2Pixel (ncol) + int_bwidth; |
| 1290 | size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; |
1291 | size.height = Height2Pixel (nrow) + int_bwidth; |
| 1291 | } |
1292 | } |
| 1292 | |
1293 | |
| 1293 | void |
1294 | void |
| 1294 | rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, |
1295 | rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, |
| 1295 | XRectangle &status_rect, |
1296 | XRectangle &status_rect, |
| 1296 | const XRectangle &needed_rect) |
1297 | const XRectangle &needed_rect) |
| 1297 | { |
1298 | { |
| 1298 | preedit_rect.x = needed_rect.width; |
1299 | preedit_rect.x = needed_rect.width; |
| 1299 | preedit_rect.y = 0; |
1300 | preedit_rect.y = 0; |
| 1300 | preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; |
1301 | preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1; |
| 1301 | preedit_rect.height = TermWin.fheight; |
1302 | preedit_rect.height = fheight; |
| 1302 | |
1303 | |
| 1303 | status_rect.x = 0; |
1304 | status_rect.x = 0; |
| 1304 | status_rect.y = 0; |
1305 | status_rect.y = 0; |
| 1305 | status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; |
1306 | status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1; |
| 1306 | status_rect.height = TermWin.fheight; |
1307 | status_rect.height = fheight; |
| 1307 | } |
1308 | } |
| 1308 | |
1309 | |
| 1309 | /* Checking whether input method is running. */ |
1310 | /* Checking whether input method is running. */ |
| 1310 | bool |
1311 | bool |
| 1311 | rxvt_term::IMisRunning () |
1312 | rxvt_term::IMisRunning () |
| … | |
… | |
| 1339 | { |
1340 | { |
| 1340 | XPoint nspot; |
1341 | XPoint nspot; |
| 1341 | XVaNestedList preedit_attr; |
1342 | XVaNestedList preedit_attr; |
| 1342 | |
1343 | |
| 1343 | if (!Input_Context |
1344 | if (!Input_Context |
| 1344 | || !TermWin.focus |
1345 | || !focus |
| 1345 | || !(input_style & XIMPreeditPosition)) |
1346 | || !(input_style & XIMPreeditPosition)) |
| 1346 | return; |
1347 | return; |
| 1347 | |
1348 | |
| 1348 | im_set_position (nspot); |
1349 | im_set_position (nspot); |
| 1349 | |
1350 | |
| … | |
… | |
| 1469 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1470 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
| 1470 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1471 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
| 1471 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1472 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
| 1472 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1473 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
| 1473 | "*", |
1474 | "*", |
| 1474 | TermWin.fheight, |
1475 | fheight, |
| 1475 | TermWin.fheight + 1, TermWin.fheight - 1, |
1476 | fheight + 1, fheight - 1, |
| 1476 | TermWin.fheight - 2, TermWin.fheight + 2); |
1477 | fheight - 2, fheight + 2); |
| 1477 | |
1478 | |
| 1478 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1479 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
| 1479 | &missing_charset_list, &missing_charset_count, &def_string); |
1480 | &missing_charset_list, &missing_charset_count, &def_string); |
| 1480 | |
1481 | |
| 1481 | if (missing_charset_list) |
1482 | if (missing_charset_list) |
| … | |
… | |
| 1527 | NULL); |
1528 | NULL); |
| 1528 | } |
1529 | } |
| 1529 | |
1530 | |
| 1530 | Input_Context = XCreateIC (xim, |
1531 | Input_Context = XCreateIC (xim, |
| 1531 | XNInputStyle, input_style, |
1532 | XNInputStyle, input_style, |
| 1532 | XNClientWindow, TermWin.vt, |
1533 | XNClientWindow, vt, |
| 1533 | XNFocusWindow, TermWin.parent[0], |
1534 | XNFocusWindow, parent[0], |
| 1534 | preedit_attr ? XNPreeditAttributes : NULL, |
1535 | preedit_attr ? XNPreeditAttributes : NULL, |
| 1535 | preedit_attr, |
1536 | preedit_attr, |
| 1536 | status_attr ? XNStatusAttributes : NULL, |
1537 | status_attr ? XNStatusAttributes : NULL, |
| 1537 | status_attr, NULL); |
1538 | status_attr, NULL); |
| 1538 | |
1539 | |
| … | |
… | |
| 1622 | { |
1623 | { |
| 1623 | XRectangle preedit_rect, status_rect, *needed_rect; |
1624 | XRectangle preedit_rect, status_rect, *needed_rect; |
| 1624 | XVaNestedList preedit_attr, status_attr; |
1625 | XVaNestedList preedit_attr, status_attr; |
| 1625 | |
1626 | |
| 1626 | if (!Input_Context |
1627 | if (!Input_Context |
| 1627 | || !TermWin.focus |
1628 | || !focus |
| 1628 | || !(input_style & XIMPreeditArea) |
1629 | || !(input_style & XIMPreeditArea) |
| 1629 | || !IMisRunning ()) |
1630 | || !IMisRunning ()) |
| 1630 | return; |
1631 | return; |
| 1631 | |
1632 | |
| 1632 | /* Getting the necessary width of preedit area */ |
1633 | /* Getting the necessary width of preedit area */ |
