publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vncserver YAML config: support true and false values

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-11-02 20:09:27 +13:00
parent 42021dd29a
commit 7ad6810d7f
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
unix/vncserver
View File

@@ -1117,12 +1117,9 @@ sub DefineFilePathsAndStuff {
DetectFontPath(); DetectFontPath();
%configToXvncArgsMap = ( interface => "-interface" ); %xvncArgsToConfigAliases = (
$configToXvncArgsMap{dlp}{clipboard}{max_paste_size} = '-MaxCutText'; '-AcceptPointerEvents' => [qw(pointer.allow_clicks_and_cursor_movement)]
$configToXvncArgsMap{pointer}{allow_clicks_and_cursor_movement} = );
'-AcceptPointerEvents';
%xvncArgsToConfigAliases = ();
$xvncArgsToConfigAliases{'-MaxCutText'} = [qw(dlp.clipboard.max_paste_size dlp.clipboard.delay)]; $xvncArgsToConfigAliases{'-MaxCutText'} = [qw(dlp.clipboard.max_paste_size dlp.clipboard.delay)];
$xvncArgsToConfigAliases{'-httpd'} = [qw(httpd_directory)]; $xvncArgsToConfigAliases{'-httpd'} = [qw(httpd_directory)];
} }
@@ -1291,27 +1288,41 @@ sub LoadYAMLConfig {
} }
sub ConvertConfigToXvncArgs { sub ConvertConfigToXvncArgs {
# my $result = ""; my $result = "";
foreach my $cliArg (keys %xvncArgsToConfigAliases) { foreach my $cliArg (keys %xvncArgsToConfigAliases) {
ComplementCliArgWithValue($cliArg); my $xvncCliArgWithValue = ComplementCliArgWithValue($cliArg);
} next unless defined($xvncCliArgWithValue);
exit;
# $result .= " $key $value"; $result .= " $xvncCliArgWithValue";
}
$result;
} }
sub ComplementCliArgWithValue { sub ComplementCliArgWithValue {
my $cliArg = $_[0]; my $cliArg = $_[0];
my $firstDefinedConfigKey = FirstDefinedConfigKey($cliArg); my $firstDefinedConfigKey = FirstDefinedConfigKey($cliArg);
return unless defined($firstDefinedConfigKey);
my $cliValue = ConfigValue($firstDefinedConfigKey); my $cliValue = ConfigValue($firstDefinedConfigKey);
if ($cliValue eq "default") { return unless defined($cliValue);
say "default value for $cliArg, skipping";
next; switch($cliValue) {
case "default" {
say "default value for $cliArg, skipping";
next;
}
case "true" {
$cliValue = "1";
}
case "false" {
$cliValue = "0";
}
} }
say "$cliArg $cliValue"; "$cliArg $cliValue";
} }
sub FirstDefinedConfigKey { sub FirstDefinedConfigKey {