AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

build: Add gtk-css static library

Browse Source 
This library is meant to be the new CSS library that gets used from GDK,
GSK and GTK for string printing and parsing.

As a first step, move GtkCssProviderError into it.

While doing so, split it into GtkCssParserError (for critical problems)
and GtkCssParserWarning (for non-critical problems).
This commit is contained in:
Benjamin Otte 2019-03-22 04:20:17 +01:00
parent d6cc10ea74
commit a938c14d11
82 changed files with 555 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gtk-demo/css_basics.c
View File

@ -25,7 +25,7 @@ show_parsing_error (GtkCssProvider *provider,
gtk_css_section_get_end_line (section),
gtk_css_section_get_end_position (section));
if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
if (error->domain == GTK_CSS_PARSER_WARNING)
tag_name = "warning";
else
tag_name = "error";

2
demos/gtk-demo/css_multiplebgs.c
View File

@ -25,7 +25,7 @@ show_parsing_error (GtkCssProvider *provider,
gtk_css_section_get_end_line (section),
gtk_css_section_get_end_position (section));
if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
if (error->domain == GTK_CSS_PARSER_WARNING)
tag_name = "warning";
else
tag_name = "error";

2
demos/gtk-demo/css_pixbufs.c
View File

@ -24,7 +24,7 @@ show_parsing_error (GtkCssProvider *provider,
gtk_css_section_get_end_line (section),
gtk_css_section_get_end_position (section));
if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
if (error->domain == GTK_CSS_PARSER_WARNING)
tag_name = "warning";
else
tag_name = "error";

2
demos/gtk-demo/css_shadows.c
View File

@ -23,7 +23,7 @@ show_parsing_error (GtkCssProvider *provider,
gtk_css_section_get_end_line (section),
gtk_css_section_get_end_position (section));
if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
if (error->domain == GTK_CSS_PARSER_WARNING)
tag_name = "warning";
else
tag_name = "error";

5
docs/reference/gtk/gtk4-sections.txt
View File

@ -5086,8 +5086,9 @@ gtk_css_provider_load_from_path
gtk_css_provider_load_from_resource
gtk_css_provider_new
gtk_css_provider_to_string
GTK_CSS_PROVIDER_ERROR
GtkCssProviderError
GTK_CSS_PARSER_ERROR
GtkCssParserError
GtkCssParserWarning
<SUBSECTION>
GtkCssSection
GtkCssSectionType

2
gdk/gdkversionmacros.h.in
View File

@ -15,7 +15,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#if !defined (__GDK_H_INSIDE__) && !defined (__GTK_CSS_H_INSIDE__) && !defined (GDK_COMPILATION) && !defined (GTK_CSS_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif

39
gtk/css/gtkcss.h Normal file
View File

@ -0,0 +1,39 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library 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 of the License, or (at your option) any later version.
*
* This library 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 this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_CSS_H__
#define __GTK_CSS_H__
#define __GTK_CSS_H_INSIDE__
#include <glib.h>
#include <gdk/gdkversionmacros.h>
#include <gtk/css/gtkcssenums.h>
#include <gtk/css/gtkcssenumtypes.h>
#include <gtk/css/gtkcsserror.h>
#undef __GTK_CSS_H_INSIDE__
#endif /* __GTK_CSS_H__ */

74
gtk/css/gtkcssenums.h Normal file
View File

@ -0,0 +1,74 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library 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 of the License, or (at your option) any later version.
*
* This library 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 this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_CSS_ENUMS_H__
#define __GTK_CSS_ENUMS_H__
#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION)
#error "Only <gtk/css/gtkcss.h> can be included directly."
#endif
#include <glib.h>
#include <gdk/gdkversionmacros.h>
/**
* GtkCssParserError:
* @GTK_CSS_PARSER_ERROR_FAILED: Unknown failure.
* @GTK_CSS_PARSER_ERROR_SYNTAX: The given text does not form valid
* syntax
* @GTK_CSS_PARSER_ERROR_IMPORT: Failed to import a resource
* @GTK_CSS_PARSER_ERROR_NAME: The given name has not been defined
* @GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE: The given value is not
* correct
*
* Errors that can occur while parsing CSS.
*
* These errors are unexpected and will cause parts of the given CSS
* to be ignored.
*/
typedef enum
{
GTK_CSS_PARSER_ERROR_FAILED,
GTK_CSS_PARSER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR_IMPORT,
GTK_CSS_PARSER_ERROR_NAME,
GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
} GtkCssParserError;
/**
* GtkCssParserWarning:
* @GTK_CSS_PARSER_WARNING_DEPRECATED: The given construct is
* deprecated and will be removed in a future version
*
* Warnings that can occur while parsing CSS.
*
* Unlike #GtkCssParserErrors, warnings do not cause the parser to
* skip any input, but they indicate issues that should be fixed.
*/
typedef enum
{
GTK_CSS_PARSER_WARNING_DEPRECATED
} GtkCssParserWarning;
#endif /* __GTK_CSS_ENUMS_H__ */

