From 146e15297fab2a087effdd3df1bc0d320f674a5d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 17 Oct 2011 10:24:25 +0100 Subject: [PATCH] debug: Clean up debugging notes --- clutter/clutter-backend.c | 6 ++--- clutter/clutter-bezier.c | 2 +- clutter/clutter-debug.h | 27 +++++++++---------- clutter/clutter-main.c | 4 --- clutter/deprecated/clutter-behaviour-depth.c | 2 +- .../deprecated/clutter-behaviour-ellipse.c | 2 +- .../deprecated/clutter-behaviour-opacity.c | 2 +- clutter/deprecated/clutter-behaviour-path.c | 2 +- clutter/deprecated/clutter-behaviour.c | 12 ++++----- clutter/wayland/clutter-backend-wayland.c | 2 +- clutter/win32/clutter-event-win32.c | 4 +-- 11 files changed, 29 insertions(+), 36 deletions(-) diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c index 80e4853d0..7243cac8a 100644 --- a/clutter/clutter-backend.c +++ b/clutter/clutter-backend.c @@ -465,7 +465,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend, { new_stage = NULL; - CLUTTER_NOTE (MULTISTAGE, + CLUTTER_NOTE (BACKEND, "Stage [%p] is not realized, unsetting the stage", stage); } @@ -473,7 +473,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend, { new_stage = stage; - CLUTTER_NOTE (MULTISTAGE, + CLUTTER_NOTE (BACKEND, "Setting the new stage [%p]", new_stage); } @@ -515,7 +515,7 @@ _clutter_backend_ensure_context (ClutterBackend *backend, current_context_stage = new_stage; } else - CLUTTER_NOTE (MULTISTAGE, "Stage is the same"); + CLUTTER_NOTE (BACKEND, "Stage is the same"); } diff --git a/clutter/clutter-bezier.c b/clutter/clutter-bezier.c index f4c480c1d..7b6ba3cbb 100644 --- a/clutter/clutter-bezier.c +++ b/clutter/clutter-bezier.c @@ -180,7 +180,7 @@ _clutter_bezier_advance (const ClutterBezier *b, gint L, ClutterKnot * knot) knot->x = _clutter_bezier_t2x (b, t); knot->y = _clutter_bezier_t2y (b, t); - CLUTTER_NOTE (BEHAVIOUR, "advancing to relative pt %f: t %f, {%d,%d}", + CLUTTER_NOTE (MISC, "advancing to relative pt %f: t %f, {%d,%d}", (double) L / (double) CBZ_T_ONE, (double) t / (double) CBZ_T_ONE, knot->x, knot->y); diff --git a/clutter/clutter-debug.h b/clutter/clutter-debug.h index 88b7fcec3..9cd02b2e0 100644 --- a/clutter/clutter-debug.h +++ b/clutter/clutter-debug.h @@ -13,21 +13,18 @@ typedef enum { CLUTTER_DEBUG_TEXTURE = 1 << 2, CLUTTER_DEBUG_EVENT = 1 << 3, CLUTTER_DEBUG_PAINT = 1 << 4, - CLUTTER_DEBUG_GL = 1 << 5, - CLUTTER_DEBUG_ALPHA = 1 << 6, - CLUTTER_DEBUG_BEHAVIOUR = 1 << 7, - CLUTTER_DEBUG_PANGO = 1 << 8, - CLUTTER_DEBUG_BACKEND = 1 << 9, - CLUTTER_DEBUG_SCHEDULER = 1 << 10, - CLUTTER_DEBUG_SCRIPT = 1 << 11, - CLUTTER_DEBUG_SHADER = 1 << 12, - CLUTTER_DEBUG_MULTISTAGE = 1 << 13, - CLUTTER_DEBUG_ANIMATION = 1 << 14, - CLUTTER_DEBUG_LAYOUT = 1 << 15, - CLUTTER_DEBUG_PICK = 1 << 16, - CLUTTER_DEBUG_EVENTLOOP = 1 << 17, - CLUTTER_DEBUG_CLIPPING = 1 << 18, - CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 19 + CLUTTER_DEBUG_PANGO = 1 << 5, + CLUTTER_DEBUG_BACKEND = 1 << 6, + CLUTTER_DEBUG_SCHEDULER = 1 << 7, + CLUTTER_DEBUG_SCRIPT = 1 << 8, + CLUTTER_DEBUG_SHADER = 1 << 9, + CLUTTER_DEBUG_MULTISTAGE = 1 << 10, + CLUTTER_DEBUG_ANIMATION = 1 << 11, + CLUTTER_DEBUG_LAYOUT = 1 << 12, + CLUTTER_DEBUG_PICK = 1 << 13, + CLUTTER_DEBUG_EVENTLOOP = 1 << 14, + CLUTTER_DEBUG_CLIPPING = 1 << 15, + CLUTTER_DEBUG_OOB_TRANSFORMS = 1 << 16 } ClutterDebugFlag; typedef enum { diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index d31b44485..128a30766 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -163,15 +163,11 @@ static const GDebugKey clutter_debug_keys[] = { { "event", CLUTTER_DEBUG_EVENT }, { "paint", CLUTTER_DEBUG_PAINT }, { "pick", CLUTTER_DEBUG_PICK }, - { "gl", CLUTTER_DEBUG_GL }, - { "alpha", CLUTTER_DEBUG_ALPHA }, - { "behaviour", CLUTTER_DEBUG_BEHAVIOUR }, { "pango", CLUTTER_DEBUG_PANGO }, { "backend", CLUTTER_DEBUG_BACKEND }, { "scheduler", CLUTTER_DEBUG_SCHEDULER }, { "script", CLUTTER_DEBUG_SCRIPT }, { "shader", CLUTTER_DEBUG_SHADER }, - { "multistage", CLUTTER_DEBUG_MULTISTAGE }, { "animation", CLUTTER_DEBUG_ANIMATION }, { "layout", CLUTTER_DEBUG_LAYOUT }, { "clipping", CLUTTER_DEBUG_CLIPPING }, diff --git a/clutter/deprecated/clutter-behaviour-depth.c b/clutter/deprecated/clutter-behaviour-depth.c index 28eb3c058..fd329b52c 100644 --- a/clutter/deprecated/clutter-behaviour-depth.c +++ b/clutter/deprecated/clutter-behaviour-depth.c @@ -91,7 +91,7 @@ clutter_behaviour_depth_alpha_notify (ClutterBehaviour *behaviour, depth = (alpha_value * (priv->depth_end - priv->depth_start)) + priv->depth_start; - CLUTTER_NOTE (BEHAVIOUR, "alpha: %.4f, depth: %d", alpha_value, depth); + CLUTTER_NOTE (ANIMATION, "alpha: %.4f, depth: %d", alpha_value, depth); clutter_behaviour_actors_foreach (behaviour, alpha_notify_foreach, diff --git a/clutter/deprecated/clutter-behaviour-ellipse.c b/clutter/deprecated/clutter-behaviour-ellipse.c index ab2cf60f8..ab05acab6 100644 --- a/clutter/deprecated/clutter-behaviour-ellipse.c +++ b/clutter/deprecated/clutter-behaviour-ellipse.c @@ -176,7 +176,7 @@ clutter_behaviour_ellipse_advance (ClutterBehaviourEllipse *e, knot->y = y; knot->z = z; - CLUTTER_NOTE (BEHAVIOUR, "advancing to angle %.2f [%d, %d] (a: %d, b: %d)", + CLUTTER_NOTE (ANIMATION, "advancing to angle %.2f [%d, %d] (a: %d, b: %d)", angle, knot->x, knot->y, priv->a, priv->b); diff --git a/clutter/deprecated/clutter-behaviour-opacity.c b/clutter/deprecated/clutter-behaviour-opacity.c index 072b28fa1..bfd2f0cc8 100644 --- a/clutter/deprecated/clutter-behaviour-opacity.c +++ b/clutter/deprecated/clutter-behaviour-opacity.c @@ -97,7 +97,7 @@ clutter_behaviour_alpha_notify (ClutterBehaviour *behave, * (priv->opacity_end - priv->opacity_start) + priv->opacity_start; - CLUTTER_NOTE (BEHAVIOUR, "alpha: %.4f, opacity: %u", + CLUTTER_NOTE (ANIMATION, "alpha: %.4f, opacity: %u", alpha_value, opacity); diff --git a/clutter/deprecated/clutter-behaviour-path.c b/clutter/deprecated/clutter-behaviour-path.c index 48ada7ed8..69e94d7e4 100644 --- a/clutter/deprecated/clutter-behaviour-path.c +++ b/clutter/deprecated/clutter-behaviour-path.c @@ -128,7 +128,7 @@ actor_apply_knot_foreach (ClutterBehaviour *behaviour, { ClutterKnot *knot = data; - CLUTTER_NOTE (BEHAVIOUR, "Setting actor to %ix%i", knot->x, knot->y); + CLUTTER_NOTE (ANIMATION, "Setting actor to %ix%i", knot->x, knot->y); clutter_actor_set_position (actor, knot->x, knot->y); } diff --git a/clutter/deprecated/clutter-behaviour.c b/clutter/deprecated/clutter-behaviour.c index 1cbdbe742..c79e53284 100644 --- a/clutter/deprecated/clutter-behaviour.c +++ b/clutter/deprecated/clutter-behaviour.c @@ -518,17 +518,17 @@ notify_cb (GObject *object, klass = CLUTTER_BEHAVIOUR_GET_CLASS (behave); - CLUTTER_NOTE (BEHAVIOUR, "notify::alpha"); + CLUTTER_NOTE (ANIMATION, "notify::alpha"); /* no actors, we can stop right here */ if (behave->priv->actors == NULL) return; - if (klass->alpha_notify) + if (klass->alpha_notify != NULL) { gdouble alpha_value = clutter_alpha_get_alpha (behave->priv->alpha); - CLUTTER_NOTE (BEHAVIOUR, "calling %s::alpha_notify (%p, %.4f)", + CLUTTER_NOTE (ANIMATION, "calling %s::alpha_notify (%p, %.4f)", g_type_name (G_TYPE_FROM_CLASS (klass)), behave, alpha_value); @@ -571,7 +571,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave, if (priv->notify_id) { - CLUTTER_NOTE (BEHAVIOUR, "removing previous notify-id (%d)", + CLUTTER_NOTE (ANIMATION, "removing previous notify-id (%d)", priv->notify_id); g_signal_handler_disconnect (priv->alpha, priv->notify_id); @@ -580,7 +580,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave, if (priv->alpha != NULL) { - CLUTTER_NOTE (BEHAVIOUR, "removing previous alpha object"); + CLUTTER_NOTE (ANIMATION, "removing previous alpha object"); g_object_unref (priv->alpha); priv->alpha = NULL; @@ -594,7 +594,7 @@ clutter_behaviour_set_alpha (ClutterBehaviour *behave, G_CALLBACK(notify_cb), behave); - CLUTTER_NOTE (BEHAVIOUR, "setting new alpha object (%p, notify:%d)", + CLUTTER_NOTE (ANIMATION, "setting new alpha object (%p, notify:%d)", priv->alpha, priv->notify_id); } diff --git a/clutter/wayland/clutter-backend-wayland.c b/clutter/wayland/clutter-backend-wayland.c index c21b81a11..56c23a251 100644 --- a/clutter/wayland/clutter-backend-wayland.c +++ b/clutter/wayland/clutter-backend-wayland.c @@ -401,7 +401,7 @@ try_create_context (ClutterBackend *backend, goto fail; } - CLUTTER_NOTE (GL, "Created EGL Context"); + CLUTTER_NOTE (BACKEND, "Created EGL Context"); } if (!eglMakeCurrent (backend_wayland->edpy, diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c index 287495ee3..197f665ad 100644 --- a/clutter/win32/clutter-event-win32.c +++ b/clutter/win32/clutter-event-win32.c @@ -440,8 +440,8 @@ clutter_win32_handle_event (const MSG *msg) break; case WM_PAINT: - CLUTTER_NOTE (MULTISTAGE, "expose for stage:%p, redrawing", stage); - clutter_redraw (stage); + CLUTTER_NOTE (BACKEND, "expose for stage:%p, redrawing", stage); + clutter_stage_ensure_redraw (stage); break; case WM_DESTROY: