diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-21 09:07:06 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-21 09:07:06 -0300 |
| commit | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (patch) | |
| tree | 872a375b64d93fd6aaf1239e058a13630c9cfabe /platform/x11/os_x11.h | |
| parent | 81f62fb78c7f3c133ef764a99dcdf05077d8ced9 (diff) | |
| parent | b2f670ebaefa16b0345f9a7ae825f78dbfdec9f8 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform/x11/os_x11.h')
| -rw-r--r-- | platform/x11/os_x11.h | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index ed61df8f0e..02518189e0 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -47,6 +47,7 @@ #include "servers/physics_2d/physics_2d_server_sw.h" #include "servers/physics_2d/physics_2d_server_wrap_mt.h" #include "main/input_default.h" +#include "joystick_linux.h" #include <X11/keysym.h> #include <X11/Xlib.h> @@ -113,7 +114,6 @@ class OS_X11 : public OS_Unix { bool force_quit; bool minimized; - int dpad_last[2]; bool do_mouse_warp; @@ -126,6 +126,10 @@ class OS_X11 : public OS_Unix { InputDefault *input; +#ifdef __linux__ + joystick_linux *joystick; +#endif + #ifdef RTAUDIO_ENABLED AudioDriverRtAudio driver_rtaudio; #endif @@ -138,26 +142,7 @@ class OS_X11 : public OS_Unix { AudioDriverPulseAudio driver_pulseaudio; #endif - enum { - JOYSTICKS_MAX = 8, - MAX_JOY_AXIS = 32768, // I've no idea - }; - - struct Joystick { - - int fd; - int last_axis[JOY_AXIS_MAX]; - - Joystick() { - fd = -1; - for (int i=0; i<JOY_AXIS_MAX; i++) { - - last_axis[i] = 0; - }; - }; - }; - int joystick_count; - Joystick joysticks[JOYSTICKS_MAX]; + Atom net_wm_icon; int audio_driver_index; unsigned int capture_idle; @@ -180,10 +165,6 @@ protected: virtual void set_main_loop( MainLoop * p_main_loop ); - void probe_joystick(int p_id = -1); - void process_joysticks(); - void close_joystick(int p_id = -1); - public: |