Extract input

CMakeLists.txt

@@ -119,6 +119,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/grayscale.h"
     "src/heap.cc"
     "src/heap.h"
+    "src/input.cc"
+    "src/input.h"
     "src/interface.cc"
     "src/interface.h"
     "src/interpreter_extra.cc"

src/animation.cc

@@ -16,6 +16,7 @@
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "kb.h"

src/automap.cc

@@ -17,6 +17,7 @@
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "graph_lib.h"
+#include "input.h"
 #include "item.h"
 #include "kb.h"
 #include "map.h"

src/character_editor.cc

@@ -22,6 +22,7 @@
 #include "game_palette.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "kb.h"

src/character_selector.cc

@@ -17,6 +17,7 @@
 #include "game.h"
 #include "game_config.h"
 #include "game_sound.h"
+#include "input.h"
 #include "kb.h"
 #include "memory.h"
 #include "message.h"

src/combat.cc

@@ -20,6 +20,7 @@
 #include "game_config.h"
 #include "game_mouse.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "kb.h"

src/combat_ai.cc

@@ -16,6 +16,7 @@
 #include "game.h"
 #include "game_config.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "light.h"

src/core.h

@@ -4,67 +4,15 @@
 #include <SDL.h>
 
 #include "db.h"
-#include "dinput.h"
 #include "geometry.h"
 #include "window.h"
 
 namespace fallout {
 
-typedef struct STRUCT_6ABF50 {
-    // Time when appropriate key was pressed down or -1 if it's up.
-    int tick;
-    int repeatCount;
-} STRUCT_6ABF50;
-
-typedef struct InputEvent {
-    // This is either logical key or input event id, which can be either
-    // character code pressed or some other numbers used throughout the
-    // game interface.
-    int logicalKey;
-    int mouseX;
-    int mouseY;
-} InputEvent;
-
-typedef void(IdleFunc)();
-typedef void(FocusFunc)(bool focus);
-typedef void(TickerProc)();
-
-typedef struct TickerListNode {
-    int flags;
-    TickerProc* proc;
-    struct TickerListNode* next;
-} TickerListNode;
-
-typedef int(PauseHandler)();
-typedef int(ScreenshotHandler)(int width, int height, unsigned char* buffer, unsigned char* palette);
-
-extern IdleFunc* _idle_func;
-extern FocusFunc* _focus_func;
-extern int gKeyboardKeyRepeatRate;
-extern int gKeyboardKeyRepeatDelay;
-extern bool _keyboard_hooked;
-
 extern void (*_update_palette_func)();
 extern bool gMmxEnabled;
 extern bool gMmxProbed;
 
-extern int gNormalizedQwertyKeys[SDL_NUM_SCANCODES];
-extern InputEvent gInputEventQueue[40];
-extern STRUCT_6ABF50 _GNW95_key_time_stamps[SDL_NUM_SCANCODES];
-extern int _input_mx;
-extern int _input_my;
-extern bool gPaused;
-extern int gScreenshotKeyCode;
-extern int _using_msec_timer;
-extern int gPauseKeyCode;
-extern ScreenshotHandler* gScreenshotHandler;
-extern int gInputEventQueueReadIndex;
-extern unsigned char* gScreenshotBuffer;
-extern PauseHandler* gPauseHandler;
-extern int gInputEventQueueWriteIndex;
-extern bool gRunLoopDisabled;
-extern TickerListNode* gTickerListHead;
-extern unsigned int gTickerLastTimestamp;
 extern unsigned short gSixteenBppPalette[256];
 extern Rect _scr_size;
 extern int gRedMask;
@@ -84,45 +32,6 @@ extern SDL_Renderer* gSdlRenderer;
 extern SDL_Texture* gSdlTexture;
 extern SDL_Surface* gSdlTextureSurface;
 
-int coreInit(int a1);
-void coreExit();
-int _get_input();
-void _process_bk();
-void enqueueInputEvent(int a1);
-int dequeueInputEvent();
-void inputEventQueueReset();
-void tickersExecute();
-void tickersAdd(TickerProc* fn);
-void tickersRemove(TickerProc* fn);
-void tickersEnable();
-void tickersDisable();
-void pauseGame();
-int pauseHandlerDefaultImpl();
-void pauseHandlerConfigure(int keyCode, PauseHandler* fn);
-void takeScreenshot();
-void screenshotBlitter(unsigned char* src, int src_pitch, int a3, int x, int y, int width, int height, int dest_x, int dest_y);
-int screenshotHandlerDefaultImpl(int width, int height, unsigned char* data, unsigned char* palette);
-void screenshotHandlerConfigure(int keyCode, ScreenshotHandler* handler);
-unsigned int _get_time();
-void coreDelayProcessingEvents(unsigned int ms);
-void coreDelay(unsigned int ms);
-unsigned int getTicksSince(unsigned int a1);
-unsigned int getTicksBetween(unsigned int a1, unsigned int a2);
-unsigned int _get_bk_time();
-void inputSetKeyboardKeyRepeatRate(int value);
-int inputGetKeyboardKeyRepeatRate();
-void inputSetKeyboardKeyRepeatDelay(int value);
-int inputGetKeyboardKeyRepeatDelay();
-void inputSetFocusFunc(FocusFunc* func);
-FocusFunc* inputGetFocusFunc();
-void inputSetIdleFunc(IdleFunc* func);
-IdleFunc* inputGetIdleFunc();
-void buildNormalizedQwertyKeys();
-int _GNW95_input_init();
-void _GNW95_process_message();
-void _GNW95_clear_time_stamps();
-void _GNW95_process_key(KeyboardData* data);
-void _GNW95_lost_focus();
 void mmxSetEnabled(bool a1);
 int _init_mode_320_200();
 int _init_mode_320_400();
@@ -152,6 +61,7 @@ void _GNW95_zero_vid_mem();
 int screenGetWidth();
 int screenGetHeight();
 int screenGetVisibleHeight();
+void handleWindowSizeChanged();
 
 } // namespace fallout
 

