Bump mce-dev version to 1.32.0

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

Makefile

@@ -31,11 +31,11 @@ distclean:: clean
 
 DESTDIR    ?= /tmp/test-mce-dev
 
-PCDIR      := /usr/lib/pkgconfig
+PCDIR      ?= /usr/lib/pkgconfig
 INCLUDEDIR := /usr/include/mce
 
-INSTALL_DIR  := install --mode=755 --directory
-INSTALL_DATA := install --mode=644
+INSTALL_DIR  := install -m 755 -d
+INSTALL_DATA := install -m 644
 
 
 # ----------------------------------------------------------------------------

debian/changelog

@@ -1,3 +1,76 @@
+mce-dev (1.32.0) unstable; urgency=low
+
+  * [mce] Add charging suspendable dbus constant. JB#59152
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Tue, 22 Nov 2022 14:22:52 +0200
+
+mce-dev (1.31.0) unstable; urgency=low
+
+  * [mce] Add forced charging D-Bus constants. JB#58372
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Tue, 18 Oct 2022 10:47:06 +0300
+
+mce-dev (1.30.0) unstable; urgency=low
+
+  * [mce] Add charging hysteresis state D-Bus constants. JB#40062
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Tue, 22 Feb 2022 04:19:53 +0200
+
+mce-dev (1.29.0) unstable; urgency=low
+
+  * [mce] Add mouse availability state D-Bus constants. JB#55866
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Mon, 25 Oct 2021 18:09:15 +0300
+
+mce-dev (1.28.3) unstable; urgency=low
+
+  * [mce-dev] Set rpm build arch to noarch
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 01 Sep 2020 11:42:42 +0300
+
+mce-dev (1.28.2) unstable; urgency=low
+
+  * [aarch64] Specify pcdir with use of libdir. Contributes to JB#49681
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 25 May 2020 16:43:30 +0300
+
+mce-dev (1.28.1) unstable; urgency=low
+
+  * [mce-dev] Make the makefile compatible with Busybox
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 07 Apr 2020 09:20:57 +0300
+
+mce-dev (1.28.0) unstable; urgency=low
+
+  * [mce] Add charger state D-Bus constants. JB#44852
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 08 Oct 2019 12:59:35 +0300
+
+mce-dev (1.27.0) unstable; urgency=low
+
+  * [mce] Add charger type D-Bus constants. JB#38667
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 26 Aug 2019 09:36:42 +0300
+
+mce-dev (1.26.1) unstable; urgency=low
+
+  * [mce-dev] fix url. Contributes to JB#33684
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 25 Jun 2019 10:11:01 +0300
+
+mce-dev (1.26.0) unstable; urgency=low
+
+  * [mce] Add D-Bus constants for button backlight mode. JB#42094
+  * [mce] Add missing Doxygen group name tag
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 20 Nov 2018 12:42:26 +0200
+
+mce-dev (1.25.0) unstable; urgency=low
+
+  * [mce] Add blanking pause related D-Bus constants. JB#41340
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 20 Mar 2018 10:07:37 +0200
+
 mce-dev (1.24.0) unstable; urgency=low
 
   * [rpmbuild] Use _smp_mflags instead of jobs macro

include/mce/dbus-names.h

@@ -4,8 +4,9 @@
  * <p>
  * This file is part of mce-dev
  * <p>
- * Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2013-2017 Jolla Ltd.
+ * Copyright (c) 2004 - 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2013 - 2022 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
  * @author Santtu Lakkala <ext-santtu.1.lakkala@nokia.com>
@@ -356,8 +357,20 @@
  *
  * @since mce 0.5
  *
