diff --git a/client/SDL/CMakeLists.txt b/client/SDL/CMakeLists.txt
index 2965544b3..488a56a2a 100644
--- a/client/SDL/CMakeLists.txt
+++ b/client/SDL/CMakeLists.txt
@@ -77,6 +77,13 @@ if (NOT SDL2_FOUND AND NOT SDL3_FOUND)
message(FATAL_ERROR "No SDL library detected, giving up. Install SDL2 or SDL3 development package to fix")
endif()
+# Configuration settings for manpages
+if (NOT WITH_FULL_CONFIG_PATH AND "${VENDOR}" STREQUAL "${PRODUCT}")
+ string(TOLOWER "${VENDOR}" VENDOR_PRODUCT)
+else()
+ set(VENDOR_PRODUCT "${VENDOR}/${PRODUCT}")
+endif()
+
add_subdirectory(common)
include_directories(common)
diff --git a/client/SDL/SDL2/man/CMakeLists.txt b/client/SDL/SDL2/man/CMakeLists.txt
index a642f5591..522448893 100644
--- a/client/SDL/SDL2/man/CMakeLists.txt
+++ b/client/SDL/SDL2/man/CMakeLists.txt
@@ -1,8 +1,8 @@
set(DEPS
- sdl2-freerdp-channels.1.xml
- sdl2-freerdp-config.1.xml
- sdl2-freerdp-examples.1.xml
- sdl2-freerdp-envvar.1.xml
+ ../../common/man/sdl-freerdp-channels.1.xml
+ ../../common/man/sdl-freerdp-config.1.xml
+ ../../common/man/sdl-freerdp-examples.1.xml
+ ../../common/man/sdl-freerdp-envvar.1.xml
)
generate_and_install_freerdp_man_from_xml(${MODULE_NAME} "1" "${DEPS}")
diff --git a/client/SDL/SDL2/man/sdl2-freerdp.1.xml.in b/client/SDL/SDL2/man/sdl2-freerdp.1.xml.in
index ed73c0ade..ba5b6cbf8 100644
--- a/client/SDL/SDL2/man/sdl2-freerdp.1.xml.in
+++ b/client/SDL/SDL2/man/sdl2-freerdp.1.xml.in
@@ -3,9 +3,9 @@
PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-
-
-
+
+
+
]
>
diff --git a/client/SDL/SDL3/man/CMakeLists.txt b/client/SDL/SDL3/man/CMakeLists.txt
index 0c228b25e..522448893 100644
--- a/client/SDL/SDL3/man/CMakeLists.txt
+++ b/client/SDL/SDL3/man/CMakeLists.txt
@@ -1,8 +1,8 @@
set(DEPS
- sdl3-freerdp-channels.1.xml
- sdl3-freerdp-config.1.xml
- sdl3-freerdp-examples.1.xml
- sdl3-freerdp-envvar.1.xml
+ ../../common/man/sdl-freerdp-channels.1.xml
+ ../../common/man/sdl-freerdp-config.1.xml
+ ../../common/man/sdl-freerdp-examples.1.xml
+ ../../common/man/sdl-freerdp-envvar.1.xml
)
generate_and_install_freerdp_man_from_xml(${MODULE_NAME} "1" "${DEPS}")
diff --git a/client/SDL/SDL3/man/sdl3-freerdp-config.1.xml.in b/client/SDL/SDL3/man/sdl3-freerdp-config.1.xml.in
deleted file mode 100644
index 7db5ff8bf..000000000
--- a/client/SDL/SDL3/man/sdl3-freerdp-config.1.xml.in
+++ /dev/null
@@ -1,81 +0,0 @@
-
- Configuration file
-
-
-
- Format and Location:
-
- The configuration file is stored per user.
- The XDG_CONFIG_HOME environment variable can be used to override the base directory.
- This defaults to ~/.config
- The location relative to XDG_CONFIG_HOME is $XDG_CONFIG_HOME/@VENDOR@/@PRODUCT@/@MODULE_NAME@.json
- The configuration is stored in JSON format
-
-
-
- Supported options:
-
-
- SDL_KeyModMask
-
-
-
- Defines the key combination required for SDL client shortcuts.
- Default KMOD_RSHIFT
- An array of SDL_Keymod strings as defined at https://wiki.libsdl.org/SDL2/SDL_Keymod
-
-
-
-
-
- SDL_Fullscreen
-
-
-
- Toggles client fullscreen state.
- Default SDL_SCANCODE_RETURN.
- A string as defined at https://wiki.libsdl.org/SDL2/SDLScancodeLookup
-
-
-
-
-
- SDL_Resizeable
-
-
-
- Toggles local window resizeable state.
- Default SDL_SCANCODE_R.
- A string as defined at https://wiki.libsdl.org/SDL2/SDLScancodeLookup
-
-
-
-
-
- SDL_Grab
-
-
-
- Toggles keyboard and mouse grab state.
- Default SDL_SCANCODE_G.
- A string as defined at https://wiki.libsdl.org/SDL2/SDLScancodeLookup
-
-
-
-
-
- SDL_Disconnect
-
-
-
- Disconnects from the RDP session.
- Default SDL_SCANCODE_D.
- A string as defined at https://wiki.libsdl.org/SDL2/SDLScancodeLookup
-
-
-
-
-
-
-
-
diff --git a/client/SDL/SDL3/man/sdl3-freerdp-envvar.1.xml.in b/client/SDL/SDL3/man/sdl3-freerdp-envvar.1.xml.in
deleted file mode 100644
index ab6c8c558..000000000
--- a/client/SDL/SDL3/man/sdl3-freerdp-envvar.1.xml.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
- Environment variables
-
-
-
- wlog environment variable
-
- sdl-freerdp uses wLog as its log facility, you can refer to the
- corresponding man page (wlog(7)) for more informations. Arguments passed
- via the /log-level or /log-filters
- have precedence over the environment variables.
-
-
-
-
diff --git a/client/SDL/SDL3/man/sdl3-freerdp-examples.1.xml.in b/client/SDL/SDL3/man/sdl3-freerdp-examples.1.xml.in
deleted file mode 100644
index 7b0f87384..000000000
--- a/client/SDL/SDL3/man/sdl3-freerdp-examples.1.xml.in
+++ /dev/null
@@ -1,95 +0,0 @@
-
- Examples
-
-
- sdl-freerdp connection.rdp /p:Pwd123! /f
-
- Connect in fullscreen mode using a stored configuration connection.rdp and the password Pwd123!
-
-
-
- sdl-freerdp /u:USER /size:50%h /v:rdp.contoso.com
-
- Connect to host rdp.contoso.com with user USER and a size of 50 percent of the height. If width (w) is set instead of height (h) like /size:50%w. 50 percent of the width is used.
-
-
-
- sdl-freerdp /u:CONTOSO\\JohnDoe /p:Pwd123! /v:rdp.contoso.com
-
- Connect to host rdp.contoso.com with user CONTOSO\\JohnDoe and password Pwd123!
-
-
-
- sdl-freerdp /u:JohnDoe /p:Pwd123! /w:1366 /h:768 /v:192.168.1.100:4489
-
- Connect to host 192.168.1.100 on port 4489 with user JohnDoe, password Pwd123!. The screen width is set to 1366 and the height to 768
-
-
-
- sdl-freerdp /u:JohnDoe /p:Pwd123! /vmconnect:C824F53E-95D2-46C6-9A18-23A5BB403532 /v:192.168.1.100
-
- Establish a connection to host 192.168.1.100 with user JohnDoe, password Pwd123! and connect to Hyper-V console (use port 2179, disable negotiation) with VMID C824F53E-95D2-46C6-9A18-23A5BB403532
-
-
-
- +clipboard
-
- Activate clipboard redirection
-
-
-
- /drive:home,/home/user
-
- Activate drive redirection of /home/user as home drive
-
-
-
- /smartcard:<device>
-
- Activate smartcard redirection for device device
-
-
-
- /printer:<device>,<driver>
-
- Activate printer redirection for printer device using driver driver
-
-
-
- /serial:<device>
-
- Activate serial port redirection for port device
-
-
-
- /parallel:<device>
-
- Activate parallel port redirection for port device
-
-
-
- /sound:sys:alsa
-
- Activate audio output redirection using device sys:alsa
-
-
-
- /microphone:sys:alsa
-
- Activate audio input redirection using device sys:alsa
-
-
-
- /multimedia:sys:alsa
-
- Activate multimedia redirection using device sys:alsa
-
-
-
- /usb:id,dev:054c:0268
-
- Activate USB device redirection for the device identified by 054c:0268
-
-
-
-
diff --git a/client/SDL/SDL3/man/sdl3-freerdp.1.xml.in b/client/SDL/SDL3/man/sdl3-freerdp.1.xml.in
index b3ee2dd7b..ba5b6cbf8 100644
--- a/client/SDL/SDL3/man/sdl3-freerdp.1.xml.in
+++ b/client/SDL/SDL3/man/sdl3-freerdp.1.xml.in
@@ -3,9 +3,9 @@
PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-
-
-
+
+
+
]
>
diff --git a/client/SDL/SDL2/man/sdl2-freerdp-config.1.xml.in b/client/SDL/common/man/sdl-freerdp-config.1.xml.in
similarity index 96%
rename from client/SDL/SDL2/man/sdl2-freerdp-config.1.xml.in
rename to client/SDL/common/man/sdl-freerdp-config.1.xml.in
index 7db5ff8bf..98bc5dbe8 100644
--- a/client/SDL/SDL2/man/sdl2-freerdp-config.1.xml.in
+++ b/client/SDL/common/man/sdl-freerdp-config.1.xml.in
@@ -8,7 +8,7 @@
The configuration file is stored per user.
The XDG_CONFIG_HOME environment variable can be used to override the base directory.
This defaults to ~/.config
- The location relative to XDG_CONFIG_HOME is $XDG_CONFIG_HOME/@VENDOR@/@PRODUCT@/@MODULE_NAME@.json
+ The location relative to XDG_CONFIG_HOME is $XDG_CONFIG_HOME/@VENDOR_PRODUCT@/sdl-freerdp.json
The configuration is stored in JSON format
diff --git a/client/SDL/SDL2/man/sdl2-freerdp-envvar.1.xml.in b/client/SDL/common/man/sdl-freerdp-envvar.1.xml.in
similarity index 100%
rename from client/SDL/SDL2/man/sdl2-freerdp-envvar.1.xml.in
rename to client/SDL/common/man/sdl-freerdp-envvar.1.xml.in
diff --git a/client/SDL/SDL2/man/sdl2-freerdp-examples.1.xml.in b/client/SDL/common/man/sdl-freerdp-examples.1.xml.in
similarity index 100%
rename from client/SDL/SDL2/man/sdl2-freerdp-examples.1.xml.in
rename to client/SDL/common/man/sdl-freerdp-examples.1.xml.in
diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake
index b98c7ba6c..758d673d6 100644
--- a/cmake/InstallFreeRDPMan.cmake
+++ b/cmake/InstallFreeRDPMan.cmake
@@ -35,8 +35,9 @@ function(generate_and_install_freerdp_man_from_xml target section dependencies)
configure_file(${template}.xml.in ${manpage}.xml @ONLY IMMEDIATE)
foreach(DEP IN LISTS dependencies)
+ get_filename_component(DNAME "${DEP}" NAME)
set(SRC ${CMAKE_CURRENT_SOURCE_DIR}/${DEP}.in)
- set(DST ${CMAKE_CURRENT_BINARY_DIR}/${DEP})
+ set(DST ${CMAKE_CURRENT_BINARY_DIR}/${DNAME})
if (EXISTS ${SRC})
message("generating ${DST} from ${SRC}")