38
gtk/css/gtkcssenumtypes.c.template Normal file
View File

@ -0,0 +1,38 @@
/*** BEGIN file-header ***/
#include "config.h"
#include "gtkcssenumtypes.h"
#include <gtkcss.h>
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
GType
@enum_name@_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
static const G@Type@Value values[] = {
/*** END value-header ***/
/*** BEGIN value-production ***/
{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },
/*** END value-production ***/
/*** BEGIN value-tail ***/
{ 0, NULL, NULL }
};
GType g_define_type_id =
g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
/*** END value-tail ***/

29
gtk/css/gtkcssenumtypes.h.template Normal file
View File

@ -0,0 +1,29 @@
/*** BEGIN file-header ***/
#ifndef __GTK_CSS_ENUM_TYPES_H__
#define __GTK_CSS_ENUM_TYPES_H__
#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION)
#error "Only <gtk/css/gtkcss.h> can be included directly."
#endif
#include <glib-object.h>
#include <gdk/gdkversionmacros.h>
G_BEGIN_DECLS
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
GDK_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
/*** END value-header ***/
/*** BEGIN file-tail ***/
G_END_DECLS
#endif /* __GTK_CSS_ENUM_TYPES_H__ */
/*** END file-tail ***/

35
gtk/css/gtkcsserror.c Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright © 2019 Benjamin Otte
*
* This library 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.
*
* This library 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 this library. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: Benjamin Otte <otte@gnome.org>
*/
#include "config.h"
#include "gtkcsserror.h"
GQuark
gtk_css_parser_error_quark (void)
{
return g_quark_from_static_string ("gtk-css-parser-error-quark");
}
GQuark
gtk_css_parser_warning_quark (void)
{
return g_quark_from_static_string ("gtk-css-parser-warning-quark");
}

47
gtk/css/gtkcsserror.h Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright © 2019 Benjamin Otte
*
* This library 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.
*
* This library 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 this library. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: Benjamin Otte <otte@gnome.org>
*/
#ifndef __GTK_CSS_ERROR_H__
#define __GTK_CSS_ERROR_H__
#include <glib.h>
#include <gdk/gdkversionmacros.h>
/**
* GTK_CSS_PARSER_ERROR:
*
* Domain for #GtkCssParser errors.
*/
#define GTK_CSS_PARSER_ERROR (gtk_css_parser_error_quark ())
GDK_AVAILABLE_IN_ALL
GQuark gtk_css_parser_error_quark (void);
/**
* GTK_CSS_PARSER_WARNING:
*
* Domain for #GtkCssParser warnings.
*/
#define GTK_CSS_PARSER_WARNING (gtk_css_parser_warning_quark ())
GDK_AVAILABLE_IN_ALL
GQuark gtk_css_parser_warning_quark (void);
#endif /* __GTK_CSS_ERROR_H__ */

51
gtk/css/meson.build Normal file
View File

