# HG changeset patch
# User Stephane Lenclud
# Date 1454881051 -3600
# Node ID c66ec88ed19d487d623f10e6c304591b5834f331
# Parent  0fb548a758494976000c9f92636219aac641d37e
Published v0.8.8.0.
Idle client now monitoring display power status so as to avoid going power
saving when the monitor is still on.

diff -r 0fb548a75849 -r c66ec88ed19d Clients/Idle/App.config
--- a/Clients/Idle/App.config	Sun Feb 07 13:29:05 2016 +0100
+++ b/Clients/Idle/App.config	Sun Feb 07 22:37:31 2016 +0100
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff -r 0fb548a75849 -r c66ec88ed19d Clients/Idle/FormClientIdle.cs
--- a/Clients/Idle/FormClientIdle.cs	Sun Feb 07 13:29:05 2016 +0100
+++ b/Clients/Idle/FormClientIdle.cs	Sun Feb 07 22:37:31 2016 +0100
@@ -44,6 +44,9 @@
         Client iClient;
         ContentAlignment iAlignment;
         TextField iTextField;
+        //Used to determine if screen saver need to kick in
+        private PowerManager.SettingNotifier iPowerSettingNotifier;
+        private bool MonitorPowerOn;
 
         public delegate void CloseDelegate();
         public delegate void CloseConnectionDelegate();
@@ -75,9 +78,52 @@
             //Timer
             iTimer.Interval = IntervalToNextMinute();
             iTimer.Start();
+
+            //Create our power setting notifier and register the event we are interested in
+            iPowerSettingNotifier = new PowerManager.SettingNotifier(Handle);
+            iPowerSettingNotifier.OnMonitorPowerOn += OnMonitorPowerOn;
+            iPowerSettingNotifier.OnMonitorPowerOff += OnMonitorPowerOff;
+            MonitorPowerOn = true;
+
         }
 
         /// <summary>
+        /// Broadcast messages to subscribers.
+        /// </summary>
+        /// <param name="message"></param>
+        protected override void WndProc(ref Message aMessage)
+        {
+            //Hook in our power manager
+            if (iPowerSettingNotifier != null)
+            {
+                iPowerSettingNotifier.WndProc(ref aMessage);
+            }
+
+            base.WndProc(ref aMessage);
+        }
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void OnMonitorPowerOn()
+        {
+            MonitorPowerOn = true;
+            UpdateDisplay();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void OnMonitorPowerOff()
+        {
+            MonitorPowerOn = false;
+            UpdateDisplay();
+        }
+
+
+        /// <summary>
         /// 
         /// </summary>
         /// <returns></returns>
@@ -190,6 +236,15 @@
             iTimer.Interval = IntervalToNextMinute();
             iTimer.Start();
 
+            UpdateDisplay();
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void UpdateDisplay()
+        {
             //
             if (String.IsNullOrEmpty(iTextField.Text))
             {
@@ -206,7 +261,8 @@
             iClient.SetField(iTextField);
 
             //Now make sure we save our screen from any running system monitor
-            if (String.IsNullOrEmpty(iTextField.Text))
+            //We don't go into screen saving mode if our monitor is still on
+            if (String.IsNullOrEmpty(iTextField.Text) && !MonitorPowerOn)
             {
                 //If text it empty it means we need to cool down our display even if system monitor is running
                 iClient.SetPriority(Priorities.SystemMonitor + 1);
@@ -218,6 +274,11 @@
             }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void FormClientIdle_Shown(object sender, EventArgs e)
         {
             //Visible = false;
diff -r 0fb548a75849 -r c66ec88ed19d Clients/Idle/Properties/Resources.Designer.cs
--- a/Clients/Idle/Properties/Resources.Designer.cs	Sun Feb 07 13:29:05 2016 +0100
+++ b/Clients/Idle/Properties/Resources.Designer.cs	Sun Feb 07 22:37:31 2016 +0100
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace SharpDisplayIdleClient.Properties
-{
-
-
+namespace SharpDisplayIdleClient.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -22,48 +22,40 @@
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SharpDisplayIdleClient.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff -r 0fb548a75849 -r c66ec88ed19d Clients/Idle/Properties/Settings.Designer.cs
--- a/Clients/Idle/Properties/Settings.Designer.cs	Sun Feb 07 13:29:05 2016 +0100
+++ b/Clients/Idle/Properties/Settings.Designer.cs	Sun Feb 07 22:37:31 2016 +0100
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace SharpDisplayIdleClient.Properties
-{
-
-
+namespace SharpDisplayIdleClient.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff -r 0fb548a75849 -r c66ec88ed19d Clients/Idle/SharpDisplayClientIdle.csproj
--- a/Clients/Idle/SharpDisplayClientIdle.csproj	Sun Feb 07 13:29:05 2016 +0100
+++ b/Clients/Idle/SharpDisplayClientIdle.csproj	Sun Feb 07 22:37:31 2016 +0100
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SharpDisplayIdleClient</RootNamespace>
     <AssemblyName>SharpDisplayIdleClient</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -81,6 +82,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -96,6 +98,12 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\PowerManager\PowerManager.vcxproj">
+      <Project>{c174f23d-3055-49bc-b6b0-563011af624d}</Project>
+      <Name>PowerManager</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff -r 0fb548a75849 -r c66ec88ed19d Server/ConsumerElectronicControl.cs
--- a/Server/ConsumerElectronicControl.cs	Sun Feb 07 13:29:05 2016 +0100
+++ b/Server/ConsumerElectronicControl.cs	Sun Feb 07 22:37:31 2016 +0100
@@ -15,6 +15,9 @@
         private PowerManager.SettingNotifier iPowerSettingNotifier;
         ///
         private Cec.Client iCecClient;
+        ///This flag will only work properly if both on and off events are monitored.
+        ///TODO: have a more solid implementation
+        public bool MonitorPowerOn;
 
         /// <summary>
         /// 
@@ -24,6 +27,9 @@
         /// <param name="aHdmiPort"></param>
         public void Start(IntPtr aWndHandle, string aDeviceName, byte aHdmiPort, bool aMonitorOn, bool aMonitorOff)
         {
+            //Assuming monitor is on when we start up
+            MonitorPowerOn = true;
+
             //Create our power setting notifier and register the event we are interested in
             iPowerSettingNotifier = new PowerManager.SettingNotifier(aWndHandle);
 
@@ -72,16 +78,18 @@
             Debug.WriteLine("ON");
             iCecClient.Lib.PowerOnDevices(CecLogicalAddress.Tv);
             iCecClient.Lib.SetActiveSource(CecDeviceType.Tv);
+            MonitorPowerOn = true;
         }
 
         private void OnMonitorPowerOff()
         {
             Debug.WriteLine("OFF");
             iCecClient.Lib.StandbyDevices(CecLogicalAddress.Tv);
+            MonitorPowerOn = false;
         }
 
         /// <summary>
-        /// We need to handle WM_INPUT.
+        /// We need to handle WM_POWERBROADCAST.
         /// </summary>
         /// <param name="message"></param>
         public void OnWndProc(ref Message message)
diff -r 0fb548a75849 -r c66ec88ed19d Server/SharpDisplayManager.csproj
--- a/Server/SharpDisplayManager.csproj	Sun Feb 07 13:29:05 2016 +0100
+++ b/Server/SharpDisplayManager.csproj	Sun Feb 07 22:37:31 2016 +0100
@@ -34,7 +34,7 @@
     <WebPage>index.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.8.7.0</ApplicationVersion>
+    <ApplicationVersion>0.8.8.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>