From: Johan Malm <jgm323@gmail.com>
Date: Wed, 23 Apr 2025 19:03:14 +0000 (+0100)
Subject: font: use PangoStyle enum
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=58d22d05e22745a626ab1ec66aa1cb8802d12812;p=proto%2Flabwc.git

font: use PangoStyle enum
---

diff --git a/include/common/font.h b/include/common/font.h
index c728d484..17d1181e 100644
--- a/include/common/font.h
+++ b/include/common/font.h
@@ -5,16 +5,10 @@
 
 struct lab_data_buffer;
 
-enum font_slant {
-	FONT_SLANT_NORMAL = 0,
-	FONT_SLANT_ITALIC,
-	FONT_SLANT_OBLIQUE
-};
-
 struct font {
 	char *name;
 	int size;
-	enum font_slant slant;
+	PangoStyle slant;
 	PangoWeight weight;
 };
 
diff --git a/src/common/font.c b/src/common/font.c
index 5616c61b..d2173467 100644
--- a/src/common/font.c
+++ b/src/common/font.c
@@ -17,12 +17,7 @@ font_to_pango_desc(struct font *font)
 	PangoFontDescription *desc = pango_font_description_new();
 	pango_font_description_set_family(desc, font->name);
 	pango_font_description_set_size(desc, font->size * PANGO_SCALE);
-	if (font->slant == FONT_SLANT_ITALIC) {
-		pango_font_description_set_style(desc, PANGO_STYLE_ITALIC);
-	}
-	if (font->slant == FONT_SLANT_OBLIQUE) {
-		pango_font_description_set_style(desc, PANGO_STYLE_OBLIQUE);
-	}
+	pango_font_description_set_style(desc, font->slant);
 	pango_font_description_set_weight(desc, font->weight);
 	return desc;
 }
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 1c72744a..96ba6e27 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -855,11 +855,11 @@ set_font_attr(struct font *font, const char *nodename, const char *content)
 		font->size = atoi(content);
 	} else if (!strcmp(nodename, "slant")) {
 		if (!strcasecmp(content, "italic")) {
-			font->slant = FONT_SLANT_ITALIC;
+			font->slant = PANGO_STYLE_ITALIC;
 		} else if (!strcasecmp(content, "oblique")) {
-			font->slant = FONT_SLANT_OBLIQUE;
+			font->slant = PANGO_STYLE_OBLIQUE;
 		} else {
-			font->slant = FONT_SLANT_NORMAL;
+			font->slant = PANGO_STYLE_NORMAL;
 		}
 	} else if (!strcmp(nodename, "weight")) {
 		if (!strcasecmp(content, "thin")) {
@@ -1474,7 +1474,7 @@ static void
 init_font_defaults(struct font *font)
 {
 	font->size = 10;
-	font->slant = FONT_SLANT_NORMAL;
+	font->slant = PANGO_STYLE_NORMAL;
 	font->weight = PANGO_WEIGHT_NORMAL;
 }