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.164 by root, Wed Jun 22 14:33:23 2005 UTC vs.
Revision 1.171 by root, Fri Dec 16 13:05:49 2005 UTC

… …
260 260
261 if (nrow < prev_nrow) 261 if (nrow < prev_nrow)
262 { 262 {
263 /* delete rows */ 263 /* delete rows */
264 k = min (TermWin.nscrolled, prev_nrow - nrow); 264 k = min (TermWin.nscrolled, prev_nrow - nrow);
265 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
265 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 266 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
266 267
267 for (p = nrow; p < prev_nrow; p++) 268 for (p = nrow; p < prev_nrow; p++)
268 { 269 {
269 q = p + TermWin.saveLines; 270 q = p + TermWin.saveLines;
… …
441 */ 442 */
442void 443void
443rxvt_term::scr_release () 444rxvt_term::scr_release ()
444{ 445{
445 unsigned int total_rows; 446 unsigned int total_rows;
446 int i;
447 447
448 total_rows = TermWin.nrow + TermWin.saveLines; 448 total_rows = TermWin.nrow + TermWin.saveLines;
449 449
450 delete talloc; talloc = 0; 450 delete talloc; talloc = 0;
451 delete ralloc; ralloc = 0; 451 delete ralloc; ralloc = 0;
… …
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 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 {
… …
1936/* ------------------------------------------------------------------------- */ 1948/* ------------------------------------------------------------------------- */
1937void 1949void
1938rxvt_term::scr_bell () 1950rxvt_term::scr_bell ()
1939{ 1951{
1940#ifndef NO_BELL 1952#ifndef NO_BELL
1953
1941# ifndef NO_MAPALERT 1954# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1955# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1956 if (options & Opt_mapAlert)
1944# endif 1957# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1958 XMapWindow (display->display, TermWin.parent[0]);
1946# endif 1959# endif
1960
1947 if (options & Opt_visualBell) 1961 if (options & Opt_visualBell)
1948 { 1962 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1963 scr_rvideo_mode (!rvideo); /* refresh also done */
1964 rxvt_usleep (VISUAL_BELL_DURATION);
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1965 scr_rvideo_mode (!rvideo); /* refresh also done */
1951 } 1966 }
1952 else 1967 else
1953 XBell (display->display, 0); 1968 XBell (display->display, 0);
1969
1954#endif 1970#endif
1955} 1971}
1956 1972
1957/* ------------------------------------------------------------------------- */ 1973/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1974/* ARGSUSED */
… …
2145 2161
2146#if ENABLE_OVERLAY 2162#if ENABLE_OVERLAY
2147 scr_swap_overlay (); 2163 scr_swap_overlay ();
2148#endif 2164#endif
2149 2165
2150 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2151 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2152
2153#ifndef NO_SLOW_LINK_SUPPORT 2166#ifndef NO_SLOW_LINK_SUPPORT
2154 /* 2167 /*
2155 * D: CopyArea pass - very useful for slower links 2168 * D: CopyArea pass - very useful for slower links
2156 * This has been deliberately kept simple. 2169 * This has been deliberately kept simple.
2157 */ 2170 */
… …
2292 2305
2293 // sometimes we optimize away the trailing NOCHAR's, add them back 2306 // sometimes we optimize away the trailing NOCHAR's, add them back
2294 while (i && text[count] == NOCHAR) 2307 while (i && text[count] == NOCHAR)
2295 count++, i--; 2308 count++, i--;
2296 2309
2297#if ENABLE_STYLES
2298 // force redraw after "careful" characters to avoid pixel droppings
2299 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2300 drp[col + 1] = ~srp[col + 1];
2301
2302 // include previous careful character(s) if possible, looks nicer (best effort...)
2303 while (text > stp
2304 && srp[text - stp - 1] & RS_Careful
2305 && RS_SAME (rend, srp[text - stp - 1]))
2306 text--, count++, xpixel -= TermWin.fwidth;
2307#endif
2308
2309 /* 2310 /*
2310 * Determine the attributes for the string 2311 * Determine the attributes for the string
2311 */ 2312 */
2312 int fore = GET_FGCOLOR (rend); // desired foreground 2313 int fore = GET_FGCOLOR (rend); // desired foreground
2313 int back = GET_BGCOLOR (rend); // desired background 2314 int back = GET_BGCOLOR (rend); // desired background
2314 2315
2315 // only do special processing if ana attributes are set, which is rare 2316 // only do special processing if any attributes are set, which is rare
2316 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) 2317 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2317 { 2318 {
2319#if ENABLE_STYLES
2320 // force redraw after "careful" characters to avoid pixel droppings
2321 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2322 drp[col + 1] = ~srp[col + 1];
2323
2324 // include previous careful character(s) if possible, looks nicer (best effort...)
2325 while (text > stp
2326 && srp[text - stp - 1] & RS_Careful
2327 && RS_SAME (rend, srp[text - stp - 1]))
2328 text--, count++, xpixel -= TermWin.fwidth;
2329#endif
2330
2318 bool invert = rend & RS_RVid; 2331 bool invert = rend & RS_RVid;
2319 2332
2320#ifndef NO_BOLD_UNDERLINE_REVERSE 2333#ifndef NO_BOLD_UNDERLINE_REVERSE
2321 if (rend & RS_Bold 2334 if (rend & RS_Bold
2322 && fore == Color_fg) 2335 && fore == Color_fg)
… …
2349 SWAP_IT (fore, back, int); 2362 SWAP_IT (fore, back, int);
2350 2363
2351#ifndef NO_BOLD_UNDERLINE_REVERSE 2364#ifndef NO_BOLD_UNDERLINE_REVERSE
2352 if (ISSET_PIXCOLOR (Color_RV)) 2365 if (ISSET_PIXCOLOR (Color_RV))
2353 back = Color_RV; 2366 back = Color_RV;
2367
2368 if (fore == back)
2369 {
2370 fore = Color_bg;
2371 back = Color_fg;
2372 }
2354#endif 2373#endif
2355 } 2374 }
2356 2375
2357#ifdef TEXT_BLINK 2376#ifdef TEXT_BLINK
2358 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2377 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
… …
2530 if (!TermWin.mapped) 2549 if (!TermWin.mapped)
2531 return; 2550 return;
2532 2551
2533 num_scr_allow = 0; 2552 num_scr_allow = 0;
2534 want_refresh = 1; 2553 want_refresh = 1;
2535
2536#if TRANSPARENT
2537 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2538 {
2539 int i;
2540
2541 if (!(options & Opt_transparent_all))
2542 i = 0;
2543 else
2544 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2545
2546 while (i--)
2547 if (TermWin.parent[i] != None)
2548 XClearWindow (display->display, TermWin.parent[i]);
2549 }
2550#endif
2551 2554
2552 if (really) 2555 if (really)
2553 XClearWindow (display->display, TermWin.vt); 2556 XClearWindow (display->display, TermWin.vt);
2554} 2557}
2555 2558

Diff Legend

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