Changeset 2cc1ec0 in mainline for uspace/lib/draw/gfx

Timestamp:

2014-08-27T21:23:01Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

a9763c6

Parents:

613d644

Message:

Refactor drawing of fonts into multiple layers.

This will need further work to split glyph resolution
process to separate functions in order to support ligatures,
addition of kerning support, separate text layout functions,
etc.

Location:

uspace/lib/draw/gfx

Files:

• font-8x16.c (modified) (2 diffs)
• font-8x16.h (modified) (1 diff)

uspace/lib/draw/gfx/font-8x16.c

@@ -44 +44 @@
  * mark glyph if no specific glyph exists.
  *
+ * If found is not null, indicate whether the glyph was found or not.
+ *
  */
-uint16_t fb_font_glyph(const wchar_t ch)
+uint16_t fb_font_glyph(const wchar_t ch, bool *found)
 {
+        if (found)
+                *found = true;
+        
         if (ch == 0x0000)
                 return 0;
@@ -361 +366 @@
         if (ch == 0xfeff)
                 return 2896;
+        
+        if (found)
+                *found = false;
         
         return 2898;

uspace/lib/draw/gfx/font-8x16.h

@@ -37 +37 @@
 
 #include <sys/types.h>
+#include <stdbool.h>
 
 #define FONT_GLYPHS     2899
 #define FONT_WIDTH      8
 #define FONT_SCANLINES  16
+#define FONT_ASCENDER   12
 
-extern uint16_t fb_font_glyph(const wchar_t);
+extern uint16_t fb_font_glyph(const wchar_t, bool *);
 extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];