linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
stax76
2020-10-08 17:56:49 +02:00
parent 404a8f110d
commit 94eaf8144f
3 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mpv.net/Native/NativeHelp.cs
View File

@@ -1,6 +1,8 @@
 
using System; using System;
using static WinAPI;
namespace mpvnet namespace mpvnet
{ {
public static class NativeHelp public static class NativeHelp
@@ -9,31 +11,31 @@ namespace mpvnet
{ {
switch (v) switch (v)
{ {
case 1 /* WMSZ_LEFT */ : return 3; case 1 /* WMSZ_LEFT */ : return 3;
case 3 /* WMSZ_TOP */ : return 2; case 3 /* WMSZ_TOP */ : return 2;
case 2 /* WMSZ_RIGHT */ : return 3; case 2 /* WMSZ_RIGHT */ : return 3;
case 6 /* WMSZ_BOTTOM */ : return 2; case 6 /* WMSZ_BOTTOM */ : return 2;
case 4 /* WMSZ_TOPLEFT */ : return 1; case 4 /* WMSZ_TOPLEFT */ : return 1;
case 5 /* WMSZ_TOPRIGHT */ : return 1; case 5 /* WMSZ_TOPRIGHT */ : return 1;
case 7 /* WMSZ_BOTTOMLEFT */ : return 3; case 7 /* WMSZ_BOTTOMLEFT */ : return 3;
case 8 /* WMSZ_BOTTOMRIGHT */: return 3; case 8 /* WMSZ_BOTTOMRIGHT */ : return 3;
default: return -1; default: return -1;
} }
} }
public static void SubtractWindowBorders(IntPtr hwnd, ref WinAPI.RECT rc) public static void SubtractWindowBorders(IntPtr hwnd, ref RECT rc)
{ {
var b = new WinAPI.RECT(0, 0, 0, 0); RECT r = new RECT(0, 0, 0, 0);
AddWindowBorders(hwnd, ref b); AddWindowBorders(hwnd, ref r);
rc.Left -= b.Left; rc.Left -= r.Left;
rc.Top -= b.Top; rc.Top -= r.Top;
rc.Right -= b.Right; rc.Right -= r.Right;
rc.Bottom -= b.Bottom; rc.Bottom -= r.Bottom;
} }
public static void AddWindowBorders(IntPtr hwnd, ref WinAPI.RECT rc) public static void AddWindowBorders(IntPtr hwnd, ref RECT rc)
{ {
WinAPI.AdjustWindowRect(ref rc, (uint)WinAPI.GetWindowLong(hwnd, -16 /* GWL_STYLE */), false); AdjustWindowRect(ref rc, (uint)GetWindowLong(hwnd, -16 /* GWL_STYLE */), false);
} }
} }
} }

52
mpv.net/WinForms/MainForm.cs
View File

