aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile.am1
-rw-r--r--Makefile.in23
-rwxr-xr-xconfigure5
-rw-r--r--lcd4linux.c69
-rw-r--r--plugin.c10
-rw-r--r--plugin_apm.c196
-rw-r--r--plugin_dvb.c8
7 files changed, 270 insertions, 42 deletions
diff --git a/Makefile.am b/Makefile.am
index 88e9b18..2a572c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ plugin_meminfo.c \
plugin_netdev.c \
plugin_ppp.c \
plugin_dvb.c \
+plugin_apm.c \
plugin_i2c_sensors.c \
plugin_imon.c \
plugin_xmms.c \
diff --git a/Makefile.in b/Makefile.in
index 081f277..63cdaa4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,7 +106,7 @@ lcd4linux_LDADD = @DRIVERS@ @DRVLIBS@
#remove next line for liblcd4linux
lcd4linux_DEPENDENCIES = @DRIVERS@
-lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h debug.c debug.h drv.c drv.h evaluator.c evaluator.h hash.c hash.h layout.c layout.h lock.c lock.h pid.c pid.h timer.c timer.h udelay.c udelay.h qprintf.c qprintf.h widget.c widget.h widget_text.c widget_text.h widget_bar.c widget_bar.h widget_icon.c widget_icon.h plugin.c plugin.h plugin_math.c plugin_string.c plugin_cfg.c plugin_uname.c plugin_loadavg.c plugin_proc_stat.c plugin_cpuinfo.c plugin_meminfo.c plugin_netdev.c plugin_ppp.c plugin_dvb.c plugin_i2c_sensors.c plugin_imon.c plugin_xmms.c plugin_mysql.c plugin_seti.c
+lcd4linux_SOURCES = lcd4linux.c cfg.c cfg.h debug.c debug.h drv.c drv.h evaluator.c evaluator.h hash.c hash.h layout.c layout.h lock.c lock.h pid.c pid.h timer.c timer.h udelay.c udelay.h qprintf.c qprintf.h widget.c widget.h widget_text.c widget_text.h widget_bar.c widget_bar.h widget_icon.c widget_icon.h plugin.c plugin.h plugin_math.c plugin_string.c plugin_cfg.c plugin_uname.c plugin_loadavg.c plugin_proc_stat.c plugin_cpuinfo.c plugin_meminfo.c plugin_netdev.c plugin_ppp.c plugin_dvb.c plugin_apm.c plugin_i2c_sensors.c plugin_imon.c plugin_xmms.c plugin_mysql.c plugin_seti.c
#liblcd4linux_la_DEPENDENCIES = @DRIVERS@
@@ -145,8 +145,9 @@ plugin_math.$(OBJEXT) plugin_string.$(OBJEXT) plugin_cfg.$(OBJEXT) \
plugin_uname.$(OBJEXT) plugin_loadavg.$(OBJEXT) \
plugin_proc_stat.$(OBJEXT) plugin_cpuinfo.$(OBJEXT) \
plugin_meminfo.$(OBJEXT) plugin_netdev.$(OBJEXT) plugin_ppp.$(OBJEXT) \
-plugin_dvb.$(OBJEXT) plugin_i2c_sensors.$(OBJEXT) plugin_imon.$(OBJEXT) \
-plugin_xmms.$(OBJEXT) plugin_mysql.$(OBJEXT) plugin_seti.$(OBJEXT)
+plugin_dvb.$(OBJEXT) plugin_apm.$(OBJEXT) plugin_i2c_sensors.$(OBJEXT) \
+plugin_imon.$(OBJEXT) plugin_xmms.$(OBJEXT) plugin_mysql.$(OBJEXT) \
+plugin_seti.$(OBJEXT)
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -170,14 +171,14 @@ DEP_FILES = .deps/BeckmannEgle.P .deps/MilfordInstruments.P \
.deps/drv_generic_graphic.P .deps/drv_generic_parport.P \
.deps/drv_generic_serial.P .deps/drv_generic_text.P .deps/evaluator.P \
.deps/hash.P .deps/layout.P .deps/lcd4linux.P .deps/lock.P .deps/pid.P \
-.deps/plugin.P .deps/plugin_cfg.P .deps/plugin_cpuinfo.P \
-.deps/plugin_dvb.P .deps/plugin_i2c_sensors.P .deps/plugin_imon.P \
-.deps/plugin_loadavg.P .deps/plugin_math.P .deps/plugin_meminfo.P \
-.deps/plugin_mysql.P .deps/plugin_netdev.P .deps/plugin_ppp.P \
-.deps/plugin_proc_stat.P .deps/plugin_seti.P .deps/plugin_string.P \
-.deps/plugin_uname.P .deps/plugin_xmms.P .deps/qprintf.P .deps/timer.P \
-.deps/udelay.P .deps/widget.P .deps/widget_bar.P .deps/widget_icon.P \
-.deps/widget_text.P
+.deps/plugin.P .deps/plugin_apm.P .deps/plugin_cfg.P \
+.deps/plugin_cpuinfo.P .deps/plugin_dvb.P .deps/plugin_i2c_sensors.P \
+.deps/plugin_imon.P .deps/plugin_loadavg.P .deps/plugin_math.P \
+.deps/plugin_meminfo.P .deps/plugin_mysql.P .deps/plugin_netdev.P \
+.deps/plugin_ppp.P .deps/plugin_proc_stat.P .deps/plugin_seti.P \
+.deps/plugin_string.P .deps/plugin_uname.P .deps/plugin_xmms.P \
+.deps/qprintf.P .deps/timer.P .deps/udelay.P .deps/widget.P \
+.deps/widget_bar.P .deps/widget_icon.P .deps/widget_text.P
SOURCES = $(lcd4linux_SOURCES) $(EXTRA_lcd4linux_SOURCES)
OBJECTS = $(lcd4linux_OBJECTS)
diff --git a/configure b/configure
index 2e3a6a4..c7e0d65 100755
--- a/configure
+++ b/configure
@@ -21092,9 +21092,8 @@ fi
if test "$X11" = "yes"; then
if test "$no_x" = "yes"; then
- { { echo "$as_me:$LINENO: error: X11 headers or libraries not available: X11 driver disabled" >&5
-echo "$as_me: error: X11 headers or libraries not available: X11 driver disabled" >&2;}
- { (exit 1); exit 1; }; }
+ { echo "$as_me:$LINENO: WARNING: X11 headers or libraries not available: X11 driver disabled" >&5
+echo "$as_me: WARNING: X11 headers or libraries not available: X11 driver disabled" >&2;}
else
GRAPHIC="yes"
# DRIVERS="$DRIVERS drv_X11.lo"
diff --git a/lcd4linux.c b/lcd4linux.c
index cd48c99..7e44a69 100644
--- a/lcd4linux.c
+++ b/lcd4linux.c
@@ -1,4 +1,4 @@
-/* $Id: lcd4linux.c,v 1.68 2004/03/11 06:39:59 reinelt Exp $
+/* $Id: lcd4linux.c,v 1.69 2004/03/14 07:11:42 reinelt Exp $
*
* LCD4Linux
*
@@ -22,6 +22,10 @@
*
*
* $Log: lcd4linux.c,v $
+ * Revision 1.69 2004/03/14 07:11:42 reinelt
+ * parameter count fixed for plugin_dvb()
+ * plugin_APM (battery status) ported
+ *
* Revision 1.68 2004/03/11 06:39:59 reinelt
* big patch from Martin:
* - reuse filehandles
@@ -410,6 +414,34 @@ int hello (void)
}
#endif
+
+static void interactive_mode (void)
+{
+ char line[1024];
+ void *tree;
+ RESULT result = {0, 0, 0, NULL};
+
+ printf("\neval> ");
+ for(fgets(line, 1024, stdin); !feof(stdin); fgets(line, 1024, stdin)) {
+ if (line[strlen(line)-1]=='\n') line[strlen(line)-1]='\0';
+ if (strlen(line)>0) {
+ if (Compile(line, &tree)!=-1) {
+ Eval (tree, &result);
+ if (result.type==R_NUMBER) {
+ printf ("%g\n", R2N(&result));
+ } else if (result.type==R_STRING) {
+ printf ("'%s'\n", R2S(&result));
+ }
+ DelResult (&result);
+ }
+ DelTree(tree);
+ }
+ printf("eval> ");
+ }
+ printf ("\n");
+}
+
+
void handler (int signal)
{
debug ("got signal %d", signal);
@@ -563,6 +595,14 @@ int main (int argc, char *argv[])
running_background=1;
}
+ // go into interactive mode before display initialization
+ if (interactive >= 2) {
+ interactive_mode();
+ pid_exit(PIDFILE);
+ cfg_exit();
+ exit (0);
+ }
+
debug ("initializing driver %s", driver);
if (drv_init(section, driver)==-1) {
pid_exit(PIDFILE);
@@ -580,30 +620,9 @@ int main (int argc, char *argv[])
layout_init(layout);
free(layout);
- // maybe go into interactive mode
- if (interactive) {
- char line[1024];
- void *tree;
- RESULT result = {0, 0, 0, NULL};
-
- printf("\neval> ");
- for(fgets(line, 1024, stdin); !feof(stdin); fgets(line, 1024, stdin)) {
- if (line[strlen(line)-1]=='\n') line[strlen(line)-1]='\0';
- if (strlen(line)>0) {
- if (Compile(line, &tree)!=-1) {
- Eval (tree, &result);
- if (result.type==R_NUMBER) {
- printf ("%g\n", R2N(&result));
- } else if (result.type==R_STRING) {
- printf ("'%s'\n", R2S(&result));
- }
- DelResult (&result);
- }
- DelTree(tree);
- }
- printf("eval> ");
- }
- printf ("\n");
+ // go into interactive mode (display has been initialized)
+ if (interactive >= 1) {
+ interactive_mode();
drv_quit();
pid_exit(PIDFILE);
cfg_exit();
diff --git a/plugin.c b/plugin.c
index 6e49966..784eb64 100644
--- a/plugin.c
+++ b/plugin.c
@@ -1,4 +1,4 @@
-/* $Id: plugin.c,v 1.22 2004/03/13 06:49:20 reinelt Exp $
+/* $Id: plugin.c,v 1.23 2004/03/14 07:11:42 reinelt Exp $
*
* plugin handler for the Evaluator
*
@@ -22,6 +22,10 @@
*
*
* $Log: plugin.c,v $
+ * Revision 1.23 2004/03/14 07:11:42 reinelt
+ * parameter count fixed for plugin_dvb()
+ * plugin_APM (battery status) ported
+ *
* Revision 1.22 2004/03/13 06:49:20 reinelt
* seti@home plugin ported to NextGeneration
*
@@ -159,6 +163,7 @@ int plugin_init_meminfo (void);
int plugin_init_netdev (void);
int plugin_init_ppp (void);
int plugin_init_dvb (void);
+int plugin_init_apm (void);
int plugin_init_i2c_sensors (void);
int plugin_init_xmms (void);
int plugin_init_imon(void);
@@ -177,6 +182,7 @@ void plugin_exit_meminfo (void);
void plugin_exit_netdev (void);
void plugin_exit_ppp (void);
void plugin_exit_dvb (void);
+void plugin_exit_apm (void);
void plugin_exit_i2c_sensors (void);
void plugin_exit_xmms (void);
void plugin_exit_imon(void);
@@ -196,6 +202,7 @@ int plugin_init (void)
plugin_init_netdev();
plugin_init_ppp();
plugin_init_dvb();
+ plugin_init_apm();
plugin_init_i2c_sensors();
plugin_init_xmms();
plugin_init_imon();
@@ -217,6 +224,7 @@ void plugin_exit(void) {
plugin_exit_netdev();
plugin_exit_ppp();
plugin_exit_dvb();
+ plugin_exit_apm();
plugin_exit_i2c_sensors();
plugin_exit_xmms();
plugin_exit_imon();
diff --git a/plugin_apm.c b/plugin_apm.c
new file mode 100644
index 0000000..6c58009
--- /dev/null
+++ b/plugin_apm.c
@@ -0,0 +1,196 @@
+/* $Id: plugin_apm.c,v 1.1 2004/03/14 07:11:42 reinelt Exp $
+ *
+ * plugin for APM (battery status)
+ *
+ * Copyright 2003 Michael Reinelt <reinelt@eunet.at>
+ * Copyright 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
+ *
+ * based on the old 'battery.c' which is
+ * Copyright 2001 Leopold Tötsch <lt@toetsch.at>
+ *
+ * This file is part of LCD4Linux.
+ *
+ * LCD4Linux 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, or (at your option)
+ * any later version.
+ *
+ * LCD4Linux 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ * $Log: plugin_apm.c,v $
+ * Revision 1.1 2004/03/14 07:11:42 reinelt
+ * parameter count fixed for plugin_dvb()
+ * plugin_APM (battery status) ported
+ *
+ */
+
+/*
+ * exported functions:
+ *
+ * int plugin_init_apm (void)
+ * adds apm() function
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <asm/types.h>
+
+#include "debug.h"
+#include "plugin.h"
+#include "hash.h"
+
+static int fd = -2;
+static HASH APM = { 0, };
+
+/* from /usr/src/linux/arch/i386/kernel/apm.c:
+ *
+ * Arguments, with symbols from linux/apm_bios.h. Information is
+ * from the Get Power Status (0x0a) call unless otherwise noted.
+ *
+ * 0) Linux driver version (this will change if format changes)
+ * 1) APM BIOS Version. Usually 1.0, 1.1 or 1.2.
+ * 2) APM flags from APM Installation Check (0x00):
+ * bit 0: APM_16_BIT_SUPPORT
+ * bit 1: APM_32_BIT_SUPPORT
+ * bit 2: APM_IDLE_SLOWS_CLOCK
+ * bit 3: APM_BIOS_DISABLED
+ * bit 4: APM_BIOS_DISENGAGED
+ * 3) AC line status
+ * 0x00: Off-line
+ * 0x01: On-line
+ * 0x02: On backup power (BIOS >= 1.1 only)
+ * 0xff: Unknown
+ * 4) Battery status
+ * 0x00: High
+ * 0x01: Low
+ * 0x02: Critical
+ * 0x03: Charging
+ * 0x04: Selected battery not present (BIOS >= 1.2 only)
+ * 0xff: Unknown
+ * 5) Battery flag
+ * bit 0: High
+ * bit 1: Low
+ * bit 2: Critical
+ * bit 3: Charging
+ * bit 7: No system battery
+ * 0xff: Unknown
+ * 6) Remaining battery life (percentage of charge):
+ * 0-100: valid
+ * -1: Unknown
+ * 7) Remaining battery life (time units):
+ * Number of remaining minutes or seconds
+ * -1: Unknown
+ * 8) min = minutes; sec = seconds
+ *
+ * p+= sprintf(p, "%s %d.%d 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n",
+ * driver_version,
+ * (apm_info.bios.version >> 8) & 0xff,
+ * apm_info.bios.version & 0xff,
+ * apm_info.bios.flags,
+ * ac_line_status,
+ * battery_status,
+ * battery_flag,
+ * percentage,
+ * time_units,
+ * units);
+ */
+
+
+static int parse_proc_apm (void)
+{
+ char *key[] = { "driver_version",
+ "bios_version",
+ "bios_flags",
+ "line_status",
+ "battery_status",
+ "battery_flag",
+ "battery_percent",
+ "battery_remaining",
+ "time_units" };
+
+ char buffer[128], *beg, *end;
+ int age, i;
+
+ // reread every 10 msec only
+ age = hash_age (&APM, NULL, NULL);
+ if (age > 0 && age <= 10) return 0;
+
+ if (fd == -2) {
+ fd = open("/proc/apm", O_RDONLY | O_NDELAY);
+ if (fd == -1) {
+ error ("open(/proc/apm) failed: %s", strerror(errno));
+ return -1;
+ }
+ }
+
+ if (lseek(fd, 0L, SEEK_SET) != 0) {
+ error ("lseek(/proc/apm) failed: %s", strerror(errno));
+ fd = -1;
+ return -1;
+ }
+
+ if (read (fd, &buffer, sizeof(buffer)-1) == -1) {
+ error ("read(/proc/apm) failed: %s", strerror(errno));
+ fd=-1;
+ return -1;
+ }
+
+ beg = buffer;
+ for (i = 0; i < 9 && beg != NULL; i++) {
+ while (*beg == ' ') beg++;
+ if ((end = strpbrk(beg, " \n"))) *end='\0';
+ hash_set (&APM, key[i], beg);
+ beg = end ? end+1 : NULL;
+ }
+
+
+ return 0;
+}
+
+
+static void my_apm (RESULT *result, RESULT *arg1)
+{
+ char *val;
+
+ if (parse_proc_apm()<0) {
+ SetResult(&result, R_STRING, "");
+ return;
+ }
+
+ val=hash_get(&APM, R2S(arg1));
+ if (val==NULL) val="";
+
+ SetResult(&result, R_STRING, val);
+}
+
+int plugin_init_apm (void)
+{
+ AddFunction ("apm", 1, my_apm);
+ return 0;
+}
+
+void plugin_exit_apm (void)
+{
+ if (fd > -1) {
+ close (fd);
+ }
+ fd = -2;
+ hash_destroy(&APM);
+}
diff --git a/plugin_dvb.c b/plugin_dvb.c
index 31780b8..9bfa5f3 100644
--- a/plugin_dvb.c
+++ b/plugin_dvb.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_dvb.c,v 1.3 2004/03/03 03:47:04 reinelt Exp $
+/* $Id: plugin_dvb.c,v 1.4 2004/03/14 07:11:42 reinelt Exp $
*
* plugin for DVB status
*
@@ -23,6 +23,10 @@
*
*
* $Log: plugin_dvb.c,v $
+ * Revision 1.4 2004/03/14 07:11:42 reinelt
+ * parameter count fixed for plugin_dvb()
+ * plugin_APM (battery status) ported
+ *
* Revision 1.3 2004/03/03 03:47:04 reinelt
* big patch from Martin Hejl:
* - use qprintf() where appropriate
@@ -150,7 +154,7 @@ static void my_dvb (RESULT *result, RESULT *arg1)
int plugin_init_dvb (void)
{
- AddFunction ("dvb", 3, my_dvb);
+ AddFunction ("dvb", 1, my_dvb);
return 0;
}