[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 308ad05 3/7: Fix macfont backend color handling
From: |
Alan Third |
Subject: |
master 308ad05 3/7: Fix macfont backend color handling |
Date: |
Wed, 22 Dec 2021 15:49:23 -0500 (EST) |
branch: master
commit 308ad05d37a2d230c65a8799e193e25f4f8ba540
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 ce7a5ec..3f87c1b 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];
@@ -628,21 +628,21 @@ get_cgcolor_from_nscolor (NSColor *nsColor, 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)
@@ -2933,7 +2933,7 @@ macfont_draw (struct glyph_string *s, int from, int to,
int x, int y,
CGColorRelease (colorref);
}
else
- CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND (context, face, f);
+ CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND (context, face);
CGContextFillRects (context, &background_rect, 1);
}
@@ -2949,7 +2949,7 @@ macfont_draw (struct glyph_string *s, int from, int to,
int x, int y,
CGColorRelease (colorref);
}
else
- 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
@@ -2978,7 +2978,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);
- master updated (5b0121b -> ec1312d), Alan Third, 2021/12/22
- master 0f427be 1/7: Simplify NS color handling, Alan Third, 2021/12/22
- master 89749a6 5/7: Make NS toolbar item ID more unique (bug#50160), Alan Third, 2021/12/22
- master 11c0b25 2/7: Further cleanup of NS color code, Alan Third, 2021/12/22
- master 42601d3 4/7: Make NS toolbar use NSString instead of C strings, Alan Third, 2021/12/22
- master ec1312d 7/7: Add native HEIC support on macOS (bug#51381), Alan Third, 2021/12/22
- master ab0d7a2 6/7: Allow resizing undecorated frames on macOS (bug#28512, bug#31795), Alan Third, 2021/12/22
- master 308ad05 3/7: Fix macfont backend color handling,
Alan Third <=