mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[client,sdl] move prefs to static lib

Browse Source 
This is in preparation for the subsequent commit adding test case for
the prefs functionality to avoid building the code twice.
This commit is contained in:
Ondrej Holy 2024-04-26 10:36:24 +02:00 committed by akallabeth
parent 15c78a27f2
commit e197d27c8d
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
7 changed files with 187 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/SDL/CMakeLists.txt
View File

@ -63,8 +63,6 @@ find_package(SDL2 REQUIRED COMPONENTS)
include_directories(${SDL2_INCLUDE_DIR})
include_directories(${SDL2_INCLUDE_DIRS})
set(LIBS "")
find_package(Threads REQUIRED)
add_subdirectory(dialogs)
@ -90,8 +88,13 @@ set(SRCS
sdl_window.cpp
)
add_library(sdl_prefs STATIC
sdl_prefs.hpp
sdl_prefs.cpp
)
add_subdirectory(aad)
list(APPEND LIBS
set(LIBS
winpr
freerdp
freerdp-client
@ -99,6 +102,7 @@ list(APPEND LIBS
sdl_client_res
dialogs
aad-view
sdl_prefs
)
if (NOT WITH_SDL_LINK_SHARED)
@ -110,6 +114,7 @@ endif()
AddTargetWithResourceFile(${PROJECT_NAME} "${WIN32_GUI_FLAG}" "${PROJECT_VERSION}" SRCS)
target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBS})
target_link_libraries(sdl_prefs winpr)
set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER "Client/SDL")
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)

1
client/SDL/sdl_freerdp.cpp
View File

@ -57,6 +57,7 @@
#include "sdl_kbd.hpp"
#include "sdl_touch.hpp"
#include "sdl_pointer.hpp"
#include "sdl_prefs.hpp"
#include "dialogs/sdl_dialogs.hpp"
#include "aad/sdl_webview.hpp"

1
client/SDL/sdl_kbd.cpp
View File

@ -21,6 +21,7 @@
#include "sdl_disp.hpp"
#include "sdl_freerdp.hpp"
#include "sdl_utils.hpp"
#include "sdl_prefs.hpp"
#include <map>

145
client/SDL/sdl_prefs.cpp Normal file
View File

@ -0,0 +1,145 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* SDL Prefs
*
* Copyright 2022 Armin Novak <armin.novak@thincast.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <fstream>
#if __has_include(<filesystem>)
#include <filesystem>
namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#else
#error Could not find system header "<filesystem>" or "<experimental/filesystem>"
#endif
#include "sdl_prefs.hpp"
#include <winpr/path.h>
#include <winpr/config.h>
#include <freerdp/version.h>
#include <winpr/json.h>
#if defined(WINPR_JSON_FOUND)
using WINPR_JSONPtr = std::unique_ptr<WINPR_JSON, decltype(&WINPR_JSON_Delete)>;
static WINPR_JSONPtr get()
{
auto config = sdl_get_pref_file();
std::ifstream ifs(config);
std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
return { WINPR_JSON_ParseWithLength(content.c_str(), content.size()), WINPR_JSON_Delete };
}
static WINPR_JSON* get_item(const std::string& key)
{
static WINPR_JSONPtr config{ nullptr, WINPR_JSON_Delete };
if (!config)
config = get();
if (!config)
return nullptr;
return WINPR_JSON_GetObjectItem(config.get(), key.c_str());
}
static std::string item_to_str(WINPR_JSON* item, const std::string& fallback = "")
{
if (!item || !WINPR_JSON_IsString(item))
return fallback;
auto str = WINPR_JSON_GetStringValue(item);
if (!str)
return {};
return str;
}
#endif
std::string sdl_get_pref_string(const std::string& key, const std::string& fallback)
{
#if defined(WINPR_JSON_FOUND)
auto item = get_item(key);
return item_to_str(item, fallback);
#else
return fallback;
#endif
}
bool sdl_get_pref_bool(const std::string& key, bool fallback)
{
#if defined(WINPR_JSON_FOUND)
auto item = get_item(key);
if (!item || !WINPR_JSON_IsBool(item))
return fallback;
return WINPR_JSON_IsTrue(item);
#else
return fallback;
#endif
}
int64_t sdl_get_pref_int(const std::string& key, int64_t fallback)
{
#if defined(WINPR_JSON_FOUND)
auto item = get_item(key);
if (!item || !WINPR_JSON_IsNumber(item))
return fallback;
auto val = WINPR_JSON_GetNumberValue(item);
return static_cast<int64_t>(val);
#else
return fallback;
#endif
}
std::vector<std::string> sdl_get_pref_array(const std::string& key,
const std::vector<std::string>& fallback)
{
#if defined(WINPR_JSON_FOUND)
auto item = get_item(key);
if (!item || !WINPR_JSON_IsArray(item))
return fallback;
std::vector<std::string> values;
for (int x = 0; x < WINPR_JSON_GetArraySize(item); x++)
{
auto cur = WINPR_JSON_GetArrayItem(item, x);
values.push_back(item_to_str(cur));
}
return values;
#else
return fallback;
#endif
}
std::string sdl_get_pref_dir()
{
using CStringPtr = std::unique_ptr<char, decltype(&free)>;
CStringPtr path(GetKnownPath(KNOWN_PATH_XDG_CONFIG_HOME), free);
if (!path)
return {};
fs::path config{ path.get() };
config /= FREERDP_VENDOR;
config /= FREERDP_PRODUCT;
return config.string();
}
std::string sdl_get_pref_file()
{
fs::path config{ sdl_get_pref_dir() };
config /= "sdl-freerdp.json";
return config.string();
}

