mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 08:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

actually fix clang changing ini syntax

Browse Source 
use relative path for the ini file
This commit is contained in:
kalaposfos13 2024-10-12 22:29:10 +02:00
parent 31caf01366
commit 45f05c067d
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/sdl_window.cpp
View File

@ -17,7 +17,9 @@
#include <SDL3/SDL_video.h> #include <SDL3/SDL_video.h>
#include "common/assert.h" #include "common/assert.h"
#include "common/config.h" #include "common/config.h"
#include "common/io_file.h"
#include "common/version.h" #include "common/version.h"
#include "common/path_util.h"
#include "core/libraries/pad/pad.h" #include "core/libraries/pad/pad.h"
#include "imgui/renderer/imgui_core.h" #include "imgui/renderer/imgui_core.h"
#include "input/controller.h" #include "input/controller.h"
@ -239,11 +241,15 @@ std::map<KeyBinding, AxisMapping> axis_map = {
}; };
void WindowSDL::parseInputConfig(const std::string& filename) { void WindowSDL::parseInputConfig(const std::string& filename) {
std::ifstream file(filename); // Read configuration file.
std::cout << "Reading keyboard config...\n";
const std::filesystem::__cxx11::path user_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
std::ifstream file(user_dir / filename);
if (!file.is_open()) { if (!file.is_open()) {
std::cerr << "Error opening file: " << filename << std::endl; std::cerr << "Error opening file: " << filename << std::endl;
return; return;
} }
std::cout << "File opened at " << user_dir.c_str() << "\n";
button_map.clear(); button_map.clear();
axis_map.clear(); axis_map.clear();
@ -255,14 +261,16 @@ void WindowSDL::parseInputConfig(const std::string& filename) {
if (line.empty() || line[0] == '#') { if (line.empty() || line[0] == '#') {
continue; continue;
} }
// strip the ; and whitespace that we put there so that the braindead clang-format is happy
line = line.substr(0, line.length() - 1);
line.erase(std::remove(line.begin(), line.end(), ' '), line.end());
// Split the line by '=' // Split the line by '='
std::size_t equal_pos = line.find('='); std::size_t equal_pos = line.find('=');
if (equal_pos == std::string::npos) { if (equal_pos == std::string::npos) {
std::cerr << "Invalid line format: " << line << std::endl; std::cerr << "Invalid line format: " << line << std::endl;
continue; continue;
} }
// strip the ; that we put there so that the braindead clang-format is happy
line = line.substr(0, line.length() - 1);
std::string controller_input = line.substr(0, equal_pos); std::string controller_input = line.substr(0, equal_pos);
std::string kbm_input = line.substr(equal_pos + 1); std::string kbm_input = line.substr(equal_pos + 1);
@ -283,7 +291,7 @@ void WindowSDL::parseInputConfig(const std::string& filename) {
binding.key = key_it->second; binding.key = key_it->second;
binding.modifier = mod_it->second; binding.modifier = mod_it->second;
} else { } else {
std::cerr << "Syntax error while parsing kbm inputs at line " << lineCount << "\n"; std::cerr << "Syntax error while parsing kbm inputs at line " << lineCount << " line data: " << line << "\n";
continue; // skip continue; // skip
} }
} else { } else {
@ -292,7 +300,7 @@ void WindowSDL::parseInputConfig(const std::string& filename) {
if (key_it != string_to_keyboard_key_map.end()) { if (key_it != string_to_keyboard_key_map.end()) {
binding.key = key_it->second; binding.key = key_it->second;
} else { } else {
std::cerr << "Syntax error while parsing kbm inputs at line " << lineCount << "\n"; std::cerr << "Syntax error while parsing kbm inputs at line " << lineCount << " line data: " << line << "\n";
continue; // skip continue; // skip
} }
} }
@ -305,8 +313,7 @@ void WindowSDL::parseInputConfig(const std::string& filename) {
} else if (button_it != string_to_cbutton_map.end()) { } else if (button_it != string_to_cbutton_map.end()) {
button_map[binding] = button_it->second; button_map[binding] = button_it->second;
} else { } else {
std::cerr << "Syntax error while parsing controller inputs at line " << lineCount std::cerr << "Syntax error while parsing kbm inputs at line " << lineCount << " line data: " << line << "\n";
<< "\n";
continue; // skip continue; // skip
} }
} }
@ -396,7 +403,7 @@ WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameController* controller_
window_info.render_surface = SDL_Metal_GetLayer(SDL_Metal_CreateView(window)); window_info.render_surface = SDL_Metal_GetLayer(SDL_Metal_CreateView(window));
#endif #endif
// initialize kbm controls // initialize kbm controls
parseInputConfig("user/keyboardInputConfig.ini"); parseInputConfig("keyboardInputConfig.ini");
} }
WindowSDL::~WindowSDL() = default; WindowSDL::~WindowSDL() = default;
@ -514,7 +521,7 @@ void WindowSDL::onKeyPress(const SDL_Event* event) {
} }
// Reparse kbm inputs // Reparse kbm inputs
if (binding.key == SDLK_F8) { if (binding.key == SDLK_F8) {
parseInputConfig("user/keyboardInputConfig.ini"); parseInputConfig("keyboardInputConfig.ini");
} }
// Toggle fullscreen // Toggle fullscreen
if (binding.key == SDLK_F11) { if (binding.key == SDLK_F11) {