DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Linux support (through /proc/apm, not tested much)

Browse Source
This commit is contained in:
Pierre Pronchery 2010-01-28 16:55:09 +00:00
parent 8f911dec8c
commit 6e8a6cfd66
1 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/applets/battery.c
View File

@ -20,13 +20,17 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#ifdef __NetBSD__ #if defined(__NetBSD__)
# include <sys/types.h> # include <sys/types.h>
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <sys/envsys.h> # include <sys/envsys.h>
# include <fcntl.h> # include <fcntl.h>
# include <unistd.h> # include <unistd.h>
# include <paths.h> # include <paths.h>
#elif defined(__linux__)
# include <fcntl.h>
# include <unistd.h>
# include <stdio.h>
#endif #endif
#include <System.h> #include <System.h>
#include "Panel.h" #include "Panel.h"
@ -42,7 +46,7 @@ typedef struct _Battery
GtkWidget * image; GtkWidget * image;
GtkWidget * scale; GtkWidget * scale;
guint timeout; guint timeout;
#ifdef __NetBSD__ #if defined(__NetBSD__) || defined(__linux__)
int fd; int fd;
#endif #endif
} Battery; } Battery;
@ -86,7 +90,7 @@ static GtkWidget * _battery_init(PanelApplet * applet)
applet->priv = battery; applet->priv = battery;
battery->helper = applet->helper; battery->helper = applet->helper;
battery->timeout = 0; battery->timeout = 0;
#ifdef __NetBSD__ #if defined(__NetBSD__) || defined(__linux__)
battery->fd = -1; battery->fd = -1;
#endif #endif
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
@ -114,7 +118,7 @@ static void _battery_destroy(PanelApplet * applet)
if(battery->timeout > 0) if(battery->timeout > 0)
g_source_remove(battery->timeout); g_source_remove(battery->timeout);
#ifdef __NetBSD__ #if defined(__NetBSD__) || defined(__linux__)
if(battery->fd != -1) if(battery->fd != -1)
close(battery->fd); close(battery->fd);
#endif #endif
@ -154,7 +158,7 @@ static void _battery_set(Battery * battery, gdouble value)
/* callbacks */ /* callbacks */
/* on_timeout */ /* on_timeout */
#ifdef __NetBSD__ #if defined(__NetBSD__)
static int _get_tre(int fd, int sensor, envsys_tre_data_t * tre); static int _get_tre(int fd, int sensor, envsys_tre_data_t * tre);
static gdouble _battery_get(Battery * battery) static gdouble _battery_get(Battery * battery)
@ -233,6 +237,42 @@ static int _get_tre(int fd, int sensor, envsys_tre_data_t * tre)
return 1; return 1;
return !(tre->validflags & ENVSYS_FVALID); return !(tre->validflags & ENVSYS_FVALID);
} }
#elif defined(__linux__)
static gdouble _battery_get(Battery * battery)
{
const char apm[] = "/proc/apm";
char buf[80];
ssize_t buf_cnt;
double d;
unsigned int u;
int i;
int b;
if(battery->fd == -1 && (battery->fd = open(apm, O_RDONLY)) == -1)
{
error_set("%s: %s", apm, strerror(errno));
return 0.0 / 0.0;
}
errno = ENODATA;
if(lseek(battery->fd, 0, SEEK_SET) != 0
|| (buf_cnt = read(battery->fd, buf, sizeof(buf))) <= 0)
{
error_set("%s: %s", apm, strerror(errno));
close(battery->fd);
battery->fd = -1;
return 0.0 / 0.0;
}
buf[--buf_cnt] = '\0';
if(sscanf(buf, "%lf %lf %x %x %x %x %d%% %d min", &d, &d, &u, &u, &u,
&u, &b, &i) != 8)
{
error_set("%s: %s", apm, strerror(errno));
close(battery->fd);
battery->fd = -1;
}
d = b;
return d;
}
#else #else
static gdouble _battery_get(Battery * battery) static gdouble _battery_get(Battery * battery)
{ {