TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Fixed support for freeze/standby/suspend/hybrid suspend/hibernate in

Browse Source 
tdehw lib.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
feat/fix-suspend-code
Michele Calgaro 7 years ago
parent 0656a7511d
commit 975d1ed9c7
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 221 additions and 217 deletions
Show Stats Download Patch File Download Diff File

218
tdecore/tdehw/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c
Unescape Escape View File

@ -254,148 +254,142 @@ void reply_SetBrightness(DBusMessage* msg, DBusConnection* conn) {
free(safepath); free(safepath);
} }
void reply_CanSetPower(DBusMessage* msg, DBusConnection* conn, char* state) { void reply_CanSetSuspend(DBusMessage* msg, DBusConnection* conn, char* state, char* disk, char* mem) {
// check if required files are writable
// check if path is writable bool files_writable = (access("/sys/power/state", W_OK) == 0);
int writable = false; if (disk)
int rval = access ("/sys/power/state", W_OK); {
if (rval == 0) { files_writable &= (access("/sys/power/disk", W_OK) == 0);
writable = true; }
if (mem)
{
files_writable &= (access("/sys/power/mem_sleep", W_OK) == 0);
}
if (!files_writable)
{
reply_Bool(msg, conn, false); // send reply
} }
// check if method is supported // check if method is supported
int method = false; bool result = false;
if (writable) { // state
FILE *node = fopen("/sys/power/state", "r"); FILE *state_node = fopen("/sys/power/state", "r");
if (node != NULL) { if (state_node) {
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
ssize_t read = getline(&line, &len, node); ssize_t read = getline(&line, &len, state_node);
if (read > 0 && line) { if (read > 0 && line) {
method = strstr(line, state) != NULL; result = (strstr(line, state) != NULL);
free(line); free(line);
} }
if (fclose(node) == EOF) { fclose(state_node);
// Error!
}
} }
if (!result)
{
reply_Bool(msg, conn, false); // send reply
} }
// send reply // disk
reply_Bool(msg, conn, writable && method); if (disk)
} {
FILE *disk_node = fopen("/sys/power/disk", "r");
void reply_SetPower(DBusMessage* msg, DBusConnection* conn, char* state) { if (disk_node) {
// set power state
reply_SetGivenPath(msg, conn, "/sys/power/state", state);
}
void reply_CanSetHibernation(DBusMessage* msg, DBusConnection* conn, char* state, char* disk) {
// check if path is writable
bool state_writable = false;
int rval = access ("/sys/power/state", W_OK);
if (rval == 0) {
state_writable = true;
}
bool disk_writable = false;
rval = access ("/sys/power/disk", W_OK);
if (rval == 0) {
disk_writable = true;
}
// check if method is supported
bool method1 = false, method2 = false;
if (state_writable && disk_writable) {
FILE *statenode = fopen("/sys/power/state", "r");
if (statenode != NULL) {
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
ssize_t read = getline(&line, &len, statenode); ssize_t read = getline(&line, &len, disk_node);
if (read > 0 && line) { if (read > 0 && line) {
method1 = (strstr(line, state) != NULL); result &= (strstr(line, disk) != NULL);
free(line); free(line);
} }
if (fclose(statenode) == EOF) { fclose(disk_node);
// Error! }
} }
if (!result)
{
reply_Bool(msg, conn, false); // send reply
} }
FILE *disknode = fopen("/sys/power/disk", "r");
if (disknode != NULL) { // mem_sleep
if (mem)
{
FILE *mem_node = fopen("/sys/power/mem_sleep", "r");
if (mem_node) {
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
ssize_t read = getline(&line, &len, disknode); ssize_t read = getline(&line, &len, mem_node);
if (read > 0 && line) { if (read > 0 && line) {
method2 = (strstr(line, disk) != NULL); result &= (strstr(line, mem) != NULL);
free(line); free(line);
} }
if (fclose(disknode) == EOF) { fclose(mem_node);
// Error!
}
} }
} }
// send reply reply_Bool(msg, conn, result); // send reply
reply_Bool(msg, conn, state_writable && disk_writable && method1 && method2);
} }
void reply_SetHibernation(DBusMessage* msg, DBusConnection* conn, char* state, char* disk) { void reply_SetSuspend(DBusMessage* msg, DBusConnection* conn, char* state, char* disk, char* mem) {
// set hibernation state // check if required files are writable
DBusMessage* reply; bool files_writable = (access("/sys/power/state", W_OK) == 0);
DBusMessageIter args; if (disk)
const char* member = dbus_message_get_member(msg); {
dbus_uint32_t serial = 0; files_writable &= (access("/sys/power/disk", W_OK) == 0);
bool written1 = false, written2 = false;
// check if path is writable
int state_writable = false;
int rval = access ("/sys/power/state", W_OK);
if (rval == 0) {
state_writable = true;
} }
int disk_writable = false; if (mem)
rval = access ("/sys/power/disk", W_OK); {
if (rval == 0) { files_writable &= (access("/sys/power/mem_sleep", W_OK) == 0);
disk_writable = true;
} }
if (!files_writable)
if (state_writable && disk_writable) { {
FILE *disknode = fopen("/sys/power/disk", "w"); reply_Bool(msg, conn, false); // send reply
if (disknode != NULL) {
if (fputs(disk, disknode) != EOF) {
written1 = true;
} }
if (fclose(disknode) == EOF) {
// Error! // set suspend mode
bool result = files_writable;
if (files_writable)
{
// disk
if (disk)
{
FILE *disk_node = fopen("/sys/power/disk", "w");
if (disk_node) {
result &= (fputs(disk, disk_node) != EOF);
fclose(disk_node);
} }
} }
if (written1)
// mem_sleep
if (mem)
{ {
FILE *statenode = fopen("/sys/power/state", "w"); FILE *mem_node = fopen("/sys/power/mem_sleep", "w");
if (statenode != NULL) { if (mem_node) {
if (fputs(state, statenode) != EOF) { result &= (fputs(mem, mem_node) != EOF);
written2 = true; fclose(mem_node);
}
if (fclose(statenode) == EOF) {
// Error!
} }
} }
// state
FILE *state_node = fopen("/sys/power/state", "w");
if (state_node) {
result &= (fputs(state, state_node) != EOF);
fclose(state_node);
} }
} }
// create a reply from the message // create a reply from the message
reply = dbus_message_new_method_return(msg); DBusMessage *reply = dbus_message_new_method_return(msg);
const char* member = dbus_message_get_member(msg);
// add the arguments to the reply // add the arguments to the reply
bool written = written1 && written2; DBusMessageIter args;
dbus_message_iter_init_append(reply, &args); dbus_message_iter_init_append(reply, &args);
if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &written)) { if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &result)) {
fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_message_iter_append_basic failed\n", member); fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_message_iter_append_basic failed\n", member);
return; return;
} }
// send the reply && flush the connection // send the reply && flush the connection
dbus_uint32_t serial = 0;
if (!dbus_connection_send(conn, reply, &serial)) { if (!dbus_connection_send(conn, reply, &serial)) {
fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_connection_send failed\n", member); fprintf(stderr, "[tde_dbus_hardwarecontrol] %s: dbus_connection_send failed\n", member);
return; return;
@ -786,35 +780,35 @@ void listen() {
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Brightness", "SetBrightness")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Brightness", "SetBrightness")) {
reply_SetBrightness(msg, conn); reply_SetBrightness(msg, conn);
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanStandby")) {
reply_CanSetPower(msg, conn, "standby");
}
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "Standby")) {
reply_SetPower(msg, conn, "standby");
}
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanFreeze")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanFreeze")) {
reply_CanSetPower(msg, conn, "freeze"); reply_CanSetSuspend(msg, conn, "freeze", NULL, NULL);
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "Freeze")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "Freeze")) {
reply_SetPower(msg, conn, "freeze"); reply_SetSuspend(msg, conn, "freeze", NULL, NULL);
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanSuspend")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanStandby")) {
reply_CanSetPower(msg, conn, "mem"); reply_CanSetSuspend(msg, conn, "standby", NULL, NULL);
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "Suspend")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "Standby")) {
reply_SetPower(msg, conn, "mem"); reply_SetSuspend(msg, conn, "standby", NULL, NULL);
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanHibernate")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanSuspend")) {
reply_CanSetHibernation(msg, conn, "disk", "platform"); reply_CanSetSuspend(msg, conn, "mem", NULL, "deep");
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "Hibernate")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "Suspend")) {
reply_SetHibernation(msg, conn, "disk", "platform"); reply_SetSuspend(msg, conn, "mem", NULL, "deep");
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanHybridSuspend")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanHybridSuspend")) {
reply_CanSetHibernation(msg, conn, "disk", "suspend"); reply_CanSetSuspend(msg, conn, "disk", "suspend", NULL);
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "HybridSuspend")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "HybridSuspend")) {
reply_SetHibernation(msg, conn, "disk", "suspend"); reply_SetSuspend(msg, conn, "disk", "suspend", NULL);
}
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanHibernate")) {
reply_CanSetSuspend(msg, conn, "disk", "shutdown", NULL);
}
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "Hibernate")) {
reply_SetSuspend(msg, conn, "disk", "shutdown", NULL);
} }
else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanSetHibernationMethod")) { else if (dbus_message_is_method_call(msg, "org.trinitydesktop.hardwarecontrol.Power", "CanSetHibernationMethod")) {
reply_CanSetHibernationMethod(msg, conn); reply_CanSetHibernationMethod(msg, conn);

