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

settings: Drop the priv pointer

Browse Source
This commit is contained in:
Matthias Clasen 2019-05-19 20:04:47 +00:00
parent ced07b92a2
commit 8c1bce72d5
2 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
gtk/gtksettings.c
View File

@ -100,6 +100,8 @@
#define DEFAULT_TIMEOUT_REPEAT 50 #define DEFAULT_TIMEOUT_REPEAT 50
#define DEFAULT_TIMEOUT_EXPAND 500 #define DEFAULT_TIMEOUT_EXPAND 500
typedef struct _GtkSettingsClass GtkSettingsClass;
struct _GtkSettingsClass struct _GtkSettingsClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
@ -114,6 +116,8 @@ struct _GtkSettingsClass
typedef struct _GtkSettingsPropertyValue GtkSettingsPropertyValue; typedef struct _GtkSettingsPropertyValue GtkSettingsPropertyValue;
typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate; typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate;
typedef struct _GtkSettingsPrivate GtkSettingsPrivate;
struct _GtkSettingsPrivate struct _GtkSettingsPrivate
{ {
GData *queued_settings; /* of type GtkSettingsValue* */ GData *queued_settings; /* of type GtkSettingsValue* */
@ -251,7 +255,6 @@ gtk_settings_init (GtkSettings *settings)
const gchar * const *config_dirs; const gchar * const *config_dirs;
priv = gtk_settings_get_instance_private (settings); priv = gtk_settings_get_instance_private (settings);
settings->priv = priv;
g_datalist_init (&priv->queued_settings); g_datalist_init (&priv->queued_settings);
object_list = g_slist_prepend (object_list, settings); object_list = g_slist_prepend (object_list, settings);
@ -1017,7 +1020,7 @@ static void
gtk_settings_finalize (GObject *object) gtk_settings_finalize (GObject *object)
{ {
GtkSettings *settings = GTK_SETTINGS (object); GtkSettings *settings = GTK_SETTINGS (object);
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
guint i; guint i;
object_list = g_slist_remove (object_list, settings); object_list = g_slist_remove (object_list, settings);
@ -1043,7 +1046,7 @@ GtkStyleCascade *
_gtk_settings_get_style_cascade (GtkSettings *settings, _gtk_settings_get_style_cascade (GtkSettings *settings,
gint scale) gint scale)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GtkStyleCascade *new_cascade; GtkStyleCascade *new_cascade;
GSList *list; GSList *list;
@ -1072,6 +1075,7 @@ _gtk_settings_get_style_cascade (GtkSettings *settings,
static void static void
settings_init_style (GtkSettings *settings) settings_init_style (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
static GtkCssProvider *css_provider = NULL; static GtkCssProvider *css_provider = NULL;
GtkStyleCascade *cascade; GtkStyleCascade *cascade;
@ -1103,7 +1107,7 @@ settings_init_style (GtkSettings *settings)
GTK_STYLE_PROVIDER_PRIORITY_SETTINGS); GTK_STYLE_PROVIDER_PRIORITY_SETTINGS);
_gtk_style_cascade_add_provider (cascade, _gtk_style_cascade_add_provider (cascade,
GTK_STYLE_PROVIDER (settings->priv->theme_provider), GTK_STYLE_PROVIDER (priv->theme_provider),
GTK_STYLE_PROVIDER_PRIORITY_SETTINGS); GTK_STYLE_PROVIDER_PRIORITY_SETTINGS);
settings_update_theme (settings); settings_update_theme (settings);
@ -1130,6 +1134,7 @@ static GtkSettings *
gtk_settings_create_for_display (GdkDisplay *display) gtk_settings_create_for_display (GdkDisplay *display)
{ {
GtkSettings *settings; GtkSettings *settings;
GtkSettingsPrivate *priv;
#ifdef GDK_WINDOWING_QUARTZ #ifdef GDK_WINDOWING_QUARTZ
if (GDK_IS_QUARTZ_DISPLAY (display)) if (GDK_IS_QUARTZ_DISPLAY (display))
@ -1142,7 +1147,9 @@ gtk_settings_create_for_display (GdkDisplay *display)
#endif #endif
settings = g_object_new (GTK_TYPE_SETTINGS, NULL); settings = g_object_new (GTK_TYPE_SETTINGS, NULL);
settings->priv->display = display; priv = gtk_settings_get_instance_private (settings);
priv->display = display;
g_signal_connect_object (display, "setting-changed", G_CALLBACK (setting_changed), settings, 0); g_signal_connect_object (display, "setting-changed", G_CALLBACK (setting_changed), settings, 0);
@ -1179,7 +1186,8 @@ gtk_settings_get_for_display (GdkDisplay *display)
for (i = 0; i < display_settings->len; i++) for (i = 0; i < display_settings->len; i++)
{ {
GtkSettings *settings = g_ptr_array_index (display_settings, i); GtkSettings *settings = g_ptr_array_index (display_settings, i);
if (settings->priv->display == display) GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
if (priv->display == display)
return settings; return settings;
} }
@ -1215,7 +1223,7 @@ gtk_settings_set_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkSettings *settings = GTK_SETTINGS (object); GtkSettings *settings = GTK_SETTINGS (object);
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
g_value_copy (value, &priv->property_values[property_id - 1].value); g_value_copy (value, &priv->property_values[property_id - 1].value);
priv->property_values[property_id - 1].source = GTK_SETTINGS_SOURCE_APPLICATION; priv->property_values[property_id - 1].source = GTK_SETTINGS_SOURCE_APPLICATION;
@ -1230,7 +1238,7 @@ settings_invalidate_style (GtkSettings *settings)
static void static void
settings_update_font_values (GtkSettings *settings) settings_update_font_values (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
PangoFontDescription *desc; PangoFontDescription *desc;
const gchar *font_name; const gchar *font_name;
@ -1270,7 +1278,7 @@ gtk_settings_notify (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkSettings *settings = GTK_SETTINGS (object); GtkSettings *settings = GTK_SETTINGS (object);
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
guint property_id = pspec->param_id; guint property_id = pspec->param_id;
if (priv->display == NULL) /* initialization */ if (priv->display == NULL) /* initialization */
@ -1394,7 +1402,7 @@ apply_queued_setting (GtkSettings *settings,
GParamSpec *pspec, GParamSpec *pspec,
GtkSettingsValuePrivate *qvalue) GtkSettingsValuePrivate *qvalue)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GValue tmp_value = G_VALUE_INIT; GValue tmp_value = G_VALUE_INIT;
GtkRcPropertyParser parser = (GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser); GtkRcPropertyParser parser = (GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser);
@ -1476,7 +1484,7 @@ settings_install_property_parser (GtkSettingsClass *class,
for (node = object_list; node; node = node->next) for (node = object_list; node; node = node->next)
{ {
GtkSettings *settings = node->data; GtkSettings *settings = node->data;
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GtkSettingsValuePrivate *qvalue; GtkSettingsValuePrivate *qvalue;
priv->property_values = g_renew (GtkSettingsPropertyValue, priv->property_values, class_n_properties); priv->property_values = g_renew (GtkSettingsPropertyValue, priv->property_values, class_n_properties);
@ -1531,7 +1539,7 @@ gtk_settings_set_property_value_internal (GtkSettings *settings,
const GtkSettingsValue *new_value, const GtkSettingsValue *new_value,
GtkSettingsSource source) GtkSettingsSource source)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GtkSettingsValuePrivate *qvalue; GtkSettingsValuePrivate *qvalue;
GParamSpec *pspec; GParamSpec *pspec;
gchar *name; gchar *name;
@ -1939,7 +1947,7 @@ reset_rc_values_foreach (GQuark key_id,
void void
_gtk_settings_reset_rc_values (GtkSettings *settings) _gtk_settings_reset_rc_values (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GSList *to_reset = NULL; GSList *to_reset = NULL;
GSList *tmp_list; GSList *tmp_list;
GParamSpec **pspecs, **p; GParamSpec **pspecs, **p;
@ -1982,7 +1990,7 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
static void static void
settings_update_double_click (GtkSettings *settings) settings_update_double_click (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
gint double_click_time; gint double_click_time;
gint double_click_distance; gint double_click_distance;
@ -1998,7 +2006,7 @@ settings_update_double_click (GtkSettings *settings)
static void static void
settings_update_cursor_theme (GtkSettings *settings) settings_update_cursor_theme (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
gchar *theme = NULL; gchar *theme = NULL;
gint size = 0; gint size = 0;
@ -2016,7 +2024,7 @@ settings_update_cursor_theme (GtkSettings *settings)
static void static void
settings_update_font_options (GtkSettings *settings) settings_update_font_options (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
gint hinting; gint hinting;
gchar *hint_style_str; gchar *hint_style_str;
cairo_hint_style_t hint_style; cairo_hint_style_t hint_style;
@ -2207,7 +2215,7 @@ get_theme_name (GtkSettings *settings,
static void static void
settings_update_theme (GtkSettings *settings) settings_update_theme (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
gchar *theme_name; gchar *theme_name;
gchar *theme_variant; gchar *theme_variant;
const gchar *theme_dir; const gchar *theme_dir;
@ -2236,13 +2244,15 @@ settings_update_theme (GtkSettings *settings)
const cairo_font_options_t * const cairo_font_options_t *
gtk_settings_get_font_options (GtkSettings *settings) gtk_settings_get_font_options (GtkSettings *settings)
{ {
return settings->priv->font_options; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
return priv->font_options;
} }
GdkDisplay * GdkDisplay *
_gtk_settings_get_display (GtkSettings *settings) _gtk_settings_get_display (GtkSettings *settings)
{ {
return settings->priv->display; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
return priv->display;
} }
static void static void
@ -2388,7 +2398,7 @@ settings_update_xsetting (GtkSettings *settings,
GParamSpec *pspec, GParamSpec *pspec,
gboolean force) gboolean force)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GType value_type; GType value_type;
GType fundamental_type; GType fundamental_type;
gboolean retval = FALSE; gboolean retval = FALSE;
@ -2475,7 +2485,7 @@ gtk_settings_get_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkSettings *settings = GTK_SETTINGS (object); GtkSettings *settings = GTK_SETTINGS (object);
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
settings_update_xsetting (settings, pspec, FALSE); settings_update_xsetting (settings, pspec, FALSE);
@ -2486,7 +2496,7 @@ GtkSettingsSource
_gtk_settings_get_setting_source (GtkSettings *settings, _gtk_settings_get_setting_source (GtkSettings *settings,
const gchar *name) const gchar *name)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GParamSpec *pspec; GParamSpec *pspec;
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (settings), name); pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (settings), name);
@ -2510,7 +2520,7 @@ void
gtk_settings_reset_property (GtkSettings *settings, gtk_settings_reset_property (GtkSettings *settings,
const gchar *name) const gchar *name)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GParamSpec *pspec; GParamSpec *pspec;
GtkRcPropertyParser parser; GtkRcPropertyParser parser;
GValue *value; GValue *value;
@ -2536,7 +2546,7 @@ gtk_settings_reset_property (GtkSettings *settings,
gboolean gboolean
gtk_settings_get_enable_animations (GtkSettings *settings) gtk_settings_get_enable_animations (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GtkSettingsPropertyValue *svalue = &priv->property_values[PROP_ENABLE_ANIMATIONS - 1]; GtkSettingsPropertyValue *svalue = &priv->property_values[PROP_ENABLE_ANIMATIONS - 1];
if (svalue->source < GTK_SETTINGS_SOURCE_XSETTING) if (svalue->source < GTK_SETTINGS_SOURCE_XSETTING)
@ -2554,7 +2564,7 @@ gtk_settings_get_enable_animations (GtkSettings *settings)
gint gint
gtk_settings_get_dnd_drag_threshold (GtkSettings *settings) gtk_settings_get_dnd_drag_threshold (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GtkSettingsPropertyValue *svalue = &priv->property_values[PROP_DND_DRAG_THRESHOLD - 1]; GtkSettingsPropertyValue *svalue = &priv->property_values[PROP_DND_DRAG_THRESHOLD - 1];
if (svalue->source < GTK_SETTINGS_SOURCE_XSETTING) if (svalue->source < GTK_SETTINGS_SOURCE_XSETTING)
@ -2572,7 +2582,7 @@ gtk_settings_get_dnd_drag_threshold (GtkSettings *settings)
static void static void
settings_update_font_name (GtkSettings *settings) settings_update_font_name (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = settings->priv; GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
GtkSettingsPropertyValue *svalue = &priv->property_values[PROP_FONT_NAME - 1]; GtkSettingsPropertyValue *svalue = &priv->property_values[PROP_FONT_NAME - 1];
if (svalue->source < GTK_SETTINGS_SOURCE_XSETTING) if (svalue->source < GTK_SETTINGS_SOURCE_XSETTING)
@ -2588,23 +2598,26 @@ settings_update_font_name (GtkSettings *settings)
const gchar * const gchar *
gtk_settings_get_font_family (GtkSettings *settings) gtk_settings_get_font_family (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
settings_update_font_name (settings); settings_update_font_name (settings);
return settings->priv->font_family; return priv->font_family;
} }
gint gint
gtk_settings_get_font_size (GtkSettings *settings) gtk_settings_get_font_size (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
settings_update_font_name (settings); settings_update_font_name (settings);
return settings->priv->font_size; return priv->font_size;
} }
gboolean gboolean
gtk_settings_get_font_size_is_absolute (GtkSettings *settings) gtk_settings_get_font_size_is_absolute (GtkSettings *settings)
{ {
GtkSettingsPrivate *priv = gtk_settings_get_instance_private (settings);
settings_update_font_name (settings); settings_update_font_name (settings);
return settings->priv->font_size_absolute; return priv->font_size_absolute;
} }

5
gtk/gtksettings.h
View File

@ -35,8 +35,6 @@ G_BEGIN_DECLS
/* --- typedefs --- */ /* --- typedefs --- */
typedef struct _GtkSettingsPrivate GtkSettingsPrivate;
typedef struct _GtkSettingsClass GtkSettingsClass;
typedef struct _GtkSettingsValue GtkSettingsValue; typedef struct _GtkSettingsValue GtkSettingsValue;
@ -44,9 +42,6 @@ typedef struct _GtkSettingsValue GtkSettingsValue;
struct _GtkSettings struct _GtkSettings
{ {
GObject parent_instance; GObject parent_instance;
/*< private >*/
GtkSettingsPrivate *priv;
}; };
/** /**