r1947 - in trunk/user/pixil

[dslinux_amadeus at dslinux.in-berlin.de]

Author: amadeus
Date: 2007-09-29 10:11:03 +0200 (Sat, 29 Sep 2007)
New Revision: 1947

Log:
Enable Battery and Backlight applets

Modified: trunk/user/pixil/scripts/platforms/dslinux/defaults.xml.in
===================================================================
--- trunk/user/pixil/scripts/platforms/dslinux/defaults.xml.in	2007-09-29 06:22:11 UTC (rev 1946)
+++ trunk/user/pixil/scripts/platforms/dslinux/defaults.xml.in	2007-09-29 08:11:03 UTC (rev 1947)
@@ -195,6 +195,8 @@
 
 <applets>
 <applet name="date">date</applet>
+<applet name="backlight">backlight</applet>
+<applet name="battery">battery</applet>
 </applets>
 
 <colors>

Modified: trunk/user/pixil/sys/pixilwm/Makefile
===================================================================
--- trunk/user/pixil/sys/pixilwm/Makefile	2007-09-29 06:22:11 UTC (rev 1946)
+++ trunk/user/pixil/sys/pixilwm/Makefile	2007-09-29 08:11:03 UTC (rev 1947)
@@ -44,8 +44,8 @@
 
 ifeq ($(LIBTYPE),.o)
 OBJS-y += applets/date$(LIBTYPE)
-# xAMADEUS OBJS-$(CONFIG_PIXILWM_PM) += applets/backlight$(LIBTYPE)
-# xAMADEUS OBJS-$(CONFIG_PIXILWM_PM) += applets/battery$(LIBTYPE)
+OBJS-$(CONFIG_PIXILWM_PM) += applets/backlight$(LIBTYPE)
+OBJS-$(CONFIG_PIXILWM_PM) += applets/battery$(LIBTYPE)
 endif
 
 OBJS := $(OBJS-y)

Modified: trunk/user/pixil/sys/pixilwm/applets/backlight.c
===================================================================
--- trunk/user/pixil/sys/pixilwm/applets/backlight.c	2007-09-29 06:22:11 UTC (rev 1946)
+++ trunk/user/pixil/sys/pixilwm/applets/backlight.c	2007-09-29 08:11:03 UTC (rev 1947)
@@ -53,6 +53,11 @@
 #define BLOFFICON "bloff.gif"
 #define BLONICON  "blon.gif"
 
+#ifdef STATIC_LINK
+#define applet_init backlight_applet_init
+#define applet_close backlight_applet_close
+#endif
+
 static GR_IMAGE_ID idON, idOFF;
 static GR_WINDOW_ID wid;
 static int g_w = 0, g_h = 0;

Modified: trunk/user/pixil/sys/pixilwm/applets/battery.c
===================================================================
--- trunk/user/pixil/sys/pixilwm/applets/battery.c	2007-09-29 06:22:11 UTC (rev 1946)
+++ trunk/user/pixil/sys/pixilwm/applets/battery.c	2007-09-29 08:11:03 UTC (rev 1947)
@@ -52,6 +52,11 @@
 #include "nanowm.h"
 #include "applets.h"
 
+#ifdef STATIC_LINK
+#define applet_init battery_applet_init
+#define applet_close battery_applet_close
+#endif
+
 static GR_WINDOW_ID wid;
 static int g_w = 0, g_h = 0;
 static int applet_id;

Modified: trunk/user/pixil/sys/pixilwm/applets.c
===================================================================
--- trunk/user/pixil/sys/pixilwm/applets.c	2007-09-29 06:22:11 UTC (rev 1946)
+++ trunk/user/pixil/sys/pixilwm/applets.c	2007-09-29 08:11:03 UTC (rev 1947)
@@ -49,6 +49,10 @@
 #ifdef STATIC_LINK
 extern int date_applet_init(int id, int *x, int y, int h);
 extern int date_applet_close(void);
+extern int backlight_applet_init(int id, int *x, int y, int h);
+extern int backlight_applet_close(void);
+extern int battery_applet_init(int id, int *x, int y, int h);
+extern int battery_applet_close(void);
 #define dlclose(x) 0
 #endif
 
@@ -265,6 +269,14 @@
 	applet->init = date_applet_init;
 	applet->close = date_applet_close;
   }
+  if (strcmp(filename, "backlight") == 0) {
+	applet->init = backlight_applet_init;
+	applet->close = backlight_applet_close;
+  }
+  if (strcmp(filename, "battery") == 0) {
+	applet->init = battery_applet_init;
+	applet->close = battery_applet_close;
+  }
 #else
   applet->init = (int (*)(int, int *, int, int)) 
     dlsym(applet->handle, "applet_init");