From c9265783b1bf4a9cea1fd63e633ced6e66a154fc Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 10 Dec 2017 15:24:14 +0300
Subject: Miranda idle code cleaning

---
 include/m_idle.h | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

(limited to 'include')

diff --git a/include/m_idle.h b/include/m_idle.h
index 58d786ac8a..203228e030 100644
--- a/include/m_idle.h
+++ b/include/m_idle.h
@@ -31,9 +31,6 @@ for "long" idle. Thie module will generate long/short events based on these user
 and other information too. If you are unsure which idle mode to report for, report it
 for short idle.*/
 
-#define IDF_ISIDLE		0x1 // idle has become active (if not set, inactive)
-#define IDF_PRIVACY		0x8 // if set, the information provided shouldn't be given to third parties.
-
 /*
 	wParam: 0
 	lParam: IDF_* (or'd field)
@@ -47,18 +44,11 @@ for short idle.*/
 		set.
 	Version: 0.3.4a+ (2004/09/16)
 */
-#define ME_IDLE_CHANGED "Miranda/Idle/Changed"
 
-typedef struct {
-	int cbSize;			    // sizeof()
-	int idleTime;	       // idle in mins, if zero then disabled
-	int privacy;		    // user doesnt want other people seeing anything more than they are idle
-	int aaStatus;			 // status to go to when user is auto away
-	int aaLock;				 // the status shouldn't be unset if its set
-	int idleType;
-	int idlesoundsoff;
-}
-	MIRANDA_IDLE_INFO;
+#define IDF_ISIDLE		0x1 // idle has become active (if not set, inactive)
+#define IDF_PRIVACY		0x8 // if set, the information provided shouldn't be given to third parties.
+
+#define ME_IDLE_CHANGED "Miranda/Idle/Changed"
 
 /*
 	wParam; 0
@@ -69,6 +59,23 @@ typedef struct {
 	Version: 0.3.4 (2004/09/16)
 */
 
+struct MIRANDA_IDLE_INFO
+{
+	int cbSize;			    // sizeof()
+	int idleTime;	       // idle in mins, if zero then disabled
+	int privacy;		    // user doesnt want other people seeing anything more than they are idle
+	int aaStatus;			 // status to go to when user is auto away
+	int aaLock;				 // the status shouldn't be unset if its set
+	int idleType;
+	int idlesoundsoff;
+};
+
 #define MS_IDLE_GETIDLEINFO "Miranda/Idle/GetInfo"
 
+__forceinline int Idle_GetInfo(MIRANDA_IDLE_INFO &pInfo)
+{
+	pInfo.cbSize = sizeof(MIRANDA_IDLE_INFO);
+	return CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&pInfo);
+}
+
 #endif // M_IDLE_H__
-- 
cgit v1.2.3