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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.335 by root, Tue Mar 30 23:00:35 2010 UTC vs.
Revision 1.343 by sf-exg, Thu Jul 1 21:52:52 2010 UTC

 #include <inttypes.h>
 #include "salloc.C" // HACK, should be a seperate compile!
+static inline void
-static inline void fill_text (text_t *start, text_t value, int len)
+fill_text (text_t *start, text_t value, int len)
 {
   while (len--)
     *start++ = value;
 }
   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_RVid | RS_Uline))
+  if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
     ren = (rend_t) ~RS_None;
   else if (GET_BASEBG (rstyle) == Color_bg)
     {
       ren = DEFAULT_RSTYLE;
           ccol2 = bgcolor_of (rstyle);
 #else
           ccol2 = Color_bg;
 #endif
-        if (showcursor && focus)
+        if (focus)
           {
             if (option (Opt_cursorUnderline))
               *crp ^= RS_Uline;
             else
               {
           // seek to the beginning of wide characters
           while (expect_false (stp[col] == NOCHAR && col > 0))
             --col;
-          rend_t rend = srp[col];     /* screen rendition (target rendtion) */
+          rend_t rend = srp[col];     /* screen rendition (target rendition) */
           text_t *text = stp + col;
           int count = 1;
           dtp[col] = stp[col];
           drp[col] = rend;
            */
           int fore = fgcolor_of (rend); // desired foreground
           int back = bgcolor_of (rend); // desired background
           // only do special processing if any attributes are set, which is unlikely
-          if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
+          if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
             {
               bool invert = rend & RS_RVid;
 #ifndef NO_BOLD_UNDERLINE_REVERSE
               if (rend & RS_Bold && fore == Color_fg)
               if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
                 fore = Color_UL;
 #endif
+#ifdef OPTION_HC
+              if (rend & RS_Sel)
+                {
+                  /* invert the column if no highlightColor is set or it is the
+                   * current cursor column */
+                  if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
+                      && ISSET_PIXCOLOR (Color_HC))
+                    {
+                      if (ISSET_PIXCOLOR (Color_HTC))
+                        fore = Color_HTC;
+                      // if invert is 0 reverse video is set so we use bg color as fg color
+                      else if (!invert)
+                        fore = back;
+                      back = Color_HC;
+                      invert = 0;
+                    }
+                }
+#endif
               if (invert)
                 {
-#ifdef OPTION_HC
-                  if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
-                      || !ISSET_PIXCOLOR (Color_HC))
-#endif
-                    /* invert the column if no highlightColor is set or it is the
-                     * current cursor column */
                     ::swap (fore, back);
-#ifdef OPTION_HC
-                  else if (ISSET_PIXCOLOR (Color_HC))
-                    back = Color_HC;
-#endif
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-# ifndef OPTION_HC
-                  if (ISSET_PIXCOLOR (Color_RV))
-                    back = Color_RV;
-# endif
                   if (fore == back)
                     {
                       fore = Color_bg;
                       back = Color_fg;
                     }
             }
           /*
            * Actually do the drawing of the string here
            */
-          rxvt_font *font = fontset [GET_STYLE (rend)]->get (*text, GET_FONT (rend));
+          rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
           if (expect_true (have_bg && back == Color_bg))
             {
               // this is very ugly, maybe push it into ->draw?
     {
 #if !ENABLE_MINIMAL
       if (selection.rect)
         scr_xor_rect (selection.beg.row, selection.beg.col,
                       selection.end.row, selection.end.col,
-                      RS_RVid, RS_RVid | RS_Uline);
+                      RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
       else
 #endif
         scr_xor_span (selection.beg.row, selection.beg.col,
                       selection.end.row, selection.end.col,
-                      RS_RVid);
+                      RS_Sel | RS_RVid);
     }
 }
 /* ------------------------------------------------------------------------- */
 /*
       selection_wait = Sel_normal;
 #if X_HAVE_UTF8_STRING
       selection_type = Sel_UTF8String;
       if (selection_request_other (xa[XA_UTF8_STRING], selnum))
-	return;
+        return;
 #else
       selection_type = Sel_CompoundText;
       if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
-	return;
+        return;
 #endif
     }
   selection_wait = Sel_none;       /* don't loop in selection_paste () */
   selection_paste (display->root, XA_CUT_BUFFER0, false);

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.335 by root, Tue Mar 30 23:00:35 2010 UTC vs. Revision 1.343 by sf-exg, Thu Jul 1 21:52:52 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.335 by root, Tue Mar 30 23:00:35 2010 UTC vs.
Revision 1.343 by sf-exg, Thu Jul 1 21:52:52 2010 UTC