22
tdecore/tdehw/tdehardwaredevices.cpp
Unescape Escape View File

@ -3354,6 +3354,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
TDESystemHibernationMethodList hibernationmethods; TDESystemHibernationMethodList hibernationmethods;
TDESystemHibernationMethod::TDESystemHibernationMethod hibernationmethod = TDESystemHibernationMethod::TDESystemHibernationMethod hibernationmethod =
TDESystemHibernationMethod::Unsupported; TDESystemHibernationMethod::Unsupported;
TDESystemSuspendModeList suspendmodes;
while ( (dirfi = valuesdirit.current()) != 0 ) { while ( (dirfi = valuesdirit.current()) != 0 ) {
nodename = dirfi->fileName(); nodename = dirfi->fileName();
TQFile file( valuesnodename + nodename ); TQFile file( valuesnodename + nodename );
@ -3372,7 +3373,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
powerstates.append(TDESystemPowerState::Freeze); powerstates.append(TDESystemPowerState::Freeze);
} }
if (line.contains("mem")) { if (line.contains("mem")) {
powerstates.append(TDESystemPowerState::Suspend); powerstates.append(TDESystemPowerState::Mem);
} }
if (line.contains("disk")) { if (line.contains("disk")) {
powerstates.append(TDESystemPowerState::Disk); powerstates.append(TDESystemPowerState::Disk);
@ -3421,6 +3422,17 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
hibernationmethod = TDESystemHibernationMethod::Test; hibernationmethod = TDESystemHibernationMethod::Test;
} }
} }
if (nodename == "mem_sleep") {
if (line.contains("s2idle")) {
suspendmodes.append(TDESystemSuspendMode::SuspendToIdle);
}
if (line.contains("shallow")) {
suspendmodes.append(TDESystemSuspendMode::Standby);
}
if (line.contains("deep")) {
suspendmodes.append(TDESystemSuspendMode::SuspendToRAM);
}
}
if (nodename == "image_size") { if (nodename == "image_size") {
rdevice->internalSetDiskSpaceNeededForHibernation(line.toULong()); rdevice->internalSetDiskSpaceNeededForHibernation(line.toULong());
} }
@ -3428,11 +3440,17 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice* exist
} }
++valuesdirit; ++valuesdirit;
} }
// Suspend-to-RAM requires a combination of 'mem' and 'deep' in two different files
if (powerstates.contains(TDESystemPowerState::Mem) &&
suspendmodes.contains(TDESystemSuspendMode::SuspendToRAM)) {
powerstates.append(TDESystemPowerState::Suspend);
powerstates.remove(TDESystemPowerState::Mem);
}
// Hibernation and Hybrid Suspend are not real power states, being just two different // Hibernation and Hybrid Suspend are not real power states, being just two different
// ways of suspending to disk. Since they are very common and it is very convenient to // ways of suspending to disk. Since they are very common and it is very convenient to
// treat them as power states, we do so, as other power frameworks also do. // treat them as power states, we do so, as other power frameworks also do.
if (powerstates.contains(TDESystemPowerState::Disk) && if (powerstates.contains(TDESystemPowerState::Disk) &&
hibernationmethods.contains(TDESystemHibernationMethod::Platform)) { hibernationmethods.contains(TDESystemHibernationMethod::Shutdown)) {
powerstates.append(TDESystemPowerState::Hibernate); powerstates.append(TDESystemPowerState::Hibernate);
} }
if (powerstates.contains(TDESystemPowerState::Disk) && if (powerstates.contains(TDESystemPowerState::Disk) &&

142
tdecore/tdehw/tderootsystemdevice.cpp
Unescape Escape View File

@ -63,18 +63,10 @@ void TDERootSystemDevice::internalSetPowerStates(TDESystemPowerStateList ps) {
m_powerStates = ps; m_powerStates = ps;
} }
TDESystemHibernationMethodList TDERootSystemDevice::hibernationMethods() {
return m_hibernationMethods;
}
void TDERootSystemDevice::internalSetHibernationMethods(TDESystemHibernationMethodList hm) { void TDERootSystemDevice::internalSetHibernationMethods(TDESystemHibernationMethodList hm) {
m_hibernationMethods = hm; m_hibernationMethods = hm;
} }
TDESystemHibernationMethod::TDESystemHibernationMethod TDERootSystemDevice::hibernationMethod() {
return m_hibernationMethod;
}
void TDERootSystemDevice::internalSetHibernationMethod(TDESystemHibernationMethod::TDESystemHibernationMethod hm) { void TDERootSystemDevice::internalSetHibernationMethod(TDESystemHibernationMethod::TDESystemHibernationMethod hm) {
m_hibernationMethod = hm; m_hibernationMethod = hm;
} }
@ -115,11 +107,11 @@ bool TDERootSystemDevice::canSetHibernationMethod() {
return FALSE; return FALSE;
} }
bool TDERootSystemDevice::canStandby() { bool TDERootSystemDevice::canFreeze() {
TQString statenode = "/sys/power/state"; TQString statenode = "/sys/power/state";
int rval = access (statenode.ascii(), W_OK); int rval = access (statenode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
if (powerStates().contains(TDESystemPowerState::Standby)) { if (powerStates().contains(TDESystemPowerState::Freeze)) {
return TRUE; return TRUE;
} }
else { else {
@ -131,12 +123,12 @@ bool TDERootSystemDevice::canStandby() {
{ {
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) { if (dbusConn.isConnected()) {
// can standby? // can freeze?
TQT_DBusMessage msg = TQT_DBusMessage::methodCall( TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
"org.trinitydesktop.hardwarecontrol", "org.trinitydesktop.hardwarecontrol",
"/org/trinitydesktop/hardwarecontrol", "/org/trinitydesktop/hardwarecontrol",
"org.trinitydesktop.hardwarecontrol.Power", "org.trinitydesktop.hardwarecontrol.Power",
"CanStandby"); "CanFreeze");
TQT_DBusMessage reply = dbusConn.sendWithReply(msg); TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toBool(); return reply[0].toBool();
@ -148,11 +140,11 @@ bool TDERootSystemDevice::canStandby() {
return FALSE; return FALSE;
} }
bool TDERootSystemDevice::canFreeze() { bool TDERootSystemDevice::canStandby() {
TQString statenode = "/sys/power/state"; TQString statenode = "/sys/power/state";
int rval = access (statenode.ascii(), W_OK); int rval = access (statenode.ascii(), W_OK);
if (rval == 0) { if (rval == 0) {
if (powerStates().contains(TDESystemPowerState::Freeze)) { if (powerStates().contains(TDESystemPowerState::Standby)) {
return TRUE; return TRUE;
} }
else { else {
@ -164,12 +156,12 @@ bool TDERootSystemDevice::canFreeze() {
{ {
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) { if (dbusConn.isConnected()) {
// can freeze? // can standby?
TQT_DBusMessage msg = TQT_DBusMessage::methodCall( TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
"org.trinitydesktop.hardwarecontrol", "org.trinitydesktop.hardwarecontrol",
"/org/trinitydesktop/hardwarecontrol", "/org/trinitydesktop/hardwarecontrol",
"org.trinitydesktop.hardwarecontrol.Power", "org.trinitydesktop.hardwarecontrol.Power",
"CanFreeze"); "CanStandby");
TQT_DBusMessage reply = dbusConn.sendWithReply(msg); TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toBool(); return reply[0].toBool();
@ -294,13 +286,13 @@ bool TDERootSystemDevice::canSuspend() {
return FALSE; return FALSE;
} }
bool TDERootSystemDevice::canHibernate() { bool TDERootSystemDevice::canHybridSuspend() {
TQString statenode = "/sys/power/state"; TQString statenode = "/sys/power/state";
TQString disknode = "/sys/power/disk"; TQString disknode = "/sys/power/disk";
int state_rval = access (statenode.ascii(), W_OK); int state_rval = access (statenode.ascii(), W_OK);
int disk_rval = access (disknode.ascii(), W_OK); int disk_rval = access (disknode.ascii(), W_OK);
if (state_rval == 0 && disk_rval == 0) { if (state_rval == 0 && disk_rval == 0) {
if (powerStates().contains(TDESystemPowerState::Hibernate)) { if (powerStates().contains(TDESystemPowerState::HybridSuspend)) {
return TRUE; return TRUE;
} }
else { else {
@ -312,12 +304,12 @@ bool TDERootSystemDevice::canHibernate() {
{ {
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) { if (dbusConn.isConnected()) {
// can hibernate? // can hybrid suspend?
TQT_DBusMessage msg = TQT_DBusMessage::methodCall( TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
"org.freedesktop.login1", "org.freedesktop.login1",
"/org/freedesktop/login1", "/org/freedesktop/login1",
"org.freedesktop.login1.Manager", "org.freedesktop.login1.Manager",
"CanHibernate"); "CanHybridSleep");
TQT_DBusMessage reply = dbusConn.sendWithReply(msg); TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return (reply[0].toString() == "yes"); return (reply[0].toString() == "yes");
@ -326,41 +318,8 @@ bool TDERootSystemDevice::canHibernate() {
} }
#endif // WITH_LOGINDPOWER #endif // WITH_LOGINDPOWER
#ifdef WITH_UPOWER // No support "hybrid suspend" in org.freedesktop.UPower
{ // No support "hybrid suspend" in org.freedesktop.DeviceKit.Power
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) {
TQT_DBusProxy upowerProperties("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", dbusConn);
if (upowerProperties.canSend()) {
// can hibernate?
TQValueList<TQT_DBusData> params;
params << TQT_DBusData::fromString(upowerProperties.interface()) << TQT_DBusData::fromString("CanHibernate");
TQT_DBusMessage reply = upowerProperties.sendWithReply("Get", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toVariant().value.toBool();
}
}
}
}
#endif// WITH_UPOWER
#ifdef WITH_DEVKITPOWER
{
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) {
TQT_DBusProxy devkitpowerProperties("org.freedesktop.DeviceKit.Power", "/org/freedesktop/DeviceKit/Power", "org.freedesktop.DBus.Properties", dbusConn);
if (devkitpowerProperties.canSend()) {
// can hibernate?
TQValueList<TQT_DBusData> params;
params << TQT_DBusData::fromString(devkitpowerProperties.interface()) << TQT_DBusData::fromString("CanHibernate");
TQT_DBusMessage reply = devkitpowerProperties.sendWithReply("Get", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toVariant().value.toBool();
}
}
}
}
#endif// WITH_DEVKITPOWER
#ifdef WITH_HAL #ifdef WITH_HAL
{ {
@ -368,17 +327,11 @@ bool TDERootSystemDevice::canHibernate() {
if (dbusConn.isConnected()) { if (dbusConn.isConnected()) {
TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn); TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn);
if (halProperties.canSend()) { if (halProperties.canSend()) {
// can hibernate? // can hybrid suspend?
TQValueList<TQT_DBusData> params; TQValueList<TQT_DBusData> params;
TQT_DBusMessage reply; TQT_DBusMessage reply;
params.clear(); params.clear();
params << TQT_DBusData::fromString("power_management.can_hibernate"); params << TQT_DBusData::fromString("power_management.can_suspend_hybrid");
reply = halProperties.sendWithReply("GetPropertyBoolean", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toBool();
}
params.clear();
params << TQT_DBusData::fromString("power_management.can_suspend_to_disk");
reply = halProperties.sendWithReply("GetPropertyBoolean", params); reply = halProperties.sendWithReply("GetPropertyBoolean", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toBool(); return reply[0].toBool();
@ -392,12 +345,12 @@ bool TDERootSystemDevice::canHibernate() {
{ {
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) { if (dbusConn.isConnected()) {
// can hibernate? // can hybrid suspend?
TQT_DBusMessage msg = TQT_DBusMessage::methodCall( TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
"org.trinitydesktop.hardwarecontrol", "org.trinitydesktop.hardwarecontrol",
"/org/trinitydesktop/hardwarecontrol", "/org/trinitydesktop/hardwarecontrol",
"org.trinitydesktop.hardwarecontrol.Power", "org.trinitydesktop.hardwarecontrol.Power",
"CanHibernate"); "CanHybridSuspend");
TQT_DBusMessage reply = dbusConn.sendWithReply(msg); TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toBool(); return reply[0].toBool();
@ -409,13 +362,13 @@ bool TDERootSystemDevice::canHibernate() {
return FALSE; return FALSE;
} }
bool TDERootSystemDevice::canHybridSuspend() { bool TDERootSystemDevice::canHibernate() {
TQString statenode = "/sys/power/state"; TQString statenode = "/sys/power/state";
TQString disknode = "/sys/power/disk"; TQString disknode = "/sys/power/disk";
int state_rval = access (statenode.ascii(), W_OK); int state_rval = access (statenode.ascii(), W_OK);
int disk_rval = access (disknode.ascii(), W_OK); int disk_rval = access (disknode.ascii(), W_OK);
if (state_rval == 0 && disk_rval == 0) { if (state_rval == 0 && disk_rval == 0) {
if (powerStates().contains(TDESystemPowerState::HybridSuspend)) { if (powerStates().contains(TDESystemPowerState::Hibernate)) {
return TRUE; return TRUE;
} }
else { else {
@ -427,12 +380,12 @@ bool TDERootSystemDevice::canHybridSuspend() {
{ {
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) { if (dbusConn.isConnected()) {
// can hybrid suspend? // can hibernate?
TQT_DBusMessage msg = TQT_DBusMessage::methodCall( TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
"org.freedesktop.login1", "org.freedesktop.login1",
"/org/freedesktop/login1", "/org/freedesktop/login1",
"org.freedesktop.login1.Manager", "org.freedesktop.login1.Manager",
"CanHybridSleep"); "CanHibernate");
TQT_DBusMessage reply = dbusConn.sendWithReply(msg); TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return (reply[0].toString() == "yes"); return (reply[0].toString() == "yes");
@ -441,8 +394,41 @@ bool TDERootSystemDevice::canHybridSuspend() {
} }
#endif // WITH_LOGINDPOWER #endif // WITH_LOGINDPOWER
// No support "hybrid suspend" in org.freedesktop.UPower #ifdef WITH_UPOWER
// No support "hybrid suspend" in org.freedesktop.DeviceKit.Power {
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) {
TQT_DBusProxy upowerProperties("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", dbusConn);
if (upowerProperties.canSend()) {
// can hibernate?
TQValueList<TQT_DBusData> params;
params << TQT_DBusData::fromString(upowerProperties.interface()) << TQT_DBusData::fromString("CanHibernate");
TQT_DBusMessage reply = upowerProperties.sendWithReply("Get", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toVariant().value.toBool();
}
}
}
}
#endif// WITH_UPOWER
#ifdef WITH_DEVKITPOWER
{
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) {
TQT_DBusProxy devkitpowerProperties("org.freedesktop.DeviceKit.Power", "/org/freedesktop/DeviceKit/Power", "org.freedesktop.DBus.Properties", dbusConn);
if (devkitpowerProperties.canSend()) {
// can hibernate?
TQValueList<TQT_DBusData> params;
params << TQT_DBusData::fromString(devkitpowerProperties.interface()) << TQT_DBusData::fromString("CanHibernate");
TQT_DBusMessage reply = devkitpowerProperties.sendWithReply("Get", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toVariant().value.toBool();
}
}
}
}
#endif// WITH_DEVKITPOWER
#ifdef WITH_HAL #ifdef WITH_HAL
{ {
@ -450,11 +436,17 @@ bool TDERootSystemDevice::canHybridSuspend() {
if (dbusConn.isConnected()) { if (dbusConn.isConnected()) {
TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn); TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn);
if (halProperties.canSend()) { if (halProperties.canSend()) {
// can hybrid suspend? // can hibernate?
TQValueList<TQT_DBusData> params; TQValueList<TQT_DBusData> params;
TQT_DBusMessage reply; TQT_DBusMessage reply;
params.clear(); params.clear();
params << TQT_DBusData::fromString("power_management.can_suspend_hybrid"); params << TQT_DBusData::fromString("power_management.can_hibernate");
reply = halProperties.sendWithReply("GetPropertyBoolean", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toBool();
}
params.clear();
params << TQT_DBusData::fromString("power_management.can_suspend_to_disk");
reply = halProperties.sendWithReply("GetPropertyBoolean", params); reply = halProperties.sendWithReply("GetPropertyBoolean", params);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toBool(); return reply[0].toBool();
@ -468,12 +460,12 @@ bool TDERootSystemDevice::canHybridSuspend() {
{ {
TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
if (dbusConn.isConnected()) { if (dbusConn.isConnected()) {
// can hybrid suspend? // can hibernate?
TQT_DBusMessage msg = TQT_DBusMessage::methodCall( TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
"org.trinitydesktop.hardwarecontrol", "org.trinitydesktop.hardwarecontrol",
"/org/trinitydesktop/hardwarecontrol", "/org/trinitydesktop/hardwarecontrol",
"org.trinitydesktop.hardwarecontrol.Power", "org.trinitydesktop.hardwarecontrol.Power",
"CanHybridSuspend"); "CanHibernate");
TQT_DBusMessage reply = dbusConn.sendWithReply(msg); TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
return reply[0].toBool(); return reply[0].toBool();

36
tdecore/tdehw/tderootsystemdevice.h
Unescape Escape View File

@ -43,10 +43,19 @@ enum TDESystemPowerState {
PowerOff, PowerOff,
Reboot, Reboot,
HybridSuspend, HybridSuspend,
Mem, // Used temporarily to detect suspend-to-RAM capability
Disk // Used temporarily to detect hibernation and hybrid suspend capability Disk // Used temporarily to detect hibernation and hybrid suspend capability
}; };
}; };
namespace TDESystemSuspendMode {
enum TDESystemSuspendMode {
SuspendToIdle, // a.k.a. Freeze
Standby,
SuspendToRAM // a.k.a. Suspend
};
};
namespace TDESystemHibernationMethod { namespace TDESystemHibernationMethod {
enum TDESystemHibernationMethod { enum TDESystemHibernationMethod {
Unsupported, Unsupported,
@ -60,6 +69,7 @@ enum TDESystemHibernationMethod {
}; };
typedef TQValueList<TDESystemPowerState::TDESystemPowerState> TDESystemPowerStateList; typedef TQValueList<TDESystemPowerState::TDESystemPowerState> TDESystemPowerStateList;
typedef TQValueList<TDESystemSuspendMode::TDESystemSuspendMode> TDESystemSuspendModeList;
typedef TQValueList<TDESystemHibernationMethod::TDESystemHibernationMethod> TDESystemHibernationMethodList; typedef TQValueList<TDESystemHibernationMethod::TDESystemHibernationMethod> TDESystemHibernationMethodList;
class TDECORE_EXPORT TDERootSystemDevice : public TDEGenericDevice class TDECORE_EXPORT TDERootSystemDevice : public TDEGenericDevice
@ -86,16 +96,6 @@ class TDECORE_EXPORT TDERootSystemDevice : public TDEGenericDevice
*/ */
TDESystemPowerStateList powerStates(); TDESystemPowerStateList powerStates();
/**
* @return a TDESystemHibernationMethodList with all available hibernation methods
*/
TDESystemHibernationMethodList hibernationMethods();
/**
* @return a TDESystemHibernationMethod::TDESystemHibernationMethod with the current hibernation method
*/
TDESystemHibernationMethod::TDESystemHibernationMethod hibernationMethod();
/** /**
* @return an unsigned long with the number of bytes required to hibernate * @return an unsigned long with the number of bytes required to hibernate
*/ */
@ -107,14 +107,14 @@ class TDECORE_EXPORT TDERootSystemDevice : public TDEGenericDevice
bool canSetHibernationMethod(); bool canSetHibernationMethod();
/** /**
* @return TRUE if hardware and permissions allow the system to enter standby, FALSE if not * @return TRUE if hardware and permissions allow the system to enter freeze state, FALSE if not
*/ */
bool canStandby(); bool canFreeze();
/** /**
* @return TRUE if hardware and permissions allow the system to enter freeze state, FALSE if not * @return TRUE if hardware and permissions allow the system to enter standby, FALSE if not
*/ */
bool canFreeze(); bool canStandby();
/** /**
* @return TRUE if hardware and permissions allow the system to be suspended, FALSE if not * @return TRUE if hardware and permissions allow the system to be suspended, FALSE if not
@ -122,14 +122,14 @@ class TDECORE_EXPORT TDERootSystemDevice : public TDEGenericDevice
bool canSuspend(); bool canSuspend();
/** /**
* @return TRUE if hardware and permissions allow the system to be hibernated, FALSE if not * @return TRUE if hardware and permissions allow the system to be hybrid suspended, FALSE if not
*/ */
bool canHibernate(); bool canHybridSuspend();
/** /**
* @return TRUE if hardware and permissions allow the system to be hybrid suspended, FALSE if not * @return TRUE if hardware and permissions allow the system to be hibernated, FALSE if not
*/ */
bool canHybridSuspend(); bool canHibernate();
/** /**
* @return TRUE if permissions allow the system to be powered down, FALSE if not * @return TRUE if permissions allow the system to be powered down, FALSE if not

Write Preview
Loading…
Cancel
Save