[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/ns/testing 32fbd55 3/6: Fix macfont backend color handling
From: |
Alan Third |
Subject: |
scratch/ns/testing 32fbd55 3/6: Fix macfont backend color handling |
Date: |
Tue, 31 Aug 2021 15:51:14 -0400 (EDT) |
branch: scratch/ns/testing
commit 32fbd5530d93cbd93315217de79028b356314b11
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Fix macfont backend color handling
* src/macfont.m (get_cgcolor): Replace use of ns_lookup_indexed_color.
(CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND):
(CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND):
(CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND): Fix call to get_cgcolor
and fix all callers.
---
src/macfont.m | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/macfont.m b/src/macfont.m
index d86f09f..c046550 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -598,9 +598,9 @@ mac_screen_font_shape (ScreenFontRef font, CFStringRef
string,
}
static CGColorRef
-get_cgcolor(unsigned long idx, struct frame *f)
+get_cgcolor(unsigned long color)
{
- NSColor *nsColor = ns_lookup_indexed_color (idx, f);
+ NSColor *nsColor = [NSColor colorWithUnsignedLong:color];
[nsColor set];
CGColorSpaceRef colorSpace = [[nsColor colorSpace] CGColorSpace];
NSInteger noc = [nsColor numberOfComponents];
@@ -613,21 +613,21 @@ get_cgcolor(unsigned long idx, struct frame *f)
return cgColor;
}
-#define CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND(context, face, f) \
+#define CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND(context, face) \
do { \
- CGColorRef refcol_ = get_cgcolor (NS_FACE_FOREGROUND (face), f); \
+ CGColorRef refcol_ = get_cgcolor (NS_FACE_FOREGROUND (face)); \
CGContextSetFillColorWithColor (context, refcol_) ; \
CGColorRelease (refcol_); \
} while (0)
-#define CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND(context, face, f) \
+#define CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND(context, face) \
do { \
- CGColorRef refcol_ = get_cgcolor (NS_FACE_BACKGROUND (face), f); \
+ CGColorRef refcol_ = get_cgcolor (NS_FACE_BACKGROUND (face)); \
CGContextSetFillColorWithColor (context, refcol_); \
CGColorRelease (refcol_); \
} while (0)
-#define CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND(context, face, f) \
+#define CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND(context, face) \
do { \
- CGColorRef refcol_ = get_cgcolor (NS_FACE_FOREGROUND (face), f); \
+ CGColorRef refcol_ = get_cgcolor (NS_FACE_FOREGROUND (face)); \
CGContextSetStrokeColorWithColor (context, refcol_); \
CGColorRelease (refcol_); \
} while (0)
@@ -2914,7 +2914,7 @@ macfont_draw (struct glyph_string *s, int from, int to,
int x, int y,
if (!face)
face = FACE_FROM_ID (s->f, MOUSE_FACE_ID);
}
- CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND (context, face, f);
+ CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND (context, face);
CGContextFillRects (context, &background_rect, 1);
}
@@ -2923,7 +2923,7 @@ macfont_draw (struct glyph_string *s, int from, int to,
int x, int y,
CGAffineTransform atfm;
CGContextScaleCTM (context, 1, -1);
- CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND (context, face, s->f);
+ CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND (context, face);
if (macfont_info->synthetic_italic_p)
atfm = synthetic_italic_atfm;
else
@@ -2952,7 +2952,7 @@ macfont_draw (struct glyph_string *s, int from, int to,
int x, int y,
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
CGContextSetLineWidth (context, synthetic_bold_factor * font_size);
#endif
- CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND (context, face, f);
+ CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND (context, face);
}
if (no_antialias_p)
CGContextSetShouldAntialias (context, false);
- branch scratch/ns/testing created (now e66bb00), Alan Third, 2021/08/31
- scratch/ns/testing 32fbd55 3/6: Fix macfont backend color handling,
Alan Third <=
- scratch/ns/testing e66bb00 6/6: Allow resizing undecorated frames on macOS (bug#28512, bug#31795), Alan Third, 2021/08/31
- scratch/ns/testing f7ada2d 2/6: Further cleanup of NS color code, Alan Third, 2021/08/31
- scratch/ns/testing 4ef7ac1 4/6: Make NS toolbar use NSString instead of C strings, Alan Third, 2021/08/31
- scratch/ns/testing e8bd0b7 5/6: Make NS toolbar item ID more unique (bug#50160), Alan Third, 2021/08/31
- scratch/ns/testing 9ba21bc 1/6: Simplify NS color handling, Alan Third, 2021/08/31