Index: uspace/lib/gfxfont/include/gfx/font.h =================================================================== --- uspace/lib/gfxfont/include/gfx/font.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) +++ uspace/lib/gfxfont/include/gfx/font.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2020 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libgfxfont + * @{ + */ +/** + * @file Font + */ + +#ifndef _GFX_FONT_H +#define _GFX_FONT_H + +#include +#include +#include +#include +#include + +extern void gfx_font_metrics_init(gfx_font_metrics_t *); +extern errno_t gfx_font_create(gfx_context_t *, gfx_font_metrics_t *, + gfx_font_t **); +extern void gfx_font_destroy(gfx_font_t *); +extern void gfx_font_get_metrics(gfx_font_t *, gfx_font_metrics_t *); +extern errno_t gfx_font_set_metrics(gfx_font_t *, gfx_font_metrics_t *); +extern gfx_glyph_t *gfx_font_first_glyph(gfx_font_t *); +extern gfx_glyph_t *gfx_font_next_glyph(gfx_glyph_t *); +extern int gfx_font_search_glyph(gfx_font_t *, const char *, gfx_glyph_t **, + size_t *); + +#endif + +/** @} + */ Index: uspace/lib/gfxfont/include/gfx/glyph.h =================================================================== --- uspace/lib/gfxfont/include/gfx/glyph.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) +++ uspace/lib/gfxfont/include/gfx/glyph.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2020 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libgfxfont + * @{ + */ +/** + * @file Glyph + */ + +#ifndef _GFX_GLYPH_H +#define _GFX_GLYPH_H + +#include +#include +#include +#include + +extern void gfx_glyph_metrics_init(gfx_glyph_metrics_t *); +extern errno_t gfx_glyph_create(gfx_font_t *, gfx_glyph_metrics_t *, + gfx_glyph_t **); +extern void gfx_glyph_destroy(gfx_glyph_t *); +extern void gfx_glyph_get_metrics(gfx_glyph_t *, gfx_glyph_metrics_t *); +extern errno_t gfx_glyph_set_metrics(gfx_glyph_t *, gfx_glyph_metrics_t *); +extern errno_t gfx_glyph_set_pattern(gfx_glyph_t *, const char *); +extern void gfx_glyph_clear_pattern(gfx_glyph_t *, const char *); +extern errno_t gfx_glyph_open_bmp(gfx_glyph_t *, gfx_glyph_bmp_t **); + +#endif + +/** @} + */ Index: uspace/lib/gfxfont/include/gfx/glyph_bmp.h =================================================================== --- uspace/lib/gfxfont/include/gfx/glyph_bmp.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) +++ uspace/lib/gfxfont/include/gfx/glyph_bmp.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2020 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libgfxfont + * @{ + */ +/** + * @file Glyph bitmap + */ + +#ifndef _GFX_GLYPH_BMP_H +#define _GFX_GLYPH_BMP_H + +#include +#include +#include + +extern errno_t gfx_glyph_bmp_save(gfx_glyph_bmp_t *); +extern void gfx_glyph_bmp_close(gfx_glyph_bmp_t *); +extern int gfx_glyph_bmp_getpix(gfx_glyph_bmp_t *, gfx_coord_t, gfx_coord_t); +extern errno_t gfx_glyph_bmp_setpix(gfx_glyph_bmp_t *, gfx_coord_t, + gfx_coord_t, int); + +#endif + +/** @} + */ Index: uspace/lib/gfxfont/include/types/gfx/font.h =================================================================== --- uspace/lib/gfxfont/include/types/gfx/font.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) +++ uspace/lib/gfxfont/include/types/gfx/font.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2020 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libgfxfont + * @{ + */ +/** + * @file Font types + */ + +#ifndef _TYPES_GFX_FONT_H +#define _TYPES_GFX_FONT_H + +#include + +struct gfx_font; +typedef struct gfx_font gfx_font_t; + +/** Font metrics */ +typedef struct { + /** Ascent */ + gfx_coord_t acent; + /** Descent */ + gfx_coord_t descent; + /** Leading */ + gfx_coord_t leading; +} gfx_font_metrics_t; + +/** Text metrics */ +typedef struct { + /** Bounding rectangle (not including oversize elements) */ + gfx_rect_t bounds; +} gfx_text_metrics_t; + +#endif + +/** @} + */ Index: uspace/lib/gfxfont/include/types/gfx/glyph.h =================================================================== --- uspace/lib/gfxfont/include/types/gfx/glyph.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) +++ uspace/lib/gfxfont/include/types/gfx/glyph.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2020 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libgfxfont + * @{ + */ +/** + * @file Glyph types + */ + +#ifndef _TYPES_GFX_GLYPH_H +#define _TYPES_GFX_GLYPH_H + +#include + +struct gfx_glyph; +typedef struct gfx_glyph gfx_glyph_t; + +/** Glyph metrics */ +typedef struct { + /** Advance */ + gfx_coord_t advance; +} gfx_glyph_metrics_t; + +#endif + +/** @} + */ Index: uspace/lib/gfxfont/include/types/gfx/glyph_bmp.h =================================================================== --- uspace/lib/gfxfont/include/types/gfx/glyph_bmp.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) +++ uspace/lib/gfxfont/include/types/gfx/glyph_bmp.h (revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2020 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libgfxfont + * @{ + */ +/** + * @file Glyph types + */ + +#ifndef _TYPES_GFX_GLYPH_BMP_H +#define _TYPES_GFX_GLYPH_BMP_H + +struct gfx_glyph_bmp; +typedef struct gfx_glyph_bmp gfx_glyph_bmp_t; + +#endif + +/** @} + */