From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 27 Oct 2006 22:37:48 +0000 (+0000)
Subject: (x_draw_glyph_string_foreground): Set background mode to TRANSPARENT before
X-Git-Tag: emacs-pretest-22.0.91~496
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4975e69596a64247e8995d1ff9084b98a9a5ed0d;p=emacs.git

(x_draw_glyph_string_foreground): Set background mode to TRANSPARENT before
using overstrike to simulate bold faces.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d4f67a927de..4118fc6f2d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,15 @@
+2006-10-27  Ben North  <ben@redfrontdoor.org>  (tiny change)
+
+	* w32term.c (x_draw_glyph_string_foreground): Set background mode
+	to TRANSPARENT before using overstrike to simulate bold faces.
+
+	* xfaces.c (best_matching_font): Fix logic to decide whether to
+	use overstriking to simulate bold-face (it was reversed).
+
 2006-10-23  Kim F. Storm  <storm@cua.dk>
 
-	* xdisp.c (remember_mouse_glyph): Do nothing if glyphs are not initialized.
+	* xdisp.c (remember_mouse_glyph): Do nothing if glyphs are not
+	initialized.
 
 	* keyboard.c (read_char): Make an element (t . EVENT) in
 	unread-command-events add EVENT to the current command's key sequence.
@@ -113,8 +122,8 @@
 	(x_draw_glyph_string_foreground): Use overstrike when needed.
 	(x_draw_composite_glyph_string_foreground): Likewise.
 	Use mac_draw_image_string_16 instead of mac_draw_string_16.
-	(mac_load_query_font): Rename from XLoadQueryFont.  Take argument F
-	instead of DPY.  All uses changed.  Don't save/restore font.
+	(mac_load_query_font): Rename from XLoadQueryFont.  Take argument
+	F instead of DPY.  All uses changed.  Don't save/restore font.
 
 2006-10-07  Ralf Angeli  <angeli@caeruleus.net>
 
@@ -157,7 +166,7 @@
 
 2006-09-30  Eli Zaretskii  <eliz@gnu.org>
 
-	* config.in Regenerated.
+	* config.in: Regenerated.
 
 2006-09-29  Juri Linkov  <juri@jurta.org>
 
diff --git a/src/w32term.c b/src/w32term.c
index c00fdb8923c..e22a9dbe1ab 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1591,7 +1591,10 @@ x_draw_glyph_string_foreground (s)
 	{
 	  /* For overstriking (to simulate bold-face), draw the
 	     characters again shifted to the right by one pixel.  */
+	  int old_BkMode = SetBkMode (s->hdc, TRANSPARENT);
 	  w32_text_out (s, x + 1, s->ybase - boff, s->char2b, s->nchars);
+	  if (old_BkMode && old_BkMode != TRANSPARENT)
+	    SetBkMode (s->hdc, old_BkMode);
 	}
     }
   if (s->font && s->font->hfont)