[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

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.350 by root, Thu Oct 14 23:21:40 2010 UTC

 #include "rxvt.h"               /* NECESSARY */
 #include "rxvtperl.h"           /* NECESSARY */
 #include <inttypes.h>
-#include "salloc.C" // HACK, should be a seperate compile!
+#include "salloc.C" // HACK, should be a separate compile!
 static inline void
 fill_text (text_t *start, text_t value, int len)
 {
   while (len--)
           rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
           // if the character doesn't fit into the remaining columns...
           if (expect_false (screen.cur.col > ncol - width && ncol >= width))
             {
+              if (screen.flags & Screen_Autowrap)
+                {
-              // ... artificially enlargen the previous one
+                  // ... artificially enlargen the previous one
-              c = NOCHAR;
+                  c = NOCHAR;
-              // and try the same character next loop iteration
+                  // and try the same character next loop iteration
-              --str;
+                  --str;
+                }
+              else
+                screen.cur.col = ncol - width;
             }
           line->touch ();
           do
           want_refresh = 1;
 #endif
         }
     }
+  else if (screen.flags & Screen_WrapNext)
+    screen.flags &= ~Screen_WrapNext;
   else
     scr_gotorc (0, -1, RELATIVE);
 }
 /* ------------------------------------------------------------------------- */
   if (row >= nrow) /* Out Of Bounds */
     return;
   min_it (num, nrow - row);
-  // TODO: the code below does not work when view_start != 0
-  // the workaround is to disable the clear and use a normal refresh
-  // when view_start != 0. mysterious.
   if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
     ren = (rend_t) ~RS_None;
   else if (GET_BASEBG (rstyle) == Color_bg)
     {
       ren = DEFAULT_RSTYLE;
-      if (mapped && !view_start)
+      if (mapped)
         XClearArea (dpy, vt, 0,
                     Row2Pixel (row - view_start), (unsigned int)width,
                     (unsigned int)Height2Pixel (num), False);
     }
   else
     {
       ren = rstyle & (RS_fgMask | RS_bgMask);
-      if (mapped && !view_start)
+      if (mapped)
         {
           gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
           XChangeGC (dpy, gc, GCForeground, &gcvalue);
           XFillRectangle (dpy, vt, gc,
                           0, Row2Pixel (row - view_start),
   for (; num--; row++)
     {
       scr_blank_screen_mem (ROW(row), rstyle);
-      if (!view_start)
+      if (row - view_start < nrow)
-        scr_blank_line (drawn_buf [row], 0, ncol, ren);
+        scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
     }
 }
 #if !ENABLE_MINIMAL
 void

Diff Legend

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

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.350 by root, Thu Oct 14 23:21:40 2010 UTC

Diff Legend

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.350 by root, Thu Oct 14 23:21:40 2010 UTC