From c2977e5cb874e696994bcb93b8148f52c315b901 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Wed, 1 Oct 2014 11:23:02 +0200 Subject: terminal: move unifont-internal.h to unifont.h All the definitions are for outside users, so drop the -internal suffix. Internal definitions are in unifont-def.h and unifont.c, no need to share those. --- src/libsystemd-terminal/test-unifont.c | 2 +- src/libsystemd-terminal/unifont-internal.h | 54 ------------------------------ src/libsystemd-terminal/unifont.c | 2 +- src/libsystemd-terminal/unifont.h | 54 ++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 src/libsystemd-terminal/unifont-internal.h create mode 100644 src/libsystemd-terminal/unifont.h (limited to 'src/libsystemd-terminal') diff --git a/src/libsystemd-terminal/test-unifont.c b/src/libsystemd-terminal/test-unifont.c index 2c415941fb..cfeef61a47 100644 --- a/src/libsystemd-terminal/test-unifont.c +++ b/src/libsystemd-terminal/test-unifont.c @@ -30,7 +30,7 @@ #include #include "macro.h" #include "unifont-def.h" -#include "unifont-internal.h" +#include "unifont.h" #include "util.h" static void render(char *w, const unifont_glyph *g) { diff --git a/src/libsystemd-terminal/unifont-internal.h b/src/libsystemd-terminal/unifont-internal.h deleted file mode 100644 index c39512d2c6..0000000000 --- a/src/libsystemd-terminal/unifont-internal.h +++ /dev/null @@ -1,54 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright (C) 2014 David Herrmann - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see . -***/ - -#pragma once - -#include -#include -#include -#include "util.h" - -typedef struct unifont unifont; -typedef struct unifont_glyph unifont_glyph; - -/* - * Unifont - * The unifont API provides a glyph-lookup for bitmap fonts which can be used - * as fallback if no system-font is available or if you don't want to deal with - * full font renderers. - */ - -struct unifont_glyph { - unsigned int width; - unsigned int height; - unsigned int stride; - unsigned int cwidth; - const void *data; /* unaligned! */ -}; - -int unifont_new(unifont **out); -unifont *unifont_ref(unifont *u); -unifont *unifont_unref(unifont *u); - -DEFINE_TRIVIAL_CLEANUP_FUNC(unifont*, unifont_unref); - -unsigned int unifont_get_stride(unifont *u); -int unifont_lookup(unifont *u, unifont_glyph *out, uint32_t ucs4); diff --git a/src/libsystemd-terminal/unifont.c b/src/libsystemd-terminal/unifont.c index 9e0f718665..aa91794410 100644 --- a/src/libsystemd-terminal/unifont.c +++ b/src/libsystemd-terminal/unifont.c @@ -37,7 +37,7 @@ #include #include "macro.h" #include "unifont-def.h" -#include "unifont-internal.h" +#include "unifont.h" #include "util.h" struct unifont { diff --git a/src/libsystemd-terminal/unifont.h b/src/libsystemd-terminal/unifont.h new file mode 100644 index 0000000000..c39512d2c6 --- /dev/null +++ b/src/libsystemd-terminal/unifont.h @@ -0,0 +1,54 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of systemd. + + Copyright (C) 2014 David Herrmann + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#pragma once + +#include +#include +#include +#include "util.h" + +typedef struct unifont unifont; +typedef struct unifont_glyph unifont_glyph; + +/* + * Unifont + * The unifont API provides a glyph-lookup for bitmap fonts which can be used + * as fallback if no system-font is available or if you don't want to deal with + * full font renderers. + */ + +struct unifont_glyph { + unsigned int width; + unsigned int height; + unsigned int stride; + unsigned int cwidth; + const void *data; /* unaligned! */ +}; + +int unifont_new(unifont **out); +unifont *unifont_ref(unifont *u); +unifont *unifont_unref(unifont *u); + +DEFINE_TRIVIAL_CLEANUP_FUNC(unifont*, unifont_unref); + +unsigned int unifont_get_stride(unifont *u); +int unifont_lookup(unifont *u, unifont_glyph *out, uint32_t ucs4); -- cgit v1.2.3-54-g00ecf