Changeset 96

Timestamp:

07/01/08 19:22:32 (2 months ago)

Author:

inz

Message:

Handle backgrounding and display off. Fix file descriptor leak.

Files:

• mh-home-sysmon/trunk/Makefile (modified) (1 diff)
• mh-home-sysmon/trunk/debian/changelog (modified) (1 diff)
• mh-home-sysmon/trunk/debian/control (modified) (1 diff)
• mh-home-sysmon/trunk/mh-cpu-source.c (modified) (1 diff)
• mh-home-sysmon/trunk/mh-home-sysmon.c (modified) (13 diffs)

mh-home-sysmon/trunk/Makefile

@@ -1 @@
-libhildondesktop
-libhildondesktop
+dbus-glib-1 libhildondesktop mce
+dbus-glib-1 libhildondesktop mce
-
-SOURCES := $(wildcard *.c)

mh-home-sysmon/trunk/debian/changelog

@@ +1 @@
+mh-home-sysmon (0.0.2) unstable; urgency=low
+
+  * Handle {back,fore}ground signals and mce display off signal.
+  * Fix file descriptor leak.
+
+ -- Santtu Lakkala <inz@inz.fi>  Tue,  1 Jul 2008 19:20:04 +0300
+
-mh-home-sysmon (0.0.1) unstable; urgency=low
-

mh-home-sysmon/trunk/debian/control

@@ -3 +3 @@
-Priority: optional
-Maintainer: Santtu Lakkala <inz@inz.fi>
-
+, mce-dev, libdbus-glib-1-dev
-Standards-Version: 3.6.1
-

mh-home-sysmon/trunk/mh-cpu-source.c

@@ -43 +43 @@
-        FILE *proc_stat = fopen("/proc/stat", "r");
-        fscanf(proc_stat, "cpu %u %u %u %u", &user, &nice, &kern, &idle);
+        fclose(proc_stat);
+
-        change = user + nice + kern + idle - data->prev;
-        data->prev = user + nice + kern + idle;

mh-home-sysmon/trunk/mh-home-sysmon.c

@@ -4 +4 @@
-#include <stdlib.h>
-
+#include <dbus/dbus-glib.h>
+
-#ifndef GTKDEBUG
+#include <mce/dbus-names.h>
+#include <mce/mode-names.h>
-#include <libhildondesktop/libhildondesktop.h>
-#endif
@@ -15 +19 @@
-
-#include <stdio.h>
+#include <string.h>
-
-#define MH_HOME_SYSMON_GET_PRIVATE(x) (G_TYPE_INSTANCE_GET_PRIVATE((x), MH_TYPE_HOME_SYSMON, MhHomeSysmonPrivate))
@@ -23 +28 @@
-        GQueue *solid_data;
-
+#ifndef GTKDEBUG
+        DBusGConnection *gconn;
+        DBusGProxy *proxy;
+#endif
+
-        DataSource *line_source;
-        DataSource *solid_source;
@@ -30 +40 @@
-        guint datapoints;
-        guint timer_source;
+
+        gboolean foreground;
-};
-
@@ -55 +67 @@
-                            gint padding,
-                            const gchar *markup, TextAlign align);
+static void mh_home_sysmon_foreground(HildonDesktopHomeItem *item);
+static void mh_home_sysmon_background(HildonDesktopHomeItem *item);
+static void mh_home_sysmon_display_ind(DBusGProxy *proxy,
+                                       gchar *display_state,
+                                       MhHomeSysmon *sysmon);
-
-#ifndef GTKDEBUG
@@ -69 +86 @@
-        g_queue_free(priv->line_data);
-        g_queue_free(priv->solid_data);
+
+        g_object_unref(priv->proxy);
+        g_object_unref(priv->gconn);
-}
-
@@ -94 +114 @@
-        priv->timer_source =
-                g_timeout_add(5000, mh_home_sysmon_update, plugin);
+
+        priv->foreground = TRUE;
-
-        gtk_widget_set_size_request(GTK_WIDGET(plugin), 140, 140);
@@ -100 +122 @@
-                                                 (plugin),
-                                                 HILDON_DESKTOP_HOME_ITEM_RESIZE_BOTH);
+
+        priv->gconn = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
+        priv->proxy = dbus_g_proxy_new_for_name(priv->gconn,
+                                                MCE_SERVICE,
+                                                MCE_SIGNAL_PATH,
+                                                MCE_SIGNAL_IF);
+        dbus_g_proxy_add_signal(priv->proxy,
+                                MCE_DISPLAY_SIG,
+                                G_TYPE_STRING,
+                                G_TYPE_INVALID);
+        dbus_g_proxy_connect_signal(priv->proxy,
+                                    MCE_DISPLAY_SIG,
+                                    G_CALLBACK(mh_home_sysmon_display_ind),
+                                    plugin,
+                                    NULL);
-#endif
-
@@ -109 +146 @@
-        GObjectClass *object_class = G_OBJECT_CLASS(klass);
-        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+        HildonDesktopHomeItemClass *item_class =
+                HILDON_DESKTOP_HOME_ITEM_CLASS(klass);
-        g_type_class_add_private(klass, sizeof(MhHomeSysmonPrivate));
-
@@ -115 +154 @@
-        widget_class->expose_event = mh_home_sysmon_expose;
-        widget_class->screen_changed = mh_home_sysmon_screen_changed;
+
+        item_class->background = mh_home_sysmon_background;
+        item_class->foreground = mh_home_sysmon_foreground;
-}
-
@@ -155 +197 @@
-                                      GdkEventExpose *event)
-{
- = gdk_cairo_create(GDK_DRAWABLE(widget->window))
+
-        GtkRequisition req;
-        cairo_path_t *path;
@@ -165 +207 @@
-
-        cairo_pattern_t *pattern;
+
-        (void)event;
-
+        if (!priv->foreground) {
+                return TRUE;
+        }
+
+        cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
-        req.height = widget->allocation.height;
-        req.width = widget->allocation.width;
@@ -319 +367 @@
-        g_object_unref(layout);
-}
+
+static void mh_home_sysmon_foreground(HildonDesktopHomeItem *item)
+{
+        MhHomeSysmonPrivate *priv = MH_HOME_SYSMON_GET_PRIVATE(item);
+
+        priv->foreground = TRUE;
+}
+
+static void mh_home_sysmon_background(HildonDesktopHomeItem *item)
+{
+        MhHomeSysmonPrivate *priv = MH_HOME_SYSMON_GET_PRIVATE(item);
+
+        priv->foreground = FALSE;
+}
+
+#ifndef GTKDEBUG
+static void mh_home_sysmon_display_ind(DBusGProxy *proxy,
+                                       gchar *display_state,
+                                       MhHomeSysmon *sysmon)
+{
+        MhHomeSysmonPrivate *priv = MH_HOME_SYSMON_GET_PRIVATE(sysmon);
+
+        (void)proxy;
+
+        if (strcmp(display_state, MCE_DISPLAY_OFF_STRING) == 0)
+        {
+                if (priv->timer_source) {
+                        g_source_remove(priv->timer_source);
+                }
+        } else {
+                if (!priv->timer_source) {
+                        priv->timer_source =
+                                g_timeout_add(5000,
+                                              mh_home_sysmon_update, sysmon);
+                }
+        }
+}
+#endif