Changeset 26653c9 in mainline


Ignore:
Timestamp:
2020-10-22T09:50:18Z (4 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
Files:
2 added
1 deleted
8 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/app/terminal/meson.build

    r70814b8e r26653c9  
    2727#
    2828
    29 deps = [ 'draw', 'gfx', 'ipcgfx', 'display' ]
     29deps = [ 'fbfont', 'display', 'ui' ]
    3030src = files(
    3131        'main.c',

  • uspace/app/terminal/terminal.c

    r70814b8e r26653c9  
    3737#include <adt/list.h>
    3838#include <adt/prodcons.h>
    39 #include <draw/gfx.h>
    4039#include <errno.h>
     40#include <fbfont/font-8x16.h>
    4141#include <io/chargrid.h>
    4242#include <gfx/bitmap.h>

  • uspace/lib/draw/font/embedded.c

    r70814b8e r26653c9  
    4242#include <draw/font.h>
    4343#include <draw/drawctx.h>
     44#include <fbfont/font-8x16.h>
    4445
    4546static errno_t fde_resolve_glyph(void *unused, const char32_t chr,

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

    r70814b8e r26653c9  
    5353extern uint8_t cursor_mask[];
    5454
    55 extern uint16_t fb_font_glyph(const char32_t, bool *);
    56 extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
    57 
    5855#endif
    5956

  • uspace/lib/draw/meson.build

    r70814b8e r26653c9  
    2727#
    2828
    29 deps = [ 'softrend' , 'compress' ]
     29deps = [ 'softrend' , 'compress', 'fbfont' ]
    3030src = files(
    3131        'codec/tga.c',
    … …  
    3636        'font/bitmap_backend.c',
    3737        'font/pcf.c',
    38         'gfx/font-8x16.c',
    3938        'gfx/cursor-11x18.c',
    4039        'drawctx.c',

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

    r70814b8e r26653c9  
    11/*
    22 * Copyright (c) 2005 Martin Decky
     3 * Copyright (c) 2012 Petr Koupy
    34 * All rights reserved.
    45 *
    … …  
    3637#define FONT_8X16_H_
    3738
    38 #include <sys/types.h>
     39#include <stdint.h>
     40#include <str.h>
    3941
    4042#define FONT_GLYPHS     2899
    4143#define FONT_WIDTH      8
    4244#define FONT_SCANLINES  16
     45#define FONT_ASCENDER   12
    4346
    44 extern uint16_t fb_font_glyph(const char32_t);
     47extern uint16_t fb_font_glyph(const char32_t, bool *);
    4548extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
    4649

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

    r70814b8e r26653c9  
    2828 */
    2929
    30 /** @addtogroup draw
     30/** @addtogroup libfbfont
    3131 * @{
    3232 */
    … …  
    3535
    3636#include <stdint.h>
    37 #include <draw/gfx.h>
     37#include <str.h>
     38#include "../include/fbfont/font-8x16.h"
    3839
    3940/** Convert character to font glyph index

  • uspace/lib/gui/meson.build

    r70814b8e r26653c9  
    2727#
    2828
    29 deps = [ 'draw' , 'softrend', 'display' ]
     29deps = [ 'draw' , 'softrend', 'fbfont', 'display' ]
    3030src = files(
    3131        'common.c',

  • uspace/lib/gui/terminal.c

    r70814b8e r26653c9  
    3939#include <draw/surface.h>
    4040#include <draw/gfx.h>
     41#include <fbfont/font-8x16.h>
    4142#include <io/con_srv.h>
    4243#include <io/concaps.h>

  • uspace/lib/meson.build

    r70814b8e r26653c9  
    5656        'crypto',
    5757        'dltest',
     58        'fbfont',
    5859        'fdisk',
    5960        'fmtutil',
Note: See TracChangeset for help on using the changeset viewer.