wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 700262 - Add remainingTime support to upower backend. r=cjones

Browse Source
This commit is contained in:
Mounir Lamouri 2011-11-09 10:00:01 +01:00
parent d36933c757
commit a9f20cde94
1 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hal/linux/UPowerClient.cpp
View File

@ -82,6 +82,7 @@ public:
double GetLevel();
bool IsCharging();
double GetRemainingTime();
~UPowerClient();
@ -140,10 +141,12 @@ private:
double mLevel;
bool mCharging;
double mRemainingTime;
static UPowerClient* sInstance;
static const guint sDeviceTypeBattery = 2;
static const guint64 kUPowerUnknownRemainingTime = 0;
};
/*
@ -171,7 +174,7 @@ GetCurrentBatteryInformation(hal::BatteryInformation* aBatteryInfo)
aBatteryInfo->level() = upowerClient->GetLevel();
aBatteryInfo->charging() = upowerClient->IsCharging();
aBatteryInfo->remainingTime() = kUnknownRemainingTime;
aBatteryInfo->remainingTime() = upowerClient->GetRemainingTime();
}
/*
@ -196,6 +199,7 @@ UPowerClient::UPowerClient()
, mTrackedDevice(nsnull)
, mLevel(kDefaultLevel)
, mCharging(kDefaultCharging)
, mRemainingTime(kUnknownRemainingTime)
{
}
@ -275,6 +279,7 @@ UPowerClient::StopListening()
// We should now show the default values, not the latest we got.
mLevel = kDefaultLevel;
mCharging = kDefaultCharging;
mRemainingTime = kUnknownRemainingTime;
}
void
@ -335,7 +340,7 @@ UPowerClient::DeviceChanged(DBusGProxy* aProxy, const gchar* aObjectPath, UPower
hal::NotifyBatteryChange(hal::BatteryInformation(aListener->mLevel,
aListener->mCharging,
kUnknownRemainingTime));
aListener->mRemainingTime));
}
/* static */ DBusHandlerResult
@ -377,14 +382,34 @@ UPowerClient::GetDeviceProperties(const gchar* aDevice)
void
UPowerClient::UpdateSavedInfo(GHashTable* aHashTable)
{
bool isFull = false;
mLevel = g_value_get_double(static_cast<const GValue*>(g_hash_table_lookup(aHashTable, "Percentage")))*0.01;
/*
* State values are confusing...
* First of all, after looking at upower sources (0.9.13), it seems that
* PendingDischarge and PendingCharge are not used.
* In addition, FullyCharged and Empty states are not clear because we do not
* know if the battery is actually charging or not. Those values come directly
* from sysfs (in the Linux kernel) which have four states: "Empty", "Full",
* "Charging" and "Discharging". In sysfs, "Empty" and "Full" are also only
* related to the level, not to the charging state.
* In this code, we are going to assume that Full means charging and Empty
* means discharging because if that is not the case, the state should not
* last a long time (actually, it should disappear at the following update).
* It might be even very hard to see real cases where the state is Empty and
* the battery is charging or the state is Full and the battery is discharging
* given that plugging/unplugging the battery should have an impact on the
* level.
*/
switch (g_value_get_uint(static_cast<const GValue*>(g_hash_table_lookup(aHashTable, "State")))) {
case eState_Unknown:
mCharging = kDefaultCharging;
break;
case eState_Charging:
case eState_FullyCharged:
isFull = true;
case eState_Charging:
case eState_PendingCharge:
mCharging = true;
break;
@ -394,6 +419,17 @@ UPowerClient::UpdateSavedInfo(GHashTable* aHashTable)
mCharging = false;
break;
}
if (isFull) {
mRemainingTime = 0;
} else {
mRemainingTime = mCharging ? g_value_get_int64(static_cast<const GValue*>(g_hash_table_lookup(aHashTable, "TimeToFull")))
: g_value_get_int64(static_cast<const GValue*>(g_hash_table_lookup(aHashTable, "TimeToEmpty")));
if (mRemainingTime == kUPowerUnknownRemainingTime) {
mRemainingTime = kUnknownRemainingTime;
}
}
}
double
@ -408,5 +444,11 @@ UPowerClient::IsCharging()
return mCharging;
}
double
UPowerClient::GetRemainingTime()
{
return mRemainingTime;
}
} // namespace hal_impl
} // namespace mozilla