[OS/2] Bug 414596: implement nsIdleService on OS/2 (using DSSaver), r=mkaply

git-svn-id: svn://10.0.0.236/trunk@245633 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/widget/src/os2/Makefile.in

@@ -95,6 +95,7 @@ CPPSRCS		= \
 		nsDeviceContextSpecOS2.cpp \
 		nsPrintOptionsOS2.cpp \
 		nsRwsService.cpp \
+		nsIdleServiceOS2.cpp \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS = \

mozilla/widget/src/os2/nsIdleServiceOS2.cpp

@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 sts=2 et cin: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla OS/2 widget code.
+ *
+ * The Initial Developer of the Original Code is
+ * Peter Weilbacher <mozilla@Weilbacher.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsIdleServiceOS2.h"
+
+// prototype for funtion imported from DSSaver
+static int (*_System DSSaver_GetInactivityTime)(ULONG *, ULONG *);
+#define SSCORE_NOERROR 0 // as in the DSSaver header files
+
+NS_IMPL_ISUPPORTS1(nsIdleServiceOS2, nsIIdleService)
+
+nsIdleServiceOS2::nsIdleServiceOS2()
+  : mHMod(NULLHANDLE), mInitialized(PR_FALSE)
+{
+  const char error[256] = "";
+  if (DosLoadModule(error, 256, "SSCORE", &mHMod) == NO_ERROR) {
+    if (DosQueryProcAddr(mHMod, 0, "SSCore_GetInactivityTime",
+                         (PFN*)&DSSaver_GetInactivityTime) == NO_ERROR) {
+      mInitialized = PR_TRUE;
+    }
+  }
+}
+
+nsIdleServiceOS2::~nsIdleServiceOS2()
+{
+  if (mHMod != NULLHANDLE) {
+    DosFreeModule(mHMod);
+  }
+}
+
+NS_IMETHODIMP
+nsIdleServiceOS2::GetIdleTime(PRUint32 *aIdleTime)
+{
+  if (!mInitialized)
+    return NS_ERROR_NOT_INITIALIZED;
+
+  ULONG mouse, keyboard;
+  if (DSSaver_GetInactivityTime(&mouse, &keyboard) != SSCORE_NOERROR) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // we are only interested in activity in general, so take the minimum
+  // of both timers
+  *aIdleTime = PR_MIN(mouse, keyboard);
+  return NS_OK;
+}

mozilla/widget/src/os2/nsIdleServiceOS2.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 sts=2 et cin: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla OS/2 widget code.
+ *
+ * The Initial Developer of the Original Code is
+ * Peter Weilbacher <mozilla@Weilbacher.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsIdleServiceOS2_h__
+#define nsIdleServiceOS2_h__
+
+#include "nsIdleService.h"
+#define INCL_DOSMODULEMGR
+#define INCL_DOSERRORS
+#include <os2.h>
+
+class nsIdleServiceOS2 : public nsIdleService
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  nsIdleServiceOS2();
+  ~nsIdleServiceOS2();
+
+  // ask the DSSaver DLL (sscore.dll) for the time of the last activity
+  NS_IMETHOD GetIdleTime(PRUint32 *aIdleTime);
+
+private:
+  HMODULE mHMod; // module handle for screensaver DLL
+  PRBool mInitialized; // fully initialized (function found in screensaver DLL?)
+};
+
+#endif // nsIdleServiceOS2_h__

mozilla/widget/src/os2/nsWidgetFactory.cpp

@@ -89,6 +89,8 @@
 
 #include "nsFrameWindow.h" // OS/2 only
 
+#include "nsIdleServiceOS2.h"
+
 // objects that just require generic constructors
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
@@ -108,6 +110,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsOS2, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorOS2)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerOS2)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceOS2)
 
 // component definition, will be exported using XPCOM
 static const nsModuleComponentInfo components[] =
@@ -191,6 +194,10 @@ static const nsModuleComponentInfo components[] =
     NS_RWSSERVICE_CID,
     NS_RWSSERVICE_CONTRACTID,
     nsRwsServiceConstructor },
+  { "User Idle Service",
+    NS_IDLE_SERVICE_CID,
+    "@mozilla.org/widget/idleservice;1",
+    nsIdleServiceOS2Constructor },
 };
 
 PR_STATIC_CALLBACK(void)