diff --git a/Client/Win/TeamScreenClientPortable/MainForm.Designer.cs b/Client/Win/TeamScreenClientPortable/MainForm.Designer.cs index 926a640..b5ce339 100644 --- a/Client/Win/TeamScreenClientPortable/MainForm.Designer.cs +++ b/Client/Win/TeamScreenClientPortable/MainForm.Designer.cs @@ -153,6 +153,7 @@ private void InitializeComponent() this.Margin = new System.Windows.Forms.Padding(2); this.Name = "MainForm"; this.Text = "TeamScreen Client"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); this.ResumeLayout(false); diff --git a/Client/Win/TeamScreenClientPortable/MainForm.cs b/Client/Win/TeamScreenClientPortable/MainForm.cs index a8b5d73..070f2d7 100644 --- a/Client/Win/TeamScreenClientPortable/MainForm.cs +++ b/Client/Win/TeamScreenClientPortable/MainForm.cs @@ -1,4 +1,6 @@ -using Messages.EventArgs.Network; +using Messages.Connection.OneWay; +using Messages.Connection.Request; +using Messages.EventArgs.Network; using Network.Thread; using System; using System.Collections.Generic; @@ -139,5 +141,10 @@ private void ClientListener_OnClientConnected(object sender, ClientConnectedEven this.lblStatus.Text = "Passwort Falsch Verbindung abgebrochen von: " + e.SystemId; } } + + private void MainForm_FormClosing(object sender, FormClosingEventArgs e) + { + clientThread.Manager.sendMessage(new DisconnectFromIntroducerMessage() { SystemId = clientThread.Manager.SystemId}); + } } } diff --git a/Client/Win/TeamScreenClientPortable/RemoteForm.Designer.cs b/Client/Win/TeamScreenClientPortable/RemoteForm.Designer.cs index bf037bc..c437947 100644 --- a/Client/Win/TeamScreenClientPortable/RemoteForm.Designer.cs +++ b/Client/Win/TeamScreenClientPortable/RemoteForm.Designer.cs @@ -30,6 +30,7 @@ private void InitializeComponent() { this.button1 = new System.Windows.Forms.Button(); this.drawingArea1 = new TeamScreenClientPortable.Controls.DrawingArea(); + this.btnCtrlAltDel = new System.Windows.Forms.Button(); this.SuspendLayout(); // // button1 @@ -59,11 +60,22 @@ private void InitializeComponent() this.drawingArea1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.drawingArea1_MouseMove); this.drawingArea1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.drawingArea1_MouseUp); // + // btnCtrlAltDel + // + this.btnCtrlAltDel.Location = new System.Drawing.Point(599, 12); + this.btnCtrlAltDel.Name = "btnCtrlAltDel"; + this.btnCtrlAltDel.Size = new System.Drawing.Size(105, 23); + this.btnCtrlAltDel.TabIndex = 2; + this.btnCtrlAltDel.Text = "CTRL+ALT+DEL"; + this.btnCtrlAltDel.UseVisualStyleBackColor = true; + this.btnCtrlAltDel.Click += new System.EventHandler(this.btnCtrlAltDel_Click); + // // RemoteForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(884, 533); + this.Controls.Add(this.btnCtrlAltDel); this.Controls.Add(this.button1); this.Controls.Add(this.drawingArea1); this.Name = "RemoteForm"; @@ -77,5 +89,6 @@ private void InitializeComponent() private Controls.DrawingArea drawingArea1; private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button btnCtrlAltDel; } } \ No newline at end of file diff --git a/Client/Win/TeamScreenClientPortable/RemoteForm.cs b/Client/Win/TeamScreenClientPortable/RemoteForm.cs index 380632e..8f3e892 100644 --- a/Client/Win/TeamScreenClientPortable/RemoteForm.cs +++ b/Client/Win/TeamScreenClientPortable/RemoteForm.cs @@ -210,5 +210,11 @@ private void drawingArea1_MouseDoubleClick(object sender, MouseEventArgs e) break; } } + + private void btnCtrlAltDel_Click(object sender, EventArgs e) + { + clientThread.Manager.sendMessage(new Messages.Connection.OneWay.KeyMessage { SymmetricKey = clientThread.Manager.getSymmetricKeyForRemoteId(this.SystemId), Key = (uint)46, ClientSystemId = clientThread.Manager.SystemId, HostSystemId = this.SystemId, Alt = true, Control = true, Shift = false, Mode = Messages.Connection.OneWay.KeyMessage.KeyMode.Down }); + clientThread.Manager.sendMessage(new Messages.Connection.OneWay.KeyMessage { SymmetricKey = clientThread.Manager.getSymmetricKeyForRemoteId(this.SystemId), Key = (uint)46, ClientSystemId = clientThread.Manager.SystemId, HostSystemId = this.SystemId, Alt = true, Control = true, Shift = false, Mode = Messages.Connection.OneWay.KeyMessage.KeyMode.Up }); + } } } diff --git a/Host/ConsoleApp/Program.cs b/Host/ConsoleApp/Program.cs index 6d1b4c1..a36b76d 100644 --- a/Host/ConsoleApp/Program.cs +++ b/Host/ConsoleApp/Program.cs @@ -1,4 +1,5 @@ using System; +using LiteNetLib; using Network.Thread; namespace ConsoleApp @@ -6,16 +7,16 @@ namespace ConsoleApp class Program { - public static HostThread Manager { get { return Network.Instance.Host.Instance.Thread; } } + public static HostThread thread { get { return Network.Instance.Host.Instance.Thread; } } static void Main(string[] args) { - Manager.Events.onPeerConnected += delegate(object sender, EventArgs eventArgs) + thread.Events.onPeerConnected += delegate(object sender, EventArgs eventArgs) { - Console.WriteLine("Host Connected"); + Console.WriteLine("Host Connected: " + thread.Manager.SystemId + " Password: " + thread.Manager.Password); }; - - Manager.Start(); + + thread.Start(); Console.WriteLine("Host started ...");