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

3307 lines
104 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"
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
#include "gtkcssparserprivate.h"
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
#include "gtkcsssectionprivate.h"
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
#include "gtkcssselectorprivate.h"
css: Overhaul value parsing Value parsing only sometimes emitted errors. Sometimes it didn't emit errors but ignored the value, sometimes it took a default, sometimes it converted it to something it deemed suitable. While refactoring, I moved the whole GValue <=> char * conversion routines to a separate file, to make navigating the core css provider easier.
2011-04-08 14:08:28 +00:00
#include "gtksymboliccolor.h"
Split out private style context api into a private header
2011-01-23 23:29:07 +00:00
#include "gtkstyleprovider.h"
#include "gtkstylecontextprivate.h"
css: Refactor code to do property lookups earlier We want to ook up the property in the CSS parser, so we can do fancy things with it. We currently don't but we want to later.
2011-05-16 21:37:29 +00:00
#include "gtkstylepropertiesprivate.h"
css: Rename gtkcssstrfuncs file to gtkstyleproperty The idea is to handle the style property registering etc in this file instead of the styleproperties file. The next commits will move those files.
2011-05-21 01:30:36 +00:00
#include "gtkstylepropertyprivate.h"
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
#include "gtkbindings.h"
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
#include "gtkmarshalers.h"
win32: include gtkprivate.h for win32 GTK_DATA_PREFIX
2011-01-02 11:11:34 +00:00
#include "gtkprivate.h"
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
#include "gtkintl.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 * {
docs: There is no font-name style property It's "font"
2011-06-01 23:55:45 +00:00
* font: 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 {
docs: There is no font-name style property It's "font"
2011-06-01 23:55:45 +00:00
* font: 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>
Add a missing id to the docs
2011-01-31 12:37:36 +00:00
* <para id="css-binding-set">
Document @binding-set and the gtk-key-bindings css parser property
2011-01-28 09:25:17 +00:00
* In order to extend key bindings affecting different widgets, GTK+
* supports the &commat;binding-set rule to parse a set of bind/unbind
doc fixes
2011-01-31 04:34:52 +00:00
* directives, see #GtkBindingSet for the supported syntax. Note that
* the binding sets defined in this way must be associated with rule sets
* by setting the gtk-key-bindings style property.
* </para>
* <para>
* Customized key bindings are typically defined in a separate
* <filename>gtk-keys.css</filename> CSS file and GTK+ loads this file
* according to the current key theme, which is defined by the
* #GtkSettings:gtk-key-theme-name setting.
Document @binding-set and the gtk-key-bindings css parser property
2011-01-28 09:25:17 +00:00
* </para>
* <example>
* <title>Using the &commat;binding rule</title>
* <programlisting language="text">
* &commat;binding-set binding-set1 {
* bind "&lt;alt&gt;Left" { "move-cursor" (visual-positions, -3, 0) };
* unbind "End";
* };
*
Make documentation match behaviour
2011-01-28 23:08:57 +00:00
* &commat;binding-set binding-set2 {
Document @binding-set and the gtk-key-bindings css parser property
2011-01-28 09:25:17 +00:00
* bind "&lt;alt&gt;Right" { "move-cursor" (visual-positions, 3, 0) };
Make documentation match behaviour
2011-01-28 23:08:57 +00:00
* bind "&lt;alt&gt;KP_space" { "delete-from-cursor" (whitespace, 1)
doc fixes
2011-01-31 04:34:52 +00:00
* "insert-at-cursor" (" ") };
Document @binding-set and the gtk-key-bindings css parser property
2011-01-28 09:25:17 +00:00
* };
*
* GtkEntry {
Make documentation match behaviour
2011-01-28 23:08:57 +00:00
* gtk-key-bindings: binding-set1, binding-set2;
Document @binding-set and the gtk-key-bindings css parser property
2011-01-28 09:25:17 +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>
styleproperties: add a "text-shadow" style property And document its use in the CSS parser gtk-doc. https://bugzilla.gnome.org/show_bug.cgi?id=649314
2011-05-20 20:11:08 +00:00
* <refsect2 id="gtkcssprovider-shadows">
* <title>Text shadow</title>
* <para>
* A shadow list can be applied to text or symbolic icons, using the CSS3
* text-shadow syntax, as defined in
* <ulink url="http://www.w3.org/TR/css3-text/#text-shadow">the CSS3 specification</ulink>.
* </para>
* <para>
* A text shadow is specified using the syntax
* <literallayout>text-shadow: @horizontal_offset @vertical_offset [ @blur_radius ] @color</literallayout>
* The offset of the shadow is specified with the @horizontal_offset and @vertical_offset
* parameters. The optional blur radius is parsed, but it is currently not rendered by
* the GTK+ theming engine.
* </para>
* <para>
* To set multiple shadows on an element, you can specify a comma-separated list
* of shadow elements in the text-shadow property. Shadows are always rendered
* front-back, i.e. the first shadow specified is on top of the others. Shadows
* can thus overlay each other, but they can never overlay the text itself,
* which is always rendered on top of the shadow layer.
* </para>
* </refsect2>
cssprovider: add a doc paragraph about box-shadow
2011-06-07 16:57:08 +00:00
* <refsect2>
* <title>Box shadow</title>
* <para>
* Themes can apply shadows on framed elements using the CSS3 box-shadow syntax,
* as defined in
* <ulink url="http://www.w3.org/TR/css3-background/#the-box-shadow">the CSS3 specification</ulink>.
* </para>
* <para>
* A box shadow is specified using the syntax
* <literallayout>box-shadow: [ @inset ] @horizontal_offset @vertical_offset [ @blur_radius ] [ @spread ] @color</literallayout>
* A positive offset will draw a shadow that is offset to the right (down) of the box,
* a negative offset to the left (top). The optional spread parameter defines an additional
* distance to expand the shadow shape in all directions, by the specified radius.
* The optional blur radius parameter is parsed, but it is currently not rendered by
* the GTK+ theming engine.
* The inset parameter defines whether the drop shadow should be rendered inside or outside
* the box canvas. Only inset box-shadows are currently supported by the GTK+ theming engine,
* non-inset elements are currently ignored.
* </para>
* <para>
* To set multiple box-shadows on an element, you can specify a comma-separated list
* of shadow elements in the box-shadow property. Shadows are always rendered
* front-back, i.e. the first shadow specified is on top of the others, so they may
* overlap other boxes or other shadows.
* </para>
* </refsect2>
docs: expand the docs for border-image https://bugzilla.gnome.org/show_bug.cgi?id=651194
2011-05-31 13:32:00 +00:00
* <refsect2 id="gtkcssprovider-border-image">
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>
docs: expand the docs for border-image https://bugzilla.gnome.org/show_bug.cgi?id=651194
2011-05-31 13:32:00 +00:00
* Images and gradients can also be used in slices for the purpose of creating
* scalable borders.
* For more information, see the CSS3 documentation for the border-image property,
* which can be found <ulink url="http://www.w3.org/TR/css3-background/#border-images">here</ulink>.
Document border images better
2010-11-22 16:15:47 +00:00
* </para>
* <inlinegraphic fileref="slices.png" format="PNG"/>
* <para>
docs: expand the docs for border-image https://bugzilla.gnome.org/show_bug.cgi?id=651194
2011-05-31 13:32:00 +00:00
* The parameters of the slicing process are controlled by
border-image: add support for border-image-width too It's useful to set a slice size != border-width, as backgrounds are clipped to border-width too. As slices can be half-transparent and overlap the background, this would not fill the border box properly if we only use a single property for specifying the width. Also, this brings us even closer to CSS3.
2011-06-09 23:59:14 +00:00
* four separate properties. Note that you can use the
docs: expand the docs for border-image https://bugzilla.gnome.org/show_bug.cgi?id=651194
2011-05-31 13:32:00 +00:00
* <literallayout>border-image</literallayout> shorthand property
* to set values for the three properties at the same time.
* </para>
* <para>
* <literallayout>border-image-source: url(@path)
* (or border-image-source: -gtk-gradient(...))</literallayout>:
* Specifies the source of the border image, and it can either
* be an URL or a gradient (see above).
* </para>
* <para>
* <literallayout>border-image-slice: @top @right @bottom @left</literallayout>
* The sizes specified by the @top, @right, @bottom and @left parameters
* are the offsets, in pixels, from the relevant edge where the image
* should be "cut off" to build the slices used for the rendering
* of the border.
* </para>
* <para>
border-image: add support for border-image-width too It's useful to set a slice size != border-width, as backgrounds are clipped to border-width too. As slices can be half-transparent and overlap the background, this would not fill the border box properly if we only use a single property for specifying the width. Also, this brings us even closer to CSS3.
2011-06-09 23:59:14 +00:00
* <literallayout>border-image-width: @top @right @bottom @left</literallayout>
* The sizes specified by the @top, @right, @bottom and @left parameters
* are inward distances from the border box edge, used to specify the
* rendered size of each slice determined by border-image-slice.
* If this property is not specified, the values of border-width will
* be used as a fallback.
* </para>
* <para>
docs: expand the docs for border-image https://bugzilla.gnome.org/show_bug.cgi?id=651194
2011-05-31 13:32:00 +00:00
* <literallayout>border-image-repeat: [stretch|repeat|round|space] ?
* [stretch|repeat|round|space]</literallayout>
* Specifies how the image slices should be rendered in the area
* outlined by border-width.
* The default (stretch) is to resize the slice to fill in the whole
* allocated area.
* If the value of this property is 'repeat', the image slice
* will be tiled to fill the area.
* If the value of this property is 'round', the image slice will
* be tiled to fill the area, and scaled to fit it exactly
* a whole number of times.
* If the value of this property is 'space', the image slice will
* be tiled to fill the area, and if it doesn't fit it exactly a whole
* number of times, the extra space is distributed as padding around
* the slices.
* If two options are specified, the first one affects
Document border images better
2010-11-22 16:15:47 +00:00
* 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>
* 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>
styleproperty: Add border-*-color style properties And make border-color a shorthand
2011-06-13 01:45:18 +00:00
* <entry morerows="7">#GdkRGBA</entry>
* <entry morerows="7"><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>
styleproperty: Add border-*-color style properties And make border-color a shorthand
2011-06-13 01:45:18 +00:00
* <entry>border-top-color</entry>
* <entry morerows="4">transparent|color (see above)</entry>
* </row>
* <row>
* <entry>border-right-color</entry>
* </row>
* <row>
* <entry>border-bottom-color</entry>
* </row>
* <row>
* <entry>border-left-color</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-color</entry>
styleproperty: Add border-*-color style properties And make border-color a shorthand
2011-06-13 01:45:18 +00:00
* <entry>[transparent|color]{1,4}</entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* </row>
* <row>
css: Make font property a shorthand ... and implement the CSS font properties: - font-size - font-style - font-family - font-weight - font-variant This is the second try at this. The first was backed out previously due to bugginess. Let's hope this one survives a bit longer. Also makes the font-family CSS test work again.
2011-05-29 05:03:59 +00:00
* <entry>font-family</entry>
* <entry>@family [, @family]*</entry>
* <entry>#gchararray</entry>
* <entry>font-family: Sans, Arial;</entry>
* </row>
* <row>
* <entry>font-style</entry>
* <entry>[normal|oblique|italic]</entry>
* <entry>#PANGO_TYPE_STYLE</entry>
* <entry>font-style: italic;</entry>
* </row>
* <row>
* <entry>font-variant</entry>
* <entry>[normal|small-caps]</entry>
* <entry>#PANGO_TYPE_VARIANT</entry>
* <entry>font-variant: normal;</entry>
* </row>
* <row>
* <entry>font-weight</entry>
* <entry>[normal|bold|bolder|lighter|100|200|300|400|500|600|700|800|900]</entry>
* <entry>#PANGO_TYPE_WEIGHT</entry>
* <entry>font-weight: bold;</entry>
* </row>
* <row>
* <entry>font-size</entry>
* <entry>Font size in point</entry>
* <entry>#gint</entry>
* <entry>font-size: 13;</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>
style: Make margin a shorthand ... and add the real properties: - margin-top - margin-left - margin-bottom - margin-right
2011-05-22 03:55:12 +00:00
* <entry>margin-top</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>margin-top: 0;</entry>
* </row>
* <row>
* <entry>margin-left</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>margin-left: 1;</entry>
* </row>
* <row>
* <entry>margin-bottom</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>margin-bottom: 2;</entry>
* </row>
* <row>
* <entry>margin-right</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>margin-right: 4;</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>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>
style: Make padding a shorthand ... and add the real properties: - padding-top - padding-left - padding-bottom - padding-right
2011-05-22 03:42:17 +00:00
* <entry>padding-top</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>padding-top: 5;</entry>
* </row>
* <row>
* <entry>padding-left</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>padding-left: 5;</entry>
* </row>
* <row>
* <entry>padding-bottom</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>padding-bottom: 5;</entry>
* </row>
* <row>
* <entry>padding-right</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>padding-right: 5;</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>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>
css: start background-repeat By default, a background image is stretched. Instead, it is worth to have a tiled background. This patch allows background surfaces to be repeated or not, and should be compatible with future extensions and CSS. https://bugzilla.gnome.org/show_bug.cgi?id=663522
2011-11-06 18:33:05 +00:00
* <entry>background-repeat</entry>
* <entry>[repeat|no-repeat]</entry>
* <entry>internal</entry>
* <entry><literallayout>background-repeat: no-repeat;</literallayout>
* If not specified, the style doesn't respect the CSS3
* specification, since the background will be
* stretched to fill the area.
* </entry>
* </row>
* <row>
style: Convert border-width to a shorthand Add the corresponding properties it refers to, too: - border-top-width - border-left-width - border-bottom-width - border-right-width
2011-05-21 22:10:43 +00:00
* <entry>border-top-width</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>border-top-width: 5;</entry>
* </row>
* <row>
* <entry>border-left-width</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>border-left-width: 5;</entry>
* </row>
* <row>
* <entry>border-bottom-width</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>integer</entry>
* <entry>#gint</entry>
style: Convert border-width to a shorthand Add the corresponding properties it refers to, too: - border-top-width - border-left-width - border-bottom-width - border-right-width
2011-05-21 22:10:43 +00:00
* <entry>border-bottom-width: 5;</entry>
* </row>
* <row>
* <entry>border-right-width</entry>
* <entry>integer</entry>
* <entry>#gint</entry>
* <entry>border-right-width: 5;</entry>
* </row>
* <row>
* <entry>border-width</entry>
* <entry morerows="1">#GtkBorder</entry>
* <entry morerows="1"><literallayout>border-width: 1;
* border-width: 1 2;
* border-width: 1 2 3;
* border-width: 1 2 3 5;</literallayout>
* </entry>
Add some images to the docs Add graphs for the transition functions and gradient examples.
2010-11-22 06:41:45 +00:00
* </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>
docs: Add missing <row>
2011-05-21 01:41:52 +00:00
* <row>
styleproperties: add a "text-shadow" style property And document its use in the CSS parser gtk-doc. https://bugzilla.gnome.org/show_bug.cgi?id=649314
2011-05-20 20:11:08 +00:00
* <entry>text-shadow</entry>
* <entry>shadow list (see above)</entry>
* <entry>#GtkTextShadow</entry>
* <entry><literallayout>text-shadow: 1 1 0 blue, -4 -4 red;</literallayout></entry>
* </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
* <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>
Document @binding-set and the gtk-key-bindings css parser property
2011-01-28 09:25:17 +00:00
* <row>
* <entry>gtk-key-bindings</entry>
* <entry>binding set name list</entry>
* <entry>internal use only</entry>
* <entry><literallayout>gtk-bindings: binding1, binding2, ...;</literallayout>
* </entry>
* </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
* </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>
*/
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
typedef struct GtkCssRuleset GtkCssRuleset;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
typedef struct _GtkCssScanner GtkCssScanner;
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
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
struct GtkCssRuleset
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: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
GtkCssSelector *selector;
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
GHashTable *widget_style;
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
GHashTable *style;
cssprovider: Cache if rulesets have inheritable style properties This provides a huge speedup as we only need to preprocess style properties when they are indeed inherited. This roughly doubles the performance of the CSS matcher and brings the time taken by gtk_css_provider_get_style() from 19% to 7% in my favorite benchmark.
2011-05-18 03:47:18 +00:00
guint has_inherit :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
};
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
struct _GtkCssScanner
cssprovider: Add a private structure to the scanner So far, it's unused
2011-04-10 01:39:52 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssProvider *provider;
GtkCssParser *parser;
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
GtkCssSection *section;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *parent;
cssprovider: Move properties to scanner constructor So we can set them in one place.
2011-04-11 14:48:00 +00:00
GFile *file;
cssprovider: Keep base url in the scanner And provide a nice function to query it. Simplifies a bunch of code.
2011-04-11 15:30:01 +00:00
GFile *base;
cssprovider: track state in the scanner This way, we don't have to do magic copies when we create a new scanner for a subfile.
2011-04-10 01:51:43 +00:00
GSList *state;
cssprovider: Add a private structure to the scanner So far, it's unused
2011-04-10 01:39:52 +00:00
};
cssprovider: Move private struct definition to header consistency, improved debugging, etc
2011-04-06 14:10:25 +00:00
struct _GtkCssProviderPrivate
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;
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
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;
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
GArray *rulesets;
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
};
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
enum {
PARSING_ERROR,
LAST_SIGNAL
};
static guint css_provider_signals[LAST_SIGNAL] = { 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
static void gtk_css_provider_finalize (GObject *object);
static void gtk_css_style_provider_iface_init (GtkStyleProviderIface *iface);
cssprovider: Make @import use the new load_internal() func
2011-04-11 23:10:13 +00:00
static gboolean
gtk_css_provider_load_internal (GtkCssProvider *css_provider,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *scanner,
cssprovider: Make @import use the new load_internal() func
2011-04-11 23:10:13 +00:00
GFile *file,
const char *data,
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
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));
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
static void
gtk_css_provider_parsing_error (GtkCssProvider *provider,
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
GtkCssSection *section,
const GError *error)
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
{
cssprovider: Emit a g_warning() when a css file is erroneous ... and no other error handler is active. See the source code comment for the reasoning.
2011-04-10 23:51:49 +00:00
/* Only emit a warning when we have no error handlers. This is our
* default handlers. And in this case erroneous CSS files are a bug
* and should be fixed.
* Note that these warnings can also be triggered by a broken theme
* that people installed from some weird location on the internets.
*/
if (!g_signal_has_handler_pending (provider,
css_provider_signals[PARSING_ERROR],
0,
TRUE))
{
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
GFileInfo *info;
GFile *file;
const char *path;
file = gtk_css_section_get_file (section);
if (file)
{
gtkcssprovider: fix a crash in gtk_css_provider_parsing_error "info" was being declared in two different scopes, and the one that was freed wasn't the one that was set.
2011-09-09 13:32:54 +00:00
info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, 0, NULL, NULL);
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
if (info)
path = g_file_info_get_display_name (info);
else
path = "<broken file>";
}
else
{
info = NULL;
path = "<data>";
}
g_warning ("Theme parsing error: %s:%u:%u: %s",
path,
gtk_css_section_get_end_line (section) + 1,
gtk_css_section_get_end_position (section),
error->message);
if (info)
g_object_unref (info);
cssprovider: Emit a g_warning() when a css file is erroneous ... and no other error handler is active. See the source code comment for the reasoning.
2011-04-10 23:51:49 +00:00
}
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +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
static void
gtk_css_provider_class_init (GtkCssProviderClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
/**
* GtkCssProvider::parsing-error:
* @provider: the provider that had a parsing error
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
* @section: section the error happened in
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
* @error: The parsing error
*
* Signals that a parsing error occured. the @path, @line and @position
* describe the actual location of the error as accurately as possible.
*
* Parsing errors are never fatal, so the parsing will resume after
* the error. Errors may however cause parts of the given
* data or even all of it to not be parsed at all. So it is a useful idea
* to check that the parsing succeeds by connecting to this signal.
*
* Note that this signal may be emitted at any time as the css provider
* may opt to defer parsing parts or all of the input to a later time
* than when a loading function was called.
*/
css_provider_signals[PARSING_ERROR] =
g_signal_new (I_("parsing-error"),
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkCssProviderClass, parsing_error),
NULL, NULL,
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
_gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2, GTK_TYPE_CSS_SECTION, G_TYPE_ERROR);
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +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
object_class->finalize = gtk_css_provider_finalize;
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
klass->parsing_error = gtk_css_provider_parsing_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
g_type_class_add_private (object_class, sizeof (GtkCssProviderPrivate));
}
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
static void
gtk_css_ruleset_init_copy (GtkCssRuleset *new,
const GtkCssRuleset *ruleset,
GtkCssSelector *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
{
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
memcpy (new, ruleset, sizeof (GtkCssRuleset));
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
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
new->selector = selector;
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (new->widget_style)
g_hash_table_ref (new->widget_style);
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
if (new->style)
g_hash_table_ref (new->style);
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
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
gtk_css_ruleset_clear (GtkCssRuleset *ruleset)
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
{
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
if (ruleset->style)
g_hash_table_unref (ruleset->style);
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (ruleset->widget_style)
g_hash_table_unref (ruleset->widget_style);
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
if (ruleset->selector)
_gtk_css_selector_free (ruleset->selector);
Plugged leak in gtkcssprovider.c SelectorStyleInfo structs were never freed.
2011-01-16 11:52:43 +00:00
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
memset (ruleset, 0, sizeof (GtkCssRuleset));
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
}
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
typedef struct _PropertyValue PropertyValue;
struct _PropertyValue {
GtkCssSection *section;
GValue value;
};
static PropertyValue *
property_value_new (GtkCssSection *section)
{
PropertyValue *value;
value = g_slice_new0 (PropertyValue);
value->section = gtk_css_section_ref (section);
return 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
static void
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
property_value_free (PropertyValue *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
{
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
if (G_IS_VALUE (&value->value))
g_value_unset (&value->value);
gtk_css_section_unref (value->section);
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
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
g_slice_free (PropertyValue, value);
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
}
static void
gtk_css_ruleset_add_style (GtkCssRuleset *ruleset,
char *name,
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
PropertyValue *value)
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
{
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (ruleset->widget_style == NULL)
ruleset->widget_style = g_hash_table_new_full (g_str_hash,
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) property_value_free);
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
g_hash_table_insert (ruleset->widget_style, name, 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
}
cssprovider: Add a new setter for rulesets We now have set-by-pspec (which is used for normal style properties) and set-by-name (which is used by widget properties).
2011-05-18 02:30:51 +00:00
static void
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
gtk_css_ruleset_add (GtkCssRuleset *ruleset,
const GtkStyleProperty *prop,
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
PropertyValue *value)
cssprovider: Add a new setter for rulesets We now have set-by-pspec (which is used for normal style properties) and set-by-name (which is used by widget properties).
2011-05-18 02:30:51 +00:00
{
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (ruleset->style == NULL)
ruleset->style = g_hash_table_new_full (g_direct_hash,
g_direct_equal,
NULL,
(GDestroyNotify) property_value_free);
style: Add support for shorthand properties Shorthand properties are basically the same a in CSS. For storage in style properties or the CSS provider, they are unpacked into the real values, so it is possible to partially override them. No properties are yet converted to the new world yet, this is just the code for supporting them.
2011-05-21 21:47:19 +00:00
if (_gtk_style_property_is_shorthand (prop))
{
GParameter *parameters;
guint i, n_parameters;
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
parameters = _gtk_style_property_unpack (prop, &value->value, &n_parameters);
style: Add support for shorthand properties Shorthand properties are basically the same a in CSS. For storage in style properties or the CSS provider, they are unpacked into the real values, so it is possible to partially override them. No properties are yet converted to the new world yet, this is just the code for supporting them.
2011-05-21 21:47:19 +00:00
for (i = 0; i < n_parameters; i++)
{
const GtkStyleProperty *child;
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
PropertyValue *val;
gtkcssprovider: Use g_slice_dup() to copy GValues around GValues stored in GtkCssRulesets are gslice managed, so don't g_memdup() GValues from shorthand properties. This fixes memory corruptions when reloading contents in a GtkCssProvider.
2011-05-30 17:04:22 +00:00
style: Add support for shorthand properties Shorthand properties are basically the same a in CSS. For storage in style properties or the CSS provider, they are unpacked into the real values, so it is possible to partially override them. No properties are yet converted to the new world yet, this is just the code for supporting them.
2011-05-21 21:47:19 +00:00
child = _gtk_style_property_lookup (parameters[i].name);
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
val = property_value_new (value->section);
memcpy (&val->value, &parameters[i].value, sizeof (GValue));
gtk_css_ruleset_add (ruleset, child, val);
style: Add support for shorthand properties Shorthand properties are basically the same a in CSS. For storage in style properties or the CSS provider, they are unpacked into the real values, so it is possible to partially override them. No properties are yet converted to the new world yet, this is just the code for supporting them.
2011-05-21 21:47:19 +00:00
}
g_free (parameters);
gtkcssprovider: Free shorthand border GValues in the right place The call to gtk_border_free() within unpack_border() felt completely in the wrong place, as the border actually pertains to the GValue being unpacked. Plus, the GValue itself was also being leaked.
2011-05-30 17:29:22 +00:00
property_value_free (value);
style: Add support for shorthand properties Shorthand properties are basically the same a in CSS. For storage in style properties or the CSS provider, they are unpacked into the real values, so it is possible to partially override them. No properties are yet converted to the new world yet, this is just the code for supporting them.
2011-05-21 21:47:19 +00:00
return;
}
styleproperty: Add _gtk_style_property_is_inherit() And use it instead of gtk_style_param_get_inherit()
2011-05-31 10:05:43 +00:00
ruleset->has_inherit |= _gtk_style_property_is_inherit (prop);
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
g_hash_table_insert (ruleset->style, (gpointer) prop, value);
cssprovider: Add a new setter for rulesets We now have set-by-pspec (which is used for normal style properties) and set-by-name (which is used by widget properties).
2011-05-18 02:30:51 +00:00
}
cssprovider: Refactor code to have a gtk_css_ruleset_matches()
2011-05-17 20:11:50 +00:00
static gboolean
gtk_css_ruleset_matches (GtkCssRuleset *ruleset,
GtkWidgetPath *path,
guint length)
{
return _gtk_css_selector_matches (ruleset->selector, path, length);
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static void
gtk_css_scanner_destroy (GtkCssScanner *scanner)
{
g_object_unref (scanner->provider);
if (scanner->file)
g_object_unref (scanner->file);
g_object_unref (scanner->base);
_gtk_css_parser_free (scanner->parser);
g_slice_free (GtkCssScanner, scanner);
cssprovider: track state in the scanner This way, we don't have to do magic copies when we create a new scanner for a subfile.
2011-04-10 01:51:43 +00:00
}
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
static void
gtk_css_provider_emit_error (GtkCssProvider *provider,
GtkCssScanner *scanner,
const GError *error)
{
g_signal_emit (provider, css_provider_signals[PARSING_ERROR], 0,
scanner->section, error);
}
cssprovider: Add a custom gtk_css_scanner_destroy() function So far, it does nothing
2011-04-10 01:35:19 +00:00
static void
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
gtk_css_scanner_parser_error (GtkCssParser *parser,
const GError *error,
gpointer user_data)
cssprovider: Add a custom gtk_css_scanner_destroy() function So far, it does nothing
2011-04-10 01:35:19 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *scanner = user_data;
cssprovider: Store current properties and selectors in scanner They don't belong in the css provider
2011-04-10 23:28:00 +00:00
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
gtk_css_provider_emit_error (scanner->provider,
scanner,
error);
cssprovider: Add a custom gtk_css_scanner_destroy() function So far, it does nothing
2011-04-10 01:35:19 +00:00
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static GtkCssScanner *
gtk_css_scanner_new (GtkCssProvider *provider,
GtkCssScanner *parent,
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
GtkCssSection *section,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GFile *file,
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
const gchar *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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
scanner = g_slice_new0 (GtkCssScanner);
cssprovider: Add a private structure to the scanner So far, it's unused
2011-04-10 01:39:52 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
g_object_ref (provider);
scanner->provider = provider;
scanner->parent = parent;
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
if (section)
scanner->section = gtk_css_section_ref (section);
cssprovider: Allow storing the parent stylesheet
2011-04-12 00:06:08 +00:00
cssprovider: Move properties to scanner constructor So we can set them in one place.
2011-04-11 14:48:00 +00:00
if (file)
cssprovider: Keep base url in the scanner And provide a nice function to query it. Simplifies a bunch of code.
2011-04-11 15:30:01 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
scanner->file = g_object_ref (file);
scanner->base = g_file_get_parent (file);
cssprovider: Keep base url in the scanner And provide a nice function to query it. Simplifies a bunch of code.
2011-04-11 15:30:01 +00:00
}
else
{
char *dir = g_get_current_dir ();
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
scanner->base = g_file_new_for_path (dir);
cssprovider: Keep base url in the scanner And provide a nice function to query it. Simplifies a bunch of code.
2011-04-11 15:30:01 +00:00
g_free (dir);
}
cssprovider: Move properties to scanner constructor So we can set them in one place.
2011-04-11 14:48:00 +00:00
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
scanner->parser = _gtk_css_parser_new (text,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
gtk_css_scanner_parser_error,
scanner);
cssprovider: Move properties to scanner constructor So we can set them in one place.
2011-04-11 14:48:00 +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
return scanner;
}
cssprovider: Keep base url in the scanner And provide a nice function to query it. Simplifies a bunch of code.
2011-04-11 15:30:01 +00:00
static GFile *
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
gtk_css_scanner_get_base_url (GtkCssScanner *scanner)
cssprovider: Keep base url in the scanner And provide a nice function to query it. Simplifies a bunch of code.
2011-04-11 15:30:01 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return scanner->base;
cssprovider: Keep base url in the scanner And provide a nice function to query it. Simplifies a bunch of code.
2011-04-11 15:30:01 +00:00
}
cssprovider: Add recursion checks for @import This is pretty important, because otherwise recursions cause crashes. And if you accidentally change your theme to one that crashes on load, all your gonna SEGV and then on reboot, gdm tries to load the theme...
2011-04-12 00:50:25 +00:00
static gboolean
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
gtk_css_scanner_would_recurse (GtkCssScanner *scanner,
GFile *file)
cssprovider: Add recursion checks for @import This is pretty important, because otherwise recursions cause crashes. And if you accidentally change your theme to one that crashes on load, all your gonna SEGV and then on reboot, gdm tries to load the theme...
2011-04-12 00:50:25 +00:00
{
while (scanner)
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (scanner->file && g_file_equal (scanner->file, file))
cssprovider: Add recursion checks for @import This is pretty important, because otherwise recursions cause crashes. And if you accidentally change your theme to one that crashes on load, all your gonna SEGV and then on reboot, gdm tries to load the theme...
2011-04-12 00:50:25 +00:00
return TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
scanner = scanner->parent;
cssprovider: Add recursion checks for @import This is pretty important, because otherwise recursions cause crashes. And if you accidentally change your theme to one that crashes on load, all your gonna SEGV and then on reboot, gdm tries to load the theme...
2011-04-12 00:50:25 +00:00
}
return FALSE;
}
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
static void
gtk_css_scanner_push_section (GtkCssScanner *scanner,
GtkCssSectionType section_type)
{
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
GtkCssSection *section;
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
section = _gtk_css_section_new (scanner->section,
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
section_type,
scanner->parser,
scanner->file);
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
if (scanner->section)
gtk_css_section_unref (scanner->section);
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
scanner->section = section;
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
}
static void
gtk_css_scanner_pop_section (GtkCssScanner *scanner,
GtkCssSectionType check_type)
{
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
GtkCssSection *parent;
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
g_assert (gtk_css_section_get_section_type (scanner->section) == check_type);
parent = gtk_css_section_get_parent (scanner->section);
if (parent)
gtk_css_section_ref (parent);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
_gtk_css_section_end (scanner->section);
gtk_css_section_unref (scanner->section);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
scanner->section = parent;
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +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 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);
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
priv->rulesets = g_array_new (FALSE, FALSE, sizeof (GtkCssRuleset));
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
}
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;
cssprovider: Simplify code Don't go through an intermediate array when matching styles.
2011-05-16 17:54:57 +00:00
GtkCssProviderPrivate *priv;
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;
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
guint i, l, length;
GtkCssProvider: refactor out selector matching.
2010-06-18 14:52:34 +00:00
GtkCssProvider: Add priv pointer to object struct.
2010-07-03 00:19:27 +00:00
css_provider = GTK_CSS_PROVIDER (provider);
cssprovider: Simplify code Don't go through an intermediate array when matching styles.
2011-05-16 17:54:57 +00:00
priv = css_provider->priv;
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
length = gtk_widget_path_length (path);
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: refactor out selector matching.
2010-06-18 14:52:34 +00:00
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
for (l = 1; l <= length; l++)
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
{
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
for (i = 0; i < priv->rulesets->len; i++)
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
{
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
GtkCssRuleset *ruleset;
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
GHashTableIter iter;
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
gpointer key, 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
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);
cssprovider: Simplify code Don't go through an intermediate array when matching styles.
2011-05-16 17:54:57 +00:00
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (ruleset->style == NULL)
continue;
cssprovider: Cache if rulesets have inheritable style properties This provides a huge speedup as we only need to preprocess style properties when they are indeed inherited. This roughly doubles the performance of the CSS matcher and brings the time taken by gtk_css_provider_get_style() from 19% to 7% in my favorite benchmark.
2011-05-18 03:47:18 +00:00
if (l < length && (!ruleset->has_inherit || _gtk_css_selector_get_state_flags (ruleset->selector)))
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
continue;
cssprovider: Simplify code Don't go through an intermediate array when matching styles.
2011-05-16 17:54:57 +00:00
cssprovider: Refactor code to have a gtk_css_ruleset_matches()
2011-05-17 20:11:50 +00:00
if (!gtk_css_ruleset_matches (ruleset, path, l))
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
continue;
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
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
g_hash_table_iter_init (&iter, ruleset->style);
css: Refactor code to do property lookups earlier We want to ook up the property in the CSS parser, so we can do fancy things with it. We currently don't but we want to later.
2011-05-16 21:37:29 +00:00
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
while (g_hash_table_iter_next (&iter, &key, &val))
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
{
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
GtkStyleProperty *prop = key;
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
PropertyValue *value = val;
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
styleproperty: Add _gtk_style_property_is_inherit() And use it instead of gtk_style_param_get_inherit()
2011-05-31 10:05:43 +00:00
if (l != length && !_gtk_style_property_is_inherit (prop))
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
continue;
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
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
_gtk_style_properties_set_property_by_property (props,
prop,
_gtk_css_selector_get_state_flags (ruleset->selector),
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
&value->value);
css: Implement inherit properties Huge performance hit (slows down things roughly by a factor of 3), but necessary for CSS conformance and for implementing "inherit" and percentages.
2011-05-17 13:01:59 +00:00
}
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
}
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)
{
cssprovider: Speed up gtk_widget_style_get() property lookups Previously we got the list of all matching rules and then iterated it to find the first one that had the property. Now we look while matching rules, so we don't lookup rules that we don't need.
2011-05-16 15:55:50 +00:00
GtkCssProvider *css_provider = GTK_CSS_PROVIDER (provider);
GtkCssProviderPrivate *priv = css_provider->priv;
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
PropertyValue *val;
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
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
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
for (i = priv->rulesets->len - 1; i >= 0; i--)
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
{
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
GtkCssRuleset *ruleset;
cssprovider: Speed up gtk_widget_style_get() property lookups Previously we got the list of all matching rules and then iterated it to find the first one that had the property. Now we look while matching rules, so we don't lookup rules that we don't need.
2011-05-16 15:55:50 +00:00
GtkStateFlags selector_state;
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
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);
cssprovider: Speed up gtk_widget_style_get() property lookups Previously we got the list of all matching rules and then iterated it to find the first one that had the property. Now we look while matching rules, so we don't lookup rules that we don't need.
2011-05-16 15:55:50 +00:00
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (ruleset->widget_style == NULL)
continue;
cssprovider: Refactor code to have a gtk_css_ruleset_matches()
2011-05-17 20:11:50 +00:00
if (!gtk_css_ruleset_matches (ruleset, path, gtk_widget_path_length (path)))
cssprovider: Speed up gtk_widget_style_get() property lookups Previously we got the list of all matching rules and then iterated it to find the first one that had the property. Now we look while matching rules, so we don't lookup rules that we don't need.
2011-05-16 15:55:50 +00:00
continue;
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
selector_state = _gtk_css_selector_get_state_flags (ruleset->selector);
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
val = g_hash_table_lookup (ruleset->widget_style, prop_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
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 &&
cssprovider: Speed up gtk_widget_style_get() property lookups Previously we got the list of all matching rules and then iterated it to find the first one that had the property. Now we look while matching rules, so we don't lookup rules that we don't need.
2011-05-16 15:55:50 +00:00
(selector_state == 0 ||
selector_state == state ||
((selector_state & state) != 0 &&
(selector_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
{
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
GtkCssScanner *scanner;
css: Make property parsing functions take a css parser Instead of reading a string and then passing that in, let the parse functions use the full power of the parser.
2011-05-18 16:32:22 +00:00
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
scanner = gtk_css_scanner_new (css_provider,
NULL,
val->section,
gtk_css_section_get_file (val->section),
g_value_get_string (&val->value));
css: Make property parsing functions take a css parser Instead of reading a string and then passing that in, let the parse functions use the full power of the parser.
2011-05-18 16:32:22 +00:00
css: Rename function to _gtk_style_property_parse_value() ... and take an optional style property as argument. This way, we can allow custom parse functions for properties. The style property needs to be optional so that we can use it for widget style properties, too.
2011-05-25 23:01:44 +00:00
found = _gtk_style_property_parse_value (NULL,
value,
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
scanner->parser,
css: Rename function to _gtk_style_property_parse_value() ... and take an optional style property as argument. This way, we can allow custom parse functions for properties. The style property needs to be optional so that we can use it for widget style properties, too.
2011-05-25 23:01:44 +00:00
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
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
gtk_css_scanner_destroy (scanner);
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
css: Overhaul value parsing Value parsing only sometimes emitted errors. Sometimes it didn't emit errors but ignored the value, sometimes it took a default, sometimes it converted it to something it deemed suitable. While refactoring, I moved the whole GValue <=> char * conversion routines to a separate file, to make navigating the core css provider easier.
2011-04-08 14:08:28 +00:00
if (found)
break;
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_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: plug several leaks In finalize(), clear all rulesets. In parse_declaration(), Free the GValue under unhandled error situations. In gtk_css_provider_load_internal(), Do not leak the file contents.
2011-05-30 17:26:28 +00:00
guint 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: 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
gtkcssprovider: plug several leaks In finalize(), clear all rulesets. In parse_declaration(), Free the GValue under unhandled error situations. In gtk_css_provider_load_internal(), Do not leak the file contents.
2011-05-30 17:26:28 +00:00
for (i = 0; i < priv->rulesets->len; i++)
gtk_css_ruleset_clear (&g_array_index (priv->rulesets, GtkCssRuleset, i));
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
g_array_free (priv->rulesets, 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
Some error reporting When we take a GError argument, better use it.
2010-11-18 03:29:39 +00:00
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);
}
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
static void
gtk_css_provider_take_error (GtkCssProvider *provider,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *scanner,
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
GError *error)
{
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
gtk_css_provider_emit_error (scanner->provider,
scanner,
error);
g_error_free (error);
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
}
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
static void
gtk_css_provider_error_literal (GtkCssProvider *provider,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *scanner,
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
GQuark domain,
gint code,
const char *message)
{
gtk_css_provider_take_error (provider,
cssprovider: Pass scanner argument explicitly to error functions
2011-04-10 13:22:07 +00:00
scanner,
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
g_error_new_literal (domain, code, message));
}
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
static void
gtk_css_provider_error (GtkCssProvider *provider,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *scanner,
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
GQuark domain,
gint code,
const char *format,
cssprovider: Pass scanner argument explicitly to error functions
2011-04-10 13:22:07 +00:00
...) G_GNUC_PRINTF (5, 6);
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
static void
gtk_css_provider_error (GtkCssProvider *provider,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *scanner,
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
GQuark domain,
gint code,
const char *format,
...)
{
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
GError *error;
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
va_list args;
va_start (args, format);
API: cssprovider: Make error a signal
2011-04-07 15:26:47 +00:00
error = g_error_new_valist (domain, code, format, args);
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
va_end (args);
cssprovider: Pass scanner argument explicitly to error functions
2011-04-10 13:22:07 +00:00
gtk_css_provider_take_error (provider, scanner, error);
cssprovider: Handle errors completely via new error functions
2011-04-07 12:03:08 +00:00
}
cssprovider: Add a function for signalling errors
2011-04-06 13:38:06 +00:00
static void
gtk_css_provider_invalid_token (GtkCssProvider *provider,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *scanner,
cssprovider: Add a function for signalling errors
2011-04-06 13:38:06 +00:00
const char *expected)
{
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
gtk_css_provider_error (provider,
cssprovider: Pass scanner argument explicitly to error functions
2011-04-10 13:22:07 +00:00
scanner,
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
GTK_CSS_PROVIDER_ERROR,
cssprovider: use INVALID_SYNTAX for unexpected token error
2011-04-07 22:18:38 +00:00
GTK_CSS_PROVIDER_ERROR_SYNTAX,
cssprovider: Provide better API to set errors
2011-04-07 11:37:03 +00:00
"expected a valid %s", expected);
cssprovider: Add a function for signalling errors
2011-04-06 13:38:06 +00:00
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static void
cssprovider: Store current properties and selectors in scanner They don't belong in the css provider
2011-04-10 23:28:00 +00:00
css_provider_commit (GtkCssProvider *css_provider,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GSList *selectors,
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
GtkCssRuleset *ruleset)
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;
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
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (ruleset->style == NULL && ruleset->widget_style == NULL)
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
{
g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
return;
}
cssprovider: Ignore empty rules
2011-04-07 00:15:02 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
for (l = selectors; l; l = l->next)
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
{
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
GtkCssRuleset new;
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
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
gtk_css_ruleset_init_copy (&new, ruleset, l->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
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
g_array_append_val (priv->rulesets, new);
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: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
g_slist_free (selectors);
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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static void
gtk_css_provider_reset (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
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssProviderPrivate *priv;
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
guint i;
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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
cssprovider: Remove colors when resetting
2011-05-27 23:01:42 +00:00
g_hash_table_remove_all (priv->symbolic_colors);
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
for (i = 0; i < priv->rulesets->len; i++)
gtk_css_ruleset_clear (&g_array_index (priv->rulesets, GtkCssRuleset, i));
g_array_set_size (priv->rulesets, 0);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static void
gtk_css_provider_propagate_error (GtkCssProvider *provider,
Change gtk_css_provider_propagate_error's signature. Update to new parsing-error signal. https://bugzilla.gnome.org/show_bug.cgi?id=657882
2011-08-31 22:24:53 +00:00
GtkCssSection *section,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
const GError *error,
GError **propagate_to)
{
Change gtk_css_provider_propagate_error's signature. Update to new parsing-error signal. https://bugzilla.gnome.org/show_bug.cgi?id=657882
2011-08-31 22:24:53 +00:00
GFileInfo *info;
GFile *file;
const char *path;
file = gtk_css_section_get_file (section);
if (file)
{
info = g_file_query_info (file,G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, 0, NULL, NULL);
if (info)
path = g_file_info_get_display_name (info);
else
path = "<broken file>";
}
else
{
info = NULL;
path = "<unknown>";
}
cssprovider: Don't propagate deprecation messages to passed-in error It's an informative message, don't stop parsing the CSS because of it.
2011-05-18 16:35:37 +00:00
/* don't fail for deprecations */
if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
{
Change gtk_css_provider_propagate_error's signature. Update to new parsing-error signal. https://bugzilla.gnome.org/show_bug.cgi?id=657882
2011-08-31 22:24:53 +00:00
g_warning ("Theme parsing error: %s:%u:%u: %s", path,
gtk_css_section_get_end_line (section) + 1,
gtk_css_section_get_end_position (section), error->message);
cssprovider: Don't propagate deprecation messages to passed-in error It's an informative message, don't stop parsing the CSS because of it.
2011-05-18 16:35:37 +00:00
return;
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
/* we already set an error. And we'd like to keep the first one */
if (*propagate_to)
return;
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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
*propagate_to = g_error_copy (error);
Change gtk_css_provider_propagate_error's signature. Update to new parsing-error signal. https://bugzilla.gnome.org/show_bug.cgi?id=657882
2011-08-31 22:24:53 +00:00
g_prefix_error (propagate_to, "%s:%u:%u: ", path,
gtk_css_section_get_end_line (section) + 1,
gtk_css_section_get_end_position (section));
if (info)
g_object_unref (info);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
static gboolean
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parse_import (GtkCssScanner *scanner)
{
GFile *file;
char *uri;
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
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_IMPORT);
if (!_gtk_css_parser_try (scanner->parser, "@import", TRUE))
{
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT);
return FALSE;
}
cssprovider: @import <string> is valid CSS The parser rewrite insisted on @import url(<string>) syntax, but CSS xplicitly allows omitting the url string.
2011-07-19 23:19:59 +00:00
if (_gtk_css_parser_is_string (scanner->parser))
uri = _gtk_css_parser_read_string (scanner->parser);
else
uri = _gtk_css_parser_read_uri (scanner->parser);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (uri == NULL)
{
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT);
return TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
file = g_file_resolve_relative_path (gtk_css_scanner_get_base_url (scanner), uri);
g_free (uri);
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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (gtk_css_scanner_would_recurse (scanner, file))
{
char *path = g_file_get_path (file);
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_IMPORT,
"Loading '%s' would recurse",
path);
g_free (path);
}
else
{
gtk_css_provider_load_internal (scanner->provider,
scanner,
file,
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
NULL,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
NULL);
}
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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
{
gtk_css_provider_invalid_token (scanner->provider, scanner, "semicolon");
_gtk_css_parser_resync (scanner->parser, TRUE, 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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
g_object_unref (file);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT);
return TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
static gboolean
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parse_color_definition (GtkCssScanner *scanner)
{
GtkSymbolicColor *symbolic;
char *name;
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
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
if (!_gtk_css_parser_try (scanner->parser, "@define-color", TRUE))
{
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
return FALSE;
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
name = _gtk_css_parser_try_name (scanner->parser, TRUE);
if (name == NULL)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Not a valid color name");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
return TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
symbolic = _gtk_css_parser_read_symbolic_color (scanner->parser);
if (symbolic == NULL)
{
g_free (name);
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
return TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
{
g_free (name);
gtk_symbolic_color_unref (symbolic);
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Missing semicolon at end of color definition");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
return TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
g_hash_table_insert (scanner->provider->priv->symbolic_colors, name, symbolic);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
return TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
css: Overhaul value parsing Value parsing only sometimes emitted errors. Sometimes it didn't emit errors but ignored the value, sometimes it took a default, sometimes it converted it to something it deemed suitable. While refactoring, I moved the whole GValue <=> char * conversion routines to a separate file, to make navigating the core css provider easier.
2011-04-08 14:08:28 +00:00
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
static gboolean
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parse_binding_set (GtkCssScanner *scanner)
{
GtkBindingSet *binding_set;
char *name;
css: Overhaul value parsing Value parsing only sometimes emitted errors. Sometimes it didn't emit errors but ignored the value, sometimes it took a default, sometimes it converted it to something it deemed suitable. While refactoring, I moved the whole GValue <=> char * conversion routines to a separate file, to make navigating the core css provider easier.
2011-04-08 14:08:28 +00:00
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_BINDING_SET);
if (!_gtk_css_parser_try (scanner->parser, "@binding-set", TRUE))
{
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_BINDING_SET);
return FALSE;
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
name = _gtk_css_parser_try_ident (scanner->parser, TRUE);
if (name == NULL)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Expected name for binding set");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
goto skip_semicolon;
}
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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
binding_set = gtk_binding_set_find (name);
if (!binding_set)
{
binding_set = gtk_binding_set_new (name);
binding_set->parsed = TRUE;
}
g_free (name);
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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (!_gtk_css_parser_try (scanner->parser, "{", TRUE))
{
gtk_css_provider_error_literal (scanner->provider,
cssprovider: Add recursion checks for @import This is pretty important, because otherwise recursions cause crashes. And if you accidentally change your theme to one that crashes on load, all your gonna SEGV and then on reboot, gdm tries to load the theme...
2011-04-12 00:50:25 +00:00
scanner,
GTK_CSS_PROVIDER_ERROR,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Expected '{' for binding set");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
goto skip_semicolon;
}
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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
while (!_gtk_css_parser_is_eof (scanner->parser) &&
!_gtk_css_parser_begins_with (scanner->parser, '}'))
{
name = _gtk_css_parser_read_value (scanner->parser);
if (name == NULL)
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
continue;
}
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
cssprovider: Emit an error when parsing a binding fails
2011-07-20 00:11:51 +00:00
if (gtk_binding_entry_add_signal_from_string (binding_set, name) != G_TOKEN_NONE)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Failed to parse binding set.");
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
g_free (name);
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
{
if (!_gtk_css_parser_begins_with (scanner->parser, '}') &&
!_gtk_css_parser_is_eof (scanner->parser))
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Expected semicolon");
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
}
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (!_gtk_css_parser_try (scanner->parser, "}", TRUE))
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"expected '}' after declarations");
if (!_gtk_css_parser_is_eof (scanner->parser))
_gtk_css_parser_resync (scanner->parser, FALSE, 0);
}
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
skip_semicolon:
cssprovider: Get the location right for semicolon warnings
2011-07-20 00:01:34 +00:00
if (_gtk_css_parser_begins_with (scanner->parser, ';'))
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_DEPRECATED,
"Nonstandard semicolon at end of binding set");
_gtk_css_parser_try (scanner->parser, ";", TRUE);
}
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_BINDING_SET);
return TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static void
parse_at_keyword (GtkCssScanner *scanner)
{
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
if (parse_import (scanner))
return;
if (parse_color_definition (scanner))
return;
if (parse_binding_set (scanner))
return;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
else
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"unknown @ rule");
_gtk_css_parser_resync (scanner->parser, TRUE, 0);
}
}
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static gboolean
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
parse_selector_class (GtkCssScanner *scanner, GArray *classes)
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
GQuark qname;
char *name;
name = _gtk_css_parser_try_name (scanner->parser, FALSE);
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (name == NULL)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
"Expected a valid name for class");
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return FALSE;
}
Improve binding-set parser Make gtk_binding_entry_add_signal_from_string() return the expected token in case of parsing error, so that we can return a GError instead of spewing. Also, add a separate scope for binding-set, since allowing {} in identifiers in SCOPE_VALUE breaks the fact that the ; after the last assignment in a rule is optional.
2011-01-29 00:36:24 +00:00
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
qname = g_quark_from_string (name);
g_array_append_val (classes, qname);
g_free (name);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return TRUE;
}
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static gboolean
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
parse_selector_name (GtkCssScanner *scanner, GArray *names)
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
GQuark qname;
char *name;
name = _gtk_css_parser_try_name (scanner->parser, FALSE);
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (name == NULL)
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
"Expected a valid name for id");
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return FALSE;
}
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
qname = g_quark_from_string (name);
g_array_append_val (names, qname);
g_free (name);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return TRUE;
}
Add @binding-set rules to the CSS parser these custom rules can be used to define key themes as in the RC files, a series of bind/unbind rules may be added then: @binding foo-bar { bind "<alt>1" { "move-cursor" (visual-positions, 1, 0) }; unbind "<ctl>d" }
2011-01-28 00:52:03 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static gboolean
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
parse_selector_pseudo_class (GtkCssScanner *scanner,
GtkRegionFlags *region_to_modify,
GtkStateFlags *state_to_modify)
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
struct {
const char *name;
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
GtkRegionFlags region_flag;
GtkStateFlags state_flag;
} pseudo_classes[] = {
cssprovider: Fix names for first and last child pseudo class The correct name is :first-child, not :first
2011-07-20 09:59:15 +00:00
{ "first-child", GTK_REGION_FIRST, 0 },
{ "last-child", GTK_REGION_LAST, 0 },
all: add an 'only-child' pseudo-class selector Add an :only-child pseudo-class selector, which selects single children of a parent container. https://bugzilla.gnome.org/show_bug.cgi?id=660833
2011-10-03 21:09:09 +00:00
{ "only-child", GTK_REGION_ONLY, 0 },
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
{ "sorted", GTK_REGION_SORTED, 0 },
{ "active", 0, GTK_STATE_FLAG_ACTIVE },
{ "prelight", 0, GTK_STATE_FLAG_PRELIGHT },
{ "hover", 0, GTK_STATE_FLAG_PRELIGHT },
{ "selected", 0, GTK_STATE_FLAG_SELECTED },
{ "insensitive", 0, GTK_STATE_FLAG_INSENSITIVE },
{ "inconsistent", 0, GTK_STATE_FLAG_INCONSISTENT },
{ "focused", 0, GTK_STATE_FLAG_FOCUSED },
{ "focus", 0, GTK_STATE_FLAG_FOCUSED },
gtk: Add a GTK_STATE_FLAG_WINDOW_UNFOCUSED widget state flag This allows themes to style widgets differently according to whether the toplevel window they are in is presented as focused. https://bugzilla.gnome.org/show_bug.cgi?id=661428
2011-10-28 22:45:38 +00:00
{ "window-unfocused", 0, GTK_STATE_FLAG_WINDOW_UNFOCUSED },
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
{ NULL, }
}, nth_child_classes[] = {
{ "first", GTK_REGION_FIRST, 0 },
{ "last", GTK_REGION_LAST, 0 },
{ "even", GTK_REGION_EVEN, 0 },
{ "odd", GTK_REGION_ODD, 0 },
{ NULL, }
}, *classes;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
guint i;
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
char *name;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
name = _gtk_css_parser_try_ident (scanner->parser, FALSE);
if (name == NULL)
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Missing name of pseudo-class");
return FALSE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
if (_gtk_css_parser_try (scanner->parser, "(", TRUE))
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
char *function = name;
name = _gtk_css_parser_try_ident (scanner->parser, TRUE);
if (!_gtk_css_parser_try (scanner->parser, ")", FALSE))
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: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Missing closing bracket for pseudo-class");
return FALSE;
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
}
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
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
if (g_ascii_strcasecmp (function, "nth-child") != 0)
{
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE,
"Unknown pseudo-class '%s(%s)'", function, name ? name : "");
g_free (function);
g_free (name);
return FALSE;
}
g_free (function);
if (name == NULL)
{
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE,
"nth-child() requires an argument");
return FALSE;
}
classes = nth_child_classes;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
else
classes = pseudo_classes;
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: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
for (i = 0; classes[i].name != NULL; i++)
GtkCssProvider: free selector path on parse_rule().
2010-04-20 23:51:46 +00:00
{
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
if (g_ascii_strcasecmp (name, classes[i].name) == 0)
{
if ((*region_to_modify & classes[i].region_flag) ||
(*state_to_modify & classes[i].state_flag))
{
if (classes == nth_child_classes)
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Duplicate pseudo-class 'nth-child(%s)'", name);
else
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Duplicate pseudo-class '%s'", name);
}
*region_to_modify |= classes[i].region_flag;
*state_to_modify |= classes[i].state_flag;
g_free (name);
return TRUE;
}
GtkCssProvider: free selector path on parse_rule().
2010-04-20 23:51: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
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
if (classes == nth_child_classes)
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE,
"Unknown pseudo-class 'nth-child(%s)'", name);
else
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE,
"Unknown pseudo-class '%s'", name);
g_free (name);
return FALSE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static gboolean
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
parse_simple_selector (GtkCssScanner *scanner,
char **name,
GArray *ids,
GArray *classes,
GtkRegionFlags *pseudo_classes,
GtkStateFlags *state)
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
gboolean parsed_something;
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
*name = _gtk_css_parser_try_ident (scanner->parser, FALSE);
if (*name)
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
parsed_something = TRUE;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
else
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
parsed_something = _gtk_css_parser_try (scanner->parser, "*", 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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
do {
if (_gtk_css_parser_try (scanner->parser, "#", FALSE))
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
{
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
if (!parse_selector_name (scanner, ids))
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return FALSE;
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
else if (_gtk_css_parser_try (scanner->parser, ".", FALSE))
{
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
if (!parse_selector_class (scanner, classes))
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return FALSE;
}
else if (_gtk_css_parser_try (scanner->parser, ":", FALSE))
{
css: No more special code for regions Just treat regions the same as elements.
2011-05-14 21:54:37 +00:00
if (!parse_selector_pseudo_class (scanner, pseudo_classes, state))
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return FALSE;
}
else if (!parsed_something)
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
gtk_css_provider_error_literal (scanner->provider,
cssprovider: Pass scanner argument explicitly to error functions
2011-04-10 13:22:07 +00:00
scanner,
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
GTK_CSS_PROVIDER_ERROR,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Expected a valid selector");
return FALSE;
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
else
break;
cssprovider: Rework declaration parsing loop The new loop can cope better with invalid identifiers and manages to resume parsing properly.
2011-04-09 16:18:02 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parsed_something = TRUE;
}
while (!_gtk_css_parser_is_eof (scanner->parser));
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
_gtk_css_parser_skip_whitespace (scanner->parser);
return TRUE;
}
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
static GtkCssSelector *
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parse_selector (GtkCssScanner *scanner)
{
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
GtkCssSelector *selector = NULL;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
do {
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
char *name = NULL;
GArray *ids = g_array_new (TRUE, FALSE, sizeof (GQuark));
GArray *classes = g_array_new (TRUE, FALSE, sizeof (GQuark));
GtkRegionFlags pseudo_classes = 0;
GtkStateFlags state = 0;
GtkCssCombinator combine = GTK_CSS_COMBINE_DESCANDANT;
if (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
{
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
if (_gtk_css_parser_try (scanner->parser, ">", TRUE))
combine = GTK_CSS_COMBINE_CHILD;
}
if (!parse_simple_selector (scanner, &name, ids, classes, &pseudo_classes, &state))
{
g_array_free (ids, TRUE);
g_array_free (classes, TRUE);
if (selector)
_gtk_css_selector_free (selector);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return 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: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
selector = _gtk_css_selector_new (selector,
combine,
name,
(GQuark *) g_array_free (ids, ids->len == 0),
(GQuark *) g_array_free (classes, classes->len == 0),
pseudo_classes,
state);
g_free (name);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
while (!_gtk_css_parser_is_eof (scanner->parser) &&
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
!_gtk_css_parser_begins_with (scanner->parser, ',') &&
!_gtk_css_parser_begins_with (scanner->parser, '{'));
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: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
return selector;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static GSList *
parse_selector_list (GtkCssScanner *scanner)
{
GSList *selectors = 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
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_SELECTOR);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
do {
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
GtkCssSelector *select = parse_selector (scanner);
cssprovider: Clean up declaration parser to conform to more tests The tests will follow with the next commits
2011-04-09 23:48:55 +00:00
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
if (select == NULL)
cssprovider: Clean up declaration parser to conform to more tests The tests will follow with the next commits
2011-04-09 23:48:55 +00:00
{
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
_gtk_css_parser_resync (scanner->parser, FALSE, 0);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_SELECTOR);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return NULL;
cssprovider: Clean up declaration parser to conform to more tests The tests will follow with the next commits
2011-04-09 23:48:55 +00:00
}
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
selectors = g_slist_prepend (selectors, select);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
while (_gtk_css_parser_try (scanner->parser, ",", TRUE));
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
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_SELECTOR);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return selectors;
}
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
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
static void
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
parse_declaration (GtkCssScanner *scanner,
GtkCssRuleset *ruleset)
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
cssprovider: Use _gtk_style_property_lookup() This way we get the actual data node and can use it.
2011-05-19 12:04:51 +00:00
const GtkStyleProperty *property;
css: Make property parsing functions take a css parser Instead of reading a string and then passing that in, let the parse functions use the full power of the parser.
2011-05-18 16:32:22 +00:00
char *name;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_DECLARATION);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
name = _gtk_css_parser_try_ident (scanner->parser, TRUE);
if (name == NULL)
goto check_for_semicolon;
cssprovider: Use _gtk_style_property_lookup() This way we get the actual data node and can use it.
2011-05-19 12:04:51 +00:00
property = _gtk_style_property_lookup (name);
if (property == NULL && name[0] != '-')
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
gtk_css_provider_error (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_NAME,
"'%s' is not a valid property name",
name);
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
g_free (name);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return;
}
if (!_gtk_css_parser_try (scanner->parser, ":", TRUE))
{
gtk_css_provider_invalid_token (scanner->provider, scanner, "':'");
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
g_free (name);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return;
}
cssprovider: Use _gtk_style_property_lookup() This way we get the actual data node and can use it.
2011-05-19 12:04:51 +00:00
if (property)
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
PropertyValue *val;
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
cssprovider: Add a new setter for rulesets We now have set-by-pspec (which is used for normal style properties) and set-by-name (which is used by widget properties).
2011-05-18 02:30:51 +00:00
g_free (name);
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_VALUE);
val = property_value_new (scanner->section);
g_value_init (&val->value, property->pspec->value_type);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
css: Move property parsing into styleproperty file Just shuffles code around for parsing properties.
2011-05-25 23:25:00 +00:00
if (_gtk_style_property_parse_value (property,
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
&val->value,
css: Move property parsing into styleproperty file Just shuffles code around for parsing properties.
2011-05-25 23:25:00 +00:00
scanner->parser,
gtk_css_scanner_get_base_url (scanner)))
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
css: Move property parsing into styleproperty file Just shuffles code around for parsing properties.
2011-05-25 23:25:00 +00:00
if (_gtk_css_parser_begins_with (scanner->parser, ';') ||
_gtk_css_parser_begins_with (scanner->parser, '}') ||
_gtk_css_parser_is_eof (scanner->parser))
css: Rename struct variable I want to add parse_func as something different soon.
2011-05-25 22:09:26 +00:00
{
gtk_css_ruleset_add (ruleset, property, val);
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
else
gtkcssprovider: plug several leaks In finalize(), clear all rulesets. In parse_declaration(), Free the GValue under unhandled error situations. In gtk_css_provider_load_internal(), Do not leak the file contents.
2011-05-30 17:26:28 +00:00
{
css: Move property parsing into styleproperty file Just shuffles code around for parsing properties.
2011-05-25 23:25:00 +00:00
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Junk at end of value");
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
property_value_free (val);
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
css: Move property parsing into styleproperty file Just shuffles code around for parsing properties.
2011-05-25 23:25:00 +00:00
return;
gtkcssprovider: plug several leaks In finalize(), clear all rulesets. In parse_declaration(), Free the GValue under unhandled error situations. In gtk_css_provider_load_internal(), Do not leak the file contents.
2011-05-30 17:26:28 +00:00
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
else
{
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
property_value_free (val);
css: Move property parsing into styleproperty file Just shuffles code around for parsing properties.
2011-05-25 23:25:00 +00:00
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
css: Move property parsing into styleproperty file Just shuffles code around for parsing properties.
2011-05-25 23:25:00 +00:00
return;
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
}
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
else if (name[0] == '-')
{
css: Make property parsing functions take a css parser Instead of reading a string and then passing that in, let the parse functions use the full power of the parser.
2011-05-18 16:32:22 +00:00
char *value_str;
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
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_VALUE);
css: Make property parsing functions take a css parser Instead of reading a string and then passing that in, let the parse functions use the full power of the parser.
2011-05-18 16:32:22 +00:00
value_str = _gtk_css_parser_read_value (scanner->parser);
if (value_str)
{
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
PropertyValue *val;
css: Make property parsing functions take a css parser Instead of reading a string and then passing that in, let the parse functions use the full power of the parser.
2011-05-18 16:32:22 +00:00
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
val = property_value_new (scanner->section);
g_value_init (&val->value, G_TYPE_STRING);
g_value_take_string (&val->value, value_str);
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
css: Make property parsing functions take a css parser Instead of reading a string and then passing that in, let the parse functions use the full power of the parser.
2011-05-18 16:32:22 +00:00
gtk_css_ruleset_add_style (ruleset, name, val);
}
else
{
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
css: Make property parsing functions take a css parser Instead of reading a string and then passing that in, let the parse functions use the full power of the parser.
2011-05-18 16:32:22 +00:00
return;
}
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
else
g_free (name);
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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
check_for_semicolon:
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
{
if (!_gtk_css_parser_begins_with (scanner->parser, '}') &&
!_gtk_css_parser_is_eof (scanner->parser))
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Expected semicolon");
_gtk_css_parser_resync (scanner->parser, TRUE, '}');
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +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
}
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
static void
parse_declarations (GtkCssScanner *scanner,
GtkCssRuleset *ruleset)
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
{
while (!_gtk_css_parser_is_eof (scanner->parser) &&
!_gtk_css_parser_begins_with (scanner->parser, '}'))
{
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
parse_declaration (scanner, ruleset);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +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
}
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
static void
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parse_ruleset (GtkCssScanner *scanner)
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GSList *selectors;
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
GtkCssRuleset ruleset = { 0, };
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_RULESET);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
selectors = parse_selector_list (scanner);
if (selectors == NULL)
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
{
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_RULESET);
return;
}
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (!_gtk_css_parser_try (scanner->parser, "{", TRUE))
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"expected '{' after selectors");
_gtk_css_parser_resync (scanner->parser, FALSE, 0);
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_RULESET);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
return;
}
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
parse_declarations (scanner, &ruleset);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (!_gtk_css_parser_try (scanner->parser, "}", TRUE))
{
gtk_css_provider_error_literal (scanner->provider,
scanner,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_SYNTAX,
"expected '}' after declarations");
if (!_gtk_css_parser_is_eof (scanner->parser))
{
_gtk_css_parser_resync (scanner->parser, FALSE, 0);
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
gtk_css_ruleset_clear (&ruleset);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_RULESET);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
}
}
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
css_provider_commit (scanner->provider, selectors, &ruleset);
gtk_css_ruleset_clear (&ruleset);
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_RULESET);
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
}
cssprovider: Keep track of passed in error differently Instead of having an error member in the CSS provider's private struct, connect a signal handler when an error is passed in. This has two advantages: 1) It makes the code clearer as we don't have to keep track of an error member anywhere. 2) It causes a non-emission of the g_warning() when an error was passed in, because it only triggers when no signal handlers are connected. So we get identical behavior to GTK 3.0 where warnings where only emitted when no error was passed in.
2011-04-11 00:32:26 +00:00
static void
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parse_statement (GtkCssScanner *scanner)
cssprovider: Keep track of passed in error differently Instead of having an error member in the CSS provider's private struct, connect a signal handler when an error is passed in. This has two advantages: 1) It makes the code clearer as we don't have to keep track of an error member anywhere. 2) It causes a non-emission of the g_warning() when an error was passed in, because it only triggers when no signal handlers are connected. So we get identical behavior to GTK 3.0 where warnings where only emitted when no error was passed in.
2011-04-11 00:32:26 +00:00
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (_gtk_css_parser_begins_with (scanner->parser, '@'))
parse_at_keyword (scanner);
else
parse_ruleset (scanner);
cssprovider: Keep track of passed in error differently Instead of having an error member in the CSS provider's private struct, connect a signal handler when an error is passed in. This has two advantages: 1) It makes the code clearer as we don't have to keep track of an error member anywhere. 2) It causes a non-emission of the g_warning() when an error was passed in, because it only triggers when no signal handlers are connected. So we get identical behavior to GTK 3.0 where warnings where only emitted when no error was passed in.
2011-04-11 00:32:26 +00:00
}
cssprovider: Remove now useless variables
2011-04-08 00:57:33 +00:00
cssprovider: More error handling into load_internal() Now the parsing functions starting at parse_stylesheet() don't have to care about errors anymore.
2011-04-11 17:57:42 +00:00
static void
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
parse_stylesheet (GtkCssScanner *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
{
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_DOCUMENT);
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
_gtk_css_parser_skip_whitespace (scanner->parser);
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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
while (!_gtk_css_parser_is_eof (scanner->parser))
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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
if (_gtk_css_parser_try (scanner->parser, "<!--", TRUE) ||
_gtk_css_parser_try (scanner->parser, "-->", TRUE))
continue;
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: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parse_statement (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
}
API: css: Add GtkCssSection This struct keeps track of an area of text in a CSS file and uses it when specifying information. Also, the cssprovider keeps track of sections when parsing a file.
2011-06-17 00:02:24 +00:00
gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DOCUMENT);
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: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
static int
gtk_css_provider_compare_rule (gconstpointer a_,
gconstpointer b_)
{
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
const GtkCssRuleset *a = (const GtkCssRuleset *) a_;
const GtkCssRuleset *b = (const GtkCssRuleset *) b_;
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
int compare;
compare = _gtk_css_selector_compare (a->selector, b->selector);
if (compare != 0)
return compare;
/* compare pointers in array to ensure a stable sort */
if (a_ < b_)
return -1;
if (a_ > b_)
return 1;
return 0;
}
static void
gtk_css_provider_postprocess (GtkCssProvider *css_provider)
{
GtkCssProviderPrivate *priv = css_provider->priv;
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
g_array_sort (priv->rulesets, gtk_css_provider_compare_rule);
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
}
cssprovider: Add a load_internal function that all loads chain to
2011-04-11 17:55:34 +00:00
static gboolean
gtk_css_provider_load_internal (GtkCssProvider *css_provider,
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *parent,
cssprovider: Add a load_internal function that all loads chain to
2011-04-11 17:55:34 +00:00
GFile *file,
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
const char *text,
cssprovider: Add a load_internal function that all loads chain to
2011-04-11 17:55:34 +00:00
GError **error)
{
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
GtkCssScanner *scanner;
cssprovider: More error handling into load_internal() Now the parsing functions starting at parse_stylesheet() don't have to care about errors anymore.
2011-04-11 17:57:42 +00:00
gulong error_handler;
gtkcssprovider: plug several leaks In finalize(), clear all rulesets. In parse_declaration(), Free the GValue under unhandled error situations. In gtk_css_provider_load_internal(), Do not leak the file contents.
2011-05-30 17:26:28 +00:00
char *free_data = NULL;
cssprovider: More error handling into load_internal() Now the parsing functions starting at parse_stylesheet() don't have to care about errors anymore.
2011-04-11 17:57:42 +00:00
if (error)
error_handler = g_signal_connect (css_provider,
"parsing-error",
G_CALLBACK (gtk_css_provider_propagate_error),
error);
else
error_handler = 0; /* silence gcc */
cssprovider: Add a load_internal function that all loads chain to
2011-04-11 17:55:34 +00:00
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
if (text == NULL)
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
{
GError *load_error = NULL;
cssprovider: Add a load_internal function that all loads chain to
2011-04-11 17:55:34 +00:00
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
if (g_file_load_contents (file, NULL,
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
&free_data, NULL,
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
NULL, &load_error))
{
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
text = free_data;
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
}
else
{
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
GtkCssSection *section;
cssprovider: Allow storing the parent stylesheet
2011-04-12 00:06:08 +00:00
if (parent)
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
section = gtk_css_section_ref (parent->section);
cssprovider: Allow storing the parent stylesheet
2011-04-12 00:06:08 +00:00
else
API: cssprovider: Change parsing-error signal Instead of path, line and position, emit the section the error happened in. This has a lot more information to consume.
2011-06-17 05:39:11 +00:00
section = _gtk_css_section_new_for_file (GTK_CSS_SECTION_DOCUMENT, file);
gtk_css_provider_error (css_provider,
parent,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_IMPORT,
"Failed to import: %s",
load_error->message);
gtk_css_section_unref (section);
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
}
}
cssprovider: Add a load_internal function that all loads chain to
2011-04-11 17:55:34 +00:00
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
if (text)
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
{
cssprovider: Keep only the curent section while parsing We don't need a list of sections, the section can give us the parent when we need it (d'oh).
2011-06-17 02:52:43 +00:00
scanner = gtk_css_scanner_new (css_provider,
parent,
parent ? parent->section : NULL,
file,
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
text);
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
css: Rewrite the parser Instead of relying on GScanner and its idea of syntax, code up a parser that obeys the CSS spec. This also has the great side effect of reporting correct line numbers and positions. Also included is a reorganization of the returned error values. Instead of error values describing what type of syntax error was returned, the code just returns SYNTAX_ERROR. Other messages exist for when actual values don't work or when errors shouldn't be fatal due to backwards compatibility.
2011-04-14 02:47:18 +00:00
parse_stylesheet (scanner);
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
gtk_css_scanner_destroy (scanner);
css: Rewrite selectors Selectors now go into their own C file. The new selectors are modeled a lot closer to the CSS spec. In particular the specificity computation matches CSS 2.1 exactly. For details about the why, see also: http://mail.gnome.org/archives/gtk-devel-list/2011-May/msg00061.html https://bugzilla.gnome.org/show_bug.cgi?id=649798
2011-05-14 11:27:31 +00:00
if (parent == NULL)
gtk_css_provider_postprocess (css_provider);
cssprovider: Make load_internal() load the contents This way, we achieve two things: 1) We can unify file loading to one location 2) We can emit the error from file loading using the parsing-error signal. This is very useful for @import handling in particular.
2011-04-11 18:08:57 +00:00
}
cssprovider: Add a load_internal function that all loads chain to
2011-04-11 17:55:34 +00:00
gtkcssprovider: plug several leaks In finalize(), clear all rulesets. In parse_declaration(), Free the GValue under unhandled error situations. In gtk_css_provider_load_internal(), Do not leak the file contents.
2011-05-30 17:26:28 +00:00
g_free (free_data);
cssprovider: More error handling into load_internal() Now the parsing functions starting at parse_stylesheet() don't have to care about errors anymore.
2011-04-11 17:57:42 +00:00
if (error)
{
g_signal_handler_disconnect (css_provider, error_handler);
gtkcssprovider: plug several leaks In finalize(), clear all rulesets. In parse_declaration(), Free the GValue under unhandled error situations. In gtk_css_provider_load_internal(), Do not leak the file contents.
2011-05-30 17:26:28 +00:00
cssprovider: More error handling into load_internal() Now the parsing functions starting at parse_stylesheet() don't have to care about errors anymore.
2011-04-11 17:57:42 +00:00
if (*error)
{
/* We clear all contents from the provider for backwards compat reasons */
gtk_css_provider_reset (css_provider);
return FALSE;
}
}
return TRUE;
cssprovider: Add a load_internal function that all loads chain to
2011-04-11 17:55:34 +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
Add annotations to gtk_css_provider_load_from_data https://bugzilla.gnome.org/show_bug.cgi?id=646859
2011-06-01 00:37:43 +00:00
* @data: (array length=length) (element-type guint8): CSS data loaded in memory
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
* @length: the length of @data in bytes, or -1 for NUL terminated strings. If
* @length is not -1, the code will assume it is not NUL terminated and will
* potentially do a copy.
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
* @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
{
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
char *free_data;
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 (data != NULL, FALSE);
if (length < 0)
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
{
length = strlen (data);
free_data = NULL;
}
else
{
free_data = g_strndup (data, length);
data = free_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
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
gtk_css_provider_reset (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
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
ret = gtk_css_provider_load_internal (css_provider, NULL, NULL, data, error);
g_free (free_data);
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
}
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)
{
g_return_val_if_fail (GTK_IS_CSS_PROVIDER (css_provider), FALSE);
g_return_val_if_fail (G_IS_FILE (file), FALSE);
cssprovider: Change declaration parsing for error reporting Previously, we only checked for errors after parsing the full declaration. Now we detect errors with the property before even attempting to parse its value. The benefit here is that the error reporting reports the correct line and position numbers.
2011-04-07 22:08:10 +00:00
gtk_css_provider_reset (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
cssprovider: Handle non-NULL-terminated data Do a dumb copy if that happens.
2011-06-17 03:15:48 +00:00
return gtk_css_provider_load_internal (css_provider, NULL, file, NULL, 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_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)
{
cssprovider: Reimplement gtk_css_provider_load_from_path() Call gtk_css_provider_load_from_file() instead of the internal function. This has two advantages: 1) It simplifies the code a lot 2) It gets rid of GMappedFile usage. GMappedFile does not work everywhere, so this is finally portable.
2011-04-11 23:22:16 +00:00
GFile *file;
gboolean result;
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_return_val_if_fail (GTK_IS_CSS_PROVIDER (css_provider), FALSE);
g_return_val_if_fail (path != NULL, FALSE);
cssprovider: Reimplement gtk_css_provider_load_from_path() Call gtk_css_provider_load_from_file() instead of the internal function. This has two advantages: 1) It simplifies the code a lot 2) It gets rid of GMappedFile usage. GMappedFile does not work everywhere, so this is finally portable.
2011-04-11 23:22:16 +00:00
file = g_file_new_for_path (path);
result = gtk_css_provider_load_from_file (css_provider, file, error);
g_object_unref (file);
return result;
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
}
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"
gtkentry: Add hinting to GtkEntry gtk_entry_set_placeholder_text() makes the entry display the given text when it is empty and unfocused. Based on previous patch by Alberto Garcia. https://bugzilla.gnome.org/show_bug.cgi?id=440963
2011-02-24 12:29:10 +00:00
"@define-color placeholder_text_color #808080; \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"
theme: Fix prelight on selected rows' expanders There was no prelight effect on selected rows' expanders with the builtin theme, noticed by Kris Rietveld.
2011-04-03 10:21:57 +00:00
".expander:prelight,\n"
"GtkTreeView.view.expander:selected:prelight {\n"
Make GtkExpander use GtkStyleContext
2010-12-13 19:04:40 +00:00
" color: @text_color;\n"
"}\n"
"\n"
".expander:active {\n"
Speed up expander animation Go back to 200ms, which is what we had in GTK+ 2.x. Themes can change this, of course.
2011-01-31 15:51:09 +00:00
" transition: 200ms 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"
default theme: fix tooltip colors
2011-06-12 21:26:53 +00:00
".tooltip,\n"
".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"
gtk: make the .trough background-color darker() as it was in GTK+ 2.x
2011-02-06 12:48:42 +00:00
" background-color: darker (@bg_color);\n"
GtkCssProvider: Improve default CSS.
2010-10-23 16:32:15 +00:00
" 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"
default theme: Fix menuitem check/radio colors
2011-06-12 21:35:39 +00:00
".menuitem.check, .menuitem.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"
default theme: fix menuitem selections
2011-06-12 21:28:43 +00:00
".menuitem:hover,\n"
".menuitem.check:hover,\n"
".menuitem.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"
css-provider: Fix up the Switch style As it was with the old style, when the Switch is in the "on" state the trough should be using the selected background color.
2010-12-29 03:09:14 +00:00
"GtkSwitch.trough:active {\n"
" background-color: @selected_bg_color;\n"
" color: @selected_fg_color;\n"
"}\n"
"\n"
GtkCssProvider: Render inconsistent toggle buttons differently.
2010-11-22 20:47:11 +00:00
"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"
"}\n"
"\n"
"GtkLabel:selected:focused {\n"
" background-color: @selected_bg_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: 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
gtk: clean up the private horror - add gtkmodulesprivate.h and move stuff there from gtkprivate.h - add gtkprivate.c and move stuff there from gtkmain.c - add gtkwin32.c and move stuff there from gtkmain.c - don't redefine GTK_DATADIR and friends in gtkprivate.h - have _gtk_get_datadir() and friends on all platforms - remove the horrid hacks where gtkprivate.h can't be included, or must be included later due to redefinition of the compile-time directories
2011-10-22 06:48:13 +00:00
path = g_build_filename (_gtk_get_data_prefix (), "share", "themes", NULL);
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
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
GtkCssProvider: Take into account variant When loading a theme, make sure we take into account the variant so we don't use the plain version when the theme changes. Also make sure to fallback to the plain theme when loading a variant fails. https://bugzilla.gnome.org/show_bug.cgi?id=640983
2011-01-31 00:30:00 +00:00
* @variant: (allow-none): variant to load, for example, "dark", or
* %NULL for the default
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
* 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.
GtkCssProvider: Take into account variant When loading a theme, make sure we take into account the variant so we don't use the plain version when the theme changes. Also make sure to fallback to the plain theme when loading a variant fails. https://bugzilla.gnome.org/show_bug.cgi?id=640983
2011-01-31 00:30:00 +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;
GtkCssProvider: Take into account variant When loading a theme, make sure we take into account the variant so we don't use the plain version when the theme changes. Also make sure to fallback to the plain theme when loading a variant fails. https://bugzilla.gnome.org/show_bug.cgi?id=640983
2011-01-31 00:30:00 +00:00
gchar *key;
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
if (G_UNLIKELY (!themes))
themes = g_hash_table_new (g_str_hash, g_str_equal);
GtkCssProvider: Take into account variant When loading a theme, make sure we take into account the variant so we don't use the plain version when the theme changes. Also make sure to fallback to the plain theme when loading a variant fails. https://bugzilla.gnome.org/show_bug.cgi?id=640983
2011-01-31 00:30:00 +00:00
if (variant == NULL)
key = (gchar *)name;
else
key = g_strconcat (name, "-", variant, NULL);
provider = g_hash_table_lookup (themes, key);
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
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)
{
GtkCssProvider: Take into account variant When loading a theme, make sure we take into account the variant so we don't use the plain version when the theme changes. Also make sure to fallback to the plain theme when loading a variant fails. https://bugzilla.gnome.org/show_bug.cgi?id=640983
2011-01-31 00:30:00 +00:00
gchar *theme_dir;
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)
{
provider = gtk_css_provider_new ();
cssprovider: When loading themes, don't pass in an error We want to parse existing themes as well as possible instead of failing. And the g_warning() is preserved.
2011-05-18 16:37:23 +00:00
if (!gtk_css_provider_load_from_path (provider, path, NULL))
{
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
g_object_unref (provider);
provider = NULL;
}
else
GtkCssProvider: Take into account variant When loading a theme, make sure we take into account the variant so we don't use the plain version when the theme changes. Also make sure to fallback to the plain theme when loading a variant fails. https://bugzilla.gnome.org/show_bug.cgi?id=640983
2011-01-31 00:30:00 +00:00
g_hash_table_insert (themes, g_strdup (key), provider);
Fix a memory leak in GtkCSSProvider Found by Felix Riemann https://bugzilla.gnome.org/show_bug.cgi?id=641558
2011-02-05 02:13:56 +00:00
g_free (path);
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
}
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
}
GtkCssProvider: Take into account variant When loading a theme, make sure we take into account the variant so we don't use the plain version when the theme changes. Also make sure to fallback to the plain theme when loading a variant fails. https://bugzilla.gnome.org/show_bug.cgi?id=640983
2011-01-31 00:30:00 +00:00
if (key != name)
g_free (key);
GtkCssProvider: Add gtk_css_provider_load_from_path()
2010-08-20 09:50:39 +00:00
return provider;
}
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
static int
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
compare_properties (gconstpointer a, gconstpointer b)
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
{
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
return strcmp (((const GtkStyleProperty *) a)->pspec->name,
((const GtkStyleProperty *) b)->pspec->name);
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
}
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
static void
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
gtk_css_ruleset_print (const GtkCssRuleset *ruleset,
GString *str)
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
{
GList *keys, *walk;
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
_gtk_css_selector_print (ruleset->selector, str);
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
g_string_append (str, " {\n");
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (ruleset->style)
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
{
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
keys = g_hash_table_get_keys (ruleset->style);
/* so the output is identical for identical selector styles */
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
keys = g_list_sort (keys, compare_properties);
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
for (walk = keys; walk; walk = walk->next)
{
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
GtkStyleProperty *prop = walk->data;
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
const PropertyValue *value = g_hash_table_lookup (ruleset->style, prop);
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
g_string_append (str, " ");
styleproperties: Add _gtk_style_properties_set_property_by_property() ... as a replacement for _gtk_style_properties_set_property_by_pspec(). We'll need that to handle shorthands.
2011-05-21 19:17:08 +00:00
g_string_append (str, prop->pspec->name);
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
g_string_append (str, ": ");
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
_gtk_style_property_print_value (prop, &value->value, str);
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
g_string_append (str, ";\n");
}
g_list_free (keys);
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
}
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
if (ruleset->widget_style)
{
keys = g_hash_table_get_keys (ruleset->widget_style);
/* so the output is identical for identical selector styles */
keys = g_list_sort (keys, (GCompareFunc) strcmp);
for (walk = keys; walk; walk = walk->next)
{
const char *name = walk->data;
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
const PropertyValue *value = g_hash_table_lookup (ruleset->widget_style, (gpointer) name);
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
g_string_append (str, " ");
g_string_append (str, name);
g_string_append (str, ": ");
cssprovider: Store sections with parsed values Also create a separate section for values to associate the values with. Finally, use this section information when delayed-parsing a widget style property.
2011-06-17 03:58:04 +00:00
g_string_append (str, g_value_get_string (&value->value));
cssprovider: Keep two hash tables per ruleset One for the style properties, one for the widget style properties. This way we can make one hash table by pspec which means we don't have to repeat the pspec lookup.
2011-05-18 02:36:43 +00:00
g_string_append (str, ";\n");
}
g_list_free (keys);
}
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
g_string_append (str, "}\n");
}
static void
gtk_css_provider_print_colors (GHashTable *colors,
GString *str)
{
GList *keys, *walk;
char *s;
keys = g_hash_table_get_keys (colors);
/* so the output is identical for identical styles */
keys = g_list_sort (keys, (GCompareFunc) strcmp);
for (walk = keys; walk; walk = walk->next)
{
const char *name = walk->data;
GtkSymbolicColor *symbolic = g_hash_table_lookup (colors, (gpointer) name);
g_string_append (str, "@define-color ");
g_string_append (str, name);
g_string_append (str, " ");
s = gtk_symbolic_color_to_string (symbolic);
g_string_append (str, s);
g_free (s);
g_string_append (str, ";\n");
}
g_list_free (keys);
}
/**
* gtk_css_provider_to_string:
* @provider: the provider to write to a string
*
* Convertes the @provider into a string representation in CSS
* format.
*
* Using gtk_css_provider_load_from_data() with the return value
* from this function on a new provider created with
* gtk_css_provider_new() will basicallu create a duplicate of
* this @provider.
*
* Returns: a new string representing the @provider.
**/
char *
gtk_css_provider_to_string (GtkCssProvider *provider)
{
GtkCssProviderPrivate *priv;
GString *str;
guint i;
g_return_val_if_fail (GTK_IS_CSS_PROVIDER (provider), NULL);
priv = provider->priv;
str = g_string_new ("");
gtk_css_provider_print_colors (priv->symbolic_colors, str);
cssprovider: Rename "SelectorStyleInfo" to "Ruleset" No code changes, just clarification of the name
2011-05-17 20:04:40 +00:00
for (i = 0; i < priv->rulesets->len; i++)
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
{
if (i > 0)
g_string_append (str, "\n");
cssprovider: Refactor handling of rulesets Keep rulesets as an on-stack/heap structure instead of allocating all instances separately. Also, pass a ruleset to the ruleset parser, so we can make the ruleset parser do lots of fancy things that might be useful for performance.
2011-05-18 02:20:05 +00:00
gtk_css_ruleset_print (&g_array_index (priv->rulesets, GtkCssRuleset, i), str);
API: gtk: Add gtk_css_provider_to_string() This is intented to convert the contents of a CSS provider back to a string. It is not complete yet but good enough for starting a testsuite. :)
2011-04-06 20:03:35 +00:00
}
return g_string_free (str, FALSE);
}
Reference in New Issue Copy Permalink