css: Merge GtkStyleProviderPrivate into GtkStyleProvider

This is just lots of renaming.

The interface remains private, so the public API does not change, apart
from removing the definition of the Interface object to avoid
subclassing.

1 files changed, 126 insertions, 14 deletions

diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
index 9eb735d4de..032e9bd07a 100644
--- a/gtk/gtkstyleprovider.c
+++ b/gtk/gtkstyleprovider.c
@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include "gtkstyleprovider.h"
+#include "gtkstyleproviderprivate.h"
 
 #include "gtkintl.h"
 #include "gtkprivate.h"
@@ -33,23 +33,135 @@
  * See gtk_style_context_add_provider() and gtk_style_context_add_provider_for_display().
  */
 
-static void gtk_style_provider_iface_init (gpointer g_iface);
+enum {
+  CHANGED,
+  LAST_SIGNAL
+};
 
-GType
-gtk_style_provider_get_type (void)
+G_DEFINE_INTERFACE (GtkStyleProvider, gtk_style_provider, GTK_TYPE_STYLE_PROVIDER)
+
+static guint signals[LAST_SIGNAL];
+
+static void
+gtk_style_provider_default_init (GtkStyleProviderInterface *iface)
 {
-  static GType style_provider_type = 0;
+  signals[CHANGED] = g_signal_new (I_("-gtk-private-changed"),
+                                   G_TYPE_FROM_INTERFACE (iface),
+                                   G_SIGNAL_RUN_LAST,
+                                   G_STRUCT_OFFSET (GtkStyleProviderInterface, changed),
+                                   NULL, NULL,
+                                   g_cclosure_marshal_VOID__VOID,
+                                   G_TYPE_NONE, 0);
 
-  if (!style_provider_type)
-    style_provider_type = g_type_register_static_simple (G_TYPE_INTERFACE,
-                                                         I_("GtkStyleProvider"),
-                                                         sizeof (GtkStyleProviderIface),
-                                                         (GClassInitFunc) gtk_style_provider_iface_init,
-                                                         0, NULL, 0);
-  return style_provider_type;
 }
 
-static void
-gtk_style_provider_iface_init (gpointer g_iface)
+GtkCssValue *
+gtk_style_provider_get_color (GtkStyleProvider *provider,
+                              const char       *name)
+{
+  GtkStyleProviderInterface *iface;
+
+  /* for compat with gtk_symbolic_color_resolve() */
+  if (provider == NULL)
+    return NULL;
+
+  gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL);
+
+  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+
+  if (!iface->get_color)
+    return NULL;
+
+  return iface->get_color (provider, name);
+}
+
+GtkCssKeyframes *
+gtk_style_provider_get_keyframes (GtkStyleProvider *provider,
+                                  const char       *name)
 {
+  GtkStyleProviderInterface *iface;
+
+  gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL);
+  gtk_internal_return_val_if_fail (name != NULL, NULL);
+
+  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+
+  if (!iface->get_keyframes)
+    return NULL;
+
+  return iface->get_keyframes (provider, name);
+}
+
+void
+gtk_style_provider_lookup (GtkStyleProvider    *provider,
+                           const GtkCssMatcher *matcher,
+                           GtkCssLookup        *lookup,
+                           GtkCssChange        *out_change)
+{
+  GtkStyleProviderInterface *iface;
+
+  gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER (provider));
+  gtk_internal_return_if_fail (matcher != NULL);
+  gtk_internal_return_if_fail (lookup != NULL);
+
+  if (out_change)
+    *out_change = 0;
+
+  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+
+  if (!iface->lookup)
+    return;
+
+  iface->lookup (provider, matcher, lookup, out_change);
+}
+
+void
+gtk_style_provider_changed (GtkStyleProvider *provider)
+{
+  gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER (provider));
+
+  g_signal_emit (provider, signals[CHANGED], 0);
+}
+
+GtkSettings *
+gtk_style_provider_get_settings (GtkStyleProvider *provider)
+{
+  GtkStyleProviderInterface *iface;
+
+  gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL);
+
+  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+
+  if (!iface->get_settings)
+    return NULL;
+
+  return iface->get_settings (provider);
+}
+
+int
+gtk_style_provider_get_scale (GtkStyleProvider *provider)
+{
+  GtkStyleProviderInterface *iface;
+
+  gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), 1);
+
+  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+
+  if (!iface->get_scale)
+    return 1;
+
+  return iface->get_scale (provider);
+}
+
+void
+gtk_style_provider_emit_error (GtkStyleProvider *provider,
+                               GtkCssSection    *section,
+                               GError           *error)
+{
+  GtkStyleProviderInterface *iface;
+
+  iface = GTK_STYLE_PROVIDER_GET_INTERFACE (provider);
+
+  if (iface->emit_error)
+    iface->emit_error (provider, section, error);
 }