diff options
| author | Juan Linietsky <juan@godotengine.org> | 2020-03-01 19:14:37 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 15:49:32 +0100 |
| commit | 4396e98834f159da59ec790f2ff64fb65dacd9ce (patch) | |
| tree | d618e96d7a7b856260fd96e5e727f38a26de0724 /platform/x11/joypad_linux.h | |
| parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) | |
Refactored Input, create DisplayServer and DisplayServerX11
Diffstat (limited to 'platform/x11/joypad_linux.h')
| -rw-r--r-- | platform/x11/joypad_linux.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/x11/joypad_linux.h b/platform/x11/joypad_linux.h index d5719b6dbe..0d175193a5 100644 --- a/platform/x11/joypad_linux.h +++ b/platform/x11/joypad_linux.h @@ -33,15 +33,15 @@ #define JOYPAD_LINUX_H #ifdef JOYDEV_ENABLED +#include "core/input/input.h" #include "core/os/mutex.h" #include "core/os/thread.h" -#include "main/input_default.h" struct input_absinfo; class JoypadLinux { public: - JoypadLinux(InputDefault *in); + JoypadLinux(Input *in); ~JoypadLinux(); void process_joypads(); @@ -53,7 +53,7 @@ private: }; struct Joypad { - InputDefault::JoyAxis curr_axis[MAX_ABS]; + Input::JoyAxis curr_axis[MAX_ABS]; int key_map[MAX_KEY]; int abs_map[MAX_ABS]; int dpad; @@ -74,7 +74,7 @@ private: bool exit_udev; Mutex joy_mutex; Thread *joy_thread; - InputDefault *input; + Input *input; Joypad joypads[JOYPADS_MAX]; Vector<String> attached_devices; @@ -95,7 +95,7 @@ private: void joypad_vibration_start(int p_id, float p_weak_magnitude, float p_strong_magnitude, float p_duration, uint64_t p_timestamp); void joypad_vibration_stop(int p_id, uint64_t p_timestamp); - InputDefault::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const; + Input::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const; }; #endif |