| 25 |
|
|
| 26 |
|
bool debug(false); |
| 27 |
|
|
| 28 |
< |
void Uname(Display &display, time_t now = 0) |
| 28 |
> |
void Uname(Display &display, time_t now = 0, bool change = false) |
| 29 |
|
{ |
| 30 |
< |
utsname os; |
| 30 |
> |
if (!now || change) |
| 31 |
> |
{ |
| 32 |
> |
utsname os; |
| 33 |
|
|
| 34 |
< |
::uname(&os); |
| 34 |
> |
::uname(&os); |
| 35 |
|
|
| 36 |
< |
static Pcre::RegEx version(_B("^(\\d+\\.\\d+)-([A-Z])[A-Z]*(-p\\d+)?.*$")); |
| 37 |
< |
Pcre::RegEx::Match match(version(os.release)); |
| 36 |
> |
static Pcre::RegEx version(_B("^(\\d+\\.\\d+)-([A-Z])[A-Z]*(-p\\d+)?.*$")); |
| 37 |
> |
Pcre::RegEx::Match match(version(os.release)); |
| 38 |
|
|
| 39 |
< |
display.Set(0, 1, os.sysname + _B(" ") + match[1] + match[2] + match[3]); |
| 39 |
> |
display.Set(0, 1, os.sysname + _B(" ") + match[1] + match[2] + match[3]); |
| 40 |
> |
} |
| 41 |
|
|
| 42 |
|
int mib[] = { CTL_KERN, KERN_BOOTTIME }; |
| 43 |
|
timeval boottime; |
| 50 |
|
if (uptime > 60) |
| 51 |
|
uptime += 30; |
| 52 |
|
|
| 53 |
< |
std::ostringstream output; |
| 54 |
< |
|
| 52 |
< |
output << _B("up ") << (uptime / 86400) << '+'; |
| 53 |
> |
char *when; |
| 54 |
> |
int days(uptime / 86400); |
| 55 |
|
|
| 56 |
|
uptime %= 86400; |
| 57 |
|
|
| 58 |
< |
output.width(2); |
| 57 |
< |
output.fill('0'); |
| 58 |
< |
|
| 59 |
< |
output << (uptime / 3600) << ':'; |
| 58 |
> |
int hours(uptime / 3600); |
| 59 |
|
|
| 60 |
|
uptime %= 3600; |
| 61 |
|
|
| 62 |
< |
output << (uptime / 60) << ':' << (uptime % 60); |
| 63 |
< |
output << std::string(20 - output.str().size(), ' '); |
| 62 |
> |
int minutes(uptime / 60), seconds(uptime % 60); |
| 63 |
> |
|
| 64 |
> |
::asprintf(&when, "%i+%02i:%02i:%02i", days, hours, minutes, seconds); |
| 65 |
> |
|
| 66 |
> |
std::string then(when); |
| 67 |
|
|
| 68 |
< |
display.Set(0, 2, output.str()); |
| 68 |
> |
then.append(17 - std::strlen(when), ' '); |
| 69 |
> |
|
| 70 |
> |
std::free(when); |
| 71 |
> |
|
| 72 |
> |
if (change) |
| 73 |
> |
display.Set(0, 2, _B("up ") + then); |
| 74 |
> |
else |
| 75 |
> |
display.Set(3, 2, then); |
| 76 |
|
} |
| 77 |
|
else |
| 78 |
|
display.Set(0, 2, _B("up -+--:--:-- ")); |
| 83 |
|
display.Set(0, 3, _B("-.--, -.--, -.-- ")); |
| 84 |
|
else |
| 85 |
|
{ |
| 86 |
< |
std::ostringstream output; |
| 86 |
> |
char *load; |
| 87 |
> |
|
| 88 |
> |
::asprintf(&load, "%.2f, %.2f, %.2f", averages[0], averages[1] , averages[2]); |
| 89 |
|
|
| 90 |
< |
output << std::fixed << std::setprecision(2) << averages[0] << _B(", ") << averages[1] << _B(", ") << averages[2]; |
| 80 |
< |
output << std::string(20 - output.str().size(), ' '); |
| 90 |
> |
display.Set(0, 3, load + std::string(20 - std::strlen(load), ' ')); |
| 91 |
|
|
| 92 |
< |
display.Set(0, 3, output.str()); |
| 92 |
> |
std::free(load); |
| 93 |
|
} |
| 94 |
|
} |
| 95 |
|
|
| 128 |
|
|
| 129 |
|
try |
| 130 |
|
{ |
| 121 |
– |
//enum Mode { Uname, Music, English, Metric, Nautical, Last } mode(Uname); |
| 122 |
– |
//Audacious audacious; |
| 131 |
|
Display display(device); |
| 132 |
|
|
| 133 |
|
display.Clear(); |
| 146 |
|
|
| 147 |
|
display.Store(); |
| 148 |
|
|
| 149 |
< |
::Uname(display, std::time(NULL)); |
| 149 |
> |
enum Mode { Uname, Music, English, Metric, Nautical, Last } mode(Uname); |
| 150 |
> |
//Audacious::Audacious audacious; |
| 151 |
> |
//GPS::GPS gps; |
| 152 |
|
|
| 153 |
< |
/*GPS::GPS gps; |
| 153 |
> |
_forever |
| 154 |
> |
{ |
| 155 |
> |
time_t now(std::time(NULL)); |
| 156 |
|
|
| 157 |
< |
gps.Query(_B("o")); |
| 157 |
> |
{ |
| 158 |
> |
char when[16]; |
| 159 |
|
|
| 160 |
< |
std::cout << gps.GetLatitude() << std::endl;*/ |
| 160 |
> |
std::strftime(when, sizeof (when), "%l:%M:%S %p %Z", std::localtime(&now)); |
| 161 |
|
|
| 162 |
< |
/*time_t now(std::time(NULL)); |
| 163 |
< |
char when[16]; |
| 162 |
> |
display.Set(2, 0, when); |
| 163 |
> |
} |
| 164 |
> |
|
| 165 |
> |
switch (mode) |
| 166 |
> |
{ |
| 167 |
> |
default: |
| 168 |
> |
::Uname(display, now); |
| 169 |
> |
|
| 170 |
> |
break; |
| 171 |
> |
case Music: |
| 172 |
> |
case English: |
| 173 |
> |
case Metric: |
| 174 |
> |
case Nautical: |
| 175 |
> |
break; |
| 176 |
> |
} |
| 177 |
|
|
| 178 |
< |
std::strftime(when, sizeof (when), "%l:%M:%S %p %Z", std::localtime(&now));*/ |
| 178 |
> |
::sleep(1); |
| 179 |
> |
} |
| 180 |
|
} |
| 181 |
|
catch (const std::exception &exception) |
| 182 |
|
{ |
