source: pkg/main/gnome-power-manager/trunk/debian/patches/55-lid-state-tracking.patch @ 196

gnome-power-manager-2.15.90

@@ -214 +214 @@
         return can_suspend;
 }
 
+/** Finds out if HAL indicates it can monitor lid status
+ *
+ *  @return            TRUE if hal has state information for the lid
+ */
+gboolean
+gpm_hal_lid_is_closed_capable (GpmHal   *hal)
+{
+       gboolean exists;
+       gboolean can_monitor;
+       exists = gpm_hal_device_get_bool (hal, HAL_ACPI_LID_SWITCH,
+                                         "button.has_state",
+                                         &can_monitor);
+       return exists && can_monitor;
+}
+
+/** Assuming we can monitor, returns the status of the lid switch
+ *
+ *  @return            TRUE if lid is closed
+ */
+gboolean
+gpm_hal_lid_is_closed (GpmHal   *hal)
+{
+       gboolean exists;
+       gboolean lid_state;
+       exists = gpm_hal_device_get_bool (hal, HAL_ACPI_LID_SWITCH,
+                                         "button.state.value",
+                                         &lid_state);
+       if (!exists)
+               gpm_warning ("gpm_hal_lid_is_closed: button.state.value does not exist in acpi_LID object");
+       gpm_debug ("Lid status: %s", (exists && lid_state)?"closed":"open");
+       return exists && lid_state;
+}
+
+
 /**
  * gpm_hal_can_hibernate:
  *

gnome-power-manager-2.15.90

@@ -33 +33 @@
 #define HAL_DBUS_INTERFACE_LAPTOP_PANEL "org.freedesktop.Hal.Device.LaptopPanel"
 #define HAL_DBUS_INTERFACE_POWER        "org.freedesktop.Hal.Device.SystemPowerManagement"
 #define HAL_ROOT_COMPUTER               "/org/freedesktop/Hal/devices/computer"
+#define HAL_ACPI_LID_SWITCH             "/org/freedesktop/Hal/devices/acpi_LID"
 
 #define GPM_TYPE_HAL            (gpm_hal_get_type ())
 #define GPM_HAL(o)              (G_TYPE_CHECK_INSTANCE_CAST ((o), GPM_TYPE_HAL, GpmHal))
@@ -96 +97 @@
 gboolean         gpm_hal_is_running                     (GpmHal         *hal);
 gboolean         gpm_hal_is_laptop                      (GpmHal         *hal);
 gboolean         gpm_hal_is_on_ac                       (GpmHal         *hal);
+gboolean         gpm_hal_lid_is_closed                  (GpmHal *hal);
+gboolean         gpm_hal_lid_is_closed_capable          (GpmHal *hal);
 gboolean         gpm_hal_can_suspend                    (GpmHal         *hal);
 gboolean         gpm_hal_suspend                        (GpmHal         *hal,
                                                          gint            wakeup);

gnome-power-manager-2.15.90

@@ -126 +126 @@
 
         gboolean         use_time_to_notify;
         gboolean         lid_is_closed;
+        gboolean         lid_can_use_hal;
         gboolean         done_notify_fully_charged;
         gboolean         enable_beeping;
         gboolean         ignore_inhibits;
@@ -359 +360 @@
         return TRUE;
 }
 
+static gboolean
+gpm_manager_lid_is_closed(GpmManager *manager)
+{
+       /* Can we use hal? */
+       if (manager->priv->lid_can_use_hal)
+               return gpm_hal_lid_is_closed (manager->priv->hal);
+       return manager->priv->lid_is_closed;
+}
+
 /**
  * get_stock_id:
  * @manager: This manager class instance
@@ -1351 +1361 @@
            the screen when the user moves the mouse on systems that do not
            support hardware blanking.
            Details are here: https://launchpad.net/malone/bugs/22522 */
-        if (manager->priv->lid_is_closed) {
+        if (gpm_manager_lid_is_closed(manager)) {
                 gpm_debug ("lid is closed, so we are ignoring idle state changes");
                 return;
         }
@@ -1715 +1725 @@
         gboolean event_when_closed;
         event_when_closed = gconf_client_get_bool (manager->priv->gconf_client,
                                                    GPM_PREF_BATT_EVENT_WHEN_CLOSED, NULL);
-        if (event_when_closed && (!on_ac) && manager->priv->lid_is_closed) {
+        if (event_when_closed && (!on_ac) && gpm_manager_lid_is_closed (manager)) {
                 manager_policy_do (manager,
                                    GPM_PREF_BATTERY_BUTTON_LID,
                                    _("the lid has been closed, and the ac adapter "
@@ -2575 +2585 @@
 
         /* FIXME: We shouldn't assume the lid is open at startup */
         manager->priv->lid_is_closed = FALSE;
+        manager->priv->lid_can_use_hal = gpm_hal_lid_is_closed_capable (manager->priv->hal);
+        if (manager->priv->lid_can_use_hal)
+                gpm_debug("Using hal to monitor lid status");
+        manager->priv->lid_is_closed = gpm_manager_lid_is_closed (manager);
 
         /* we need these to refresh the tooltip and icon */
         g_signal_connect (manager->priv->power, "battery-removed",