mirror of
https://github.com/yaakov-h/Notepad.Extensions.Logging.git
synced 2024-11-25 12:34:48 +00:00
Merge non static changes.
This commit is contained in:
commit
6926e2a858
9 changed files with 146 additions and 88 deletions
7
Notepad.Extensions.Logging/IWindowFinder.cs
Normal file
7
Notepad.Extensions.Logging/IWindowFinder.cs
Normal file
|
@ -0,0 +1,7 @@
|
|||
namespace Notepad.Extensions.Logging
|
||||
{
|
||||
interface IWindowFinder
|
||||
{
|
||||
WindowInfo FindNotepadWindow();
|
||||
}
|
||||
}
|
|
@ -22,10 +22,10 @@ namespace Notepad.Extensions.Logging
|
|||
[DllImport("User32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
|
||||
public static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
|
||||
|
||||
public delegate bool EnumWindowsDelegate(IntPtr hWnd, IntPtr lParam);
|
||||
public delegate bool EnumWindowsDelegate(IntPtr hWnd, object lParam);
|
||||
|
||||
[DllImport("user32.dll")]
|
||||
public static extern bool EnumWindows(EnumWindowsDelegate lpEnumFunc, IntPtr lParam);
|
||||
public static extern bool EnumWindows(EnumWindowsDelegate lpEnumFunc, object lParam);
|
||||
|
||||
[DllImport("User32.dll")]
|
||||
public static extern int GetWindowText(IntPtr hWndParent, StringBuilder sb, int maxCount);
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
using System;
|
||||
using System.Buffers;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
|
@ -12,18 +11,16 @@ namespace Notepad.Extensions.Logging
|
|||
{
|
||||
class NotepadLogger : ILogger
|
||||
{
|
||||
public NotepadLogger(ObjectPool<StringBuilder> stringBuilderPool, string categoryName, string windowName)
|
||||
public NotepadLogger(ObjectPool<StringBuilder> stringBuilderPool, IWindowFinder windowFinder, string categoryName)
|
||||
{
|
||||
this.stringBuilderPool = stringBuilderPool;
|
||||
this.stringBuilderPool = stringBuilderPool ?? throw new ArgumentNullException(nameof(stringBuilderPool));
|
||||
this.windowFinder = windowFinder ?? throw new ArgumentNullException(nameof(windowFinder));
|
||||
this.categoryName = categoryName;
|
||||
this.windowName = windowName ?? throw new ArgumentNullException(nameof(windowName));
|
||||
this.changedWindowName = $"*{windowName}";
|
||||
}
|
||||
|
||||
readonly ObjectPool<StringBuilder> stringBuilderPool;
|
||||
readonly IWindowFinder windowFinder;
|
||||
readonly string categoryName;
|
||||
readonly string windowName;
|
||||
readonly string changedWindowName;
|
||||
|
||||
public IDisposable BeginScope<TState>(TState state) => NullDisposable.Instance;
|
||||
|
||||
|
@ -93,16 +90,16 @@ namespace Notepad.Extensions.Logging
|
|||
|
||||
void WriteToNotepad(string message)
|
||||
{
|
||||
var (kind, hwnd) = WindowFinder.FindNotepadWindow();
|
||||
switch (kind)
|
||||
var info = windowFinder.FindNotepadWindow();
|
||||
switch (info.Kind)
|
||||
{
|
||||
case WindowKind.Notepad:
|
||||
SendMessage(hwnd, EM_REPLACESEL, (IntPtr)1, message);
|
||||
SendMessage(info.Handle, EM_REPLACESEL, (IntPtr)1, message);
|
||||
break;
|
||||
|
||||
case WindowKind.NotepadPlusPlus:
|
||||
{
|
||||
WriteToNotepadPlusPlus(hwnd, message);
|
||||
WriteToNotepadPlusPlus(info.Handle, message);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,14 +9,11 @@ namespace Notepad.Extensions.Logging
|
|||
[ProviderAlias("Notepad")]
|
||||
class NotepadLoggerProvider : ILoggerProvider
|
||||
{
|
||||
readonly ObjectPool<StringBuilder> stringBuilderPool;
|
||||
readonly IDisposable optionsReloadToken;
|
||||
NotepadLoggerOptions options;
|
||||
|
||||
NotepadLoggerProvider()
|
||||
{
|
||||
var poolProvider = new DefaultObjectPoolProvider();
|
||||
stringBuilderPool = poolProvider.CreateStringBuilderPool();
|
||||
windowFinder = new WindowFinder();
|
||||
}
|
||||
|
||||
public NotepadLoggerProvider(IOptionsMonitor<NotepadLoggerOptions> options) : this()
|
||||
|
@ -30,8 +27,12 @@ namespace Notepad.Extensions.Logging
|
|||
{
|
||||
this.options = options;
|
||||
}
|
||||
|
||||
public ILogger CreateLogger(string categoryName) => new NotepadLogger(stringBuilderPool, categoryName, options.WindowName);
|
||||
readonly ObjectPool<StringBuilder> stringBuilderPool;
|
||||
readonly IWindowFinder windowFinder;
|
||||
readonly IDisposable optionsReloadToken;
|
||||
NotepadLoggerOptions options;
|
||||
|
||||
public ILogger CreateLogger(string categoryName) => new NotepadLogger(stringBuilderPool, windowFinder, categoryName);
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
|
|
72
Notepad.Extensions.Logging/WindowEnumerationState.cs
Normal file
72
Notepad.Extensions.Logging/WindowEnumerationState.cs
Normal file
|
@ -0,0 +1,72 @@
|
|||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace Notepad.Extensions.Logging
|
||||
{
|
||||
class WindowEnumerationState
|
||||
{
|
||||
public WindowEnumerationState()
|
||||
{
|
||||
sb = new StringBuilder(capacity: 4096);
|
||||
}
|
||||
|
||||
readonly StringBuilder sb;
|
||||
|
||||
public IntPtr Handle { get; private set; }
|
||||
public WindowKind WindowKind { get; private set; }
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
Handle = default;
|
||||
WindowKind = default;
|
||||
sb.Clear();
|
||||
}
|
||||
|
||||
public bool ExamineWindow(IntPtr hWnd)
|
||||
{
|
||||
var result = NativeMethods.GetWindowText(hWnd, sb, sb.Capacity);
|
||||
if (result < 0)
|
||||
{
|
||||
throw new Win32Exception(result);
|
||||
}
|
||||
|
||||
Handle = hWnd;
|
||||
|
||||
if (sb.Length > 0 && sb[0] == '*')
|
||||
{
|
||||
// Notepad and Notepad++ both mark dirty documents by adding a leading asterisk to the window name.
|
||||
sb.Remove(0, 1);
|
||||
}
|
||||
|
||||
if (IsKnownNotepadWindow(sb.ToString()))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
static Regex notepadPlusPlusRegex = new Regex(@"^new \d+ - Notepad\+\+$", RegexOptions.Compiled);
|
||||
|
||||
bool IsKnownNotepadWindow(string titleText)
|
||||
{
|
||||
switch (titleText)
|
||||
{
|
||||
case "Untitled - Notepad":
|
||||
WindowKind = WindowKind.Notepad;
|
||||
Handle = NativeMethods.FindWindowEx(Handle, IntPtr.Zero, "EDIT", null);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (notepadPlusPlusRegex.IsMatch(titleText))
|
||||
{
|
||||
WindowKind = WindowKind.NotepadPlusPlus;
|
||||
Handle = NativeMethods.FindWindowEx(Handle, IntPtr.Zero, "Scintilla", null);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,17 @@
|
|||
using Microsoft.Extensions.ObjectPool;
|
||||
|
||||
namespace Notepad.Extensions.Logging
|
||||
{
|
||||
class WindowEnumerationStatePoolingPolicy : IPooledObjectPolicy<WindowEnumerationState>
|
||||
{
|
||||
public static IPooledObjectPolicy<WindowEnumerationState> Instance { get; } = new WindowEnumerationStatePoolingPolicy();
|
||||
|
||||
public WindowEnumerationState Create() => new WindowEnumerationState();
|
||||
|
||||
public bool Return(WindowEnumerationState obj)
|
||||
{
|
||||
obj.Reset();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,89 +1,37 @@
|
|||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using Microsoft.Extensions.ObjectPool;
|
||||
|
||||
namespace Notepad.Extensions.Logging
|
||||
{
|
||||
static class WindowFinder
|
||||
class WindowFinder : IWindowFinder
|
||||
{
|
||||
public static (WindowKind kind, IntPtr hwnd) FindNotepadWindow()
|
||||
public WindowFinder()
|
||||
{
|
||||
sb ??= new StringBuilder(4096);
|
||||
statePool = new DefaultObjectPool<WindowEnumerationState>(WindowEnumerationStatePoolingPolicy.Instance);
|
||||
}
|
||||
|
||||
readonly ObjectPool<WindowEnumerationState> statePool;
|
||||
|
||||
public WindowInfo FindNotepadWindow()
|
||||
{
|
||||
var stateObject = statePool.Get();
|
||||
try
|
||||
{
|
||||
FindMainWindow();
|
||||
return (windowKind, handle);
|
||||
NativeMethods.EnumWindows(enumWindowsDelegate, stateObject);
|
||||
return new WindowInfo(stateObject.WindowKind, stateObject.Handle);
|
||||
}
|
||||
finally
|
||||
{
|
||||
handle = IntPtr.Zero;
|
||||
sb.Clear();
|
||||
windowKind = WindowKind.Invalid;
|
||||
statePool.Return(stateObject);
|
||||
}
|
||||
}
|
||||
|
||||
static IntPtr FindMainWindow()
|
||||
{
|
||||
NativeMethods.EnumWindows(enumWindowsDelegate, IntPtr.Zero);
|
||||
return handle;
|
||||
}
|
||||
|
||||
static NativeMethods.EnumWindowsDelegate enumWindowsDelegate = new NativeMethods.EnumWindowsDelegate(EnumWindowsCallback);
|
||||
|
||||
static bool EnumWindowsCallback(IntPtr hWnd, IntPtr lParam)
|
||||
static bool EnumWindowsCallback(IntPtr hWnd, object lParam)
|
||||
{
|
||||
var result = NativeMethods.GetWindowText(hWnd, sb, sb.Capacity);
|
||||
if (result < 0)
|
||||
{
|
||||
throw new Win32Exception(result);
|
||||
}
|
||||
|
||||
WindowFinder.handle = hWnd;
|
||||
|
||||
if (sb.Length > 0 && sb[0] == '*')
|
||||
{
|
||||
// Notepad and Notepad++ both mark dirty documents by adding a leading asterisk to the window name.
|
||||
sb.Remove(0, 1);
|
||||
}
|
||||
|
||||
if (IsKnownNotepadWindow(sb.ToString()))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
[ThreadStatic]
|
||||
static IntPtr handle;
|
||||
|
||||
[ThreadStatic]
|
||||
static WindowKind windowKind;
|
||||
|
||||
[ThreadStatic]
|
||||
static StringBuilder sb;
|
||||
|
||||
static Regex notepadPlusPlusRegex = new Regex(@"^new \d+ - Notepad\+\+$", RegexOptions.Compiled);
|
||||
|
||||
static bool IsKnownNotepadWindow(string titleText)
|
||||
{
|
||||
switch (titleText)
|
||||
{
|
||||
case "Untitled - Notepad":
|
||||
windowKind = WindowKind.Notepad;
|
||||
handle = NativeMethods.FindWindowEx(handle, IntPtr.Zero, "EDIT", null);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (notepadPlusPlusRegex.IsMatch(titleText))
|
||||
{
|
||||
windowKind = WindowKind.NotepadPlusPlus;
|
||||
handle = NativeMethods.FindWindowEx(handle, IntPtr.Zero, "Scintilla", null);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
var state = (WindowEnumerationState)lParam;
|
||||
return state.ExamineWindow(hWnd);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
16
Notepad.Extensions.Logging/WindowInfo.cs
Normal file
16
Notepad.Extensions.Logging/WindowInfo.cs
Normal file
|
@ -0,0 +1,16 @@
|
|||
using System;
|
||||
|
||||
namespace Notepad.Extensions.Logging
|
||||
{
|
||||
struct WindowInfo
|
||||
{
|
||||
public WindowInfo(WindowKind kind, IntPtr handle)
|
||||
{
|
||||
Kind = kind;
|
||||
Handle = handle;
|
||||
}
|
||||
|
||||
public WindowKind Kind { get; }
|
||||
public IntPtr Handle { get; }
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
namespace Notepad.Extensions.Logging
|
||||
{
|
||||
public enum WindowKind
|
||||
enum WindowKind
|
||||
{
|
||||
Invalid,
|
||||
Notepad,
|
||||
|
|
Loading…
Reference in a new issue