simplify configuration

README.md

@@ -268,17 +268,19 @@ If the device still can not be entered, make sure you have UDP port `4242` (or t
 <details>
     <summary>Command Line Interface</summary>
 
-The cli interface can be accessed by passing `cli` as a commandline argument.
-Use
-```sh
-lan-mouse cli help
-```
- to list the available commands and
-```sh
-lan-mouse cli <cmd> help
-```
-for information on how to use a specific command.
+The cli interface can be enabled using `--frontend cli` as commandline arguments.
+Type `help` to list the available commands.
 
+E.g.:
+```sh
+$ cargo run --release -- --frontend cli
+(...)
+> connect <host> left|right|top|bottom
+(...)
+> list
+(...)
+> activate 0
+```
 </details>
 
 <details>
@@ -324,6 +326,9 @@ release_bind = [ "KeyA", "KeyS", "KeyD", "KeyF" ]
 
 # optional port (defaults to 4242)
 port = 4242
+# # optional frontend -> defaults to gtk if available
+# # possible values are "cli" and "gtk"
+# frontend = "gtk"
 
 # list of authorized tls certificate fingerprints that
 # are accepted for incoming traffic
@@ -331,9 +336,7 @@ port = 4242
 "bc:05:ab:7a:a4:de:88:8c:2f:92:ac:bc:b8:49:b8:24:0d:44:b3:e6:a4:ef:d7:0b:6c:69:6d:77:53:0b:14:80" = "iridium"
 
 # define a client on the right side with host name "iridium"
-[[clients]]
-# position (left | right | top | bottom)
-position = "right"
+[right]
 # hostname
 hostname = "iridium"
 # activate this client immediately when lan-mouse is started
@@ -342,8 +345,7 @@ activate_on_startup = true
 ips = ["192.168.178.156"]
 
 # define a client on the left side with IP address 192.168.178.189
-[[clients]]
-position = "left"
+[left]
 # The hostname is optional: When no hostname is specified,
 # at least one ip address needs to be specified.
 hostname = "thorium"

config.toml

@@ -1,10 +1,14 @@
 # example configuration
 
-# configure release bind
-release_bind = [ "KeyA", "KeyS", "KeyD", "KeyF" ]
+# capture_backend = "LayerShell"
+
+# release bind
+release_bind = ["KeyA", "KeyS", "KeyD", "KeyF"]
 
 # optional port (defaults to 4242)
 port = 4242
+# optional frontend -> defaults to gtk if available
+# frontend = "gtk"
 
 # list of authorized tls certificate fingerprints that
 # are accepted for incoming traffic
@@ -12,19 +16,14 @@ port = 4242
 "bc:05:ab:7a:a4:de:88:8c:2f:92:ac:bc:b8:49:b8:24:0d:44:b3:e6:a4:ef:d7:0b:6c:69:6d:77:53:0b:14:80" = "iridium"
 
 # define a client on the right side with host name "iridium"
-[[clients]]
-# position (left | right | top | bottom)
-position = "right"
+[right]
 # hostname
 hostname = "iridium"
-# activate this client immediately when lan-mouse is started
-activate_on_startup = true
 # optional list of (known) ip addresses
 ips = ["192.168.178.156"]
 
 # define a client on the left side with IP address 192.168.178.189
-[[clients]]
-position = "left"
+[left]
 # The hostname is optional: When no hostname is specified,
 # at least one ip address needs to be specified.
 hostname = "thorium"

wix/bundle/.gitignore

@@ -1,3 +0,0 @@
-/bin
-/obj
-icon.ico

wix/bundle/Bundle.wixproj

@@ -1,16 +0,0 @@
-<Project Sdk="WixToolset.Sdk/5.0.0">
-	<PropertyGroup>
-		<OutputType>Bundle</OutputType>
-		<TargetExt>.exe</TargetExt>
-		<Platforms>x64</Platforms>
-		<InstallerPlatform>x64</InstallerPlatform>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="WixToolset.Heat">
-		  <Version>5.0.2</Version>
-		</PackageReference>
-		<PackageReference Include="WixToolset.Bal.wixext">
-		  <Version>5.0.2</Version>
-		</PackageReference>
-	</ItemGroup>
-</Project>

wix/bundle/Bundle.wxs

@@ -1,42 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-    xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-
-    <Bundle
-        Name="Lan Mouse"
-        Version="0.10.0"
-        UpgradeCode="{39A9744D-9D6E-4CD3-A84F-9E034786A7B1}"
-        Compressed="no"
-        SplashScreenSourceFile="icon.ico">
-
-        <BootstrapperApplication>
-            <bal:WixStandardBootstrapperApplication
-                LicenseUrl=""
-                Theme="hyperlinkLicense" />
-        </BootstrapperApplication>
-
-        <Chain>
-            <!-- Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810 -->
-            <ExePackage
-                Id="VC_REDIST_X64"
-                DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
-                PerMachine="yes"
-                Permanent="yes"
-                Protocol="burn"
-                InstallCondition="VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
-                DetectCondition="(VCRUNTIME_X64_VER &gt;= VCRUNTIME_VER) AND VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
-                InstallArguments="/install /quiet /norestart"
-                RepairArguments="/repair /quiet /norestart"
-                UninstallArguments="/uninstall /quiet /norestart">
-                <ExePackagePayload
-                    Name="VC_redist.x64.exe"
-                    ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
-                    Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
-                    Hash="5935B69F5138AC3FBC33813C74DA853269BA079F910936AEFA95E230C6092B92F6225BFFB594E5DD35FF29BF260E4B35F91ADEDE90FDF5F062030D8666FD0104"
-                    Size="25397512"
-                    Version="14.40.33810.0"
-                    DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/3642E3F95D50CC193E4B5A0B0FFBF7FE2C08801517758B4C8AEB7105A091208A/VC_redist.x64.exe" />
-            </ExePackage>
-            <MsiPackage SourceFile="..\lan-mouse\bin\Debug\en-US\LanMouse.msi" Compressed="yes"/>
-        </Chain>
-    </Bundle>
-</Wix>

wix/lan-mouse/.gitignore

@@ -1,3 +0,0 @@
-/bin
-/obj
-icon.ico

wix/lan-mouse/Folders.wxs

@@ -1,13 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-	<Fragment>
-		<StandardDirectory Id="ProgramFiles64Folder">
-			<Directory Id="INSTALLFOLDER" Name="!(bind.Property.Manufacturer) !(bind.Property.ProductName)">
-				<Directory Id="SHARE" Name="share"/>
-				<Directory Id="LIB" Name="lib"/>
-			</Directory>
-		</StandardDirectory>
-		<StandardDirectory Id="ProgramMenuFolder">
-			<Directory Id="ApplicationProgramsFolder" Name="!(bind.Property.ProductName)"/>
-		</StandardDirectory>
-	</Fragment>
-</Wix>

wix/lan-mouse/LanMouse.wixproj

@@ -1,34 +0,0 @@
-<Project Sdk="WixToolset.Sdk/5.0.2">
-	<PropertyGroup>
-		<InstallerPlatform>x64</InstallerPlatform>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="WixToolset.Heat">
-		  <Version>5.0.2</Version>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\bin">
-			<ComponentGroupName>GTKBIN</ComponentGroupName>
-			<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-			<SuppressRegistry>true</SuppressRegistry>
-		</HarvestDirectory>
-		<BindPath Include="C:\gtk-build\gtk\x64\release\bin" />
-	</ItemGroup>
-	<ItemGroup>
-		<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\share\icons">
-			<ComponentGroupName>GTKICONS</ComponentGroupName>
-			<DirectoryRefId>SHARE</DirectoryRefId>
-			<SuppressRegistry>true</SuppressRegistry>
-		</HarvestDirectory>
-		<BindPath Include="C:\gtk-build\gtk\x64\release\share\icons" />
-	</ItemGroup>
-	<ItemGroup>
-		<HarvestDirectory Include="C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0">
-			<ComponentGroupName>GTKLIBS</ComponentGroupName>
-			<DirectoryRefId>LIB</DirectoryRefId>
-			<SuppressRegistry>true</SuppressRegistry>
-		</HarvestDirectory>
-		<BindPath Include="C:\gtk-build\gtk\x64\release\lib\gdk-pixbuf-2.0" />
-	</ItemGroup>
-</Project>

wix/lan-mouse/LanMouseComponents.wxs

@@ -1,32 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-	<Fragment>
-		<ComponentGroup Id="LanMouseComponents" Directory="INSTALLFOLDER" Subdirectory="bin">
-			<Component Guid="{ECB52D3E-28AD-4BEC-B9DF-E01CCAB356BE}">
-				<!-- the main binary -->
-				<File Source="..\..\target\release\lan-mouse.exe"/>
-
-				<!-- visual c runtime dll -->
-				<!--<File Source="C:\windows\system32\VCRUNTIME140.dll"/>-->
-				<!--<File Source="C:\windows\system32\VCRUNTIME140_1.dll"/>-->
-			</Component>
-			<!-- start menu entry-->
-			<Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder">
-				<Shortcut Id="ApplicationStartMenuShortcut"
-						  Name="!(bind.Property.ProductName)"
-						  Description ="Mouse and Keyboard sharing Software"
-						  Target="[INSTALLFOLDER]bin\lan-mouse.exe"
-						  WorkingDirectory="INSTALLFOLDER">
-					<Icon Id="LanMouse" SourceFile=".\icon.ico"/>
-				</Shortcut>
-				<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
-				<RegistryValue
-					Root="HKCU"
-					Key="Software\Feschber\LanMouse"
-					Name="installed"
-					Type="integer"
-					Value="1"
-					KeyPath="yes"/>
-			</Component>
-		</ComponentGroup>
-	</Fragment>
-</Wix>

wix/lan-mouse/Package.en-us.wxl

@@ -1,8 +0,0 @@
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
-
-</WixLocalization>

wix/lan-mouse/Package.wxs

@@ -1,16 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="Lan Mouse"
-		   Manufacturer="Ferdinand Schober"
-		   Version="0.10.0.0"
-		   UpgradeCode="{a330cd60-4c35-4a54-8bb6-75b3049b46c6}">
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-
-    <MediaTemplate EmbedCab="yes"/>
-    <Feature Id="Main">
-	  <ComponentGroupRef Id="GTKBIN"/>
-      <ComponentGroupRef Id="GTKICONS"/>
-	  <ComponentGroupRef Id="GTKLIBS"/>
-      <ComponentGroupRef Id="LanMouseComponents"/>
-    </Feature>
-  </Package>
-</Wix>

wix/lan-mouse/build.ps1

@@ -1,2 +0,0 @@
-magick -background none -density 384 ..\lan-mouse-gtk\resources\de.feschber.LanMouse.svg -trim -define icon:auto-resize icon.ico
-dotnet build