Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
[Web] minor updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@nokotan
nokotan committed Jul 10, 2023
1 parent 5513210 commit 2373269
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 258 deletions.
4 changes: 4 additions & 0 deletions Siv3D/include/Siv3D/detail/AsyncTask.ipp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ namespace s3d
template <class Type>
template <class Fty, class... Args, std::enable_if_t<std::is_invocable_v<Fty, Args...>>*>
inline AsyncTask<Type>::AsyncTask(Fty&& f, Args&&... args)
# if !SIV3D_PLATFORM(WEB) || defined(__EMSCRIPTEN_PTHREADS__)
: m_data{ std::async(std::launch::async, std::forward<Fty>(f), std::forward<Args>(args)...) } {}
# else
: m_data{} {}
# endif

template <class Type>
inline AsyncTask<Type>& AsyncTask<Type>::operator =(base_type&& other) noexcept
Expand Down
1 change: 1 addition & 0 deletions Siv3D/src/Siv3D-Platform/Web/Siv3D/Cursor/CCursor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ namespace s3d
}
else
{
LOG_ERROR(U"CreateCursor is not supported on Web platform.");
return false;
}
}
Expand Down
264 changes: 6 additions & 258 deletions Siv3D/src/Siv3D-Platform/Web/Siv3D/PowerStatus/SivPowerStatus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,269 +19,17 @@

