From 0a0fa8cd31ffd677ff7d4d27941f927cb93c010a Mon Sep 17 00:00:00 2001
From: ben <ben@cda61777-01e9-0310-a592-d414129be87e>
Date: Mon, 9 Dec 2002 22:49:56 +0000
Subject: [PATCH] Update the non-Color Quickdraw code in pre_paint() to match
 recent changes to the Color Quickdraw code.  This makes redraw work properly
 on old Macs again.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2298 cda61777-01e9-0310-a592-d414129be87e
---
 mac/macterm.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mac/macterm.c b/mac/macterm.c
index 629d2543..4be59596 100644
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1,4 +1,4 @@
-/* $Id: macterm.c,v 1.20 2002/12/08 22:23:08 ben Exp $ */
+/* $Id: macterm.c,v 1.21 2002/12/09 22:49:56 ben Exp $ */
 /*
  * Copyright (c) 1999 Simon Tatham
  * Copyright (c) 1999, 2002 Ben Harris
@@ -1010,8 +1010,8 @@ void pre_paint(Session *s) {
     GDHandle gdh;
     Rect myrect, tmprect;
 
-    s->term->attr_mask = 0;
     if (HAVE_COLOR_QD()) {
+	s->term->attr_mask = 0;
 	SetPort(s->window);
 	myrect = (*s->window->visRgn)->rgnBBox;
 	LocalToGlobal((Point *)&myrect.top);
@@ -1025,7 +1025,8 @@ void pre_paint(Session *s) {
 		switch ((*(*gdh)->gdPMap)->pixelSize) {
 		  case 1:
 		    if (s->cfg.bold_colour)
-			s->term->attr_mask |= ~(ATTR_BOLD | ATTR_COLOURS);
+			s->term->attr_mask |= ~(ATTR_COLOURS |
+			    (s->cfg.bold_colour ? ATTR_BOLD : 0));
 		    break;
 		  case 2:
 		    s->term->attr_mask |= ~ATTR_COLOURS;
@@ -1037,7 +1038,7 @@ void pre_paint(Session *s) {
 	    }
 	}
     } else
-	s->term->attr_mask &= ~(ATTR_COLOURS |
+	s->term->attr_mask = ~(ATTR_COLOURS |
 			        (s->cfg.bold_colour ? ATTR_BOLD : 0));
 }
 
-- 
2.11.0