Changeset 26653c9 in mainline for uspace/lib/draw

Timestamp:

2020-10-22T09:50:18Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dcfd422

Parents:

70814b8e

git-author:

Jiri Svoboda <jiri@…> (2020-10-22 17:50:34)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-22 09:50:18)

Message:

Move fixed width font to its own library, libfbfont

We've actually three copies, one in kernel/, one in output server
(not used anymorei, removed), one in libdraw (now moved to separate library
libfbfont). So we are left with two copies, that could be coalesced
somehow in the future.

Location:

uspace/lib/draw

Files:

• font/embedded.c (modified) (1 diff)
• include/draw/gfx.h (modified) (1 diff)
• meson.build (modified) (2 diffs)

uspace/lib/draw/font/embedded.c

@@ -42 +42 @@
 #include <draw/font.h>
 #include <draw/drawctx.h>
+#include <fbfont/font-8x16.h>
 
 static errno_t fde_resolve_glyph(void *unused, const char32_t chr,

uspace/lib/draw/include/draw/gfx.h

@@ -53 +53 @@
 extern uint8_t cursor_mask[];
 
-extern uint16_t fb_font_glyph(const char32_t, bool *);
-extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
-
 #endif
 

uspace/lib/draw/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'softrend' , 'compress' ]
+deps = [ 'softrend' , 'compress', 'fbfont' ]
 src = files(
         'codec/tga.c',
@@ -36 +36 @@
         'font/bitmap_backend.c',
         'font/pcf.c',
-        'gfx/font-8x16.c',
         'gfx/cursor-11x18.c',
         'drawctx.c',