Changeset 26653c9 in mainline for uspace/lib/fbfont

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/fbfont

Files:

• doc/doxygroups.h (added)
• include/fbfont/font-8x16.h (moved) (moved from uspace/srv/hid/output/gfx/font-8x16.h ) (2 diffs)
• meson.build (added)
• src/font-8x16.c (moved) (moved from uspace/lib/draw/gfx/font-8x16.c ) (2 diffs)

uspace/lib/fbfont/include/fbfont/font-8x16.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
  *
@@ -36 +37 @@
 #define FONT_8X16_H_
 
-#include <sys/types.h>
+#include <stdint.h>
+#include <str.h>
 
 #define FONT_GLYPHS     2899
 #define FONT_WIDTH      8
 #define FONT_SCANLINES  16
+#define FONT_ASCENDER   12
 
-extern uint16_t fb_font_glyph(const char32_t);
+extern uint16_t fb_font_glyph(const char32_t, bool *);
 extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
 

uspace/lib/fbfont/src/font-8x16.c

@@ -28 +28 @@
  */
 
-/** @addtogroup draw
+/** @addtogroup libfbfont
  * @{
  */
@@ -35 +35 @@
 
 #include <stdint.h>
-#include <draw/gfx.h>
+#include <str.h>
+#include "../include/fbfont/font-8x16.h"
 
 /** Convert character to font glyph index