From 0dad59e82d77186d81063b409a7ea2cef15b0f40 Mon Sep 17 00:00:00 2001
From: Phil Jones <philj56@gmail.com>
Date: Thu, 23 Jun 2022 15:16:36 +0100
Subject: Combine Harfbuzz & Pango backends.

Tofi now uses Harfbuzz if a file is passed to --font-name, and Pango
otherwise.
---
 src/entry.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/entry.h')

diff --git a/src/entry.h b/src/entry.h
index f1187d3..1b8bfe4 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -1,11 +1,8 @@
 #ifndef ENTRY_H
 #define ENTRY_H
 
-#ifdef USE_PANGO
 #include "entry_backend/pango.h"
-#else
 #include "entry_backend/harfbuzz.h"
-#endif
 
 #include <cairo/cairo.h>
 #include <wchar.h>
@@ -21,7 +18,8 @@
 
 struct entry {
 	struct image image;
-	struct entry_backend backend;
+	struct entry_backend_harfbuzz harfbuzz;
+	struct entry_backend_pango pango;
 	struct {
 		cairo_surface_t *surface;
 		cairo_t *cr;
@@ -38,6 +36,7 @@ struct entry {
 	struct string_vec results;
 	struct string_vec commands;
 	struct history history;
+	bool use_pango;
 
 	/* Options */
 	bool horizontal;
-- 
cgit v1.2.3