@ -0,0 +1,51 @@
gtk_css_public_sources = files([
'gtkcsserror.c',
])
gtk_css_private_sources = files([
])
gtk_css_public_headers = files([
'gtkcssenums.h',
'gtkcsserror.h',
])
install_headers(gtk_css_public_headers, 'gtkcss.h', subdir: 'gtk-4.0/gtk/css')
gtk_css_deps = [
libm,
glib_dep,
gobject_dep,
platform_gio_dep,
]
gtk_css_enums = gnome.mkenums('gtkcssenumtypes',
sources: gtk_css_public_headers,
c_template: 'gtkcssenumtypes.c.template',
h_template: 'gtkcssenumtypes.h.template',
install_dir: join_paths(gtk_includedir, 'gtk-4.0/gtk/css'),
install_header: true)
gtk_css_enum_h = gtk_css_enums[1]
libgtk_css = static_library('gtk_css',
sources: [
gtk_css_public_sources,
gtk_css_private_sources,
gtk_css_enums,
],
dependencies: gtk_css_deps,
include_directories: [ confinc, ],
c_args: [
'-DGTK_CSS_COMPILATION',
'-DG_LOG_DOMAIN="Gtk"',
'-DG_LOG_STRUCTURED=1',
] + common_cflags,
link_args: common_ldflags)
# We don't have link_with: to internal static libs here on purpose, just
# list the dependencies and generated headers and such, for use in the
# "public" libgtk_dep used by internal executables.
libgtk_css_dep = declare_dependency(include_directories: [ confinc, ],
sources: [ gtk_css_enum_h ],
dependencies: gtk_css_deps)

3
gtk/gtk.h
View File

@ -27,7 +27,10 @@
#define __GTK_H_INSIDE__
#include <gtk/css/gtkcss.h>
#include <gdk/gdk.h>
#include <gsk/gsk.h>
#include <gtk/gtkaboutdialog.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkaccellabel.h>

4
gtk/gtkcssimagerecolor.c
View File

@ -155,8 +155,8 @@ gtk_css_image_recolor_load (GtkCssImageRecolor *recolor,
uri = g_file_get_uri (recolor->file);
g_set_error (gerror,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_FAILED,
"Error loading image '%s': %s", uri, local_error->message);
g_free (uri);
}

4
gtk/gtkcssimageurl.c
View File

@ -65,8 +65,8 @@ gtk_css_image_url_load_image (GtkCssImageUrl *url,
uri = g_file_get_uri (url->file);
g_set_error (error,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_FAILED,
"Error loading image '%s': %s", uri, local_error->message);
g_free (uri);
}

2
gtk/gtkcsskeyframes.c
View File

