libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Move keyboard_event files to input/drivers_keyboard

Browse Source
This commit is contained in:
twinaphex 2015-04-04 20:42:16 +02:00
parent 66a17301f1
commit 5b688ea8be
6 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.common
View File

@ -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

8
griffin/griffin.c
View File

@ -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
/*============================================================

14
input/keyboard_event_apple.c → input/drivers_keyboard/keyboard_event_apple.c
View File

@ -17,16 +17,18 @@
#include <stdint.h>
#include <unistd.h>
#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,

10
input/keyboard_event_win32.c → input/drivers_keyboard/keyboard_event_win32.c
View File

@ -14,11 +14,11 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#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)

6
input/keyboard_event_x11.c → input/drivers_keyboard/keyboard_event_x11.c
View File

@ -23,10 +23,10 @@
#endif
#include <boolean.h>
#include "../driver.h"
#include "keyboard_line.h"
#include "input_keymaps.h"
#include <retro_inline.h>
#include "../../driver.h"
#include "../keyboard_line.h"
#include "../input_keymaps.h"
static INLINE unsigned leading_ones(uint8_t c)
{

6
input/keyboard_event_xkb.c → input/drivers_keyboard/keyboard_event_xkb.c
View File

@ -15,9 +15,9 @@
*/
#include <xkbcommon/xkbcommon.h>
#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