[Goodies-commits] r7169 - in xfce4-power-manager/trunk: . src
Ali Abdallah
aliov at xfce.org
Sun Apr 12 02:14:49 CEST 2009
Author: aliov
Date: 2009-04-12 00:14:49 +0000 (Sun, 12 Apr 2009)
New Revision: 7169
Added:
xfce4-power-manager/trunk/src/xfpm-debug.h
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/src/Makefile.am
xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
xfce4-power-manager/trunk/src/xfpm-button-xf86.c
xfce4-power-manager/trunk/src/xfpm-engine.c
Log:
Added debug macro for enum values+fix possible missing signal that preventing the OSD from getting displayed on brightness key press
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-04-11 21:06:30 UTC (rev 7168)
+++ xfce4-power-manager/trunk/ChangeLog 2009-04-12 00:14:49 UTC (rev 7169)
@@ -1,4 +1,7 @@
+2009-04-12 2:14 Ali aliov at xfce.org
+ * : Added debug macro for enum values+fix possible missing signal that preventing the OSD from getting displayed on brightness key press
+
2009-04-11 23:06 Ali aliov at xfce.org
* : Implement option to put the system in sleep mode when it is inactive for a long time
Modified: xfce4-power-manager/trunk/src/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/src/Makefile.am 2009-04-11 21:06:30 UTC (rev 7168)
+++ xfce4-power-manager/trunk/src/Makefile.am 2009-04-12 00:14:49 UTC (rev 7169)
@@ -60,7 +60,8 @@
xfpm-errors.c \
xfpm-errors.h \
xfpm-config.h \
- xfpm-enum.h
+ xfpm-enum.h \
+ xfpm-debug.h
xfce4_power_manager_CFLAGS = \
Modified: xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-04-11 21:06:30 UTC (rev 7168)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-04-12 00:14:49 UTC (rev 7169)
@@ -205,30 +205,34 @@
xfpm_brightness_hal_up (XfpmBrightnessHal *brg)
{
if ( brg->priv->brightness_in_hw )
- return;
+ goto signal;
if ( brg->priv->hw_level <= brg->priv->max_level -2 )
{
TRACE ("Brightness key up");
xfpm_brightness_hal_set_level (brg, brg->priv->hw_level + 1 );
- brg->priv->hw_level = xfpm_brightness_hal_get_level (brg);
- g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_UP], 0, brg->priv->hw_level);
}
+
+signal:
+ brg->priv->hw_level = xfpm_brightness_hal_get_level (brg);
+ g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_UP], 0, brg->priv->hw_level);
}
static void
xfpm_brightness_hal_down (XfpmBrightnessHal *brg)
{
if ( brg->priv->brightness_in_hw )
- return;
+ goto signal;
if ( brg->priv->hw_level != 0)
{
TRACE("Brightness key down");
xfpm_brightness_hal_set_level (brg, brg->priv->hw_level - 1 );
- brg->priv->hw_level = xfpm_brightness_hal_get_level (brg);
- g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_DOWN], 0, brg->priv->hw_level);
}
+
+signal:
+ brg->priv->hw_level = xfpm_brightness_hal_get_level (brg);
+ g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_DOWN], 0, brg->priv->hw_level);
}
static void
Modified: xfce4-power-manager/trunk/src/xfpm-button-xf86.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button-xf86.c 2009-04-11 21:06:30 UTC (rev 7168)
+++ xfce4-power-manager/trunk/src/xfpm-button-xf86.c 2009-04-12 00:14:49 UTC (rev 7169)
@@ -46,6 +46,7 @@
#include "xfpm-button-xf86.h"
#include "xfpm-enum.h"
#include "xfpm-enum-types.h"
+#include "xfpm-debug.h"
/* Init */
static void xfpm_button_xf86_class_init (XfpmButtonXf86Class *klass);
@@ -81,6 +82,7 @@
static GdkFilterReturn
xfpm_button_xf86_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
{
+ XfpmButtonKey key;
XEvent *xev = (XEvent *) xevent;
if ( xev->type != KeyPress )
@@ -96,11 +98,11 @@
return GDK_FILTER_CONTINUE;
}
- XfpmButtonKey type = GPOINTER_TO_INT (key_hash);
+ key = GPOINTER_TO_INT (key_hash);
- TRACE("Found key in hash %d", type);
+ XFPM_DEBUG_ENUM ("Key press", key, XFPM_TYPE_BUTTON_KEY)
- g_signal_emit (G_OBJECT(button), signals[XF86_BUTTON_PRESSED], 0, type);
+ g_signal_emit (G_OBJECT(button), signals[XF86_BUTTON_PRESSED], 0, key);
return GDK_FILTER_REMOVE;
}
@@ -145,7 +147,7 @@
static gboolean
-xfpm_button_xf86_xevent_key (XfpmButtonXf86 *button, guint keysym , XfpmButtonKey type)
+xfpm_button_xf86_xevent_key (XfpmButtonXf86 *button, guint keysym , XfpmButtonKey key)
{
guint keycode = XKeysymToKeycode (GDK_DISPLAY(), keysym);
@@ -161,18 +163,10 @@
return FALSE;
}
-#ifdef DEBUG
- gchar *content;
- GValue value = { 0, };
- g_value_init (&value, XFPM_TYPE_BUTTON_KEY);
- g_value_set_enum (&value, type);
- content = g_strdup_value_contents (&value);
- TRACE("Grabbed key=%s, keycode=%li", content, (long int) keycode);
- g_free (content);
-#endif /*DEBUG */
-
- g_hash_table_insert (button->priv->hash, GINT_TO_POINTER(keycode), GINT_TO_POINTER(type));
+ XFPM_DEBUG_ENUM_FULL (key, XFPM_TYPE_BUTTON_KEY, "Grabbed key %li ", (long int) keycode)
+ g_hash_table_insert (button->priv->hash, GINT_TO_POINTER(keycode), GINT_TO_POINTER(key));
+
return TRUE;
}
Added: xfce4-power-manager/trunk/src/xfpm-debug.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-debug.h (rev 0)
+++ xfce4-power-manager/trunk/src/xfpm-debug.h 2009-04-12 00:14:49 UTC (rev 7169)
@@ -0,0 +1,68 @@
+/*
+ * * Copyright (C) 2008-2009 Ali <aliov at xfce.org>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __XFPM_DEBUG_H
+#define __XFPM_DEBUG_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#ifdef DEBUG
+
+#define XFPM_DEBUG_ENUM(_text, _value, _type) \
+ char *content; \
+ GValue __value__ = { 0, }; \
+ g_value_init (&__value__, _type); \
+ g_value_set_enum (&__value__, _value); \
+ content = g_strdup_value_contents (&__value__); \
+ TRACE ("%s : %s", _text, content); \
+ g_free (content);
+
+#define XFPM_DEBUG_ENUM_FULL(_value, _type, ...) \
+ char *content; \
+ GValue __value__ = { 0, }; \
+ g_value_init (&__value__, _type); \
+ g_value_set_enum (&__value__, _value); \
+ content = g_strdup_value_contents (&__value__); \
+ fprintf(stderr, "TRACE[%s:%d] %s(): ",__FILE__,__LINE__,__func__); \
+ fprintf(stderr, __VA_ARGS__); \
+ fprintf(stderr, ": %s", content); \
+ fprintf(stderr, "\n"); \
+ g_free (content);
+
+#else
+
+#define XFPM_DEBUG_ENUM(_text, _value, _type)
+#define XFPM_DEBUG_ENUM_FULL(_value, _type, ...)
+
+#endif
+
+G_END_DECLS
+
+#endif /* __XFPM_DEBUG_H */
Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c 2009-04-11 21:06:30 UTC (rev 7168)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c 2009-04-12 00:14:49 UTC (rev 7169)
@@ -52,6 +52,8 @@
#include "xfpm-idle.h"
#include "xfpm-errors.h"
#include "xfpm-config.h"
+#include "xfpm-enum-types.h"
+#include "xfpm-debug.h"
/* Init */
static void xfpm_engine_class_init (XfpmEngineClass * klass);
@@ -210,7 +212,6 @@
xfpm_engine_button_pressed_cb (XfpmButton *button,
XfpmButtonKey type, XfpmEngine * engine)
{
- TRACE ("Received button press event type %d", type);
XfpmShutdownRequest shutdown;
if ( engine->priv->inhibited )
@@ -219,6 +220,8 @@
return;
}
+ XFPM_DEBUG_ENUM ("Received button press event", type, XFPM_TYPE_BUTTON_KEY);
+
if ( type == BUTTON_MON_BRIGHTNESS_DOWN || type == BUTTON_MON_BRIGHTNESS_UP )
return;
More information about the Goodies-commits
mailing list