Skip to content

Commit

Permalink
Convert to single-threaded
Browse files Browse the repository at this point in the history
  • Loading branch information
@mihaifm
mihaifm committed Nov 9, 2022
1 parent b3f57c2 commit 22e2fa2
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 100 deletions.
3 changes: 1 addition & 2 deletions ElegantRecorder/AutomationEngine.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Threading;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;

namespace ElegantRecorder
{
Expand Down Expand Up @@ -95,7 +94,7 @@ public virtual bool ReplayKeypressAction(UIAction action, ref string status)

public virtual bool ReplayClipboardAction(UIAction action, ref string status)
{
App.WinAPI.SetClipboardText(action.TextData);
System.Windows.Clipboard.SetText(action.TextData);
return true;
}

Expand Down
142 changes: 73 additions & 69 deletions ElegantRecorder/ElegantRecorder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
using System.Diagnostics;
using System.IO;
using System.Text.Json;
using System.Threading;
using System.Windows.Forms;
using ElegantRecorder.Properties;
using System.Threading.Tasks;

namespace ElegantRecorder
{
Expand Down Expand Up @@ -187,9 +185,8 @@ private void PreRecordClipboard()
}
}

public /*async*/ void RecordMouse(MouseHookStruct currentMouseHookStruct, MouseHookStruct prevMouseHookStruct)
public void RecordMouse(MouseHookStruct currentMouseHookStruct, MouseHookStruct prevMouseHookStruct)
{
//await System.Threading.Tasks.Task.Run(() => RecordMouseWorker());
RecordMouseWorker(currentMouseHookStruct, prevMouseHookStruct);

SetStatus(status);
Expand Down Expand Up @@ -276,9 +273,6 @@ public void Record()
WinAPI.InstallHooks();
}

CancellationTokenSource tokenSource = new CancellationTokenSource();
CancellationToken token;

// Use MouseDown istead of Click event to avoid situations where other UI events happen between mouse down and up, due to the automation
private void buttonStop_MouseDown(object sender, MouseEventArgs e)
{
Expand All @@ -289,12 +283,9 @@ public void Stop(bool paused)
{
WinAPI.UninstallHooks();

stopwatch.Reset();
replayInterrupted = true;

if (tokenSource != null)
{
tokenSource.Cancel();
}
stopwatch.Reset();

ClearStatus();

Expand Down Expand Up @@ -326,95 +317,108 @@ public void Stop(bool paused)
}
}

private async void buttonReplay_Click(object sender, EventArgs e)
private void buttonReplay_Click(object sender, EventArgs e)
{
if (replaying)
return;

ResetButtons();

replaying = true;
buttonReplay.Image = Resources.play_edit;
replayInterrupted = false;

tokenSource.Dispose();
tokenSource = new CancellationTokenSource();
token = tokenSource.Token;
buttonReplay.Image = Resources.play_edit;

ClearStatus();

var task = Task.Run(ReplayWorker, token);

try
{
await task;
}
catch (Exception) { }
Replay();

SetStatus(status);
}

private int currentActionIndex = 0;
private Timer replayTimer = null;
private Recording ReplayRec = null;
private bool replayInterrupted = false;

void ReplayWorker()
void Replay()
{
var rec = new Recording(this, CurrentRecordingName);
rec.Load();
ReplayRec = new Recording(this, CurrentRecordingName);
ReplayRec.Load();

UIAction[] steps = rec.UIActions;

if (currentActionIndex >= steps.Length - 1)
if (currentActionIndex >= ReplayRec.UIActions.Length - 1)
currentActionIndex = 0;

for (int i = currentActionIndex; i < steps.Length; i++)
if (ReplayRec.UIActions.Length > 0)
{
var action = steps[i];
replayTimer = new Timer();
replayTimer.Tick += ReplayTimer_Tick;
PlayAction();
}
}

