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/os_x11.h | |
| parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) | |
| download | redot-engine-4396e98834f159da59ec790f2ff64fb65dacd9ce.tar.gz | |
Refactored Input, create DisplayServer and DisplayServerX11
Diffstat (limited to 'platform/x11/os_x11.h')
| -rw-r--r-- | platform/x11/os_x11.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 997a6cc053..4cdf5445ce 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -31,14 +31,13 @@ #ifndef OS_X11_H #define OS_X11_H -#include "core/os/input.h" +#include "core/input/input.h" #include "crash_handler_x11.h" #include "drivers/alsa/audio_driver_alsa.h" #include "drivers/alsamidi/midi_driver_alsamidi.h" #include "drivers/pulseaudio/audio_driver_pulseaudio.h" #include "drivers/unix/os_unix.h" #include "joypad_linux.h" -#include "main/input_default.h" #include "servers/audio_server.h" #include "servers/visual/rasterizer.h" #include "servers/visual_server.h" @@ -181,7 +180,7 @@ class OS_X11 : public OS_Unix { CursorShape current_cursor; Map<CursorShape, Vector<Variant>> cursors_cache; - InputDefault *input; + Input *input; #ifdef JOYDEV_ENABLED JoypadLinux *joypad; |