[maemo-commits] [maemo-commits] r16786 - in projects/haf/trunk/sapwood: . engine

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Nov 27 16:49:04 EET 2008 
Author: herzi
Date: 2008-11-27 16:49:02 +0200 (Thu, 27 Nov 2008)
New Revision: 16786

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/engine/sapwood-style.c
Log:
2008-11-27  Sven Herzberg  <sven at imendio.com>

	Added some debug output; patch from Daniel Bormann

	* engine/sapwood-style.c (enum_value_to_string), (draw_hline),
	(draw_vline), (draw_shadow), (draw_arrow), (draw_diamond),
	(draw_string), (draw_box), (draw_flat_box), (draw_check),
	(draw_option), (draw_tab), (draw_shadow_gap), (draw_box_gap),
	(draw_expander), (draw_extension), (draw_focus), (draw_slider),
	(draw_handle), (draw_layout): added debug output


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2008-11-27 14:03:58 UTC (rev 16785)
+++ projects/haf/trunk/sapwood/ChangeLog	2008-11-27 14:49:02 UTC (rev 16786)
@@ -1,3 +1,14 @@
+2008-11-27  Sven Herzberg  <sven at imendio.com>
+
+	Added some debug output; patch from Daniel Bormann
+
+	* engine/sapwood-style.c (enum_value_to_string), (draw_hline),
+	(draw_vline), (draw_shadow), (draw_arrow), (draw_diamond),
+	(draw_string), (draw_box), (draw_flat_box), (draw_check),
+	(draw_option), (draw_tab), (draw_shadow_gap), (draw_box_gap),
+	(draw_expander), (draw_extension), (draw_focus), (draw_slider),
+	(draw_handle), (draw_layout): added debug output
+
 2008-11-21  Claudio Saavedra  <csaavedra at igalia.com>
 
 	* === Release 3.1.1 ===

Modified: projects/haf/trunk/sapwood/engine/sapwood-style.c
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-style.c	2008-11-27 14:03:58 UTC (rev 16785)
+++ projects/haf/trunk/sapwood/engine/sapwood-style.c	2008-11-27 14:49:02 UTC (rev 16786)
@@ -30,8 +30,32 @@
 #include "sapwood-rc-style.h"
 #include "sapwood-style.h"
 
+#ifdef ENABLE_DEBUG
+#define LOG(...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, __VA_ARGS__)
+#else
+#define LOG(...)
+#endif
+
 G_DEFINE_DYNAMIC_TYPE (SapwoodStyle, sapwood_style, GTK_TYPE_STYLE);
 
+#ifdef ENABLE_DEBUG
+static gchar *
+enum_value_to_string (GType enum_type,
+                      gint  enum_value)
+{
+  gpointer enum_class;
+  GEnumValue *val;
+
+  g_assert (G_TYPE_IS_ENUM (enum_type));
+
+  enum_class = g_type_class_ref (enum_type);
+  val = g_enum_get_value (G_ENUM_CLASS (enum_class), enum_value);
+  g_type_class_unref (enum_class);
+
+  return (val && val->value_nick) ? (gchar*) val->value_nick : "undefined";
+}
+#endif /* ENABLE_DEBUG */
+
 static ThemeImage *
 match_theme_image (GtkStyle       *style,
 		   ThemeMatchData *match_data)
@@ -481,6 +505,12 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=hline, state=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_HLINE;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_ORIENTATION | THEME_MATCH_STATE;
@@ -517,6 +547,12 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=vline, state=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_VLINE;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_ORIENTATION | THEME_MATCH_STATE;
@@ -554,6 +590,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=shadow, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_SHADOW;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
@@ -630,6 +673,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=arrow, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        detail,
+        gtk_widget_get_name (widget));
+
   if (detail &&
       (strcmp (detail, "hscrollbar") == 0 || strcmp (detail, "vscrollbar") == 0))
     {
@@ -721,6 +771,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=diamond, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_DIAMOND;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
@@ -747,6 +804,12 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=string, state=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        detail,
+        gtk_widget_get_name (widget));
+
   if (state == GTK_STATE_INSENSITIVE)
     {
       if (area)
@@ -824,6 +887,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=box, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   if (detail &&
       (strcmp (detail, "hscrollbar") == 0 || strcmp (detail, "vscrollbar") == 0))
     {
@@ -915,6 +985,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
   
+  LOG ("widget=%s, primitive=flat_box, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   /* Hack because Gtk doesn't give us the correct widget state */
   if (widget && GTK_IS_ENTRY(widget))
   {
@@ -959,6 +1036,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=check, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_CHECK;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
@@ -997,6 +1081,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=option, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_OPTION;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
@@ -1035,6 +1126,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=tab, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_TAB;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
@@ -1065,6 +1163,13 @@
 {
   ThemeMatchData match_data;
 
+  LOG ("widget=%s, primitive=shadow_gap, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_SHADOW_GAP;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
@@ -1099,6 +1204,13 @@
 {
   ThemeMatchData match_data;
 
+  LOG ("widget=%s, primitive=box_gap, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_BOX_GAP;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE;
@@ -1132,6 +1244,12 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=expander, state=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        detail,
+        gtk_widget_get_name (widget));
+
   /* Reusing the arrow theming here as it's flexible enough (almost, we do lose
    * the intermediate states.) It also allows us to use existing gtkrc.
    * XXX Might want to introduce proper keywords for expanders some day.
@@ -1185,6 +1303,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=extension, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_EXTENSION;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE | THEME_MATCH_GAP_SIDE;
@@ -1216,6 +1341,12 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=focus, state=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_FOCUS;
   match_data.detail = (gchar *)detail;
   match_data.flags = THEME_MATCH_STATE;
@@ -1246,6 +1377,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=slider, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_SLIDER;
   match_data.detail = (gchar *)detail;
   match_data.flags = (THEME_MATCH_SHADOW | 
@@ -1282,6 +1420,13 @@
   g_return_if_fail (style != NULL);
   g_return_if_fail (window != NULL);
 
+  LOG ("widget=%s, primitive=handle, state=%s, shadow=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state),
+        enum_value_to_string (gtk_shadow_type_get_type (), shadow),
+        detail,
+        gtk_widget_get_name (widget));
+
   match_data.function = TOKEN_D_HANDLE;
   match_data.detail = (gchar *)detail;
   match_data.flags = (THEME_MATCH_SHADOW | 
@@ -1384,6 +1529,12 @@
    * state in the default theme engine */
   GdkGC *gc;
 
+  LOG ("widget=%s, primitive=layout, state=%s, detail='%s', name='%s'",
+        G_OBJECT_TYPE_NAME (widget),
+        enum_value_to_string (gtk_state_type_get_type (), state_type),
+        detail,
+        gtk_widget_get_name (widget));
+
   gc = use_text ? style->text_gc[state_type] : style->fg_gc[state_type];
 
   if (area)
More information about the maemo-commits mailing list