currentActionIndex = i;
private void PlayAction()
{
if (replayInterrupted)
{
replayTimer.Stop();
SetStatus("Replay interrupted");
return;
}

if (action.elapsed != null)
{
Thread.Sleep((int)ElegantOptions.GetPlaybackSpeedDuration(rec.PlaybackSpeed, (double)action.elapsed));
}
var action = ReplayRec.UIActions[currentActionIndex];

try
{
token.ThrowIfCancellationRequested();
}
catch (OperationCanceledException)
{
status = "Replay interrupted";
return;
}
if (action.EventType == "click")
{
AutomationEngine.ReplayClickAction(action, ref status);
}
else if (action.EventType == "mousemove")
{
AutomationEngine.ReplayMouseMoveAction(action, ref status);
}
else if (action.EventType == "mousewheel")
{
AutomationEngine.ReplayMouseWheelAction(action, ref status);
}
else if (action.EventType == "keypress")
{
AutomationEngine.ReplayKeypressAction(action, ref status);
}
else if (action.EventType == "clipboard")
{
AutomationEngine.ReplayClipboardAction(action, ref status);
}
else if (action.EventType == "mousepath")
{
AutomationEngine.ReplayMousePathAction(action, ReplayRec.PlaybackSpeed, ref status);
}

if (action.EventType == "click")
{
AutomationEngine.ReplayClickAction(action, ref status);
}
else if (action.EventType == "mousemove")
{
AutomationEngine.ReplayMouseMoveAction(action, ref status);
}
else if (action.EventType == "mousewheel")
{
AutomationEngine.ReplayMouseWheelAction(action, ref status);
}
else if (action.EventType == "keypress")
{
AutomationEngine.ReplayKeypressAction(action, ref status);
}
else if (action.EventType == "clipboard")
if (currentActionIndex < ReplayRec.UIActions.Length - 1)
{
currentActionIndex++;

if (ReplayRec.UIActions[currentActionIndex].elapsed != null && ReplayRec.UIActions[currentActionIndex].elapsed != 0)
{
AutomationEngine.ReplayClipboardAction(action, ref status);
replayTimer.Interval = (int)ElegantOptions.GetPlaybackSpeedDuration(ReplayRec.PlaybackSpeed, (double)ReplayRec.UIActions[currentActionIndex].elapsed);
replayTimer.Start();
}
else if (action.EventType == "mousepath")
else
{
AutomationEngine.ReplayMousePathAction(action, rec.PlaybackSpeed, ref status);
PlayAction();
}
}
else
{
replayTimer.Stop();
SetStatus("Replay finished");
ResetButtons();
}
}

status = "Replay finished";

ResetButtons();
private void ReplayTimer_Tick(object? sender, EventArgs e)
{
replayTimer.Stop();
PlayAction();
}

private void buttonSettings_Click(object sender, EventArgs e)
Expand Down
29 changes: 0 additions & 29 deletions ElegantRecorder/WinAPI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ public WinAPI(ElegantRecorder App)

private const int WM_CLIPBOARDUPDATE = 0x031D;

private const int CF_UNICODETEXT = 13;

[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
private static extern IntPtr SetWindowsHookEx(int idHook, LowLevelHookProc lpfn, IntPtr hMod, uint dwThreadId);

Expand Down Expand Up @@ -154,18 +152,6 @@ public WinAPI(ElegantRecorder App)
[return: MarshalAs(UnmanagedType.Bool)]
static extern bool RemoveClipboardFormatListener(IntPtr hwnd);

[DllImport("user32.dll", SetLastError = true)]
static extern bool OpenClipboard(IntPtr hWndNewOwner);

[DllImport("user32.dll", SetLastError = true)]
static extern bool CloseClipboard();

[DllImport("user32.dll")]
static extern bool EmptyClipboard();

[DllImport("user32.dll")]
static extern IntPtr SetClipboardData(uint uFormat, IntPtr hMem);

[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
private static extern bool RegisterHotKey(IntPtr hWnd, int id, KeyModifiers fsModifiers, Keys vk);

Expand All @@ -176,7 +162,6 @@ public WinAPI(ElegantRecorder App)
private LowLevelHookProc mouseDelegate = null;
private LowLevelHookProc keyboardDelegate = null;


public MouseHookStruct CurrentMouseHookStruct;
public MouseHookStruct PrevMouseHookStruct;
public KeyboardHookStruct KeyboardHookStruct;
Expand Down Expand Up @@ -382,20 +367,6 @@ public bool ProcessClipboardMessage(int message, ref string clipboardText)
return false;
}

public void SetClipboardText(string text)
{
//string nullTerminatedStr = text + "\0";

//byte[] strBytes = Encoding.Unicode.GetBytes(nullTerminatedStr);
//IntPtr hglobal = Marshal.AllocHGlobal(strBytes.Length);
//Marshal.Copy(strBytes, 0, hglobal, strBytes.Length);
//OpenClipboard(IntPtr.Zero);
//EmptyClipboard();
//SetClipboardData(CF_UNICODETEXT, hglobal);
//CloseClipboard();
//Marshal.FreeHGlobal(hglobal);
}

public static void GetModifiers(Keys keydata, out Keys key, out KeyModifiers modifers)
{
key = keydata;
Expand Down

0 comments on commit 22e2fa2

Please sign in to comment.