Remove some crazy dependencies to keymapper

include/core/dispatch.hpp

@@ -1,7 +1,6 @@
 #ifndef _dispatch__hpp__included__
 #define _dispatch__hpp__included__
 
-#include "core/keymapper.hpp"
 #include "library/framebuffer.hpp"
 #include "library/dispatch.hpp"
 

include/core/window.hpp

@@ -1,9 +1,9 @@
 #ifndef _window__hpp__included__
 #define _window__hpp__included__
 
-#include "core/keymapper.hpp"
 #include "core/rom.hpp"
 #include "interface/romtype.hpp"
+#include "library/keyboard.hpp"
 #include "library/messagebuffer.hpp"
 #include "library/emustatus.hpp"
 #include "library/framebuffer.hpp"

include/lua/lua.hpp

@@ -2,9 +2,9 @@
 #define _lua__hpp__included__
 
 #include "core/controllerframe.hpp"
-#include "core/keymapper.hpp"
 #include "core/movie.hpp"
 #include "library/framebuffer.hpp"
+#include "library/keyboard.hpp"
 #include "library/lua-framebuffer.hpp"
 
 void init_lua() throw();

src/core/controller.cpp

@@ -4,6 +4,7 @@
 #include "core/controller.hpp"
 #include "core/dispatch.hpp"
 #include "core/framebuffer.hpp"
+#include "core/keymapper.hpp"
 #include "core/mainloop.hpp"
 #include "core/misc.hpp"
 #include "core/moviedata.hpp"

src/core/dispatch.cpp

@@ -1,5 +1,6 @@
 #include "core/dispatch.hpp"
 #include "library/globalwrap.hpp"
+#include "core/keymapper.hpp"
 #include "core/misc.hpp"
 
 #include <sstream>

src/core/framebuffer.cpp

@@ -1,12 +1,13 @@
 #include "core/command.hpp"
 #include "core/dispatch.hpp"
 #include "core/framebuffer.hpp"
-#include "core/subtitles.hpp"
+#include "core/keymapper.hpp"
-#include "lua/lua.hpp"
 #include "core/misc.hpp"
-#include "core/window.hpp"
 #include "core/moviedata.hpp"
 #include "core/moviefile.hpp"
+#include "core/subtitles.hpp"
+#include "core/window.hpp"
+#include "lua/lua.hpp"
 #include "fonts/wrapper.hpp"
 #include "library/framebuffer.hpp"
 #include "library/pixfmt-lrgb.hpp"

src/core/mainloop.cpp

@@ -8,6 +8,7 @@
 #include "core/framebuffer.hpp"
 #include "core/framerate.hpp"
 #include "core/inthread.hpp"
+#include "core/keymapper.hpp"
 #include "core/multitrack.hpp"
 #include "lua/lua.hpp"
 #include "library/string.hpp"

src/core/multitrack.cpp

@@ -2,6 +2,7 @@
 #include "core/command.hpp"
 #include "core/controller.hpp"
 #include "core/dispatch.hpp"
+#include "core/keymapper.hpp"
 #include "core/moviedata.hpp"
 #include "core/multitrack.hpp"
 #include "lua/internal.hpp"

src/core/window.cpp

@@ -3,6 +3,7 @@
 #include "core/dispatch.hpp"
 #include "core/framerate.hpp"
 #include "core/joystickapi.hpp"
+#include "core/keymapper.hpp"
 #include "lua/lua.hpp"
 #include "core/misc.hpp"
 #include "core/window.hpp"

src/platform/wxwidgets/mainwindow.cpp

@@ -19,6 +19,7 @@
 #include "core/dispatch.hpp"
 #include "core/framebuffer.hpp"
 #include "core/framerate.hpp"
+#include "core/keymapper.hpp"
 #include "interface/romtype.hpp"
 #include "core/loadlib.hpp"
 #include "lua/lua.hpp"

src/platform/wxwidgets/settings-keyentry.cpp

@@ -1,5 +1,6 @@
 #include "platform/wxwidgets/settings-common.hpp"
 #include "platform/wxwidgets/settings-keyentry.hpp"
+#include "core/keymapper.hpp"
 
 namespace
 {

src/video/jmd.cpp

@@ -1,6 +1,7 @@
 #include "core/advdumper.hpp"
 #include "core/dispatch.hpp"
 #include "core/settings.hpp"
+#include "core/window.hpp"
 #include "library/serialization.hpp"
 #include "video/tcp.hpp"
 

src/video/pipedec.cpp

@@ -1,5 +1,6 @@
 #include "core/advdumper.hpp"
 #include "core/dispatch.hpp"
+#include "core/window.hpp"
 #include "video/sox.hpp"
 #include "library/serialization.hpp"
 #include "library/string.hpp"