Changeset 7e38970d in mainline for uspace/lib/fbfont/include/fbfont/font-8x16.h

Timestamp:

2020-12-07T00:08:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jxsvoboda-gfx' into master

File:

• uspace/lib/fbfont/include/fbfont/font-8x16.h (moved) (moved from uspace/srv/hid/output/gfx/font-8x16.h ) (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];