Changeset 2bb6d04 in mainline for uspace/lib/draw/include/draw/font.h

Timestamp:

2019-06-25T14:58:16Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

aeba767

Parents:

cd9531d3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-13 12:14:16)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-25 14:58:16)

Message:

Curb the proliferation of libdraw headers

libdraw provides a lot of ambiguously named headers, which makes it
confusing. This change merges the subdirectories into single headers,
and moves all headers into draw subdirectory, so that it's obvious
at a glance what library the header belongs to.

Compare:

#include <path.h>
#include <source.h>
#include <font/bitmap_backend.h>
#include <font/pcf.h>

vs.

#include <draw/path.h>
#include <draw/source.h>
#include <draw/font.h>

File:

• uspace/lib/draw/include/draw/font.h (moved) (moved from uspace/lib/draw/font.h ) (3 diffs)

uspace/lib/draw/include/draw/font.h

@@ -40 +40 @@
 #include <stdint.h>
 
+#include "font.h"
 #include "surface.h"
 #include "source.h"
@@ -108 +109 @@
 } font_t;
 
+typedef struct {
+        errno_t (*resolve_glyph)(void *, const wchar_t, glyph_id_t *);
+        errno_t (*load_glyph_surface)(void *, glyph_id_t, surface_t **);
+        errno_t (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
+        void (*release)(void *);
+} bitmap_font_decoder_t;
+
 extern font_t *font_create(font_backend_t *, void *);
 extern errno_t font_get_metrics(font_t *, font_metrics_t *);
@@ -120 +128 @@
     sysarg_t, sysarg_t);
 
+extern errno_t bitmap_font_create(bitmap_font_decoder_t *, void *, uint32_t,
+    font_metrics_t, uint16_t, font_t **);
+extern errno_t embedded_font_create(font_t **, uint16_t points);
+extern errno_t pcf_font_create(font_t **, char *path, uint16_t points);
+
 #endif