namespace s3d
{
/*
// [Siv3D ToDo]
// ・時間がかかりすぎる（> 20ms）
// ・ACLineStatus が不正確
namespace detail
{
const char* NAME_UPower = "org.freedesktop.UPower";
const char* OBJECT_UPower = "/org/freedesktop/UPower";
const char* INTERFACE_UPower = "org.freedesktop.UPower";
const char* INTERFACE_UPower_Device = "org.freedesktop.UPower.Device";
bool get_property(GDBusProxy *_proxy, const gchar *_property_name, const gchar *_format, void *_dest)
{
GVariant *variant = g_dbus_proxy_get_cached_property(_proxy, _property_name);
if (variant != nullptr)
{
g_variant_get(variant, _format, _dest);
g_variant_unref(variant);
return true;
}
else
return false;
}
bool get_property_and_output_log(GDBusProxy *_proxy, const gchar *_property_name, const gchar *_format, void *_dest)
{
bool ret = get_property(_proxy, _property_name, _format, _dest);
if (ret == false)
{
//LOG_FAIL(U"❌ PowerStatus: Failed to get UPower device property ({})."_fmt(Unicode::Widen(_property_name)));
}
return ret;
}
void GetPowerStatus_Linux(PowerStatus& result)
{
std::vector<std::string> devicePaths;
GDBusProxy *proxy;
GDBusConnection *conn;
GError *error = nullptr;
char *s;
guint32 u;
guint64 x;
gboolean b;
gdouble d;
GVariant *variant;
GVariantIter *iter;
conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, &error);
if (conn == nullptr)
{
//LOG_FAIL(U"❌ PowerStatus: Failed to get d-bus connection.");
return;
}
proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE, nullptr,
NAME_UPower, OBJECT_UPower, INTERFACE_UPower, nullptr, &error);
if (proxy == nullptr)
{
//LOG_FAIL(U"❌ PowerStatus: Failed to get d-bus proxy.");
return;
}
variant = g_dbus_proxy_get_cached_property(proxy, "DaemonVersion");
if (variant == nullptr)
{
//LOG_FAIL(U"❌ PowerStatus: Failed to get UPower properties.");
return;
}
g_variant_get(variant, "s", &s);
g_variant_unref(variant);
//LOG_INFO(U"ℹ️ PowerStatus: UPower daemon version {}"_fmt(Unicode::Widen(s)));
variant = g_dbus_proxy_call_sync(proxy, "EnumerateDevices", nullptr,
G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error);
if (variant == nullptr)
{
//LOG_FAIL(U"❌ PowerStatus: Failed to enumerate power supply devices.");
return;
}
g_variant_get(variant, "(ao)", &iter);
while (g_variant_iter_loop(iter, "o", &s))
{
devicePaths.push_back(s);
}
g_variant_iter_free(iter);
g_variant_unref(variant);
g_object_unref(proxy);
result.battery = BatteryStatus::NoBattery;
for (const auto &dev : devicePaths)
{
proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE, nullptr,
NAME_UPower, dev.c_str(), INTERFACE_UPower_Device, nullptr, &error);
if (!get_property_and_output_log(proxy, "Type", "u", &u))
continue;
if (u == 1)
{
//line power
if (get_property_and_output_log(proxy, "Online", "b", &b))
{
result.ac = b ? ACLineStatus::Online : ACLineStatus::Offline;
}
}
else if (u == 2)
{
//battery
if (get_property_and_output_log(proxy, "Percentage", "d", &d))
{
result.batteryLifePercent = static_cast<int32>(d);
result.battery = d <= 5 ? BatteryStatus::Critical
: d <= 33 ? BatteryStatus::Low
: d <= 66 ? BatteryStatus::Middle
: BatteryStatus::High;
}
if (get_property_and_output_log(proxy, "State", "u", &u))
{
if (u == 1)
{
//charging
result.charging = true;
if (get_property_and_output_log(proxy, "TimeToFull", "x", &x))
{
if (x != 0)
result.batteryTimeToFullChargeSec = static_cast<int32>(x);
}
}
else if (u == 2)
{
//discharging
if (get_property_and_output_log(proxy, "TimeToEmpty", "x", &x))
{
if (x != 0)
result.batteryLifeTimeSec = static_cast<int32>(x);
}
}
}
}
}
g_object_unref(conn);
}
}
namespace System
{
PowerStatus GetPowerStatus()
{
PowerStatus status;
detail::GetPowerStatus_Linux(status);
return status;
}
}
*/

namespace detail
{
[[nodiscard]]
static Optional<int32> ReadInt(const char* path)
{
std::ifstream ifs{ path };

if (not ifs)
PowerStatus status
{
return none;
}

int32 value;

if (ifs >> value)
{
return value;
}
else
{
return none;
}
}

[[nodiscard]]
static Optional<std::string> ReadString(const char* path)
{
std::ifstream ifs{ path };

if (not ifs)
{
return none;
}

std::string value;

if (ifs >> value)
{
return value;
}
else
{
return none;
}
}
}

namespace System
{
PowerStatus GetPowerStatus()
{
PowerStatus status;
status.battery = BatteryStatus::NoBattery;
bool hasBattery = false;

if (auto value = detail::ReadInt("/sys/class/power_supply/AC/online"))
{
status.ac = (*value == 1) ? ACLineStatus::Online : ACLineStatus::Offline;
}
else if (auto value = detail::ReadInt("/sys/class/power_supply/ac/online"))
{
status.ac = (*value == 1) ? ACLineStatus::Online : ACLineStatus::Offline;
}

if (auto value = detail::ReadString("/sys/class/power_supply/battery/status"))
{
hasBattery = true;
status.charging = (*value == "Charging");

if (auto capacity = detail::ReadInt("/sys/class/power_supply/battery/capacity"))
{
status.batteryLifePercent = capacity;
}
}
else if (auto value = detail::ReadString("/sys/class/power_supply/BAT0/status"))
{
hasBattery = true;
status.charging = (*value == "Charging");

if (auto capacity = detail::ReadInt("/sys/class/power_supply/BAT0/capacity"))
{
status.batteryLifePercent = capacity;
}
}

if (hasBattery)
{
if (status.batteryLifePercent)
{
const int32 percent = *status.batteryLifePercent;

status.battery = percent <+ 5 ? BatteryStatus::Critical
: percent <= 33 ? BatteryStatus::Low
: percent <= 66 ? BatteryStatus::Middle
: BatteryStatus::High;
}
else
{
status.battery = BatteryStatus::Unknown;
}
}
.ac = ACLineStatus::Unknown,
.battery = BatteryStatus::Unknown,
.batterySaver = false,
.charging = false,
};

return status;
}
Expand Down

0 comments on commit 2373269

Please sign in to comment.