- * If display is on and lockscreen is not active, normal blanking
- * timers are stopped for 60 seconds.
+ * Normal blanking timers are stopped for 60 seconds - under roughly
+ * the following conditions:
+ *
+ * - Display is already on and lockscreen is not active
+ *
+ * - Display is already on, lockscreen is active but
+ *   compositor has notified that user interaction is expected
+ *   and the blanking prevent request originates from the same
+ *   process that owns the topmost window on screen.
+ *
+ * The exact details are subject to change and clients showld
+ * track #MCE_PREVENT_BLANK_ALLOWED_SIG signals to know when
+ * making blank prevention calls are allowed/ignored (and query
+ * the initial state with #MCE_PREVENT_BLANK_ALLOWED_GET).
  *
  * To keep display from blanking for longer periods, the client
  * needs to re-issue this call every 60 seconds.
@@ -365,9 +378,15 @@
  * When application no longer wishes to keep display from blanking,
  * it should make a #MCE_CANCEL_PREVENT_BLANK_REQ method call.
  *
- * @note If client drops from the system bus, it is handled as if
- *       the client would have made a #MCE_CANCEL_PREVENT_BLANK_REQ
- *       call.
+ * @note If client drops from the system bus, or misses the 60 second
+ *       renew period, it is handled as if the client would have made
+ *       a #MCE_CANCEL_PREVENT_BLANK_REQ method call.
+ *
+ * @note Previously mce waited exactly 60 seconds for renew calls
+ *       which meant clients had to use shorter than 60 second
+ *       renew periods to avoid hiccups. Since mce >= 1.93.0
+ *       the hard limit is 65 seconds and thus clients can schedule
+ *       renewing to occur once / 60 seconds.
  */
 # define MCE_PREVENT_BLANK_REQ             "req_display_blanking_pause"
 
@@ -397,6 +416,26 @@
  */
 # define MCE_PREVENT_BLANK_SIG             "display_blanking_pause_ind"
 
+/** Query whether MCE_PREVENT_BLANK_REQ request can be made
+ *
+ * @since 1.93.0
+ *
+ * See #MCE_PREVENT_BLANK_REQ for details.
+ *
+ * @return boolean: true for allowed, false for not allowed
+ */
+# define MCE_PREVENT_BLANK_ALLOWED_GET     "get_display_blanking_pause_allowed"
+
+/** Notify change in whether MCE_PREVENT_BLANK_REQ request can be made
+ *
+ * @since 1.93.0
+ *
+ * See #MCE_PREVENT_BLANK_REQ for details.
+ *
+ * @param boolean: true for allowed, false for not allowed
+ */
+# define MCE_PREVENT_BLANK_ALLOWED_SIG     "display_blanking_pause_allowed_ind"
+
 /*@}*/
 
 /////////////////////////////////////////////////////////////////////////////
@@ -808,6 +847,32 @@
  */
 # define MCE_BATTERY_STATUS_SIG            "battery_status_ind"
 
+/** Query current battery state
+ *
+ * @since mce 1.104.0
+ *
+ * @return string: current battery state, one of:
+ * - #MCE_BATTERY_STATE_UNKNOWN
+ * - #MCE_BATTERY_STATE_CHARGING
+ * - #MCE_BATTERY_STATE_DISCHARGING
+ * - #MCE_BATTERY_STATE_NOT_CHARGING
+ * - #MCE_BATTERY_STATE_FULL
+ */
+#define MCE_BATTERY_STATE_GET              "get_battery_state"
+
+/** Signal that indicates that battery state has changed
+ *
+ * @since mce 1.104.0
+ *
+ * @param battery_state string: current battery state, one of:
+ * - #MCE_BATTERY_STATE_UNKNOWN
+ * - #MCE_BATTERY_STATE_CHARGING
+ * - #MCE_BATTERY_STATE_DISCHARGING
+ * - #MCE_BATTERY_STATE_NOT_CHARGING
+ * - #MCE_BATTERY_STATE_FULL
+ */
+#define MCE_BATTERY_STATE_SIG              "battery_state_ind"
+
 /** Query current battery level
  *
  * @since mce 1.86.0
@@ -824,8 +889,113 @@
  */
 # define MCE_BATTERY_LEVEL_SIG             "battery_level_ind"
 
+/** Query current charger type
+ *
+ * @since mce 1.102.0
+ *
+ * @return string: current charger type, one of:
+ * - #MCE_CHARGER_TYPE_NONE
+ * - #MCE_CHARGER_TYPE_USB
+ * - #MCE_CHARGER_TYPE_DCP
+ * - #MCE_CHARGER_TYPE_HVDCP
+ * - #MCE_CHARGER_TYPE_CDP
+ * - #MCE_CHARGER_TYPE_WIRELESS
+ * - #MCE_CHARGER_TYPE_OTHER
+ */
+# define MCE_CHARGER_TYPE_GET             "get_charger_type"
+
+/** Signal that indicates that charger type has changed
+ *
+ * @since mce 1.102.0
+ *
+ * @param charger_type string: current charger type, one of:
+ * - #MCE_CHARGER_TYPE_NONE
+ * - #MCE_CHARGER_TYPE_USB
+ * - #MCE_CHARGER_TYPE_DCP
+ * - #MCE_CHARGER_TYPE_HVDCP
+ * - #MCE_CHARGER_TYPE_CDP
+ * - #MCE_CHARGER_TYPE_WIRELESS
+ * - #MCE_CHARGER_TYPE_OTHER
+ */
+# define MCE_CHARGER_TYPE_SIG             "charger_type_ind"
+
+/** Query current charging hysteresis state
+ *
+ * @since mce 1.110.0
+ *
+ * @return string: charging hysteresis policy state, one of:
+ * - #MCE_CHARGING_STATE_UNKNOWN
+ * - #MCE_CHARGING_STATE_ENABLED
+ * - #MCE_CHARGING_STATE_DISABLED
+ */
+# define MCE_CHARGING_STATE_GET           "get_charging_state"
+
+/** Signal that indicates that charging hysteresis state has changed
+ *
+ * Charging hysteresis policy decision.
+ *
+ * @since mce 1.110.0
+ *
+ * @param string: charging hysteresis policy state, one of:
+ * - #MCE_CHARGING_STATE_UNKNOWN
+ * - #MCE_CHARGING_STATE_ENABLED
+ * - #MCE_CHARGING_STATE_DISABLED
+ */
+# define MCE_CHARGING_STATE_SIG           "charging_state_ind"
+
+/** Query charge-once-to-full policy override state
+ *
+ * @since mce 1.112.0
+ *
+ * @return string: charge-once-to-full policy override state, one of:
+ * - #MCE_FORCED_CHARGING_UNKNOWN
+ * - #MCE_FORCED_CHARGING_ENABLED
+ * - #MCE_FORCED_CHARGING_DISABLED
+ */
+# define MCE_FORCED_CHARGING_GET           "get_forced_charging"
+
+/** Request charge-once-to-full policy override state change
+ *
+ * @since mce 1.112.0
+ * 
+ * @note Override is automatically disabled if / when
+ *       battery is full or charger is disconnected.
+ *
+ * @param value string: override state, one of:
+ * - #MCE_FORCED_CHARGING_ENABLED
+ * - #MCE_FORCED_CHARGING_DISABLED
+ */
+# define MCE_FORCED_CHARGING_REQ           "req_forced_charging"
+
+/** Signal that indicates that charge-once-to-full policy override state has changed
+ *
+ * Charge-once-to-full policy override decision.
+ *
+ * @since mce 1.112.0
+ *
+ * @param string: charge-once-to-full policy state, one of:
+ * - #MCE_FORCED_CHARGING_UNKNOWN
+ * - #MCE_FORCED_CHARGING_ENABLED
+ * - #MCE_FORCED_CHARGING_DISABLED
+ */
+# define MCE_FORCED_CHARGING_SIG           "forced_charging_ind"
+
+/** Query whether charging can be suspended on this device
+ *
+ * @since mce 1.113.0
+ *
+ * @note As this is a matter of static configuration, the value
+ *       returned does not change during mce runtime and thus
+ *       there is related change signal.
+ *
+ * @return boolean: true if mce can be enable/disable charging, or
+ *                  false if not
+ */
+# define MCE_CHARGING_SUSPENDABLE_GET      "get_charging_suspendable"
+
 /*@}*/
 
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name LED Control
@@ -993,6 +1163,21 @@
  */
 # define MCE_BUTTON_BACKLIGHT_CHANGE_REQ   "req_button_backlight_change"
 
+/** Request button backlight mode change
+ *
+ * @since mce 1.98.0
+ *
+ * For use from the CSD application button backlight verification test.
+ *
+ * Allows bypassing of the button backlight policy and explicitly turn
+ * the backlight on or off.
+ *
+ * @param mode int32: #MCE_BUTTON_BACKLIGHT_MODE_OFF,
+ *                    #MCE_BUTTON_BACKLIGHT_MODE_ON, or
+ *                    #MCE_BUTTON_BACKLIGHT_MODE_POLICY
+ */
+# define MCE_BUTTON_BACKLIGHT_MODE_REQ     "req_button_backlight_mode"
+
 /** Indication for change of button backlight state
  *
  * @since mce 1.90.0
@@ -1043,6 +1228,44 @@
 
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Hardware Mouse Availability
+ *
+ *@{
+ */
+
+/** Query HW mouse availability
+ *
+ * @since mce 1.109.0
+ *
+ * Mouse present
+ *
+ * Used for example in evaluating whether mouse pointer
+ * should be shown or not.
+ *
+ * @return string: availability state, one of:
+ * - #MCE_HARDWARE_MOUSE_UNDEF
+ * - #MCE_HARDWARE_MOUSE_AVAILABLE
+ * - #MCE_HARDWARE_MOUSE_NOT_AVAILABLE
+ */
+# define MCE_HARDWARE_MOUSE_STATE_GET      "mouse_available_state_req"
+
+/** Notify changes in HW mouse availability
+ *
+ * @since mce 1.109.0
+ *
+ * Mouse present
+ *
+ * @return string: availability state, one of:
+ * - #MCE_HARDWARE_MOUSE_UNDEF
+ * - #MCE_HARDWARE_MOUSE_AVAILABLE
+ * - #MCE_HARDWARE_MOUSE_NOT_AVAILABLE
+ */
+# define MCE_HARDWARE_MOUSE_STATE_SIG      "mouse_available_state_ind"
+
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Sliding Keyboard State

include/mce/mode-names.h

@@ -4,8 +4,9 @@
  * <p>
  * This file is part of mce-dev
  * <p>
- * Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2012-2017 Jolla Ltd.
+ * Copyright (c) 2004 - 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2012 - 2022 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
  * @author Tapio Rantala <ext-tapio.rantala@nokia.com>
@@ -430,9 +431,114 @@
 
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Charger Type Constants
+ *
+ *@{
+ */
+
+/** No charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_NONE                   "none"
+
+/** Standard down port (pc/hub) charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_USB                    "usb"
+
+/** Dedicated charging port (wall) charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_DCP                    "dcp"
+
+/** High voltage DCP charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_HVDCP                  "hvdcp"
+
+/** Charging Downstream Port charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_CDP                    "cdp"
+
+/** Wireless charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_WIRELESS               "wireless"
+
+/** Other kind of charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_OTHER                  "other"
+
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Charging Hysteresis State Constants
+ *
+ *@{
+ */
+
+/** Charging hysteresis policy state is not known
+ *
+ * @since mce 1.110.0
+ */
+# define MCE_CHARGING_STATE_UNKNOWN              "unknown"
+
+/** Charging hysteresis policy allows charging
+ *
+ * @since mce 1.110.0
+ */
+# define MCE_CHARGING_STATE_ENABLED              "enabled"
+
+/** Charging hysteresis policy denies charging
+ *
+ * @since mce 1.110.0
+ */
+# define MCE_CHARGING_STATE_DISABLED             "disabled"
+/*@}*/
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Charge-once-to-full policy override constants
+ *
+ *@{
+ */
+
+/** Charge-once-to-full policy override state is not known
+ *
+ * @since mce 1.112.0
+ */
+# define MCE_FORCED_CHARGING_UNKNOWN              "unknown"
+
+/** Charge-once-to-full policy override has been activated
+ *
+ * @since mce 1.112.0
+ */
+# define MCE_FORCED_CHARGING_ENABLED              "enabled"
+
+/** Charge-once-to-full policy override has been deactivated
+ *
+ * @since mce 1.112.0
+ */
+# define MCE_FORCED_CHARGING_DISABLED             "disabled"
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Battery Status Constants
+ *
+ * These values match legacy maemo (bme) battery status values.
  *
  *@{
  */
@@ -469,6 +575,55 @@
 
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Battery State Constants
+ *
+ * These values match linux power supply device status values.
+ *
+ *@{
+ */
+
+/** Battery state is not known
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_UNKNOWN               "unknown"
+
+/** Battery is currently discharging
+ *
+ * Charger is disconnected, battery is discharging.
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_DISCHARGING           "discharging"
+
+/** Battery is currently charging
+ *
+ * Charger is connected, battery is charging.
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_CHARGING              "charging"
+
+/** Battery is not getting charged
+ *
+ * Charger is connected, battery is not getting charged.
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_NOT_CHARGING          "not_charging"
+
+/** Battery is fully charged
+ *
+ * Charger is connected, battery is full.
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_FULL                  "full"
+
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Battery Level Constants
@@ -531,6 +686,32 @@
 # define MCE_HARDWARE_KEYBOARD_NOT_AVAILABLE     "not-available"
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Hardware Mouse Availability Constants
+ *
+ *@{
+ */
+
+/** Hardware Mouse availability is not known
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_UNDEF                "undef"
+
+/** Hardware Mouse is available
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_AVAILABLE            "available"
+
+/** Hardware Mouse is not available
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_NOT_AVAILABLE        "not-available"
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Feedback Event Name Constants
@@ -703,7 +884,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-/** TKLock status replies from SystemUI
+/** @name TKLock status replies from SystemUI
  *
  *@{
  */
@@ -736,4 +917,31 @@
 
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Button backlight operation modes
+ *
+ *@{
+ */
+
+/** Button backlight should be turned off
+ *
+ * @since mce 1.98.0
+ */
+#define MCE_BUTTON_BACKLIGHT_MODE_OFF    0
+
+/** Button backlight should be turned on
+ *
+ * @since mce 1.98.0
+ */
+#define MCE_BUTTON_BACKLIGHT_MODE_ON     1
+
+/** Button backlight should be turned on/off according to policy
+ *
+ * @since mce 1.98.0
+ */
+#define MCE_BUTTON_BACKLIGHT_MODE_POLICY 2
+
+/*@}*/
+
 #endif /* MCE_MODE_NAMES_H_ */

mce.pc

@@ -3,7 +3,7 @@ includedir=${prefix}/include
 
 Name: mce
 Description: Mode Control Entity
-Version: 1.24.0
+Version: 1.32.0
 Requires:
 Libs:
 Cflags: -I${includedir}

rpm/mce-headers.spec

@@ -1,11 +1,12 @@
 Name:       mce-headers
 Summary:    Development files for mce
-Version:    1.24.0
+Version:    1.32.0
 Release:    1
 Group:      Development/Libraries
 License:    LGPLv2
-URL:        https://github.com/nemomobile/mce-dev
+URL:        https://git.sailfishos.org/mer-core/mce-dev
 Source0:    %{name}-%{version}.tar.bz2
+BuildArch:  noarch
 BuildRequires:  doxygen
 
 %description
@@ -31,7 +32,7 @@ make doc
 
 %install
 rm -rf %{buildroot}
-%make_install
+make install PCDIR=%{_libdir}/pkgconfig DESTDIR=%{?buildroot}
 install -d %{buildroot}/%{_docdir}/mce-doc/html/
 install -m 644 doc/html/* %{buildroot}/%{_docdir}/mce-doc/html/