Partially implement libfonts_get_default_font, libfonts_get_{default,output}_rendering_settings

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 22 insertions, 13 deletions

diff --git a/common.h b/common.h
index 99298f1..082f806 100644
--- a/common.h
+++ b/common.h
@@ -2,6 +2,7 @@
 #include "libfonts.h"
 #include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <pwd.h>
@@ -11,22 +12,23 @@
 #include <string.h>
 #include <strings.h>
 
+
 #define DOUBLE_TOLERANCE 0.000001
 
 #define LIST_RENDERING_SETTINGS(X, _)\
-	X("dpi-x", dpi_x, 96) _\
-	X("dpi-y", dpi_y, 96) _\
-	X("ref-width", reference_width, 0) _\
-	X("ref-height", reference_height, 0) _\
-	X("subpixel-order", subpixel_order, LIBFONTS_SUBPIXEL_ORDER_UNKNOWN) _\
-	X("greyscale-min", min_dpsqi_for_greyscale, 0) _\
-	X("subpixel-min", min_dpsqi_for_subpixel, 0) _\
-	X("h-grey-text-aa", horizontal_grey_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE) _\
-	X("v-grey-text-aa", vertical_grey_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE) _\
-	X("d-grey-text-aa", diagonal_grey_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE) _\
-	X("h-coloured-text-aa", horizontal_colour_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE) _\
-	X("v-coloured-text-aa", vertical_colour_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE) _\
-	X("d-coloured-text-aa", diagonal_colour_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE)
+	X(0, "dpi-x", dpi_x, 96, libfonts_parse_double__) _\
+	X(1, "dpi-y", dpi_y, 96, libfonts_parse_double__) _\
+	X(2, "ref-width", reference_width, 0, libfonts_parse_uint32__) _\
+	X(3, "ref-height", reference_height, 0, libfonts_parse_uint32__) _\
+	X(4, "subpixel-order", subpixel_order, LIBFONTS_SUBPIXEL_ORDER_UNKNOWN, libfonts_parse_order__) _\
+	X(5, "greyscale-min", min_dpsqi_for_greyscale, 0, libfonts_parse_double__) _\
+	X(6, "subpixel-min", min_dpsqi_for_subpixel, 0, libfonts_parse_double__) _\
+	X(7, "h-grey-text-aa", horizontal_grey_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE, libfonts_parse_aa__) _\
+	X(8, "v-grey-text-aa", vertical_grey_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE, libfonts_parse_aa__) _\
+	X(9, "d-grey-text-aa", diagonal_grey_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE, libfonts_parse_aa__) _\
+	X(10, "h-coloured-text-aa", horizontal_colour_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE, libfonts_parse_aa__) _\
+	X(11, "v-coloured-text-aa", vertical_colour_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE, libfonts_parse_aa__) _\
+	X(12, "d-coloured-text-aa", diagonal_colour_text_antialiasing, LIBFONTS_ANTIALIASING_GREYSCALE, libfonts_parse_aa__)
 
 
 static inline void
@@ -50,6 +52,13 @@ eq(double a, double b)
 
 const char *libfonts_getenv__(const char *name, struct libfonts_context *ctx);
 char *libfonts_gethome__(struct libfonts_context *ctx);
+ssize_t libfonts_getline__(int fd, char **linep, char **bufp, size_t *sizep, size_t *offp, size_t *availp);
+char *libfonts_confsplit__(char *line);
+
+int libfonts_parse_double__(double *outp, const char *value);
+int libfonts_parse_uint32__(uint32_t *outp, const char *value);
+int libfonts_parse_order__(enum libfonts_subpixel_order *outp, const char *value);
+int libfonts_parse_aa__(enum libfonts_antialiasing *outp, const char *value);
 
 
 #ifdef TEST