vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move action from Battery_Face to Battery (We only need to check the battery 

once, even if there are multiple faces).

Clean up battery check.


SVN revision: 13259
This commit is contained in:
sebastid 2005-02-09 12:14:08 +00:00 committed by sebastid
parent 0bba6039f0
commit 1b891d8974
2 changed files with 385 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

612
src/modules/battery/e_mod_main.c
View File

File diff suppressed because it is too large Load Diff

64
src/modules/battery/e_mod_main.h
View File

@ -1,10 +1,16 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
typedef struct _Config Config;
typedef struct _Config_Face Config_Face;
typedef struct _Battery Battery;
typedef struct _Battery_Face Battery_Face;
typedef struct _Status Status;
#define CHECK_NONE 0
#define CHECK_LINUX_ACPI 1
#define CHECK_LINUX_APM 2
@ -13,18 +19,27 @@ struct _Config
{
double poll_time;
int alarm;
Evas_List *faces;
};
struct _Config_Face
{
unsigned char enabled;
};
struct _Battery
{
E_Menu *config_menu;
E_Menu *config_menu_alarm;
E_Menu *config_menu_poll;
Battery_Face *face;
E_Config_DD *conf_edd;
E_Menu *config_menu;
Evas_List *faces;
Config *conf;
int alarm_triggered;
int battery_check_mode;
Ecore_Timer *battery_check_timer;
int battery_prev_drain;
int battery_prev_ac;
int battery_prev_battery;
};
struct _Battery_Face
@ -32,19 +47,40 @@ struct _Battery_Face
Battery *bat;
E_Container *con;
Evas *evas;
Evas_Object *bat_object;
Evas_Object *event_object;
int battery_check_mode;
Ecore_Timer *battery_check_timer;
int battery_prev_drain;
int battery_prev_ac;
int battery_prev_battery;
E_Gadman_Client *gmc;
};
#define BATTERY_STATE_NONE 0
#define BATTERY_STATE_CHARGING 1
#define BATTERY_STATE_DISCHARGING 2
struct _Status
{
/* Low battery */
unsigned char alarm;
/* Is there a battery? */
unsigned char has_battery;
/* charging, discharging, none */
unsigned char state;
/* Battery level */
double level;
/* Text */
/* reading == % left */
char *reading;
/* time == time left to empty / full */
char *time;
/* Signals */
/* charge == (ac == on), (fade_clip == default) */
/* pulsestop == (pulse_clip == default) */
/* discharge == (ac == off), (fade_clip == default) */
/* pulse == (pulse_clip == faded), .... */
/* unknown == (fade_clip == faded) */
};
EAPI void *init (E_Module *m);
EAPI int shutdown (E_Module *m);
EAPI int save (E_Module *m);