extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2024-11-28 02:53:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

vncserver: extract ConstructXvncCmd()

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-08-01 21:57:36 +12:00
parent 4a63e93582
commit 6181c249d7
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
unix/vncserver
View File

@ -107,24 +107,7 @@ unlink($desktopLog);
# Now start the X VNC Server # Now start the X VNC Server
# We build up our Xvnc command with options # We build up our Xvnc command with options
$cmd = $exedir."Xvnc :$displayNumber"; $cmd = &ConstructXvncCmd();
foreach my $k (sort keys %config) {
$cmd .= " -$k $config{$k}";
delete $default_opts{$k}; # file options take precedence
}
foreach my $k (sort keys %default_opts) {
$cmd .= " -$k $default_opts{$k}";
}
# Add color database stuff here, e.g.:
# $cmd .= " -co /usr/lib/X11/rgb";
foreach $arg (@ARGV) {
$cmd .= " " . &quotedString($arg);
}
$cmd .= " >> " . &quotedString($desktopLog) . " 2>&1";
# Run $cmd and record the process ID. # Run $cmd and record the process ID.
$pidFile = "$vncUserDir/$host:$displayNumber.pid"; $pidFile = "$vncUserDir/$host:$displayNumber.pid";
@ -933,3 +916,26 @@ sub SetupXauthorityFile {
print XAUTH "add $host/unix:$displayNumber . $cookie\n"; print XAUTH "add $host/unix:$displayNumber . $cookie\n";
close(XAUTH); close(XAUTH);
} }
sub ConstructXvncCmd {
my $cmd = $exedir."Xvnc :$displayNumber";
foreach my $k (sort keys %config) {
$cmd .= " -$k $config{$k}";
delete $default_opts{$k}; # file options take precedence
}
foreach my $k (sort keys %default_opts) {
$cmd .= " -$k $default_opts{$k}";
}
# Add color database stuff here, e.g.:
# $cmd .= " -co /usr/lib/X11/rgb";
foreach $arg (@ARGV) {
$cmd .= " " . &quotedString($arg);
}
$cmd .= " >> " . &quotedString($desktopLog) . " 2>&1";
return $cmd;
}