Add ContextMenu.

immense · Apr 9, 2020 · 0c9bfc6 · 0c9bfc6
1 parent b4bb9a0
commit 0c9bfc6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 21 deletions.
diff --git a/ScreenCast.Linux/Services/KeyboardMouseInputLinux.cs b/ScreenCast.Linux/Services/KeyboardMouseInputLinux.cs
@@ -235,6 +235,9 @@ private string ConvertJavaScriptKeyToX11Key(string key)
                 case "ScrollLock":
                     keySym = "Scroll_Lock";
                     break;
+                case "ContextMenu":
+                    keySym = "Menu";
+                    break;
                 case " ":
                     keySym = "space";
                     break;

diff --git a/ScreenCast.Win/Services/KeyboardMouseInputWin.cs b/ScreenCast.Win/Services/KeyboardMouseInputWin.cs
@@ -310,6 +310,9 @@ private VirtualKey ConvertJavaScriptKeyToVirtualKey(string key)
                 case "Meta":
                     keyCode = VirtualKey.LWIN;
                     break;
+                case "ContextMenu":
+                    keyCode = VirtualKey.MENU;
+                    break;
                 default:
                     keyCode = (VirtualKey)VkKeyScan(Convert.ToChar(key));
                     break;

diff --git a/Server/Program.cs b/Server/Program.cs
@@ -24,6 +24,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
                 .CaptureStartupErrors(true)
                 .ConfigureLogging((hostingContext, logging) =>
                 {
+                    logging.ClearProviders();
                     logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));
                     logging.AddConsole();
                     logging.AddDebug();
@@ -32,10 +33,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
                     {
                         if (OSUtils.IsWindows && enableEventLog)
                         {
-                            logging.AddEventLog(settings => {
-                                settings.LogName = "Remotely_Server";
-                                settings.SourceName = "Remotely_Server";
-                            });
+                            logging.AddEventLog();
                         }
                     }
                 });

diff --git a/Server/wwwroot/scripts/RemoteControl/RtcSession.js b/Server/wwwroot/scripts/RemoteControl/RtcSession.js
diff --git a/Server/wwwroot/scripts/RemoteControl/RtcSession.js.map b/Server/wwwroot/scripts/RemoteControl/RtcSession.js.map
diff --git a/Server/wwwroot/scripts/RemoteControl/RtcSession.ts b/Server/wwwroot/scripts/RemoteControl/RtcSession.ts
@@ -49,18 +49,10 @@ export class RtcSession {
         };
         this.PeerConnection.onconnectionstatechange = function (ev) {
             console.log("Connection state changed to " + this.connectionState);
-            if (this.connectionState != "connected") {
-                UI.ConnectionP2PIcon.style.display = "none";
-                UI.ConnectionRelayedIcon.style.display = "unset";
-            }
         }
 
         this.PeerConnection.oniceconnectionstatechange = function (ev) {
             console.log("ICE connection state changed to " + this.iceConnectionState);
-            if (this.iceConnectionState != "connected") {
-                UI.ConnectionP2PIcon.style.display = "none";
-                UI.ConnectionRelayedIcon.style.display = "unset";
-            }
         }
         this.PeerConnection.onicecandidate = async (ev) => {
             await Remotely.RCBrowserSockets.SendIceCandidate(ev.candidate);