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

fix license and style

Browse Source
This commit is contained in:
kalaposfos13 2024-10-13 10:49:54 +02:00
parent 6a2eab3f65
commit b300ffe959
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sdl_window.cpp
View File

@ -184,7 +184,7 @@ int mouse_joystick_binding = 0;
Uint32 mouse_polling_id = 0; Uint32 mouse_polling_id = 0;
bool mouse_enabled = true; bool mouse_enabled = true;
void WindowSDL::parseInputConfig(const std::string& filename) { void WindowSDL::parseInputConfig(const std::string& filename) {
// Read configuration file. // Read configuration file.
// std::cout << "Reading keyboard config...\n"; // std::cout << "Reading keyboard config...\n";
const auto user_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir); const auto user_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
@ -298,7 +298,8 @@ Uint32 WindowSDL::mousePolling(void* param, Uint32 id, Uint32 interval) {
} }
void WindowSDL::updateMouse() { void WindowSDL::updateMouse() {
if(!mouse_enabled) return; if (!mouse_enabled)
return;
Input::Axis axis_x, axis_y; Input::Axis axis_x, axis_y;
switch (mouse_joystick_binding) { switch (mouse_joystick_binding) {
case 1: case 1:
@ -391,7 +392,7 @@ void WindowSDL::waitEvent() {
if (mouse_polling_id == 0) { if (mouse_polling_id == 0) {
mouse_polling_id = SDL_AddTimer(33, mousePolling, (void*)this); mouse_polling_id = SDL_AddTimer(33, mousePolling, (void*)this);
} }
if (!SDL_WaitEvent(&event)) { if (!SDL_WaitEvent(&event)) {
return; return;
} }

6
user/keyboardInputConfig.ini
View File

@ -1,6 +1,6 @@
## SPDX-FileCopyrightText : Copyright 2024 shadPS4 Emulator Project ## SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
## SPDX-License-Identifier : GPL-2.0-or-later ## SPDX-License-Identifier: GPL-2.0-or-later
#Controller button mappings #Controller button mappings
#Taken keys: #Taken keys: