X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecTray%2Fui%2FCECTray.cs;h=197ce32818c0d7537d2349f2f4102ce4b58f0854;hb=c46b7188dffb5b17f88de17615e4615a1f904877;hp=e8dd66b584b8817ad6e5b505d455b17269c81602;hpb=496897540ebcc6fc13b346aa5e08f2148a2770c7;p=deb_libcec.git
diff --git a/src/LibCecTray/ui/CECTray.cs b/src/LibCecTray/ui/CECTray.cs
index e8dd66b..197ce32 100644
--- a/src/LibCecTray/ui/CECTray.cs
+++ b/src/LibCecTray/ui/CECTray.cs
@@ -1,7 +1,7 @@
/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -38,6 +38,9 @@ using LibCECTray.Properties;
using LibCECTray.controller;
using LibCECTray.controller.applications;
using LibCECTray.settings;
+using Microsoft.Win32;
+using System.Security.Permissions;
+using System.Runtime.InteropServices;
namespace LibCECTray.ui
{
@@ -63,7 +66,6 @@ namespace LibCECTray.ui
{
Text = Resources.app_name;
InitializeComponent();
- _controller = new CECController(this);
VisibleChanged += delegate
{
if (!Visible)
@@ -71,6 +73,91 @@ namespace LibCECTray.ui
else
OnShow();
};
+
+ SystemEvents.SessionEnding += new SessionEndingEventHandler(OnSessionEnding);
+ }
+
+ public void OnSessionEnding(object sender, SessionEndingEventArgs e)
+ {
+ Controller.CECActions.SuppressUpdates = true;
+ Controller.Close();
+ }
+
+ #region Power state change window messages
+ private const int WM_POWERBROADCAST = 0x0218;
+ private const int PBT_APMSUSPEND = 0x0004;
+ private const int PBT_APMRESUMESUSPEND = 0x0007;
+ private const int PBT_APMRESUMECRITICAL = 0x0006;
+ private const int PBT_APMRESUMEAUTOMATIC = 0x0012;
+ private const int PBT_POWERSETTINGCHANGE = 0x8013;
+ private static Guid GUID_SYSTEM_AWAYMODE = new Guid("98a7f580-01f7-48aa-9c0f-44352c29e5c0");
+
+ [StructLayout(LayoutKind.Sequential, Pack = 4)]
+ internal struct POWERBROADCAST_SETTING
+ {
+ public Guid PowerSetting;
+ public uint DataLength;
+ public byte Data;
+ }
+ #endregion
+
+ ///
+ /// Check for power state changes, and pass up when it's something we don't care about
+ ///
+ /// The incoming window message
+ protected override void WndProc(ref Message msg)
+ {
+ if (msg.Msg == WM_POWERBROADCAST)
+ {
+ switch (msg.WParam.ToInt32())
+ {
+ case PBT_APMSUSPEND:
+ OnSleep();
+ return;
+
+ case PBT_APMRESUMESUSPEND:
+ case PBT_APMRESUMECRITICAL:
+ case PBT_APMRESUMEAUTOMATIC:
+ OnWake();
+ return;
+
+ case PBT_POWERSETTINGCHANGE:
+ {
+ POWERBROADCAST_SETTING pwr = (POWERBROADCAST_SETTING)Marshal.PtrToStructure(msg.LParam, typeof(POWERBROADCAST_SETTING));
+ if (pwr.PowerSetting == GUID_SYSTEM_AWAYMODE && pwr.DataLength == Marshal.SizeOf(typeof(Int32)))
+ {
+ switch (pwr.Data)
+ {
+ case 0:
+ // do _not_ wake the pc when away mode is deactivated
+ //OnWake();
+ //return;
+ case 1:
+ OnSleep();
+ return;
+ default:
+ break;
+ }
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ // pass up when not handled
+ base.WndProc(ref msg);
+ }
+
+ private void OnWake()
+ {
+ Controller.Initialise();
+ }
+
+ private void OnSleep()
+ {
+ Controller.Close();
}
public override sealed string Text
@@ -79,17 +166,19 @@ namespace LibCECTray.ui
set { base.Text = value; }
}
- private void CECTrayLoad(object sender, EventArgs e)
+ public void Initialise()
{
- _controller.Initialise();
+ Controller.Initialise();
}
protected override void Dispose(bool disposing)
{
Hide();
+ SuppressLogUpdates = true;
if (disposing)
{
- _controller.Close();
+ Controller.CECActions.SuppressUpdates = true;
+ Controller.Close();
}
if (disposing && (components != null))
{
@@ -120,12 +209,12 @@ namespace LibCECTray.ui
private void BSaveClick(object sender, EventArgs e)
{
- _controller.PersistSettings();
+ Controller.PersistSettings();
}
private void BReloadConfigClick(object sender, EventArgs e)
{
- _controller.ResetDefaultSettings();
+ Controller.ResetDefaultSettings();
}
#endregion
@@ -170,22 +259,22 @@ namespace LibCECTray.ui
private void BSendImageViewOnClick(object sender, EventArgs e)
{
- _controller.CECActions.SendImageViewOn(GetTargetDevice());
+ Controller.CECActions.SendImageViewOn(GetTargetDevice());
}
private void BStandbyClick(object sender, EventArgs e)
{
- _controller.CECActions.SendStandby(GetTargetDevice());
+ Controller.CECActions.SendStandby(GetTargetDevice());
}
private void BScanClick(object sender, EventArgs e)
{
- _controller.CECActions.ShowDeviceInfo(GetTargetDevice());
+ Controller.CECActions.ShowDeviceInfo(GetTargetDevice());
}
private void BActivateSourceClick(object sender, EventArgs e)
{
- _controller.CECActions.ActivateSource(GetTargetDevice());
+ Controller.CECActions.ActivateSource(GetTargetDevice());
}
private void CbCommandDestinationSelectedIndexChanged(object sender, EventArgs e)
@@ -200,22 +289,22 @@ namespace LibCECTray.ui
private void BVolUpClick(object sender, EventArgs e)
{
- _controller.Lib.VolumeUp(true);
+ Controller.Lib.VolumeUp(true);
}
private void BVolDownClick(object sender, EventArgs e)
{
- _controller.Lib.VolumeDown(true);
+ Controller.Lib.VolumeDown(true);
}
private void BMuteClick(object sender, EventArgs e)
{
- _controller.Lib.MuteAudio(true);
+ Controller.Lib.MuteAudio(true);
}
private void BRescanDevicesClick(object sender, EventArgs e)
{
- _controller.CECActions.RescanDevices();
+ Controller.CECActions.RescanDevices();
}
#endregion
@@ -223,6 +312,9 @@ namespace LibCECTray.ui
delegate void UpdateLogCallback();
private void UpdateLog()
{
+ if (SuppressLogUpdates)
+ return;
+
if (tbLog.InvokeRequired)
{
UpdateLogCallback d = UpdateLog;
@@ -333,12 +425,12 @@ namespace LibCECTray.ui
private void AboutToolStripMenuItemClick(object sender, EventArgs e)
{
- (new About(_controller.LibServerVersion, _controller.LibClientVersion, _controller.LibInfo)).ShowDialog();
+ (new About(Controller.LibServerVersion, Controller.LibClientVersion, Controller.LibInfo)).ShowDialog();
}
private void AdvancedModeToolStripMenuItemClick(object sender, EventArgs e)
{
- _controller.Settings.AdvancedMode.Value = !advancedModeToolStripMenuItem.Checked;
+ Controller.Settings.AdvancedMode.Value = !advancedModeToolStripMenuItem.Checked;
ShowHideAdvanced(!advancedModeToolStripMenuItem.Checked);
}
@@ -372,12 +464,12 @@ namespace LibCECTray.ui
{
if (Visible && WindowState != FormWindowState.Minimized)
{
- _controller.Settings.StartHidden.Value = true;
+ Controller.Settings.StartHidden.Value = true;
Hide();
}
else
{
- _controller.Settings.StartHidden.Value = false;
+ Controller.Settings.StartHidden.Value = false;
Show();
}
}
@@ -390,17 +482,9 @@ namespace LibCECTray.ui
private void CECTrayResize(object sender, EventArgs e)
{
if (WindowState == FormWindowState.Minimized)
- {
- ShowInTaskbar = false;
- tsMenuShowHide.Text = Resources.show;
- _controller.Settings.StartHidden.Value = true;
- }
+ Hide();
else
- {
- ShowInTaskbar = true;
- tsMenuShowHide.Text = Resources.hide;
- _controller.Settings.StartHidden.Value = false;
- }
+ Show();
}
private void TsMenuShowHideClick(object sender, EventArgs e)
@@ -434,7 +518,7 @@ namespace LibCECTray.ui
private void TsAdvancedClick(object sender, EventArgs e)
{
- _controller.Settings.AdvancedMode.Value = !tsAdvanced.Checked;
+ Controller.Settings.AdvancedMode.Value = !tsAdvanced.Checked;
ShowHideAdvanced(!tsAdvanced.Checked);
}
@@ -488,12 +572,16 @@ namespace LibCECTray.ui
#endregion
#region Class members
+ private bool SuppressLogUpdates = false;
private ConfigTab _selectedTab = ConfigTab.Configuration;
private string _log = string.Empty;
- private readonly CECController _controller;
+ private CECController _controller;
public CECController Controller
{
- get { return _controller; }
+ get
+ {
+ return _controller ?? (_controller = new CECController(this));
+ }
}
public Control.ControlCollection TabControls
{
@@ -507,8 +595,8 @@ namespace LibCECTray.ui
private void AddNewApplicationToolStripMenuItemClick(object sender, EventArgs e)
{
- ConfigureApplication appConfig = new ConfigureApplication(_controller.Settings, _controller);
- _controller.DisplayDialog(appConfig, false);
+ ConfigureApplication appConfig = new ConfigureApplication(Controller.Settings, Controller);
+ Controller.DisplayDialog(appConfig, false);
}
}
}