* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
+#include "config.h"
#include <locale.h>
#ifdef HAVE_UNISTD_H
var = g_getenv ("GTK_EXE_PREFIX");
if (var)
- path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
+ path = g_build_filename (var, "lib", "gtk-3.0", GTK_BINARY_VERSION, type, NULL);
else
- path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
+ path = g_build_filename (GTK_LIBDIR, "gtk-3.0", GTK_BINARY_VERSION, type, NULL);
return path;
}
if (im_module_file)
result = g_strdup (im_module_file);
else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtk.immodules", NULL);
}
return result;
else
{
const gchar *home;
- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc", NULL);
gtk_rc_add_default_file (str);
g_free (str);
home = g_get_home_dir ();
if (home)
{
- str = g_build_filename (home, ".gtkrc-2.0", NULL);
+ str = g_build_filename (home, ".gtkrc-3.0", NULL);
gtk_rc_add_default_file (str);
g_free (str);
}
GParamSpec *pspec,
GtkRcContext *context)
{
- if (context->color_hash)
- g_hash_table_unref (context->color_hash);
-
+ GHashTable *old_hash;
+
+ old_hash = context->color_hash;
+
g_object_get (settings, "color-hash", &context->color_hash, NULL);
+ if (old_hash)
+ g_hash_table_unref (old_hash);
+
gtk_rc_reparse_all_for_settings (settings, TRUE);
}
gchar *subpath;
if (type)
- subpath = g_strconcat ("gtk-2.0-", type,
+ subpath = g_strconcat ("gtk-3.0-", type,
G_DIR_SEPARATOR_S "gtkrc",
NULL);
else
- subpath = g_strdup ("gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
+ subpath = g_strdup ("gtk-3.0" G_DIR_SEPARATOR_S "gtkrc");
/* First look in the users home directory
*/
{
gint i;
+ gtk_rc_add_initial_default_files ();
+
for (i = 0; gtk_rc_default_files[i] != NULL; i++)
gtk_rc_context_parse_file (context, gtk_rc_default_files[i], GTK_PATH_PRIO_RC, FALSE);
}
" bg[NORMAL] = \"#c4c2bd\"\n"
"}\n"
"\n"
+ "style \"gtk-default-entry-style\" {\n"
+ " bg[SELECTED] = \"#b7c3cd\"\n"
+ " fg[SELECTED] = \"#000000\"\n"
+ "}\n"
+ "\n"
"style \"gtk-default-menu-bar-item-style\" {\n"
" GtkMenuItem::horizontal_padding = 5\n"
"}\n"
" text[PRELIGHT] = \"#ffffff\"\n"
"}\n"
"\n"
- /* Make transparent tray icons work */
- "style \"gtk-default-tray-icon-style\" {\n"
- " bg_pixmap[NORMAL] = \"<parent>\"\n"
- "}\n"
- "\n"
/* Work around clipping of accelerator underlines */
"style \"gtk-default-label-style\" {\n"
" GtkWidget::draw-border = {0,0,0,1}\n"
"}\n"
"\n"
"class \"GtkProgressBar\" style : gtk \"gtk-default-progress-bar-style\"\n"
- "class \"GtkTrayIcon\" style : gtk \"gtk-default-tray-icon-style\"\n"
+ "class \"GtkEntry\" style : gtk \"gtk-default-entry-style\"\n"
"widget \"gtk-tooltip*\" style : gtk \"gtk-default-tooltips-style\"\n"
"widget_class \"*<GtkMenuItem>*\" style : gtk \"gtk-default-menu-item-style\"\n"
"widget_class \"*<GtkMenuBar>*<GtkMenuItem>\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
- node = _gtk_rc_style_lookup_rc_property (rc_style, type_name, property_name);
+ node = (GtkRcProperty *) _gtk_rc_style_lookup_rc_property (rc_style,
+ type_name,
+ property_name);
if (node != NULL)
{
}
}
-void
-gtk_rc_style_ref (GtkRcStyle *rc_style)
-{
- g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
-
- g_object_ref (rc_style);
-}
-
-void
-gtk_rc_style_unref (GtkRcStyle *rc_style)
-{
- g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
-
- g_object_unref (rc_style);
-}
-
static GtkRcStyle *
gtk_rc_style_real_create_rc_style (GtkRcStyle *style)
{
return priv->color_hashes;
}
+static void gtk_rc_style_prepend_empty_color_hash (GtkRcStyle *rc_style);
+
+void
+_gtk_rc_style_set_symbolic_color (GtkRcStyle *rc_style,
+ const gchar *name,
+ const GdkColor *color)
+{
+ GtkRcStylePrivate *priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
+ GHashTable *our_hash = NULL;
+
+ if (priv->color_hashes)
+ our_hash = priv->color_hashes->data;
+
+ if (our_hash == NULL)
+ {
+ if (color == NULL)
+ return;
+
+ gtk_rc_style_prepend_empty_color_hash (rc_style);
+ our_hash = priv->color_hashes->data;
+ }
+
+ if (color)
+ g_hash_table_insert (our_hash, g_strdup (name), gdk_color_copy (color));
+ else
+ g_hash_table_remove (our_hash, name);
+}
+
static gint
gtk_rc_properties_cmp (gconstpointer bsearch_node1,
gconstpointer bsearch_node2)
gpointer data,
gpointer user_data)
{
- gtk_rc_style_unref (data);
+ g_object_unref (data);
}
static void
/**
* gtk_rc_get_style_by_paths:
* @settings: a #GtkSettings object
- * @widget_path: the widget path to use when looking up the style, or %NULL
+ * @widget_path: (allow-none): the widget path to use when looking up the style, or %NULL
* if no matching against the widget path should be done
- * @class_path: the class path to use when looking up the style, or %NULL
+ * @class_path: (allow-none): the class path to use when looking up the style, or %NULL
* if no matching against the class path should be done.
* @type: a type that will be used along with parent types of this type
* when matching against class styles, or #G_TYPE_NONE
- *
+ *
* Creates up a #GtkStyle from styles defined in a RC file by providing
* the raw components used in matching. This function may be useful
* when creating pseudo-widgets that should be themed like widgets but
* would be items inside a GNOME canvas widget.
*
* The action of gtk_rc_get_style() is similar to:
- * <informalexample><programlisting>
- * gtk_widget_path (widget, NULL, &path, NULL);
- * gtk_widget_class_path (widget, NULL, &class_path, NULL);
- * gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget), path, class_path,
+ * |[
+ * gtk_widget_path (widget, NULL, &path, NULL);
+ * gtk_widget_class_path (widget, NULL, &class_path, NULL);
+ * gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget),
+ * path, class_path,
* G_OBJECT_TYPE (widget));
- * </programlisting></informalexample>
+ * ]|
*
* Return value: A style created by matching with the supplied paths,
* or %NULL if nothing matching was specified and the default style should
return NULL;
}
-static GSList *
-gtk_rc_add_rc_sets (GSList *slist,
- GtkRcStyle *rc_style,
- const gchar *pattern,
- GtkPathType path_type)
-{
- GtkRcStyle *new_style;
- GtkRcSet *rc_set;
- guint i;
-
- new_style = gtk_rc_style_new ();
- *new_style = *rc_style;
- new_style->name = g_strdup (rc_style->name);
- if (rc_style->font_desc)
- new_style->font_desc = pango_font_description_copy (rc_style->font_desc);
-
- for (i = 0; i < 5; i++)
- new_style->bg_pixmap_name[i] = g_strdup (rc_style->bg_pixmap_name[i]);
-
- rc_set = g_new (GtkRcSet, 1);
- rc_set->type = path_type;
-
- if (path_type == GTK_PATH_WIDGET_CLASS)
- {
- rc_set->pspec = NULL;
- rc_set->path = _gtk_rc_parse_widget_class_path (pattern);
- }
- else
- {
- rc_set->pspec = g_pattern_spec_new (pattern);
- rc_set->path = NULL;
- }
-
- rc_set->rc_style = rc_style;
-
- return g_slist_prepend (slist, rc_set);
-}
-
-void
-gtk_rc_add_widget_name_style (GtkRcStyle *rc_style,
- const gchar *pattern)
-{
- GtkRcContext *context;
-
- g_return_if_fail (rc_style != NULL);
- g_return_if_fail (pattern != NULL);
-
- context = gtk_rc_context_get (gtk_settings_get_default ());
-
- context->rc_sets_widget = gtk_rc_add_rc_sets (context->rc_sets_widget, rc_style, pattern, GTK_PATH_WIDGET);
-}
-
-void
-gtk_rc_add_widget_class_style (GtkRcStyle *rc_style,
- const gchar *pattern)
-{
- GtkRcContext *context;
-
- g_return_if_fail (rc_style != NULL);
- g_return_if_fail (pattern != NULL);
-
- context = gtk_rc_context_get (gtk_settings_get_default ());
-
- context->rc_sets_widget_class = gtk_rc_add_rc_sets (context->rc_sets_widget_class, rc_style, pattern, GTK_PATH_WIDGET_CLASS);
-}
-
-void
-gtk_rc_add_class_style (GtkRcStyle *rc_style,
- const gchar *pattern)
-{
- GtkRcContext *context;
-
- g_return_if_fail (rc_style != NULL);
- g_return_if_fail (pattern != NULL);
-
- context = gtk_rc_context_get (gtk_settings_get_default ());
-
- context->rc_sets_class = gtk_rc_add_rc_sets (context->rc_sets_class, rc_style, pattern, GTK_PATH_CLASS);
-}
-
GScanner*
gtk_rc_scanner_new (void)
{
if (expected_token != G_TOKEN_NONE)
{
- gchar *symbol_name;
- gchar *msg;
-
- msg = NULL;
- symbol_name = NULL;
+ const gchar *symbol_name = NULL;
+ gchar *msg = NULL;
+
if (scanner->scope_id == 0)
{
/* if we are in scope 0, we know the symbol names
if (expected_token > GTK_RC_TOKEN_INVALID &&
expected_token < GTK_RC_TOKEN_LAST)
{
+ const gchar *sym = NULL;
+
for (i = 0; i < G_N_ELEMENTS (symbols); i++)
if (symbols[i].token == expected_token)
- msg = symbol_names + symbols[i].name_offset;
- if (msg)
- msg = g_strconcat ("e.g. `", msg, "'", NULL);
+ sym = symbol_names + symbols[i].name_offset;
+
+ if (sym)
+ msg = g_strconcat ("e.g. `", sym, "'", NULL);
}
+
if (scanner->token > GTK_RC_TOKEN_INVALID &&
scanner->token < GTK_RC_TOKEN_LAST)
{
symbol_name = symbol_names + symbols[i].name_offset;
}
}
+
g_scanner_unexp_token (scanner,
expected_token,
NULL,
}
style = gtk_rc_style_to_style (context, proto_style);
- gtk_rc_style_unref (proto_style);
+ g_object_unref (proto_style);
g_hash_table_insert (realized_style_ht, rc_styles, style);
}
break;
case GTK_RC_TOKEN_COLOR:
if (our_hash == NULL)
- gtk_rc_style_prepend_empty_color_hash (rc_style);
- our_hash = rc_priv->color_hashes->data;
+ {
+ gtk_rc_style_prepend_empty_color_hash (rc_style);
+ our_hash = rc_priv->color_hashes->data;
+ }
token = gtk_rc_parse_logical_color (scanner, rc_style, our_hash);
break;
case G_TOKEN_IDENTIFIER:
- if (is_c_identifier (scanner->next_value.v_identifier) &&
- scanner->next_value.v_identifier[0] >= 'A' &&
- scanner->next_value.v_identifier[0] <= 'Z') /* match namespaced type names */
+ if (is_c_identifier (scanner->next_value.v_identifier))
{
GtkRcProperty prop = { 0, 0, NULL, { 0, }, };
gchar *name;
err:
if (rc_style != orig_style)
- gtk_rc_style_unref (rc_style);
+ g_object_unref (rc_style);
if (orig_style)
g_object_unref (orig_style);
/**
* gtk_rc_parse_color:
* @scanner: a #GScanner
- * @color: a pointer to a #GtkColor structure in which to store the result
+ * @color: a pointer to a #GdkColor structure in which to store the result
*
* Parses a color in the <link linkend="color=format">format</link> expected
* in a RC file.
/**
* gtk_rc_parse_color_full:
* @scanner: a #GScanner
- * @style: a #GtkRcStyle, or %NULL
- * @color: a pointer to a #GtkColor structure in which to store the result
+ * @style: (allow-none): a #GtkRcStyle, or %NULL
+ * @color: a pointer to a #GdkColor structure in which to store the result
*
* Parses a color in the <link linkend="color=format">format</link> expected
* in a RC file. If @style is not %NULL, it will be consulted to resolve
return match_widget_class_recursive (list, length, path, path_reversed);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
projects / ~andy / gtk / blobdiff