static Eldbus_Object *_obj = NULL;
static Eldbus_Proxy *_proxy = NULL;
+static Eldbus_Object *_disp_obj = NULL;
+static Eldbus_Proxy *_disp_proxy = NULL;
+
+typedef enum {
+ VERSION_ON_LOW_BATTERY,
+ VERSION_WARNING_LEVEL
+}Ecore_System_Upower_Version;
+static Ecore_System_Upower_Version _version = 0;
+
#ifdef CRI
#undef CRI
#endif
#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
static Eina_Bool _ecore_on_battery = EINA_FALSE;
-static unsigned int _ecore_low_battery = 0;
+static Eina_Bool _ecore_low_battery = EINA_FALSE;
+static int _ecore_battery_level = -1;
-static int uversions[3] = {0}; //major, minor, micro
+static Eina_Bool _ecore_system_upower_display_device_init(void);
static void _ecore_system_upower_shutdown(void);
static void
_battery_eval(void)
{
- if (uversions[0] >= 1) return;
- if (uversions[1] >= 99)
- ecore_power_state_set(_ecore_low_battery);
- else
- {
- if (_ecore_low_battery)
- ecore_power_state_set(ECORE_POWER_STATE_LOW);
- else if (_ecore_on_battery)
- ecore_power_state_set(ECORE_POWER_STATE_BATTERY);
- else
- ecore_power_state_set(ECORE_POWER_STATE_MAINS);
+ Ecore_Power_State power_state = ECORE_POWER_STATE_MAINS;
+
+ if (_ecore_low_battery)
+ {
+ power_state = ECORE_POWER_STATE_LOW;
+ }
+ else if (_ecore_on_battery)
+ {
+ power_state = ECORE_POWER_STATE_BATTERY;
+
+ /* FIXME: get level value from libupower? */
+ if (_ecore_battery_level >= 3)
+ {
+ power_state = ECORE_POWER_STATE_LOW;
+ }
+ }
+
+ ecore_power_state_set(power_state);
+}
+
+static void
+_warning_level_from_variant(Eldbus_Message_Iter *variant)
+{
+ unsigned int val;
+
+ if (!eldbus_message_iter_get_and_next(variant, 'u', &val))
+ {
+ ERR("Error getting WarningLevel.");
+ return;
+ }
+
+ _ecore_battery_level = val;
+ _battery_eval();
+}
+
+static void
+_warning_level_get_cb(void *data EINA_UNUSED,
+ const Eldbus_Message *msg,
+ Eldbus_Pending *pending EINA_UNUSED)
+{
+ Eldbus_Message_Iter *variant;
+ const char *errname, *errmsg;
+
+ if (eldbus_message_error_get(msg, &errname, &errmsg))
+ {
+ ERR("Message error %s - %s", errname, errmsg);
+ return;
+ }
+ if (!eldbus_message_arguments_get(msg, "v", &variant))
+ {
+ ERR("Error getting arguments.");
+ return;
}
+
+ _warning_level_from_variant(variant);
+}
+
+static void
+_warning_level_get(Eldbus_Proxy *proxy)
+{
+ eldbus_proxy_property_get(proxy, "WarningLevel",
+ _warning_level_get_cb, NULL);
}
static void
}
static void
-_on_low_battery_from_uint(unsigned int level)
-{
- DBG("OnLowBattery=%hhu", level);
- _ecore_low_battery = level;
- _battery_eval();
-}
-
-static void
_on_low_battery_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
Eldbus_Pending *pending EINA_UNUSED)
{
+ Eldbus_Message_Iter *variant;
const char *errname, *errmsg;
if (eldbus_message_error_get(msg, &errname, &errmsg))
ERR("Message error %s - %s", errname, errmsg);
return;
}
-
- if (uversions[0] >= 1)
+ if (!eldbus_message_arguments_get(msg, "v", &variant))
{
- ERR("Unsupported new UPower version!");
+ ERR("Error getting arguments.");
return;
}
- if (uversions[1] >= 99)
- {
- unsigned int level;
-
- if (!eldbus_message_arguments_get(msg, "u", &level))
- {
- ERR("Error getting arguments.");
- return;
- }
- _on_low_battery_from_uint(level);
- }
- else
- {
- Eldbus_Message_Iter *variant;
- if (!eldbus_message_arguments_get(msg, "v", &variant))
- {
- ERR("Error getting arguments.");
- return;
- }
- _on_low_battery_from_variant(variant);
- }
+ _on_low_battery_from_variant(variant);
}
static void
_on_low_battery_get(Eldbus_Proxy *proxy)
{
- /* version specific battery properties */
- if (uversions[0] < 1)
- {
- if (uversions[1] >= 99)
- {/* FIXME: this module needs a huge refactoring since WarningLevel property is per-device */}
- else
- eldbus_proxy_property_get(proxy, "OnLowBattery", _on_low_battery_get_cb, NULL);
- }
- else
- CRI("SOMEBODY SHOULD BE MAINTAINING THIS MODULE!!!!!!!");
+ eldbus_proxy_property_get(proxy, "OnLowBattery",
+ _on_low_battery_get_cb, NULL);
}
static void
}
static void
-_props_changed(void *data, const Eldbus_Message *msg)
+_battery_state_get()
{
- Eldbus_Proxy *proxy = data;
- Eldbus_Message_Iter *changed, *entry, *invalidated;
- const char *iface, *prop;
+ switch (_version)
+ {
+ case VERSION_ON_LOW_BATTERY:
+ _on_low_battery_get(_proxy);
+ break;
+ case VERSION_WARNING_LEVEL:
+ if (_ecore_system_upower_display_device_init())
+ _warning_level_get(_disp_proxy);
+ break;
+ default:
+ break;
+ }
+}
- if (!eldbus_message_arguments_get(msg, "sa{sv}as",
- &iface, &changed, &invalidated))
+static void
+_daemon_version_from_variant(Eldbus_Message_Iter *variant)
+{
+ const char *val;
+ char **version;
+ int standard[3] = {0, 99, 0}; // upower >= 0.99.0 provides WarningLevel instead of OnLowBattery
+ int i;
+
+ if (!eldbus_message_iter_get_and_next(variant, 's', &val))
{
- ERR("Error getting data from properties changed signal.");
+ ERR("Error getting DaemonVersion.");
return;
}
+ version = eina_str_split(val, ".", 3);
- while (eldbus_message_iter_get_and_next(changed, 'e', &entry))
+ for (i = 0; i < 3; i ++)
{
- const void *key;
- Eldbus_Message_Iter *var;
- if (!eldbus_message_iter_arguments_get(entry, "sv", &key, &var))
- continue;
- if (strcmp(key, "OnBattery") == 0)
- _on_battery_from_variant(var);
- if (uversions[0] >= 1)
+ if (atoi(version[i]) > standard[i])
{
- ERR("Unsupported new UPower version!");
- return;
+ _version = VERSION_WARNING_LEVEL;
+ break;
}
- if (uversions[1] >= 99)
+ else if (atoi(version[i]) < standard[i])
{
- /* FIXME: this will never be hit since it's on the wrong proxy */
-#if 0
- if (strcmp(key, "WarningLevel") == 0)
- {
- unsigned int level;
-
- if (!eldbus_message_iter_get_and_next(var, 'u', &level))
- ERR("Error getting OnBattery.");
- else
- _on_low_battery_from_uint(level);
- }
-#endif
+ _version = VERSION_ON_LOW_BATTERY;
+ break;
}
- else
+ else if (i == 2)
{
- if (strcmp(key, "OnLowBattery") == 0)
- _on_low_battery_from_variant(var);
+ _version = VERSION_WARNING_LEVEL;
+ break;
}
}
- while (eldbus_message_iter_get_and_next(invalidated, 's', &prop))
- {
- if (strcmp(prop, "OnBattery") == 0)
- _on_battery_get(proxy);
- if (strcmp(prop, "OnLowBattery") == 0)
- _on_low_battery_get(proxy);
- }
+ _battery_state_get();
}
static void
-_version_get(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
+_daemon_version_get_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
+ Eldbus_Pending *pending EINA_UNUSED)
{
- const char *errname, *errmsg, *v;
- char vers[128], *e;
- unsigned int i;
Eldbus_Message_Iter *variant;
+ const char *errname, *errmsg;
- /* FIXME: if either of these fail...do something? */
if (eldbus_message_error_get(msg, &errname, &errmsg))
{
ERR("Message error %s - %s", errname, errmsg);
return;
}
- if ((!eldbus_message_arguments_get(msg, "v", &variant)) ||
- (!eldbus_message_iter_get_and_next(variant, 's', &v)))
+ if (!eldbus_message_arguments_get(msg, "v", &variant))
{
- ERR("Error getting version.");
+ ERR("Error getting arguments.");
return;
}
- e = strncpy(vers, v, sizeof(vers) - 1);
- for (i = 0; e[0] && (i < 3); i++, e++)
+
+ _daemon_version_from_variant(variant);
+}
+
+static void
+_daemon_version_get(Eldbus_Proxy *proxy)
+{
+ eldbus_proxy_property_get(proxy, "DaemonVersion",
+ _daemon_version_get_cb, NULL);
+}
+
+static void
+_props_changed(void *data, const Eldbus_Message *msg)
+{
+ Eldbus_Proxy *proxy = data;
+ Eldbus_Message_Iter *changed, *entry, *invalidated;
+ const char *iface, *prop;
+
+ if (!eldbus_message_arguments_get(msg, "sa{sv}as",
+ &iface, &changed, &invalidated))
{
- errno = 0;
- uversions[i] = strtol(e, &e, 10);
- if (errno) break;
+ ERR("Error getting data from properties changed signal.");
+ return;
}
- if ((uversions[0] >= 1) || (uversions[1] >= 99))
+
+ while (eldbus_message_iter_get_and_next(changed, 'e', &entry))
{
- /* may as well kill the module since it'll do more harm than good */
- ERR("Unsupported new UPower version!");
- _ecore_system_upower_shutdown();
- return;
+ const void *key;
+ Eldbus_Message_Iter *var;
+ if (!eldbus_message_iter_arguments_get(entry, "sv", &key, &var))
+ continue;
+ if (strcmp(key, "OnBattery") == 0)
+ _on_battery_from_variant(var);
+ if (strcmp(key, "OnLowBattery") == 0)
+ _on_low_battery_from_variant(var);
+ if (strcmp(key, "WarningLevel") == 0)
+ _warning_level_from_variant(var);
+ }
+
+ while (eldbus_message_iter_get_and_next(invalidated, 's', &prop))
+ {
+ if (strcmp(prop, "OnBattery") == 0)
+ _on_battery_get(proxy);
+ if (strcmp(prop, "OnLowBattery") == 0)
+ _on_low_battery_get(proxy);
+ if (strcmp(prop, "WarningLevel") == 0)
+ _warning_level_get(proxy);
}
- _on_low_battery_get(data);
}
static void _upower_name_owner_cb(void *data,
old_id, new_id);
if ((new_id) && (new_id[0]))
- eldbus_proxy_property_get(proxy, "DaemonVersion", _version_get, proxy);
+ {
+ _daemon_version_get(proxy);
+ }
}
-static void _ecore_system_upower_shutdown(void);
+static Eina_Bool
+_ecore_system_upower_display_device_init(void)
+{
+ Eldbus_Signal_Handler *s;
+
+ _disp_obj =
+ eldbus_object_get(_conn, "org.freedesktop.UPower",
+ "/org/freedesktop/UPower/devices/DisplayDevice");
+ if (!_disp_obj)
+ {
+ ERR("could not get object name=org.freedesktop.UPower, "
+ "path=/org/freedesktop/UPower/devices/DisplayDevice");
+ goto disp_error;
+ }
+
+ _disp_proxy = eldbus_proxy_get(_disp_obj, "org.freedesktop.UPower");
+ if (!_disp_proxy)
+ {
+ ERR("could not get proxy interface=org.freedesktop.UPower, "
+ "name=org.freedesktop.UPower, "
+ "path=/org/freedesktop/UPower/devices/DisplayDevice");
+ goto disp_error;
+ }
+
+ s = eldbus_proxy_properties_changed_callback_add(_disp_proxy,
+ _props_changed,
+ _disp_proxy);
+ if (!s)
+ {
+ ERR("could not add signal handler for properties changed for proxy "
+ "interface=org.freedesktop.UPower, "
+ "name=org.freedesktop.UPower, "
+ "path=/org/freedesktop/UPower/devices/DisplayDevice");
+ goto disp_error;
+ }
+
+ return EINA_TRUE;
+
+disp_error:
+ _ecore_system_upower_shutdown();
+ return EINA_FALSE;
+}
static Eina_Bool
_ecore_system_upower_init(void)
eldbus_name_owner_changed_callback_del(_conn, "org.freedesktop.UPower",
_upower_name_owner_cb,
NULL);
+ if (_disp_proxy)
+ {
+ eldbus_proxy_unref(_disp_proxy);
+ _disp_proxy = NULL;
+ }
+
+ if (_disp_obj)
+ {
+ eldbus_object_unref(_disp_obj);
+ _disp_obj = NULL;
+ }
if (_proxy)
{
}
eldbus_shutdown();
- memset(&uversions, 0, sizeof(uversions));
}
EINA_MODULE_INIT(_ecore_system_upower_init);
projects / platform / upstream / efl.git / commitdiff