Ignore:
Timestamp:
2020-12-07T00:08:37Z (4 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:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/gfxfont/include/types/gfx/font.h

    r7a873f0 r7e38970d  
    11/*
    2  * Copyright (c) 2012 Petr Koupy
     2 * Copyright (c) 2020 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup draw
     29/** @addtogroup libgfxfont
    3030 * @{
    3131 */
    3232/**
    33  * @file
     33 * @file Font types
    3434 */
    3535
    36 #ifndef DRAW_CURSOR_H_
    37 #define DRAW_CURSOR_H_
     36#ifndef _TYPES_GFX_FONT_H
     37#define _TYPES_GFX_FONT_H
    3838
    39 #include <stdint.h>
     39#include <types/gfx/coord.h>
    4040
    41 #include "surface.h"
     41struct gfx_font;
     42typedef struct gfx_font gfx_font_t;
    4243
     44struct gfx_font_info;
     45typedef struct gfx_font_info gfx_font_info_t;
     46
     47/** Font flags */
    4348typedef enum {
    44         CURSOR_DECODER_EMBEDDED
    45 } cursor_decoder_type_t;
     49        /** Bold */
     50        gff_bold = 0x1,
     51        /** Italic */
     52        gff_italic = 0x2,
     53        /** Bold, italic */
     54        gff_bold_italic = gff_bold | gff_italic
     55} gfx_font_flags_t;
    4656
     57/** Font properties */
    4758typedef struct {
    48         void (*init)(char *, uint8_t *, void **);
    49         surface_t *(*render)(uint8_t);
    50         void (*release)(void *);
    51 } cursor_decoder_t;
    52 
    53 typedef struct cursor {
    54         uint8_t state_count;
    55         surface_t **states;
    56         cursor_decoder_t *decoder;
    57         void *decoder_data;
    58 } cursor_t;
    59 
    60 extern cursor_decoder_t cd_embedded;
    61 
    62 extern void cursor_init(cursor_t *, cursor_decoder_type_t, char *);
    63 extern void cursor_release(cursor_t *);
     59        /** Size */
     60        gfx_coord_t size;
     61        /** Flags */
     62        gfx_font_flags_t flags;
     63} gfx_font_props_t;
    6464
    6565#endif
Note: See TracChangeset for help on using the changeset viewer.