src/credits.cc

@@ -10,6 +10,7 @@
 #include "debug.h"
 #include "draw.h"
 #include "game_mouse.h"
+#include "input.h"
 #include "memory.h"
 #include "message.h"
 #include "mouse.h"

src/cycle.cc

@@ -3,6 +3,7 @@
 #include "color.h"
 #include "core.h"
 #include "game_config.h"
+#include "input.h"
 #include "palette.h"
 
 namespace fallout {

src/dbox.cc

@@ -13,6 +13,7 @@
 #include "draw.h"
 #include "game.h"
 #include "game_sound.h"
+#include "input.h"
 #include "kb.h"
 #include "message.h"
 #include "mouse.h"

src/display_monitor.cc

@@ -12,6 +12,7 @@
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
 #include "memory.h"
 #include "sfall_config.h"

src/elevator.cc

@@ -13,6 +13,7 @@
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
 #include "kb.h"
 #include "map.h"

src/endgame.cc

@@ -20,6 +20,7 @@
 #include "game_mouse.h"
 #include "game_movie.h"
 #include "game_sound.h"
+#include "input.h"
 #include "map.h"
 #include "memory.h"
 #include "mouse.h"

src/game.cc

@@ -35,6 +35,7 @@
 #include "game_mouse.h"
 #include "game_movie.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "inventory.h"
 #include "item.h"

src/game_dialog.cc

@@ -20,6 +20,7 @@
 #include "game.h"
 #include "game_mouse.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "kb.h"

src/game_mouse.cc

@@ -15,6 +15,7 @@
 #include "game.h"
 #include "game_config.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "kb.h"

src/game_movie.cc

@@ -11,6 +11,7 @@
 #include "game_config.h"
 #include "game_mouse.h"
 #include "game_sound.h"
+#include "input.h"
 #include "mouse.h"
 #include "movie.h"
 #include "movie_effect.h"

src/game_sound.cc

@@ -10,6 +10,7 @@
 #include "core.h"
 #include "debug.h"
 #include "game_config.h"
+#include "input.h"
 #include "item.h"
 #include "map.h"
 #include "memory.h"

src/input.h

@@ -0,0 +1,101 @@
+#ifndef FALLOUT_INPUT_H_
+#define FALLOUT_INPUT_H_
+
+#include "dinput.h"
+
+namespace fallout {
+
+typedef struct STRUCT_6ABF50 {
+    // Time when appropriate key was pressed down or -1 if it's up.
+    int tick;
+    int repeatCount;
+} STRUCT_6ABF50;
+
+typedef struct InputEvent {
+    // This is either logical key or input event id, which can be either
+    // character code pressed or some other numbers used throughout the
+    // game interface.
+    int logicalKey;
+    int mouseX;
+    int mouseY;
+} InputEvent;
+
+typedef void(IdleFunc)();
+typedef void(FocusFunc)(bool focus);
+typedef void(TickerProc)();
+
+typedef struct TickerListNode {
+    int flags;
+    TickerProc* proc;
+    struct TickerListNode* next;
+} TickerListNode;
+
+typedef int(PauseHandler)();
+typedef int(ScreenshotHandler)(int width, int height, unsigned char* buffer, unsigned char* palette);
+
+extern IdleFunc* _idle_func;
+extern FocusFunc* _focus_func;
+extern int gKeyboardKeyRepeatRate;
+extern int gKeyboardKeyRepeatDelay;
+extern bool _keyboard_hooked;
+
+extern int gNormalizedQwertyKeys[SDL_NUM_SCANCODES];
+extern InputEvent gInputEventQueue[40];
+extern STRUCT_6ABF50 _GNW95_key_time_stamps[SDL_NUM_SCANCODES];
+extern int _input_mx;
+extern int _input_my;
+extern bool gPaused;
+extern int gScreenshotKeyCode;
+extern int _using_msec_timer;
+extern int gPauseKeyCode;
+extern ScreenshotHandler* gScreenshotHandler;
+extern int gInputEventQueueReadIndex;
+extern unsigned char* gScreenshotBuffer;
+extern PauseHandler* gPauseHandler;
+extern int gInputEventQueueWriteIndex;
+extern bool gRunLoopDisabled;
+extern TickerListNode* gTickerListHead;
+extern unsigned int gTickerLastTimestamp;
+int coreInit(int a1);
+void coreExit();
+int _get_input();
+void _process_bk();
+void enqueueInputEvent(int a1);
+int dequeueInputEvent();
+void inputEventQueueReset();
+void tickersExecute();
+void tickersAdd(TickerProc* fn);
+void tickersRemove(TickerProc* fn);
+void tickersEnable();
+void tickersDisable();
+void pauseGame();
+int pauseHandlerDefaultImpl();
+void pauseHandlerConfigure(int keyCode, PauseHandler* fn);
+void takeScreenshot();
+void screenshotBlitter(unsigned char* src, int src_pitch, int a3, int x, int y, int width, int height, int dest_x, int dest_y);
+int screenshotHandlerDefaultImpl(int width, int height, unsigned char* data, unsigned char* palette);
+void screenshotHandlerConfigure(int keyCode, ScreenshotHandler* handler);
+unsigned int _get_time();
+void coreDelayProcessingEvents(unsigned int ms);
+void coreDelay(unsigned int ms);
+unsigned int getTicksSince(unsigned int a1);
+unsigned int getTicksBetween(unsigned int a1, unsigned int a2);
+unsigned int _get_bk_time();
+void inputSetKeyboardKeyRepeatRate(int value);
+int inputGetKeyboardKeyRepeatRate();
+void inputSetKeyboardKeyRepeatDelay(int value);
+int inputGetKeyboardKeyRepeatDelay();
+void inputSetFocusFunc(FocusFunc* func);
+FocusFunc* inputGetFocusFunc();
+void inputSetIdleFunc(IdleFunc* func);
+IdleFunc* inputGetIdleFunc();
+void buildNormalizedQwertyKeys();
+int _GNW95_input_init();
+void _GNW95_process_message();
+void _GNW95_clear_time_stamps();
+void _GNW95_process_key(KeyboardData* data);
+void _GNW95_lost_focus();
+
+} // namespace fallout
+
+#endif /* FALLOUT_INPUT_H_ */

src/interface.cc

@@ -20,6 +20,7 @@
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "item.h"
 #include "kb.h"
 #include "memory.h"

src/interpreter.cc

@@ -11,6 +11,7 @@
 #include "db.h"
 #include "debug.h"
 #include "export.h"
+#include "input.h"
 #include "interpreter_lib.h"
 #include "memory_manager.h"
 #include "platform_compat.h"

src/interpreter_lib.cc

@@ -5,6 +5,7 @@
 #include "datafile.h"
 #include "debug.h"
 #include "dialog.h"
+#include "input.h"
 #include "interpreter_extra.h"
 #include "memory_manager.h"
 #include "mouse_manager.h"

src/inventory.cc

@@ -23,6 +23,7 @@
 #include "game_dialog.h"
 #include "game_mouse.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "kb.h"

src/kb.cc

@@ -3,6 +3,7 @@
 #include <string.h>
 
 #include "core.h"
+#include "input.h"
 #include "vcr.h"
 
 namespace fallout {

src/lips.cc

@@ -8,6 +8,7 @@
 #include "db.h"
 #include "debug.h"
 #include "game_sound.h"
+#include "input.h"
 #include "memory.h"
 #include "platform_compat.h"
 #include "sound.h"

src/loadsave.cc

@@ -28,6 +28,7 @@
 #include "game_movie.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "kb.h"

src/main.cc

@@ -21,6 +21,7 @@
 #include "game_mouse.h"
 #include "game_movie.h"
 #include "game_sound.h"
+#include "input.h"
 #include "kb.h"
 #include "loadsave.h"
 #include "map.h"

src/map.cc

@@ -22,6 +22,7 @@
 #include "game_mouse.h"
 #include "game_movie.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "light.h"

src/mouse.cc

@@ -3,6 +3,7 @@
 #include "color.h"
 #include "core.h"
 #include "dinput.h"
+#include "input.h"
 #include "memory.h"
 #include "kb.h"
 #include "vcr.h"

src/mouse_manager.cc

@@ -6,6 +6,7 @@
 #include "datafile.h"
 #include "db.h"
 #include "debug.h"
+#include "input.h"
 #include "memory_manager.h"
 #include "mouse.h"
 #include "platform_compat.h"

src/movie.cc

@@ -11,6 +11,7 @@
 #include "draw.h"
 #include "game_config.h"
 #include "geometry.h"
+#include "input.h"
 #include "memory_manager.h"
 #include "movie_effect.h"
 #include "movie_lib.h"

src/options.cc

@@ -20,6 +20,7 @@
 #include "game_sound.h"
 #include "geometry.h"
 #include "grayscale.h"
+#include "input.h"
 #include "kb.h"
 #include "loadsave.h"
 #include "memory.h"

src/palette.cc

@@ -7,6 +7,7 @@
 #include "cycle.h"
 #include "debug.h"
 #include "game_sound.h"
+#include "input.h"
 
 namespace fallout {
 

src/pipboy.cc

@@ -21,6 +21,7 @@
 #include "game_movie.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
 #include "kb.h"
 #include "map.h"

src/scripts.cc

@@ -21,6 +21,7 @@
 #include "game_dialog.h"
 #include "game_mouse.h"
 #include "game_movie.h"
+#include "input.h"
 #include "memory.h"
 #include "message.h"
 #include "object.h"

src/selfrun.cc

@@ -6,6 +6,7 @@
 #include "db.h"
 #include "game.h"
 #include "game_config.h"
+#include "input.h"
 #include "kb.h"
 #include "mouse.h"
 #include "platform_compat.h"

src/skilldex.cc

@@ -13,6 +13,7 @@
 #include "game_mouse.h"
 #include "game_sound.h"
 #include "geometry.h"
+#include "input.h"
 #include "interface.h"
 #include "kb.h"
 #include "map.h"

src/text_object.cc

@@ -6,6 +6,7 @@
 #include "debug.h"
 #include "draw.h"
 #include "game_config.h"
+#include "input.h"
 #include "memory.h"
 #include "object.h"
 #include "text_font.h"

src/vcr.cc

@@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 #include "core.h"
+#include "input.h"
 #include "kb.h"
 #include "memory.h"
 #include "mouse.h"

src/window.cc

@@ -9,6 +9,7 @@
 #include "datafile.h"
 #include "draw.h"
 #include "game.h"
+#include "input.h"
 #include "interpreter_lib.h"
 #include "kb.h"
 #include "memory_manager.h"

src/window_manager.cc

@@ -10,6 +10,7 @@
 #include "core.h"
 #include "debug.h"
 #include "draw.h"
+#include "input.h"
 #include "memory.h"
 #include "mouse.h"
 #include "palette.h"

src/window_manager_private.cc

@@ -8,6 +8,7 @@
 #include "color.h"
 #include "core.h"
 #include "draw.h"
+#include "input.h"
 #include "kb.h"
 #include "memory.h"
 #include "mouse.h"

src/worldmap.cc

@@ -25,6 +25,7 @@
 #include "game_mouse.h"
 #include "game_movie.h"
 #include "game_sound.h"
+#include "input.h"
 #include "interface.h"
 #include "item.h"
 #include "kb.h"