AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
9e20341775
gtk2/gtk/gtkcssprovider.c

4086 lines
112 KiB
C
Raw Normal View History

Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
/* GTK - The GIMP Toolkit
* Copyright (C) 2010 Carlos Garnacho <carlosg@gnome.org>
*
* 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, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
#include <stdlib.h>
Split out private style context api into a private header
2011-01-23 23:29:07 +00:00
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
#include <gdk-pixbuf/gdk-pixbuf.h>
Use the correct cairo-gobject.h include path.
2010-11-12 20:43:13 +00:00
#include <cairo-gobject.h>
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
Privately export css_provider_get_theme_dir
2011-01-26 16:17:34 +00:00
#include "gtkcssproviderprivate.h"
GtkCssProvider: Parse properties of type GtkAnimationDescription.
2010-08-19 19:50:19 +00:00
#include "gtkanimationdescription.h"
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
#include "gtk9slice.h"
Split out private style context api into a private header
2011-01-23 23:29:07 +00:00
#include "gtkgradient.h"
#include "gtkthemingengine.h"
#include "gtkstyleprovider.h"
#include "gtkstylecontextprivate.h"
win32: include gtkprivate.h for win32 GTK_DATA_PREFIX
2011-01-02 11:11:34 +00:00
#include "gtkprivate.h"
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
/**
* SECTION:gtkcssprovider
* @Short_description: CSS-like styling for widgets
* @Title: GtkCssProvider
* @See_also: #GtkStyleContext, #GtkStyleProvider
*
Some header cleanups Move GtkGradient to their own files, also move GtkBorder out of gtkstyle.h, so that header can be all deprecated.
2010-11-26 01:39:53 +00:00
* GtkCssProvider is an object implementing the #GtkStyleProvider interface.
* It is able to parse <ulink url="http://www.w3.org/TR/CSS2">CSS</ulink>-like
* input in order to style widgets.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
*
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <refsect2 id="gtkcssprovider-files">
* <title>Default files</title>
* <para>
* An application can cause GTK+ to parse a specific CSS style sheet by
* calling gtk_css_provider_load_from_file() and adding the provider with
* gtk_style_context_add_provider() or gtk_style_context_add_provider_for_screen().
* In addition, certain files will be read when GTK+ is initialized. First,
Remove reference to GTK2_RC_FILES from the docs Pointed out in bug 637471.
2010-12-20 15:19:55 +00:00
* the file <filename><envar>$XDG_CONFIG_HOME</envar>/gtk-3.0/gtk.css</filename>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* is loaded if it exists. Then, GTK+ tries to load
Remove reference to GTK2_RC_FILES from the docs Pointed out in bug 637471.
2010-12-20 15:19:55 +00:00
* <filename><envar>$HOME</envar>/.themes/<replaceable>theme-name</replaceable>/gtk-3.0/gtk.css</filename>,
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* falling back to
Remove reference to GTK2_RC_FILES from the docs Pointed out in bug 637471.
2010-12-20 15:19:55 +00:00
* <filename><replaceable>datadir</replaceable>/share/themes/<replaceable>theme-name</replaceable>/gtk-3.0/gtk.css</filename>,
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* where <replaceable>theme-name</replaceable> is the name of the current theme
Fix a tag mismatch in the docs
2010-12-21 23:15:43 +00:00
* (see the #GtkSettings:gtk-theme-name setting) and <replaceable>datadir</replaceable>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* is the prefix configured when GTK+ was compiled, unless overridden by the
* <envar>GTK_DATA_PREFIX</envar> environment variable.
* </para>
* </refsect2>
* <refsect2 id="gtkcssprovider-stylesheets">
* <title>Style sheets</title>
* <para>
* The basic structure of the style sheets understood by this provider is
* a series of statements, which are either rule sets or '@-rules', separated
* by whitespace.
* </para>
* <para>
* A rule set consists of a selector and a declaration block, which is
* a series of declarations enclosed in curly braces ({ and }). The
* declarations are separated by semicolons (;). Multiple selectors can
* share the same declaration block, by putting all the separators in
* front of the block, separated by commas.
* </para>
* <example><title>A rule set with two selectors</title>
* <programlisting language="text">
* GtkButton, GtkEntry {
* color: &num;ff00ea;
* font: Comic Sans 12
* }
* </programlisting>
* </example>
* </refsect2>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <refsect2 id="gtkcssprovider-selectors">
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <title>Selectors</title>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* Selectors work very similar to the way they do in CSS, with widget class
* names taking the role of element names, and widget names taking the role
* of IDs. When used in a selector, widget names must be prefixed with a
* '&num;' character. The '*' character represents the so-called universal
* selector, which matches any widget.
* </para>
* <para>
* To express more complicated situations, selectors can be combined in
* various ways:
* <itemizedlist>
* <listitem><para>To require that a widget satisfies several conditions,
* combine several selectors into one by concatenating them. E.g.
* <literal>GtkButton&num;button1</literal> matches a GtkButton widget
* with the name button1.</para></listitem>
* <listitem><para>To only match a widget when it occurs inside some other
* widget, write the two selectors after each other, separated by whitespace.
* E.g. <literal>GtkToolBar GtkButton</literal> matches GtkButton widgets
* that occur inside a GtkToolBar.</para></listitem>
* <listitem><para>In the previous example, the GtkButton is matched even
* if it occurs deeply nested inside the toolbar. To restrict the match
* to direct children of the parent widget, insert a '>' character between
* the two selectors. E.g. <literal>GtkNotebook > GtkLabel</literal> matches
* GtkLabel widgets that are direct children of a GtkNotebook.</para></listitem>
* </itemizedlist>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
* <example>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <title>Widget classes and names in selectors</title>
* <programlisting language="text">
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* /&ast; Theme labels that are descendants of a window &ast;/
* GtkWindow GtkLabel {
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* background-color: &num;898989
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
*
* /&ast; Theme notebooks, and anything that's within these &ast;/
* GtkNotebook {
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* background-color: &num;a939f0
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
*
* /&ast; Theme combo boxes, and entries that
* are direct children of a notebook &ast;/
* GtkComboBox,
* GtkNotebook > GtkEntry {
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* color: @fg_color;
* background-color: &num;1209a2
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
*
* /&ast; Theme any widget within a GtkBin &ast;/
* GtkBin * {
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* font-name: Sans 20
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
*
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* /&ast; Theme a label named title-label &ast;/
* GtkLabel&num;title-label {
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* font-name: Sans 15
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
*
* /&ast; Theme any widget named main-entry &ast;/
* &num;main-entry {
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* background-color: &num;f0a810
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
* </programlisting>
* </example>
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* Widgets may also define style classes, which can be used for matching.
* When used in a selector, style classes must be prefixed with a '.'
* character.
* </para>
* <para>
* Refer to the documentation of individual widgets to learn which
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
* style classes they define and see <xref linkend="gtkstylecontext-classes"/>
* for a list of all style classes used by GTK+ widgets.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
Mention type vs region ambiguity in the docs
2011-01-19 17:55:48 +00:00
* <para>
* Note that there is some ambiguity in the selector syntax when it comes
* to differentiation widget class names from regions. GTK+ currently treats
* a string as a widget class name if it contains any uppercase characters
* (which should work for more widgets with names like GtkLabel).
* </para>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <example>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <title>Style classes in selectors</title>
* <programlisting language="text">
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* /&ast; Theme all widgets defining the class entry &ast;/
* .entry {
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
* color: &num;39f1f9;
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
*
* /&ast; Theme spinbuttons' entry &ast;/
* GtkSpinButton.entry {
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* color: &num;900185
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
* </programlisting>
* </example>
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* In complicated widgets like e.g. a GtkNotebook, it may be desirable
* to style different parts of the widget differently. To make this
* possible, container widgets may define regions, whose names
* may be used for matching in selectors.
* </para>
* <para>
* Some containers allow to further differentiate between regions by
* applying so-called pseudo-classes to the region. For example, the
* tab region in GtkNotebook allows to single out the first or last
* tab by using the :first-child or :last-child pseudo-class.
* When used in selectors, pseudo-classes must be prefixed with a
* ':' character.
* </para>
* <para>
* Refer to the documentation of individual widgets to learn which
Add list of classes and regions to the docs
2010-11-26 04:49:07 +00:00
* regions and pseudo-classes they define and see
* <xref linkend="gtkstylecontext-classes"/> for a list of all regions
* used by GTK+ widgets.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
* <example>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <title>Regions in selectors</title>
* <programlisting language="text">
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* /&ast; Theme any label within a notebook &ast;/
* GtkNotebook GtkLabel {
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
* color: &num;f90192;
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
*
* /&ast; Theme labels within notebook tabs &ast;/
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* GtkNotebook tab GtkLabel {
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
* color: &num;703910;
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
*
* /&ast; Theme labels in the any first notebook
* tab, both selectors are equivalent &ast;/
* GtkNotebook tab:nth-child(first) GtkLabel,
* GtkNotebook tab:first-child GtkLabel {
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
* color: &num;89d012;
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* }
* </programlisting>
* </example>
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* Another use of pseudo-classes is to match widgets depending on their
* state. This is conceptually similar to the :hover, :active or :focus
* pseudo-classes in CSS. The available pseudo-classes for widget states
* are :active, :prelight (or :hover), :insensitive, :selected, :focused
* and :inconsistent.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
* <example>
* <title>Styling specific widget states</title>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <programlisting language="text">
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* /&ast; Theme active (pressed) buttons &ast;/
* GtkButton:active {
* background-color: &num;0274d9;
* }
*
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* /&ast; Theme buttons with the mouse pointer on it,
* both are equivalent &ast;/
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* GtkButton:hover,
* GtkButton:prelight {
* background-color: &num;3085a9;
* }
*
* /&ast; Theme insensitive widgets, both are equivalent &ast;/
* :insensitive,
* *:insensitive {
* background-color: &num;320a91;
* }
*
* /&ast; Theme selection colors in entries &ast;/
* GtkEntry:selected {
* background-color: &num;56f9a0;
* }
*
* /&ast; Theme focused labels &ast;/
* GtkLabel:focused {
* background-color: &num;b4940f;
* }
*
* /&ast; Theme inconsistent checkbuttons &ast;/
* GtkCheckButton:inconsistent {
* background-color: &num;20395a;
* }
* </programlisting>
* </example>
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* Widget state pseudoclasses may only apply to the last element
* in a selector.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* To determine the effective style for a widget, all the matching rule
* sets are merged. As in CSS, rules apply by specificity, so the rules
* whose selectors more closely match a widget path will take precedence
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* over the others.
* </para>
* </refsect2>
* <refsect2 id="gtkcssprovider-rules">
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <title>&commat; Rules</title>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* GTK+'s CSS supports the &commat;import rule, in order to load another
* CSS style sheet in addition to the currently parsed one.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
* <example>
* <title>Using the &commat;import rule</title>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <programlisting language="text">
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* &commat;import url ("path/to/common.css");
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </programlisting>
* </example>
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* GTK+ also supports an additional &commat;define-color rule, in order
* to define a color name which may be used instead of color numeric
* representations. Also see the #GtkSettings:gtk-color-scheme setting
* for a way to override the values of these named colors.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
* <example>
* <title>Defining colors</title>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <programlisting language="text">
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* &commat;define-color bg_color &num;f9a039;
*
* &ast; {
* background-color: &commat;bg_color;
* }
* </programlisting>
* </example>
* </refsect2>
* <refsect2 id="gtkcssprovider-symbolic-colors">
* <title>Symbolic colors</title>
* <para>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* Besides being able to define color names, the CSS parser is also able
* to read different color expressions, which can also be nested, providing
* a rich language to define colors which are derived from a set of base
* colors.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
* <example>
* <title>Using symbolic colors</title>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <programlisting language="text">
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* &commat;define-color entry-color shade (&commat;bg_color, 0.7);
*
* GtkEntry {
* background-color: @entry-color;
* }
*
* GtkEntry:focused {
* background-color: mix (&commat;entry-color,
* shade (&num;fff, 0.5),
* 0.8);
* }
* </programlisting>
* </example>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <para>
* The various ways to express colors in GTK+ CSS are:
* </para>
* <informaltable>
* <tgroup cols="3">
* <thead>
* <row>
* <entry>Syntax</entry>
* <entry>Explanation</entry>
* <entry>Examples</entry>
* </row>
* </thead>
* <tbody>
* <row>
* <entry>rgb(@r, @g, @b)</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>An opaque color; @r, @g, @b can be either integers between
* 0 and 255 or percentages</entry>
* <entry><literallayout>rgb(128, 10, 54)
* rgb(20%, 30%, 0%)</literallayout></entry>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* </row>
* <row>
* <entry>rgba(@r, @g, @b, @a)</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>A translucent color; @r, @g, @b are as in the previous row,
* @a is a floating point number between 0 and 1</entry>
* <entry><literallayout>rgba(255, 255, 0, 0.5)</literallayout></entry>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* </row>
* <row>
* <entry>&num;@xxyyzz</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>An opaque color; @xx, @yy, @zz are hexadecimal numbers
* specifying @r, @g, @b variants with between 1 and 4
* hexadecimal digits per component are allowed</entry>
* <entry><literallayout>&num;ff12ab
* &num;f0c</literallayout></entry>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* </row>
* <row>
* <entry>&commat;name</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>Reference to a color that has been defined with
* &commat;define-color
* </entry>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <entry>&commat;bg_color</entry>
* </row>
* <row>
* <entry>mix(@color1, @color2, @f)</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>A linear combination of @color1 and @color2. @f is a
* floating point number between 0 and 1.</entry>
* <entry><literallayout>mix(&num;ff1e0a, &commat;bg_color, 0.8)</literallayout></entry>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* </row>
* <row>
* <entry>shade(@color, @f)</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>A lighter or darker variant of @color. @f is a
* floating point number.
* </entry>
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
* <entry>shade(&commat;fg_color, 0.5)</entry>
* </row>
* <row>
* <entry>lighter(@color)</entry>
* <entry>A lighter variant of @color</entry>
* </row>
* <row>
* <entry>darker(@color)</entry>
* <entry>A darker variant of @color</entry>
* </row>
* </tbody>
* </tgroup>
* </informaltable>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </refsect2>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <refsect2 id="gtkcssprovider-gradients">
* <title>Gradients</title>
* <para>
* Linear or radial Gradients can be used as background images.
* </para>
* <para>
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* A linear gradient along the line from (@start_x, @start_y) to
* (@end_x, @end_y) is specified using the syntax
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <literallayout>-gtk-gradient (linear,
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* @start_x @start_y, @end_x @end_y,
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* color-stop (@position, @color),
* ...)</literallayout>
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* where @start_x and @end_x can be either a floating point number between
* 0 and 1 or one of the special values 'left', 'right' or 'center', @start_y
* and @end_y can be either a floating point number between 0 and 1 or one
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* of the special values 'top', 'bottom' or 'center', @position is a floating
* point number between 0 and 1 and @color is a color expression (see above).
* The color-stop can be repeated multiple times to add more than one color
* stop. 'from (@color)' and 'to (@color)' can be used as abbreviations for
* color stops with position 0 and 1, respectively.
* </para>
* <example>
* <title>A linear gradient</title>
* <inlinegraphic fileref="gradient1.png" format="PNG"/>
* <para>This gradient was specified with
* <literallayout>-gtk-gradient (linear,
* left top, right bottom,
* from(&commat;yellow), to(&commat;blue))</literallayout></para>
* </example>
* <example>
* <title>Another linear gradient</title>
* <inlinegraphic fileref="gradient2.png" format="PNG"/>
* <para>This gradient was specified with
* <literallayout>-gtk-gradient (linear,
* 0 0, 0 1,
* color-stop(0, &commat;yellow),
* color-stop(0.2, &commat;blue),
* color-stop(1, &num;0f0))</literallayout></para>
* </example>
* <para>
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* A radial gradient along the two circles defined by (@start_x, @start_y,
* @start_radius) and (@end_x, @end_y, @end_radius) is specified using the
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* syntax
* <literallayout>-gtk-gradient (radial,
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* @start_x @start_y, @start_radius,
* @end_x @end_y, @end_radius,
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* color-stop (@position, @color),
* ...)</literallayout>
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* where @start_radius and @end_radius are floating point numbers and
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* the other parameters are as before.
* </para>
* <example>
* <title>A radial gradient</title>
* <inlinegraphic fileref="gradient3.png" format="PNG"/>
* <para>This gradient was specified with
* <literallayout>-gtk-gradient (radial,
* center center, 0,
* center center, 1,
* from(&commat;yellow), to(&commat;green))</literallayout></para>
* </example>
* <example>
* <title>Another radial gradient</title>
* <inlinegraphic fileref="gradient4.png" format="PNG"/>
* <para>This gradient was specified with
Document border images better
2010-11-22 16:15:47 +00:00
* <literallayout>-gtk-gradient (radial,
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* 0.4 0.4, 0.1,
* 0.6 0.6, 0.7,
* color-stop (0, &num;f00),
* color-stop (0.1, &num;a0f),
* color-stop (0.2, &commat;yellow),
* color-stop (1, &commat;green))</literallayout></para>
* </example>
* </refsect2>
Document border images better
2010-11-22 16:15:47 +00:00
* <refsect2 id="gtkcssprovider-slices">
Tweak wording
2010-11-22 16:18:27 +00:00
* <title>Border images</title>
Document border images better
2010-11-22 16:15:47 +00:00
* <para>
* Images can be used in 'slices' for the purpose of creating scalable
* borders.
* </para>
* <inlinegraphic fileref="slices.png" format="PNG"/>
* <para>
* The syntax for specifying border images of this kind is:
* <literallayout>url(@path) @top @right @bottom @left [repeat|stretch]? [repeat|stretch]?</literallayout>
* The sizes of the 'cut off' portions are specified
* with the @top, @right, @bottom and @left parameters.
* The 'middle' sections can be repeated or stretched to create
* the desired effect, by adding the 'repeat' or 'stretch' options after
* the dimensions. If two options are specified, the first one affects
* the horizontal behaviour and the second one the vertical behaviour.
* If only one option is specified, it affects both.
* </para>
* <example>
* <title>A border image</title>
* <inlinegraphic fileref="border1.png" format="PNG"/>
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* <para>This border image was specified with
* <literallayout>url("gradient1.png") 10 10 10 10</literallayout>
* </para>
Document border images better
2010-11-22 16:15:47 +00:00
* </example>
* <example>
* <title>A repeating border image</title>
* <inlinegraphic fileref="border2.png" format="PNG"/>
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* <para>This border image was specified with
* <literallayout>url("gradient1.png") 10 10 10 10 repeat</literallayout>
* </para>
Document border images better
2010-11-22 16:15:47 +00:00
* </example>
* <example>
* <title>A stretched border image</title>
* <inlinegraphic fileref="border3.png" format="PNG"/>
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* <para>This border image was specified with
* <literallayout>url("gradient1.png") 10 10 10 10 stretch</literallayout>
* </para>
Document border images better
2010-11-22 16:15:47 +00:00
* </example>
* </refsect2>
More documentation reshuffling
2010-11-22 20:12:42 +00:00
* <refsect2 id="gtkcssprovider-transitions">
* <para>Styles can specify transitions that will be used to create a gradual
* change in the appearance when a widget state changes. The following
* syntax is used to specify transitions:
* <literallayout>@duration [s|ms] [linear|ease|ease-in|ease-out|ease-in-out] [loop]?</literallayout>
* The @duration is the amount of time that the animation will take for
* a complete cycle from start to end. If the loop option is given, the
* animation will be repated until the state changes again.
* The option after the duration determines the transition function from a
* small set of predefined functions.
* <figure><title>Linear transition</title>
* <graphic fileref="linear.png" format="PNG"/>
* </figure>
* <figure><title>Ease transition</title>
* <graphic fileref="ease.png" format="PNG"/>
* </figure>
* <figure><title>Ease-in-out transition</title>
* <graphic fileref="ease-in-out.png" format="PNG"/>
* </figure>
* <figure><title>Ease-in transition</title>
* <graphic fileref="ease-in.png" format="PNG"/>
* </figure>
* <figure><title>Ease-out transition</title>
* <graphic fileref="ease-out.png" format="PNG"/>
* </figure>
* </para>
* </refsect2>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <refsect2 id="gtkcssprovider-properties">
* <title>Supported properties</title>
* <para>
* Properties are the part that differ the most to common CSS,
* not all properties are supported (some are planned to be
* supported eventually, some others are meaningless or don't
* map intuitively in a widget based environment).
* </para>
* <para>
* There is also a difference in shorthand properties, for
* example in common CSS it is fine to define a font through
* the different @font-family, @font-style, @font-size
* properties, meanwhile in GTK+'s CSS only the canonical
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
* @font property is supported.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </para>
* <para>
* The currently supported properties are:
* </para>
* <informaltable>
* <tgroup cols="4">
* <thead>
* <row>
* <entry>Property name</entry>
* <entry>Syntax</entry>
* <entry>Maps to</entry>
* <entry>Examples</entry>
* </row>
* </thead>
* <tbody>
* <row>
* <entry>engine</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>engine-name</entry>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <entry>#GtkThemingEngine</entry>
Mention gvfs in the gtk_show_uri() docs https://bugzilla.gnome.org/show_bug.cgi?id=622125
2011-01-04 16:25:40 +00:00
* <entry>engine: clearlooks;
* engine: none; /&ast; use the default (i.e. builtin) engine) &ast;/ </entry>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </row>
* <row>
* <entry>background-color</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry morerows="2">color (see above)</entry>
* <entry morerows="2">#GdkRGBA</entry>
* <entry morerows="2"><literallayout>background-color: &num;fff;
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* color: &amp;color1;
* background-color: shade (&amp;color1, 0.5);
* color: mix (&amp;color1, &num;f0f, 0.8);</literallayout>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </entry>
* </row>
* <row>
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
* <entry>color</entry>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </row>
* <row>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>border-color</entry>
* </row>
* <row>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <entry>font</entry>
Document border images better
2010-11-22 16:15:47 +00:00
* <entry>@family [@style] [@size]</entry>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <entry>#PangoFontDescription</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>font: Sans 15;</entry>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </row>
* <row>
* <entry>margin</entry>
Document border images better
2010-11-22 16:15:47 +00:00
* <entry morerows="1"><literallayout>@width
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* @vertical_width @horizontal_width
* @top_width @horizontal_width @bottom_width
* @top_width @right_width @bottom_width @left_width</literallayout>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </entry>
* <entry morerows="1">#GtkBorder</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry morerows="1"><literallayout>margin: 5;
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* margin: 5 10;
* margin: 5 10 3;
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* margin: 5 10 3 5;</literallayout>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </entry>
* </row>
* <row>
* <entry>padding</entry>
* </row>
* <row>
* <entry>background-image</entry>
Allow images for background-image In addition to -gtk-gradient(...), allow url(path), and create a pattern from the image. Still to do: allow stretch/repeat options.
2010-11-26 05:43:16 +00:00
* <entry><literallayout>gradient (see above) or
* url(@path)</literallayout></entry>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <entry>#cairo_pattern_t</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry><literallayout>-gtk-gradient (linear,
GtkCssProvider: Docs fix for -gtk-gradient() syntax.
2010-11-13 12:27:37 +00:00
* left top, right top,
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* from (&num;fff), to (&num;000));
* -gtk-gradient (linear, 0.0 0.5, 0.5 1.0,
* from (&num;fff),
* color-stop (0.5, &num;f00),
* to (&num;000));
* -gtk-gradient (radial,
* center center, 0.2,
* center center, 0.8,
* color-stop (0.0, &num;fff),
Allow images for background-image In addition to -gtk-gradient(...), allow url(path), and create a pattern from the image. Still to do: allow stretch/repeat options.
2010-11-26 05:43:16 +00:00
* color-stop (1.0, &num;000));
* url ('background.png');</literallayout>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </entry>
* </row>
* <row>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry>border-width</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>border-width: 5;</entry>
* </row>
* <row>
* <entry>border-radius</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>border-radius: 5;</entry>
* </row>
* <row>
* <entry>border-style</entry>
* <entry>[none|solid|inset|outset]</entry>
* <entry>#GtkBorderStyle</entry>
* <entry>border-style: solid;</entry>
* </row>
* <row>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* <entry>border-image</entry>
Document border images better
2010-11-22 16:15:47 +00:00
* <entry><literallayout>border image (see above)</literallayout></entry>
Declare transition and border-image properties to be writeonly We don't make the types of their values public, so getting their values is useless and will leak.
2010-11-23 13:24:49 +00:00
* <entry>internal use only</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry><literallayout>border-image: url("/path/to/image.png") 3 4 3 4 stretch;
* border-image: url("/path/to/image.png") 3 4 4 3 repeat stretch;</literallayout>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </entry>
* </row>
* <row>
* <entry>transition</entry>
More documentation reshuffling
2010-11-22 20:12:42 +00:00
* <entry>transition (see above)</entry>
Declare transition and border-image properties to be writeonly We don't make the types of their values public, so getting their values is useless and will leak.
2010-11-23 13:24:49 +00:00
* <entry>internal use only</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* <entry><literallayout>transition: 150ms ease-in-out;
* transition: 1s linear loop;</literallayout>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </entry>
* </row>
* </tbody>
* </tgroup>
* </informaltable>
Improve some gtk_render_ docs With pictures !!
2010-11-23 06:05:11 +00:00
* <para>
* GtkThemingEngines can register their own, engine-specific style properties
* with the function gtk_theming_engine_register_property(). These properties
* can be set in CSS like other properties, using a name of the form
* <literallayout>-<replaceable>namespace</replaceable>-<replaceable>name</replaceable></literallayout>, where <replaceable>namespace</replaceable> is typically
* the name of the theming engine, and <replaceable>name</replaceable> is the
* name of the property. Style properties that have been registered by widgets
* using gtk_widget_class_install_style_property() can also be set in this
* way, using the widget class name for <replaceable>namespace</replaceable>.
* </para>
* <example>
* <title>Using engine-specific style properties</title>
* <programlisting>
* * {
* engine: clearlooks;
* border-radius: 4;
* -GtkPaned-handle-size: 6;
* -clearlooks-colorize-scrollbar: false;
* }
* </programlisting>
* </example>
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* </refsect2>
*/
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
typedef struct GtkCssProviderPrivate GtkCssProviderPrivate;
typedef struct SelectorElement SelectorElement;
typedef struct SelectorPath SelectorPath;
typedef struct SelectorStyleInfo SelectorStyleInfo;
typedef enum SelectorElementType SelectorElementType;
GtkCssProvider: Add support for child/descendant combinators. Now, selectors like: GtkWindow > GtkButton {} GtkNotebook > GtkLabel {} will represent a direct parent/child relation between both elements, while GtkWindow GtkButton {} GtkNotebook GtkLabel {} will allow intermediate children between these.
2010-04-16 01:02:42 +00:00
typedef enum CombinatorType CombinatorType;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
typedef enum ParserScope ParserScope;
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
typedef enum ParserSymbol ParserSymbol;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
enum SelectorElementType {
SELECTOR_TYPE_NAME,
SELECTOR_NAME,
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
SELECTOR_GTYPE,
GtkCssProvider: Add named regions to selector path.
2010-04-20 23:48:01 +00:00
SELECTOR_REGION,
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
SELECTOR_CLASS,
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
SELECTOR_GLOB
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
};
GtkCssProvider: Add support for child/descendant combinators. Now, selectors like: GtkWindow > GtkButton {} GtkNotebook > GtkLabel {} will represent a direct parent/child relation between both elements, while GtkWindow GtkButton {} GtkNotebook GtkLabel {} will allow intermediate children between these.
2010-04-16 01:02:42 +00:00
enum CombinatorType {
COMBINATOR_DESCENDANT, /* No direct relation needed */
COMBINATOR_CHILD /* Direct child */
};
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
struct SelectorElement
{
SelectorElementType elem_type;
GtkCssProvider: Add support for child/descendant combinators. Now, selectors like: GtkWindow > GtkButton {} GtkNotebook > GtkLabel {} will represent a direct parent/child relation between both elements, while GtkWindow GtkButton {} GtkNotebook GtkLabel {} will allow intermediate children between these.
2010-04-16 01:02:42 +00:00
CombinatorType combinator;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
union
{
GQuark name;
GType type;
GtkCssProvider: Add named regions to selector path.
2010-04-20 23:48:01 +00:00
struct
{
GQuark name;
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
GtkRegionFlags flags;
GtkCssProvider: Add named regions to selector path.
2010-04-20 23:48:01 +00:00
} region;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
};
};
struct SelectorPath
{
GSList *elements;
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
GtkStateFlags state;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
guint ref_count;
};
struct SelectorStyleInfo
{
SelectorPath *path;
GHashTable *style;
};
struct GtkCssProviderPrivate
{
GScanner *scanner;
GtkCssProvider: Fix compile warning.
2010-06-25 16:46:59 +00:00
gchar *filename;
GtkCssProvider: set scanner->input_name.
2010-06-19 14:04:30 +00:00
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
const gchar *buffer;
const gchar *value_pos;
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GHashTable *symbolic_colors;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GPtrArray *selectors_info;
/* Current parser state */
GSList *state;
GSList *cur_selectors;
GHashTable *cur_properties;
};
enum ParserScope {
SCOPE_SELECTOR,
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
SCOPE_PSEUDO_CLASS,
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
SCOPE_NTH_CHILD,
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
SCOPE_DECLARATION,
SCOPE_VALUE
};
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
/* Extend GtkStateType, since these
* values are also used as symbols
*/
enum ParserSymbol {
/* Scope: pseudo-class */
Remove GTK_STATE_LAST. It didn't turn out to be that useful, nor widely used.
2010-11-12 20:44:48 +00:00
SYMBOL_NTH_CHILD = GTK_STATE_FOCUSED + 1,
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
SYMBOL_FIRST_CHILD,
SYMBOL_LAST_CHILD,
GtkCssProvider: Parse default/sorted region flags.
2010-10-19 11:00:07 +00:00
SYMBOL_SORTED_CHILD,
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
/* Scope: nth-child */
SYMBOL_NTH_CHILD_EVEN,
SYMBOL_NTH_CHILD_ODD,
SYMBOL_NTH_CHILD_FIRST,
SYMBOL_NTH_CHILD_LAST
};
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
static void gtk_css_provider_finalize (GObject *object);
static void gtk_css_style_provider_iface_init (GtkStyleProviderIface *iface);
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
static void scanner_apply_scope (GScanner *scanner,
ParserScope scope);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
static gboolean css_provider_parse_value (GtkCssProvider *css_provider,
const gchar *value_str,
GValue *value,
GError **error);
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
static gboolean gtk_css_provider_load_from_path_internal (GtkCssProvider *css_provider,
const gchar *path,
gboolean reset,
GError **error);
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
GQuark
gtk_css_provider_error_quark (void)
{
return g_quark_from_static_string ("gtk-css-provider-error-quark");
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
G_DEFINE_TYPE_EXTENDED (GtkCssProvider, gtk_css_provider, G_TYPE_OBJECT, 0,
G_IMPLEMENT_INTERFACE (GTK_TYPE_STYLE_PROVIDER,
gtk_css_style_provider_iface_init));
static void
gtk_css_provider_class_init (GtkCssProviderClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gtk_css_provider_finalize;
g_type_class_add_private (object_class, sizeof (GtkCssProviderPrivate));
}
static SelectorPath *
selector_path_new (void)
{
SelectorPath *path;
path = g_slice_new0 (SelectorPath);
path->ref_count = 1;
return path;
}
static SelectorPath *
selector_path_ref (SelectorPath *path)
{
path->ref_count++;
return path;
}
static void
selector_path_unref (SelectorPath *path)
{
path->ref_count--;
if (path->ref_count > 0)
return;
while (path->elements)
{
GtkCssProvider: Fix typo freeing SelectorElements.
2010-04-16 00:59:36 +00:00
g_slice_free (SelectorElement, path->elements->data);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
path->elements = g_slist_delete_link (path->elements, path->elements);
}
g_slice_free (SelectorPath, path);
}
static void
selector_path_prepend_type (SelectorPath *path,
const gchar *type_name)
{
SelectorElement *elem;
GType type;
elem = g_slice_new (SelectorElement);
GtkCssProvider: Add support for child/descendant combinators. Now, selectors like: GtkWindow > GtkButton {} GtkNotebook > GtkLabel {} will represent a direct parent/child relation between both elements, while GtkWindow GtkButton {} GtkNotebook GtkLabel {} will allow intermediate children between these.
2010-04-16 01:02:42 +00:00
elem->combinator = COMBINATOR_DESCENDANT;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
type = g_type_from_name (type_name);
if (type == G_TYPE_INVALID)
{
elem->elem_type = SELECTOR_TYPE_NAME;
elem->name = g_quark_from_string (type_name);
}
else
{
elem->elem_type = SELECTOR_GTYPE;
elem->type = type;
}
path->elements = g_slist_prepend (path->elements, elem);
}
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
static void
selector_path_prepend_glob (SelectorPath *path)
{
SelectorElement *elem;
elem = g_slice_new (SelectorElement);
elem->elem_type = SELECTOR_GLOB;
GtkCssProvider: Add support for child/descendant combinators. Now, selectors like: GtkWindow > GtkButton {} GtkNotebook > GtkLabel {} will represent a direct parent/child relation between both elements, while GtkWindow GtkButton {} GtkNotebook GtkLabel {} will allow intermediate children between these.
2010-04-16 01:02:42 +00:00
elem->combinator = COMBINATOR_DESCENDANT;
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
path->elements = g_slist_prepend (path->elements, elem);
}
GtkCssProvider: Add named regions to selector path.
2010-04-20 23:48:01 +00:00
static void
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
selector_path_prepend_region (SelectorPath *path,
const gchar *name,
GtkRegionFlags flags)
GtkCssProvider: Add named regions to selector path.
2010-04-20 23:48:01 +00:00
{
SelectorElement *elem;
elem = g_slice_new (SelectorElement);
elem->combinator = COMBINATOR_DESCENDANT;
elem->elem_type = SELECTOR_REGION;
elem->region.name = g_quark_from_string (name);
elem->region.flags = flags;
path->elements = g_slist_prepend (path->elements, elem);
}
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
static void
selector_path_prepend_name (SelectorPath *path,
const gchar *name)
{
SelectorElement *elem;
elem = g_slice_new (SelectorElement);
elem->combinator = COMBINATOR_DESCENDANT;
elem->elem_type = SELECTOR_NAME;
elem->name = g_quark_from_string (name);
path->elements = g_slist_prepend (path->elements, elem);
}
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
static void
selector_path_prepend_class (SelectorPath *path,
const gchar *name)
{
SelectorElement *elem;
elem = g_slice_new (SelectorElement);
elem->combinator = COMBINATOR_DESCENDANT;
elem->elem_type = SELECTOR_CLASS;
elem->name = g_quark_from_string (name);
path->elements = g_slist_prepend (path->elements, elem);
}
GtkCssProvider: Add support for child/descendant combinators. Now, selectors like: GtkWindow > GtkButton {} GtkNotebook > GtkLabel {} will represent a direct parent/child relation between both elements, while GtkWindow GtkButton {} GtkNotebook GtkLabel {} will allow intermediate children between these.
2010-04-16 01:02:42 +00:00
static void
selector_path_prepend_combinator (SelectorPath *path,
CombinatorType combinator)
{
SelectorElement *elem;
g_assert (path->elements != NULL);
/* It is actually stored in the last element */
elem = path->elements->data;
elem->combinator = combinator;
}
GtkCssProvider: Allow empty selector. universal selector is implied, so things like this work: :active {} :insensitive{}
2010-04-15 23:44:50 +00:00
static gint
selector_path_depth (SelectorPath *path)
{
return g_slist_length (path->elements);
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
static SelectorStyleInfo *
selector_style_info_new (SelectorPath *path)
{
SelectorStyleInfo *info;
info = g_slice_new0 (SelectorStyleInfo);
info->path = selector_path_ref (path);
return info;
}
static void
selector_style_info_free (SelectorStyleInfo *info)
{
if (info->style)
g_hash_table_unref (info->style);
if (info->path)
selector_path_unref (info->path);
Plugged leak in gtkcssprovider.c SelectorStyleInfo structs were never freed.
2011-01-16 11:52:43 +00:00
g_slice_free (SelectorStyleInfo, info);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
static void
selector_style_info_set_style (SelectorStyleInfo *info,
GHashTable *style)
{
if (info->style)
g_hash_table_unref (info->style);
if (style)
info->style = g_hash_table_ref (style);
else
info->style = NULL;
}
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
static GScanner *
create_scanner (void)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
GScanner *scanner;
scanner = g_scanner_new (NULL);
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "active", GUINT_TO_POINTER (GTK_STATE_ACTIVE));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "prelight", GUINT_TO_POINTER (GTK_STATE_PRELIGHT));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "hover", GUINT_TO_POINTER (GTK_STATE_PRELIGHT));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "selected", GUINT_TO_POINTER (GTK_STATE_SELECTED));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "insensitive", GUINT_TO_POINTER (GTK_STATE_INSENSITIVE));
GtkCssProvider: Parse missing widget states.
2010-10-19 10:59:19 +00:00
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "inconsistent", GUINT_TO_POINTER (GTK_STATE_INCONSISTENT));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "focused", GUINT_TO_POINTER (GTK_STATE_FOCUSED));
Documentation improvements This patch adds more detail to the explanation of CSS, and also adds documentation about which files are read. We also make :focus an alternative to :focused (since :focus is a standard CSS pseudo-class).
2010-11-20 05:22:29 +00:00
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "focus", GUINT_TO_POINTER (GTK_STATE_FOCUSED));
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "nth-child", GUINT_TO_POINTER (SYMBOL_NTH_CHILD));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "first-child", GUINT_TO_POINTER (SYMBOL_FIRST_CHILD));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "last-child", GUINT_TO_POINTER (SYMBOL_LAST_CHILD));
GtkCssProvider: Parse default/sorted region flags.
2010-10-19 11:00:07 +00:00
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "sorted", GUINT_TO_POINTER (SYMBOL_SORTED_CHILD));
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
g_scanner_scope_add_symbol (scanner, SCOPE_NTH_CHILD, "even", GUINT_TO_POINTER (SYMBOL_NTH_CHILD_EVEN));
g_scanner_scope_add_symbol (scanner, SCOPE_NTH_CHILD, "odd", GUINT_TO_POINTER (SYMBOL_NTH_CHILD_ODD));
g_scanner_scope_add_symbol (scanner, SCOPE_NTH_CHILD, "first", GUINT_TO_POINTER (SYMBOL_NTH_CHILD_FIRST));
g_scanner_scope_add_symbol (scanner, SCOPE_NTH_CHILD, "last", GUINT_TO_POINTER (SYMBOL_NTH_CHILD_LAST));
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner_apply_scope (scanner, SCOPE_SELECTOR);
return scanner;
}
static void
gtk_css_provider_init (GtkCssProvider *css_provider)
{
GtkCssProviderPrivate *priv;
priv = css_provider->priv = G_TYPE_INSTANCE_GET_PRIVATE (css_provider,
GTK_TYPE_CSS_PROVIDER,
GtkCssProviderPrivate);
priv->selectors_info = g_ptr_array_new_with_free_func ((GDestroyNotify) selector_style_info_free);
priv->scanner = create_scanner ();
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
priv->symbolic_colors = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) gtk_symbolic_color_unref);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
typedef struct ComparePathData ComparePathData;
struct ComparePathData
{
guint64 score;
SelectorPath *path;
GSList *iter;
};
static gboolean
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
compare_selector_element (GtkWidgetPath *path,
guint index,
SelectorElement *elem,
guint8 *score)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
*score = 0;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (elem->elem_type == SELECTOR_TYPE_NAME)
{
const gchar *type_name;
GType resolved_type;
/* Resolve the type name */
type_name = g_quark_to_string (elem->name);
resolved_type = g_type_from_name (type_name);
if (resolved_type == G_TYPE_INVALID)
{
/* Type couldn't be resolved, so the selector
* clearly doesn't affect the given widget path
*/
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
return FALSE;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
elem->elem_type = SELECTOR_GTYPE;
elem->type = resolved_type;
}
if (elem->elem_type == SELECTOR_GTYPE)
{
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
GType type;
widgetpath: allow GTypes non-derived from GTK_TYPE_WIDGET This makes things like GtkCellRenderer or GtkNumerableIcon more easily themeable. https://bugzilla.gnome.org/show_bug.cgi?id=637169
2010-12-13 16:54:02 +00:00
type = gtk_widget_path_iter_get_object_type (path, index);
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (!g_type_is_a (type, elem->type))
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
return FALSE;
if (type == elem->type)
*score |= 0xF;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
else
{
GType parent = type;
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
*score = 0xE;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
while ((parent = g_type_parent (parent)) != G_TYPE_INVALID)
{
if (parent == elem->type)
break;
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
*score -= 1;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
if (*score == 1)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
g_warning ("Hierarchy is higher than expected.");
break;
}
}
}
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
return TRUE;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
GtkCssProvider: Compare GtkWidgetPath regions with css.
2010-04-22 23:31:44 +00:00
else if (elem->elem_type == SELECTOR_REGION)
{
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
GtkRegionFlags flags;
GtkCssProvider: Compare GtkWidgetPath regions with css.
2010-04-22 23:31:44 +00:00
Compare region names as quarks in style matching.
2010-08-04 10:19:23 +00:00
if (!gtk_widget_path_iter_has_qregion (path, index,
elem->region.name,
&flags))
GtkCssProvider: Compare GtkWidgetPath regions with css.
2010-04-22 23:31:44 +00:00
return FALSE;
if (elem->region.flags != 0 &&
(flags & elem->region.flags) == 0)
return FALSE;
*score = 0xF;
return TRUE;
}
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
else if (elem->elem_type == SELECTOR_GLOB)
{
/* Treat as lowest matching type */
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
*score = 1;
return TRUE;
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
}
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
else if (elem->elem_type == SELECTOR_NAME)
{
Compare widget names as GQuarks in style matching.
2010-08-04 11:11:50 +00:00
if (!gtk_widget_path_iter_has_qname (path, index, elem->name))
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
return FALSE;
*score = 0xF;
return TRUE;
}
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
else if (elem->elem_type == SELECTOR_CLASS)
{
if (!gtk_widget_path_iter_has_qclass (path, index, elem->name))
return FALSE;
*score = 0xF;
return TRUE;
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
return FALSE;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
static guint64
compare_selector (GtkWidgetPath *path,
SelectorPath *selector)
{
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
GSList *elements = selector->elements;
GtkCssProvider: Make selectors applying from the topmost widget rank higher For example, for an entry within a notebook, previously these 2 rules would have the same weight: .entry {} .notebook {} Now ".entry" will rank higher than ".notebook" for the GtkEntry, further specific selectors such as: .notebook .entry {} still get a higher score than the previous ones.
2010-12-13 11:44:29 +00:00
gboolean match = TRUE, first = TRUE, first_match = FALSE;
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
guint64 score = 0;
GtkCssProvider: Run through the widget path in the correct order. Comparing a selector with a widget path was being done backwards since the change to use GtkContainer::get_path_for_child().
2010-10-20 15:37:00 +00:00
gint i;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Run through the widget path in the correct order. Comparing a selector with a widget path was being done backwards since the change to use GtkContainer::get_path_for_child().
2010-10-20 15:37:00 +00:00
i = gtk_widget_path_length (path) - 1;
GtkCssProvider: Small optimization.
2010-08-04 09:36:21 +00:00
GtkCssProvider: Run through the widget path in the correct order. Comparing a selector with a widget path was being done backwards since the change to use GtkContainer::get_path_for_child().
2010-10-20 15:37:00 +00:00
while (elements && match && i >= 0)
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
{
SelectorElement *elem;
guint8 elem_score;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
elem = elements->data;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
match = compare_selector_element (path, i, elem, &elem_score);
GtkCssProvider: Don't jump too eagerly to the next element when comparing selectors.
2010-08-04 09:43:18 +00:00
GtkCssProvider: Make selectors applying from the topmost widget rank higher For example, for an entry within a notebook, previously these 2 rules would have the same weight: .entry {} .notebook {} Now ".entry" will rank higher than ".notebook" for the GtkEntry, further specific selectors such as: .notebook .entry {} still get a higher score than the previous ones.
2010-12-13 11:44:29 +00:00
if (match && first)
first_match = TRUE;
GtkCssProvider: Don't jump too eagerly to the next element when comparing selectors.
2010-08-04 09:43:18 +00:00
/* Only move on to the next index if there is no match
* with the current element (whether to continue or not
* handled right after in the combinator check), or a
* GType or glob has just been matched.
*
* Region and widget names do not trigger this because
* the next element in the selector path could also be
* related to the same index.
*/
if (!match ||
(elem->elem_type == SELECTOR_GTYPE ||
elem->elem_type == SELECTOR_GLOB))
GtkCssProvider: Run through the widget path in the correct order. Comparing a selector with a widget path was being done backwards since the change to use GtkContainer::get_path_for_child().
2010-10-20 15:37:00 +00:00
i--;
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
GtkCssProvider: Immediately bail out if GType couldn't be resolved.
2010-08-04 09:42:08 +00:00
if (!match &&
elem->elem_type != SELECTOR_TYPE_NAME &&
elem->combinator == COMBINATOR_DESCENDANT)
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
{
/* With descendant combinators there may
* be intermediate chidren in the hierarchy
*/
match = TRUE;
}
GtkCssProvider: Immediately bail out if GType couldn't be resolved.
2010-08-04 09:42:08 +00:00
else if (match)
GtkCssProvider: move to next selector element on match or child combinator.
2010-04-22 23:23:27 +00:00
elements = elements->next;
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
if (match)
{
GtkCssProvider: Set default value if no state pseudo-class is specified.
2010-05-04 17:58:07 +00:00
/* Only 4 bits are actually used */
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
score <<= 4;
score |= elem_score;
}
GtkCssProvider: Make selectors applying from the topmost widget rank higher For example, for an entry within a notebook, previously these 2 rules would have the same weight: .entry {} .notebook {} Now ".entry" will rank higher than ".notebook" for the GtkEntry, further specific selectors such as: .notebook .entry {} still get a higher score than the previous ones.
2010-12-13 11:44:29 +00:00
first = FALSE;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
/* If there are pending selector
* elements to compare, it's not
* a match.
*/
if (elements)
match = FALSE;
if (!match)
score = 0;
GtkCssProvider: Make selectors applying from the topmost widget rank higher For example, for an entry within a notebook, previously these 2 rules would have the same weight: .entry {} .notebook {} Now ".entry" will rank higher than ".notebook" for the GtkEntry, further specific selectors such as: .notebook .entry {} still get a higher score than the previous ones.
2010-12-13 11:44:29 +00:00
else if (first_match)
{
Make GtkInfoBar use GtkStyleContext All colors are defined now in the default css, and classes have been added so the bars are fully themeable (as opposed to gtk_widget_override_*, which require changing the color map itself)
2010-12-14 01:29:57 +00:00
/* Assign more weight to these selectors
GtkCssProvider: Make selectors applying from the topmost widget rank higher For example, for an entry within a notebook, previously these 2 rules would have the same weight: .entry {} .notebook {} Now ".entry" will rank higher than ".notebook" for the GtkEntry, further specific selectors such as: .notebook .entry {} still get a higher score than the previous ones.
2010-12-13 11:44:29 +00:00
* that matched right from the first element.
*/
score <<= 4;
}
Refurbish GtkWidgetPath API. The foreach() function is now gone, there's now API to get GTypes and names from the position in the path.
2010-04-20 23:27:46 +00:00
return score;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
typedef struct StylePriorityInfo StylePriorityInfo;
struct StylePriorityInfo
{
guint64 score;
GHashTable *style;
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
GtkStateFlags state;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
};
GtkCssProvider: refactor out selector matching.
2010-06-18 14:52:34 +00:00
static GArray *
css_provider_get_selectors (GtkCssProvider *css_provider,
GtkWidgetPath *path)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
GtkCssProviderPrivate *priv;
GArray *priority_info;
guint i, j;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
priority_info = g_array_new (FALSE, FALSE, sizeof (StylePriorityInfo));
for (i = 0; i < priv->selectors_info->len; i++)
{
SelectorStyleInfo *info;
StylePriorityInfo new;
gboolean added = FALSE;
guint64 score;
info = g_ptr_array_index (priv->selectors_info, i);
score = compare_selector (path, info->path);
if (score <= 0)
continue;
new.score = score;
new.style = info->style;
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
new.state = info->path->state;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
for (j = 0; j < priority_info->len; j++)
{
StylePriorityInfo *cur;
cur = &g_array_index (priority_info, StylePriorityInfo, j);
if (cur->score > new.score)
{
g_array_insert_val (priority_info, j, new);
added = TRUE;
break;
}
}
if (!added)
g_array_append_val (priority_info, new);
}
GtkCssProvider: refactor out selector matching.
2010-06-18 14:52:34 +00:00
return priority_info;
}
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
static void
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
css_provider_dump_symbolic_colors (GtkCssProvider *css_provider,
GtkStyleProperties *props)
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
{
GtkCssProviderPrivate *priv;
GHashTableIter iter;
gpointer key, value;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
g_hash_table_iter_init (&iter, priv->symbolic_colors);
while (g_hash_table_iter_next (&iter, &key, &value))
{
const gchar *name;
GtkSymbolicColor *color;
name = key;
color = value;
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
gtk_style_properties_map_color (props, name, color);
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
}
}
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
static GtkStyleProperties *
GtkCssProvider: refactor out selector matching.
2010-06-18 14:52:34 +00:00
gtk_css_provider_get_style (GtkStyleProvider *provider,
GtkWidgetPath *path)
{
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
GtkCssProvider *css_provider;
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
GtkStyleProperties *props;
GtkCssProvider: refactor out selector matching.
2010-06-18 14:52:34 +00:00
GArray *priority_info;
guint i;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
css_provider = GTK_CSS_PROVIDER (provider);
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
props = gtk_style_properties_new ();
GtkCssProvider: refactor out selector matching.
2010-06-18 14:52:34 +00:00
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
css_provider_dump_symbolic_colors (css_provider, props);
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priority_info = css_provider_get_selectors (css_provider, path);
GtkCssProvider: refactor out selector matching.
2010-06-18 14:52:34 +00:00
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
for (i = 0; i < priority_info->len; i++)
{
StylePriorityInfo *info;
GHashTableIter iter;
gpointer key, value;
info = &g_array_index (priority_info, StylePriorityInfo, i);
g_hash_table_iter_init (&iter, info->style);
while (g_hash_table_iter_next (&iter, &key, &value))
GtkCssProvider: Set default value if no state pseudo-class is specified.
2010-05-04 17:58:07 +00:00
{
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
gchar *prop = key;
GtkThemingEngine: Add gtk_theming_engine_register_property(). This function may be used for custom property registration from theming engines. The property names will have the -${engine-type-name}-${prop-name} format, the parser has been modified to allow properties with '-' as the first char.
2010-08-04 15:51:19 +00:00
/* Properties starting with '-' may be both widget style properties
* or custom properties from the theming engine, so check whether
* the type is registered or not.
*/
if (prop[0] == '-' &&
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
!gtk_style_properties_lookup_property (prop, NULL, NULL))
GtkThemingEngine: Add gtk_theming_engine_register_property(). This function may be used for custom property registration from theming engines. The property names will have the -${engine-type-name}-${prop-name} format, the parser has been modified to allow properties with '-' as the first char.
2010-08-04 15:51:19 +00:00
continue;
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
gtk_style_properties_set_property (props, key, info->state, value);
GtkCssProvider: Set default value if no state pseudo-class is specified.
2010-05-04 17:58:07 +00:00
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
g_array_free (priority_info, TRUE);
s/GtkStyleSet/GtkStyleProperties/ The former name had oddities such as gtk_style_set_set() and such, so the new name is nicer in that regard and not much longer.
2010-10-29 04:47:32 +00:00
return props;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
static gboolean
gtk_css_provider_get_style_property (GtkStyleProvider *provider,
GtkWidgetPath *path,
GtkStyleProvider: Add GtkStateFlags parameter to get_style_property(). Widget style properties can now have different values depending on the current state.
2010-11-30 01:14:00 +00:00
GtkStateFlags state,
GtkStyleProvider: Pass a GParamSpec in get_style_property(). This is so we can know the owner type of the property, and matching with the stored strings in GtkCssProvider is direct.
2010-11-17 01:42:27 +00:00
GParamSpec *pspec,
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
GValue *value)
{
GArray *priority_info;
gboolean found = FALSE;
gchar *prop_name;
gint i;
prop_name = g_strdup_printf ("-%s-%s",
GtkStyleProvider: Pass a GParamSpec in get_style_property(). This is so we can know the owner type of the property, and matching with the stored strings in GtkCssProvider is direct.
2010-11-17 01:42:27 +00:00
g_type_name (pspec->owner_type),
pspec->name);
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
priority_info = css_provider_get_selectors (GTK_CSS_PROVIDER (provider), path);
for (i = priority_info->len - 1; i >= 0; i--)
{
StylePriorityInfo *info;
GValue *val;
info = &g_array_index (priority_info, StylePriorityInfo, i);
val = g_hash_table_lookup (info->style, prop_name);
GtkStyleProvider: Add GtkStateFlags parameter to get_style_property(). Widget style properties can now have different values depending on the current state.
2010-11-30 01:14:00 +00:00
if (val &&
GtkCssProvider: Fix up state matching when looking up style properties.
2010-11-30 02:59:39 +00:00
(info->state == 0 ||
info->state == state ||
Fix compiler warnings.
2010-12-01 00:19:24 +00:00
((info->state & state) != 0 &&
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
(info->state & ~(state)) == 0)))
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
{
const gchar *val_str;
val_str = g_value_get_string (val);
found = TRUE;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
css_provider_parse_value (GTK_CSS_PROVIDER (provider), val_str, value, NULL);
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
break;
}
}
g_array_free (priority_info, TRUE);
g_free (prop_name);
return found;
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
static void
gtk_css_style_provider_iface_init (GtkStyleProviderIface *iface)
{
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
iface->get_style = gtk_css_provider_get_style;
iface->get_style_property = gtk_css_provider_get_style_property;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
static void
gtk_css_provider_finalize (GObject *object)
{
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
GtkCssProvider *css_provider;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProviderPrivate *priv;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
css_provider = GTK_CSS_PROVIDER (object);
priv = css_provider->priv;
GtkCssProvider: set scanner->input_name.
2010-06-19 14:04:30 +00:00
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_scanner_destroy (priv->scanner);
GtkCssProvider: set scanner->input_name.
2010-06-19 14:04:30 +00:00
g_free (priv->filename);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_ptr_array_free (priv->selectors_info, TRUE);
g_slist_foreach (priv->cur_selectors, (GFunc) selector_path_unref, NULL);
g_slist_free (priv->cur_selectors);
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
if (priv->cur_properties)
g_hash_table_unref (priv->cur_properties);
if (priv->symbolic_colors)
g_hash_table_destroy (priv->symbolic_colors);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
G_OBJECT_CLASS (gtk_css_provider_parent_class)->finalize (object);
}
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
/**
* gtk_css_provider_new:
*
* Returns a newly created #GtkCssProvider.
*
* Returns: A new #GtkCssProvider
**/
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider *
gtk_css_provider_new (void)
{
return g_object_new (GTK_TYPE_CSS_PROVIDER, NULL);
}
static void
property_value_free (GValue *value)
{
if (G_IS_VALUE (value))
g_value_unset (value);
g_slice_free (GValue, value);
}
static void
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner_apply_scope (GScanner *scanner,
ParserScope scope)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
g_scanner_set_scope (scanner, scope);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (scope == SCOPE_VALUE)
{
Allow digits in selectors and values, where appropriate
2010-11-23 18:34:28 +00:00
scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_";
Allow + in identifiers This is necessary since we treat paths as identifiers in @import rules, and it is common to have a + in there (at least when distchecking gtk+ ...)
2010-12-06 19:10:42 +00:00
scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_ +(),.%\t\n'/\"";
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner->config->scan_identifier_1char = TRUE;
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
}
else if (scope == SCOPE_SELECTOR)
{
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "*@";
Allow digits in selectors and values, where appropriate
2010-11-23 18:34:28 +00:00
scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "-_#.";
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner->config->scan_identifier_1char = TRUE;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
GtkCssProvider: Ensure each scope has its parser config.
2010-06-18 14:49:06 +00:00
else if (scope == SCOPE_PSEUDO_CLASS ||
scope == SCOPE_NTH_CHILD ||
scope == SCOPE_DECLARATION)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
Allow digits in selectors and values, where appropriate
2010-11-23 18:34:28 +00:00
scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "-_";
scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "-_";
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner->config->scan_identifier_1char = FALSE;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
GtkCssProvider: Ensure each scope has its parser config.
2010-06-18 14:49:06 +00:00
else
g_assert_not_reached ();
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner->config->scan_float = FALSE;
scanner->config->cpair_comment_single = NULL;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
static void
css_provider_push_scope (GtkCssProvider *css_provider,
ParserScope scope)
{
GtkCssProviderPrivate *priv;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
priv->state = g_slist_prepend (priv->state, GUINT_TO_POINTER (scope));
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner_apply_scope (priv->scanner, scope);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
static ParserScope
css_provider_pop_scope (GtkCssProvider *css_provider)
{
GtkCssProviderPrivate *priv;
ParserScope scope = SCOPE_SELECTOR;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (!priv->state)
{
g_warning ("Push/pop calls to parser scope aren't paired");
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner_apply_scope (priv->scanner, SCOPE_SELECTOR);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
return SCOPE_SELECTOR;
}
priv->state = g_slist_delete_link (priv->state, priv->state);
/* Fetch new scope */
if (priv->state)
scope = GPOINTER_TO_INT (priv->state->data);
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner_apply_scope (priv->scanner, scope);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
return scope;
}
static void
css_provider_reset_parser (GtkCssProvider *css_provider)
{
GtkCssProviderPrivate *priv;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_slist_free (priv->state);
priv->state = NULL;
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
scanner_apply_scope (priv->scanner, SCOPE_SELECTOR);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv->scanner->user_data = NULL;
priv->value_pos = NULL;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_slist_foreach (priv->cur_selectors, (GFunc) selector_path_unref, NULL);
g_slist_free (priv->cur_selectors);
priv->cur_selectors = NULL;
if (priv->cur_properties)
g_hash_table_unref (priv->cur_properties);
priv->cur_properties = g_hash_table_new_full (g_str_hash,
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) property_value_free);
}
static void
css_provider_commit (GtkCssProvider *css_provider)
{
GtkCssProviderPrivate *priv;
GSList *l;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
l = priv->cur_selectors;
while (l)
{
SelectorPath *path = l->data;
SelectorStyleInfo *info;
info = selector_style_info_new (path);
selector_style_info_set_style (info, priv->cur_properties);
g_ptr_array_add (priv->selectors_info, info);
l = l->next;
}
}
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
static GTokenType
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
parse_nth_child (GtkCssProvider *css_provider,
GScanner *scanner,
GtkRegionFlags *flags)
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
{
ParserSymbol symbol;
g_scanner_get_next_token (scanner);
if (scanner->token != G_TOKEN_SYMBOL)
return G_TOKEN_SYMBOL;
symbol = GPOINTER_TO_INT (scanner->value.v_symbol);
if (symbol == SYMBOL_NTH_CHILD)
{
g_scanner_get_next_token (scanner);
if (scanner->token != G_TOKEN_LEFT_PAREN)
return G_TOKEN_LEFT_PAREN;
css_provider_push_scope (css_provider, SCOPE_NTH_CHILD);
g_scanner_get_next_token (scanner);
if (scanner->token != G_TOKEN_SYMBOL)
return G_TOKEN_SYMBOL;
symbol = GPOINTER_TO_INT (scanner->value.v_symbol);
switch (symbol)
{
case SYMBOL_NTH_CHILD_EVEN:
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
*flags = GTK_REGION_EVEN;
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
break;
case SYMBOL_NTH_CHILD_ODD:
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
*flags = GTK_REGION_ODD;
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
break;
case SYMBOL_NTH_CHILD_FIRST:
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
*flags = GTK_REGION_FIRST;
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
break;
case SYMBOL_NTH_CHILD_LAST:
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
*flags = GTK_REGION_LAST;
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
break;
default:
break;
}
g_scanner_get_next_token (scanner);
if (scanner->token != G_TOKEN_RIGHT_PAREN)
return G_TOKEN_RIGHT_PAREN;
css_provider_pop_scope (css_provider);
}
else if (symbol == SYMBOL_FIRST_CHILD)
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
*flags = GTK_REGION_FIRST;
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
else if (symbol == SYMBOL_LAST_CHILD)
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
*flags = GTK_REGION_LAST;
GtkCssProvider: Parse default/sorted region flags.
2010-10-19 11:00:07 +00:00
else if (symbol == SYMBOL_SORTED_CHILD)
*flags = GTK_REGION_SORTED;
GtkCssProvider: fix parsing of consecutive pseudo-classes. Now either of foo{}, foo:first-child{}, foo:nth-child(even):insensitive or foo:active{} will be correctly parsed.
2010-04-22 23:28:24 +00:00
else
{
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
*flags = 0;
return G_TOKEN_SYMBOL;
}
return G_TOKEN_NONE;
}
static GTokenType
parse_pseudo_class (GtkCssProvider *css_provider,
GScanner *scanner,
SelectorPath *selector)
{
GtkStateType state;
GtkCssProvider: fix parsing of consecutive pseudo-classes. Now either of foo{}, foo:first-child{}, foo:nth-child(even):insensitive or foo:active{} will be correctly parsed.
2010-04-22 23:28:24 +00:00
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
g_scanner_get_next_token (scanner);
if (scanner->token != G_TOKEN_SYMBOL)
return G_TOKEN_SYMBOL;
state = GPOINTER_TO_INT (scanner->value.v_symbol);
switch (state)
{
case GTK_STATE_ACTIVE:
selector->state |= GTK_STATE_FLAG_ACTIVE;
break;
case GTK_STATE_PRELIGHT:
selector->state |= GTK_STATE_FLAG_PRELIGHT;
break;
case GTK_STATE_SELECTED:
selector->state |= GTK_STATE_FLAG_SELECTED;
break;
case GTK_STATE_INSENSITIVE:
selector->state |= GTK_STATE_FLAG_INSENSITIVE;
break;
case GTK_STATE_INCONSISTENT:
selector->state |= GTK_STATE_FLAG_INCONSISTENT;
break;
case GTK_STATE_FOCUSED:
selector->state |= GTK_STATE_FLAG_FOCUSED;
break;
default:
return G_TOKEN_SYMBOL;
GtkCssProvider: fix parsing of consecutive pseudo-classes. Now either of foo{}, foo:first-child{}, foo:nth-child(even):insensitive or foo:active{} will be correctly parsed.
2010-04-22 23:28:24 +00:00
}
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
return G_TOKEN_NONE;
}
GtkCssProvider: Fix parsing of concatenated classes. Now selectors such as: GtkWidget#name.class1.class2 #name.class1.class2 .class1.class2 are parsed correctly, being meaningful for a widget defining several classes.
2010-10-29 03:30:36 +00:00
/* Parses a number of concatenated classes */
static void
parse_classes (SelectorPath *path,
const gchar *str)
{
gchar *pos;
if ((pos = strchr (str, '.')) != NULL)
{
GtkCssProvider: Do not miss the last class name in concatenated classes. Selectors like .menu.check or .entry.progressbar were being misparsed and attributed to .menu and .entry.
2010-11-08 01:51:53 +00:00
/* Leave the last class to the call after the loop */
GtkCssProvider: Fix parsing of concatenated classes. Now selectors such as: GtkWidget#name.class1.class2 #name.class1.class2 .class1.class2 are parsed correctly, being meaningful for a widget defining several classes.
2010-10-29 03:30:36 +00:00
while (pos)
{
*pos = '\0';
selector_path_prepend_class (path, str);
str = pos + 1;
pos = strchr (str, '.');
}
}
GtkCssProvider: Do not miss the last class name in concatenated classes. Selectors like .menu.check or .entry.progressbar were being misparsed and attributed to .menu and .entry.
2010-11-08 01:51:53 +00:00
selector_path_prepend_class (path, str);
GtkCssProvider: Fix parsing of concatenated classes. Now selectors such as: GtkWidget#name.class1.class2 #name.class1.class2 .class1.class2 are parsed correctly, being meaningful for a widget defining several classes.
2010-10-29 03:30:36 +00:00
}
Make GtkCssProvider deal with widget types not being in plain CamelCase Fixes bug #Bug 639754, reported by Kjell Ahlstedt. gtkmm doesn't use plain CamelCase for its widget type names, so in order to distinguish widget type names from regions in the CSS parser, the following checks are now done: * if it contains an uppercase letter -> widget class (that should also work for gtkmm) * if it's a string compound by lowercase letters and '-' -> it's a region, checks have been added in gtk_style_context_add_region() and gtk_widget_path_iter_add_region() to ensure this.
2011-01-19 03:12:08 +00:00
static gboolean
is_widget_class_name (const gchar *str)
{
/* Do a pretty lax check here, not all
* widget class names contain only CamelCase
* (gtkmm widgets don't), but at least part of
* the name will be CamelCase, so check for
Mention type vs region ambiguity in the docs
2011-01-19 17:55:48 +00:00
* the first uppercase char
*/
Make GtkCssProvider deal with widget types not being in plain CamelCase Fixes bug #Bug 639754, reported by Kjell Ahlstedt. gtkmm doesn't use plain CamelCase for its widget type names, so in order to distinguish widget type names from regions in the CSS parser, the following checks are now done: * if it contains an uppercase letter -> widget class (that should also work for gtkmm) * if it's a string compound by lowercase letters and '-' -> it's a region, checks have been added in gtk_style_context_add_region() and gtk_widget_path_iter_add_region() to ensure this.
2011-01-19 03:12:08 +00:00
while (*str)
{
if (g_ascii_isupper (*str))
return TRUE;
str++;
}
return FALSE;
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
static GTokenType
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
parse_selector (GtkCssProvider *css_provider,
GScanner *scanner,
SelectorPath **selector_out)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
SelectorPath *path;
GtkCssProvider: free selector path on parse_rule().
2010-04-20 23:51:46 +00:00
path = selector_path_new ();
*selector_out = path;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Allow empty selector. universal selector is implied, so things like this work: :active {} :insensitive{}
2010-04-15 23:44:50 +00:00
if (scanner->token != ':' &&
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
scanner->token != '#' &&
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
scanner->token != '.' &&
GtkCssProvider: Allow empty selector. universal selector is implied, so things like this work: :active {} :insensitive{}
2010-04-15 23:44:50 +00:00
scanner->token != G_TOKEN_IDENTIFIER)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
return G_TOKEN_IDENTIFIER;
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
while (scanner->token == '#' ||
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
scanner->token == '.' ||
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
scanner->token == G_TOKEN_IDENTIFIER)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
if (scanner->token == '#' ||
scanner->token == '.')
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
{
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
gboolean is_class;
GtkCssProvider: Fix parsing of concatenated classes. Now selectors such as: GtkWidget#name.class1.class2 #name.class1.class2 .class1.class2 are parsed correctly, being meaningful for a widget defining several classes.
2010-10-29 03:30:36 +00:00
gchar *pos;
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
is_class = (scanner->token == '.');
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
g_scanner_get_next_token (scanner);
if (scanner->token != G_TOKEN_IDENTIFIER)
return G_TOKEN_IDENTIFIER;
GtkCssProvider: Parse correctly widget types with a name. There's now a distinction between: GtkLabel#label-name: Label with name "label-name" GtkWindow #label-name: Window containing a widget named "label-name"
2010-08-04 12:51:01 +00:00
selector_path_prepend_glob (path);
selector_path_prepend_combinator (path, COMBINATOR_CHILD);
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
if (is_class)
GtkCssProvider: Fix parsing of concatenated classes. Now selectors such as: GtkWidget#name.class1.class2 #name.class1.class2 .class1.class2 are parsed correctly, being meaningful for a widget defining several classes.
2010-10-29 03:30:36 +00:00
parse_classes (path, scanner->value.v_identifier);
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
else
GtkCssProvider: Fix parsing of concatenated classes. Now selectors such as: GtkWidget#name.class1.class2 #name.class1.class2 .class1.class2 are parsed correctly, being meaningful for a widget defining several classes.
2010-10-29 03:30:36 +00:00
{
if ((pos = strchr (scanner->value.v_identifier, '.')) != NULL)
*pos = '\0';
selector_path_prepend_name (path, scanner->value.v_identifier);
/* Parse any remaining classes */
if (pos)
parse_classes (path, pos + 1);
}
GtkCssProvider: Parse and compare widget names.
2010-08-04 09:44:32 +00:00
}
Make GtkCssProvider deal with widget types not being in plain CamelCase Fixes bug #Bug 639754, reported by Kjell Ahlstedt. gtkmm doesn't use plain CamelCase for its widget type names, so in order to distinguish widget type names from regions in the CSS parser, the following checks are now done: * if it contains an uppercase letter -> widget class (that should also work for gtkmm) * if it's a string compound by lowercase letters and '-' -> it's a region, checks have been added in gtk_style_context_add_region() and gtk_widget_path_iter_add_region() to ensure this.
2011-01-19 03:12:08 +00:00
else if (is_widget_class_name (scanner->value.v_identifier))
GtkCssProvider: Parse correctly widget types with a name. There's now a distinction between: GtkLabel#label-name: Label with name "label-name" GtkWindow #label-name: Window containing a widget named "label-name"
2010-08-04 12:51:01 +00:00
{
gchar *pos;
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
if ((pos = strchr (scanner->value.v_identifier, '#')) != NULL ||
(pos = strchr (scanner->value.v_identifier, '.')) != NULL)
GtkCssProvider: Parse correctly widget types with a name. There's now a distinction between: GtkLabel#label-name: Label with name "label-name" GtkWindow #label-name: Window containing a widget named "label-name"
2010-08-04 12:51:01 +00:00
{
gchar *type_name, *name;
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
gboolean is_class;
is_class = (*pos == '.');
GtkCssProvider: Parse correctly widget types with a name. There's now a distinction between: GtkLabel#label-name: Label with name "label-name" GtkWindow #label-name: Window containing a widget named "label-name"
2010-08-04 12:51:01 +00:00
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
/* Widget type and name/class put together */
GtkCssProvider: Parse correctly widget types with a name. There's now a distinction between: GtkLabel#label-name: Label with name "label-name" GtkWindow #label-name: Window containing a widget named "label-name"
2010-08-04 12:51:01 +00:00
name = pos + 1;
*pos = '\0';
type_name = scanner->value.v_identifier;
selector_path_prepend_type (path, type_name);
/* This is only so there is a direct relationship
* between widget type and its name.
*/
selector_path_prepend_combinator (path, COMBINATOR_CHILD);
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
if (is_class)
GtkCssProvider: Fix parsing of concatenated classes. Now selectors such as: GtkWidget#name.class1.class2 #name.class1.class2 .class1.class2 are parsed correctly, being meaningful for a widget defining several classes.
2010-10-29 03:30:36 +00:00
parse_classes (path, name);
GtkCssProvider: Parse and match class info.
2010-08-06 10:08:48 +00:00
else
GtkCssProvider: Fix parsing of concatenated classes. Now selectors such as: GtkWidget#name.class1.class2 #name.class1.class2 .class1.class2 are parsed correctly, being meaningful for a widget defining several classes.
2010-10-29 03:30:36 +00:00
{
if ((pos = strchr (name, '.')) != NULL)
*pos = '\0';
selector_path_prepend_name (path, name);
/* Parse any remaining classes */
if (pos)
parse_classes (path, pos + 1);
}
GtkCssProvider: Parse correctly widget types with a name. There's now a distinction between: GtkLabel#label-name: Label with name "label-name" GtkWindow #label-name: Window containing a widget named "label-name"
2010-08-04 12:51:01 +00:00
}
else
selector_path_prepend_type (path, scanner->value.v_identifier);
}
Make GtkCssProvider deal with widget types not being in plain CamelCase Fixes bug #Bug 639754, reported by Kjell Ahlstedt. gtkmm doesn't use plain CamelCase for its widget type names, so in order to distinguish widget type names from regions in the CSS parser, the following checks are now done: * if it contains an uppercase letter -> widget class (that should also work for gtkmm) * if it's a string compound by lowercase letters and '-' -> it's a region, checks have been added in gtk_style_context_add_region() and gtk_widget_path_iter_add_region() to ensure this.
2011-01-19 03:12:08 +00:00
else if (_gtk_style_context_check_region_name (scanner->value.v_identifier))
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
{
s/child class/region/ everywhere. "Child class" is an invented term anyway, and it conceptually defines identifiable regions in widgets.
2010-08-05 09:08:51 +00:00
GtkRegionFlags flags = 0;
GtkCssProvider: Add named regions to selector path.
2010-04-20 23:48:01 +00:00
gchar *region_name;
region_name = g_strdup (scanner->value.v_identifier);
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
if (g_scanner_peek_next_token (scanner) == ':')
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
{
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
ParserSymbol symbol;
GtkCssProvider: fix parsing of consecutive pseudo-classes. Now either of foo{}, foo:first-child{}, foo:nth-child(even):insensitive or foo:active{} will be correctly parsed.
2010-04-22 23:28:24 +00:00
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
g_scanner_get_next_token (scanner);
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
css_provider_push_scope (css_provider, SCOPE_PSEUDO_CLASS);
/* Check for the next token being nth-child, parse in that
* case, and fallback into common state parsing if not.
*/
if (g_scanner_peek_next_token (scanner) != G_TOKEN_SYMBOL)
return G_TOKEN_SYMBOL;
symbol = GPOINTER_TO_INT (scanner->next_value.v_symbol);
if (symbol == SYMBOL_FIRST_CHILD ||
symbol == SYMBOL_LAST_CHILD ||
GtkCssProvider: Parse default/sorted region flags.
2010-10-19 11:00:07 +00:00
symbol == SYMBOL_NTH_CHILD ||
symbol == SYMBOL_SORTED_CHILD)
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
{
GTokenType token;
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
if ((token = parse_nth_child (css_provider, scanner, &flags)) != G_TOKEN_NONE)
return token;
css_provider_pop_scope (css_provider);
}
else
{
css_provider_pop_scope (css_provider);
selector_path_prepend_region (path, region_name, 0);
g_free (region_name);
break;
}
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
}
GtkCssProvider: Add named regions to selector path.
2010-04-20 23:48:01 +00:00
selector_path_prepend_region (path, region_name, flags);
g_free (region_name);
GtkCssProvider: Parse named regions.
2010-04-20 23:46:52 +00:00
}
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
else if (scanner->value.v_identifier[0] == '*')
selector_path_prepend_glob (path);
else
GtkCssProvider: free selector path on parse_rule().
2010-04-20 23:51:46 +00:00
return G_TOKEN_IDENTIFIER;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Allow '*' selectors. These would match a single widget of any type.
2010-04-15 22:29:11 +00:00
g_scanner_get_next_token (scanner);
GtkCssProvider: Add support for child/descendant combinators. Now, selectors like: GtkWindow > GtkButton {} GtkNotebook > GtkLabel {} will represent a direct parent/child relation between both elements, while GtkWindow GtkButton {} GtkNotebook GtkLabel {} will allow intermediate children between these.
2010-04-16 01:02:42 +00:00
if (scanner->token == '>')
{
selector_path_prepend_combinator (path, COMBINATOR_CHILD);
g_scanner_get_next_token (scanner);
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
if (scanner->token == ':')
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
{
GtkCssProvider: Allow empty selector. universal selector is implied, so things like this work: :active {} :insensitive{}
2010-04-15 23:44:50 +00:00
/* Add glob selector if path is empty */
if (selector_path_depth (path) == 0)
selector_path_prepend_glob (path);
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
css_provider_push_scope (css_provider, SCOPE_PSEUDO_CLASS);
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
while (scanner->token == ':')
GtkCssProvider: fix parsing of consecutive pseudo-classes. Now either of foo{}, foo:first-child{}, foo:nth-child(even):insensitive or foo:active{} will be correctly parsed.
2010-04-22 23:28:24 +00:00
{
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
GTokenType token;
if ((token = parse_pseudo_class (css_provider, scanner, path)) != G_TOKEN_NONE)
return token;
g_scanner_get_next_token (scanner);
GtkCssProvider: fix parsing of consecutive pseudo-classes. Now either of foo{}, foo:first-child{}, foo:nth-child(even):insensitive or foo:active{} will be correctly parsed.
2010-04-22 23:28:24 +00:00
}
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
css_provider_pop_scope (css_provider);
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
return G_TOKEN_NONE;
}
Allow linefeeds in property values.
2010-09-01 23:48:24 +00:00
#define SKIP_SPACES(s) while (s[0] == ' ' || s[0] == '\t' || s[0] == '\n') s++;
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
#define SKIP_SPACES_BACK(s) while (s[0] == ' ' || s[0] == '\t' || s[0] == '\n') s--;
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
static GtkSymbolicColor *
symbolic_color_parse_str (const gchar *string,
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
gchar **end_ptr)
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
{
GtkSymbolicColor *symbolic_color = NULL;
gchar *str;
str = (gchar *) string;
GtkCssProvider: Update end string when misparsing symbolic colors.
2010-10-23 20:24:57 +00:00
*end_ptr = str;
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: allow color names from rgb.txt when parsing colors.
2010-11-12 21:59:21 +00:00
if (str[0] == '@')
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
{
const gchar *end;
gchar *name;
str++;
end = str;
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
while (*end == '-' || *end == '_' || g_ascii_isalpha (*end))
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
end++;
name = g_strndup (str, end - str);
symbolic_color = gtk_symbolic_color_new_name (name);
g_free (name);
*end_ptr = (gchar *) end;
}
GtkCssProvider: Add lighter/darker color functions. These behave the same than in GtkStyle.
2010-11-12 22:59:22 +00:00
else if (g_str_has_prefix (str, "lighter") ||
g_str_has_prefix (str, "darker"))
{
GtkSymbolicColor *param_color;
gboolean is_lighter = FALSE;
is_lighter = g_str_has_prefix (str, "lighter");
if (is_lighter)
str += strlen ("lighter");
else
str += strlen ("darker");
SKIP_SPACES (str);
if (*str != '(')
{
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
param_color = symbolic_color_parse_str (str, end_ptr);
if (!param_color)
return NULL;
str = *end_ptr;
SKIP_SPACES (str);
*end_ptr = (gchar *) str;
if (*str != ')')
{
gtk_symbolic_color_unref (param_color);
return NULL;
}
if (is_lighter)
symbolic_color = gtk_symbolic_color_new_shade (param_color, 1.3);
else
symbolic_color = gtk_symbolic_color_new_shade (param_color, 0.7);
gtk_symbolic_color_unref (param_color);
(*end_ptr)++;
}
GtkCssProvider: Parse alpha() symbolic colors. The "alpha" symbolic color modifies a passed color's alpha by a factor, the syntax would accept things like: background-color: alpha (@bg_color, 0.8); foreground-color: alpha (shade (@fg_color, 0.8), 0.5);
2010-10-25 18:44:15 +00:00
else if (g_str_has_prefix (str, "shade") ||
g_str_has_prefix (str, "alpha"))
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
{
GtkSymbolicColor *param_color;
GtkCssProvider: Parse alpha() symbolic colors. The "alpha" symbolic color modifies a passed color's alpha by a factor, the syntax would accept things like: background-color: alpha (@bg_color, 0.8); foreground-color: alpha (shade (@fg_color, 0.8), 0.5);
2010-10-25 18:44:15 +00:00
gboolean is_shade = FALSE;
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
gdouble factor;
GtkCssProvider: Parse alpha() symbolic colors. The "alpha" symbolic color modifies a passed color's alpha by a factor, the syntax would accept things like: background-color: alpha (@bg_color, 0.8); foreground-color: alpha (shade (@fg_color, 0.8), 0.5);
2010-10-25 18:44:15 +00:00
is_shade = g_str_has_prefix (str, "shade");
if (is_shade)
str += strlen ("shade");
else
str += strlen ("alpha");
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
SKIP_SPACES (str);
if (*str != '(')
{
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
param_color = symbolic_color_parse_str (str, end_ptr);
if (!param_color)
return NULL;
str = *end_ptr;
SKIP_SPACES (str);
if (str[0] != ',')
{
gtk_symbolic_color_unref (param_color);
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
factor = g_ascii_strtod (str, end_ptr);
str = *end_ptr;
SKIP_SPACES (str);
*end_ptr = (gchar *) str;
if (str[0] != ')')
{
gtk_symbolic_color_unref (param_color);
return NULL;
}
GtkCssProvider: Parse alpha() symbolic colors. The "alpha" symbolic color modifies a passed color's alpha by a factor, the syntax would accept things like: background-color: alpha (@bg_color, 0.8); foreground-color: alpha (shade (@fg_color, 0.8), 0.5);
2010-10-25 18:44:15 +00:00
if (is_shade)
symbolic_color = gtk_symbolic_color_new_shade (param_color, factor);
else
symbolic_color = gtk_symbolic_color_new_alpha (param_color, factor);
Plug some leaks.
2010-10-05 23:04:06 +00:00
gtk_symbolic_color_unref (param_color);
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
(*end_ptr)++;
}
else if (g_str_has_prefix (str, "mix"))
{
GtkSymbolicColor *color1, *color2;
gdouble factor;
str += strlen ("mix");
SKIP_SPACES (str);
if (*str != '(')
{
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
color1 = symbolic_color_parse_str (str, end_ptr);
if (!color1)
return NULL;
str = *end_ptr;
SKIP_SPACES (str);
if (str[0] != ',')
{
gtk_symbolic_color_unref (color1);
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
color2 = symbolic_color_parse_str (str, end_ptr);
if (!color2 || *end_ptr[0] != ',')
{
gtk_symbolic_color_unref (color1);
return NULL;
}
str = *end_ptr;
SKIP_SPACES (str);
if (str[0] != ',')
{
gtk_symbolic_color_unref (color1);
gtk_symbolic_color_unref (color2);
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
factor = g_ascii_strtod (str, end_ptr);
str = *end_ptr;
SKIP_SPACES (str);
*end_ptr = (gchar *) str;
if (str[0] != ')')
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
{
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
gtk_symbolic_color_unref (color1);
gtk_symbolic_color_unref (color2);
return NULL;
}
symbolic_color = gtk_symbolic_color_new_mix (color1, color2, factor);
Plug some leaks.
2010-10-05 23:04:06 +00:00
gtk_symbolic_color_unref (color1);
gtk_symbolic_color_unref (color2);
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
(*end_ptr)++;
}
GtkCssProvider: allow color names from rgb.txt when parsing colors.
2010-11-12 21:59:21 +00:00
else
{
GdkRGBA color;
gchar *color_str;
const gchar *end;
end = str + 1;
if (str[0] == '#')
{
/* Color in hex format */
while (g_ascii_isxdigit (*end))
end++;
}
else if (g_str_has_prefix (str, "rgb"))
{
/* color in rgb/rgba format */
while (*end != ')' && *end != '\0')
end++;
if (*end == ')')
end++;
}
else
{
Fix color name (as of rgb.txt) parsing in symbolic colors The end of the substring wasn't being detected properly.
2010-12-21 17:44:53 +00:00
/* Color name */
while (*end != '\0' &&
(g_ascii_isalnum (*end) || *end == ' '))
GtkCssProvider: allow color names from rgb.txt when parsing colors.
2010-11-12 21:59:21 +00:00
end++;
}
color_str = g_strndup (str, end - str);
*end_ptr = (gchar *) end;
if (!gdk_rgba_parse (&color, color_str))
{
g_free (color_str);
return NULL;
}
symbolic_color = gtk_symbolic_color_new_literal (&color);
g_free (color_str);
}
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
return symbolic_color;
}
static GtkSymbolicColor *
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
symbolic_color_parse (const gchar *str,
GError **error)
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
{
GtkSymbolicColor *color;
gchar *end;
color = symbolic_color_parse_str (str, &end);
if (*end != '\0')
{
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
g_set_error_literal (error,
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
"Could not parse symbolic color");
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
if (color)
{
gtk_symbolic_color_unref (color);
color = NULL;
}
}
return color;
}
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
static GtkGradient *
gradient_parse_str (const gchar *str,
gchar **end_ptr)
{
GtkGradient *gradient = NULL;
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
gdouble coords[6];
gchar *end;
guint i;
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
if (g_str_has_prefix (str, "-gtk-gradient"))
{
cairo_pattern_type_t type;
str += strlen ("-gtk-gradient");
SKIP_SPACES (str);
if (*str != '(')
{
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
/* Parse gradient type */
if (g_str_has_prefix (str, "linear"))
{
type = CAIRO_PATTERN_TYPE_LINEAR;
str += strlen ("linear");
}
else if (g_str_has_prefix (str, "radial"))
{
type = CAIRO_PATTERN_TYPE_RADIAL;
str += strlen ("radial");
}
else
{
*end_ptr = (gchar *) str;
return NULL;
}
SKIP_SPACES (str);
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
/* Parse start/stop position parameters */
for (i = 0; i < 2; i++)
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
{
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (*str != ',')
{
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
if (strncmp (str, "left", 4) == 0)
{
coords[i * 3] = 0;
str += strlen ("left");
}
else if (strncmp (str, "right", 5) == 0)
{
coords[i * 3] = 1;
str += strlen ("right");
}
else if (strncmp (str, "center", 6) == 0)
{
coords[i * 3] = 0.5;
str += strlen ("center");
}
else
{
coords[i * 3] = g_ascii_strtod (str, &end);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
if (str == end)
{
*end_ptr = (gchar *) str;
return NULL;
}
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
str = end;
}
SKIP_SPACES (str);
if (strncmp (str, "top", 3) == 0)
{
coords[(i * 3) + 1] = 0;
str += strlen ("top");
}
else if (strncmp (str, "bottom", 6) == 0)
{
coords[(i * 3) + 1] = 1;
str += strlen ("bottom");
}
else if (strncmp (str, "center", 6) == 0)
{
coords[(i * 3) + 1] = 0.5;
str += strlen ("center");
}
else
{
coords[(i * 3) + 1] = g_ascii_strtod (str, &end);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
if (str == end)
{
*end_ptr = (gchar *) str;
return NULL;
}
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
str = end;
}
SKIP_SPACES (str);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (type == CAIRO_PATTERN_TYPE_RADIAL)
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
{
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
/* Parse radius */
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
if (*str != ',')
{
*end_ptr = (gchar *) str;
return NULL;
}
str++;
SKIP_SPACES (str);
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
coords[(i * 3) + 2] = g_ascii_strtod (str, &end);
str = end;
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
SKIP_SPACES (str);
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
}
}
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (type == CAIRO_PATTERN_TYPE_LINEAR)
gradient = gtk_gradient_new_linear (coords[0], coords[1], coords[3], coords[4]);
else
gradient = gtk_gradient_new_radial (coords[0], coords[1], coords[2],
coords[3], coords[4], coords[5]);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
while (*str == ',')
{
GtkSymbolicColor *color;
gdouble position;
if (*str != ',')
{
*end_ptr = (gchar *) str;
return gradient;
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
}
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
str++;
SKIP_SPACES (str);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (g_str_has_prefix (str, "from"))
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
{
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
position = 0;
str += strlen ("from");
SKIP_SPACES (str);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (*str != '(')
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
{
*end_ptr = (gchar *) str;
return gradient;
}
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
}
else if (g_str_has_prefix (str, "to"))
{
position = 1;
str += strlen ("to");
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
SKIP_SPACES (str);
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (*str != '(')
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
{
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
*end_ptr = (gchar *) str;
return gradient;
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
}
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
}
else if (g_str_has_prefix (str, "color-stop"))
{
str += strlen ("color-stop");
SKIP_SPACES (str);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (*str != '(')
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
{
*end_ptr = (gchar *) str;
return gradient;
}
str++;
SKIP_SPACES (str);
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
position = g_ascii_strtod (str, &end);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
str = end;
SKIP_SPACES (str);
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (*str != ',')
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
{
*end_ptr = (gchar *) str;
return gradient;
}
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
}
else
{
*end_ptr = (gchar *) str;
return gradient;
}
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
str++;
SKIP_SPACES (str);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
color = symbolic_color_parse_str (str, &end);
str = end;
SKIP_SPACES (str);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
if (*str != ')')
{
*end_ptr = (gchar *) str;
return gradient;
}
str++;
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
SKIP_SPACES (str);
if (color)
{
gtk_gradient_add_color_stop (gradient, position, color);
gtk_symbolic_color_unref (color);
}
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
}
GtkGradient: Handle symbolic gradients. The css parser has been modified to parse correctly radial gradients: background-image: -gtk-gradient (radial, center center, 0, center center, 0.8, from (#000), to (#fff)); The theming engine has been modified to correctly animate these, as well as transitions between different pattern types.
2010-10-12 19:48:23 +00:00
if (*str != ')')
{
*end_ptr = (gchar *) str;
return gradient;
}
str++;
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
}
*end_ptr = (gchar *) str;
return gradient;
}
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
static gchar *
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
path_parse_str (GtkCssProvider *css_provider,
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
const gchar *str,
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
gchar **end_ptr,
GError **error)
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
{
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
gchar *path, *chr;
const gchar *start, *end;
Make url parsing work for slices The border-image parsing code relies on parse_path_str to return a meaningful end_ptr in case of success, too.
2010-11-22 14:03:07 +00:00
start = str;
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
if (g_str_has_prefix (str, "url"))
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
{
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
str += strlen ("url");
SKIP_SPACES (str);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
if (*str != '(')
{
*end_ptr = (gchar *) str;
return NULL;
}
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
Make url parsing work for slices The border-image parsing code relies on parse_path_str to return a meaningful end_ptr in case of success, too.
2010-11-22 14:03:07 +00:00
chr = strchr (str, ')');
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
if (!chr)
{
*end_ptr = (gchar *) str;
return NULL;
}
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
Make url parsing work for slices The border-image parsing code relies on parse_path_str to return a meaningful end_ptr in case of success, too.
2010-11-22 14:03:07 +00:00
end = chr + 1;
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
str++;
SKIP_SPACES (str);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
if (*str == '"' || *str == '\'')
{
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
const gchar *p;
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
p = str;
str++;
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
Work harder at parsing import statements Also, turn g_warning() into g_message() for now, so that tests don't abort. Eventually, this needs to all go into GErrors.
2010-11-18 06:59:27 +00:00
chr--;
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
SKIP_SPACES_BACK (chr);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
Work harder at parsing import statements Also, turn g_warning() into g_message() for now, so that tests don't abort. Eventually, this needs to all go into GErrors.
2010-11-18 06:59:27 +00:00
if (*chr != *p || chr == p)
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
{
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
*end_ptr = (gchar *)str;
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
return NULL;
}
}
else
{
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
*end_ptr = (gchar *)str;
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
return NULL;
}
path = g_strndup (str, chr - str);
g_strstrip (path);
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
*end_ptr = (gchar *)end;
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
}
else
{
path = g_strdup (str);
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
*end_ptr = (gchar *)str + strlen (str);
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
}
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
/* Always return an absolute path */
if (!g_path_is_absolute (path))
{
GtkCssProviderPrivate *priv;
gchar *dirname, *full_path;
priv = css_provider->priv;
/* Use relative path to the current CSS file path, if any */
Work harder at parsing import statements Also, turn g_warning() into g_message() for now, so that tests don't abort. Eventually, this needs to all go into GErrors.
2010-11-18 06:59:27 +00:00
if (priv->filename)
dirname = g_path_get_dirname (priv->filename);
else
dirname = g_get_current_dir ();
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
full_path = g_build_filename (dirname, path, NULL);
g_free (path);
g_free (dirname);
path = full_path;
}
if (!g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
{
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_EXIST,
"File doesn't exist: %s", path);
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
g_free (path);
path = NULL;
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
*end_ptr = (gchar *)start;
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
}
return path;
}
static gchar *
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
path_parse (GtkCssProvider *css_provider,
const gchar *str,
GError **error)
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
{
Avoid compiler warnings
2010-11-26 04:46:15 +00:00
gchar *path;
gchar *end;
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
path = path_parse_str (css_provider, str, &end, error);
if (!path)
return NULL;
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
if (*end != '\0')
{
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
g_set_error_literal (error,
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
"Error parsing path");
g_free (path);
path = NULL;
GtkCssProvider: improve file paths parser. It will now return a full path, and check about the file being sane.
2010-10-08 16:27:22 +00:00
}
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
return path;
}
static Gtk9Slice *
slice_parse_str (GtkCssProvider *css_provider,
const gchar *str,
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
gchar **end_ptr,
GError **error)
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
{
gdouble distance_top, distance_bottom;
gdouble distance_left, distance_right;
GtkSliceSideModifier mods[2];
GdkPixbuf *pixbuf;
Plug some leaks.
2010-10-05 23:04:06 +00:00
Gtk9Slice *slice;
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
gchar *path;
gint i = 0;
SKIP_SPACES (str);
/* Parse image url */
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
path = path_parse_str (css_provider, str, end_ptr, error);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
if (!path)
return NULL;
str = *end_ptr;
SKIP_SPACES (str);
/* Parse top/left/bottom/right distances */
Make url parsing work for slices The border-image parsing code relies on parse_path_str to return a meaningful end_ptr in case of success, too.
2010-11-22 14:03:07 +00:00
distance_top = g_ascii_strtod (str, end_ptr);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
str = *end_ptr;
SKIP_SPACES (str);
Make url parsing work for slices The border-image parsing code relies on parse_path_str to return a meaningful end_ptr in case of success, too.
2010-11-22 14:03:07 +00:00
distance_right = g_ascii_strtod (str, end_ptr);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
str = *end_ptr;
SKIP_SPACES (str);
Make url parsing work for slices The border-image parsing code relies on parse_path_str to return a meaningful end_ptr in case of success, too.
2010-11-22 14:03:07 +00:00
distance_bottom = g_ascii_strtod (str, end_ptr);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
str = *end_ptr;
SKIP_SPACES (str);
Make url parsing work for slices The border-image parsing code relies on parse_path_str to return a meaningful end_ptr in case of success, too.
2010-11-22 14:03:07 +00:00
distance_left = g_ascii_strtod (str, end_ptr);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
str = *end_ptr;
SKIP_SPACES (str);
while (*str && i < 2)
{
if (g_str_has_prefix (str, "stretch"))
{
str += strlen ("stretch");
mods[i] = GTK_SLICE_STRETCH;
}
else if (g_str_has_prefix (str, "repeat"))
{
str += strlen ("repeat");
mods[i] = GTK_SLICE_REPEAT;
}
else
{
g_free (path);
*end_ptr = (gchar *) str;
return NULL;
}
SKIP_SPACES (str);
i++;
}
*end_ptr = (gchar *) str;
if (*str != '\0')
{
g_free (path);
return NULL;
}
if (i != 2)
{
/* Fill in second modifier, same as the first */
Fix typo in the Gtk9Slice parser.
2010-10-05 22:53:49 +00:00
mods[1] = mods[0];
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
}
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
pixbuf = gdk_pixbuf_new_from_file (path, error);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
g_free (path);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
if (!pixbuf)
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
{
*end_ptr = (gchar *) str;
return NULL;
}
Fix abi check after recent merges
2010-12-05 17:18:30 +00:00
slice = _gtk_9slice_new (pixbuf,
distance_top, distance_bottom,
distance_left, distance_right,
mods[0], mods[1]);
Plug some leaks.
2010-10-05 23:04:06 +00:00
g_object_unref (pixbuf);
return slice;
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
}
GtkCssProvider: Add initial unit parsing logic At the moment only "px" are supported, and such is the default value when no unit is specified.
2010-11-13 02:55:21 +00:00
static gdouble
unit_parse_str (const gchar *str,
gchar **end_str)
{
gdouble unit;
SKIP_SPACES (str);
Make url parsing work for slices The border-image parsing code relies on parse_path_str to return a meaningful end_ptr in case of success, too.
2010-11-22 14:03:07 +00:00
unit = g_ascii_strtod (str, end_str);
GtkCssProvider: Add initial unit parsing logic At the moment only "px" are supported, and such is the default value when no unit is specified.
2010-11-13 02:55:21 +00:00
str = *end_str;
/* Now parse the unit type, if any. We
* don't admit spaces between these.
*/
if (*str != ' ' && *str != '\0')
{
while (**end_str != ' ' && **end_str != '\0')
(*end_str)++;
/* Only handle pixels at the moment */
if (strncmp (str, "px", 2) != 0)
{
gchar *type;
type = g_strndup (str, *end_str - str);
g_warning ("Unknown unit '%s', only pixel units are "
"currently supported in CSS style", type);
g_free (type);
}
}
return unit;
}
static GtkBorder *
border_parse_str (const gchar *str,
gchar **end_str)
{
gdouble first, second, third, fourth;
GtkBorder *border;
border = gtk_border_new ();
SKIP_SPACES (str);
GtkCssProvider: enable parsing negative GtkBorders this can be used as in regular CSS under some situations, so child items overlap the parent element's border.
2011-01-10 19:13:56 +00:00
if (!g_ascii_isdigit (*str) && *str != '-')
GtkCssProvider: Add initial unit parsing logic At the moment only "px" are supported, and such is the default value when no unit is specified.
2010-11-13 02:55:21 +00:00
return border;
first = unit_parse_str (str, end_str);
str = *end_str;
SKIP_SPACES (str);
GtkCssProvider: enable parsing negative GtkBorders this can be used as in regular CSS under some situations, so child items overlap the parent element's border.
2011-01-10 19:13:56 +00:00
if (!g_ascii_isdigit (*str) && *str != '-')
GtkCssProvider: Add initial unit parsing logic At the moment only "px" are supported, and such is the default value when no unit is specified.
2010-11-13 02:55:21 +00:00
{
border->left = border->right = border->top = border->bottom = (gint) first;
*end_str = (gchar *) str;
return border;
}
second = unit_parse_str (str, end_str);
str = *end_str;
SKIP_SPACES (str);
GtkCssProvider: enable parsing negative GtkBorders this can be used as in regular CSS under some situations, so child items overlap the parent element's border.
2011-01-10 19:13:56 +00:00
if (!g_ascii_isdigit (*str) && *str != '-')
GtkCssProvider: Add initial unit parsing logic At the moment only "px" are supported, and such is the default value when no unit is specified.
2010-11-13 02:55:21 +00:00
{
border->top = border->bottom = (gint) first;
border->left = border->right = (gint) second;
*end_str = (gchar *) str;
return border;
}
third = unit_parse_str (str, end_str);
str = *end_str;
SKIP_SPACES (str);
GtkCssProvider: enable parsing negative GtkBorders this can be used as in regular CSS under some situations, so child items overlap the parent element's border.
2011-01-10 19:13:56 +00:00
if (!g_ascii_isdigit (*str) && *str != '-')
GtkCssProvider: Add initial unit parsing logic At the moment only "px" are supported, and such is the default value when no unit is specified.
2010-11-13 02:55:21 +00:00
{
border->top = (gint) first;
border->left = border->right = (gint) second;
border->bottom = (gint) third;
*end_str = (gchar *) str;
return border;
}
fourth = unit_parse_str (str, end_str);
border->top = (gint) first;
border->right = (gint) second;
border->bottom = (gint) third;
border->left = (gint) fourth;
return border;
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
static gboolean
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
css_provider_parse_value (GtkCssProvider *css_provider,
const gchar *value_str,
GValue *value,
GError **error)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
GtkCssProviderPrivate *priv;
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
GType type;
GtkCssProvider: Make additions to parse_value() less error prone.
2010-06-18 14:42:48 +00:00
gboolean parsed = TRUE;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
gchar *end = NULL;
GtkCssProvider: Make additions to parse_value() less error prone.
2010-06-18 14:42:48 +00:00
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv = css_provider->priv;
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
type = G_VALUE_TYPE (value);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Also parse GdkColor values This is necessary for widget style properties to work.
2010-11-13 00:24:07 +00:00
if (type == GDK_TYPE_RGBA ||
type == GDK_TYPE_COLOR)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
GdkRGBA rgba;
GdkColor color;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Also parse GdkColor values This is necessary for widget style properties to work.
2010-11-13 00:24:07 +00:00
if (type == GDK_TYPE_RGBA &&
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
gdk_rgba_parse (&rgba, value_str))
g_value_set_boxed (value, &rgba);
GtkCssProvider: Also parse GdkColor values This is necessary for widget style properties to work.
2010-11-13 00:24:07 +00:00
else if (type == GDK_TYPE_COLOR &&
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
gdk_color_parse (value_str, &color))
g_value_set_boxed (value, &color);
GtkCssProvider: Allow symbolic colors when parsing style rules.
2010-06-25 18:31:08 +00:00
else
{
GtkSymbolicColor *symbolic_color;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
symbolic_color = symbolic_color_parse_str (value_str, &end);
GtkCssProvider: Allow symbolic colors when parsing style rules.
2010-06-25 18:31:08 +00:00
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
if (symbolic_color)
{
g_value_unset (value);
g_value_init (value, GTK_TYPE_SYMBOLIC_COLOR);
g_value_take_boxed (value, symbolic_color);
}
else
parsed = FALSE;
GtkCssProvider: Allow symbolic colors when parsing style rules.
2010-06-25 18:31:08 +00:00
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
else if (type == PANGO_TYPE_FONT_DESCRIPTION)
{
PangoFontDescription *font_desc;
font_desc = pango_font_description_from_string (value_str);
g_value_take_boxed (value, font_desc);
}
GtkCssProvider: Parse boolean values.
2010-06-18 14:46:31 +00:00
else if (type == G_TYPE_BOOLEAN)
{
if (value_str[0] == '1' ||
g_ascii_strcasecmp (value_str, "true") == 0)
g_value_set_boolean (value, TRUE);
else
g_value_set_boolean (value, FALSE);
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
else if (type == G_TYPE_INT)
GtkCssProvider: Make additions to parse_value() less error prone.
2010-06-18 14:42:48 +00:00
g_value_set_int (value, atoi (value_str));
Handle float and uint style properties These were giving errors in testgtk.
2010-11-17 05:21:21 +00:00
else if (type == G_TYPE_UINT)
g_value_set_uint (value, (guint) atoi (value_str));
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
else if (type == G_TYPE_DOUBLE)
GtkCssProvider: Make additions to parse_value() less error prone.
2010-06-18 14:42:48 +00:00
g_value_set_double (value, g_ascii_strtod (value_str, NULL));
Handle float and uint style properties These were giving errors in testgtk.
2010-11-17 05:21:21 +00:00
else if (type == G_TYPE_FLOAT)
g_value_set_float (value, (gfloat) g_ascii_strtod (value_str, NULL));
GtkStyleSet: Register GtkThemingEngine type. This has been also hooked up to the CSS provider, which parses the "engine" value to load the corresponding module.
2010-06-13 15:31:22 +00:00
else if (type == GTK_TYPE_THEMING_ENGINE)
{
GtkThemingEngine *engine;
engine = gtk_theming_engine_load (value_str);
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
if (engine)
g_value_set_object (value, engine);
else
parsed = FALSE;
GtkStyleSet: Register GtkThemingEngine type. This has been also hooked up to the CSS provider, which parses the "engine" value to load the corresponding module.
2010-06-13 15:31:22 +00:00
}
GtkCssProvider: Parse properties of type GtkAnimationDescription.
2010-08-19 19:50:19 +00:00
else if (type == GTK_TYPE_ANIMATION_DESCRIPTION)
{
GtkAnimationDescription *desc;
Fix abi check after recent merges
2010-12-05 17:18:30 +00:00
desc = _gtk_animation_description_from_string (value_str);
GtkCssProvider: Parse properties of type GtkAnimationDescription.
2010-08-19 19:50:19 +00:00
if (desc)
g_value_take_boxed (value, desc);
else
parsed = FALSE;
}
Add basic parser for GtkBorder properties. Different units aren't supported, it takes 1 to 4 integers representing pixel distances.
2010-08-30 20:34:31 +00:00
else if (type == GTK_TYPE_BORDER)
{
GtkCssProvider: Add initial unit parsing logic At the moment only "px" are supported, and such is the default value when no unit is specified.
2010-11-13 02:55:21 +00:00
GtkBorder *border;
Add basic parser for GtkBorder properties. Different units aren't supported, it takes 1 to 4 integers representing pixel distances.
2010-08-30 20:34:31 +00:00
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
border = border_parse_str (value_str, &end);
GtkCssProvider: Add initial unit parsing logic At the moment only "px" are supported, and such is the default value when no unit is specified.
2010-11-13 02:55:21 +00:00
g_value_take_boxed (value, border);
Add basic parser for GtkBorder properties. Different units aren't supported, it takes 1 to 4 integers representing pixel distances.
2010-08-30 20:34:31 +00:00
}
Use cairo gobject support instead of a new boxed type.
2010-10-13 14:33:38 +00:00
else if (type == CAIRO_GOBJECT_TYPE_PATTERN)
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
{
GtkGradient *gradient;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
gradient = gradient_parse_str (value_str, &end);
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
if (gradient)
{
g_value_unset (value);
g_value_init (value, GTK_TYPE_GRADIENT);
g_value_take_boxed (value, gradient);
}
else
Allow images for background-image In addition to -gtk-gradient(...), allow url(path), and create a pattern from the image. Still to do: allow stretch/repeat options.
2010-11-26 05:43:16 +00:00
{
gchar *path;
GdkPixbuf *pixbuf;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
g_clear_error (error);
path = path_parse_str (css_provider, value_str, &end, error);
Allow images for background-image In addition to -gtk-gradient(...), allow url(path), and create a pattern from the image. Still to do: allow stretch/repeat options.
2010-11-26 05:43:16 +00:00
if (path)
{
pixbuf = gdk_pixbuf_new_from_file (path, NULL);
g_free (path);
if (pixbuf)
{
cairo_surface_t *surface;
cairo_pattern_t *pattern;
cairo_t *cr;
cairo_matrix_t matrix;
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf));
cr = cairo_create (surface);
gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
cairo_paint (cr);
pattern = cairo_pattern_create_for_surface (surface);
cairo_matrix_init_scale (&matrix,
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf));
cairo_pattern_set_matrix (pattern, &matrix);
cairo_surface_destroy (surface);
cairo_destroy (cr);
g_object_unref (pixbuf);
g_value_take_boxed (value, pattern);
}
else
parsed = FALSE;
}
else
parsed = FALSE;
}
GtkCssProvider: Add a parser for gradients.
2010-09-02 00:06:05 +00:00
}
GtkCssProvider: Make it able to parse enums.
2010-10-20 16:04:39 +00:00
else if (G_TYPE_IS_ENUM (type))
{
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
GEnumClass *enum_class;
GtkCssProvider: Make it able to parse enums.
2010-10-20 16:04:39 +00:00
GEnumValue *enum_value;
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
enum_class = g_type_class_ref (type);
enum_value = g_enum_get_value_by_nick (enum_class, value_str);
GtkCssProvider: Make it able to parse enums.
2010-10-20 16:04:39 +00:00
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
if (!enum_value)
{
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
g_set_error (error,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Unknown value '%s' for enum type '%s'",
value_str, g_type_name (type));
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
parsed = FALSE;
}
else
g_value_set_enum (value, enum_value->value);
g_type_class_unref (enum_class);
GtkCssProvider: Make it able to parse enums.
2010-10-20 16:04:39 +00:00
}
GtkCssProviders: Parse GTypeFlags based values.
2010-11-13 11:36:24 +00:00
else if (G_TYPE_IS_FLAGS (type))
{
GFlagsClass *flags_class;
GFlagsValue *flag_value;
guint flags = 0;
gchar *ptr;
flags_class = g_type_class_ref (type);
/* Parse comma separated values */
ptr = strchr (value_str, ',');
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
while (ptr && parsed)
GtkCssProviders: Parse GTypeFlags based values.
2010-11-13 11:36:24 +00:00
{
gchar *flag_str;
*ptr = '\0';
ptr++;
flag_str = (gchar *) value_str;
flag_value = g_flags_get_value_by_nick (flags_class,
g_strstrip (flag_str));
if (!flag_value)
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
{
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
g_set_error (error,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Unknown flag '%s' for type '%s'",
value_str, g_type_name (type));
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
parsed = FALSE;
}
GtkCssProviders: Parse GTypeFlags based values.
2010-11-13 11:36:24 +00:00
else
flags |= flag_value->value;
value_str = ptr;
ptr = strchr (value_str, ',');
}
/* Store last/only value */
flag_value = g_flags_get_value_by_nick (flags_class, value_str);
if (!flag_value)
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
{
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
g_set_error (error,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Unknown flag '%s' for type '%s'",
value_str, g_type_name (type));
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
parsed = FALSE;
}
GtkCssProviders: Parse GTypeFlags based values.
2010-11-13 11:36:24 +00:00
else
flags |= flag_value->value;
GtkCssProvider: Handle better wrong enum/flag values.
2010-11-13 11:44:55 +00:00
if (parsed)
g_value_set_enum (value, flags);
GtkCssProviders: Parse GTypeFlags based values.
2010-11-13 11:36:24 +00:00
g_type_class_unref (flags_class);
}
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
else if (type == GTK_TYPE_9SLICE)
{
Gtk9Slice *slice;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
slice = slice_parse_str (css_provider, value_str, &end, error);
GtkCssProvider: Add a parser for 9slice typed properties. The value it parses is similar to the border-image CSS3 property, so strings like this will be accepted: border-image: url (foo.png) 4 3 4 3 repeat repeat; the image path is relative to the parsed CSS file dirname if no absolute path is provided.
2010-09-24 20:05:20 +00:00
if (slice)
g_value_take_boxed (value, slice);
else
parsed = FALSE;
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
else
GtkCssProvider: Make additions to parse_value() less error prone.
2010-06-18 14:42:48 +00:00
{
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
g_set_error (error,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Cannot parse string '%s' for type %s",
value_str, g_type_name (type));
GtkCssProvider: Make additions to parse_value() less error prone.
2010-06-18 14:42:48 +00:00
parsed = FALSE;
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
if (end && *end)
{
/* Set error position in the scanner
* according to what we've parsed so far
*/
priv->value_pos += (end - value_str);
if (error && !*error)
g_set_error_literal (error,
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
"Failed to parse value");
}
GtkCssProvider: Make additions to parse_value() less error prone.
2010-06-18 14:42:48 +00:00
return parsed;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
static void
scanner_report_warning (GtkCssProvider *css_provider,
GTokenType expected_token,
GError *error)
{
GtkCssProviderPrivate *priv;
const gchar *line_end, *line_start;
const gchar *expected_str;
gchar buf[2], *line, *str;
guint pos;
priv = css_provider->priv;
if (error)
str = g_strdup (error->message);
else
{
if (priv->scanner->user_data)
expected_str = priv->scanner->user_data;
else
{
switch (expected_token)
{
case G_TOKEN_SYMBOL:
expected_str = "Symbol";
case G_TOKEN_IDENTIFIER:
expected_str = "Identifier";
default:
buf[0] = expected_token;
buf[1] = '\0';
expected_str = buf;
}
}
str = g_strdup_printf ("Parse error, expecting a %s '%s'",
(expected_str != buf) ? "valid" : "",
expected_str);
}
if (priv->value_pos)
line_start = priv->value_pos - 1;
else
line_start = priv->scanner->text - 1;
while (*line_start != '\n' &&
line_start != priv->buffer)
line_start--;
if (*line_start == '\n')
line_start++;
if (priv->value_pos)
pos = priv->value_pos - line_start + 1;
else
pos = priv->scanner->text - line_start - 1;
line_end = strchr (line_start, '\n');
if (line_end)
line = g_strndup (line_start, (line_end - line_start));
else
line = g_strdup (line_start);
g_message ("CSS: %s\n"
"%s, line %d, char %d:\n"
"%*c %s\n"
"%*c ^",
str, priv->scanner->input_name,
priv->scanner->line, priv->scanner->position,
3, ' ', line,
3 + pos, ' ');
g_free (line);
g_free (str);
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
static GTokenType
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
parse_rule (GtkCssProvider *css_provider,
GScanner *scanner,
GError **error)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
GtkCssProviderPrivate *priv;
GTokenType expected_token;
SelectorPath *selector;
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
css_provider_push_scope (css_provider, SCOPE_SELECTOR);
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
/* Handle directives */
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
if (scanner->token == G_TOKEN_IDENTIFIER &&
scanner->value.v_identifier[0] == '@')
{
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
gchar *directive;
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
directive = &scanner->value.v_identifier[1];
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
if (strcmp (directive, "define-color") == 0)
{
GtkSymbolicColor *color;
gchar *color_name, *color_str;
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
/* Directive is a color mapping */
g_scanner_get_next_token (scanner);
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
if (scanner->token != G_TOKEN_IDENTIFIER)
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
{
scanner->user_data = "Color name";
return G_TOKEN_IDENTIFIER;
}
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
color_name = g_strdup (scanner->value.v_identifier);
css_provider_push_scope (css_provider, SCOPE_VALUE);
g_scanner_get_next_token (scanner);
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
if (scanner->token != G_TOKEN_IDENTIFIER)
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
{
scanner->user_data = "Color definition";
return G_TOKEN_IDENTIFIER;
}
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
color_str = g_strstrip (scanner->value.v_identifier);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
color = symbolic_color_parse (color_str, error);
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
if (!color)
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
{
scanner->user_data = "Color definition";
return G_TOKEN_IDENTIFIER;
}
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
g_hash_table_insert (priv->symbolic_colors, color_name, color);
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
css_provider_pop_scope (css_provider);
g_scanner_get_next_token (scanner);
if (scanner->token != ';')
return ';';
return G_TOKEN_NONE;
}
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
else if (strcmp (directive, "import") == 0)
{
GScanner *scanner_backup;
GSList *state_backup;
gboolean loaded;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
gchar *path = NULL;
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
css_provider_push_scope (css_provider, SCOPE_VALUE);
g_scanner_get_next_token (scanner);
Work harder at parsing import statements Also, turn g_warning() into g_message() for now, so that tests don't abort. Eventually, this needs to all go into GErrors.
2010-11-18 06:59:27 +00:00
if (scanner->token == G_TOKEN_IDENTIFIER &&
g_str_has_prefix (scanner->value.v_identifier, "url"))
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
path = path_parse (css_provider,
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
g_strstrip (scanner->value.v_identifier),
error);
Move import syntax closer to css Css allows @import url ("foo.css") or @import "foo.css" or @import url ('foo.css') but not @import url(foo.css) or @immport foo.css.
2010-11-18 06:25:41 +00:00
else if (scanner->token == G_TOKEN_STRING)
path = path_parse (css_provider,
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
g_strstrip (scanner->value.v_string),
error);
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
Work harder at parsing import statements Also, turn g_warning() into g_message() for now, so that tests don't abort. Eventually, this needs to all go into GErrors.
2010-11-18 06:59:27 +00:00
if (path == NULL)
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
{
scanner->user_data = "File URL";
return G_TOKEN_IDENTIFIER;
}
Work harder at parsing import statements Also, turn g_warning() into g_message() for now, so that tests don't abort. Eventually, this needs to all go into GErrors.
2010-11-18 06:59:27 +00:00
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
css_provider_pop_scope (css_provider);
g_scanner_get_next_token (scanner);
if (scanner->token != ';')
{
g_free (path);
return ';';
}
/* Snapshot current parser state and scanner in order to restore after importing */
state_backup = priv->state;
scanner_backup = priv->scanner;
priv->state = NULL;
priv->scanner = create_scanner ();
/* FIXME: Avoid recursive importing */
loaded = gtk_css_provider_load_from_path_internal (css_provider, path,
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
FALSE, error);
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
/* Restore previous state */
css_provider_reset_parser (css_provider);
priv->state = state_backup;
g_scanner_destroy (priv->scanner);
priv->scanner = scanner_backup;
g_free (path);
if (!loaded)
{
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
scanner->user_data = "File URL";
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
return G_TOKEN_IDENTIFIER;
}
else
return G_TOKEN_NONE;
}
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
else
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
{
scanner->user_data = "Directive";
return G_TOKEN_IDENTIFIER;
}
GtkCssProvider: Parse color mappings. These are of the form: @color-a: #fff; @color-b: mix (@color-a, #000, 0.5) @color-c: shade (@color-b, 0.7) In the stylesheet, arbitrary nesting of these commands is handled.
2010-06-25 18:27:15 +00:00
}
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
expected_token = parse_selector (css_provider, scanner, &selector);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (expected_token != G_TOKEN_NONE)
GtkCssProvider: free selector path on parse_rule().
2010-04-20 23:51:46 +00:00
{
selector_path_unref (selector);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
scanner->user_data = "Selector";
GtkCssProvider: free selector path on parse_rule().
2010-04-20 23:51:46 +00:00
return expected_token;
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
priv->cur_selectors = g_slist_prepend (priv->cur_selectors, selector);
while (scanner->token == ',')
{
g_scanner_get_next_token (scanner);
GtkCssProvider: Add state parsing. Now state is now defined as a pseudoclass in the CSS format, selectors like: GtkWidget:active { } GtkButton:insensitive { } GtkCalendar:prelight { } (also :hover is accepted) ... define the style for the given state.
2010-04-14 21:36:48 +00:00
expected_token = parse_selector (css_provider, scanner, &selector);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (expected_token != G_TOKEN_NONE)
GtkCssProvider: free selector path on parse_rule().
2010-04-20 23:51:46 +00:00
{
selector_path_unref (selector);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
scanner->user_data = "Selector";
GtkCssProvider: free selector path on parse_rule().
2010-04-20 23:51:46 +00:00
return expected_token;
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
priv->cur_selectors = g_slist_prepend (priv->cur_selectors, selector);
}
css_provider_pop_scope (css_provider);
if (scanner->token != G_TOKEN_LEFT_CURLY)
return G_TOKEN_LEFT_CURLY;
/* Declarations parsing */
css_provider_push_scope (css_provider, SCOPE_DECLARATION);
g_scanner_get_next_token (scanner);
while (scanner->token == G_TOKEN_IDENTIFIER)
{
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
gchar *value_str = NULL;
GtkStyleSet: Allow custom parsers on registered properties.
2010-08-04 15:49:15 +00:00
GtkStylePropertyParser parse_func = NULL;
GtkStyleProperties: Use GParamSpec for properties registration.
2010-11-13 18:53:36 +00:00
GParamSpec *pspec;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
gchar *prop;
prop = g_strdup (scanner->value.v_identifier);
g_scanner_get_next_token (scanner);
if (scanner->token != ':')
{
g_free (prop);
return ':';
}
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv->value_pos = priv->scanner->text;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
css_provider_push_scope (css_provider, SCOPE_VALUE);
g_scanner_get_next_token (scanner);
if (scanner->token != G_TOKEN_IDENTIFIER)
{
g_free (prop);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
scanner->user_data = "Property value";
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
return G_TOKEN_IDENTIFIER;
}
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
value_str = scanner->value.v_identifier;
SKIP_SPACES (value_str);
g_strchomp (value_str);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkStyleProperties: Use GParamSpec for properties registration.
2010-11-13 18:53:36 +00:00
if (gtk_style_properties_lookup_property (prop, &parse_func, &pspec))
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
{
GValue *val;
val = g_slice_new0 (GValue);
GtkStyleProperties: Use GParamSpec for properties registration.
2010-11-13 18:53:36 +00:00
g_value_init (val, pspec->value_type);
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
GtkCssProvider: Handle the "none" keyword to unset properties.
2010-11-13 01:30:53 +00:00
if (strcmp (value_str, "none") == 0)
{
GtkCssProvider: Use default value when handling "none". This way the default value has a way to override other values in previous GtkStyleProviders when merged.
2010-11-21 18:36:59 +00:00
/* Insert the default value, so it has an opportunity
* to override other style providers when merged
*/
g_param_value_set_default (pspec, val);
g_hash_table_insert (priv->cur_properties, prop, val);
GtkCssProvider: Handle the "none" keyword to unset properties.
2010-11-13 01:30:53 +00:00
}
GtkStyleProperties: Use GParamSpec for properties registration.
2010-11-13 18:53:36 +00:00
else if (pspec->value_type == G_TYPE_STRING)
GtkCssProvider: don't ignore custom attributes * gtk/gtkcssprovider.c: don't ignore custom attribites (which can be added by theme engines)
2010-08-05 14:21:47 +00:00
{
g_value_set_string (val, value_str);
g_hash_table_insert (priv->cur_properties, prop, val);
}
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
else if ((parse_func && (parse_func) (value_str, val, error)) ||
(!parse_func && css_provider_parse_value (css_provider, value_str, val, error)))
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
g_hash_table_insert (priv->cur_properties, prop, val);
else
{
g_value_unset (val);
g_slice_free (GValue, val);
g_free (prop);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
scanner->user_data = "Property value";
GtkCssProvider: Implement GtkStyleProvider->get_style_property Style properties in the resource files are something like: -GtkComboBox-appears-as-string -GtkEntry-icon-prelight Following the usual naming spec for extensions to CSS.
2010-06-18 15:04:03 +00:00
return G_TOKEN_IDENTIFIER;
}
}
Make GtkCssProvider deal with widget types not being in plain CamelCase Fixes bug #Bug 639754, reported by Kjell Ahlstedt. gtkmm doesn't use plain CamelCase for its widget type names, so in order to distinguish widget type names from regions in the CSS parser, the following checks are now done: * if it contains an uppercase letter -> widget class (that should also work for gtkmm) * if it's a string compound by lowercase letters and '-' -> it's a region, checks have been added in gtk_style_context_add_region() and gtk_widget_path_iter_add_region() to ensure this.
2011-01-19 03:12:08 +00:00
else if (prop[0] == '-')
GtkThemingEngine: Add gtk_theming_engine_register_property(). This function may be used for custom property registration from theming engines. The property names will have the -${engine-type-name}-${prop-name} format, the parser has been modified to allow properties with '-' as the first char.
2010-08-04 15:51:19 +00:00
{
GValue *val;
val = g_slice_new0 (GValue);
g_value_init (val, G_TYPE_STRING);
g_value_set_string (val, value_str);
g_hash_table_insert (priv->cur_properties, prop, val);
}
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
else
g_free (prop);
css_provider_pop_scope (css_provider);
g_scanner_get_next_token (scanner);
if (scanner->token != ';')
A little closer to css Declarations are ;-separated, but there is no ; required after the last declaration. We harmlessly accept either.
2010-11-18 23:36:08 +00:00
break;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_scanner_get_next_token (scanner);
}
if (scanner->token != G_TOKEN_RIGHT_CURLY)
return G_TOKEN_RIGHT_CURLY;
css_provider_pop_scope (css_provider);
return G_TOKEN_NONE;
}
static gboolean
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
parse_stylesheet (GtkCssProvider *css_provider,
GError **error)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
GtkCssProviderPrivate *priv;
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
gboolean result;
result = TRUE;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_scanner_get_next_token (priv->scanner);
while (!g_scanner_eof (priv->scanner))
{
GTokenType expected_token;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
GError *err = NULL;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
css_provider_reset_parser (css_provider);
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
expected_token = parse_rule (css_provider, priv->scanner, &err);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (expected_token != G_TOKEN_NONE)
{
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
/* If a GError was passed in, propagate the error and bail out,
* else report a warning and keep going
*/
if (error != NULL)
{
result = FALSE;
if (err)
g_propagate_error (error, err);
else
g_set_error_literal (error,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Error parsing stylesheet");
break;
}
else
{
scanner_report_warning (css_provider, expected_token, err);
g_clear_error (&err);
}
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
while (!g_scanner_eof (priv->scanner) &&
priv->scanner->token != G_TOKEN_RIGHT_CURLY)
g_scanner_get_next_token (priv->scanner);
}
else
css_provider_commit (css_provider);
g_scanner_get_next_token (priv->scanner);
}
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
return result;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
/**
* gtk_css_provider_load_from_data:
* @css_provider: a #GtkCssProvider
* @data: CSS data loaded in memory
* @length: the length of @data in bytes, or -1 for NUL terminated strings
* @error: (out) (allow-none): return location for a #GError, or %NULL
*
* Loads @data into @css_provider, making it clear any previously loaded
* information.
*
* Returns: %TRUE if the data could be loaded.
**/
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
gboolean
Fix prototype of gtk_css_style_provider_load_from_data GError arguments must be **.
2010-11-18 01:24:18 +00:00
gtk_css_provider_load_from_data (GtkCssProvider *css_provider,
const gchar *data,
gssize length,
GError **error)
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
{
GtkCssProviderPrivate *priv;
g_return_val_if_fail (GTK_IS_CSS_PROVIDER (css_provider), FALSE);
g_return_val_if_fail (data != NULL, FALSE);
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (length < 0)
length = strlen (data);
if (priv->selectors_info->len > 0)
g_ptr_array_remove_range (priv->selectors_info, 0, priv->selectors_info->len);
GtkCssProvider: set scanner->input_name.
2010-06-19 14:04:30 +00:00
priv->scanner->input_name = "-";
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv->buffer = data;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_scanner_input_text (priv->scanner, data, (guint) length);
GtkCssProvider: unset filename on load_from_data()
2010-09-24 20:09:37 +00:00
g_free (priv->filename);
priv->filename = NULL;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv->buffer = NULL;
GtkCssProvider: unset filename on load_from_data()
2010-09-24 20:09:37 +00:00
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
return parse_stylesheet (css_provider, error);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
/**
* gtk_css_provider_load_from_file:
* @css_provider: a #GtkCssProvider
* @file: #GFile pointing to a file to load
* @error: (out) (allow-none): return location for a #GError, or %NULL
*
* Loads the data contained in @file into @css_provider, making it
* clear any previously loaded information.
*
* Returns: %TRUE if the data could be loaded.
**/
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
gboolean
gtk_css_provider_load_from_file (GtkCssProvider *css_provider,
GFile *file,
GError **error)
{
GtkCssProviderPrivate *priv;
GError *internal_error = NULL;
gchar *data;
gsize length;
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
gboolean ret;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_return_val_if_fail (GTK_IS_CSS_PROVIDER (css_provider), FALSE);
g_return_val_if_fail (G_IS_FILE (file), FALSE);
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
priv = css_provider->priv;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
if (!g_file_load_contents (file, NULL,
&data, &length,
NULL, &internal_error))
{
g_propagate_error (error, internal_error);
return FALSE;
}
if (priv->selectors_info->len > 0)
g_ptr_array_remove_range (priv->selectors_info, 0, priv->selectors_info->len);
GtkCssProvider: set scanner->input_name.
2010-06-19 14:04:30 +00:00
g_free (priv->filename);
priv->filename = g_file_get_path (file);
priv->scanner->input_name = priv->filename;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv->buffer = data;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_scanner_input_text (priv->scanner, data, (guint) length);
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
ret = parse_stylesheet (css_provider, error);
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv->buffer = NULL;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
g_free (data);
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
return ret;
Added GtkCssProvider. GtkCssProvider is a GtkStyleProvider implementation which is able to read CSS-like input to style widgets. At the moment, only the basic parser features are available.
2010-04-11 21:03:25 +00:00
}
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
static gboolean
gtk_css_provider_load_from_path_internal (GtkCssProvider *css_provider,
const gchar *path,
gboolean reset,
GError **error)
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
{
GtkCssProviderPrivate *priv;
GError *internal_error = NULL;
GtkCssProvider: use mapped file to read CSS files.
2010-09-24 20:10:20 +00:00
GMappedFile *mapped_file;
const gchar *data;
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
gsize length;
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
gboolean ret;
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
priv = css_provider->priv;
GtkCssProvider: use mapped file to read CSS files.
2010-09-24 20:10:20 +00:00
mapped_file = g_mapped_file_new (path, FALSE, &internal_error);
if (internal_error)
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
{
g_propagate_error (error, internal_error);
return FALSE;
}
GtkCssProvider: use mapped file to read CSS files.
2010-09-24 20:10:20 +00:00
length = g_mapped_file_get_length (mapped_file);
data = g_mapped_file_get_contents (mapped_file);
if (!data)
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
data = "";
GtkCssProvider: use mapped file to read CSS files.
2010-09-24 20:10:20 +00:00
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
if (reset)
{
if (priv->selectors_info->len > 0)
g_ptr_array_remove_range (priv->selectors_info, 0, priv->selectors_info->len);
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
g_free (priv->filename);
priv->filename = g_strdup (path);
}
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
priv->scanner->input_name = priv->filename;
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv->buffer = data;
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
g_scanner_input_text (priv->scanner, data, (guint) length);
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
ret = parse_stylesheet (css_provider, error);
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
GtkCssProvider: Improve error handling and reporting. Nicer error reports are provided, and a GError can be spread from anywhere in parsing, so over time more precise and meaningful messages can be produced.
2010-12-03 20:56:39 +00:00
priv->buffer = NULL;
GtkCssProvider: use mapped file to read CSS files.
2010-09-24 20:10:20 +00:00
g_mapped_file_unref (mapped_file);
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
return ret;
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
}
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
/**
* gtk_css_provider_load_from_path:
* @css_provider: a #GtkCssProvider
* @path: the path of a filename to load, in the GLib filename encoding
* @error: (out) (allow-none): return location for a #GError, or %NULL
*
* Loads the data contained in @path into @css_provider, making it clear
* any previously loaded information.
*
* Returns: %TRUE if the data could be loaded.
**/
GtkCssProvider: Add support for @import rules Now other CSS files can be referenced from the currently parsed file: @import url (other-file.css); @import url (/some/file.css);
2010-10-08 16:36:46 +00:00
gboolean
gtk_css_provider_load_from_path (GtkCssProvider *css_provider,
const gchar *path,
GError **error)
{
g_return_val_if_fail (GTK_IS_CSS_PROVIDER (css_provider), FALSE);
g_return_val_if_fail (path != NULL, FALSE);
return gtk_css_provider_load_from_path_internal (css_provider, path,
TRUE, error);
}
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
/**
* gtk_css_provider_get_default:
*
* Returns the provider containing the style settings used as a
* fallback for all widgets.
*
* Returns: (transfer none): The provider used for fallback styling.
* This memory is owned by GTK+, and you must not free it.
**/
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
GtkCssProvider *
gtk_css_provider_get_default (void)
{
static GtkCssProvider *provider;
if (G_UNLIKELY (!provider))
{
const gchar *str =
GtkCssProvider: Transform custom colors to a @define-color rule. Given there are other rules such as @import (which will be supported), keep a sane namespace here, so for (re)defining a color name, in the CSS file it will look like: @define-color color-name #fff; @define-color other-color mix (@color-name, #f00, 0.4);
2010-10-08 16:19:34 +00:00
"@define-color fg_color #000; \n"
"@define-color bg_color #dcdad5; \n"
"@define-color text_color #000; \n"
"@define-color base_color #fff; \n"
"@define-color selected_bg_color #4b6983; \n"
"@define-color selected_fg_color #fff; \n"
"@define-color tooltip_bg_color #eee1b3; \n"
"@define-color tooltip_fg_color #000; \n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"\n"
Make GtkInfoBar use GtkStyleContext All colors are defined now in the default css, and classes have been added so the bars are fully themeable (as opposed to gtk_widget_override_*, which require changing the color map itself)
2010-12-14 01:29:57 +00:00
"@define-color info_fg_color rgb (181, 171, 156);\n"
"@define-color info_bg_color rgb (252, 252, 189);\n"
"@define-color warning_fg_color rgb (173, 120, 41);\n"
"@define-color warning_bg_color rgb (250, 173, 61);\n"
"@define-color question_fg_color rgb (97, 122, 214);\n"
"@define-color question_bg_color rgb (138, 173, 212);\n"
"@define-color error_fg_color rgb (166, 38, 38);\n"
"@define-color error_bg_color rgb (237, 54, 54);\n"
"\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
"* {\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
" background-color: @bg_color;\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" color: @fg_color;\n"
GtkCssProvider: Do not have border-color the same than active bg-color.
2010-11-22 01:39:11 +00:00
" border-color: shade (@bg_color, 0.6);\n"
GtkStyleProperties: Turn border-width into a GtkBorder property. All current users of this CSS property have been updated to deal with a GtkBorder. Also a 0 border width has been set in the default CSS to ensure GtkStyleContext and GtkThemingEngine always provide a non-NULL pointer for this property.
2010-11-30 23:55:14 +00:00
" padding: 2;\n"
" border-width: 0;\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"}\n"
"\n"
"*:prelight {\n"
GtkCssProvider: Make prelight a bit less light in default CSS.
2010-11-19 21:45:35 +00:00
" background-color: shade (@bg_color, 1.05);\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" color: shade (@fg_color, 1.3);\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"}\n"
"\n"
"*:selected {\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
" background-color: @selected_bg_color;\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" color: @selected_fg_color;\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"}\n"
"\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
".expander, GtkTreeView.view.expander {\n"
Make GtkExpander use GtkStyleContext
2010-12-13 19:04:40 +00:00
" color: #fff;\n"
"}\n"
"\n"
Make expanders prelight
2010-11-22 23:56:10 +00:00
".expander:prelight {\n"
Make GtkExpander use GtkStyleContext
2010-12-13 19:04:40 +00:00
" color: @text_color;\n"
"}\n"
"\n"
".expander:active {\n"
" transition: 300ms linear;\n"
Make expanders prelight
2010-11-22 23:56:10 +00:00
"}\n"
"\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"*:insensitive {\n"
GtkCssProvider: Add a default border color for insensitive elements.
2010-11-24 00:10:38 +00:00
" border-color: shade (@bg_color, 0.7);\n"
GtkCssProvider: Base prelight foreground on bg color. Entries are also handled, so base/text colors are used.
2010-11-19 21:46:07 +00:00
" background-color: shade (@bg_color, 0.9);\n"
" color: shade (@bg_color, 0.7);\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"}\n"
"\n"
Set the style for .view so i.e the GtkTextView gets the right style.
2011-01-07 10:34:35 +00:00
".view {\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
" border-width: 0;\n"
" border-radius: 0;\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
" background-color: @base_color;\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" color: @text_color;\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
"}\n"
CSS styles for the selection in a TextView. https://bugzilla.gnome.org/show_bug.cgi?id=639106
2011-01-09 22:10:47 +00:00
".view:selected {\n"
" background-color: shade (@bg_color, 0.9);\n"
" color: @fg_color;\n"
"}\n"
"\n"
".view:selected:focused {\n"
" background-color: @selected_bg_color;\n"
" color: @selected_fg_color;\n"
"}\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
"\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
".view column:sorted row,\n"
".view column:sorted row:prelight {\n"
" background-color: shade (@bg_color, 0.85);\n"
"}\n"
"\n"
".view column:sorted row:nth-child(odd),\n"
".view column:sorted row:nth-child(odd):prelight {\n"
" background-color: shade (@bg_color, 0.8);\n"
"}\n"
"\n"
".view row,\n"
".view row:prelight {\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
" background-color: @base_color;\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" color: @text_color;\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"}\n"
"\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
".view row:nth-child(odd),\n"
".view row:nth-child(odd):prelight {\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
" background-color: shade (@base_color, 0.93); \n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"}\n"
"\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
".view row:selected:focused {\n"
" background-color: @selected_bg_color;\n"
"}\n"
"\n"
".view row:selected {\n"
" background-color: darker (@bg_color);\n"
" color: @selected_fg_color;\n"
"}\n"
"\n"
".view.cell.trough,\n"
".view.cell.trough:hover,\n"
".view.cell.trough:selected,\n"
".view.cell.trough:selected:focused {\n"
" background-color: @bg_color;\n"
" color: @fg_color;\n"
"}\n"
"\n"
".view.cell.progressbar,\n"
".view.cell.progressbar:hover,\n"
".view.cell.progressbar:selected,\n"
".view.cell.progressbar:selected:focused {\n"
" background-color: @selected_bg_color;\n"
" color: @selected_fg_color;\n"
"}\n"
"\n"
".rubberband {\n"
" background-color: alpha (@fg_color, 0.25);\n"
" border-color: @fg_color;\n"
" border-style: solid;\n"
" border-width: 1;\n"
"}\n"
"\n"
GtkCssProvider: Use class for tooltips.
2010-08-06 10:09:09 +00:00
".tooltip {\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
" background-color: @tooltip_bg_color; \n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" color: @tooltip_fg_color; \n"
Make GtkTooltip use GtkStyleContext
2011-01-04 01:18:51 +00:00
" border-color: @tooltip_fg_color; \n"
" border-width: 1;\n"
" border-style: solid;\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"}\n"
"\n"
GtkCssProvider: Improve default CSS.
2010-10-23 16:32:15 +00:00
".button,\n"
".slider {\n"
" border-style: outset; \n"
" border-width: 2; \n"
"}\n"
"\n"
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
".button:active {\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
" background-color: shade (@bg_color, 0.7);\n"
GtkCssProvider: Improve default CSS.
2010-10-23 16:32:15 +00:00
" border-style: inset; \n"
"}\n"
"\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
".button:prelight,\n"
".slider:prelight {\n"
" background-color: @selected_bg_color;\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" color: @selected_fg_color;\n"
GtkCssProvider: Make default style depend more on custom colors.
2010-10-25 11:55:56 +00:00
" border-color: shade (@selected_bg_color, 0.7);\n"
"}\n"
"\n"
GtkCssProvider: Improve default CSS.
2010-10-23 16:32:15 +00:00
".trough {\n"
" border-style: inset;\n"
" border-width: 1;\n"
Improve progressbars theming. Make progressbar itself have an outset border, and improve spacings.
2011-01-14 00:09:40 +00:00
" padding: 0;\n"
GtkCssProvider: Improve default CSS.
2010-10-23 16:32:15 +00:00
"}\n"
"\n"
".entry {\n"
" border-style: inset;\n"
" border-width: 2;\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" background-color: @base_color;\n"
" color: @text_color;\n"
"}\n"
GtkCssProvider: theme progressbars in default CSS.
2010-11-09 17:26:39 +00:00
"\n"
GtkCssProvider: Base prelight foreground on bg color. Entries are also handled, so base/text colors are used.
2010-11-19 21:46:07 +00:00
".entry:insensitive {\n"
" background-color: shade (@base_color, 0.9);\n"
" color: shade (@base_color, 0.7);\n"
"}\n"
Make unfocused selections visible in entries
2010-11-23 01:55:02 +00:00
".entry:active {\n"
" background-color: #c4c2bd;\n"
" color: #000;\n"
"}\n"
GtkCssProvider: Base prelight foreground on bg color. Entries are also handled, so base/text colors are used.
2010-11-19 21:46:07 +00:00
"\n"
Make GtkProgressBar use GtkStyleContext
2010-12-28 16:42:27 +00:00
".progressbar,\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
".entry.progressbar, \n"
".cell.progressbar {\n"
GtkCssProvider: theme progressbars in default CSS.
2010-11-09 17:26:39 +00:00
" background-color: @selected_bg_color;\n"
" border-color: shade (@selected_bg_color, 0.7);\n"
GtkCssProvider: Handle progressbars.
2010-11-22 01:39:41 +00:00
" color: @selected_fg_color;\n"
Improve progressbars theming. Make progressbar itself have an outset border, and improve spacings.
2011-01-14 00:09:40 +00:00
" border-style: outset;\n"
" border-width: 1;\n"
GtkCssProvider: theme progressbars in default CSS.
2010-11-09 17:26:39 +00:00
"}\n"
"\n"
Fix checkbuttons theming in CSS so it's more similar to 2.x
2010-11-19 18:20:12 +00:00
"GtkCheckButton:hover,\n"
"GtkCheckButton:selected,\n"
"GtkRadioButton:hover,\n"
"GtkRadioButton:selected {\n"
GtkCssProvider: Make prelight a bit less light in default CSS.
2010-11-19 21:45:35 +00:00
" background-color: shade (@bg_color, 1.05);\n"
Fix checkbuttons theming in CSS so it's more similar to 2.x
2010-11-19 18:20:12 +00:00
"}\n"
"\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
".check, .radio,"
".cell.check, .cell.radio,\n"
".cell.check:hover, .cell.radio:hover {\n"
Make GtkMenu(Shell) use GtkStyleContext The default CSS has also been modified to theme these sensibly
2011-01-12 19:35:04 +00:00
" border-style: solid;\n"
" border-width: 1;\n"
Make GtkCheckButton/GtkRadioButton background white again
2011-01-18 19:02:51 +00:00
" background-color: @base_color;\n"
Render check/radio buttons with border-color: @fg_color
2011-01-23 19:01:22 +00:00
" border-color: @fg_color;\n"
Make GtkMenu(Shell) use GtkStyleContext The default CSS has also been modified to theme these sensibly
2011-01-12 19:35:04 +00:00
"}\n"
"\n"
Fix checkbuttons theming in CSS so it's more similar to 2.x
2010-11-19 18:20:12 +00:00
".check:active, .radio:active,\n"
".check:hover, .radio:hover {\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" background-color: @base_color;\n"
Fix checkbuttons theming in CSS so it's more similar to 2.x
2010-11-19 18:20:12 +00:00
" border-color: @fg_color;\n"
Make invalid stylesheets fail to parse again The recent improvements to error reporting caused gtk_css_provider_load... to always return TRUE and leave the error unset. Error messages were instead dumped out with g_message, which is not helpful. This commit changes things back to the way they were before: If a GError is passed in, parsing will fail at the first error, reporting it in the given GError. If no GError is passed in, we keep going and just issue the warning messages. This fixes the parser tests.
2010-12-06 05:44:58 +00:00
" color: @text_color;\n"
Fix checkbuttons theming in CSS so it's more similar to 2.x
2010-11-19 18:20:12 +00:00
"}\n"
"\n"
".check:selected, .radio:selected {\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
" background-color: darker (@bg_color);\n"
Fix checkbuttons theming in CSS so it's more similar to 2.x
2010-11-19 18:20:12 +00:00
" color: @selected_fg_color;\n"
Make GtkTreeView use GtkStyleContext Expander animation has been replaced by implicit animations from the style context. Column headers are also properly themed, GtkContainer::get_path_for_child() is implemented and the treeview resets column buttons style on columns being reordered. The default CSS has changed to theme treeviews sensibly.
2011-01-12 20:18:07 +00:00
" border-color: @selected_fg_color;\n"
"}\n"
"\n"
".check:selected:focused, .radio:selected:focused {\n"
" background-color: @selected_bg_color;\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
"}\n"
"\n"
Add an outline around menu popups
2010-11-17 06:39:03 +00:00
".menu.check, .menu.radio {\n"
Rely only on fg/bg colors. "foreground-color" has been renamed to just "color" as in regular CSS, and the "text-color" and "base-color" properties have been removed. The default CSS has been changed to have widgets cope with this change.
2010-10-29 03:33:38 +00:00
" color: @fg_color;\n"
" border-style: none;\n"
Make GtkMenu(Shell) use GtkStyleContext The default CSS has also been modified to theme these sensibly
2011-01-12 19:35:04 +00:00
" border-width: 0;\n"
GtkCssProvider: Improve default CSS.
2010-10-23 16:32:15 +00:00
"}\n"
"\n"
Add an outline around menu popups
2010-11-17 06:39:03 +00:00
".popup {\n"
" border-style: outset;\n"
" border-width: 1;\n"
"}\n"
"\n"
GtkCssProvider: Improve default CSS.
2010-10-23 16:32:15 +00:00
".viewport {\n"
" border-style: inset;\n"
" border-width: 2;\n"
Move all theming stack to use GtkStateFlags. This support goes from the theming engines, which are able to retrieve style for different combined states to the CSS provider, where several state pseudo-classes may be specified, such as: GtkButton:active:prelight {}
2010-08-16 17:09:34 +00:00
"}\n"
GtkCssProvider: theme notebooks.
2010-11-15 22:28:53 +00:00
"\n"
".notebook {\n"
" border-style: outset;\n"
" border-width: 1;\n"
"}\n"
Add an outline around menu popups
2010-11-17 06:39:03 +00:00
"\n"
Make frames visible by default
2010-11-17 04:02:59 +00:00
".frame {\n"
" border-style: inset;\n"
" border-width: 1;\n"
"}\n"
GtkCssProvider: Draw frame around menubars and toolbars in default CSS.
2010-11-22 20:42:30 +00:00
"\n"
Do not set any padding for scrolled window children.
2011-01-10 19:19:58 +00:00
"GtkScrolledWindow.frame {\n"
" padding: 0;\n"
"}\n"
"\n"
GtkCssProvider: Draw frame around menubars and toolbars in default CSS.
2010-11-22 20:42:30 +00:00
".menu,\n"
".menubar,\n"
".toolbar {\n"
" border-style: outset;\n"
" border-width: 1;\n"
"}\n"
GtkCssProvider: use selected fg/bg for selected menu items in CSS.
2010-11-22 20:43:44 +00:00
"\n"
".menu:hover,\n"
Make GtkMenu(Shell) use GtkStyleContext The default CSS has also been modified to theme these sensibly
2011-01-12 19:35:04 +00:00
".menubar:hover,\n"
".menu.check:hover,\n"
".menu.radio:hover {\n"
GtkCssProvider: use selected fg/bg for selected menu items in CSS.
2010-11-22 20:43:44 +00:00
" background-color: @selected_bg_color;\n"
" color: @selected_fg_color;\n"
"}\n"
GtkCssProvider: Render radio and check boxes framess in menus.
2010-11-22 20:44:36 +00:00
"\n"
GtkCssProvider: Use 1px border width for spinbutton buttons.
2010-11-22 20:45:15 +00:00
"GtkSpinButton.button {\n"
" border-width: 1;\n"
"}\n"
GtkCssProvider: do not use selected fg/bg in sliders or spinbutton buttons.
2010-11-22 20:46:12 +00:00
"\n"
".scale.slider:hover,\n"
"GtkSpinButton.button:hover {\n"
" background-color: shade (@bg_color, 1.05);\n"
" border-color: shade (@bg_color, 0.8);\n"
"}\n"
GtkCssProvider: Render inconsistent toggle buttons differently.
2010-11-22 20:47:11 +00:00
"\n"
"GtkToggleButton.button:inconsistent {\n"
" border-style: outset;\n"
" border-width: 1px;\n"
" background-color: shade (@bg_color, 0.9);\n"
" border-color: shade (@bg_color, 0.7);\n"
"}\n"
GtkCssProvider: Handle unfocused label selections in default CSS.
2010-11-24 00:25:58 +00:00
"\n"
"GtkLabel:selected {\n"
" background-color: shade (@bg_color, 0.9);\n"
" color: @fg_color;\n"
"}\n"
"\n"
"GtkLabel:selected:focused {\n"
" background-color: @selected_bg_color;\n"
" color: @selected_fg_color;\n"
"}\n"
GtkSpinner: Use style context for rendering. Animation is now handled by the theming layer, a looping animation has been defined in the default CSS to handle active spinners.
2010-11-24 22:25:14 +00:00
"\n"
".spinner:active {\n"
" transition: 750ms linear loop;\n"
"}\n"
Make GtkInfoBar use GtkStyleContext All colors are defined now in the default css, and classes have been added so the bars are fully themeable (as opposed to gtk_widget_override_*, which require changing the color map itself)
2010-12-14 01:29:57 +00:00
"\n"
".info {\n"
" background-color: @info_bg_color;\n"
" color: @info_fg_color;\n"
"}\n"
"\n"
".warning {\n"
" background-color: @warning_bg_color;\n"
" color: @warning_fg_color;\n"
"}\n"
"\n"
".question {\n"
" background-color: @question_bg_color;\n"
" color: @question_fg_color;\n"
"}\n"
"\n"
".error {\n"
" background-color: @error_bg_color;\n"
" color: @error_fg_color;\n"
"}\n"
Update GtkAssistant to GtkStyleContext
2011-01-04 00:57:50 +00:00
"\n"
".highlight {\n"
" background-color: @selected_bg_color;\n"
" color: @selected_fg_color;\n"
"}\n"
Make GtkHSV use GtkStyleContext two custom classes replace the light/dark focus detail strings, it doesn't make much sense to have a GTK_STYLE_CLASS_* for that.
2011-01-10 01:37:26 +00:00
"\n"
".light-area-focus {\n"
" color: #000;\n"
"}\n"
"\n"
".dark-area-focus {\n"
" color: #fff;\n"
"}\n"
Make GtkCalendar use GtkStyleContext
2011-01-10 19:40:37 +00:00
"GtkCalendar.view {\n"
" border-width: 1;\n"
" border-style: inset;\n"
" padding: 1;\n"
"}\n"
"\n"
"GtkCalendar.view:inconsistent {\n"
" color: darker (@bg_color);\n"
"}\n"
"\n"
"GtkCalendar.header {\n"
" background-color: @bg_color;\n"
" border-style: outset;\n"
" border-width: 2;\n"
"}\n"
"\n"
"GtkCalendar.highlight {\n"
" border-width: 0;\n"
"}\n"
"\n"
"GtkCalendar.button {\n"
" background-color: @bg_color;\n"
"}\n"
"\n"
"GtkCalendar.button:hover {\n"
" background-color: lighter (@bg_color);\n"
" color: @fg_color;\n"
"}\n"
Make GtkMenu(Shell) use GtkStyleContext The default CSS has also been modified to theme these sensibly
2011-01-12 19:35:04 +00:00
"\n"
".menu {\n"
" border-width: 1;\n"
" padding: 0;\n"
"}\n"
"\n"
".menu * {\n"
" border-width: 0;\n"
" padding: 2;\n"
"}\n"
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
"\n";
provider = gtk_css_provider_new ();
cssprovider: Explode if we fail to parse the default CSS This can only happen if somebody really messed up with a checkin, and in that case we want to explode early.
2010-12-15 13:25:19 +00:00
if (!gtk_css_provider_load_from_data (provider, str, -1, NULL))
{
g_error ("Failed to load the internal default CSS.");
}
GtkCssProvider: Add gtk_css_provider_get_default(). This method returns a GtkCssProvider with the default style information loaded.
2010-08-02 14:16:03 +00:00
}
return provider;
}
Privately export css_provider_get_theme_dir
2011-01-26 16:17:34 +00:00
gchar *
_gtk_css_provider_get_theme_dir (void)
GtkCssProvider: Add gtk_css_provider_get_named() This functions loads a CSS file from a installed theme.
2010-09-22 21:39:15 +00:00
{
const gchar *var;
gchar *path;
var = g_getenv ("GTK_DATA_PREFIX");
if (var)
path = g_build_filename (var, "share", "themes", NULL);
else
path = g_build_filename (GTK_DATA_PREFIX, "share", "themes", NULL);
return path;
}
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
/**
* gtk_css_provider_get_named:
* @name: A theme name
* @variant: variant to load, for example, "dark", or %NULL for the default
*
Fix gtk_css_provider_get_named() docs.
2010-11-13 21:57:49 +00:00
* Loads a theme from the usual theme paths
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
*
Fix gtk_css_provider_get_named() docs.
2010-11-13 21:57:49 +00:00
* Returns: (transfer none): a #GtkCssProvider with the theme loaded.
Add theming docs Both API and file format is documented, there's still missing a migration doc though.
2010-10-19 08:59:46 +00:00
* This memory is owned by GTK+, and you must not free it.
**/
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
GtkCssProvider *
GtkCssProvider: Add gtk_css_provider_get_named() This functions loads a CSS file from a installed theme.
2010-09-22 21:39:15 +00:00
gtk_css_provider_get_named (const gchar *name,
const gchar *variant)
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
{
static GHashTable *themes = NULL;
GtkCssProvider *provider;
if (G_UNLIKELY (!themes))
themes = g_hash_table_new (g_str_hash, g_str_equal);
provider = g_hash_table_lookup (themes, name);
if (!provider)
{
GtkCssProvider: Add gtk_css_provider_get_named() This functions loads a CSS file from a installed theme.
2010-09-22 21:39:15 +00:00
const gchar *home_dir;
gchar *subpath, *path = NULL;
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
GtkCssProvider: Add gtk_css_provider_get_named() This functions loads a CSS file from a installed theme.
2010-09-22 21:39:15 +00:00
if (variant)
Hardcode 3.0 version for style files and paths. It's about time to start using the right paths.
2010-11-13 21:33:34 +00:00
subpath = g_strdup_printf ("gtk-3.0" G_DIR_SEPARATOR_S "gtk-%s.css", variant);
GtkCssProvider: Add gtk_css_provider_get_named() This functions loads a CSS file from a installed theme.
2010-09-22 21:39:15 +00:00
else
Hardcode 3.0 version for style files and paths. It's about time to start using the right paths.
2010-11-13 21:33:34 +00:00
subpath = g_strdup ("gtk-3.0" G_DIR_SEPARATOR_S "gtk.css");
GtkCssProvider: Add gtk_css_provider_get_named() This functions loads a CSS file from a installed theme.
2010-09-22 21:39:15 +00:00
/* First look in the users home directory
*/
home_dir = g_get_home_dir ();
if (home_dir)
{
path = g_build_filename (home_dir, ".themes", name, subpath, NULL);
if (!g_file_test (path, G_FILE_TEST_EXISTS))
{
g_free (path);
path = NULL;
}
}
if (!path)
{
Privately export css_provider_get_theme_dir
2011-01-26 16:17:34 +00:00
gchar *theme_dir = _gtk_css_provider_get_theme_dir ();
GtkCssProvider: Add gtk_css_provider_get_named() This functions loads a CSS file from a installed theme.
2010-09-22 21:39:15 +00:00
path = g_build_filename (theme_dir, name, subpath, NULL);
g_free (theme_dir);
if (!g_file_test (path, G_FILE_TEST_EXISTS))
{
g_free (path);
path = NULL;
}
}
gtk_css_provider_get_named: don't leak subpath (#636777)
2010-12-08 14:13:21 +00:00
g_free (subpath);
GtkCssProvider: Add gtk_css_provider_get_named() This functions loads a CSS file from a installed theme.
2010-09-22 21:39:15 +00:00
if (path)
{
GError *error = NULL;
provider = gtk_css_provider_new ();
gtk_css_provider_load_from_path (provider, path, &error);
if (error)
{
g_warning ("Could not load named theme \"%s\": %s", name, error->message);
g_error_free (error);
g_object_unref (provider);
provider = NULL;
}
else
g_hash_table_insert (themes, g_strdup (name), provider);
}
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
}
return provider;
}
Reference in New Issue Copy Permalink