Refactored Input, create DisplayServer and DisplayServerX11

core/SCsub

@@ -166,6 +166,7 @@ SConscript('math/SCsub')
 SConscript('crypto/SCsub')
 SConscript('io/SCsub')
 SConscript('debugger/SCsub')
+SConscript('input/SCsub')
 SConscript('bind/SCsub')
 
 

core/debugger/remote_debugger.cpp

@@ -33,7 +33,7 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
-#include "core/os/input.h"
+#include "core/input/input.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
 #include "core/script_language.h"

core/global_constants.cpp

@@ -30,8 +30,8 @@
 
 #include "global_constants.h"
 
+#include "core/input/input_event.h"
 #include "core/object.h"
-#include "core/os/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/variant.h"
 

core/input/SCsub

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+Import('env')
+
+from platform_methods import run_in_subprocess
+import input_builders
+
+
+# Order matters here. Higher index controller database files write on top of lower index database files.
+controller_databases = ["#core/input/gamecontrollerdb_204.txt", "#core/input/gamecontrollerdb_205.txt", "#core/input/gamecontrollerdb.txt", "#core/input/godotcontrollerdb.txt"]
+
+env.Depends("#core/input/default_controller_mappings.gen.cpp", controller_databases)
+env.CommandNoCache("#core/input/default_controller_mappings.gen.cpp", controller_databases, run_in_subprocess(input_builders.make_default_controller_mappings))
+
+env.add_source_files(env.core_sources, "*.cpp")
+
+# Don't warn about duplicate entry here, we need it registered manually for first build,
+# even if later builds will pick it up twice due to above *.cpp globbing.
+env.add_source_files(env.core_sources, "#core/input/default_controller_mappings.gen.cpp", warn_duplicates=False)
+