* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <config.h>
+#define PANGO_ENABLE_BACKEND /* for pango_fc_font_map_cache_clear() */
+
+#include "config.h"
#include <string.h>
#include "gtkrc.h"
#include "gtkintl.h"
#include "gtkwidget.h"
+#include "gtktypeutils.h"
#include "gtkprivate.h"
-#include "gtkalias.h"
#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"
+#include <pango/pangofc-fontmap.h>
+#endif
+
+#ifdef GDK_WINDOWING_QUARTZ
+#define DEFAULT_KEY_THEME "Mac"
+#else
+#define DEFAULT_KEY_THEME NULL
#endif
#define DEFAULT_TIMEOUT_INITIAL 200
PROP_COLOR_SCHEME,
PROP_ENABLE_ANIMATIONS,
PROP_TOUCHSCREEN_MODE,
+ PROP_TOOLTIP_TIMEOUT,
+ PROP_TOOLTIP_BROWSE_TIMEOUT,
+ PROP_TOOLTIP_BROWSE_MODE_TIMEOUT,
PROP_KEYNAV_CURSOR_ONLY,
PROP_KEYNAV_WRAP_AROUND,
PROP_ERROR_BELL,
- PROP_COLOR_HASH
+ PROP_COLOR_HASH,
+ PROP_FILE_CHOOSER_BACKEND,
+ PROP_PRINT_BACKENDS,
+ PROP_PRINT_PREVIEW_COMMAND,
+ PROP_ENABLE_MNEMONICS,
+ PROP_ENABLE_ACCELS,
+ PROP_RECENT_FILES_LIMIT,
+ PROP_IM_MODULE,
+ PROP_RECENT_FILES_MAX_AGE,
+ PROP_FONTCONFIG_TIMESTAMP,
+ PROP_SOUND_THEME_NAME,
+ PROP_ENABLE_INPUT_FEEDBACK_SOUNDS,
+ PROP_ENABLE_EVENT_SOUNDS,
+ PROP_ENABLE_TOOLTIPS,
+ PROP_TOOLBAR_STYLE,
+ PROP_TOOLBAR_ICON_SIZE,
+ PROP_AUTO_MNEMONICS,
+ PROP_APPLICATION_PREFER_DARK_THEME
};
static void settings_update_cursor_theme (GtkSettings *settings);
static void settings_update_resolution (GtkSettings *settings);
static void settings_update_font_options (GtkSettings *settings);
+static gboolean settings_update_fontconfig (GtkSettings *settings);
#endif
static void settings_update_color_scheme (GtkSettings *settings);
static void merge_color_scheme (GtkSettings *settings,
- GValue *value,
+ const GValue *value,
GtkSettingsSource source);
static gchar *get_color_scheme (GtkSettings *settings);
static GHashTable *get_color_hash (GtkSettings *settings);
*
* Whether the cursor should blink.
*
- * Also see the gtk-cursor-blink-timeout setting, which allows
- * more flexible control over cursor blinking.
+ * Also see the #GtkSettings:gtk-cursor-blink-timeout setting,
+ * which allows more flexible control over cursor blinking.
*/
result = settings_install_property_parser (class,
g_param_spec_boolean ("gtk-cursor-blink",
* The timer is reset after each user interaction.
*
* Setting this to zero has the same effect as setting
- * gtk-cursor-blinks to %FALSE.
+ * #GtkSettings:gtk-cursor-blink to %FALSE.
*
* Since: 2.12
*/
g_param_spec_string ("gtk-key-theme-name",
P_("Key Theme Name"),
P_("Name of key theme RC file to load"),
- NULL,
+ DEFAULT_KEY_THEME,
GTK_PARAM_READWRITE),
NULL);
g_assert (result == PROP_KEY_THEME_NAME);
NULL);
g_assert (result == PROP_FONT_NAME);
+ /**
+ * GtkSettings:gtk-icon-sizes:
+ *
+ * A list of icon sizes. The list is separated by colons, and
+ * item has the form:
+ *
+ * <replaceable>size-name</replaceable> = <replaceable>width</replaceable> , <replaceable>height</replaceable>
+ *
+ * E.g. "gtk-menu=16,16:gtk-button=20,20:gtk-dialog=48,48".
+ * GTK+ itself use the following named icon sizes: gtk-menu,
+ * gtk-button, gtk-small-toolbar, gtk-large-toolbar, gtk-dnd,
+ * gtk-dialog. Applications can register their own named icon
+ * sizes with gtk_icon_size_register().
+ */
result = settings_install_property_parser (class,
g_param_spec_string ("gtk-icon-sizes",
P_("Icon Sizes"),
* GtkSettings:gtk-alternative-sort-arrows:
*
* Controls the direction of the sort indicators in sorted list and tree
- * views. By default an arrow pointing down means the column is sorted
- * in ascending order. When set to %TRUE, this order will be inverted.
+ * views. By default an arrow pointing down means the column is sorted
+ * in ascending order. When set to %TRUE, this order will be inverted.
*
* Since: 2.12
*/
g_assert (result == PROP_TOUCHSCREEN_MODE);
+ /**
+ * GtkSettings:gtk-tooltip-timeout:
+ *
+ * Time, in milliseconds, after which a tooltip could appear if the
+ * cursor is hovering on top of a widget.
+ *
+ * Since: 2.12
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_int ("gtk-tooltip-timeout",
+ P_("Tooltip timeout"),
+ P_("Timeout before tooltip is shown"),
+ 0, G_MAXINT,
+ 500,
+ GTK_PARAM_READWRITE),
+ NULL);
+
+ g_assert (result == PROP_TOOLTIP_TIMEOUT);
+
+ /**
+ * GtkSettings:gtk-tooltip-browse-timeout:
+ *
+ * Controls the time after which tooltips will appear when
+ * browse mode is enabled, in milliseconds.
+ *
+ * Browse mode is enabled when the mouse pointer moves off an object
+ * where a tooltip was currently being displayed. If the mouse pointer
+ * hits another object before the browse mode timeout expires (see
+ * #GtkSettings:gtk-tooltip-browse-mode-timeout), it will take the
+ * amount of milliseconds specified by this setting to popup the tooltip
+ * for the new object.
+ *
+ * Since: 2.12
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_int ("gtk-tooltip-browse-timeout",
+ P_("Tooltip browse timeout"),
+ P_("Timeout before tooltip is shown when browse mode is enabled"),
+ 0, G_MAXINT,
+ 60,
+ GTK_PARAM_READWRITE),
+ NULL);
+
+ g_assert (result == PROP_TOOLTIP_BROWSE_TIMEOUT);
+
+ /**
+ * GtkSettings:gtk-tooltip-browse-mode-timeout:
+ *
+ * Amount of time, in milliseconds, after which the browse mode
+ * will be disabled.
+ *
+ * See #GtkSettings:gtk-tooltip-browse-timeout for more information
+ * about browse mode.
+ *
+ * Since: 2.12
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_int ("gtk-tooltip-browse-mode-timeout",
+ P_("Tooltip browse mode timeout"),
+ P_("Timeout after which browse mode is disabled"),
+ 0, G_MAXINT,
+ 500,
+ GTK_PARAM_READWRITE),
+ NULL);
+
+ g_assert (result == PROP_TOOLTIP_BROWSE_MODE_TIMEOUT);
+
/**
* GtkSettings:gtk-keynav-cursor-only:
*
/**
* GtkSettings:color-hash:
*
- * Holds a hash table representation of the gtk-color-scheme setting,
- * mapping color names to #GdkColor<!-- -->s.
+ * Holds a hash table representation of the #GtkSettings:gtk-color-scheme
+ * setting, mapping color names to #GdkColor<!-- -->s.
+ *
+ * Since: 2.10
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_boxed ("color-hash",
+ P_("Color Hash"),
+ P_("A hash table representation of the color scheme."),
+ G_TYPE_HASH_TABLE,
+ GTK_PARAM_READABLE),
+ NULL);
+ g_assert (result == PROP_COLOR_HASH);
+
+ result = settings_install_property_parser (class,
+ g_param_spec_string ("gtk-file-chooser-backend",
+ P_("Default file chooser backend"),
+ P_("Name of the GtkFileChooser backend to use by default"),
+ NULL,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_FILE_CHOOSER_BACKEND);
+
+ /**
+ * GtkSettings:gtk-print-backends:
+ *
+ * A comma-separated list of print backends to use in the print
+ * dialog. Available print backends depend on the GTK+ installation,
+ * and may include "file", "cups", "lpr" or "papi".
*
* Since: 2.10
*/
- g_object_class_install_property (gobject_class,
- PROP_COLOR_HASH,
- g_param_spec_boxed ("color-hash",
- P_("Color Hash"),
- P_("A hash table representation of the color scheme."),
- G_TYPE_HASH_TABLE,
- GTK_PARAM_READABLE));
-
- class_n_properties++;
+ result = settings_install_property_parser (class,
+ g_param_spec_string ("gtk-print-backends",
+ P_("Default print backend"),
+ P_("List of the GtkPrintBackend backends to use by default"),
+ GTK_PRINT_BACKENDS,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_PRINT_BACKENDS);
+
+ /**
+ * GtkSettings:gtk-print-preview-command:
+ *
+ * A command to run for displaying the print preview. The command
+ * should contain a %f placeholder, which will get replaced by
+ * the path to the pdf file. The command may also contain a %s
+ * placeholder, which will get replaced by the path to a file
+ * containing the print settings in the format produced by
+ * gtk_print_settings_to_file().
+ *
+ * The preview application is responsible for removing the pdf file
+ * and the print settings file when it is done.
+ *
+ * Since: 2.10
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_string ("gtk-print-preview-command",
+ P_("Default command to run when displaying a print preview"),
+ P_("Command to run when displaying a print preview"),
+ GTK_PRINT_PREVIEW_COMMAND,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_PRINT_PREVIEW_COMMAND);
+
+ /**
+ * GtkSettings:gtk-enable-mnemonics:
+ *
+ * Whether labels and menu items should have visible mnemonics which
+ * can be activated.
+ *
+ * Since: 2.12
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-enable-mnemonics",
+ P_("Enable Mnemonics"),
+ P_("Whether labels should have mnemonics"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_ENABLE_MNEMONICS);
+
+ /**
+ * GtkSettings:gtk-enable-accels:
+ *
+ * Whether menu items should have visible accelerators which can be
+ * activated.
+ *
+ * Since: 2.12
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-enable-accels",
+ P_("Enable Accelerators"),
+ P_("Whether menu items should have accelerators"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_ENABLE_ACCELS);
+
+ /**
+ * GtkSettings:gtk-recent-files-limit:
+ *
+ * The number of recently used files that should be displayed by default by
+ * #GtkRecentChooser implementations and by the #GtkFileChooser. A value of
+ * -1 means every recently used file stored.
+ *
+ * Since: 2.12
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_int ("gtk-recent-files-limit",
+ P_("Recent Files Limit"),
+ P_("Number of recently used files"),
+ -1, G_MAXINT,
+ 50,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_RECENT_FILES_LIMIT);
+
+ /**
+ * GtkSettings:gtk-im-module:
+ *
+ * Which IM (input method) module should be used by default. This is the
+ * input method that will be used if the user has not explicitly chosen
+ * another input method from the IM context menu.
+ *
+ * See #GtkIMContext and see the #GtkSettings:gtk-show-input-method-menu property.
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_string ("gtk-im-module",
+ P_("Default IM module"),
+ P_("Which IM module should be used by default"),
+ NULL,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_IM_MODULE);
+
+ /**
+ * GtkSettings:gtk-recent-files-max-age:
+ *
+ * The maximum age, in days, of the items inside the recently used
+ * resources list. Items older than this setting will be excised
+ * from the list. If set to 0, the list will always be empty; if
+ * set to -1, no item will be removed.
+ *
+ * Since: 2.14
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_int ("gtk-recent-files-max-age",
+ P_("Recent Files Max Age"),
+ P_("Maximum age of recently used files, in days"),
+ -1, G_MAXINT,
+ 30,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_RECENT_FILES_MAX_AGE);
+
+ result = settings_install_property_parser (class,
+ g_param_spec_uint ("gtk-fontconfig-timestamp",
+ P_("Fontconfig configuration timestamp"),
+ P_("Timestamp of current fontconfig configuration"),
+ 0, G_MAXUINT, 0,
+ GTK_PARAM_READWRITE),
+ NULL);
+
+ g_assert (result == PROP_FONTCONFIG_TIMESTAMP);
+
+ /**
+ * GtkSettings:gtk-sound-theme-name:
+ *
+ * The XDG sound theme to use for event sounds.
+ *
+ * See the <ulink url="http://www.freedesktop.org/wiki/Specifications/sound-theme-spec">Sound Theme spec</ulink>
+ * for more information on event sounds and sound themes.
+ *
+ * GTK+ itself does not support event sounds, you have to use a loadable
+ * module like the one that comes with libcanberra.
+ *
+ * Since: 2.14
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_string ("gtk-sound-theme-name",
+ P_("Sound Theme Name"),
+ P_("XDG sound theme name"),
+ "freedesktop",
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_SOUND_THEME_NAME);
+
+ /**
+ * GtkSettings:gtk-enable-input-feedback-sounds:
+ *
+ * Whether to play event sounds as feedback to user input.
+ *
+ * See the <ulink url="http://www.freedesktop.org/wiki/Specifications/sound-theme-spec">Sound Theme spec</ulink>
+ * for more information on event sounds and sound themes.
+ *
+ * GTK+ itself does not support event sounds, you have to use a loadable
+ * module like the one that comes with libcanberra.
+ *
+ * Since: 2.14
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-enable-input-feedback-sounds",
+ /* Translators: this means sounds that are played as feedback to user input */
+ P_("Audible Input Feedback"),
+ P_("Whether to play event sounds as feedback to user input"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_ENABLE_INPUT_FEEDBACK_SOUNDS);
+
+ /**
+ * GtkSettings:gtk-enable-event-sounds:
+ *
+ * Whether to play any event sounds at all.
+ *
+ * See the <ulink url="http://www.freedesktop.org/wiki/Specifications/sound-theme-spec">Sound Theme spec</ulink>
+ * for more information on event sounds and sound themes.
+ *
+ * GTK+ itself does not support event sounds, you have to use a loadable
+ * module like the one that comes with libcanberra.
+ *
+ * Since: 2.14
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-enable-event-sounds",
+ P_("Enable Event Sounds"),
+ P_("Whether to play any event sounds at all"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_ENABLE_EVENT_SOUNDS);
+
+ /**
+ * GtkSettings:gtk-enable-tooltips:
+ *
+ * Whether tooltips should be shown on widgets.
+ *
+ * Since: 2.14
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-enable-tooltips",
+ P_("Enable Tooltips"),
+ P_("Whether tooltips should be shown on widgets"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_ENABLE_TOOLTIPS);
+
+ /**
+ * GtkSettings:toolbar-style:
+ *
+ * The size of icons in default toolbars.
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_enum ("gtk-toolbar-style",
+ P_("Toolbar style"),
+ P_("Whether default toolbars have text only, text and icons, icons only, etc."),
+ GTK_TYPE_TOOLBAR_STYLE,
+ GTK_TOOLBAR_BOTH,
+ GTK_PARAM_READWRITE),
+ gtk_rc_property_parse_enum);
+ g_assert (result == PROP_TOOLBAR_STYLE);
+
+ /**
+ * GtkSettings:toolbar-icon-size:
+ *
+ * The size of icons in default toolbars.
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_enum ("gtk-toolbar-icon-size",
+ P_("Toolbar Icon Size"),
+ P_("The size of icons in default toolbars."),
+ GTK_TYPE_ICON_SIZE,
+ GTK_ICON_SIZE_LARGE_TOOLBAR,
+ GTK_PARAM_READWRITE),
+ gtk_rc_property_parse_enum);
+ g_assert (result == PROP_TOOLBAR_ICON_SIZE);
+
+ /**
+ * GtkSettings:gtk-auto-mnemonics:
+ *
+ * Whether mnemonics should be automatically shown and hidden when the user
+ * presses the mnemonic activator.
+ *
+ * Since: 2.20
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-auto-mnemonics",
+ P_("Auto Mnemonics"),
+ P_("Whether mnemonics should be automatically shown and hidden when the user presses the mnemonic activator."),
+ FALSE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_AUTO_MNEMONICS);
+
+ /**
+ * GtkSettings:gtk-application-prefer-dark-theme:
+ *
+ * Whether the application prefers to use a dark theme. If a GTK+ theme
+ * includes a dark variant, it will be used instead of the configured
+ * theme.
+ *
+ * Some applications benefit from minimizing the amount of light pollution that
+ * interferes with the content. Good candidates for dark themes are photo and
+ * video editors that make the actual content get all the attention and minimize
+ * the distraction of the chrome.
+ *
+ * Dark themes should not be used for documents, where large spaces are white/light
+ * and the dark chrome creates too much contrast (web browser, text editor...).
+ *
+ * Since: 2.22
+ */
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-application-prefer-dark-theme",
+ P_("Application prefers a dark theme"),
+ P_("Whether the application prefers to have a dark theme."),
+ FALSE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_APPLICATION_PREFER_DARK_THEME);
}
static void
/**
* gtk_settings_get_for_screen:
- * @screen : a #GdkScreen.
- *
+ * @screen: a #GdkScreen.
+ *
* Gets the #GtkSettings object for @screen, creating it if necessary.
*
- * Return value: a #GtkSettings object.
+ * Return value: (transfer none): a #GtkSettings object.
*
* Since: 2.2
*/
gtk_settings_get_for_screen (GdkScreen *screen)
{
GtkSettings *settings;
-
+
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
+
settings = g_object_get_data (G_OBJECT (screen), "gtk-settings");
if (!settings)
{
*
* Gets the #GtkSettings object for the default GDK screen, creating
* it if necessary. See gtk_settings_get_for_screen().
- *
- * Return value: a #GtkSettings object. If there is no default
+ *
+ * Return value: (transfer none): a #GtkSettings object. If there is no default
* screen, then returns %NULL.
**/
GtkSettings*
g_value_copy (value, &settings->property_values[property_id - 1].value);
settings->property_values[property_id - 1].source = GTK_SETTINGS_SOURCE_APPLICATION;
+
+ if (pspec->param_id == PROP_COLOR_SCHEME)
+ merge_color_scheme (settings, value, GTK_SETTINGS_SOURCE_APPLICATION);
}
static void
GType value_type = G_VALUE_TYPE (value);
GType fundamental_type = G_TYPE_FUNDAMENTAL (value_type);
- if (property_id == PROP_COLOR_HASH)
+ /* handle internal properties */
+ switch (property_id)
{
+ case PROP_COLOR_HASH:
g_value_set_boxed (value, get_color_hash (settings));
return;
+ case PROP_COLOR_SCHEME:
+ g_value_take_string (value, get_color_scheme (settings));
+ return;
+ default: ;
}
/* For enums and strings, we need to get the value as a string,
!gdk_screen_get_setting (settings->screen, pspec->name, value))
g_value_copy (&settings->property_values[property_id - 1].value, value);
else
- {
- if (pspec->param_id == PROP_COLOR_SCHEME)
- {
- merge_color_scheme (settings, value, GTK_SETTINGS_SOURCE_XSETTING);
- g_value_take_string (value, get_color_scheme (settings));
- }
-
- g_param_value_validate (pspec, value);
- }
+ g_param_value_validate (pspec, value);
}
else
{
settings_update_font_options (settings);
gtk_rc_reset_styles (GTK_SETTINGS (object));
break;
+ case PROP_FONTCONFIG_TIMESTAMP:
+ if (settings_update_fontconfig (settings))
+ gtk_rc_reset_styles (GTK_SETTINGS (object));
+ break;
case PROP_CURSOR_THEME_NAME:
case PROP_CURSOR_THEME_SIZE:
settings_update_cursor_theme (settings);
pspec, &tmp_value))
{
if (pspec->param_id == PROP_COLOR_SCHEME)
+ merge_color_scheme (data, &tmp_value, qvalue->source);
+
+ if (data->property_values[pspec->param_id - 1].source <= qvalue->source)
{
- merge_color_scheme (data, &tmp_value, qvalue->source);
- g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
- data->property_values[pspec->param_id - 1].source = GTK_SETTINGS_SOURCE_DEFAULT;
- }
-
- else if (data->property_values[pspec->param_id - 1].source <= qvalue->source)
- {
- g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
+ g_value_copy (&tmp_value, &data->property_values[pspec->param_id - 1].value);
data->property_values[pspec->param_id - 1].source = qvalue->source;
+ g_object_notify (G_OBJECT (data), g_param_spec_get_name (pspec));
}
+
}
else
{
case G_TYPE_FLOAT:
case G_TYPE_DOUBLE:
case G_TYPE_STRING:
+ case G_TYPE_ENUM:
break;
+ case G_TYPE_BOXED:
+ if (strcmp (g_param_spec_get_name (pspec), "color-hash") == 0)
+ {
+ break;
+ }
+ /* fall through */
default:
if (!parser)
{
void
gtk_settings_install_property (GParamSpec *pspec)
{
+ static GtkSettingsClass *klass = NULL;
+
GtkRcPropertyParser parser;
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
+ if (! klass)
+ klass = g_type_class_ref (GTK_TYPE_SETTINGS);
+
parser = _gtk_rc_property_parser_from_type (G_PARAM_SPEC_VALUE_TYPE (pspec));
- settings_install_property_parser (gtk_type_class (GTK_TYPE_SETTINGS), pspec, parser);
+ settings_install_property_parser (klass, pspec, parser);
}
void
gtk_settings_install_property_parser (GParamSpec *pspec,
GtkRcPropertyParser parser)
{
+ static GtkSettingsClass *klass = NULL;
+
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
g_return_if_fail (parser != NULL);
-
- settings_install_property_parser (gtk_type_class (GTK_TYPE_SETTINGS), pspec, parser);
+
+ if (! klass)
+ klass = g_type_class_ref (GTK_TYPE_SETTINGS);
+
+ settings_install_property_parser (klass, pspec, parser);
}
static void
g_value_unset (&qvalue->public.value);
g_free (qvalue->public.origin);
- g_free (qvalue);
+ g_slice_free (GtkSettingsValuePrivate, qvalue);
}
static void
qvalue = g_datalist_id_get_data (&settings->queued_settings, name_quark);
if (!qvalue)
{
- qvalue = g_new0 (GtkSettingsValuePrivate, 1);
+ qvalue = g_slice_new0 (GtkSettingsValuePrivate);
g_datalist_id_set_data_full (&settings->queued_settings, name_quark, qvalue, free_value);
}
else
GtkBorder border;
GScanner *scanner;
gboolean success = FALSE;
+ int left, right, top, bottom;
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE);
g_return_val_if_fail (G_VALUE_HOLDS_BOXED (property_value), FALSE);
scanner = gtk_rc_scanner_new ();
g_scanner_input_text (scanner, gstring->str, gstring->len);
- if (get_braced_int (scanner, TRUE, FALSE, &border.left) &&
- get_braced_int (scanner, FALSE, FALSE, &border.right) &&
- get_braced_int (scanner, FALSE, FALSE, &border.top) &&
- get_braced_int (scanner, FALSE, TRUE, &border.bottom))
+ if (get_braced_int (scanner, TRUE, FALSE, &left) &&
+ get_braced_int (scanner, FALSE, FALSE, &right) &&
+ get_braced_int (scanner, FALSE, FALSE, &top) &&
+ get_braced_int (scanner, FALSE, TRUE, &bottom))
{
+ border.left = left;
+ border.right = right;
+ border.top = top;
+ border.bottom = bottom;
g_value_set_boxed (property_value, &border);
success = TRUE;
}
void
_gtk_settings_handle_event (GdkEventSetting *event)
{
- GtkSettings *settings = gtk_settings_get_for_screen (gdk_drawable_get_screen (event->window));
-
- if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), event->name))
- g_object_notify (G_OBJECT (settings), event->name);
+ GtkSettings *settings;
+ GParamSpec *pspec;
+ guint property_id;
+
+ settings = gtk_settings_get_for_screen (gdk_window_get_screen (event->window));
+ pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (settings), event->name);
+
+ if (pspec)
+ {
+ property_id = pspec->param_id;
+
+ if (property_id == PROP_COLOR_SCHEME)
+ {
+ GValue value = { 0, };
+
+ g_value_init (&value, G_TYPE_STRING);
+ if (!gdk_screen_get_setting (settings->screen, pspec->name, &value))
+ g_value_set_static_string (&value, "");
+ merge_color_scheme (settings, &value, GTK_SETTINGS_SOURCE_XSETTING);
+ g_value_unset (&value);
+ }
+ g_object_notify (G_OBJECT (settings), pspec->name);
+ }
}
static void
{
gint hinting;
gchar *hint_style_str;
- cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_DEFAULT;
+ cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_NONE;
gint antialias;
- cairo_antialias_t antialias_mode = CAIRO_ANTIALIAS_DEFAULT;
+ cairo_antialias_t antialias_mode = CAIRO_ANTIALIAS_GRAY;
gchar *rgba_str;
cairo_subpixel_order_t subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
cairo_font_options_t *options;
NULL);
options = cairo_font_options_create ();
-
- /* hint_metrics = FALSE should never be set for user interface code.
- */
- cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+ cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+
if (hinting >= 0 && !hinting)
{
hint_style = CAIRO_HINT_STYLE_NONE;
hint_style = CAIRO_HINT_STYLE_FULL;
}
- if (hint_style_str)
- g_free (hint_style_str);
+ g_free (hint_style_str);
cairo_font_options_set_hint_style (options, hint_style);
cairo_font_options_destroy (options);
}
+#ifdef GDK_WINDOWING_X11
+static gboolean
+settings_update_fontconfig (GtkSettings *settings)
+{
+ static guint last_update_timestamp;
+ static gboolean last_update_needed;
+
+ guint timestamp;
+
+ g_object_get (settings,
+ "gtk-fontconfig-timestamp", ×tamp,
+ NULL);
+
+ /* if timestamp is the same as last_update_timestamp, we already have
+ * updated fontconig on this timestamp (another screen requested it perhaps?),
+ * just return the cached result.*/
+
+ if (timestamp != last_update_timestamp)
+ {
+ PangoFontMap *fontmap = pango_cairo_font_map_get_default ();
+ gboolean update_needed = FALSE;
+
+ /* bug 547680 */
+ if (PANGO_IS_FC_FONT_MAP (fontmap) && !FcConfigUptoDate (NULL))
+ {
+ pango_fc_font_map_cache_clear (PANGO_FC_FONT_MAP (fontmap));
+ if (FcInitReinitialize ())
+ update_needed = TRUE;
+ }
+
+ last_update_timestamp = timestamp;
+ last_update_needed = update_needed;
+ }
+
+ return last_update_needed;
+}
+#endif /* GDK_WINDOWING_X11 */
+
static void
settings_update_resolution (GtkSettings *settings)
{
}
#endif
+typedef struct {
+ GHashTable *color_hash;
+ GHashTable *tables[GTK_SETTINGS_SOURCE_APPLICATION + 1];
+ gchar *lastentry[GTK_SETTINGS_SOURCE_APPLICATION + 1];
+} ColorSchemeData;
+
static void
-settings_update_color_scheme (GtkSettings *settings)
+color_scheme_data_free (ColorSchemeData *data)
{
- gchar *dummy;
+ gint i;
- g_object_get (settings, "gtk-color-scheme", &dummy, NULL);
+ g_hash_table_unref (data->color_hash);
- /* nothing to do here, the color hash is updated as a
- * side effect of getting the color scheme
- */
+ for (i = 0; i <= GTK_SETTINGS_SOURCE_APPLICATION; i++)
+ {
+ if (data->tables[i])
+ g_hash_table_unref (data->tables[i]);
+ g_free (data->lastentry[i]);
+ }
- g_free (dummy);
+ g_slice_free (ColorSchemeData, data);
}
+static void
+settings_update_color_scheme (GtkSettings *settings)
+{
+ if (!g_object_get_data (G_OBJECT (settings), "gtk-color-scheme"))
+ {
+ ColorSchemeData *data;
+ GValue value = { 0, };
-typedef struct {
- GHashTable *color_hash;
- GHashTable *tables[GTK_SETTINGS_SOURCE_APPLICATION + 1];
- gchar *lastentry[GTK_SETTINGS_SOURCE_APPLICATION + 1];
-} ColorSchemeData;
+ data = g_slice_new0 (ColorSchemeData);
+ data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+ (GDestroyNotify) gdk_color_free);
+ g_object_set_data_full (G_OBJECT (settings), "gtk-color-scheme",
+ data, (GDestroyNotify) color_scheme_data_free);
+ g_value_init (&value, G_TYPE_STRING);
+ if (gdk_screen_get_setting (settings->screen, "gtk-color-scheme", &value))
+ {
+ merge_color_scheme (settings, &value, GTK_SETTINGS_SOURCE_XSETTING);
+ g_value_unset (&value);
+ }
+ }
+}
static gboolean
-add_color_to_hash (gchar *name,
- GdkColor *color,
+add_color_to_hash (gchar *name,
+ GdkColor *color,
GHashTable *target)
{
- GdkColor *old, *new;
+ GdkColor *old;
old = g_hash_table_lookup (target, name);
if (!old || !gdk_color_equal (old, color))
{
- new = gdk_color_copy (color);
- g_hash_table_insert (target, g_strdup (name), new);
-
+ g_hash_table_insert (target, g_strdup (name), gdk_color_copy (color));
+
return TRUE;
}
}
static gboolean
-add_colors_to_hash_from_string (GHashTable *hash,
+add_colors_to_hash_from_string (GHashTable *hash,
const gchar *colors)
{
gchar *s, *p, *name;
}
if (gdk_color_parse (p, &color))
- changed = add_color_to_hash (name, &color, hash);
+ changed |= add_color_to_hash (name, &color, hash);
}
g_free (copy);
static gboolean
update_color_hash (ColorSchemeData *data,
- const gchar *str,
+ const gchar *str,
GtkSettingsSource source)
{
gboolean changed = FALSE;
gint i;
+ GHashTable *old_hash;
+ GHashTableIter iter;
+ gpointer name;
+ gpointer color;
- if ((str == NULL || *str == '\0') &&
+ if ((str == NULL || *str == '\0') &&
(data->lastentry[source] == NULL || data->lastentry[source][0] == '\0'))
return FALSE;
if (str && data->lastentry[source] && strcmp (str, data->lastentry[source]) == 0)
return FALSE;
- /* For the RC_FILE source we merge the values rather than over-writing
+ /* For the RC_FILE source we merge the values rather than over-writing
* them, since multiple rc files might define independent sets of colors
*/
- if ((source != GTK_SETTINGS_SOURCE_RC_FILE) &&
+ if ((source != GTK_SETTINGS_SOURCE_RC_FILE) &&
data->tables[source] && g_hash_table_size (data->tables[source]) > 0)
{
g_hash_table_unref (data->tables[source]);
}
if (data->tables[source] == NULL)
- data->tables[source] = g_hash_table_new_full (g_str_hash, g_str_equal,
+ data->tables[source] = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify) gdk_color_free);
g_free (data->lastentry[source]);
data->lastentry[source] = g_strdup (str);
-
+
changed |= add_colors_to_hash_from_string (data->tables[source], str);
if (!changed)
return FALSE;
-
+
/* Rebuild the merged hash table. */
- g_hash_table_unref (data->color_hash);
- data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
- (GDestroyNotify) gdk_color_free);
+ if (data->color_hash)
+ {
+ old_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+ (GDestroyNotify) gdk_color_free);
+
+ g_hash_table_iter_init (&iter, data->color_hash);
+ while (g_hash_table_iter_next (&iter, &name, &color))
+ {
+ g_hash_table_insert (old_hash, name, color);
+ g_hash_table_iter_steal (&iter);
+ }
+ }
+ else
+ {
+ old_hash = NULL;
+ }
+
for (i = 0; i <= GTK_SETTINGS_SOURCE_APPLICATION; i++)
{
if (data->tables[i])
data->color_hash);
}
- return TRUE;
-}
-
-static void
-color_scheme_data_free (ColorSchemeData *data)
-{
- gint i;
+ if (old_hash)
+ {
+ /* now check if the merged hash has changed */
+ changed = FALSE;
+ if (g_hash_table_size (old_hash) != g_hash_table_size (data->color_hash))
+ changed = TRUE;
+ else
+ {
+ GHashTableIter iter;
+ gpointer key, value, new_value;
- g_hash_table_unref (data->color_hash);
+ g_hash_table_iter_init (&iter, old_hash);
+ while (g_hash_table_iter_next (&iter, &key, &value))
+ {
+ new_value = g_hash_table_lookup (data->color_hash, key);
+ if (!new_value || !gdk_color_equal (value, new_value))
+ {
+ changed = TRUE;
+ break;
+ }
+ }
+ }
- for (i = 0; i <= GTK_SETTINGS_SOURCE_APPLICATION; i++)
- {
- if (data->tables[i])
- g_hash_table_unref (data->tables[i]);
- g_free (data->lastentry[i]);
+ g_hash_table_unref (old_hash);
}
+ else
+ changed = TRUE;
- g_free (data);
+ return changed;
}
static void
merge_color_scheme (GtkSettings *settings,
- GValue *value,
+ const GValue *value,
GtkSettingsSource source)
{
ColorSchemeData *data;
const gchar *colors;
+ g_object_freeze_notify (G_OBJECT (settings));
+
colors = g_value_get_string (value);
+ settings_update_color_scheme (settings);
+
data = (ColorSchemeData *) g_object_get_data (G_OBJECT (settings),
"gtk-color-scheme");
- if (!data)
- {
- data = g_new0 (ColorSchemeData, 1);
- data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
- (GDestroyNotify) gdk_color_free);
- g_object_set_data_full (G_OBJECT (settings), "gtk-color-scheme",
- data, (GDestroyNotify) color_scheme_data_free);
- }
if (update_color_hash (data, colors, source))
g_object_notify (G_OBJECT (settings), "color-hash");
+
+ g_object_thaw_notify (G_OBJECT (settings));
}
static GHashTable *
{
ColorSchemeData *data;
- if (!g_object_get_data (G_OBJECT (settings), "gtk-color-scheme"))
- settings_update_color_scheme (settings);
+ settings_update_color_scheme (settings);
data = (ColorSchemeData *)g_object_get_data (G_OBJECT (settings),
"gtk-color-scheme");
- if (!data)
- return NULL;
-
return data->color_hash;
}
ColorSchemeData *data;
GString *string;
+ settings_update_color_scheme (settings);
+
data = (ColorSchemeData *) g_object_get_data (G_OBJECT (settings),
"gtk-color-scheme");
return g_string_free (string, FALSE);
}
-
-
-#define __GTK_SETTINGS_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff