Ignore:
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:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/gfxfont/include/types/gfx/glyph.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 gui
     29/** @addtogroup libgfxfont
    3030 * @{
    3131 */
    3232/**
    33  * @file
     33 * @file Glyph types
    3434 */
    3535
    36 #ifndef GUI_CONNECTION_H_
    37 #define GUI_CONNECTION_H_
     36#ifndef _TYPES_GFX_GLYPH_H
     37#define _TYPES_GFX_GLYPH_H
    3838
    39 #include <stddef.h>
    40 #include "widget.h"
     39#include <types/gfx/coord.h>
    4140
    42 typedef sysarg_t signal_t;
    43 typedef void (*slot_t)(widget_t *, void *);
     41struct gfx_glyph;
     42typedef struct gfx_glyph gfx_glyph_t;
    4443
    45 extern void sig_connect(signal_t *, widget_t *, slot_t);
    46 extern void sig_disconnect(signal_t *, widget_t *, slot_t);
     44struct gfx_glyph_pattern;
     45typedef struct gfx_glyph_pattern gfx_glyph_pattern_t;
    4746
    48 extern void sig_send(signal_t *, void *);
    49 extern void sig_post(signal_t *, void *, size_t);
     47/** Glyph metrics */
     48typedef struct {
     49        /** Advance */
     50        gfx_coord_t advance;
     51} gfx_glyph_metrics_t;
    5052
    5153#endif
Note: See TracChangeset for help on using the changeset viewer.