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.345 by sf-exg, Sat Jul 24 10:20:26 2010 UTC vs.
Revision 1.352 by root, Fri Oct 15 20:52:15 2010 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void 35static inline void
36fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
37{ 37{
38 while (len--) 38 while (len--)
… …
143 while (col > 0 && l.t[col] == NOCHAR) 143 while (col > 0 && l.t[col] == NOCHAR)
144 col--; 144 col--;
145 145
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
148 150
149 // found start, nuke 151 // found start, nuke
150 do { 152 do {
151 l.t[col] = ' '; 153 l.t[col] = ' ';
152 l.r[col] = rend; 154 l.r[col] = rend;
… …
898# else 900# else
899 c = 0xfffd; 901 c = 0xfffd;
900# endif 902# endif
901#endif 903#endif
902 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
903 // nuke the character at this position, if required 921 // nuke the character at this position, if required
904 if (expect_false ( 922 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR 923 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1 924 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR) 925 && line->t[screen.cur.col + 1] == NOCHAR)
908 )) 926 ))
909 scr_kill_char (*line, screen.cur.col); 927 scr_kill_char (*line, screen.cur.col);
910 928
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921
922 line->touch (); 929 line->touch ();
923 930
924 do 931 do
925 { 932 {
926 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
… …
931 else 938 else
932 { 939 {
933 line->l = ncol; 940 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 942 screen.flags |= Screen_WrapNext;
936 break; 943
944 goto end_of_line;
937 } 945 }
938 946
939 c = NOCHAR; 947 c = NOCHAR;
940 } 948 }
941 while (expect_false (--width > 0)); 949 while (expect_false (--width > 0));
942 950
943 // pad with spaces when overwriting wide character with smaller one 951 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 952 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
945 { 953 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 954 line->t[c] = ' ';
951 line->r[c] = rend; 955 line->r[c] = rend;
952 }
953 } 956 }
957
958end_of_line:
959 ;
954 } 960 }
955#if ENABLE_COMBINING 961#if ENABLE_COMBINING
956 else // width == 0 962 else // width == 0
957 { 963 {
958 if (c != 0xfeff) // ignore BOM 964 if (c != 0xfeff) // ignore BOM
… …
1021 1027
1022 want_refresh = 1; 1028 want_refresh = 1;
1023#endif 1029#endif
1024 } 1030 }
1025 } 1031 }
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1026 else 1034 else
1027 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
1028} 1036}
1029 1037
1030/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1337 return; 1345 return;
1338 1346
1339 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1340 1348
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1352 {
1348 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1349 1354
1350 if (mapped && !view_start) 1355 if (mapped)
1351 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1354 } 1359 }
1355 else 1360 else
1356 { 1361 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1363
1359 if (mapped && !view_start) 1364 if (mapped)
1360 { 1365 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1369 0, Row2Pixel (row - view_start),
… …
1371 1376
1372 for (; num--; row++) 1377 for (; num--; row++)
1373 { 1378 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1375 1380
1376 if (!view_start) 1381 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1383 }
1379} 1384}
1380 1385
1381#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1382void 1387void

Diff Legend

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