rename source files
authorTuomo Tanskanen <tumi@tumi.fi>
Wed, 16 Dec 2009 15:37:15 +0000 (17:37 +0200)
committerTuomo Tanskanen <tumi@tumi.fi>
Wed, 16 Dec 2009 15:37:15 +0000 (17:37 +0200)
configure.ac
debian/changelog
src/Makefile.am
src/cpumem_status_area_item.c [new file with mode: 0644]
src/cpumem_status_area_item.h [new file with mode: 0644]
src/la_status_area_item.c [deleted file]
src/la_status_area_item.h [deleted file]

index 7340345..d9092cf 100644 (file)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(cpumem-applet, 0.0.1)
+AM_INIT_AUTOMAKE(cpumem-applet, 0.0.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
index 22ed59b..5cffc33 100644 (file)
@@ -1,3 +1,9 @@
+cpumem-applet (0.0.2) unstable; urgency=low
+
+  * Installation issues when load-applet was installed fixed
+
+ -- Tuomo Tanskanen <tumi@tumi.fi>  Wed, 16 Dec 2009 17:35:01 +0200
+
 cpumem-applet (0.0.1) unstable; urgency=low
 
   * Initial import from load-applet 0.46-1
index d75e36f..69ebb19 100644 (file)
@@ -11,5 +11,5 @@ status_area_cpumem_applet_la_LIBADD = \
         $(CPUMEM_APPLET_LIBS)
                
 status_area_cpumem_applet_la_SOURCES = \
-       la_status_area_item.c \
-       la_status_area_item.h
+       cpumem_status_area_item.c \
+       cpumem_status_area_item.h
diff --git a/src/cpumem_status_area_item.c b/src/cpumem_status_area_item.c
new file mode 100644 (file)
index 0000000..3925fd4
--- /dev/null
@@ -0,0 +1,348 @@
+/*
+ * Load applet - Maemo5 edition - status area plugin
+ */
+
+
+#include <gtk/gtk.h>
+#include <hildon/hildon.h>
+#include <glib/gerror.h>
+#include <glib.h>
+#include <string.h>
+#include <libosso.h>
+
+#include "la_status_area_item.h"
+
+#define LA_ICON_WIDTH  16
+#define LA_ICON_HEIGHT 16
+#define LA_BOX_WIDTH   5
+#define LA_BOX_HEIGHT  3
+#define LA_CPU_MAX 5
+
+
+
+#define LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE (obj, LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemPrivate))
+
+struct _LoadAppletStatusAreaItemPrivate {
+       guint timeout_id;
+       gint lastU, lastN, lastIO, lastI;
+       guchar last_mem_level;
+       guchar last_cpu_level;
+       GdkPixbuf *pixbuf;
+       GdkPixbuf *pixbuf_on;
+       GdkPixbuf *pixbuf_red;
+       GdkPixbuf *pixbuf_off;
+       osso_context_t *osso;
+       gboolean red;
+};
+
+HD_DEFINE_PLUGIN_MODULE (LoadAppletStatusAreaItem, load_applet_status_area_item, HD_TYPE_STATUS_PLUGIN_ITEM);
+
+
+/*
+ * Read current MEM usage and return indicator between 5 and 1 - how many bars are "full"
+ */
+static guchar
+la_check_mem (LoadAppletStatusAreaItemPrivate *priv)
+{
+       #define MEMFILE "/proc/meminfo"
+       #define MAX_READ_CHARS 128
+       char read_buffer[MAX_READ_CHARS];
+       FILE *fin;
+       int mem_used = 0;
+       int mem_total = 0;
+       int mem_cached = 0;
+       int mem_buffers = 0;
+       int mem_free = 0;
+
+       //Open the memory info file and get current free memory
+       fin = fopen(MEMFILE, "r");
+       if (fin == NULL) {
+               g_warning("Can't open "MEMFILE"\n");
+               return TRUE;
+       }
+       while (fgets(read_buffer, MAX_READ_CHARS, fin) != NULL) {
+               if (strncmp(read_buffer, "MemTotal", 8) == 0) {
+                       sscanf(read_buffer + 10, "%d", &mem_total);
+               } else if (strncmp(read_buffer, "MemFree", 6) == 0) {
+                       sscanf(read_buffer + 9, "%d", &mem_free);
+               } else if (strncmp(read_buffer, "Buffers", 6) == 0) {
+                       sscanf(read_buffer + 9, "%d", &mem_buffers);
+               } else if (strncmp(read_buffer, "Cached", 6) == 0) {
+                       sscanf(read_buffer + 8, "%d", &mem_cached);
+                       break;
+               }
+       }
+       fclose(fin);
+
+       mem_used = mem_total - mem_free - mem_buffers - mem_cached;
+
+       if (mem_used > 0.9*mem_total)
+               return 5;
+       else if (mem_used > 0.7*mem_total)
+               return 4;
+       else if (mem_used > 0.5*mem_total)
+               return 3;
+       else if (mem_used > 0.3*mem_total)
+               return 2;
+       else
+               return 1;
+}
+
+
+/*
+ * Read current CPU usage and return indicator between 5 and 1 - how many bars are "full"
+ */
+static guchar
+la_check_cpu (LoadAppletStatusAreaItemPrivate *priv)
+{
+       #define CPUFILE "/proc/stat"
+       gint curU, curN, curIO, curI;
+       gint deltaU, deltaN, deltaIO, deltaI;
+       int load, idle;
+       GError *error = NULL;
+       gchar *contents;
+       gsize lenght;
+       gchar **splits;
+
+       if (!g_file_get_contents (CPUFILE, &contents, &lenght, &error)) {
+               fprintf (stderr, "ERR: can't read file %s: %s\n", CPUFILE, error->message);
+               g_error_free (error);
+               return 0;
+       }
+       
+       splits = g_strsplit_set (contents, " ",  -1);
+
+       sscanf(splits[2], "%d", &curU);
+       sscanf(splits[3], "%d", &curN);
+       sscanf(splits[4], "%d", &curIO);
+       sscanf(splits[5], "%d", &curI);
+       
+       g_strfreev (splits);
+       g_free (contents);
+    
+       idle = (curI - priv->lastI);
+       if (idle == 0) load = 100;
+       else load = 100-idle;
+       if (load>100) load = 0;
+       deltaU = curU - priv->lastU;
+       deltaN = curN - priv->lastN;
+       deltaIO = curIO - priv->lastIO;
+       deltaI = curI - priv->lastI;
+       priv->lastU = curU;
+       priv->lastN = curN;
+       priv->lastIO = curIO;
+       priv->lastI = curI;
+
+       if (load > 90)
+               return 5;
+       else if (load > 70)
+               return 4;
+       else if (load > 45)
+               return 3;
+       else if (load > 19)
+               return 2;
+       else
+               return 1;
+}
+
+
+
+/*
+ * Compose and blit the current status of memory bars
+ */
+static void
+la_blit_memory_bars (const guchar level, LoadAppletStatusAreaItemPrivate *priv)
+{
+       guint x, y;
+       
+       gdk_pixbuf_fill(priv->pixbuf, 0x00000000);
+
+       x = 9;
+       y = 1;
+       if (level > 4)
+               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+       y = 5;
+       if (level > 3)
+               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+       y = 9;
+       if (level > 2)
+               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+       y = 13;
+       if (level > 1)
+               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+       else
+               gdk_pixbuf_composite(priv->pixbuf_off, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+}
+
+
+/* 
+ * Compose and blit current status of CPU bars
+ */
+static void
+la_blit_cpu_bars (const guchar level, LoadAppletStatusAreaItemPrivate *priv)
+{
+       guint x, y;
+       
+       x = 2;
+       y = 1;
+       if (level > 4)
+       {
+               if (priv->red == TRUE) {
+                       gdk_pixbuf_composite(priv->pixbuf_red, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+                       priv->red = FALSE;
+               } else {
+                       gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+                       priv->red = TRUE;
+               }
+       }
+       y = 5;
+       if (level > 3)
+               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+       y = 9;
+       if (level > 2)
+               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+       y = 13;
+       if (level > 1)
+               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+       else
+               gdk_pixbuf_composite(priv->pixbuf_off, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
+}
+
+
+/*
+ * Ran to check and update the CPU and memory reading
+ */
+static gboolean
+la_check_load (gpointer data)
+{
+       guchar current_cpu_level;
+       guchar current_mem_level;
+       LoadAppletStatusAreaItem *item = (LoadAppletStatusAreaItem*)data;
+       LoadAppletStatusAreaItemPrivate *priv = (LoadAppletStatusAreaItemPrivate*)item->priv;
+   
+       current_cpu_level = la_check_cpu(priv); 
+       current_mem_level = la_check_mem(priv);
+       //g_debug(g_strdup_printf("LOADAPLET - UPDATED CPU %d MEM %d", current_cpu_level, current_mem_level));
+       
+       //Update and blit only if data changed!
+       if ((current_mem_level != priv->last_mem_level) || (current_cpu_level != priv->last_cpu_level)) {
+               la_blit_memory_bars (current_mem_level, priv);
+               la_blit_cpu_bars (current_cpu_level, priv);
+               if (current_cpu_level == LA_CPU_MAX)
+                       priv->red = FALSE;
+               hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM(data), priv->pixbuf);
+               priv->last_mem_level = current_mem_level;
+               priv->last_cpu_level = current_cpu_level;
+       } else if (current_cpu_level == LA_CPU_MAX) {
+               //Pulsate max CPU load icon also when CPU load stays at max
+               la_blit_cpu_bars (current_cpu_level, priv);
+               hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM(data), priv->pixbuf);
+       }
+
+       return TRUE;  
+}
+
+/*
+ * Get callback when display state changes
+ */
+static void 
+load_applet_status_area_item_display_cb(osso_display_state_t state, gpointer user_data)
+{
+       LoadAppletStatusAreaItem *item = LOAD_APPLET_STATUS_AREA_ITEM(user_data);
+
+       g_return_if_fail (item != NULL && item->priv != NULL);
+
+       if (state == OSSO_DISPLAY_ON)
+    {
+               //Restart the updates, do one right away
+               if (item->priv->timeout_id == -1) 
+               {
+                       //g_debug("LOADAPPLET - restarting periodic updates");
+                       item->priv->timeout_id = gtk_timeout_add(1000, la_check_load, item);
+               }
+    } else {
+               //Suspend the updates - screen is off
+               //g_debug("LOADAPPLET - Turning updates off");
+               if (g_source_remove(item->priv->timeout_id) != TRUE)
+               {
+                       //g_error("LOADAPPLET - couldn't stop the updates!the timer still running ...");
+               } else {
+                       item->priv->timeout_id = -1;
+               }
+       }
+}
+
+
+/*****************************************************************************
+ *
+ * Boilerplate code area - do not enter
+ *
+ *****************************************************************************/
+
+static void
+load_applet_status_area_item_set_area_icon (LoadAppletStatusAreaItem *item)
+{
+       item->priv = LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE (item);
+       
+       hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM(item), item->priv->pixbuf);
+}
+
+
+static void
+load_applet_status_area_item_class_finalize (LoadAppletStatusAreaItemClass *klass)
+{
+}
+
+
+
+static void
+load_applet_status_area_item_finalize (GObject *object)
+{
+       LoadAppletStatusAreaItemPrivate *priv = LOAD_APPLET_STATUS_AREA_ITEM(object)->priv;
+       // Release and clean our stuff
+       G_OBJECT_CLASS (load_applet_status_area_item_parent_class)->finalize (object);
+       if (priv->osso)
+    {
+               osso_deinitialize(priv->osso);
+               priv->osso = NULL;
+    }
+
+}
+
+
+
+static void
+load_applet_status_area_item_class_init (LoadAppletStatusAreaItemClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+       object_class->finalize = load_applet_status_area_item_finalize;
+
+       g_type_class_add_private (klass, sizeof (LoadAppletStatusAreaItemPrivate));
+
+}
+
+static void
+load_applet_status_area_item_init (LoadAppletStatusAreaItem *item)
+{
+       item->priv = LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE (item);
+       
+       item->priv->last_mem_level = -1;
+       item->priv->last_cpu_level = -1;
+       item->priv->timeout_id = -1;
+       item->priv->red = FALSE;
+       item->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_ICON_WIDTH, LA_ICON_HEIGHT);
+       gdk_pixbuf_fill(item->priv->pixbuf, 0x00000000);
+       item->priv->pixbuf_on = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_BOX_WIDTH, LA_BOX_HEIGHT);
+       gdk_pixbuf_fill(item->priv->pixbuf_on, 0xffffffff);
+       item->priv->pixbuf_red = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_BOX_WIDTH, LA_BOX_HEIGHT);
+       gdk_pixbuf_fill(item->priv->pixbuf_red, 0xff0000ff);    
+       item->priv->pixbuf_off = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_BOX_WIDTH, LA_BOX_HEIGHT);
+       gdk_pixbuf_fill(item->priv->pixbuf_off, 0x777777ff);
+       load_applet_status_area_item_set_area_icon(item);
+
+       item->priv->osso = osso_initialize ("cpumem_applet_status_area_item", "Maemo5", TRUE, NULL);
+       item->priv->timeout_id = gtk_timeout_add(1000, la_check_load, item);
+       osso_hw_set_display_event_cb (item->priv->osso, load_applet_status_area_item_display_cb, item);
+}
+
diff --git a/src/cpumem_status_area_item.h b/src/cpumem_status_area_item.h
new file mode 100644 (file)
index 0000000..f95b19d
--- /dev/null
@@ -0,0 +1,33 @@
+#ifndef __LOAD_APPLET_STATUS_AREA_ITEM_H__
+#define __LOAD_APPLET_STATUS_AREA_ITEM_H__
+
+#include <libhildondesktop/libhildondesktop.h>
+
+G_BEGIN_DECLS
+
+#define LOAD_APPLET_TYPE_STATUS_AREA_ITEM            (load_applet_status_area_item_get_type ())
+#define LOAD_APPLET_STATUS_AREA_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItem))
+#define LOAD_APPLET_STATUS_AREA_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemClass))
+#define LOAD_APPLET_IS_STATUS_AREA_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LOAD_APPLET_TYPE_STATUS_AREA_ITEM))
+#define LOAD_APPLET_IS_STATUS_AREA_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  LOAD_APPLET_TYPE_STATUS_AREA_ITEM))
+#define LOAD_APPLET_STATUS_AREA_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemClass))
+
+typedef struct _LoadAppletStatusAreaItem        LoadAppletStatusAreaItem;
+typedef struct _LoadAppletStatusAreaItemClass   LoadAppletStatusAreaItemClass;
+typedef struct _LoadAppletStatusAreaItemPrivate LoadAppletStatusAreaItemPrivate;
+
+struct _LoadAppletStatusAreaItem {
+       HDStatusPluginItem parent;
+
+       LoadAppletStatusAreaItemPrivate *priv;
+};
+
+struct _LoadAppletStatusAreaItemClass {
+       HDStatusPluginItemClass parent;
+};
+
+GType load_applet_status_area_item_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/src/la_status_area_item.c b/src/la_status_area_item.c
deleted file mode 100644 (file)
index 3925fd4..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Load applet - Maemo5 edition - status area plugin
- */
-
-
-#include <gtk/gtk.h>
-#include <hildon/hildon.h>
-#include <glib/gerror.h>
-#include <glib.h>
-#include <string.h>
-#include <libosso.h>
-
-#include "la_status_area_item.h"
-
-#define LA_ICON_WIDTH  16
-#define LA_ICON_HEIGHT 16
-#define LA_BOX_WIDTH   5
-#define LA_BOX_HEIGHT  3
-#define LA_CPU_MAX 5
-
-
-
-#define LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE (obj, LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemPrivate))
-
-struct _LoadAppletStatusAreaItemPrivate {
-       guint timeout_id;
-       gint lastU, lastN, lastIO, lastI;
-       guchar last_mem_level;
-       guchar last_cpu_level;
-       GdkPixbuf *pixbuf;
-       GdkPixbuf *pixbuf_on;
-       GdkPixbuf *pixbuf_red;
-       GdkPixbuf *pixbuf_off;
-       osso_context_t *osso;
-       gboolean red;
-};
-
-HD_DEFINE_PLUGIN_MODULE (LoadAppletStatusAreaItem, load_applet_status_area_item, HD_TYPE_STATUS_PLUGIN_ITEM);
-
-
-/*
- * Read current MEM usage and return indicator between 5 and 1 - how many bars are "full"
- */
-static guchar
-la_check_mem (LoadAppletStatusAreaItemPrivate *priv)
-{
-       #define MEMFILE "/proc/meminfo"
-       #define MAX_READ_CHARS 128
-       char read_buffer[MAX_READ_CHARS];
-       FILE *fin;
-       int mem_used = 0;
-       int mem_total = 0;
-       int mem_cached = 0;
-       int mem_buffers = 0;
-       int mem_free = 0;
-
-       //Open the memory info file and get current free memory
-       fin = fopen(MEMFILE, "r");
-       if (fin == NULL) {
-               g_warning("Can't open "MEMFILE"\n");
-               return TRUE;
-       }
-       while (fgets(read_buffer, MAX_READ_CHARS, fin) != NULL) {
-               if (strncmp(read_buffer, "MemTotal", 8) == 0) {
-                       sscanf(read_buffer + 10, "%d", &mem_total);
-               } else if (strncmp(read_buffer, "MemFree", 6) == 0) {
-                       sscanf(read_buffer + 9, "%d", &mem_free);
-               } else if (strncmp(read_buffer, "Buffers", 6) == 0) {
-                       sscanf(read_buffer + 9, "%d", &mem_buffers);
-               } else if (strncmp(read_buffer, "Cached", 6) == 0) {
-                       sscanf(read_buffer + 8, "%d", &mem_cached);
-                       break;
-               }
-       }
-       fclose(fin);
-
-       mem_used = mem_total - mem_free - mem_buffers - mem_cached;
-
-       if (mem_used > 0.9*mem_total)
-               return 5;
-       else if (mem_used > 0.7*mem_total)
-               return 4;
-       else if (mem_used > 0.5*mem_total)
-               return 3;
-       else if (mem_used > 0.3*mem_total)
-               return 2;
-       else
-               return 1;
-}
-
-
-/*
- * Read current CPU usage and return indicator between 5 and 1 - how many bars are "full"
- */
-static guchar
-la_check_cpu (LoadAppletStatusAreaItemPrivate *priv)
-{
-       #define CPUFILE "/proc/stat"
-       gint curU, curN, curIO, curI;
-       gint deltaU, deltaN, deltaIO, deltaI;
-       int load, idle;
-       GError *error = NULL;
-       gchar *contents;
-       gsize lenght;
-       gchar **splits;
-
-       if (!g_file_get_contents (CPUFILE, &contents, &lenght, &error)) {
-               fprintf (stderr, "ERR: can't read file %s: %s\n", CPUFILE, error->message);
-               g_error_free (error);
-               return 0;
-       }
-       
-       splits = g_strsplit_set (contents, " ",  -1);
-
-       sscanf(splits[2], "%d", &curU);
-       sscanf(splits[3], "%d", &curN);
-       sscanf(splits[4], "%d", &curIO);
-       sscanf(splits[5], "%d", &curI);
-       
-       g_strfreev (splits);
-       g_free (contents);
-    
-       idle = (curI - priv->lastI);
-       if (idle == 0) load = 100;
-       else load = 100-idle;
-       if (load>100) load = 0;
-       deltaU = curU - priv->lastU;
-       deltaN = curN - priv->lastN;
-       deltaIO = curIO - priv->lastIO;
-       deltaI = curI - priv->lastI;
-       priv->lastU = curU;
-       priv->lastN = curN;
-       priv->lastIO = curIO;
-       priv->lastI = curI;
-
-       if (load > 90)
-               return 5;
-       else if (load > 70)
-               return 4;
-       else if (load > 45)
-               return 3;
-       else if (load > 19)
-               return 2;
-       else
-               return 1;
-}
-
-
-
-/*
- * Compose and blit the current status of memory bars
- */
-static void
-la_blit_memory_bars (const guchar level, LoadAppletStatusAreaItemPrivate *priv)
-{
-       guint x, y;
-       
-       gdk_pixbuf_fill(priv->pixbuf, 0x00000000);
-
-       x = 9;
-       y = 1;
-       if (level > 4)
-               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-       y = 5;
-       if (level > 3)
-               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-       y = 9;
-       if (level > 2)
-               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-       y = 13;
-       if (level > 1)
-               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-       else
-               gdk_pixbuf_composite(priv->pixbuf_off, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-}
-
-
-/* 
- * Compose and blit current status of CPU bars
- */
-static void
-la_blit_cpu_bars (const guchar level, LoadAppletStatusAreaItemPrivate *priv)
-{
-       guint x, y;
-       
-       x = 2;
-       y = 1;
-       if (level > 4)
-       {
-               if (priv->red == TRUE) {
-                       gdk_pixbuf_composite(priv->pixbuf_red, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-                       priv->red = FALSE;
-               } else {
-                       gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-                       priv->red = TRUE;
-               }
-       }
-       y = 5;
-       if (level > 3)
-               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-       y = 9;
-       if (level > 2)
-               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-       y = 13;
-       if (level > 1)
-               gdk_pixbuf_composite(priv->pixbuf_on, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-       else
-               gdk_pixbuf_composite(priv->pixbuf_off, priv->pixbuf, x, y, LA_BOX_WIDTH, LA_BOX_HEIGHT, x, y, 1, 1, GDK_INTERP_NEAREST, 255);
-}
-
-
-/*
- * Ran to check and update the CPU and memory reading
- */
-static gboolean
-la_check_load (gpointer data)
-{
-       guchar current_cpu_level;
-       guchar current_mem_level;
-       LoadAppletStatusAreaItem *item = (LoadAppletStatusAreaItem*)data;
-       LoadAppletStatusAreaItemPrivate *priv = (LoadAppletStatusAreaItemPrivate*)item->priv;
-   
-       current_cpu_level = la_check_cpu(priv); 
-       current_mem_level = la_check_mem(priv);
-       //g_debug(g_strdup_printf("LOADAPLET - UPDATED CPU %d MEM %d", current_cpu_level, current_mem_level));
-       
-       //Update and blit only if data changed!
-       if ((current_mem_level != priv->last_mem_level) || (current_cpu_level != priv->last_cpu_level)) {
-               la_blit_memory_bars (current_mem_level, priv);
-               la_blit_cpu_bars (current_cpu_level, priv);
-               if (current_cpu_level == LA_CPU_MAX)
-                       priv->red = FALSE;
-               hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM(data), priv->pixbuf);
-               priv->last_mem_level = current_mem_level;
-               priv->last_cpu_level = current_cpu_level;
-       } else if (current_cpu_level == LA_CPU_MAX) {
-               //Pulsate max CPU load icon also when CPU load stays at max
-               la_blit_cpu_bars (current_cpu_level, priv);
-               hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM(data), priv->pixbuf);
-       }
-
-       return TRUE;  
-}
-
-/*
- * Get callback when display state changes
- */
-static void 
-load_applet_status_area_item_display_cb(osso_display_state_t state, gpointer user_data)
-{
-       LoadAppletStatusAreaItem *item = LOAD_APPLET_STATUS_AREA_ITEM(user_data);
-
-       g_return_if_fail (item != NULL && item->priv != NULL);
-
-       if (state == OSSO_DISPLAY_ON)
-    {
-               //Restart the updates, do one right away
-               if (item->priv->timeout_id == -1) 
-               {
-                       //g_debug("LOADAPPLET - restarting periodic updates");
-                       item->priv->timeout_id = gtk_timeout_add(1000, la_check_load, item);
-               }
-    } else {
-               //Suspend the updates - screen is off
-               //g_debug("LOADAPPLET - Turning updates off");
-               if (g_source_remove(item->priv->timeout_id) != TRUE)
-               {
-                       //g_error("LOADAPPLET - couldn't stop the updates!the timer still running ...");
-               } else {
-                       item->priv->timeout_id = -1;
-               }
-       }
-}
-
-
-/*****************************************************************************
- *
- * Boilerplate code area - do not enter
- *
- *****************************************************************************/
-
-static void
-load_applet_status_area_item_set_area_icon (LoadAppletStatusAreaItem *item)
-{
-       item->priv = LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE (item);
-       
-       hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM(item), item->priv->pixbuf);
-}
-
-
-static void
-load_applet_status_area_item_class_finalize (LoadAppletStatusAreaItemClass *klass)
-{
-}
-
-
-
-static void
-load_applet_status_area_item_finalize (GObject *object)
-{
-       LoadAppletStatusAreaItemPrivate *priv = LOAD_APPLET_STATUS_AREA_ITEM(object)->priv;
-       // Release and clean our stuff
-       G_OBJECT_CLASS (load_applet_status_area_item_parent_class)->finalize (object);
-       if (priv->osso)
-    {
-               osso_deinitialize(priv->osso);
-               priv->osso = NULL;
-    }
-
-}
-
-
-
-static void
-load_applet_status_area_item_class_init (LoadAppletStatusAreaItemClass *klass)
-{
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-       object_class->finalize = load_applet_status_area_item_finalize;
-
-       g_type_class_add_private (klass, sizeof (LoadAppletStatusAreaItemPrivate));
-
-}
-
-static void
-load_applet_status_area_item_init (LoadAppletStatusAreaItem *item)
-{
-       item->priv = LOAD_APPLET_STATUS_AREA_ITEM_GET_PRIVATE (item);
-       
-       item->priv->last_mem_level = -1;
-       item->priv->last_cpu_level = -1;
-       item->priv->timeout_id = -1;
-       item->priv->red = FALSE;
-       item->priv->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_ICON_WIDTH, LA_ICON_HEIGHT);
-       gdk_pixbuf_fill(item->priv->pixbuf, 0x00000000);
-       item->priv->pixbuf_on = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_BOX_WIDTH, LA_BOX_HEIGHT);
-       gdk_pixbuf_fill(item->priv->pixbuf_on, 0xffffffff);
-       item->priv->pixbuf_red = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_BOX_WIDTH, LA_BOX_HEIGHT);
-       gdk_pixbuf_fill(item->priv->pixbuf_red, 0xff0000ff);    
-       item->priv->pixbuf_off = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, LA_BOX_WIDTH, LA_BOX_HEIGHT);
-       gdk_pixbuf_fill(item->priv->pixbuf_off, 0x777777ff);
-       load_applet_status_area_item_set_area_icon(item);
-
-       item->priv->osso = osso_initialize ("cpumem_applet_status_area_item", "Maemo5", TRUE, NULL);
-       item->priv->timeout_id = gtk_timeout_add(1000, la_check_load, item);
-       osso_hw_set_display_event_cb (item->priv->osso, load_applet_status_area_item_display_cb, item);
-}
-
diff --git a/src/la_status_area_item.h b/src/la_status_area_item.h
deleted file mode 100644 (file)
index f95b19d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __LOAD_APPLET_STATUS_AREA_ITEM_H__
-#define __LOAD_APPLET_STATUS_AREA_ITEM_H__
-
-#include <libhildondesktop/libhildondesktop.h>
-
-G_BEGIN_DECLS
-
-#define LOAD_APPLET_TYPE_STATUS_AREA_ITEM            (load_applet_status_area_item_get_type ())
-#define LOAD_APPLET_STATUS_AREA_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItem))
-#define LOAD_APPLET_STATUS_AREA_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemClass))
-#define LOAD_APPLET_IS_STATUS_AREA_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LOAD_APPLET_TYPE_STATUS_AREA_ITEM))
-#define LOAD_APPLET_IS_STATUS_AREA_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  LOAD_APPLET_TYPE_STATUS_AREA_ITEM))
-#define LOAD_APPLET_STATUS_AREA_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  LOAD_APPLET_TYPE_STATUS_AREA_ITEM, LoadAppletStatusAreaItemClass))
-
-typedef struct _LoadAppletStatusAreaItem        LoadAppletStatusAreaItem;
-typedef struct _LoadAppletStatusAreaItemClass   LoadAppletStatusAreaItemClass;
-typedef struct _LoadAppletStatusAreaItemPrivate LoadAppletStatusAreaItemPrivate;
-
-struct _LoadAppletStatusAreaItem {
-       HDStatusPluginItem parent;
-
-       LoadAppletStatusAreaItemPrivate *priv;
-};
-
-struct _LoadAppletStatusAreaItemClass {
-       HDStatusPluginItemClass parent;
-};
-
-GType load_applet_status_area_item_get_type (void);
-
-G_END_DECLS
-
-#endif