Changeset 3e828ea in mainline for uspace/lib/draw


Ignore:
Timestamp:
2019-09-23T12:49:29Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be2358
Parents:
9259d20 (diff), 1a4ec93f (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.
git-author:
Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)
git-committer:
Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)
Message:

Merge changes from master, especially Meson build

Location:
uspace/lib/draw
Files:
1 deleted
15 edited
9 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/draw/codec/tga.c

    r9259d20 r3e828ea  
    4040#include <stdbool.h>
    4141#include <pixconv.h>
    42 #include "tga.h"
     42#include <draw/codec.h>
    4343
    4444typedef struct {

  • uspace/lib/draw/codec/tga.gz.c

    r9259d20 r3e828ea  
    3737#include <gzip.h>
    3838#include <stdlib.h>
    39 #include "tga.gz.h"
    40 #include "tga.h"
     39#include <draw/codec.h>
    4140
    4241/** Decode gzipped Truevision TGA format

  • uspace/lib/draw/codec/webp.c

    r9259d20 r3e828ea  
    4242#include <stdint.h>
    4343#include <abi/fourcc.h>
    44 #include "webp.h"
     44#include <draw/codec.h>
    4545
    4646/** Check for input buffer overrun condition */

  • uspace/lib/draw/cursor.c

    r9259d20 r3e828ea  
    3636#include <stdlib.h>
    3737
    38 #include "cursor.h"
    39 #include "cursor/embedded.h"
     38#include <draw/cursor.h>
    4039
    4140void cursor_init(cursor_t *cursor, cursor_decoder_type_t decoder, char *path)

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

    r9259d20 r3e828ea  
    3939#include <stdlib.h>
    4040
    41 #include "../gfx/cursor-11x18.h"
    42 #include "embedded.h"
    43 #include "../surface.h"
     41#include <draw/gfx.h>
     42#include <draw/cursor.h>
     43#include <draw/surface.h>
    4444
    4545static void cde_init(char *path, uint8_t *state_count, void **data)

  • uspace/lib/draw/drawctx.c

    r9259d20 r3e828ea  
    3838#include <stdlib.h>
    3939
    40 #include "drawctx.h"
     40#include <draw/drawctx.h>
    4141
    4242void drawctx_init(drawctx_t *context, surface_t *surface)

  • uspace/lib/draw/font.c

    r9259d20 r3e828ea  
    3939#include <str.h>
    4040
    41 #include "font.h"
    42 #include "font/embedded.h"
    43 #include "drawctx.h"
     41#include <draw/font.h>
     42#include <draw/drawctx.h>
    4443
    4544font_t *font_create(font_backend_t *backend, void *backend_data)

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

    r9259d20 r3e828ea  
    3838#include <stdlib.h>
    3939
    40 #include "../font.h"
    41 #include "../drawctx.h"
    42 #include "bitmap_backend.h"
     40#include <draw/font.h>
     41#include <draw/drawctx.h>
    4342
    4443typedef struct {

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

    r9259d20 r3e828ea  
    3939#include <stdlib.h>
    4040
    41 #include "../gfx/font-8x16.h"
    42 #include "embedded.h"
    43 #include "../drawctx.h"
    44 #include "bitmap_backend.h"
     41#include <draw/gfx.h>
     42#include <draw/font.h>
     43#include <draw/drawctx.h>
    4544
    4645static errno_t fde_resolve_glyph(void *unused, const wchar_t chr,

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

    r9259d20 r3e828ea  
    4444#include <str.h>
    4545
    46 #include "pcf.h"
    47 #include "../drawctx.h"
    48 #include "bitmap_backend.h"
     46#include <draw/font.h>
     47#include <draw/drawctx.h>
    4948
    5049#define PCF_TABLE_ACCELERATORS 0x02

  • uspace/lib/draw/gfx/cursor-11x18.c

    r9259d20 r3e828ea  
    3434 */
    3535
    36 #include "cursor-11x18.h"
     36#include <draw/gfx.h>
    3737
    3838uint8_t cursor_texture[] = {

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

    r9259d20 r3e828ea  
    3535
    3636#include <stdint.h>
    37 #include "font-8x16.h"
     37#include <draw/gfx.h>
    3838
    3939/** Convert character to font glyph index

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

    r9259d20 r3e828ea  
    11/*
    22 * Copyright (c) 2014 Martin Decky
     3 * Copyright (c) 2011 Petr Koupy
    34 * All rights reserved.
    45 *
    … …  
    3435 */
    3536
    36 #ifndef DRAW_CODEC_TGA_GZ_H_
    37 #define DRAW_CODEC_TGA_GZ_H_
     37#ifndef DRAW_CODEC_H_
     38#define DRAW_CODEC_H_
    3839
    3940#include <stddef.h>
    40 #include "../surface.h"
     41#include "surface.h"
    4142
    4243extern surface_t *decode_tga_gz(void *, size_t, surface_flags_t);
    4344extern bool encode_tga_gz(surface_t *, void **, size_t *);
     45extern surface_t *decode_tga(void *, size_t, surface_flags_t);
     46extern bool encode_tga(surface_t *, void **, size_t *);
     47extern surface_t *decode_webp(void *, size_t, surface_flags_t);
     48extern bool encode_webp(surface_t *, void **, size_t *);
    4449
    4550#endif

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

    r9259d20 r3e828ea  
    5858} cursor_t;
    5959
     60extern cursor_decoder_t cd_embedded;
     61
    6062extern void cursor_init(cursor_t *, cursor_decoder_type_t, char *);
    6163extern void cursor_release(cursor_t *);

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

    r9259d20 r3e828ea  
    4040#include <stdint.h>
    4141
     42#include "font.h"
    4243#include "surface.h"
    4344#include "source.h"
    … …  
    108109} font_t;
    109110
     111typedef struct {
     112        errno_t (*resolve_glyph)(void *, const wchar_t, glyph_id_t *);
     113        errno_t (*load_glyph_surface)(void *, glyph_id_t, surface_t **);
     114        errno_t (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
     115        void (*release)(void *);
     116} bitmap_font_decoder_t;
     117
    110118extern font_t *font_create(font_backend_t *, void *);
    111119extern errno_t font_get_metrics(font_t *, font_metrics_t *);
    … …  
    120128    sysarg_t, sysarg_t);
    121129
     130extern errno_t bitmap_font_create(bitmap_font_decoder_t *, void *, uint32_t,
     131    font_metrics_t, uint16_t, font_t **);
     132extern errno_t embedded_font_create(font_t **, uint16_t points);
     133extern errno_t pcf_font_create(font_t **, char *path, uint16_t points);
     134
    122135#endif
    123136

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

    r9259d20 r3e828ea  
    11/*
    2  * Copyright (c) 2005 Martin Decky
     2 * Copyright (c) 2008 Martin Decky
     3 * Copyright (c) 2012 Petr Koupy
    34 * All rights reserved.
    45 *
    … …  
    3334 */
    3435
    35 #ifndef FONT_8X16_H_
    36 #define FONT_8X16_H_
     36#ifndef GFX_H_
     37#define GFX_H_
    3738
    3839#include <stdint.h>
    … …  
    4041#include <stddef.h>
    4142
     43#define CURSOR_WIDTH   11
     44#define CURSOR_HEIGHT  18
     45
    4246#define FONT_GLYPHS     2899
    4347#define FONT_WIDTH      8
    4448#define FONT_SCANLINES  16
    4549#define FONT_ASCENDER   12
     50
     51extern uint8_t cursor_texture[];
     52extern uint8_t cursor_mask[];
    4653
    4754extern uint16_t fb_font_glyph(const wchar_t, bool *);

  • uspace/lib/draw/meson.build

    r9259d20 r3e828ea  
    11#
    2 # Copyright (c) 2005 Martin Decky
    3 # Copyright (c) 2007 Jakub Jermar
    42# Copyright (c) 2011 Petr Koupy
    53# All rights reserved.
    … …  
    2927#
    3028
    31 USPACE_PREFIX = ../../..
    32 
    33 LIBS = drv graph softrend
    34 
    35 BINARY = amdm37x_dispc
    36 
    37 SOURCES = \
    38         amdm37x_dispc.c \
    39         main.c
    40 
    41 include $(USPACE_PREFIX)/Makefile.common
     29deps = [ 'softrend' , 'compress' ]
     30src = files(
     31        'codec/tga.c',
     32        'codec/tga.gz.c',
     33        'codec/webp.c',
     34        'cursor/embedded.c',
     35        'font/embedded.c',
     36        'font/bitmap_backend.c',
     37        'font/pcf.c',
     38        'gfx/font-8x16.c',
     39        'gfx/cursor-11x18.c',
     40        'drawctx.c',
     41        'cursor.c',
     42        'font.c',
     43        'path.c',
     44        'source.c',
     45        'surface.c',
     46)

  • uspace/lib/draw/path.c

    r9259d20 r3e828ea  
    3737#include <stdlib.h>
    3838
    39 #include "path.h"
     39#include <draw/path.h>
    4040
    4141struct path {

  • uspace/lib/draw/source.c

    r9259d20 r3e828ea  
    3636#include <assert.h>
    3737
    38 #include "source.h"
     38#include <draw/source.h>
    3939
    4040void source_init(source_t *source)

  • uspace/lib/draw/surface.c

    r9259d20 r3e828ea  
    3939#include <assert.h>
    4040#include <stdlib.h>
    41 #include "surface.h"
     41#include <draw/surface.h>
    4242
    4343struct surface {
Note: See TracChangeset for help on using the changeset viewer.