diff options
Diffstat (limited to 'src/input_common/drivers')
-rw-r--r-- | src/input_common/drivers/android.cpp | 16 | ||||
-rw-r--r-- | src/input_common/drivers/android.h | 8 | ||||
-rw-r--r-- | src/input_common/drivers/camera.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/camera.h | 2 | ||||
-rw-r--r-- | src/input_common/drivers/joycon.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/joycon.h | 2 | ||||
-rw-r--r-- | src/input_common/drivers/keyboard.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/keyboard.h | 2 | ||||
-rw-r--r-- | src/input_common/drivers/mouse.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/mouse.h | 2 | ||||
-rw-r--r-- | src/input_common/drivers/sdl_driver.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/tas_input.cpp | 6 | ||||
-rw-r--r-- | src/input_common/drivers/tas_input.h | 6 | ||||
-rw-r--r-- | src/input_common/drivers/touch_screen.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/touch_screen.h | 2 | ||||
-rw-r--r-- | src/input_common/drivers/virtual_amiibo.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/virtual_amiibo.h | 2 | ||||
-rw-r--r-- | src/input_common/drivers/virtual_gamepad.cpp | 2 | ||||
-rw-r--r-- | src/input_common/drivers/virtual_gamepad.h | 2 |
19 files changed, 33 insertions, 33 deletions
diff --git a/src/input_common/drivers/android.cpp b/src/input_common/drivers/android.cpp index d40fa66ae..4768c8bb0 100644 --- a/src/input_common/drivers/android.cpp +++ b/src/input_common/drivers/android.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-3.0-or-later #include <set> @@ -28,8 +28,8 @@ void Android::RegisterController(jobject j_input_device) { auto env = Common::Android::GetEnvForThread(); const std::string guid = Common::Android::GetJString( env, static_cast<jstring>( - env->CallObjectMethod(j_input_device, Common::Android::GetYuzuDeviceGetGUID()))); - const s32 port = env->CallIntMethod(j_input_device, Common::Android::GetYuzuDeviceGetPort()); + env->CallObjectMethod(j_input_device, Common::Android::GetCitronDeviceGetGUID()))); + const s32 port = env->CallIntMethod(j_input_device, Common::Android::GetCitronDeviceGetPort()); const auto identifier = GetIdentifier(guid, static_cast<size_t>(port)); PreSetController(identifier); @@ -81,7 +81,7 @@ bool Android::IsVibrationEnabled([[maybe_unused]] const PadIdentifier& identifie if (device != input_devices.end()) { return Common::Android::RunJNIOnFiber<bool>([&](JNIEnv* env) { return static_cast<bool>(env->CallBooleanMethod( - device->second, Common::Android::GetYuzuDeviceGetSupportsVibration())); + device->second, Common::Android::GetCitronDeviceGetSupportsVibration())); }); } return false; @@ -92,7 +92,7 @@ std::vector<Common::ParamPackage> Android::GetInputDevices() const { auto env = Common::Android::GetEnvForThread(); for (const auto& [key, value] : input_devices) { auto name_object = static_cast<jstring>( - env->CallObjectMethod(value, Common::Android::GetYuzuDeviceGetName())); + env->CallObjectMethod(value, Common::Android::GetCitronDeviceGetName())); const std::string name = fmt::format("{} {}", Common::Android::GetJString(env, name_object), key.port); devices.emplace_back(Common::ParamPackage{ @@ -107,7 +107,7 @@ std::vector<Common::ParamPackage> Android::GetInputDevices() const { std::set<s32> Android::GetDeviceAxes(JNIEnv* env, jobject& j_device) const { auto j_axes = static_cast<jobjectArray>( - env->CallObjectMethod(j_device, Common::Android::GetYuzuDeviceGetAxes())); + env->CallObjectMethod(j_device, Common::Android::GetCitronDeviceGetAxes())); std::set<s32> axes; for (int i = 0; i < env->GetArrayLength(j_axes); ++i) { jobject axis = env->GetObjectArrayElement(j_axes, i); @@ -215,7 +215,7 @@ ButtonMapping Android::GetButtonMappingForDevice(const Common::ParamPackage& par jintArray j_keys = env->NewIntArray(static_cast<int>(keycode_ids.size())); env->SetIntArrayRegion(j_keys, 0, static_cast<int>(keycode_ids.size()), keycode_ids.data()); auto j_has_keys_object = static_cast<jbooleanArray>( - env->CallObjectMethod(j_device, Common::Android::GetYuzuDeviceHasKeys(), j_keys)); + env->CallObjectMethod(j_device, Common::Android::GetCitronDeviceHasKeys(), j_keys)); jboolean isCopy = false; jboolean* j_has_keys = env->GetBooleanArrayElements(j_has_keys_object, &isCopy); @@ -359,7 +359,7 @@ void Android::SendVibrations(JNIEnv* env, std::stop_token token) { if (device != input_devices.end()) { float average_intensity = static_cast<float>( (request.vibration.high_amplitude + request.vibration.low_amplitude) / 2.0); - env->CallVoidMethod(device->second, Common::Android::GetYuzuDeviceVibrate(), + env->CallVoidMethod(device->second, Common::Android::GetCitronDeviceVibrate(), average_intensity); } } diff --git a/src/input_common/drivers/android.h b/src/input_common/drivers/android.h index 03e2b2c98..e008ae772 100644 --- a/src/input_common/drivers/android.h +++ b/src/input_common/drivers/android.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -21,7 +21,7 @@ public: /** * Registers controller number to accept new inputs. - * @param j_input_device YuzuInputDevice object from the Android frontend to register. + * @param j_input_device CitronInputDevice object from the Android frontend to register. */ void RegisterController(jobject j_input_device); @@ -62,9 +62,9 @@ public: std::vector<Common::ParamPackage> GetInputDevices() const override; /** - * Gets the axes reported by the YuzuInputDevice. + * Gets the axes reported by the CitronInputDevice. * @param env JNI environment pointer. - * @param j_device YuzuInputDevice from the Android frontend. + * @param j_device CitronInputDevice from the Android frontend. * @return Set of the axes reported by the underlying Android InputDevice */ std::set<s32> GetDeviceAxes(JNIEnv* env, jobject& j_device) const; diff --git a/src/input_common/drivers/camera.cpp b/src/input_common/drivers/camera.cpp index 04970f635..d3f6b3185 100644 --- a/src/input_common/drivers/camera.cpp +++ b/src/input_common/drivers/camera.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <fmt/format.h> diff --git a/src/input_common/drivers/camera.h b/src/input_common/drivers/camera.h index 24b27e325..e5803d01d 100644 --- a/src/input_common/drivers/camera.h +++ b/src/input_common/drivers/camera.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index 72d2951f3..bdb9413b6 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <fmt/format.h> diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h index 112e970e1..54a3936a8 100644 --- a/src/input_common/drivers/joycon.h +++ b/src/input_common/drivers/joycon.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/input_common/drivers/keyboard.cpp b/src/input_common/drivers/keyboard.cpp index 2567df9af..faf36cd66 100644 --- a/src/input_common/drivers/keyboard.cpp +++ b/src/input_common/drivers/keyboard.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/param_package.h" diff --git a/src/input_common/drivers/keyboard.h b/src/input_common/drivers/keyboard.h index 62436dba4..ddca93b19 100644 --- a/src/input_common/drivers/keyboard.h +++ b/src/input_common/drivers/keyboard.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index 9fb824baf..cf8676e36 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <thread> diff --git a/src/input_common/drivers/mouse.h b/src/input_common/drivers/mouse.h index 2b93a40b9..10490ce93 100644 --- a/src/input_common/drivers/mouse.h +++ b/src/input_common/drivers/mouse.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 78f458afe..fa78e10d3 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -489,7 +489,7 @@ void SDLDriver::CloseJoysticks() { SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_engine_)) { // Set our application name. Currently passed to DBus by SDL and visible to the user through // their desktop environment. - SDL_SetHint(SDL_HINT_APP_NAME, "yuzu"); + SDL_SetHint(SDL_HINT_APP_NAME, "citron"); if (!Settings::values.enable_raw_input) { // Disable raw input. When enabled this setting causes SDL to die when a web applet opens diff --git a/src/input_common/drivers/tas_input.cpp b/src/input_common/drivers/tas_input.cpp index f3cb14c56..e953bb56e 100644 --- a/src/input_common/drivers/tas_input.cpp +++ b/src/input_common/drivers/tas_input.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include <cstring> @@ -82,7 +82,7 @@ void Tas::LoadTasFile(size_t player_index, size_t file_index) { commands[player_index].clear(); std::string file = Common::FS::ReadStringFromFile( - Common::FS::GetYuzuPath(Common::FS::YuzuPath::TASDir) / + Common::FS::GetCitronPath(Common::FS::CitronPath::TASDir) / fmt::format("script{}-{}.txt", file_index, player_index + 1), Common::FS::FileType::BinaryFile); std::istringstream command_line(file); @@ -137,7 +137,7 @@ void Tas::WriteTasFile(std::u8string_view file_name) { WriteCommandAxis(line.l_axis), WriteCommandAxis(line.r_axis)); } - const auto tas_file_name = Common::FS::GetYuzuPath(Common::FS::YuzuPath::TASDir) / file_name; + const auto tas_file_name = Common::FS::GetCitronPath(Common::FS::CitronPath::TASDir) / file_name; const auto bytes_written = Common::FS::WriteStringToFile(tas_file_name, Common::FS::FileType::TextFile, output_text); if (bytes_written == output_text.size()) { diff --git a/src/input_common/drivers/tas_input.h b/src/input_common/drivers/tas_input.h index 5be66d142..6f770f6f5 100644 --- a/src/input_common/drivers/tas_input.h +++ b/src/input_common/drivers/tas_input.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -11,7 +11,7 @@ #include "input_common/input_engine.h" /* -To play back TAS scripts on Yuzu, select the folder with scripts in the configuration menu below +To play back TAS scripts on Citron, select the folder with scripts in the configuration menu below Tools -> Configure TAS. The file itself has normal text format and has to be called script0-1.txt for controller 1, script0-2.txt for controller 2 and so forth (with max. 8 players). @@ -26,7 +26,7 @@ A script file has the same format as TAS-nx uses, so final files will look like 46 KEY_A 32767;0 0;0 47 KEY_A 32767;0 0;0 -After placing the file at the correct location, it can be read into Yuzu with the (default) hotkey +After placing the file at the correct location, it can be read into Citron with the (default) hotkey CTRL+F6 (refresh). In the bottom left corner, it will display the amount of frames the script file has. Playback can be started or stopped using CTRL+F5. diff --git a/src/input_common/drivers/touch_screen.cpp b/src/input_common/drivers/touch_screen.cpp index 1753e0893..8978e2f30 100644 --- a/src/input_common/drivers/touch_screen.cpp +++ b/src/input_common/drivers/touch_screen.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/param_package.h" diff --git a/src/input_common/drivers/touch_screen.h b/src/input_common/drivers/touch_screen.h index f46036ffd..22ba76019 100644 --- a/src/input_common/drivers/touch_screen.h +++ b/src/input_common/drivers/touch_screen.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cpp index 180eb53ef..43bac3b4c 100644 --- a/src/input_common/drivers/virtual_amiibo.cpp +++ b/src/input_common/drivers/virtual_amiibo.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-3.0-or-later #include <cstring> diff --git a/src/input_common/drivers/virtual_amiibo.h b/src/input_common/drivers/virtual_amiibo.h index 490f38e05..601304f6a 100644 --- a/src/input_common/drivers/virtual_amiibo.h +++ b/src/input_common/drivers/virtual_amiibo.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-3.0-or-later #pragma once diff --git a/src/input_common/drivers/virtual_gamepad.cpp b/src/input_common/drivers/virtual_gamepad.cpp index c15cbbe58..c78fe437e 100644 --- a/src/input_common/drivers/virtual_gamepad.cpp +++ b/src/input_common/drivers/virtual_gamepad.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #include "input_common/drivers/virtual_gamepad.h" diff --git a/src/input_common/drivers/virtual_gamepad.h b/src/input_common/drivers/virtual_gamepad.h index 3a40e3fd3..96f070677 100644 --- a/src/input_common/drivers/virtual_gamepad.h +++ b/src/input_common/drivers/virtual_gamepad.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once |