Re-fix opacity group handling

[~andy/gtk] / gtk / gtkcssparserprivate.h

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index e5661d54ca340e34de86b6d29449e6cd7c6a4c8b..3c6f3ba81bfb8792aab1e9878c1b28a88551868d 100644 (file)
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -12,27 +12,17 @@
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_CSS_PARSER_PRIVATE_H__
 #define __GTK_CSS_PARSER_PRIVATE_H__
 
 #include "gtk/gtkcsstypesprivate.h"
-#include <gtk/gtksymboliccolor.h>
+#include <gtk/gtkcssprovider.h>
 
 G_BEGIN_DECLS
 
-typedef enum /*< skip >*/ {
-  GTK_CSS_POSITIVE_ONLY = (1 << 0),
-  GTK_CSS_PARSE_PERCENT = (1 << 1),
-  GTK_CSS_PARSE_NUMBER = (1 << 2),
-  GTK_CSS_NUMBER_AS_PIXELS = (1 << 3),
-  GTK_CSS_PARSE_LENGTH = (1 << 4)
-} GtkCssNumberParseFlags;
-
 typedef struct _GtkCssParser GtkCssParser;
 
 typedef void (* GtkCssParserErrorFunc) (GtkCssParser *parser,
@@ -40,6 +30,7 @@ typedef void (* GtkCssParserErrorFunc) (GtkCssParser *parser,
                                         gpointer      user_data);
 
 GtkCssParser *  _gtk_css_parser_new               (const char            *data,
+                                                   GFile                 *file,
                                                    GtkCssParserErrorFunc  error_func,
                                                    gpointer               user_data);
 void            _gtk_css_parser_free              (GtkCssParser          *parser);
@@ -49,9 +40,16 @@ void            _gtk_css_parser_take_error        (GtkCssParser          *parser
 void            _gtk_css_parser_error             (GtkCssParser          *parser,
                                                    const char            *format,
                                                     ...) G_GNUC_PRINTF (2, 3);
+void            _gtk_css_parser_error_full        (GtkCssParser          *parser,
+                                                   GtkCssProviderError    code,
+                                                   const char            *format,
+                                                    ...) G_GNUC_PRINTF (3, 4);
 
 guint           _gtk_css_parser_get_line          (GtkCssParser          *parser);
 guint           _gtk_css_parser_get_position      (GtkCssParser          *parser);
+GFile *         _gtk_css_parser_get_file          (GtkCssParser          *parser);
+GFile *         _gtk_css_parser_get_file_for_path (GtkCssParser          *parser,
+                                                   const char            *path);
 
 gboolean        _gtk_css_parser_is_eof            (GtkCssParser          *parser);
 gboolean        _gtk_css_parser_begins_with       (GtkCssParser          *parser,
@@ -86,17 +84,13 @@ gboolean        _gtk_css_parser_try_length        (GtkCssParser          *parser
 gboolean        _gtk_css_parser_try_enum          (GtkCssParser          *parser,
                                                    GType                  enum_type,
                                                    int                   *value);
+gboolean        _gtk_css_parser_try_hash_color    (GtkCssParser          *parser,
+                                                   GdkRGBA               *rgba);
 
 gboolean        _gtk_css_parser_has_number        (GtkCssParser          *parser);
-gboolean        _gtk_css_parser_read_number       (GtkCssParser          *parser,
-                                                   GtkCssNumber          *number,
-                                                   GtkCssNumberParseFlags flags);
 char *          _gtk_css_parser_read_string       (GtkCssParser          *parser);
 char *          _gtk_css_parser_read_value        (GtkCssParser          *parser);
-GtkSymbolicColor *_gtk_css_parser_read_symbolic_color
-                                                  (GtkCssParser          *parser);
-GFile *         _gtk_css_parser_read_url          (GtkCssParser          *parser,
-                                                   GFile                 *base);
+GFile *         _gtk_css_parser_read_url          (GtkCssParser          *parser);
 
 void            _gtk_css_parser_skip_whitespace   (GtkCssParser          *parser);
 void            _gtk_css_parser_resync            (GtkCssParser          *parser,