*** empty log message ***

diff --git a/Changes b/Changes
index 0a7895e5c34acd88851ee14de3e306aab9a2b326..f71e30ec167233013fdcf2e9cac818c2bcc54a51 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,10 @@
-1.7
+1.7  Fri Jan 30 16:50:11 CET 2004
+       - further cleanups.
+        - never do last-minute-changes: restore ability to have
+          color + bold ass high-intensity, and let the selection
+          use reverse video, not _blink_.
+        - remove OPTION_HC, at least temporarily. If you want it back,
+          please drop me a note.
 
 1.6  Fri Jan 30 00:34:01 CET 2004
        - cleanups, minor bugfixes.

diff --git a/src/feature.h b/src/feature.h
index a883cdaea0f4a40e44b195feb190e66442ccf67f..43874af1442440e2f5749001b376e79830cc5a58 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -71,11 +71,6 @@
  */
 #define NO_PIXEL_DROPPING_AVOIDANCE
 
-/*
- * Add support for '-hc colour' for background highlight of selection
- */
-#define OPTION_HC
-
 /*
  * Define maximum possible columns and rows
  */

diff --git a/src/rxvt.h b/src/rxvt.h
index 0b557f5a59c2706fa19ec19c5ee10b26c0b49928..15d6d4b7b8889abd08eba24898426c03cc5d663a 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -900,7 +900,6 @@ struct rxvt_term : rxvt_vars {
                   last_top,   /* scrollbar last top position               */
                   last_state, /* scrollbar last state                      */
                   scrollbar_len,
-                  currmaxcol,
 #ifdef MENUBAR
                   menu_readonly,      /* okay to alter menu? */
                   Arrows_x,
@@ -1040,7 +1039,6 @@ struct rxvt_term : rxvt_vars {
   char           *env_display;        /* environmental variable DISPLAY  */
   char           *env_term;           /* environmental variable TERM     */
   char           *env_colorfgbg;
-  char           *buffer;
   char           *locale;
   char           *codeset;
   char            charsets[4];

diff --git a/src/screen.C b/src/screen.C
index be162fd862916bef810980deaa28bdfd6063bbaa..1a59dd4bb86ed2919bae2ef3cee79234ad9af0dc 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -1896,13 +1896,6 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
      */
     clearfirst = clearlast = must_clear = 0;
 
-    if (currmaxcol < TermWin.ncol)
-      {
-        currmaxcol = TermWin.ncol;
-        buffer = (char *)rxvt_realloc (buffer,
-                                          sizeof(char) * (currmaxcol + 1) * MB_CUR_MAX);
-      }
-
     refresh_count = 0;
 
     row_offset = TermWin.saveLines - TermWin.view_start;
@@ -1955,7 +1948,7 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
               *srp ^= RS_RVid;
 #ifndef NO_CURSORCOLOR
               cc1 = *srp & (RS_fgMask | RS_bgMask);
-              if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor))
+              if (ISSET_PIXCOLOR (this, Color_cursor))
                   ccol1 = Color_cursor;
               else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
@@ -1963,7 +1956,7 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
 #else
                   ccol1 = Color_fg;
 #endif
-              if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor2))
+              if (ISSET_PIXCOLOR (this, Color_cursor2))
                   ccol2 = Color_cursor2;
               else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
@@ -2170,21 +2163,13 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
                 else if (hidden_text)
                   fore = back;
               }
-#elif OPTION_HC
-            if (!rvid && (rend & RS_Blink))
-              {
-                if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
-                  back = Color_HC;
-                else
-                  rvid = !rvid; /* fall back */
-              }
 #endif
             if (rvid)
               {
                 SWAP_IT(fore, back, int);
 
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-                if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_RV)
+                if (ISSET_PIXCOLOR (this, Color_RV)
 # ifndef NO_CURSORCOLOR
                     && !ISSET_PIXCOLOR (this, Color_cursor)
 # endif
@@ -2195,15 +2180,14 @@ rxvt_term::scr_refresh (unsigned char refresh_type)
 #ifndef NO_BOLD_UNDERLINE_REVERSE
             else if (rend & RS_Bold)
               {
-                if (Xdepth > 2)
-                  if (ISSET_PIXCOLOR (this, Color_BD))
-                    fore = Color_BD;
-                  else
-                    fore = Color_White;
+                if (ISSET_PIXCOLOR (this, Color_BD))
+                  fore = Color_BD;
+                else if (fore == Color_fg)
+                  fore = Color_White;
               }
             else if (rend & RS_Uline)
               {
-                if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
+                if (ISSET_PIXCOLOR (this, Color_UL))
                   fore = Color_UL;
               }
 #endif
@@ -2255,7 +2239,7 @@ nodraw: ;
 #ifndef NO_CURSORCOLOR
             unsigned long   gcmask;     /* Graphics Context mask */
 
-            if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor))
+            if (ISSET_PIXCOLOR (this, Color_cursor))
               XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
 #endif
             XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
@@ -2348,18 +2332,10 @@ rxvt_scr_reverse_selection(pR)
         end_row += R->TermWin.nrow;
         for (; i < row && i < end_row; i++, col = 0)
             for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++)
-#ifndef OPTION_HC
                 srp[col] ^= RS_RVid;
-#else
-                srp[col] ^= RS_Blink;
-#endif
         if (i == row && i < end_row)
             for (srp = R->screen.rend[i]; col < R->selection.end.col; col++)
-#ifndef OPTION_HC
                 srp[col] ^= RS_RVid;
-#else
-                srp[col] ^= RS_Blink;
-#endif
     }
 }