Index: uspace/lib/draw/font/bitmap_backend.c =================================================================== --- uspace/lib/draw/font/bitmap_backend.c (revision dd500c26d08a5e01581111bd204d1724c4b2696a) +++ uspace/lib/draw/font/bitmap_backend.c (revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb) @@ -38,7 +38,6 @@ #include -#include "../font.h" -#include "../drawctx.h" -#include "bitmap_backend.h" +#include +#include typedef struct { Index: uspace/lib/draw/font/bitmap_backend.h =================================================================== --- uspace/lib/draw/font/bitmap_backend.h (revision dd500c26d08a5e01581111bd204d1724c4b2696a) +++ (revision ) @@ -1,59 +1,0 @@ -/* - * Copyright (c) 2012 Petr Koupy - * Copyright (c) 2014 Martin Sucha - * 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 draw - * @{ - */ -/** - * @file - */ - -#ifndef DRAW_FONT_BITMAP_BACKEND_H_ -#define DRAW_FONT_BITMAP_BACKEND_H_ - -#include - -#include "../font.h" -#include "../surface.h" -#include "../source.h" - -typedef struct { - errno_t (*resolve_glyph)(void *, const wchar_t, glyph_id_t *); - errno_t (*load_glyph_surface)(void *, glyph_id_t, surface_t **); - errno_t (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *); - void (*release)(void *); -} bitmap_font_decoder_t; - -extern errno_t bitmap_font_create(bitmap_font_decoder_t *, void *, uint32_t, - font_metrics_t, uint16_t, font_t **); - -#endif - -/** @} - */ Index: uspace/lib/draw/font/embedded.c =================================================================== --- uspace/lib/draw/font/embedded.c (revision dd500c26d08a5e01581111bd204d1724c4b2696a) +++ uspace/lib/draw/font/embedded.c (revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb) @@ -39,8 +39,7 @@ #include -#include "../gfx/font-8x16.h" -#include "embedded.h" -#include "../drawctx.h" -#include "bitmap_backend.h" +#include +#include +#include static errno_t fde_resolve_glyph(void *unused, const wchar_t chr, Index: uspace/lib/draw/font/embedded.h =================================================================== --- uspace/lib/draw/font/embedded.h (revision dd500c26d08a5e01581111bd204d1724c4b2696a) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2012 Petr Koupy - * 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 draw - * @{ - */ -/** - * @file - */ - -#ifndef DRAW_FONT_EMBEDDED_H_ -#define DRAW_FONT_EMBEDDED_H_ - -#include "../font.h" - -extern errno_t embedded_font_create(font_t **, uint16_t points); - -#endif - -/** @} - */ Index: uspace/lib/draw/font/pcf.c =================================================================== --- uspace/lib/draw/font/pcf.c (revision dd500c26d08a5e01581111bd204d1724c4b2696a) +++ uspace/lib/draw/font/pcf.c (revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb) @@ -44,7 +44,6 @@ #include -#include "pcf.h" -#include "../drawctx.h" -#include "bitmap_backend.h" +#include +#include #define PCF_TABLE_ACCELERATORS 0x02 Index: uspace/lib/draw/font/pcf.h =================================================================== --- uspace/lib/draw/font/pcf.h (revision dd500c26d08a5e01581111bd204d1724c4b2696a) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2014 Martin Sucha - * 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 draw - * @{ - */ -/** - * @file - */ - -#ifndef DRAW_FONT_PBF_H_ -#define DRAW_FONT_PBF_H_ - -#include "../font.h" - -extern errno_t pcf_font_create(font_t **, char *path, uint16_t points); - -#endif - -/** @} - */