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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.21 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.24 by pcg, Sat Jan 31 04:12:10 2004 UTC

  * the top of the screen
  */
 int
 rxvt_term::scr_move_to (int y, int len)
 {
-    long            p = 0;
+    long p = 0;
-    uint16_t       oldviewstart;
+    uint16_t oldviewstart;
     oldviewstart = TermWin.view_start;
     if (y < len) {
         p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
         p -= (long)(TermWin.nrow - 1);
       {
         clearfirst = clearlast = 1;
         refresh_type &= ~REFRESH_BOUNDS;
       }
-#if defined(XPM_BACKGROUND)
+#ifdef XPM_BACKGROUND
     must_clear |= (bgPixmap.pixmap != None);
 #endif
-#if defined(TRANSPARENT)
+#ifdef TRANSPARENT
     must_clear |= ((Options & Opt_transparent) && am_transparent);
 #endif
     ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
     /*
             int back = GET_BGCOLOR (rend); // desired background
             rend = GET_ATTR (rend);
             rvid = !!(rend & RS_RVid);
+            if (rvid)
+              {
+                SWAP_IT(fore, back, int);
+#ifndef NO_BOLD_UNDERLINE_REVERSE
+                if (ISSET_PIXCOLOR (Color_RV)
+# ifndef NO_CURSORCOLOR
+                    && !ISSET_PIXCOLOR (Color_cursor)
+# endif
+                    )
+                  back = Color_RV;
+#endif
+              }
 #ifdef TEXT_BLINK
             if (rend & RS_Blink)
               {
                 if (!text_blink_ev.active)
                   {
                   }
                 else if (hidden_text)
                   fore = back;
               }
 #endif
-            if (rvid)
-              {
-                SWAP_IT(fore, back, int);
-#ifndef NO_BOLD_UNDERLINE_REVERSE
-                if (ISSET_PIXCOLOR (Color_RV)
-# ifndef NO_CURSORCOLOR
-                    && !ISSET_PIXCOLOR (Color_cursor)
-# endif
-                    )
-                  back = Color_RV;
-#endif
-              }
 #ifndef NO_BOLD_UNDERLINE_REVERSE
             else if (rend & RS_Bold)
               {
                 if (ISSET_PIXCOLOR (Color_BD))
                   fore = Color_BD;
             /*
              * Actually do the drawing of the string here
              */
             rxvt_font *font = (*TermWin.fontset)[fid];
+            if (back == fore)
+              font->clear_rect (xpixel, ypixel,
+                                TermWin.fwidth * count, TermWin.fheight,
+                                back);
-            if (back == Color_bg)
+            else if (back == Color_bg)
               {
                 if (must_clear)
                   {
+                    CLEAR_CHARS (xpixel, ypixel, count);
                     for (i = 0; i < count; i++) /* don't draw empty strings */
                       if (text[i] != ' ')
                         {
                           font->draw (xpixel, ypixel, text, count, fore, -1);
-                          goto nodraw;
+                          break;
                         }
-                    CLEAR_CHARS (xpixel, ypixel, count);
-nodraw: ;
                   }
                 else
                   font->draw (xpixel, ypixel, text, count, fore, Color_bg);
               }
             else

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.21 by pcg, Sat Jan 31 00:20:21 2004 UTC vs. Revision 1.24 by pcg, Sat Jan 31 04:12:10 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.21 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.24 by pcg, Sat Jan 31 04:12:10 2004 UTC