From 5b688ea8bea4755b5f74ad8e201a4a2115123872 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 4 Apr 2015 20:42:16 +0200 Subject: [PATCH] Move keyboard_event files to input/drivers_keyboard --- Makefile.common | 6 +++--- griffin/griffin.c | 8 ++++---- .../{ => drivers_keyboard}/keyboard_event_apple.c | 14 ++++++++------ .../{ => drivers_keyboard}/keyboard_event_win32.c | 10 +++++----- input/{ => drivers_keyboard}/keyboard_event_x11.c | 6 +++--- input/{ => drivers_keyboard}/keyboard_event_xkb.c | 6 +++--- 6 files changed, 26 insertions(+), 24 deletions(-) rename input/{ => drivers_keyboard}/keyboard_event_apple.c (96%) rename input/{ => drivers_keyboard}/keyboard_event_win32.c (93%) rename input/{ => drivers_keyboard}/keyboard_event_x11.c (97%) rename input/{ => drivers_keyboard}/keyboard_event_xkb.c (96%) diff --git a/Makefile.common b/Makefile.common index 199df260db..b7f4e579c5 100644 --- a/Makefile.common +++ b/Makefile.common @@ -378,14 +378,14 @@ endif ifeq ($(HAVE_X11), 1) OBJ += input/drivers/x11_input.o \ gfx/drivers_wm/x11_common.o \ - input/keyboard_event_x11.o + input/drivers_keyboard/keyboard_event_x11.o LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS) DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS) endif ifeq ($(HAVE_XKBCOMMON), 1) DEFINES += $(XKBCOMMON_CFLAGS) - OBJ += input/keyboard_event_xkb.o + OBJ += input/drivers_keyboard/keyboard_event_xkb.o LIBS += $(XKBCOMMON_LIBS) endif @@ -690,7 +690,7 @@ endif ifneq ($(findstring Win32,$(OS)),) OBJ += media/rarch.o \ - input/keyboard_event_win32.o \ + input/drivers_keyboard/keyboard_event_win32.o \ gfx/drivers_wm/win32_common.o \ gfx/drivers_wm/win32_dwm_common.o endif diff --git a/griffin/griffin.c b/griffin/griffin.c index 6e5e9189a8..e141711eca 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -386,19 +386,19 @@ INPUT (HID) ============================================================ */ #if defined(_WIN32) && !defined(_XBOX) -#include "../input/keyboard_event_win32.c" +#include "../input/drivers_keyboard/keyboard_event_win32.c" #endif #ifdef HAVE_X11 -#include "../input/keyboard_event_x11.c" +#include "../input/drivers_keyboard/keyboard_event_x11.c" #endif #ifdef __APPLE__ -#include "../input/keyboard_event_apple.c" +#include "../input/drivers_keyboard/keyboard_event_apple.c" #endif #ifdef HAVE_XKBCOMMON -#include "../input/keyboard_event_xkb.c" +#include "../input/drivers_keyboard/keyboard_event_xkb.c" #endif /*============================================================ diff --git a/input/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c similarity index 96% rename from input/keyboard_event_apple.c rename to input/drivers_keyboard/keyboard_event_apple.c index 7c7d06b3db..f7e92aa2dd 100644 --- a/input/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -17,16 +17,18 @@ #include #include -#include "input_common.h" -#include "input_keymaps.h" -#include "drivers/apple_input.h" -#include "../general.h" -#include "../driver.h" +#include "../input_common.h" +#include "../input_keymaps.h" +#include "../drivers/apple_input.h" +#include "../../general.h" +#include "../../driver.h" -#include "drivers/apple_keycode.h" +#include "../drivers/apple_keycode.h" #if defined(IOS) + #define HIDKEY(X) X + #elif defined(OSX) /* Taken from https://github.com/depp/keycode, diff --git a/input/keyboard_event_win32.c b/input/drivers_keyboard/keyboard_event_win32.c similarity index 93% rename from input/keyboard_event_win32.c rename to input/drivers_keyboard/keyboard_event_win32.c index d4dc3b5778..df9435e7d6 100644 --- a/input/keyboard_event_win32.c +++ b/input/drivers_keyboard/keyboard_event_win32.c @@ -14,11 +14,11 @@ * If not, see . */ -#include "../general.h" -#include "keyboard_line.h" -#include "../gfx/drivers_context/win32_common.h" -#include "input_common.h" -#include "input_keymaps.h" +#include "../../general.h" +#include "../keyboard_line.h" +#include "../../gfx/drivers_context/win32_common.h" +#include "../input_common.h" +#include "../input_keymaps.h" LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) diff --git a/input/keyboard_event_x11.c b/input/drivers_keyboard/keyboard_event_x11.c similarity index 97% rename from input/keyboard_event_x11.c rename to input/drivers_keyboard/keyboard_event_x11.c index 263ca09d6d..41c99a12db 100644 --- a/input/keyboard_event_x11.c +++ b/input/drivers_keyboard/keyboard_event_x11.c @@ -23,10 +23,10 @@ #endif #include -#include "../driver.h" -#include "keyboard_line.h" -#include "input_keymaps.h" #include +#include "../../driver.h" +#include "../keyboard_line.h" +#include "../input_keymaps.h" static INLINE unsigned leading_ones(uint8_t c) { diff --git a/input/keyboard_event_xkb.c b/input/drivers_keyboard/keyboard_event_xkb.c similarity index 96% rename from input/keyboard_event_xkb.c rename to input/drivers_keyboard/keyboard_event_xkb.c index 39a980e840..6f08812563 100644 --- a/input/keyboard_event_xkb.c +++ b/input/drivers_keyboard/keyboard_event_xkb.c @@ -15,9 +15,9 @@ */ #include -#include "input_joypad_driver.h" -#include "input_keymaps.h" -#include "keyboard_line.h" +#include "../input_joypad_driver.h" +#include "../input_keymaps.h" +#include "../keyboard_line.h" #define MOD_MAP_SIZE 5