github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*SysInfo: Solved problems with Xtest

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8861 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2015-08-28 19:35:54 +00:00
parent b8352735a9
commit fbdd70f3a2
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bazaar/SysInfo/SysInfo.upp
View file

@ -8,7 +8,9 @@ library(WIN32) "ws2_32 psapi gdi32 vfw32 oleaut32 iphlpapi PowrProf netapi32 wbe
library(POSIX | LINUX | FREEBSD) X11;
library(!NO_XTEST) Xtst;
library(POSIX | NO_XTEST) ;
library(POSIX) Xtst;
options(MSC) "/D PSAPI_VERSION=1";

4
bazaar/SysInfo/battery.cpp
View file

@ -27,7 +27,7 @@ bool GetBatteryStatus(bool &discharging, int &percentage, int &remainingMin)
remainingMin = Null;
*/
percentage = 100;
Array<String> files = SearchFile("/proc/acpi/battery", "state");
Vector<String> files = SearchFile("/proc/acpi/battery", "state");
if (files.GetCount() == 0)
return false;
StringParse state = LoadFile_Safe(files[0]);
@ -58,7 +58,7 @@ bool GetBatteryStatus(bool &discharging, int &percentage, int &remainingMin)
bool GetBatteryInfo(bool &present/*, int &designCapacity, int &lastFullCapacity, String &vendor, String &type, String &model, String &serial*/)
{
Array<String> files = SearchFile("/proc/acpi/battery", "info");
Vector<String> files = SearchFile("/proc/acpi/battery", "info");
if (files.GetCount() == 0)
return false;
StringParse info = LoadFile_Safe(files[0]);