gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use C99 bool internally in SDL

Browse Source
This commit is contained in:
Sam Lantinga
2024-08-22 09:21:26 -07:00
parent 6501e90018
commit 8f546bb3c9
450 changed files with 6046 additions and 6033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/power/SDL_power.c
View File

@@ -22,21 +22,21 @@
#include "SDL_syspower.h"
/*
* Returns SDL_TRUE if we have a definitive answer.
* SDL_FALSE to try next implementation.
* Returns true if we have a definitive answer.
* false to try next implementation.
*/
typedef SDL_bool (*SDL_GetPowerInfo_Impl)(SDL_PowerState *state, int *seconds,
typedef bool (*SDL_GetPowerInfo_Impl)(SDL_PowerState *state, int *seconds,
int *percent);
#ifndef SDL_POWER_DISABLED
#ifdef SDL_POWER_HARDWIRED
// This is for things that _never_ have a battery
static SDL_bool SDL_GetPowerInfo_Hardwired(SDL_PowerState *state, int *seconds, int *percent)
static bool SDL_GetPowerInfo_Hardwired(SDL_PowerState *state, int *seconds, int *percent)
{
*seconds = -1;
*percent = -1;
*state = SDL_POWERSTATE_NO_BATTERY;
return SDL_TRUE;
return true;
}
#endif

30
src/power/SDL_syspower.h
View File

@@ -26,22 +26,22 @@
#define SDL_syspower_h_
// Not all of these are available in a given build. Use #ifdefs, etc.
SDL_bool SDL_GetPowerInfo_Linux_org_freedesktop_upower(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_Haiku(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_Android(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_PSP(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_VITA(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_N3DS(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_WinRT(SDL_PowerState *, int *, int *);
SDL_bool SDL_GetPowerInfo_Emscripten(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_Linux_org_freedesktop_upower(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_Windows(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_UIKit(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_Haiku(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_Android(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_PSP(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_VITA(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_N3DS(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_WinRT(SDL_PowerState *, int *, int *);
bool SDL_GetPowerInfo_Emscripten(SDL_PowerState *, int *, int *);
// this one is static in SDL_power.c
/* SDL_bool SDL_GetPowerInfo_Hardwired(SDL_PowerState *, int *, int *);*/
/* bool SDL_GetPowerInfo_Hardwired(SDL_PowerState *, int *, int *);*/
#endif // SDL_syspower_h_

4
src/power/android/SDL_syspower.c
View File

@@ -27,7 +27,7 @@
#include "../../core/android/SDL_android.h"
SDL_bool SDL_GetPowerInfo_Android(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_Android(SDL_PowerState *state, int *seconds, int *percent)
{
int battery;
int plugged;
@@ -53,7 +53,7 @@ SDL_bool SDL_GetPowerInfo_Android(SDL_PowerState *state, int *seconds, int *perc
*percent = -1;
}
return SDL_TRUE;
return true;
}
#endif // SDL_POWER_ANDROID

8
src/power/emscripten/SDL_syspower.c
View File

@@ -25,13 +25,13 @@
#include <emscripten/html5.h>
SDL_bool SDL_GetPowerInfo_Emscripten(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_Emscripten(SDL_PowerState *state, int *seconds, int *percent)
{
EmscriptenBatteryEvent batteryState;
int haveBattery = 0;
if (emscripten_get_battery_status(&batteryState) == EMSCRIPTEN_RESULT_NOT_SUPPORTED) {
return SDL_FALSE;
return false;
}
haveBattery = batteryState.level != 1.0 || !batteryState.charging || batteryState.chargingTime != 0.0;
@@ -40,7 +40,7 @@ SDL_bool SDL_GetPowerInfo_Emscripten(SDL_PowerState *state, int *seconds, int *p
*state = SDL_POWERSTATE_NO_BATTERY;
*seconds = -1;
*percent = -1;
return SDL_TRUE;
return true;
}
if (batteryState.charging) {
@@ -52,7 +52,7 @@ SDL_bool SDL_GetPowerInfo_Emscripten(SDL_PowerState *state, int *seconds, int *p
*seconds = (int)batteryState.dischargingTime;
*percent = (int)batteryState.level * 100;
return SDL_TRUE;
return true;
}
#endif // SDL_POWER_EMSCRIPTEN

16
src/power/haiku/SDL_syspower.c
View File

@@ -40,10 +40,10 @@
#define APM_DEVICE_ALL 1
#define APM_BIOS_CALL (B_DEVICE_OP_CODES_END + 3)
SDL_bool SDL_GetPowerInfo_Haiku(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_Haiku(SDL_PowerState *state, int *seconds, int *percent)
{
const int fd = open("/dev/misc/apm", O_RDONLY | O_CLOEXEC);
SDL_bool need_details = SDL_FALSE;
bool need_details = false;
uint16 regs[6];
uint8 ac_status;
uint8 battery_status;
@@ -53,7 +53,7 @@ SDL_bool SDL_GetPowerInfo_Haiku(SDL_PowerState *state, int *seconds, int *percen
int rc;
if (fd == -1) {
return SDL_FALSE; // maybe some other method will work?
return false; // maybe some other method will work?
}
SDL_memset(regs, '\0', sizeof(regs));
@@ -63,7 +63,7 @@ SDL_bool SDL_GetPowerInfo_Haiku(SDL_PowerState *state, int *seconds, int *percen
close(fd);
if (rc < 0) {
return SDL_FALSE;
return false;
}
ac_status = regs[1] >> 8;
@@ -93,13 +93,13 @@ SDL_bool SDL_GetPowerInfo_Haiku(SDL_PowerState *state, int *seconds, int *percen
*state = SDL_POWERSTATE_NO_BATTERY;
} else if (battery_flags & (1 << 3)) { // charging
*state = SDL_POWERSTATE_CHARGING;
need_details = SDL_TRUE;
need_details = true;
} else if (ac_status == 1) {
*state = SDL_POWERSTATE_CHARGED; // on AC, not charging.
need_details = SDL_TRUE;
need_details = true;
} else {
*state = SDL_POWERSTATE_ON_BATTERY; // not on AC.
need_details = SDL_TRUE;
need_details = true;
}
*percent = -1;
@@ -116,7 +116,7 @@ SDL_bool SDL_GetPowerInfo_Haiku(SDL_PowerState *state, int *seconds, int *percen
}
}
return SDL_TRUE; // the definitive answer if APM driver replied.
return true; // the definitive answer if APM driver replied.
}
#endif // SDL_POWER_HAIKU

138
src/power/linux/SDL_syspower.c
View File

@@ -55,24 +55,24 @@ static int open_power_file(const char *base, const char *node, const char *key)
return fd;
}
static SDL_bool read_power_file(const char *base, const char *node, const char *key,
static bool read_power_file(const char *base, const char *node, const char *key,
char *buf, size_t buflen)
{
ssize_t br = 0;
const int fd = open_power_file(base, node, key);
if (fd == -1) {
return SDL_FALSE;
return false;
}
br = read(fd, buf, buflen - 1);
close(fd);
if (br < 0) {
return SDL_FALSE;
return false;
}
buf[br] = '\0'; // null-terminate the string.
return SDL_TRUE;
return true;
}
static SDL_bool make_proc_acpi_key_val(char **_ptr, char **_key, char **_val)
static bool make_proc_acpi_key_val(char **_ptr, char **_key, char **_val)
{
char *ptr = *_ptr;
@@ -81,7 +81,7 @@ static SDL_bool make_proc_acpi_key_val(char **_ptr, char **_key, char **_val)
}
if (*ptr == '\0') {
return SDL_FALSE; // EOF.
return false; // EOF.
}
*_key = ptr;
@@ -91,7 +91,7 @@ static SDL_bool make_proc_acpi_key_val(char **_ptr, char **_key, char **_val)
}
if (*ptr == '\0') {
return SDL_FALSE; // (unexpected) EOF.
return false; // (unexpected) EOF.
}
*(ptr++) = '\0'; // terminate the key.
@@ -101,7 +101,7 @@ static SDL_bool make_proc_acpi_key_val(char **_ptr, char **_key, char **_val)
}
if (*ptr == '\0') {
return SDL_FALSE; // (unexpected) EOF.
return false; // (unexpected) EOF.
}
*_val = ptr;
@@ -115,11 +115,11 @@ static SDL_bool make_proc_acpi_key_val(char **_ptr, char **_key, char **_val)
}
*_ptr = ptr; // store for next time.
return SDL_TRUE;
return true;
}
static void check_proc_acpi_battery(const char *node, SDL_bool *have_battery,
SDL_bool *charging, int *seconds, int *percent)
static void check_proc_acpi_battery(const char *node, bool *have_battery,
bool *charging, int *seconds, int *percent)
{
const char *base = proc_acpi_battery_path;
char info[1024];
@@ -127,8 +127,8 @@ static void check_proc_acpi_battery(const char *node, SDL_bool *have_battery,
char *ptr = NULL;
char *key = NULL;
char *val = NULL;
SDL_bool charge = SDL_FALSE;
SDL_bool choose = SDL_FALSE;
bool charge = false;
bool choose = false;
int maximum = -1;
int remaining = -1;
int secs = -1;
@@ -144,14 +144,14 @@ static void check_proc_acpi_battery(const char *node, SDL_bool *have_battery,
while (make_proc_acpi_key_val(&ptr, &key, &val)) {
if (SDL_strcasecmp(key, "present") == 0) {
if (SDL_strcasecmp(val, "yes") == 0) {
*have_battery = SDL_TRUE;
*have_battery = true;
}
} else if (SDL_strcasecmp(key, "charging state") == 0) {
// !!! FIXME: what exactly _does_ charging/discharging mean?
if (SDL_strcasecmp(val, "charging/discharging") == 0) {
charge = SDL_TRUE;
charge = true;
} else if (SDL_strcasecmp(val, "charging") == 0) {
charge = SDL_TRUE;
charge = true;
}
} else if (SDL_strcasecmp(key, "remaining capacity") == 0) {
char *endptr = NULL;
@@ -190,13 +190,13 @@ static void check_proc_acpi_battery(const char *node, SDL_bool *have_battery,
*/
if ((secs < 0) && (*seconds < 0)) {
if ((pct < 0) && (*percent < 0)) {
choose = SDL_TRUE; // at least we know there's a battery.
choose = true; // at least we know there's a battery.
}
if (pct > *percent) {
choose = SDL_TRUE;
choose = true;
}
} else if (secs > *seconds) {
choose = SDL_TRUE;
choose = true;
}
if (choose) {
@@ -206,7 +206,7 @@ static void check_proc_acpi_battery(const char *node, SDL_bool *have_battery,
}
}
static void check_proc_acpi_ac_adapter(const char *node, SDL_bool *have_ac)
static void check_proc_acpi_ac_adapter(const char *node, bool *have_ac)
{
const char *base = proc_acpi_ac_adapter_path;
char state[256];
@@ -222,19 +222,19 @@ static void check_proc_acpi_ac_adapter(const char *node, SDL_bool *have_ac)
while (make_proc_acpi_key_val(&ptr, &key, &val)) {
if (SDL_strcasecmp(key, "state") == 0) {
if (SDL_strcasecmp(val, "on-line") == 0) {
*have_ac = SDL_TRUE;
*have_ac = true;
}
}
}
}
SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *state, int *seconds, int *percent)
{
struct dirent *dent = NULL;
DIR *dirp = NULL;
SDL_bool have_battery = SDL_FALSE;
SDL_bool have_ac = SDL_FALSE;
SDL_bool charging = SDL_FALSE;
bool have_battery = false;
bool have_ac = false;
bool charging = false;
*seconds = -1;
*percent = -1;
@@ -242,7 +242,7 @@ SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *state, int *seconds, i
dirp = opendir(proc_acpi_battery_path);
if (!dirp) {
return SDL_FALSE; // can't use this interface.
return false; // can't use this interface.
} else {
while ((dent = readdir(dirp)) != NULL) {
const char *node = dent->d_name;
@@ -254,7 +254,7 @@ SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *state, int *seconds, i
dirp = opendir(proc_acpi_ac_adapter_path);
if (!dirp) {
return SDL_FALSE; // can't use this interface.
return false; // can't use this interface.
} else {
while ((dent = readdir(dirp)) != NULL) {
const char *node = dent->d_name;
@@ -273,10 +273,10 @@ SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *state, int *seconds, i
*state = SDL_POWERSTATE_ON_BATTERY;
}
return SDL_TRUE; // definitive answer.
return true; // definitive answer.
}
static SDL_bool next_string(char **_ptr, char **_str)
static bool next_string(char **_ptr, char **_str)
{
char *ptr = *_ptr;
char *str;
@@ -286,7 +286,7 @@ static SDL_bool next_string(char **_ptr, char **_str)
}
if (*ptr == '\0') {
return SDL_FALSE;
return false;
}
str = ptr;
@@ -300,10 +300,10 @@ static SDL_bool next_string(char **_ptr, char **_str)
*_str = str;
*_ptr = ptr;
return SDL_TRUE;
return true;
}
static SDL_bool int_string(char *str, int *val)
static bool int_string(char *str, int *val)
{
char *endptr = NULL;
*val = (int)SDL_strtol(str, &endptr, 0);
@@ -311,9 +311,9 @@ static SDL_bool int_string(char *str, int *val)
}
// http://lxr.linux.no/linux+v2.6.29/drivers/char/apm-emulation.c
SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *state, int *seconds, int *percent)
{
SDL_bool need_details = SDL_FALSE;
bool need_details = false;
int ac_status = 0;
int battery_status = 0;
int battery_flag = 0;
@@ -326,61 +326,61 @@ SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *state, int *seconds, in
ssize_t br;
if (fd == -1) {
return SDL_FALSE; // can't use this interface.
return false; // can't use this interface.
}
br = read(fd, buf, sizeof(buf) - 1);
close(fd);
if (br < 0) {
return SDL_FALSE;
return false;
}
buf[br] = '\0'; // null-terminate the string.
if (!next_string(&ptr, &str)) { // driver version
return SDL_FALSE;
return false;
}
if (!next_string(&ptr, &str)) { // BIOS version
return SDL_FALSE;
return false;
}
if (!next_string(&ptr, &str)) { // APM flags
return SDL_FALSE;
return false;
}
if (!next_string(&ptr, &str)) { // AC line status
return SDL_FALSE;
return false;
} else if (!int_string(str, &ac_status)) {
return SDL_FALSE;
return false;
}
if (!next_string(&ptr, &str)) { // battery status
return SDL_FALSE;
return false;
} else if (!int_string(str, &battery_status)) {
return SDL_FALSE;
return false;
}
if (!next_string(&ptr, &str)) { // battery flag
return SDL_FALSE;
return false;
} else if (!int_string(str, &battery_flag)) {
return SDL_FALSE;
return false;
}
if (!next_string(&ptr, &str)) { // remaining battery life percent
return SDL_FALSE;
return false;
}
if (str[SDL_strlen(str) - 1] == '%') {
str[SDL_strlen(str) - 1] = '\0';
}
if (!int_string(str, &battery_percent)) {
return SDL_FALSE;
return false;
}
if (!next_string(&ptr, &str)) { // remaining battery life time
return SDL_FALSE;
return false;
} else if (!int_string(str, &battery_time)) {
return SDL_FALSE;
return false;
}
if (!next_string(&ptr, &str)) { // remaining battery life time units
return SDL_FALSE;
return false;
} else if (SDL_strcasecmp(str, "min") == 0) {
battery_time *= 60;
}
@@ -391,13 +391,13 @@ SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *state, int *seconds, in
*state = SDL_POWERSTATE_NO_BATTERY;
} else if (battery_flag & (1 << 3)) { // charging
*state = SDL_POWERSTATE_CHARGING;
need_details = SDL_TRUE;
need_details = true;
} else if (ac_status == 1) {
*state = SDL_POWERSTATE_CHARGED; // on AC, not charging.
need_details = SDL_TRUE;
need_details = true;
} else {
*state = SDL_POWERSTATE_ON_BATTERY;
need_details = SDL_TRUE;
need_details = true;
}
*percent = -1;
@@ -414,10 +414,10 @@ SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *state, int *seconds, in
}
}
return SDL_TRUE;
return true;
}
SDL_bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *state, int *seconds, int *percent)
{
const char *base = sys_class_power_supply_path;
struct dirent *dent;
@@ -425,7 +425,7 @@ SDL_bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *state, in
dirp = opendir(base);
if (!dirp) {
return SDL_FALSE;
return false;
}
*state = SDL_POWERSTATE_NO_BATTERY; // assume we're just plugged in.
@@ -434,7 +434,7 @@ SDL_bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *state, in
while ((dent = readdir(dirp)) != NULL) {
const char *name = dent->d_name;
SDL_bool choose = SDL_FALSE;
bool choose = false;
char str[64];
SDL_PowerState st;
int secs;
@@ -500,12 +500,12 @@ SDL_bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *state, in
*/
if ((secs < 0) && (*seconds < 0)) {
if ((pct < 0) && (*percent < 0)) {
choose = SDL_TRUE; // at least we know there's a battery.
choose = true; // at least we know there's a battery.
} else if (pct > *percent) {
choose = SDL_TRUE;
choose = true;
}
} else if (secs > *seconds) {
choose = SDL_TRUE;
choose = true;
}
if (choose) {
@@ -516,7 +516,7 @@ SDL_bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *state, in
}
closedir(dirp);
return SDL_TRUE; // don't look any further.
return true; // don't look any further.
}
// d-bus queries to org.freedesktop.UPower.
@@ -528,7 +528,7 @@ SDL_bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *state, in
static void check_upower_device(DBusConnection *conn, const char *path, SDL_PowerState *state, int *seconds, int *percent)
{
SDL_bool choose = SDL_FALSE;
bool choose = false;
SDL_PowerState st;
int secs;
int pct;
@@ -598,12 +598,12 @@ static void check_upower_device(DBusConnection *conn, const char *path, SDL_Powe
*/
if ((secs < 0) && (*seconds < 0)) {
if ((pct < 0) && (*percent < 0)) {
choose = SDL_TRUE; // at least we know there's a battery.
choose = true; // at least we know there's a battery.
} else if (pct > *percent) {
choose = SDL_TRUE;
choose = true;
}
} else if (secs > *seconds) {
choose = SDL_TRUE;
choose = true;
}
if (choose) {
@@ -614,9 +614,9 @@ static void check_upower_device(DBusConnection *conn, const char *path, SDL_Powe
}
#endif
SDL_bool SDL_GetPowerInfo_Linux_org_freedesktop_upower(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_Linux_org_freedesktop_upower(SDL_PowerState *state, int *seconds, int *percent)
{
SDL_bool retval = SDL_FALSE;
bool retval = false;
#ifdef SDL_USE_LIBDBUS
SDL_DBusContext *dbus = SDL_DBus_GetContext();
@@ -626,10 +626,10 @@ SDL_bool SDL_GetPowerInfo_Linux_org_freedesktop_upower(SDL_PowerState *state, in
if (!dbus || !SDL_DBus_CallMethodOnConnection(dbus->system_conn, UPOWER_DBUS_NODE, UPOWER_DBUS_PATH, UPOWER_DBUS_INTERFACE, "EnumerateDevices",
DBUS_TYPE_INVALID,
DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &paths, &numpaths, DBUS_TYPE_INVALID)) {
return SDL_FALSE; // try a different approach than UPower.
return false; // try a different approach than UPower.
}
retval = SDL_TRUE; // Clearly we can use this interface.
retval = true; // Clearly we can use this interface.
*state = SDL_POWERSTATE_NO_BATTERY; // assume we're just plugged in.
*seconds = -1;
*percent = -1;

34
src/power/macos/SDL_syspower.c
View File

@@ -33,15 +33,15 @@
CFDictionaryGetValueIfPresent(dict, CFSTR(k), (const void **)v)
// Note that AC power sources also include a laptop battery it is charging.
static void checkps(CFDictionaryRef dict, SDL_bool *have_ac, SDL_bool *have_battery,
SDL_bool *charging, int *seconds, int *percent)
static void checkps(CFDictionaryRef dict, bool *have_ac, bool *have_battery,
bool *charging, int *seconds, int *percent)
{
CFStringRef strval; // don't CFRelease() this.
CFBooleanRef bval;
CFNumberRef numval;
SDL_bool charge = SDL_FALSE;
SDL_bool choose = SDL_FALSE;
SDL_bool is_ac = SDL_FALSE;
bool charge = false;
bool choose = false;
bool is_ac = false;
int secs = -1;
int maxpct = -1;
int pct = -1;
@@ -55,20 +55,20 @@ static void checkps(CFDictionaryRef dict, SDL_bool *have_ac, SDL_bool *have_batt
}
if (STRMATCH(strval, CFSTR(kIOPSACPowerValue))) {
is_ac = *have_ac = SDL_TRUE;
is_ac = *have_ac = true;
} else if (!STRMATCH(strval, CFSTR(kIOPSBatteryPowerValue))) {
return; // not a battery?
}
if ((GETVAL(kIOPSIsChargingKey, &bval)) && (bval == kCFBooleanTrue)) {
charge = SDL_TRUE;
charge = true;
}
if (GETVAL(kIOPSMaxCapacityKey, &numval)) {
SInt32 val = -1;
CFNumberGetValue(numval, kCFNumberSInt32Type, &val);
if (val > 0) {
*have_battery = SDL_TRUE;
*have_battery = true;
maxpct = (int)val;
}
}
@@ -77,7 +77,7 @@ static void checkps(CFDictionaryRef dict, SDL_bool *have_ac, SDL_bool *have_batt
SInt32 val = -1;
CFNumberGetValue(numval, kCFNumberSInt32Type, &val);
if (val > 0) {
*have_battery = SDL_TRUE;
*have_battery = true;
maxpct = (int)val;
}
}
@@ -117,13 +117,13 @@ static void checkps(CFDictionaryRef dict, SDL_bool *have_ac, SDL_bool *have_batt
*/
if ((secs < 0) && (*seconds < 0)) {
if ((pct < 0) && (*percent < 0)) {
choose = SDL_TRUE; // at least we know there's a battery.
choose = true; // at least we know there's a battery.
}
if (pct > *percent) {
choose = SDL_TRUE;
choose = true;
}
} else if (secs > *seconds) {
choose = SDL_TRUE;
choose = true;
}
if (choose) {
@@ -136,7 +136,7 @@ static void checkps(CFDictionaryRef dict, SDL_bool *have_ac, SDL_bool *have_batt
#undef GETVAL
#undef STRMATCH
SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *state, int *seconds, int *percent)
{
CFTypeRef blob = IOPSCopyPowerSourcesInfo();
@@ -148,9 +148,9 @@ SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *state, int *seconds, int *perce
CFArrayRef list = IOPSCopyPowerSourcesList(blob);
if (list != NULL) {
// don't CFRelease() the list items, or dictionaries!
SDL_bool have_ac = SDL_FALSE;
SDL_bool have_battery = SDL_FALSE;
SDL_bool charging = SDL_FALSE;
bool have_ac = false;
bool have_battery = false;
bool charging = false;
const CFIndex total = CFArrayGetCount(list);
CFIndex i;
for (i = 0; i < total; i++) {
@@ -178,7 +178,7 @@ SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *state, int *seconds, int *perce
CFRelease(blob);
}
return SDL_TRUE; // always the definitive answer on macOS.
return true; // always the definitive answer on macOS.
}
#endif // SDL_POWER_MACOSX

4
src/power/n3ds/SDL_syspower.c
View File

@@ -32,13 +32,13 @@ static int GetBatteryPercentage(void);
#define BATTERY_PERCENT_REG 0xB
#define BATTERY_PERCENT_REG_SIZE 2
SDL_bool SDL_GetPowerInfo_N3DS(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_N3DS(SDL_PowerState *state, int *seconds, int *percent)
{
*state = GetPowerState();
*percent = GetBatteryPercentage();
*seconds = -1; // libctru doesn't provide a way to estimate battery life
return SDL_TRUE;
return true;
}
static SDL_PowerState GetPowerState(void)

4
src/power/psp/SDL_syspower.c
View File

@@ -26,7 +26,7 @@
#include <psppower.h>
SDL_bool SDL_GetPowerInfo_PSP(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_PSP(SDL_PowerState *state, int *seconds, int *percent)
{
int battery = scePowerIsBatteryExist();
int plugged = scePowerIsPowerOnline();
@@ -54,7 +54,7 @@ SDL_bool SDL_GetPowerInfo_PSP(SDL_PowerState *state, int *seconds, int *percent)
*seconds = scePowerGetBatteryLifeTime() * 60;
}
return SDL_TRUE; // always the definitive answer on PSP.
return true; // always the definitive answer on PSP.
}
#endif // SDL_POWER_PSP

2
src/power/uikit/SDL_syspower.h
View File

@@ -23,6 +23,6 @@
#ifdef SDL_POWER_UIKIT
void SDL_UIKit_UpdateBatteryMonitoring(void);
SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState *state, int *seconds, int *percent);
bool SDL_GetPowerInfo_UIKit(SDL_PowerState *state, int *seconds, int *percent);
#endif // SDL_POWER_UIKIT

4
src/power/uikit/SDL_syspower.m
View File

@@ -50,7 +50,7 @@ void SDL_UIKit_UpdateBatteryMonitoring(void)
}
#endif // !SDL_PLATFORM_TVOS
SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_UIKit(SDL_PowerState *state, int *seconds, int *percent)
{
#ifdef SDL_PLATFORM_TVOS
*state = SDL_POWERSTATE_NO_BATTERY;
@@ -98,7 +98,7 @@ SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState *state, int *seconds, int *percen
}
#endif // SDL_PLATFORM_TVOS
return SDL_TRUE; // always the definitive answer on iOS.
return true; // always the definitive answer on iOS.
}
#endif // SDL_POWER_UIKIT

4
src/power/vita/SDL_syspower.c
View File

@@ -26,7 +26,7 @@
#include <psp2/power.h>
SDL_bool SDL_GetPowerInfo_VITA(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_VITA(SDL_PowerState *state, int *seconds, int *percent)
{
int battery = 1;
int plugged = scePowerIsPowerOnline();
@@ -54,7 +54,7 @@ SDL_bool SDL_GetPowerInfo_VITA(SDL_PowerState *state, int *seconds, int *percent
*seconds = scePowerGetBatteryLifeTime() * 60;
}
return SDL_TRUE; // always the definitive answer on VITA.
return true; // always the definitive answer on VITA.
}
#endif // SDL_POWER_VITA

12
src/power/windows/SDL_syspower.c
View File

@@ -25,10 +25,10 @@
#include "../../core/windows/SDL_windows.h"
SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState *state, int *seconds, int *percent)
bool SDL_GetPowerInfo_Windows(SDL_PowerState *state, int *seconds, int *percent)
{
SYSTEM_POWER_STATUS status;
SDL_bool need_details = SDL_FALSE;
bool need_details = false;
// This API should exist back to Win95.
if (!GetSystemPowerStatus(&status)) {
@@ -40,13 +40,13 @@ SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState *state, int *seconds, int *perc
*state = SDL_POWERSTATE_NO_BATTERY;
} else if (status.BatteryFlag & (1 << 3)) { // charging
*state = SDL_POWERSTATE_CHARGING;
need_details = SDL_TRUE;
need_details = true;
} else if (status.ACLineStatus == 1) {
*state = SDL_POWERSTATE_CHARGED; // on AC, not charging.
need_details = SDL_TRUE;
need_details = true;
} else {
*state = SDL_POWERSTATE_ON_BATTERY; // not on AC.
need_details = SDL_TRUE;
need_details = true;
}
*percent = -1;
@@ -63,7 +63,7 @@ SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState *state, int *seconds, int *perc
}
}
return SDL_TRUE; // always the definitive answer on Windows.
return true; // always the definitive answer on Windows.
}
#endif // SDL_POWER_WINDOWS

4
src/power/winrt/SDL_syspower.cpp
View File

@@ -23,7 +23,7 @@
#ifndef SDL_POWER_DISABLED
#if SDL_POWER_WINRT
extern "C" SDL_bool
extern "C" bool
SDL_GetPowerInfo_WinRT(SDL_PowerState *state, int *seconds, int *percent)
{
// TODO, WinRT: Battery info is available on at least one WinRT platform (Windows Phone 8). Implement SDL_GetPowerInfo_WinRT as appropriate.
@@ -32,7 +32,7 @@ SDL_GetPowerInfo_WinRT(SDL_PowerState *state, int *seconds, int *percent)
- Windows Phone 8 has a 'Battery' class, which is documented as available for C++
- More info on WP8's Battery class can be found at http://msdn.microsoft.com/library/windowsphone/develop/jj207231
*/
return SDL_FALSE;
return false;
}
#endif // SDL_POWER_WINRT