diff options
Diffstat (limited to 'platform/x11/os_x11.h')
| -rw-r--r-- | platform/x11/os_x11.h | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 1566062b9e..a556ba49e3 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -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,18 +114,22 @@ class OS_X11 : public OS_Unix { bool force_quit; bool minimized; - int dpad_last[2]; bool do_mouse_warp; const char *cursor_theme; int cursor_size; + XcursorImage *img[CURSOR_MAX]; Cursor cursors[CURSOR_MAX]; Cursor null_cursor; CursorShape current_cursor; InputDefault *input; +#ifdef JOYDEV_ENABLED + joystick_linux *joystick; +#endif + #ifdef RTAUDIO_ENABLED AudioDriverRtAudio driver_rtaudio; #endif @@ -137,32 +142,8 @@ 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; - }; - }; - }; - Atom net_wm_icon; - - int joystick_count; - - Joystick joysticks[JOYSTICKS_MAX]; - int audio_driver_index; unsigned int capture_idle; bool maximized; @@ -184,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: |