refactor: move server files, split input types

chore: fix weird imports

chore: fix sys tray import error

chore: fix clang code style

refactor: mouse, keyboard and touch now on their own namespaces

fix: make platf_input a singleton

refactor: better isolation

lint: remove import and space

lint: import order

docs: refactor docs too

lint: new line at the end

build: glob linking input/server

build: full src glob

chore: rebase fixes

cmake/compile_definitions/common.cmake

@@ -48,6 +48,10 @@ list(APPEND PLATFORM_TARGET_FILES ${NVENC_SOURCES})
 configure_file("${CMAKE_SOURCE_DIR}/src/version.h.in" version.h @ONLY)
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")  # required for importing version.h
 
+file(GLOB_RECURSE COMMON_SOURCES
+        ${CMAKE_SOURCE_DIR}/src/**)
+list(FILTER COMMON_SOURCES EXCLUDE REGEX "${CMAKE_SOURCE_DIR}/src/platform/.*")
+
 set(SUNSHINE_TARGET_FILES
         "${CMAKE_SOURCE_DIR}/third-party/nanors/rs.c"
         "${CMAKE_SOURCE_DIR}/third-party/nanors/rs.h"
@@ -56,58 +60,7 @@ set(SUNSHINE_TARGET_FILES
         "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/RtspParser.c"
         "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Video.h"
         "${CMAKE_SOURCE_DIR}/third-party/tray/src/tray.h"
-        "${CMAKE_SOURCE_DIR}/src/upnp.cpp"
-        "${CMAKE_SOURCE_DIR}/src/upnp.h"
-        "${CMAKE_SOURCE_DIR}/src/cbs.cpp"
-        "${CMAKE_SOURCE_DIR}/src/utility.h"
-        "${CMAKE_SOURCE_DIR}/src/uuid.h"
-        "${CMAKE_SOURCE_DIR}/src/config.h"
-        "${CMAKE_SOURCE_DIR}/src/config.cpp"
-        "${CMAKE_SOURCE_DIR}/src/entry_handler.cpp"
-        "${CMAKE_SOURCE_DIR}/src/entry_handler.h"
-        "${CMAKE_SOURCE_DIR}/src/file_handler.cpp"
-        "${CMAKE_SOURCE_DIR}/src/file_handler.h"
-        "${CMAKE_SOURCE_DIR}/src/globals.cpp"
-        "${CMAKE_SOURCE_DIR}/src/globals.h"
-        "${CMAKE_SOURCE_DIR}/src/logging.cpp"
-        "${CMAKE_SOURCE_DIR}/src/logging.h"
-        "${CMAKE_SOURCE_DIR}/src/main.cpp"
-        "${CMAKE_SOURCE_DIR}/src/main.h"
-        "${CMAKE_SOURCE_DIR}/src/crypto.cpp"
-        "${CMAKE_SOURCE_DIR}/src/crypto.h"
-        "${CMAKE_SOURCE_DIR}/src/nvhttp.cpp"
-        "${CMAKE_SOURCE_DIR}/src/nvhttp.h"
-        "${CMAKE_SOURCE_DIR}/src/httpcommon.cpp"
-        "${CMAKE_SOURCE_DIR}/src/httpcommon.h"
-        "${CMAKE_SOURCE_DIR}/src/confighttp.cpp"
-        "${CMAKE_SOURCE_DIR}/src/confighttp.h"
-        "${CMAKE_SOURCE_DIR}/src/rtsp.cpp"
-        "${CMAKE_SOURCE_DIR}/src/rtsp.h"
-        "${CMAKE_SOURCE_DIR}/src/stream.cpp"
-        "${CMAKE_SOURCE_DIR}/src/stream.h"
-        "${CMAKE_SOURCE_DIR}/src/video.cpp"
-        "${CMAKE_SOURCE_DIR}/src/video.h"
-        "${CMAKE_SOURCE_DIR}/src/video_colorspace.cpp"
-        "${CMAKE_SOURCE_DIR}/src/video_colorspace.h"
-        "${CMAKE_SOURCE_DIR}/src/input.cpp"
-        "${CMAKE_SOURCE_DIR}/src/input.h"
-        "${CMAKE_SOURCE_DIR}/src/audio.cpp"
-        "${CMAKE_SOURCE_DIR}/src/audio.h"
-        "${CMAKE_SOURCE_DIR}/src/platform/common.h"
-        "${CMAKE_SOURCE_DIR}/src/process.cpp"
-        "${CMAKE_SOURCE_DIR}/src/process.h"
-        "${CMAKE_SOURCE_DIR}/src/network.cpp"
-        "${CMAKE_SOURCE_DIR}/src/network.h"
-        "${CMAKE_SOURCE_DIR}/src/move_by_copy.h"
-        "${CMAKE_SOURCE_DIR}/src/system_tray.cpp"
-        "${CMAKE_SOURCE_DIR}/src/system_tray.h"
-        "${CMAKE_SOURCE_DIR}/src/task_pool.h"
-        "${CMAKE_SOURCE_DIR}/src/thread_pool.h"
-        "${CMAKE_SOURCE_DIR}/src/thread_safe.h"
-        "${CMAKE_SOURCE_DIR}/src/sync.h"
-        "${CMAKE_SOURCE_DIR}/src/round_robin.h"
-        "${CMAKE_SOURCE_DIR}/src/stat_trackers.h"
-        "${CMAKE_SOURCE_DIR}/src/stat_trackers.cpp"
+        ${COMMON_SOURCES}
         ${PLATFORM_TARGET_FILES})
 
 if(NOT SUNSHINE_ASSETS_DIR_DEF)

cmake/targets/common.cmake

@@ -75,7 +75,7 @@ else()
 endif()
 
 # src/upnp
-set_source_files_properties("${CMAKE_SOURCE_DIR}/src/upnp.cpp"
+set_source_files_properties("${CMAKE_SOURCE_DIR}/src/server/upnp.cpp"
         DIRECTORY "${CMAKE_SOURCE_DIR}" "${TEST_DIR}"
         PROPERTIES COMPILE_FLAGS -Wno-pedantic)
 
@@ -101,7 +101,7 @@ set_source_files_properties("${CMAKE_SOURCE_DIR}/third-party/ViGEmClient/src/ViG
 string(TOUPPER "x${CMAKE_BUILD_TYPE}" BUILD_TYPE)
 if("${BUILD_TYPE}" STREQUAL "XDEBUG")
     if(WIN32)
-        set_source_files_properties("${CMAKE_SOURCE_DIR}/src/nvhttp.cpp"
+        set_source_files_properties("${CMAKE_SOURCE_DIR}/src/server/nvhttp.cpp"
                 DIRECTORY "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/tests"
                 PROPERTIES COMPILE_FLAGS -O2)
     endif()

docs/source/source_code/source_code.rst

@@ -62,6 +62,13 @@ Source
 
    src/*
 
+.. toctree::
+   :caption: src/input
+   :maxdepth: 1
+   :glob:
+
+   src/input/*
+
 .. toctree::
    :caption: src/platform
    :maxdepth: 1
@@ -89,3 +96,10 @@ Source
    :glob:
 
    src/platform/windows/*
+
+.. toctree::
+   :caption: src/server
+   :maxdepth: 1
+   :glob:
+
+   src/server/*

docs/source/source_code/src/input/common.rst

@@ -0,0 +1,6 @@
+input/common
+============
+
+.. cpp:namespace:: common
+.. doxygenfile:: input/common.h
+   :allow-dot-graphs:

docs/source/source_code/src/input/gamepad.rst

@@ -0,0 +1,6 @@
+input/gamepad
+=============
+
+.. cpp:namespace:: gamepad
+.. doxygenfile:: input/gamepad.h
+   :allow-dot-graphs:

docs/source/source_code/src/input/init.rst

@@ -0,0 +1,6 @@
+input/init
+==========
+
+.. cpp:namespace:: init
+.. doxygenfile:: input/init.h
+   :allow-dot-graphs:

docs/source/source_code/src/input/keyboard.rst

@@ -0,0 +1,6 @@
+input/keyboard
+==============
+
+.. cpp:namespace:: keyboard
+.. doxygenfile:: input/keyboard.h
+   :allow-dot-graphs:

docs/source/source_code/src/input/mouse.rst

@@ -0,0 +1,6 @@
+input/mouse
+===========
+
+.. cpp:namespace:: mouse
+.. doxygenfile:: input/mouse.h
+   :allow-dot-graphs:

docs/source/source_code/src/input/pen.rst

@@ -0,0 +1,6 @@
+input/pen
+=========
+
+.. cpp:namespace:: pen
+.. doxygenfile:: input/pen.h
+   :allow-dot-graphs:

docs/source/source_code/src/input/platform_input.rst

@@ -0,0 +1,5 @@
+input/platform_input
+====================
+
+.. doxygenfile:: input/platform_input.h
+   :allow-dot-graphs:

docs/source/source_code/src/input/processor.rst

@@ -0,0 +1,5 @@
+input/processor
+===============
+
+.. doxygenfile:: input/processor.h
+   :allow-dot-graphs:

docs/source/source_code/src/input/touch.rst

@@ -0,0 +1,6 @@
+input/touch
+===========
+
+.. cpp:namespace:: touch
+.. doxygenfile:: input/touch.h
+   :allow-dot-graphs:

docs/source/source_code/src/confighttp.rst → docs/source/source_code/src/server/confighttp.rst

@@ -1,5 +1,5 @@
 confighttp
 ==========
 
-.. doxygenfile:: confighttp.h
+.. doxygenfile:: server/confighttp.h
    :allow-dot-graphs:

docs/source/source_code/src/crypto.rst → docs/source/source_code/src/server/crypto.rst

@@ -1,5 +1,5 @@
 crypto
 ======
 
-.. doxygenfile:: crypto.h
+.. doxygenfile:: server/crypto.h
    :allow-dot-graphs:

docs/source/source_code/src/httpcommon.rst → docs/source/source_code/src/server/httpcommon.rst

@@ -1,5 +1,5 @@
 httpcommon
 ==========
 
-.. doxygenfile:: httpcommon.h
+.. doxygenfile:: server/httpcommon.h
    :allow-dot-graphs:

docs/source/source_code/src/network.rst → docs/source/source_code/src/server/network.rst

@@ -1,5 +1,5 @@
 network
 =======
 
-.. doxygenfile:: network.h
+.. doxygenfile:: server/network.h
    :allow-dot-graphs:

docs/source/source_code/src/nvhttp.rst → docs/source/source_code/src/server/nvhttp.rst

@@ -1,5 +1,5 @@
 nvhttp
 ======
 
-.. doxygenfile:: nvhttp.h
+.. doxygenfile:: server/nvhttp.h
    :allow-dot-graphs:

docs/source/source_code/src/rtsp.rst → docs/source/source_code/src/server/rtsp.rst

@@ -1,5 +1,5 @@
 rtsp
 ====
 
-.. doxygenfile:: rtsp.h
+.. doxygenfile:: server/rtsp.h
    :allow-dot-graphs:

docs/source/source_code/src/upnp.rst → docs/source/source_code/src/server/upnp.rst

@@ -1,5 +1,5 @@
 upnp
 ====
 
-.. doxygenfile:: upnp.h
+.. doxygenfile:: server/upnp.h
    :allow-dot-graphs:

src/audio.h

@@ -6,6 +6,7 @@
 
 #include "thread_safe.h"
 #include "utility.h"
+
 namespace audio {
   enum stream_config_e : int {
     STEREO,

src/config.cpp

@@ -20,8 +20,8 @@
 #include "entry_handler.h"
 #include "file_handler.h"
 #include "logging.h"
-#include "nvhttp.h"
-#include "rtsp.h"
+#include "server/nvhttp.h"
+#include "server/rtsp.h"
 #include "utility.h"
 
 #include "platform/common.h"

src/entry_handler.cpp

@@ -10,13 +10,13 @@
 
 // local includes
 #include "config.h"
-#include "confighttp.h"
 #include "entry_handler.h"
 #include "globals.h"
-#include "httpcommon.h"
 #include "logging.h"
-#include "network.h"
 #include "platform/common.h"
+#include "server/confighttp.h"
+#include "server/httpcommon.h"
+#include "server/network.h"
 #include "version.h"
 
 extern "C" {