32
client/SDL/sdl_prefs.hpp Normal file
View File

@ -0,0 +1,32 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* SDL Prefs
*
* Copyright 2022 Armin Novak <armin.novak@thincast.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <string>
#include <vector>
std::string sdl_get_pref_dir();
std::string sdl_get_pref_file();
std::string sdl_get_pref_string(const std::string& key, const std::string& fallback = "");
int64_t sdl_get_pref_int(const std::string& key, int64_t fallback = 0);
bool sdl_get_pref_bool(const std::string& key, bool fallback = false);
std::vector<std::string> sdl_get_pref_array(const std::string& key,
const std::vector<std::string>& fallback = {});

123
client/SDL/sdl_utils.cpp
View File

@ -17,17 +17,6 @@
* limitations under the License.
*/
#include <fstream>
#if __has_include(<filesystem>)
#include <filesystem>
namespace fs = std::filesystem;
#elif __has_include(<experimental/filesystem>)
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#else
#error Could not find system header "<filesystem>" or "<experimental/filesystem>"
#endif
#include <cassert>
#include "sdl_utils.hpp"
@ -35,10 +24,7 @@ namespace fs = std::experimental::filesystem;
#include <SDL.h>
#include <winpr/path.h>
#include <winpr/config.h>
#include <freerdp/version.h>
#include <winpr/json.h>
const char* sdl_event_type_str(Uint32 type)
{
@ -353,112 +339,3 @@ std::string sdl_window_event_str(Uint8 ev)
return "SDL_WINDOWEVENT_UNKNOWN";
}
}
#if defined(WINPR_JSON_FOUND)
using WINPR_JSONPtr = std::unique_ptr<WINPR_JSON, decltype(&WINPR_JSON_Delete)>;
static WINPR_JSONPtr get()
{
auto config = sdl_get_pref_file();
std::ifstream ifs(config);
std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
return { WINPR_JSON_ParseWithLength(content.c_str(), content.size()), WINPR_JSON_Delete };
}
static WINPR_JSON* get_item(const std::string& key)
{
static WINPR_JSONPtr config{ nullptr, WINPR_JSON_Delete };
if (!config)
config = get();
if (!config)
return nullptr;
return WINPR_JSON_GetObjectItem(config.get(), key.c_str());
}
static std::string item_to_str(WINPR_JSON* item, const std::string& fallback = "")
{
if (!item || !WINPR_JSON_IsString(item))
return fallback;
auto str = WINPR_JSON_GetStringValue(item);
if (!str)
return {};
return str;
}
#endif
std::string sdl_get_pref_string(const std::string& key, const std::string& fallback)
{
#if defined(WINPR_JSON_FOUND)
auto item = get_item(key);
return item_to_str(item, fallback);
#else
return fallback;
#endif
}
bool sdl_get_pref_bool(const std::string& key, bool fallback)
{
#if defined(WINPR_JSON_FOUND)
auto item = get_item(key);
if (!item || !WINPR_JSON_IsBool(item))
return fallback;
return WINPR_JSON_IsTrue(item);
#else
return fallback;
#endif
}
int64_t sdl_get_pref_int(const std::string& key, int64_t fallback)
{
#if defined(WINPR_JSON_FOUND)
auto item = get_item(key);
if (!item || !WINPR_JSON_IsNumber(item))
return fallback;
auto val = WINPR_JSON_GetNumberValue(item);
return static_cast<int64_t>(val);
#else
return fallback;
#endif
}
std::vector<std::string> sdl_get_pref_array(const std::string& key,
const std::vector<std::string>& fallback)
{
#if defined(WINPR_JSON_FOUND)
auto item = get_item(key);
if (!item || !WINPR_JSON_IsArray(item))
return fallback;
std::vector<std::string> values;
for (int x = 0; x < WINPR_JSON_GetArraySize(item); x++)
{
auto cur = WINPR_JSON_GetArrayItem(item, x);
values.push_back(item_to_str(cur));
}
return values;
#else
return fallback;
#endif
}
std::string sdl_get_pref_dir()
{
using CStringPtr = std::unique_ptr<char, decltype(&free)>;
CStringPtr path(GetKnownPath(KNOWN_PATH_XDG_CONFIG_HOME), free);
if (!path)
return {};
fs::path config{ path.get() };
config /= FREERDP_VENDOR;
config /= FREERDP_PRODUCT;
return config.string();
}
std::string sdl_get_pref_file()
{
fs::path config{ sdl_get_pref_dir() };
config /= "sdl-freerdp.json";
return config.string();
}

9
client/SDL/sdl_utils.hpp
View File

@ -100,12 +100,3 @@ const char* sdl_error_string(Uint32 res);
#define sdl_log_error(res, log, what) sdl_log_error_ex(res, log, what, __FILE__, __LINE__, __func__)
BOOL sdl_log_error_ex(Uint32 res, wLog* log, const char* what, const char* file, size_t line,
const char* fkt);
std::string sdl_get_pref_dir();
std::string sdl_get_pref_file();
std::string sdl_get_pref_string(const std::string& key, const std::string& fallback = "");
int64_t sdl_get_pref_int(const std::string& key, int64_t fallback = 0);
bool sdl_get_pref_bool(const std::string& key, bool fallback = false);
std::vector<std::string> sdl_get_pref_array(const std::string& key,
const std::vector<std::string>& fallback = {});