Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
gsk: Inline some more rect functions

See merge request GNOME/gtk!6755
This commit is contained in:
Matthias Clasen
2024-01-14 22:37:02 +00:00
parent 53e17ab14e cdbfb35067
commit c6967234de
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tools/gtk-rendernode-tool.c
View File

@@ -29,6 +29,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtk-rendernode-tool.h" #include "gtk-rendernode-tool.h"
#ifdef HAVE_PANGOFT
#include <pango/pangofc-fontmap.h>
#endif
static void G_GNUC_NORETURN static void G_GNUC_NORETURN
usage (void) usage (void)
{ {
@@ -88,6 +92,41 @@ log_writer_func (GLogLevelFlags level,
return G_LOG_WRITER_HANDLED; return G_LOG_WRITER_HANDLED;
} }
static void
maybe_add_test_fonts (void)
{
#ifdef HAVE_PANGOFT
const char *subdir = "testsuite/gsk/fonts";
const char *source_dir;
char *dir;
source_dir = g_getenv ("GTK_SOURCE_DIR");
if (source_dir)
{
char *abs_source_dir = g_canonicalize_filename (source_dir, NULL);
dir = g_canonicalize_filename (subdir, abs_source_dir);
g_free (abs_source_dir);
}
else
{
char *current_dir = g_get_current_dir ();
dir = g_canonicalize_filename (subdir, current_dir);
g_free (current_dir);
}
if (g_file_test (dir, G_FILE_TEST_EXISTS))
{
FcConfig *config;
config = FcConfigGetCurrent ();
FcConfigAppFontAddDir (config, (const FcChar8 *) dir);
}
g_free (dir);
#endif
}
int int
main (int argc, const char *argv[]) main (int argc, const char *argv[])
{ {
@@ -108,6 +147,8 @@ main (int argc, const char *argv[])
argv++; argv++;
argc--; argc--;
maybe_add_test_fonts ();
if (strcmp (argv[0], "show") == 0) if (strcmp (argv[0], "show") == 0)
do_show (&argc, &argv); do_show (&argc, &argv);
else if (strcmp (argv[0], "render") == 0) else if (strcmp (argv[0], "render") == 0)