From f8a79a97c7d12da43b111a756f09ee7ad5ea28e9 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 3 Mar 2020 10:36:29 -0300 Subject: Effective DisplayServer separation, rename X11 -> LinuxBSD --- platform/linuxbsd/joypad_linux.h | 102 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 platform/linuxbsd/joypad_linux.h (limited to 'platform/linuxbsd/joypad_linux.h') diff --git a/platform/linuxbsd/joypad_linux.h b/platform/linuxbsd/joypad_linux.h new file mode 100644 index 0000000000..0d175193a5 --- /dev/null +++ b/platform/linuxbsd/joypad_linux.h @@ -0,0 +1,102 @@ +/*************************************************************************/ +/* joypad_linux.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ + +//author: Andreas Haas +#ifndef JOYPAD_LINUX_H +#define JOYPAD_LINUX_H + +#ifdef JOYDEV_ENABLED +#include "core/input/input.h" +#include "core/os/mutex.h" +#include "core/os/thread.h" + +struct input_absinfo; + +class JoypadLinux { +public: + JoypadLinux(Input *in); + ~JoypadLinux(); + void process_joypads(); + +private: + enum { + JOYPADS_MAX = 16, + MAX_ABS = 63, + MAX_KEY = 767, // Hack because can't be included here + }; + + struct Joypad { + Input::JoyAxis curr_axis[MAX_ABS]; + int key_map[MAX_KEY]; + int abs_map[MAX_ABS]; + int dpad; + int fd; + + String devpath; + input_absinfo *abs_info[MAX_ABS]; + + bool force_feedback; + int ff_effect_id; + uint64_t ff_effect_timestamp; + + Joypad(); + ~Joypad(); + void reset(); + }; + + bool exit_udev; + Mutex joy_mutex; + Thread *joy_thread; + Input *input; + Joypad joypads[JOYPADS_MAX]; + Vector attached_devices; + + static void joy_thread_func(void *p_user); + + int get_joy_from_path(String p_path) const; + + void setup_joypad_properties(int p_id); + void close_joypad(int p_id = -1); +#ifdef UDEV_ENABLED + void enumerate_joypads(struct udev *p_udev); + void monitor_joypads(struct udev *p_udev); +#endif + void monitor_joypads(); + void run_joypad_thread(); + void open_joypad(const char *p_path); + + 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); + + Input::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const; +}; + +#endif +#endif // JOYPAD_LINUX_H -- cgit v1.2.3 From 8e6960a69e0202cb1e6f3b3dc9f9bb34e1c1d889 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 4 Mar 2020 13:36:09 -0300 Subject: Refactored input, goes all via windows now. Also renamed Input to InputFilter because all it does is filter events. --- platform/linuxbsd/joypad_linux.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'platform/linuxbsd/joypad_linux.h') diff --git a/platform/linuxbsd/joypad_linux.h b/platform/linuxbsd/joypad_linux.h index 0d175193a5..1d2ed5bbc1 100644 --- a/platform/linuxbsd/joypad_linux.h +++ b/platform/linuxbsd/joypad_linux.h @@ -33,7 +33,7 @@ #define JOYPAD_LINUX_H #ifdef JOYDEV_ENABLED -#include "core/input/input.h" +#include "core/input/input_filter.h" #include "core/os/mutex.h" #include "core/os/thread.h" @@ -41,7 +41,7 @@ struct input_absinfo; class JoypadLinux { public: - JoypadLinux(Input *in); + JoypadLinux(InputFilter *in); ~JoypadLinux(); void process_joypads(); @@ -53,7 +53,7 @@ private: }; struct Joypad { - Input::JoyAxis curr_axis[MAX_ABS]; + InputFilter::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; - Input *input; + InputFilter *input; Joypad joypads[JOYPADS_MAX]; Vector 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); - Input::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const; + InputFilter::JoyAxis axis_correct(const input_absinfo *p_abs, int p_value) const; }; #endif -- cgit v1.2.3