Merge lp:~justinmcp/oxide/1328494 into lp:~oxide-developers/oxide/oxide.trunk

[Justin McPherson]

Request that the screensaver be inhibited (desktop)

This adds to the already existing code to do this by activating the desktop path.

[lp:~justinmcp/oxide/1328494]

1162. By Justin McPherson on 2015-07-09

Be more specific about type

[Chris Coulson (chrisccoulson)]

Thanks. This looks mostly ok - I've just left a few minor comments

review: Needs Fixing

[lp:~justinmcp/oxide/1328494]

1163. By Justin McPherson on 2015-07-22

Merge from trunk.

1164. By Justin McPherson on 2015-07-22

Results of review.

1165. By Justin McPherson on 2015-07-22

Remove unnecessary header include.

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.cc'
--- qt/core/browser/oxide_qt_browser_platform_integration.cc	2015-06-22 23:56:59 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.cc	2015-07-22 04:34:45 +0000
@@ -162,6 +162,10 @@
   return state_;
 }
 
+std::string BrowserPlatformIntegration::GetApplicationName() {
+  return qApp->applicationName().toStdString();
+}
+
 bool BrowserPlatformIntegration::eventFilter(QObject* watched, QEvent* event) {
   if (event->type() == QEvent::ApplicationActivate ||
       event->type() == QEvent::ApplicationDeactivate) {

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.h'
--- qt/core/browser/oxide_qt_browser_platform_integration.h	2015-06-12 07:39:38 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.h	2015-07-22 04:34:45 +0000
@@ -57,6 +57,7 @@
   void BrowserThreadInit(content::BrowserThread::ID id) override;
   content::LocationProvider* CreateLocationProvider() override;
   ApplicationState GetApplicationState() override;
+  std::string GetApplicationName() override;
   ui::ClipboardOxideFactory GetClipboardOxideFactory() override;
 
   // QObject implementation

=== modified file 'shared/browser/oxide_browser_platform_integration.cc'
--- shared/browser/oxide_browser_platform_integration.cc	2015-05-27 20:56:59 +0000
+++ shared/browser/oxide_browser_platform_integration.cc	2015-07-22 04:34:45 +0000
@@ -25,6 +25,8 @@
 
 namespace {
 
+const char kDefaultApplicationName[] = "Oxide";
+
 BrowserPlatformIntegration* g_instance;
 
 }
@@ -74,6 +76,10 @@
   return APPLICATION_STATE_ACTIVE;
 }
 
+std::string BrowserPlatformIntegration::GetApplicationName() {
+  return kDefaultApplicationName;
+}
+
 void BrowserPlatformIntegration::AddObserver(
     BrowserPlatformIntegrationObserver* observer) {
   observers_.AddObserver(observer);

=== modified file 'shared/browser/oxide_browser_platform_integration.h'
--- shared/browser/oxide_browser_platform_integration.h	2015-06-12 07:39:38 +0000
+++ shared/browser/oxide_browser_platform_integration.h	2015-07-22 04:34:45 +0000
@@ -18,6 +18,8 @@
 #ifndef _OXIDE_SHARED_BROWSER_PLATFORM_INTEGRATION_H_
 #define _OXIDE_SHARED_BROWSER_PLATFORM_INTEGRATION_H_
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
@@ -96,6 +98,9 @@
   // Get the current application state
   virtual ApplicationState GetApplicationState();
 
+  // Get the application name
+  virtual std::string GetApplicationName();
+
  protected:
   BrowserPlatformIntegration();
 

=== modified file 'shared/browser/oxide_power_save_blocker.cc'
--- shared/browser/oxide_power_save_blocker.cc	2015-05-27 20:56:59 +0000
+++ shared/browser/oxide_power_save_blocker.cc	2015-07-22 04:34:45 +0000
@@ -31,6 +31,7 @@
 
 #include "shared/port/content/browser/power_save_blocker_oxide.h"
 
+#include "oxide_browser_platform_integration.h"
 #include "oxide_browser_platform_integration_observer.h"
 #include "oxide_form_factor.h"
 
@@ -43,12 +44,18 @@
 const char kUnityScreenInterface[] = "com.canonical.Unity.Screen";
 const int kInvalidCookie = -1;
 
+const char kFreeDesktopScreenSaverName[] = "org.freedesktop.ScreenSaver";
+const char kFreeDesktopScreenSaverPath[] = "/org/freedesktop/ScreenSaver";
+const char kFreeDestopScreenSaverInterface[] = "org.freedesktop.ScreenSaver";
+
+const char kDefaultInhibitReason[] = "Active Application";
+
 }
 
 class PowerSaveBlocker : public content::PowerSaveBlockerOxideDelegate,
                          public BrowserPlatformIntegrationObserver {
  public:
-  PowerSaveBlocker();
+  PowerSaveBlocker(const std::string& description);
 
  private:
   virtual ~PowerSaveBlocker() {}
@@ -59,12 +66,22 @@
   void ApplyBlock();
   void RemoveBlock();
 
+  void ApplyBlockUnityScreenService();
+  void RemoveBlockUnityScreenService();
+
+  void ApplyBlockFreedesktop();
+  void RemoveBlockFreedesktop();
+
   // BrowserPlatformIntegrationObserver implementation
   void ApplicationStateChanged() final;
 
   oxide::FormFactor form_factor_;
   scoped_refptr<dbus::Bus> bus_;
-  int cookie_;
+  union {
+    int32_t unity_cookie_;
+    uint32_t freedesktop_cookie_;
+  };
+  std::string description_;
 };
 
 void PowerSaveBlocker::Init() {
@@ -89,34 +106,9 @@
 
   if (form_factor_ == oxide::FORM_FACTOR_PHONE ||
       form_factor_ == oxide::FORM_FACTOR_TABLET) {
-    DCHECK(!bus_.get());
-    dbus::Bus::Options options;
-    options.bus_type = dbus::Bus::SYSTEM;
-    options.connection_type = dbus::Bus::PRIVATE;
-    bus_ = new dbus::Bus(options);
-
-    scoped_refptr<dbus::ObjectProxy> object_proxy = bus_->GetObjectProxy(
-          kUnityScreenServiceName,
-          dbus::ObjectPath(kUnityScreenPath));
-    scoped_ptr<dbus::MethodCall> method_call;
-    method_call.reset(
-        new dbus::MethodCall(kUnityScreenInterface, "keepDisplayOn"));
-    scoped_ptr<dbus::MessageWriter> message_writer;
-    message_writer.reset(new dbus::MessageWriter(method_call.get()));
-
-    scoped_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock(
-        method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
-    if (response) {
-      dbus::MessageReader message_reader(response.get());
-      if (!message_reader.PopInt32(&cookie_)) {
-        LOG(ERROR) << "Invalid response for screen blanking inhibition request: "
-                   << response->ToString();
-      }
-    } else {
-      LOG(ERROR) << "Failed to inhibit screen blanking";
-    }
+    ApplyBlockUnityScreenService();
   } else {
-    NOTIMPLEMENTED();
+    ApplyBlockFreedesktop();
   }
 }
 
@@ -125,27 +117,121 @@
 
   if (form_factor_ == oxide::FORM_FACTOR_PHONE ||
       form_factor_ == oxide::FORM_FACTOR_TABLET) {
-    if (cookie_ != kInvalidCookie) {
-      DCHECK(bus_.get());
-      scoped_refptr<dbus::ObjectProxy> object_proxy = bus_->GetObjectProxy(
-          kUnityScreenServiceName,
-          dbus::ObjectPath(kUnityScreenPath));
-      scoped_ptr<dbus::MethodCall> method_call;
-      method_call.reset(
-          new dbus::MethodCall(kUnityScreenInterface, "removeDisplayOnRequest"));
-      dbus::MessageWriter message_writer(method_call.get());
-      message_writer.AppendInt32(cookie_);
-      object_proxy->CallMethodAndBlock(
-          method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
-      cookie_ = kInvalidCookie;
-    }
-
-    if (bus_.get()) {
-      bus_->ShutdownAndBlock();
-      bus_ = nullptr;
-    }
-  } else {
-    NOTIMPLEMENTED();
+    RemoveBlockUnityScreenService();
+  } else {
+    RemoveBlockFreedesktop();
+  }
+}
+
+void PowerSaveBlocker::ApplyBlockUnityScreenService() {
+  DCHECK(!bus_.get());
+  dbus::Bus::Options options;
+  options.bus_type = dbus::Bus::SYSTEM;
+  options.connection_type = dbus::Bus::PRIVATE;
+  bus_ = new dbus::Bus(options);
+
+  scoped_refptr<dbus::ObjectProxy> object_proxy = bus_->GetObjectProxy(
+        kUnityScreenServiceName,
+        dbus::ObjectPath(kUnityScreenPath));
+  scoped_ptr<dbus::MethodCall> method_call;
+  method_call.reset(
+      new dbus::MethodCall(kUnityScreenInterface, "keepDisplayOn"));
+  scoped_ptr<dbus::MessageWriter> message_writer;
+  message_writer.reset(new dbus::MessageWriter(method_call.get()));
+
+  scoped_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock(
+      method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
+  if (response) {
+    dbus::MessageReader message_reader(response.get());
+    if (!message_reader.PopInt32(&unity_cookie_)) {
+      LOG(ERROR) << "Invalid response for screen blanking inhibition request: "
+                 << response->ToString();
+    }
+  } else {
+    LOG(ERROR) << "Failed to inhibit screen blanking";
+  }
+}
+
+void PowerSaveBlocker::RemoveBlockUnityScreenService() {
+  if (unity_cookie_ != kInvalidCookie) {
+    DCHECK(bus_.get());
+    scoped_refptr<dbus::ObjectProxy> object_proxy = bus_->GetObjectProxy(
+        kUnityScreenServiceName,
+        dbus::ObjectPath(kUnityScreenPath));
+    scoped_ptr<dbus::MethodCall> method_call;
+    method_call.reset(
+        new dbus::MethodCall(kUnityScreenInterface, "removeDisplayOnRequest"));
+    dbus::MessageWriter message_writer(method_call.get());
+    message_writer.AppendInt32(unity_cookie_);
+    object_proxy->CallMethodAndBlock(
+        method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
+    unity_cookie_ = kInvalidCookie;
+  }
+
+  if (bus_.get()) {
+    bus_->ShutdownAndBlock();
+    bus_ = nullptr;
+  }
+}
+
+void PowerSaveBlocker::ApplyBlockFreedesktop() {
+  std::string application_name =
+      BrowserPlatformIntegration::GetInstance()->GetApplicationName();
+  std::string description{kDefaultInhibitReason};
+
+  if (!description_.empty()) {
+    description = description_;
+  }
+
+  DCHECK(!bus_.get());
+  dbus::Bus::Options options;
+  options.bus_type = dbus::Bus::SESSION;
+  options.connection_type = dbus::Bus::PRIVATE;
+  bus_ = new dbus::Bus(options);
+
+  scoped_refptr<dbus::ObjectProxy> object_proxy = bus_->GetObjectProxy(
+        kFreeDesktopScreenSaverName,
+        dbus::ObjectPath(kFreeDesktopScreenSaverPath));
+  scoped_ptr<dbus::MethodCall> method_call;
+  method_call.reset(
+      new dbus::MethodCall(kFreeDestopScreenSaverInterface, "Inhibit"));
+  scoped_ptr<dbus::MessageWriter> message_writer;
+  message_writer.reset(new dbus::MessageWriter(method_call.get()));
+  message_writer->AppendString(application_name);
+  message_writer->AppendString(description);
+
+  scoped_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock(
+      method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
+  if (response) {
+    dbus::MessageReader message_reader(response.get());
+    if (!message_reader.PopUint32(&freedesktop_cookie_)) {
+      LOG(ERROR) << "Invalid response for screen blanking inhibition request: "
+                 << response->ToString();
+    }
+  } else {
+    LOG(ERROR) << "Failed to inhibit screen blanking";
+  }
+}
+
+void PowerSaveBlocker::RemoveBlockFreedesktop() {
+  if (freedesktop_cookie_ != uint32_t(kInvalidCookie)) {
+    DCHECK(bus_.get());
+    scoped_refptr<dbus::ObjectProxy> object_proxy = bus_->GetObjectProxy(
+        kFreeDesktopScreenSaverName,
+        dbus::ObjectPath(kFreeDesktopScreenSaverPath));
+    scoped_ptr<dbus::MethodCall> method_call;
+    method_call.reset(
+        new dbus::MethodCall(kFreeDestopScreenSaverInterface, "UnInhibit"));
+    dbus::MessageWriter message_writer(method_call.get());
+    message_writer.AppendUint32(freedesktop_cookie_);
+    object_proxy->CallMethodAndBlock(
+        method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
+    freedesktop_cookie_ = kInvalidCookie;
+  }
+
+  if (bus_.get()) {
+    bus_->ShutdownAndBlock();
+    bus_ = nullptr;
   }
 }
 
@@ -153,23 +239,25 @@
   BrowserPlatformIntegration::ApplicationState state =
       BrowserPlatformIntegration::GetInstance()->GetApplicationState();
   if (state != BrowserPlatformIntegration::APPLICATION_STATE_SUSPENDED &&
-      cookie_ == kInvalidCookie) {
+      unity_cookie_ == kInvalidCookie) {
     Init();
   } else if (state == BrowserPlatformIntegration::APPLICATION_STATE_SUSPENDED &&
-             cookie_ != kInvalidCookie) {
+             unity_cookie_ != kInvalidCookie) {
     CleanUp();
   }
 }
 
-PowerSaveBlocker::PowerSaveBlocker()
+PowerSaveBlocker::PowerSaveBlocker(const std::string& description)
     : form_factor_(oxide::GetFormFactorHint())
-    , cookie_(kInvalidCookie) {}
+    , unity_cookie_(kInvalidCookie)
+    , description_(description)
+{}
 
 content::PowerSaveBlockerOxideDelegate* CreatePowerSaveBlocker(
     content::PowerSaveBlocker::PowerSaveBlockerType type,
     content::PowerSaveBlocker::Reason reason,
     const std::string& description) {
-  return new PowerSaveBlocker();
+  return new PowerSaveBlocker(description);
 }
 
 } // namespace oxide