Skip to content

Commit 75dbf0a

Browse files
PickleftPickleft
committed
Fixed a lot of bugs didn't notice.
1 parent be71d06 commit 75dbf0a

File tree

5 files changed

+70
-205
lines changed

5 files changed

+70
-205
lines changed

‎Swift/Calls.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ internal class Calls
2828
public static extern bool PostMessage(IntPtr hWnd, uint Msg, int wParam, int lParam);
2929
[DllImport("dnsapi.dll", EntryPoint = "DnsFlushResolverCache")]
3030
public static extern UInt32 DnsFlushResolverCache();
31+
[DllImport("user32", SetLastError = true)]
32+
public static extern bool RegisterHotKey(IntPtr hWnd, int id, uint fsModifiers, uint vk);
33+
34+
[DllImport("user32", SetLastError = true)]
35+
public static extern bool UnregisterHotKey(IntPtr hWnd, int id);
3136

3237
public static void restartservice()
3338
{

‎Swift/Clicker.cs‎

Lines changed: 62 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
using System.Text;
88
using System.Threading.Tasks;
99
using System.Windows.Forms;
10+
using System.Windows.Input;
1011
using static Swift.Calls;
1112
using Swift.Mods;
1213
using System.Diagnostics;
14+
using System.Runtime.InteropServices;
1315

1416
namespace Swift
1517
{
@@ -32,7 +34,6 @@ randomizatin is prt decent unless you got better make a pull request or somethin
3234
System.Timers.Timer rightclicker = new System.Timers.Timer();
3335
System.Timers.Timer randomizer = new System.Timers.Timer();
3436
System.Timers.Timer drop = new System.Timers.Timer();
35-
System.Timers.Timer keyreg = new System.Timers.Timer();
3637

3738

3839
public Clicker()
@@ -42,65 +43,70 @@ public Clicker()
4243
rightclicker.Elapsed += RightClickvent;
4344
randomizer.Elapsed += randomvent;
4445
drop.Elapsed += dropvent;
45-
keyreg.Elapsed += keysevent;
46-
keyreg.Enabled = true;
4746
InitializeComponent();
48-
HotKeyManager.HotKeyPressed += new EventHandler<HotKeyEventArgs>(HotKeyManager_HotKeyPressed);
4947
}
5048

51-
public void HotKeyManager_HotKeyPressed(object sender, HotKeyEventArgs e)
49+
protected override void WndProc(ref Message m)
5250
{
5351
try
5452
{
5553
if (Bind.Text != "[ Bind ]")
5654
{
5755
if (Bind.Text != "[ ... ]")
5856
{
57+
Calls.UnregisterHotKey(Handle, idofL);
5958
Keys key = (Keys)new KeysConverter().ConvertFromString(Bind.Text.Trim('[', ']', ' '));
60-
if (e.Key == key)
59+
Calls.RegisterHotKey(Handle, 1, 0, (uint)key);
60+
}
61+
}
62+
if (rbind.Text != "[ Bind ]")
63+
{
64+
if (rbind.Text != "[ ... ]")
65+
{
66+
Calls.UnregisterHotKey(Handle, idofR);
67+
Keys keyright = (Keys)new KeysConverter().ConvertFromString(rbind.Text.Trim('[', ']', ' '));
68+
Calls.RegisterHotKey(Handle, 2, 0, (uint)keyright);
69+
}
70+
}
71+
if (m.Msg == 0x312)
72+
{
73+
int id = m.WParam.ToInt32();
74+
if (id == 1)
75+
{
76+
if (clicker.Enabled == true)
6177
{
62-
if (clicker.Enabled == true)
78+
clicker.Enabled = false;
79+
if (statusleft.InvokeRequired)
6380
{
64-
clicker.Enabled = false;
65-
if (statusleft.InvokeRequired)
66-
{
67-
statusleft.Invoke(new MethodInvoker(delegate { statusleft.Checked = false; }));
68-
}
81+
statusleft.Invoke(new MethodInvoker(delegate { statusleft.Checked = false; }));
6982
}
70-
else
83+
}
84+
else
85+
{
86+
clicker.Enabled = true;
87+
if (statusleft.InvokeRequired)
7188
{
72-
clicker.Enabled = true;
73-
if (statusleft.InvokeRequired)
74-
{
75-
statusleft.Invoke(new MethodInvoker(delegate { statusleft.Checked = true; }));
76-
}
77-
89+
statusleft.Invoke(new MethodInvoker(delegate { statusleft.Checked = true; }));
7890
}
91+
7992
}
8093
}
81-
}
82-
if (rbind.Text != "[ Bind ]")
83-
{
84-
if (rbind.Text != "[ ... ]")
94+
else if (id == 2)
8595
{
86-
Keys keyright = (Keys)new KeysConverter().ConvertFromString(rbind.Text.Trim('[', ']', ' '));
87-
if (e.Key == keyright)
96+
if (rightclicker.Enabled == true)
8897
{
89-
if (rightclicker.Enabled == true)
98+
rightclicker.Enabled = false;
99+
if (statusright.InvokeRequired)
90100
{
91-
rightclicker.Enabled = false;
92-
if (statusright.InvokeRequired)
93-
{
94-
statusright.Invoke(new MethodInvoker(delegate { statusright.Checked = false; }));
95-
}
101+
statusright.Invoke(new MethodInvoker(delegate { statusright.Checked = false; }));
96102
}
97-
else
103+
}
104+
else
105+
{
106+
rightclicker.Enabled = true;
107+
if (statusright.InvokeRequired)
98108
{
99-
rightclicker.Enabled = true;
100-
if (statusright.InvokeRequired)
101-
{
102-
statusright.Invoke(new MethodInvoker(delegate { statusright.Checked = true; }));
103-
}
109+
statusright.Invoke(new MethodInvoker(delegate { statusright.Checked = true; }));
104110
}
105111
}
106112
}
@@ -110,6 +116,7 @@ public void HotKeyManager_HotKeyPressed(object sender, HotKeyEventArgs e)
110116
{
111117

112118
}
119+
base.WndProc(ref m);
113120
}
114121

115122
private void Clickvent(object sender, System.Timers.ElapsedEventArgs e)
@@ -135,8 +142,9 @@ private void Clickvent(object sender, System.Timers.ElapsedEventArgs e)
135142
{
136143
Core.leftclick(javah, leftlock);
137144
}
138-
139145
}
146+
147+
140148
private void RightClickvent(object sender, System.Timers.ElapsedEventArgs e)
141149
{
142150
rightclicker.Interval = rightcps;
@@ -158,36 +166,6 @@ private void RightClickvent(object sender, System.Timers.ElapsedEventArgs e)
158166
}
159167
}
160168

161-
private void keysevent(object sender, System.Timers.ElapsedEventArgs e)
162-
{
163-
try
164-
{
165-
if (Bind.Text != "[ Bind ]")
166-
{
167-
if (Bind.Text != "[ ... ]")
168-
{
169-
HotKeyManager.UnregisterHotKey(idofL);
170-
Keys key = (Keys)new KeysConverter().ConvertFromString(Bind.Text.Trim('[', ']', ' '));
171-
idofL = HotKeyManager.RegisterHotKey(key, KeyModifiers.NoRepeat);
172-
}
173-
}
174-
if (rbind.Text != "[ Bind ]")
175-
{
176-
if (rbind.Text != "[ ... ]")
177-
{
178-
HotKeyManager.UnregisterHotKey(idofR);
179-
Keys keyright = (Keys)new KeysConverter().ConvertFromString(rbind.Text.Trim('[', ']', ' '));
180-
idofR = HotKeyManager.RegisterHotKey(keyright, KeyModifiers.NoRepeat);
181-
}
182-
}
183-
}
184-
catch
185-
{
186-
187-
}
188-
}
189-
190-
191169
private void randomvent(object sender, System.Timers.ElapsedEventArgs e)
192170
{
193171
double randominterval = leftcps + new Random().Next(250, 500);
@@ -355,9 +333,10 @@ private void lmblock_CheckedChanged(object sender, EventArgs e)
355333
private void Bind_Click(object sender, EventArgs e)
356334
{
357335
Bind.Text = "[ ... ]";
336+
Bind.Checked = true;
358337
}
359338

360-
private void Bind_KeyDown(object sender, KeyEventArgs e)
339+
private void Bind_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
361340
{
362341
if (Bind.Checked)
363342
{
@@ -373,7 +352,7 @@ private void Bind_KeyDown(object sender, KeyEventArgs e)
373352
}
374353
else
375354
{
376-
return; // cry abt it wonder </3
355+
return;
377356
}
378357
}
379358

@@ -457,6 +436,7 @@ private void food_CheckedChanged(object sender, EventArgs e)
457436
private void rbind_Click(object sender, EventArgs e)
458437
{
459438
rbind.Text = "[ ... ]";
439+
rbind.Checked = true;
460440
}
461441

462442
private void Rcpsslider_ValueChanged(object sender, EventArgs e)
@@ -466,15 +446,23 @@ private void Rcpsslider_ValueChanged(object sender, EventArgs e)
466446
rightcps = (double)(1000 / Rcpsslider.Value);
467447
}
468448

469-
private void rbind_KeyDown(object sender, KeyEventArgs e)
449+
private void rbind_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
470450
{
471-
if (e.KeyCode == Keys.Escape)
451+
if (rbind.Checked)
472452
{
473-
rbind.Text = "[ Bind ]";
453+
if (e.KeyCode == Keys.Escape)
454+
{
455+
rbind.Text = "[ Bind ]";
456+
}
457+
else
458+
{
459+
rbind.Text = $"[ {e.KeyCode} ]";
460+
}
461+
rbind.Checked = false;
474462
}
475463
else
476464
{
477-
rbind.Text = $"[ {e.KeyCode} ]";
465+
return;
478466
}
479467
}
480468

‎Swift/Mods/Core.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ public static async void rightclick(IntPtr window, bool leftlock)
130130
await Task.Delay(70);
131131
if (Control.MouseButtons == MouseButtons.Right)
132132
{
133-
PostMessage(window, 0x201, 0, 0);
133+
PostMessage(window, 0x204, 0, 0);
134134
await Task.Delay(rnd.Next(10, 40));
135-
PostMessage(window, 0x202, 0, 0);
135+
PostMessage(window, 0x205, 0, 0);
136136
}
137137
else
138138
{

‎Swift/Mods/HotKeyManager.cs‎

Lines changed: 0 additions & 128 deletions
This file was deleted.

0 commit comments

Comments
 (0)