ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.308 by root, Tue Jul 15 16:41:22 2008 UTC vs.
Revision 1.309 by root, Mon Jul 21 16:51:31 2008 UTC

… …
771 771
772 while (str < strend) 772 while (str < strend)
773 { 773 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 775
776 if (c < 0x20) 776 if (expect_false (c < 0x20))
777 if (c == C0_LF) 777 if (c == C0_LF)
778 { 778 {
779 max_it (line->l, screen.cur.col); 779 max_it (line->l, screen.cur.col);
780 780
781 screen.flags &= ~Screen_WrapNext; 781 screen.flags &= ~Screen_WrapNext;
… …
800 { 800 {
801 scr_tab (1, true); 801 scr_tab (1, true);
802 continue; 802 continue;
803 } 803 }
804 804
805 if (expect_false (
805 if (checksel /* see if we're writing within selection */ 806 checksel /* see if we're writing within selection */
806 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
807 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 ))
808 { 810 {
809 checksel = 0; 811 checksel = 0;
810 /* 812 /*
811 * If we wrote anywhere in the selected area, kill the selection 813 * If we wrote anywhere in the selected area, kill the selection
812 * XXX: should we kill the mark too? Possibly, but maybe that 814 * XXX: should we kill the mark too? Possibly, but maybe that
813 * should be a similar check. 815 * should be a similar check.
814 */ 816 */
815 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
816 } 818 }
817 819
818 if (screen.flags & Screen_WrapNext) 820 if (expect_false (screen.flags & Screen_WrapNext))
819 { 821 {
820 scr_do_wrap (); 822 scr_do_wrap ();
821 823
822 line->l = ncol; 824 line->l = ncol;
823 line->is_longer (1); 825 line->is_longer (1);
… …
825 row = screen.cur.row; 827 row = screen.cur.row;
826 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
827 } 829 }
828 830
829 // some utf-8 decoders "decode" surrogate characters: let's fix this. 831 // some utf-8 decoders "decode" surrogate characters: let's fix this.
830 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
831 c = 0xfffd; 833 c = 0xfffd;
832 834
833 // rely on wcwidth to tell us the character width, do wcwidth before 835 // rely on wcwidth to tell us the character width, do wcwidth before
834 // further replacements, as wcwidth might return -1 for the line 836 // further replacements, as wcwidth might return -1 for the line
835 // drawing characters below as they might be invalid in the current 837 // drawing characters below as they might be invalid in the current
836 // locale. 838 // locale.
837 int width = WCWIDTH (c); 839 int width = WCWIDTH (c);
838 840
839 if (charsets [screen.charset] == '0') // DEC SPECIAL 841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
840 { 842 {
841 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
842 // 5f-7e standard vt100 844 // 5f-7e standard vt100
843 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
844 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 c = vt100_0[c - 0x41]; 859 c = vt100_0[c - 0x41];
858 width = 1; // vt100 line drawing characters are always single-width 860 width = 1; // vt100 line drawing characters are always single-width
859 } 861 }
860 } 862 }
861 863
862 if (screen.flags & Screen_Insert) 864 if (expect_false (screen.flags & Screen_Insert))
863 scr_insdel_chars (width, INSERT); 865 scr_insdel_chars (width, INSERT);
864 866
865 if (width != 0) 867 if (width != 0)
866 { 868 {
867#if !UNICODE_3 869#if !UNICODE_3
… …
873 c = 0xfffd; 875 c = 0xfffd;
874# endif 876# endif
875#endif 877#endif
876 878
877 // nuke the character at this position, if required 879 // nuke the character at this position, if required
880 if (expect_false (
878 if (line->t[screen.cur.col] == NOCHAR 881 line->t[screen.cur.col] == NOCHAR
879 || (screen.cur.col < ncol - 1 882 || (screen.cur.col < ncol - 1
880 && line->t[screen.cur.col + 1] == NOCHAR)) 883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
881 { 885 {
882 int col = screen.cur.col; 886 int col = screen.cur.col;
883 887
884 // find begin 888 // find begin
885 while (col > 0 && line->t[col] == NOCHAR) 889 while (col > 0 && line->t[col] == NOCHAR)
… …
896 } 900 }
897 901
898 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899 903
900 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
901 if (screen.cur.col > ncol - width && ncol >= width) 905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
902 { 906 {
903 // ...output spaces 907 // ...output spaces
904 c = ' '; 908 c = ' ';
905 // and try the same character next loop iteration 909 // and try the same character next loop iteration
906 --str; 910 --str;
… …
911 do 915 do
912 { 916 {
913 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
914 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
915 919
916 if (screen.cur.col < ncol - 1) 920 if (expect_true (screen.cur.col < ncol - 1))
917 screen.cur.col++; 921 screen.cur.col++;
918 else 922 else
919 { 923 {
920 line->l = ncol; 924 line->l = ncol;
921 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
… …
923 break; 927 break;
924 } 928 }
925 929
926 c = NOCHAR; 930 c = NOCHAR;
927 } 931 }
928 while (--width > 0); 932 while (expect_false (--width > 0));
929 933
930 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
931 if (!width) 935 if (expect_false (!width))
932 { 936 {
933 line->touch (); 937 line->touch ();
934 938
935 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
936 { 940 {
937 line->t[c] = ' '; 941 line->t[c] = ' ';
938 line->r[c] = rend; 942 line->r[c] = rend;
939 } 943 }
940 } 944 }
941 } 945 }
946#if ENABLE_COMBINING
942 else // width == 0 947 else // width == 0
943 { 948 {
944#if ENABLE_COMBINING 949 if (c != 0xfeff) // ignore BOM
945 // handle combining characters
946 // we just tag the accent on the previous on-screen character.
947 // this is arguably not correct, but also arguably not wrong.
948 // we don't handle double-width characters nicely yet.
949 line_t *linep;
950 text_t *tp;
951 rend_t *rp;
952
953 if (screen.cur.col > 0)
954 { 950 {
951 // handle combining characters
952 // we just tag the accent on the previous on-screen character.
953 // this is arguably not correct, but also arguably not wrong.
954 // we don't handle double-width characters nicely yet.
955 line_t *linep;
956 text_t *tp;
957 rend_t *rp;
958
959 if (screen.cur.col > 0)
960 {
955 linep = line; 961 linep = line;
956 tp = line->t + screen.cur.col - 1; 962 tp = line->t + screen.cur.col - 1;
957 rp = line->r + screen.cur.col - 1; 963 rp = line->r + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && ROW(screen.cur.row - 1).is_longer ())
967 {
968 linep = &ROW(screen.cur.row - 1);
969 tp = line->t + ncol - 1;
970 rp = line->r + ncol - 1;
971 }
972 else
973 continue;
974
975 linep->touch ();
976
977 while (*tp == NOCHAR && tp > linep->t)
978 tp--, rp--;
979
980 // first try to find a precomposed character
981 unicode_t n = rxvt_compose (*tp, c);
982 if (n == NOCHAR)
983 n = rxvt_composite.compose (*tp, c);
984
985 *tp = n;
986 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 987 }
959 else if (screen.cur.row > 0
960 && ROW(screen.cur.row - 1).is_longer ())
961 {
962 linep = &ROW(screen.cur.row - 1);
963 tp = line->t + ncol - 1;
964 rp = line->r + ncol - 1;
965 } 988 }
966 else
967 continue;
968
969 linep->touch ();
970
971 while (*tp == NOCHAR && tp > linep->t)
972 tp--, rp--;
973
974 // first try to find a precomposed character
975 unicode_t n = rxvt_compose (*tp, c);
976 if (n == NOCHAR)
977 n = rxvt_composite.compose (*tp, c);
978
979 *tp = n;
980 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
981#endif 989#endif
982 }
983 } 990 }
984 991
985 max_it (line->l, screen.cur.col); 992 max_it (line->l, screen.cur.col);
986 993
987#ifdef DEBUG_STRICT 994#ifdef DEBUG_STRICT

Diff Legend

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