@@ -12,6 +12,7 @@ using System.Diagnostics;
using System.Threading.Tasks; using System.Threading.Tasks;
using static mpvnet.Core; using static mpvnet.Core;
using static WinAPI;
namespace mpvnet namespace mpvnet
{ {
@@ -50,7 +51,12 @@ namespace mpvnet
core.Init(); core.Init();
if (App.GlobalMediaKeys) if (App.GlobalMediaKeys)
RegisterGlobalMediaKeys(); {
RegisterGlobalKey(VK_MEDIA_NEXT_TRACK);
RegisterGlobalKey(VK_MEDIA_PREV_TRACK);
RegisterGlobalKey(VK_MEDIA_PLAY_PAUSE);
RegisterGlobalKey(VK_MEDIA_STOP);
}
core.Shutdown += Shutdown; core.Shutdown += Shutdown;
core.VideoSizeChanged += VideoSizeChanged; core.VideoSizeChanged += VideoSizeChanged;
@@ -79,7 +85,7 @@ namespace mpvnet
Application.ThreadException += (sender, e) => App.ShowException(e.Exception); Application.ThreadException += (sender, e) => App.ShowException(e.Exception);
Msg.SupportURL = "https://github.com/stax76/mpv.net#support"; Msg.SupportURL = "https://github.com/stax76/mpv.net#support";
Text = "mpv.net " + Application.ProductVersion; Text = "mpv.net " + Application.ProductVersion;
TaskbarButtonCreatedMessage = WinAPI.RegisterWindowMessage("TaskbarButtonCreated"); TaskbarButtonCreatedMessage = RegisterWindowMessage("TaskbarButtonCreated");
ContextMenu = new ContextMenuStripEx(components); ContextMenu = new ContextMenuStripEx(components);
ContextMenu.Opened += ContextMenu_Opened; ContextMenu.Opened += ContextMenu_Opened;
@@ -370,7 +376,7 @@ namespace mpvnet
} }
Point middlePos = new Point(Left + Width / 2, Top + Height / 2); Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
var rect = new WinAPI.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height)); var rect = new RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
NativeHelp.AddWindowBorders(Handle, ref rect); NativeHelp.AddWindowBorders(Handle, ref rect);
int left = middlePos.X - rect.Width / 2; int left = middlePos.X - rect.Width / 2;
int top = middlePos.Y - rect.Height / 2; int top = middlePos.Y - rect.Height / 2;
@@ -393,7 +399,7 @@ namespace mpvnet
if (top + rect.Height > maxBottom) if (top + rect.Height > maxBottom)
top = maxBottom - rect.Height; top = maxBottom - rect.Height;
WinAPI.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */,
left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */); left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
} }
@@ -414,7 +420,7 @@ namespace mpvnet
Rectangle b = Screen.FromControl(this).Bounds; Rectangle b = Screen.FromControl(this).Bounds;
uint SWP_SHOWWINDOW = 0x0040; uint SWP_SHOWWINDOW = 0x0040;
IntPtr HWND_TOP= IntPtr.Zero; IntPtr HWND_TOP= IntPtr.Zero;
WinAPI.SetWindowPos(Handle, HWND_TOP, b.X, b.Y, b.Width, b.Height, SWP_SHOWWINDOW); SetWindowPos(Handle, HWND_TOP, b.X, b.Y, b.Width, b.Height, SWP_SHOWWINDOW);
} }
} }
} }
@@ -549,7 +555,7 @@ namespace mpvnet
(Environment.TickCount - LastAppCommand) < 1000; (Environment.TickCount - LastAppCommand) < 1000;
if (core.WindowHandle != IntPtr.Zero && !skip) if (core.WindowHandle != IntPtr.Zero && !skip)
m.Result = WinAPI.SendMessage(core.WindowHandle, m.Msg, m.WParam, m.LParam); m.Result = SendMessage(core.WindowHandle, m.Msg, m.WParam, m.LParam);
} }
break; break;
case 0x319: // WM_APPCOMMAND case 0x319: // WM_APPCOMMAND
@@ -568,16 +574,16 @@ namespace mpvnet
case 0x0312: // WM_HOTKEY case 0x0312: // WM_HOTKEY
switch (m.WParam.ToInt64()) switch (m.WParam.ToInt64())
{ {
case WinAPI.VK_MEDIA_NEXT_TRACK: case VK_MEDIA_NEXT_TRACK:
core.command("keypress NEXT"); core.command("keypress NEXT");
break; break;
case WinAPI.VK_MEDIA_PREV_TRACK: case VK_MEDIA_PREV_TRACK:
core.command("keypress PREV"); core.command("keypress PREV");
break; break;
case WinAPI.VK_MEDIA_PLAY_PAUSE: case VK_MEDIA_PLAY_PAUSE:
core.command("keypress PLAYPAUSE"); core.command("keypress PLAYPAUSE");
break; break;
case WinAPI.VK_MEDIA_STOP: case VK_MEDIA_STOP:
core.command("keypress STOP"); core.command("keypress STOP");
break; break;
} }
@@ -607,13 +613,13 @@ namespace mpvnet
if (!WasShown()) if (!WasShown())
break; break;
WinAPI.RECT rect = Marshal.PtrToStructure<WinAPI.RECT>(m.LParam); RECT rect = Marshal.PtrToStructure<RECT>(m.LParam);
WinAPI.SetWindowPos(Handle, IntPtr.Zero, rect.Left, rect.Top, rect.Width, rect.Height, 0); SetWindowPos(Handle, IntPtr.Zero, rect.Left, rect.Top, rect.Width, rect.Height, 0);
} }
break; break;
case 0x0214: // WM_SIZING case 0x0214: // WM_SIZING
{ {
var rc = Marshal.PtrToStructure<WinAPI.RECT>(m.LParam); var rc = Marshal.PtrToStructure<RECT>(m.LParam);
var r = rc; var r = rc;
NativeHelp.SubtractWindowBorders(Handle, ref r); NativeHelp.SubtractWindowBorders(Handle, ref r);
int c_w = r.Right - r.Left, c_h = r.Bottom - r.Top; int c_w = r.Right - r.Left, c_h = r.Bottom - r.Top;
@@ -633,13 +639,13 @@ namespace mpvnet
if (corner >= 0) if (corner >= 0)
corners[corner] -= d_corners[corner]; corners[corner] -= d_corners[corner];
Marshal.StructureToPtr<WinAPI.RECT>(new WinAPI.RECT(corners[0], corners[1], corners[2], corners[3]), m.LParam, false); Marshal.StructureToPtr<RECT>(new RECT(corners[0], corners[1], corners[2], corners[3]), m.LParam, false);
m.Result = new IntPtr(1); m.Result = new IntPtr(1);
} }
return; return;
case 0x004A: // WM_COPYDATA case 0x004A: // WM_COPYDATA
{ {
var copyData = (WinAPI.COPYDATASTRUCT)m.GetLParam(typeof(WinAPI.COPYDATASTRUCT)); var copyData = (COPYDATASTRUCT)m.GetLParam(typeof(COPYDATASTRUCT));
string[] files = copyData.lpData.Split('\n'); string[] files = copyData.lpData.Split('\n');
string mode = files[0]; string mode = files[0];
files = files.Skip(1).ToArray(); files = files.Skip(1).ToArray();
@@ -693,6 +699,8 @@ namespace mpvnet
Taskbar.SetValue(core.get_property_number("time-pos"), core.Duration.TotalSeconds); Taskbar.SetValue(core.get_property_number("time-pos"), core.Duration.TotalSeconds);
} }
void RegisterGlobalKey(int key) => RegisterHotKey(Handle, key, 0, (uint)key);
void PropChangeOnTop(bool value) => BeginInvoke(new Action(() => TopMost = value)); void PropChangeOnTop(bool value) => BeginInvoke(new Action(() => TopMost = value));
void PropChangeAid(string value) => core.Aid = value; void PropChangeAid(string value) => core.Aid = value;
@@ -770,14 +778,6 @@ namespace mpvnet
} }
} }
void RegisterGlobalMediaKeys()
{
WinAPI.RegisterHotKey(Handle, WinAPI.VK_MEDIA_NEXT_TRACK, 0, (uint)WinAPI.VK_MEDIA_NEXT_TRACK);
WinAPI.RegisterHotKey(Handle, WinAPI.VK_MEDIA_PREV_TRACK, 0, (uint)WinAPI.VK_MEDIA_PREV_TRACK);
WinAPI.RegisterHotKey(Handle, WinAPI.VK_MEDIA_PLAY_PAUSE, 0, (uint)WinAPI.VK_MEDIA_PLAY_PAUSE);
WinAPI.RegisterHotKey(Handle, WinAPI.VK_MEDIA_STOP, 0, (uint)WinAPI.VK_MEDIA_STOP);
}
protected override void OnLoad(EventArgs e) protected override void OnLoad(EventArgs e)
{ {
base.OnLoad(e); base.OnLoad(e);
@@ -820,7 +820,7 @@ namespace mpvnet
{ {
base.OnActivated(e); base.OnActivated(e);
Message m = new Message() { Msg = 0x0202 }; // WM_LBUTTONUP Message m = new Message() { Msg = 0x0202 }; // WM_LBUTTONUP
WinAPI.SendMessage(MainForm.Instance.Handle, m.Msg, m.WParam, m.LParam); SendMessage(MainForm.Instance.Handle, m.Msg, m.WParam, m.LParam);
} }
protected override void OnResize(EventArgs e) protected override void OnResize(EventArgs e)
@@ -877,8 +877,8 @@ namespace mpvnet
e.Button == MouseButtons.Left && !IsMouseInOSC()) e.Button == MouseButtons.Left && !IsMouseInOSC())
{ {
var HTCAPTION = new IntPtr(2); var HTCAPTION = new IntPtr(2);
WinAPI.ReleaseCapture(); ReleaseCapture();
WinAPI.PostMessage(Handle, 0xA1 /* WM_NCLBUTTONDOWN */, HTCAPTION, IntPtr.Zero); PostMessage(Handle, 0xA1 /* WM_NCLBUTTONDOWN */, HTCAPTION, IntPtr.Zero);
} }
if (Width - e.Location.X < 10 && e.Location.Y < 10) if (Width - e.Location.X < 10 && e.Location.Y < 10)

1
mpv.net/mpv/Core.cs
View File

@@ -14,6 +14,7 @@ using System.Windows.Forms;
using static libmpv; using static libmpv;
using static NewLine; using static NewLine;
using System.Globalization; using System.Globalization;
namespace mpvnet namespace mpvnet