csd-power-manager.c: Don't turn monitors off before suspend/hibernate. (#442)

* csd-power-manager.c: Don't turn monitors off before suspend/hibernate.

This happens automatically anyhow, and doing it here, pre-emptively,
can interfere with proper hiding of the desktop by the screensaver.

Put a small delay before turning monitors off during the 'BLANK'
action (like when "Lock Screen" is the close-lid action), to allow
the screensaver to be fully effective.

* Increase delay in blanking, track source ID so it can be cancelled
if state changes early.

Author: mtwebster

plugins/power/csd-power-manager.c

@@ -182,6 +182,7 @@ struct CsdPowerManagerPrivate
 
         guint                    lid_close_safety_timer_id;
         guint                    xscreensaver_watchdog_timer_id;
+        guint                    turn_monitors_off_id;
         gboolean                 is_virtual_machine;
         gint                     fd_close_loop_end;
 
@@ -1889,12 +1890,14 @@ cinnamon_session_shutdown (void)
         g_object_unref (proxy);
 }
 
-static void
+static gboolean
 turn_monitors_off (CsdPowerManager *manager)
 {
     gboolean ret;
     GError *error = NULL;
 
+    manager->priv->turn_monitors_off_id = 0;
+
     ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
                                          GNOME_RR_DPMS_OFF,
                                          &error);
@@ -1903,6 +1906,14 @@ turn_monitors_off (CsdPowerManager *manager)
                        error->message);
             g_error_free (error);
     }
+
+    return G_SOURCE_REMOVE;
+}
+
+static void
+cancel_turn_monitors_off (CsdPowerManager *manager)
+{
+    g_clear_handle_id (&manager->priv->turn_monitors_off_id, g_source_remove);
 }
 
 static void
@@ -1915,8 +1926,6 @@ do_power_action_type (CsdPowerManager *manager,
                         activate_screensaver (manager, TRUE);
                 }
 
-                turn_monitors_off (manager);
-
                 gboolean hybrid = g_settings_get_boolean (manager->priv->settings_cinnamon_session,
                                                           "prefer-hybrid-sleep");
                 gboolean suspend_then_hibernate = g_settings_get_boolean (manager->priv->settings_cinnamon_session,
@@ -1932,7 +1941,6 @@ do_power_action_type (CsdPowerManager *manager,
                         activate_screensaver (manager, TRUE);
                 }
 
-                turn_monitors_off (manager);
                 csd_power_hibernate ();
                 break;
         case CSD_POWER_ACTION_SHUTDOWN:
@@ -1945,7 +1953,7 @@ do_power_action_type (CsdPowerManager *manager,
                 /* Lock first or else xrandr might reconfigure stuff and the ss's coverage
                  * may be incorrect upon return. */
                 activate_screensaver (manager, FALSE);
-                turn_monitors_off (manager);
+                manager->priv->turn_monitors_off_id = g_timeout_add_seconds (2, (GSourceFunc) turn_monitors_off, manager);
                 break;
         case CSD_POWER_ACTION_NOTHING:
                 break;
@@ -2182,6 +2190,8 @@ do_lid_open_action (CsdPowerManager *manager)
         gboolean ret;
         GError *error = NULL;
 
+        cancel_turn_monitors_off (manager);
+
         /* play a sound, using sounds from the naming spec */
         ca_context_play (manager->priv->canberra_context, 0,
                          CA_PROP_EVENT_ID, "lid-open",
@@ -3058,6 +3068,8 @@ idle_set_mode (CsdPowerManager *manager, CsdPowerIdleMode mode)
         /* turn on screen and restore user-selected brightness level */
         } else if (mode == CSD_POWER_IDLE_MODE_NORMAL) {
 
+                cancel_turn_monitors_off (manager);
+
                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
                                                      GNOME_RR_DPMS_ON,
                                                      &error);
@@ -3966,9 +3978,6 @@ handle_suspend_actions (CsdPowerManager *manager)
 static void
 handle_resume_actions (CsdPowerManager *manager)
 {
-        gboolean ret;
-        GError *error = NULL;
-
         /* this displays the unlock dialogue so the user doesn't have
          * to move the mouse or press any key before the window comes up */
         g_dbus_connection_call (manager->priv->connection,
@@ -3985,16 +3994,6 @@ handle_resume_actions (CsdPowerManager *manager)
         notify_close_if_showing (manager->priv->notification_low);
         notify_close_if_showing (manager->priv->notification_discharging);
 
-        /* ensure we turn the panel back on after resume */
-        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-                                             GNOME_RR_DPMS_ON,
-                                             &error);
-        if (!ret) {
-                g_warning ("failed to turn the panel on after resume: %s",
-                           error->message);
-                g_error_free (error);
-        }
-
         /* set up the delay again */
         inhibit_suspend (manager);
 }