@ -238,7 +238,7 @@ parse_declaration (GtkCssKeyframes *keyframes,
property = _gtk_style_property_lookup (name);
if (property == NULL)
{
/* should be GTK_CSS_PROVIDER_ERROR_NAME */
/* should be GTK_CSS_PARSER_ERROR_NAME */
_gtk_css_parser_error (parser, "No property named '%s'", name);
g_free (name);
return FALSE;

4
gtk/gtkcssparser.c
View File

@ -194,8 +194,8 @@ _gtk_css_parser_error (GtkCssParser *parser,
va_list args;
va_start (args, format);
error = g_error_new_valist (GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
error = g_error_new_valist (GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
format, args);
va_end (args);

2
gtk/gtkcssparserprivate.h
View File

@ -20,6 +20,8 @@
#include <gtk/gtkcssprovider.h>
#include <gtk/css/gtkcss.h>
G_BEGIN_DECLS
typedef struct _GtkCssParser GtkCssParser;

58
gtk/gtkcssprovider.c
View File

@ -142,12 +142,6 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
GFile *file,
const char *data);
GQuark
gtk_css_provider_error_quark (void)
{
return g_quark_from_static_string ("gtk-css-provider-error-quark");
}
G_DEFINE_TYPE_EXTENDED (GtkCssProvider, gtk_css_provider, G_TYPE_OBJECT, 0,
G_ADD_PRIVATE (GtkCssProvider)
G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER,
@ -720,8 +714,8 @@ gtk_css_provider_invalid_token (GtkCssProvider *provider,
{
gtk_css_provider_error (provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"expected %s", expected);
}
@ -818,8 +812,8 @@ parse_import (GtkCssScanner *scanner)
char *path = g_file_get_path (file);
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_IMPORT,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_IMPORT,
"Loading '%s' would recurse",
path);
g_free (path);
@ -860,8 +854,8 @@ parse_color_definition (GtkCssScanner *scanner)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"Not a valid color name");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
@ -883,8 +877,8 @@ parse_color_definition (GtkCssScanner *scanner)
_gtk_css_value_unref (color);
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"Missing semicolon at end of color definition");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
@ -918,8 +912,8 @@ parse_keyframes (GtkCssScanner *scanner)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"Expected name for keyframes");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
goto exit;
@ -929,8 +923,8 @@ parse_keyframes (GtkCssScanner *scanner)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"Expected '{' for keyframes");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
g_free (name);
@ -951,8 +945,8 @@ parse_keyframes (GtkCssScanner *scanner)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"expected '}' after declarations");
if (!_gtk_css_parser_is_eof (scanner->parser))
_gtk_css_parser_resync (scanner->parser, FALSE, 0);
@ -978,8 +972,8 @@ parse_at_keyword (GtkCssScanner *scanner)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"unknown @ rule");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
}
@ -1061,8 +1055,8 @@ parse_declaration (GtkCssScanner *scanner,
{
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"Junk at end of value for %s", property->name);
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
@ -1111,8 +1105,8 @@ check_for_semicolon:
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"Expected semicolon");
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
}
@ -1149,8 +1143,8 @@ parse_ruleset (GtkCssScanner *scanner)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"expected '{' after selectors");
_gtk_css_parser_resync (scanner->parser, FALSE, 0);
g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
@ -1164,8 +1158,8 @@ parse_ruleset (GtkCssScanner *scanner)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_SYNTAX,
"expected '}' after declarations");
if (!_gtk_css_parser_is_eof (scanner->parser))
{
@ -1298,8 +1292,8 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
gtk_css_provider_error (css_provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_IMPORT,
GTK_CSS_PARSER_ERROR,
GTK_CSS_PARSER_ERROR_IMPORT,
"Failed to import: %s",
load_error->message);

31
gtk/gtkcssprovider.h
View File

@ -30,37 +30,6 @@ G_BEGIN_DECLS
#define GTK_IS_CSS_PROVIDER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GTK_TYPE_CSS_PROVIDER))
#define GTK_CSS_PROVIDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_CSS_PROVIDER, GtkCssProviderClass))
/**
* GTK_CSS_PROVIDER_ERROR:
*
* Domain for #GtkCssProvider errors.
*/
#define GTK_CSS_PROVIDER_ERROR (gtk_css_provider_error_quark ())
/**
* GtkCssProviderError:
* @GTK_CSS_PROVIDER_ERROR_FAILED: Failed.
* @GTK_CSS_PROVIDER_ERROR_SYNTAX: Syntax error.
* @GTK_CSS_PROVIDER_ERROR_IMPORT: Import error.
* @GTK_CSS_PROVIDER_ERROR_NAME: Name error.
* @GTK_CSS_PROVIDER_ERROR_DEPRECATED: Deprecation error.
* @GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE: Unknown value.
*
* Error codes for %GTK_CSS_PROVIDER_ERROR.
*/
typedef enum
{
GTK_CSS_PROVIDER_ERROR_FAILED,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
GTK_CSS_PROVIDER_ERROR_IMPORT,
GTK_CSS_PROVIDER_ERROR_NAME,
GTK_CSS_PROVIDER_ERROR_DEPRECATED,
GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE
} GtkCssProviderError;
GDK_AVAILABLE_IN_ALL
GQuark gtk_css_provider_error_quark (void);
typedef struct _GtkCssProvider GtkCssProvider;
typedef struct _GtkCssProviderClass GtkCssProviderClass;
typedef struct _GtkCssProviderPrivate GtkCssProviderPrivate;

3
gtk/inspector/css-editor.c
View File

@ -36,6 +36,7 @@
#include "gtktooltip.h"
#include "gtktextiter.h"
#include "gtk/css/gtkcss.h"
struct _GtkInspectorCssEditorPrivate
{
@ -305,7 +306,7 @@ show_parsing_error (GtkCssProvider *provider,
gtk_css_section_get_end_line (section),
gtk_css_section_get_end_position (section));
if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
if (error->domain == GTK_CSS_PARSER_WARNING)
tag_name = "warning";
else
tag_name = "error";

8
gtk/meson.build
View File

@ -841,7 +841,7 @@ typefuncs = custom_target('gtktypefuncs.inc',
gtk_public_headers +
gtk_deprecated_headers +
[ gtktypebuiltins_h, ] +
[ gdkenum_h, gskenum_h, ],
[ gtk_css_enum_h, gdkenum_h, gskenum_h, ],
command: [
find_program('gentypefuncs.py'),
'@OUTPUT@',
@ -993,8 +993,8 @@ libgtk = shared_library('gtk-4',
sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
c_args: gtk_cargs + common_cflags,
include_directories: [confinc, gdkinc, gskinc, gtkinc],
dependencies: gtk_deps + [libgdk_dep, libgsk_dep],
link_with: [libgdk, libgsk, ],
dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
link_with: [libgtk_css, libgdk, libgsk, ],
link_args: common_ldflags,
install: true)
@ -1119,7 +1119,7 @@ endif
libgtk_dep = declare_dependency(sources: gtk_dep_sources,
include_directories: [confinc, gtkinc],
dependencies: gtk_deps + [libgdk_dep, libgsk_dep],
dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
link_with: libgtk,
link_args: common_ldflags)

1
meson.build
View File

@ -681,6 +681,7 @@ if graphene_has_sse2 or graphene_has_gcc
endif
endif
subdir('gtk/css')
subdir('gdk')
subdir('gsk')
subdir('gtk')

2
tests/testboxcss.c
View File

@ -61,7 +61,7 @@ show_parsing_error (GtkCssProvider *provider,
gtk_css_section_get_end_line (section),
gtk_css_section_get_end_position (section));
if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
if (error->domain == GTK_CSS_PARSER_WARNING)
tag_name = "warning";
else
tag_name = "error";

2
testsuite/css/parser/animation-crash-3.12.errors
View File

@ -1 +1 @@
animation-crash-3.12.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
animation-crash-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-01.errors
View File

@ -1 +1 @@
at-invalid-01.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-01.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-02.errors
View File

@ -1 +1 @@
at-invalid-02.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-02.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-03.errors
View File

@ -1 +1 @@
at-invalid-03.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-03.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-04.errors
View File

@ -1 +1 @@
at-invalid-04.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-04.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-05.errors
View File

@ -1 +1 @@
at-invalid-05.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-05.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-06.errors
View File

@ -1 +1 @@
at-invalid-06.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-06.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-07.errors
View File

@ -1 +1 @@
at-invalid-07.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-07.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-08.errors
View File

@ -1 +1 @@
at-invalid-08.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-09.errors
View File

@ -1 +1 @@
at-invalid-09.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-09.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-10.errors
View File

@ -1 +1 @@
at-invalid-10.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-10.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-11.errors
View File

@ -1 +1 @@
at-invalid-11.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-11.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-12.errors
View File

@ -1 +1 @@
at-invalid-12.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-12.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-13.errors
View File

@ -1 +1 @@
at-invalid-13.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-13.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-14.errors
View File

@ -1 +1 @@
at-invalid-14.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-14.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-15.errors
View File

@ -1 +1 @@
at-invalid-15.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-15.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-16.errors
View File

@ -1 +1 @@
at-invalid-16.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-16.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-17.errors
View File

@ -1 +1 @@
at-invalid-17.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-17.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-18.errors
View File

@ -1 +1 @@
at-invalid-18.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-18.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-19.errors
View File

@ -1 +1 @@
at-invalid-19.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-19.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/at-invalid-20.errors
View File

@ -1 +1 @@
at-invalid-20.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-20.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

4
testsuite/css/parser/at-invalid-21.errors
View File

@ -1,2 +1,2 @@
at-invalid-21.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-21.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
at-invalid-21.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
at-invalid-21.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/background-position-errors.errors
View File

@ -1 +1 @@
background-position-errors.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

28
testsuite/css/parser/background-position.errors
View File

@ -1,14 +1,14 @@
background-position.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:18: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:66: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:70: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:90: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:102: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:110: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:122: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:126: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:150: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:154: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
background-position.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:66: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:70: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:90: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:102: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:110: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:122: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:126: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:150: error: GTK_CSS_PARSER_ERROR_SYNTAX
background-position.css:154: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/border-infloop-3.12.errors
View File

@ -1 +1 @@
border-infloop-3.12.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-infloop-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

26
testsuite/css/parser/border-radius-shorthand.errors
View File

@ -1,13 +1,13 @@
border-radius-shorthand.css:64: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:68: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:72: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:76: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:80: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:84: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:88: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:92: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:96: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:100: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:104: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:108: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:112: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border-radius-shorthand.css:64: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:68: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:72: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:76: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:80: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:84: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:88: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:92: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:96: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:100: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:104: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:108: error: GTK_CSS_PARSER_ERROR_SYNTAX
border-radius-shorthand.css:112: error: GTK_CSS_PARSER_ERROR_SYNTAX

16
testsuite/css/parser/border.errors
View File

@ -1,8 +1,8 @@
border.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border.css:30: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border.css:46: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border.css:50: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border.css:54: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
border.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
border.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
border.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
border.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
border.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
border.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
border.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX
border.css:54: error: GTK_CSS_PARSER_ERROR_SYNTAX

38
testsuite/css/parser/calc-errors.errors
View File

@ -1,19 +1,19 @@
calc-errors.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:10: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:14: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:18: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:22: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:30: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:46: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:50: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:54: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:58: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:62: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:66: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:70: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:74: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
calc-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:54: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:58: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:62: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:66: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:70: error: GTK_CSS_PARSER_ERROR_SYNTAX
calc-errors.css:74: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/close-at-end-of-file.errors
View File

@ -1 +1 @@
close-at-end-of-file.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
close-at-end-of-file.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX

14
testsuite/css/parser/colors-errors.errors
View File

@ -1,7 +1,7 @@
colors-errors.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
colors-errors.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
colors-errors.css:10: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
colors-errors.css:14: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
colors-errors.css:18: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
colors-errors.css:22: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
colors-errors.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
colors-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
colors-errors.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
colors-errors.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
colors-errors.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
colors-errors.css:18: error: GTK_CSS_PARSER_ERROR_SYNTAX
colors-errors.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
colors-errors.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX

12
testsuite/css/parser/css-21-malformed-declarations.errors
View File

@ -1,6 +1,6 @@
css-21-malformed-declarations.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-declarations.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-declarations.css:4: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-declarations.css:5: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-declarations.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-declarations.css:7: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-declarations.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
css-21-malformed-declarations.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
css-21-malformed-declarations.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX
css-21-malformed-declarations.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
css-21-malformed-declarations.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
css-21-malformed-declarations.css:7: error: GTK_CSS_PARSER_ERROR_SYNTAX

8
testsuite/css/parser/css-21-malformed-statements.errors
View File

@ -1,4 +1,4 @@
css-21-malformed-statements.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-statements.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-statements.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-statements.css:4: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
css-21-malformed-statements.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
css-21-malformed-statements.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
css-21-malformed-statements.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
css-21-malformed-statements.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/declarations-invalid-01.errors
View File

@ -1 +1 @@
declarations-invalid-01.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-01.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/declarations-invalid-02.errors
View File

@ -1 +1 @@
declarations-invalid-02.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-02.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/declarations-invalid-03.errors
View File

@ -1 +1 @@
declarations-invalid-03.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-03.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/declarations-invalid-04.errors
View File

@ -1 +1 @@
declarations-invalid-04.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-04.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/declarations-invalid-05.errors
View File

@ -1 +1 @@
declarations-invalid-05.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-05.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/declarations-invalid-06.errors
View File

@ -1 +1 @@
declarations-invalid-06.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-06.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/declarations-invalid-07.errors
View File

@ -1 +1 @@
declarations-invalid-07.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-07.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

6
testsuite/css/parser/declarations-invalid-08.errors
View File

@ -1,3 +1,3 @@
declarations-invalid-08.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-08.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-08.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations-invalid-08.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations-invalid-08.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

28
testsuite/css/parser/declarations.errors
View File

@ -1,14 +1,14 @@
declarations.css:24: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:28: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:30: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:32: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:36: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:40: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:44: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:46: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:48: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:50: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
declarations.css:24: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:28: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:30: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:32: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:36: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:40: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:44: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:46: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:48: error: GTK_CSS_PARSER_ERROR_SYNTAX
declarations.css:50: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/does-not-exist.errors
View File

@ -1 +1 @@
does-not-exist.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
does-not-exist.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/freed-string-in-error-messages.errors
View File

@ -1 +1 @@
freed-string-in-error-messages.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
freed-string-in-error-messages.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/import-cyclic-1.errors
View File

@ -1 +1 @@
import-cyclic-3.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
import-cyclic-3.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

2
testsuite/css/parser/import-cyclic-2.errors
View File

@ -1 +1 @@
import-cyclic-1.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
import-cyclic-1.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

2
testsuite/css/parser/import-cyclic-3.errors
View File

@ -1 +1 @@
import-cyclic-2.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
import-cyclic-2.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

2
testsuite/css/parser/import-nonexistant.errors
View File

@ -1 +1 @@
import-nonexistant.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
import-nonexistant.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

2
testsuite/css/parser/import-recursive.errors
View File

@ -1 +1 @@
import-recursive.css:1: error: GTK_CSS_PROVIDER_ERROR_IMPORT
import-recursive.css:1: error: GTK_CSS_PARSER_ERROR_IMPORT

24
testsuite/css/parser/integer.errors
View File

@ -1,12 +1,12 @@
integer.css:5: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:8: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:11: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:14: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:17: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:23: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:26: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:29: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:32: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:35: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:41: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
integer.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:8: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:11: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:17: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:23: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:26: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:29: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:32: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:35: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
integer.css:41: error: GTK_CSS_PARSER_ERROR_SYNTAX

4
testsuite/css/parser/property-name-errors.errors
View File

@ -1,2 +1,2 @@
property-name-errors.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
property-name-errors.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
property-name-errors.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
property-name-errors.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX

12
testsuite/css/parser/pseudo-classes-unknown.errors
View File

@ -1,6 +1,6 @@
pseudo-classes-unknown.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
pseudo-classes-unknown.css:5: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
pseudo-classes-unknown.css:9: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
pseudo-classes-unknown.css:13: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
pseudo-classes-unknown.css:17: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
pseudo-classes-unknown.css:21: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
pseudo-classes-unknown.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX
pseudo-classes-unknown.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
pseudo-classes-unknown.css:9: error: GTK_CSS_PARSER_ERROR_SYNTAX
pseudo-classes-unknown.css:13: error: GTK_CSS_PARSER_ERROR_SYNTAX
pseudo-classes-unknown.css:17: error: GTK_CSS_PARSER_ERROR_SYNTAX
pseudo-classes-unknown.css:21: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/radial-background-position-error.errors
View File

@ -1 +1 @@
radial-background-position-error.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
radial-background-position-error.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX

6
testsuite/css/parser/radial-positions.errors
View File

@ -1,3 +1,3 @@
radial-positions.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
radial-positions.css:5: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
radial-positions.css:8: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
radial-positions.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
radial-positions.css:5: error: GTK_CSS_PARSER_ERROR_SYNTAX
radial-positions.css:8: error: GTK_CSS_PARSER_ERROR_SYNTAX

2
testsuite/css/parser/single-slash.errors
View File

@ -1 +1 @@
single-slash.css:1: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
single-slash.css:1: error: GTK_CSS_PARSER_ERROR_SYNTAX

4
testsuite/css/parser/test-css-parser.c
View File

@ -150,8 +150,8 @@ parsing_error_cb (GtkCssProvider *provider,
basename, gtk_css_section_get_end_line (section) + 1);
g_free (basename);
if (error->domain == GTK_CSS_PROVIDER_ERROR)
append_error_value (errors, GTK_TYPE_CSS_PROVIDER_ERROR, error->code);
if (error->domain == GTK_CSS_PARSER_ERROR)
append_error_value (errors, GTK_TYPE_CSS_PARSER_ERROR, error->code);
else
g_string_append_printf (errors,
"%s %u\n",

4
testsuite/css/parser/text-shadow-invalid-but-worked-in-3.12.errors
View File

@ -1,2 +1,2 @@
text-shadow-invalid-but-worked-in-3.12.css:2: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
text-shadow-invalid-but-worked-in-3.12.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
text-shadow-invalid-but-worked-in-3.12.css:2: error: GTK_CSS_PARSER_ERROR_SYNTAX
text-shadow-invalid-but-worked-in-3.12.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX

62
testsuite/css/parser/value-none.errors
View File

@ -1,31 +1,31 @@
value-none.css:3: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:4: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:6: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:7: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:8: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:9: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:10: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:12: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:13: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:14: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:16: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:17: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:19: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:20: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:22: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:23: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:24: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:25: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:27: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:29: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:31: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:32: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:34: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:35: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:36: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:37: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:38: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:39: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:40: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:41: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:42: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
value-none.css:3: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:4: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:6: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:7: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:8: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:9: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:10: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:12: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:13: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:14: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:16: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:17: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:19: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:20: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:22: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:23: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:24: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:25: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:27: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:29: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:31: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:32: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:34: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:35: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:36: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:37: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:38: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:39: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:40: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:41: error: GTK_CSS_PARSER_ERROR_SYNTAX
value-none.css:42: error: GTK_CSS_PARSER_ERROR_SYNTAX