summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2017-08-09 01:57:42 +0200
committerwwylele <wwylele@gmail.com>2017-08-24 14:00:56 +0200
commit2617de1fe6f6f1fc846a8e038e1ea77a894554b2 (patch)
tree08c5cc339ed43241359c1e0b6d7331ca69408eb4 /src/citra
parentHID: use TouchDevice for touch pad (diff)
downloadyuzu-2617de1fe6f6f1fc846a8e038e1ea77a894554b2.tar
yuzu-2617de1fe6f6f1fc846a8e038e1ea77a894554b2.tar.gz
yuzu-2617de1fe6f6f1fc846a8e038e1ea77a894554b2.tar.bz2
yuzu-2617de1fe6f6f1fc846a8e038e1ea77a894554b2.tar.lz
yuzu-2617de1fe6f6f1fc846a8e038e1ea77a894554b2.tar.xz
yuzu-2617de1fe6f6f1fc846a8e038e1ea77a894554b2.tar.zst
yuzu-2617de1fe6f6f1fc846a8e038e1ea77a894554b2.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/config.cpp2
-rw-r--r--src/citra/default_ini.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 73846ed91..93569fc4c 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -78,6 +78,8 @@ void Config::ReadValues() {
Settings::values.motion_device = sdl2_config->Get(
"Controls", "motion_device", "engine:motion_emu,update_period:100,sensitivity:0.01");
+ Settings::values.touch_device =
+ sdl2_config->Get("Controls", "touch_device", "engine:emu_window");
// Core
Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true);
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index 9ea779dd8..fa9dda651 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -62,6 +62,10 @@ c_stick=
# - "sensitivity": the coefficient converting mouse movement to tilting angle (default to 0.01)
motion_device=
+# for touch input, the following devices are available:
+# - "emu_window" (default) for emulating touch input from mouse input to the emulation window. No parameters required
+touch_device=
+
[Core]
# Whether to use the Just-In-Time (JIT) compiler for CPU emulation
# 0: Interpreter (slow), 1 (default): JIT (fast)