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.160 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.166 by root, Sun Jun 26 20:06:52 2005 UTC

… …
773 * Add text given in <str> of length <len> to screen struct 773 * Add text given in <str> of length <len> to screen struct
774 */ 774 */
775void 775void
776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
777{ 777{
778 if (len <= 0) /* sanity */
779 return;
780
778 unsigned char checksel; 781 unsigned char checksel;
779 unicode_t c; 782 unicode_t c;
780 int i, row, last_col; 783 int i, row, last_col;
781 text_t *stp; 784 text_t *stp;
782 rend_t *srp; 785 rend_t *srp;
783 786 const unicode_t *strend = str + len;
784 if (len <= 0) /* sanity */
785 return;
786 787
787 want_refresh = 1; 788 want_refresh = 1;
788 ZERO_SCROLLBACK (); 789 ZERO_SCROLLBACK ();
789 last_col = TermWin.ncol; 790 last_col = TermWin.ncol;
790 791
… …
815 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
816 817
817 stp = screen.text[row]; 818 stp = screen.text[row];
818 srp = screen.rend[row]; 819 srp = screen.rend[row];
819 820
820 while (len--) 821 while (str < strend)
821 { 822 {
822 c = *str++; 823 c = *str++;
823 824
824 if (c < 0x20) 825 if (c < 0x20)
825 switch (c) 826 if (c == C0_LF)
827 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col);
830
831 screen.flags &= ~Screen_WrapNext;
832
833 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835 else if (screen.cur.row < (TermWin.nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines;
837
838 stp = screen.text[row]; /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue;
841 }
842 else if (c == C0_CR)
826 { 843 {
827 case C0_HT:
828 scr_tab (1, true);
829 continue;
830
831 case C0_LF:
832 if (screen.tlen[row] != -1) /* XXX: think about this */ 844 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col); 845 MAX_IT (screen.tlen[row], screen.cur.col);
834 846
835 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
836
837 if (screen.cur.row == screen.bscroll)
838 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
839 else if (screen.cur.row < (TermWin.nrow - 1))
840 row = (++screen.cur.row) + TermWin.saveLines;
841
842 stp = screen.text[row]; /* _must_ refresh */
843 srp = screen.rend[row]; /* _must_ refresh */
844 continue;
845
846 case C0_CR:
847 if (screen.tlen[row] != -1) /* XXX: think about this */
848 MAX_IT (screen.tlen[row], screen.cur.col);
849
850 screen.flags &= ~Screen_WrapNext;
851 screen.cur.col = 0; 848 screen.cur.col = 0;
852 continue; 849 continue;
850 }
851 else if (c == C0_HT)
852 {
853 scr_tab (1, true);
854 continue;
853 } 855 }
854 856
855 if (checksel /* see if we're writing within selection */ 857 if (checksel /* see if we're writing within selection */
856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
857 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
867 869
868 if (screen.flags & Screen_WrapNext) 870 if (screen.flags & Screen_WrapNext)
869 { 871 {
870 screen.tlen[row] = -1; 872 screen.tlen[row] = -1;
871 873
874 scr_do_wrap ();
875
872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 876 row = screen.cur.row + TermWin.saveLines;
873
874 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
875 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
876 } 879 }
877 880
881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff))
883 c = 0xfffd;
884
878 // rely on wcwidth to tell us the character width, at least for non-latin1 885 // rely on wcwidth to tell us the character width, at least for non-latin1
879 // do wcwidth before further replacements, as wcwidth says that line-drawing 886 // do wcwidth before further replacements, as wcwidth might return -1
880 // characters have width -1 (DOH!) on GNU/Linux sometimes. 887 // for the line drawing characters below as they might be invalid in the current
888 // locale.
881 int width = c < 0x100 ? 1 : wcwidth (c); 889 int width = c < 0x100 ? 1 : wcwidth (c);
882 890
883 if (charsets[screen.charset] == '0') // DEC SPECIAL 891 if (charsets[screen.charset] == '0') // DEC SPECIAL
884 { 892 {
885 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100 894 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
888 static uint16_t vt100_0[63] = { // 40 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! 897 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f 898 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 899 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f 900 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e 904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 905 };
898 906
899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) 907 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
900 { 908 {
901 c = vt100_0[c - 0x40]; 909 c = vt100_0[c - 0x41];
902 width = 1; 910 width = 1; // vt100 line drawing characters are always single-width
903 } 911 }
904 } 912 }
905 913
906 if (screen.flags & Screen_Insert) 914 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
908 916
909 if (width != 0) 917 if (width != 0)
910 { 918 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3 919#if !UNICODE_3
916 // trim characters we can't store directly :( 920 // trim characters we can't store directly :(
917 if (c >= 0x10000) 921 if (c >= 0x10000)
918# if ENABLE_COMBINING 922# if ENABLE_COMBINING
919 c = rxvt_composite.compose (c); // map to lower 16 bits 923 c = rxvt_composite.compose (c); // map to lower 16 bits
… …
942 col++; 946 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR); 947 } while (col < TermWin.ncol && stp[col] == NOCHAR);
944 } 948 }
945 949
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951
952 // if the character doesn't fit into the remaining columns...
953 if (screen.cur.col > last_col - width && last_col >= width)
954 {
955 // ...output spaces
956 c = ' ';
957 // and try the same character next loop iteration
958 --str;
959 }
947 960
948 do 961 do
949 { 962 {
950 stp[screen.cur.col] = c; 963 stp[screen.cur.col] = c;
951 srp[screen.cur.col] = rend; 964 srp[screen.cur.col] = rend;
… …
970 { 983 {
971 stp[c] = ' '; 984 stp[c] = ' ';
972 srp[c] = rend; 985 srp[c] = rend;
973 } 986 }
974 } 987 }
975 else if (width == 0) 988 else // width == 0
976 { 989 {
977#if ENABLE_COMBINING 990#if ENABLE_COMBINING
978 // handle combining characters 991 // handle combining characters
979 // we just tag the accent on the previous on-screen character. 992 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong. 993 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet. 994 // we don't handle double-width characters nicely yet.
982
983 text_t *tp; 995 text_t *tp;
984 rend_t *rp; 996 rend_t *rp;
985 997
986 if (screen.cur.col > 0) 998 if (screen.cur.col > 0)
987 { 999 {
… …
1397rxvt_term::scr_erase_savelines () 1409rxvt_term::scr_erase_savelines ()
1398{ 1410{
1399 want_refresh = 1; 1411 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1401 1413
1402 for (int i = 0; i < TermWin.saveLines; ++i) 1414 TermWin.nscrolled = 0;
1403 if (screen.text [i])
1404 {
1405 screen.tlen[i] = 0;
1406 scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
1407 }
1408} 1415}
1409#endif 1416#endif
1410 1417
1411/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1412/* 1419/*
… …
2018/* 2025/*
2019 * Refresh the screen 2026 * Refresh the screen
2020 * drawn_text/drawn_rend contain the screen information before the update. 2027 * drawn_text/drawn_rend contain the screen information before the update.
2021 * screen.text/screen.rend contain what the screen will change to. 2028 * screen.text/screen.rend contain what the screen will change to.
2022 */ 2029 */
2023
2024#define FONT_WIDTH(X, Y) \
2025 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2026#define FONT_RBEAR(X, Y) \
2027 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2028#define FONT_LBEAR(X, Y) \
2029 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2030#define IS_FONT_CHAR(X, Y) \
2031 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2032
2033void 2030void
2034rxvt_term::scr_refresh (unsigned char refresh_type) 2031rxvt_term::scr_refresh (unsigned char refresh_type)
2035{ 2032{
2036 unsigned char must_clear, /* use draw_string not draw_image_string */ 2033 unsigned char must_clear, /* use draw_string not draw_image_string */
2037 showcursor; /* show the cursor */ 2034 showcursor; /* show the cursor */
… …
2056 refresh_count = 0; 2053 refresh_count = 0;
2057 2054
2058 row_offset = TermWin.saveLines - TermWin.view_start; 2055 row_offset = TermWin.saveLines - TermWin.view_start;
2059 2056
2060#if XPM_BACKGROUND 2057#if XPM_BACKGROUND
2061 must_clear |= (bgPixmap.pixmap != None); 2058 must_clear |= bgPixmap.pixmap != None;
2062#endif 2059#endif
2063#if TRANSPARENT 2060#if TRANSPARENT
2064 must_clear |= ((options & Opt_transparent) && am_transparent); 2061 must_clear |= (options & Opt_transparent) && am_transparent;
2065#endif 2062#endif
2066 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2067 2064
2068 /* 2065 /*
2069 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
2093 2090
2094 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2091 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2095 2092
2096 if (showcursor && TermWin.focus) 2093 if (showcursor && TermWin.focus)
2097 { 2094 {
2095 if (options & Opt_cursorUnderline)
2096 *crp ^= RS_Uline;
2097 else
2098 {
2098 *crp ^= RS_RVid; 2099 *crp ^= RS_RVid;
2100
2099#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
2100 cc1 = *crp & (RS_fgMask | RS_bgMask); 2102 cc1 = *crp & (RS_fgMask | RS_bgMask);
2101 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2102 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2103 else 2105 else
2104#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2105 ccol1 = GET_FGCOLOR (rstyle); 2107 ccol1 = GET_FGCOLOR (rstyle);
2106#else 2108#else
2107 ccol1 = Color_fg; 2109 ccol1 = Color_fg;
2108#endif 2110#endif
2109 if (ISSET_PIXCOLOR (Color_cursor2)) 2111 if (ISSET_PIXCOLOR (Color_cursor2))
2110 ccol2 = Color_cursor2; 2112 ccol2 = Color_cursor2;
2111 else 2113 else
2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2114#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2113 ccol2 = GET_BGCOLOR (rstyle); 2115 ccol2 = GET_BGCOLOR (rstyle);
2114#else 2116#else
2115 ccol2 = Color_bg; 2117 ccol2 = Color_bg;
2116#endif 2118#endif
2117 *crp = SET_FGCOLOR (*crp, ccol1); 2119 *crp = SET_FGCOLOR (*crp, ccol1);
2118 *crp = SET_BGCOLOR (*crp, ccol2); 2120 *crp = SET_BGCOLOR (*crp, ccol2);
2119#endif 2121#endif
2122 }
2120 } 2123 }
2121 } 2124 }
2122 2125
2123 /* make sure no outline cursor is left around */ 2126 /* make sure no outline cursor is left around */
2124 setoldcursor = 0; 2127 setoldcursor = 0;
… …
2430 */ 2433 */
2431 if (showcursor) 2434 if (showcursor)
2432 { 2435 {
2433 if (TermWin.focus) 2436 if (TermWin.focus)
2434 { 2437 {
2438 if (options & Opt_cursorUnderline)
2439 *crp ^= RS_Uline;
2440 else
2441 {
2435 *crp ^= RS_RVid; 2442 *crp ^= RS_RVid;
2436#ifndef NO_CURSORCOLOR 2443#ifndef NO_CURSORCOLOR
2437 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2444 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2438#endif 2445#endif
2446 }
2439 } 2447 }
2440 else if (oldcursor.row >= 0) 2448 else if (oldcursor.row >= 0)
2441 { 2449 {
2450 int cursorwidth = 1;
2451 int col = oldcursor.col;
2452
2453 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2454 col--;
2455
2456 while (col + cursorwidth < TermWin.ncol
2457 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2458 cursorwidth++;
2459
2442#ifndef NO_CURSORCOLOR 2460#ifndef NO_CURSORCOLOR
2443 if (ISSET_PIXCOLOR (Color_cursor)) 2461 if (ISSET_PIXCOLOR (Color_cursor))
2444 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2462 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2445#endif 2463#endif
2446 int cursorwidth = 1;
2447 while (oldcursor.col + cursorwidth < TermWin.ncol
2448 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2449 cursorwidth++;
2450 2464
2451 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2465 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2452 Col2Pixel (oldcursor.col), 2466 Col2Pixel (col),
2453 Row2Pixel (oldcursor.row), 2467 Row2Pixel (oldcursor.row),
2454 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2468 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2455 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2469 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2456 } 2470 }
2457 } 2471 }
… …
2916 2930
2917int 2931int
2918rxvt_term::selection_request_other (Atom target, int selnum) 2932rxvt_term::selection_request_other (Atom target, int selnum)
2919{ 2933{
2920 Atom sel; 2934 Atom sel;
2921#ifdef DEBUG_SELECT
2922 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2923#endif
2924 2935
2925 selection_type |= selnum; 2936 selection_type |= selnum;
2926 2937
2927 if (selnum == Sel_Primary) 2938 if (selnum == Sel_Primary)
2928 sel = XA_PRIMARY; 2939 sel = XA_PRIMARY;
… …
3803 while (*s) 3814 while (*s)
3804 scr_overlay_set (x++, y, *s++); 3815 scr_overlay_set (x++, y, *s++);
3805} 3816}
3806 3817
3807void 3818void
3819rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3820{
3821 while (*s)
3822 {
3823 text_t t = *s++;
3824 int width = wcwidth (t);
3825
3826 while (width--)
3827 {
3828 scr_overlay_set (x++, y, t);
3829 t = NOCHAR;
3830 }
3831 }
3832}
3833
3834void
3808rxvt_term::scr_swap_overlay () 3835rxvt_term::scr_swap_overlay ()
3809{ 3836{
3810 if (!ov_text) 3837 if (!ov_text)
3811 return; 3838 return;
3812 3839

Diff Legend

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