From 9214469470c16453f3832b5d1a3f4fbe702d51d7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 27 Oct 2014 06:17:07 +0100
Subject: [PATCH] Rename to gfx/context/win32_common.c to
 input/keyboard_event_win32.c

---
 Makefile.common                               |  2 +-
 griffin/griffin.c                             |  2 +-
 .../keyboard_event_win32.c                    | 45 +++++++------------
 3 files changed, 19 insertions(+), 30 deletions(-)
 rename gfx/context/win32_common.c => input/keyboard_event_win32.c (65%)

diff --git a/Makefile.common b/Makefile.common
index 84faabde16..78d3f97339 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -615,7 +615,7 @@ endif
 
 ifneq ($(findstring Win32,$(OS)),)
    OBJ += media/rarch.o \
-          gfx/context/win32_common.o
+          input/keyboard_event_win32.o
 endif
 
 # Record
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 6452ebf2f8..1a2b86c94c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -351,7 +351,7 @@ INPUT
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
-#include "../gfx/context/win32_common.c"
+#include "../input/keyboard_event_win32.c"
 #endif
 
 #if defined(__CELLOS_LV2__)
diff --git a/gfx/context/win32_common.c b/input/keyboard_event_win32.c
similarity index 65%
rename from gfx/context/win32_common.c
rename to input/keyboard_event_win32.c
index d98507ecff..e6e5a8ca26 100644
--- a/gfx/context/win32_common.c
+++ b/input/keyboard_event_win32.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2014 - Daniel De Matteis
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU General Public License as published by the Free Software Found-
@@ -13,61 +14,50 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../general.h"
-#include "../../input/keyboard_line.h"
-#include "win32_common.h"
-#include "../../input/input_common.h"
-#include "../../input/input_keymaps.h"
+#include "../general.h"
+#include "keyboard_line.h"
+#include "../gfx/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)
+LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message,
+		WPARAM wparam, LPARAM lparam)
 {
+   unsigned scancode = (lparam >> 16) & 0xff;
+   unsigned keycode = input_translate_keysym_to_rk(scancode);
    uint16_t mod = 0;
    mod |= (GetKeyState(VK_SHIFT)   & 0x80) ? RETROKMOD_SHIFT : 0;
    mod |= (GetKeyState(VK_CONTROL) & 0x80) ? RETROKMOD_CTRL : 0;
    mod |= (GetKeyState(VK_MENU)    & 0x80) ? RETROKMOD_ALT : 0;
    mod |= (GetKeyState(VK_CAPITAL) & 0x81) ? RETROKMOD_CAPSLOCK : 0;
    mod |= (GetKeyState(VK_SCROLL)  & 0x81) ? RETROKMOD_SCROLLOCK : 0;
-   mod |= ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80) ? RETROKMOD_META : 0;
+   mod |= ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80) ? 
+	   RETROKMOD_META : 0;
 
    switch (message)
    {
-      // Seems to be hard to synchronize WM_CHAR and WM_KEYDOWN properly.
+      /* Seems to be hard to synchronize 
+       * WM_CHAR and WM_KEYDOWN properly.
+       */
       case WM_CHAR:
-      {
          input_keyboard_event(true, RETROK_UNKNOWN, wparam, mod);
          return TRUE;
-      }
 
       case WM_KEYDOWN:
-      {
-         // DirectInput uses scancodes directly.
-         unsigned scancode = (lparam >> 16) & 0xff;
-         unsigned keycode = input_translate_keysym_to_rk(scancode);
+         /* DirectInput uses scancodes directly. */
          input_keyboard_event(true, keycode, 0, mod);
          return 0;
-      }
 
       case WM_KEYUP:
-      {
-         // DirectInput uses scancodes directly.
-         unsigned scancode = (lparam >> 16) & 0xff;
-         unsigned keycode = input_translate_keysym_to_rk(scancode);
+         /* DirectInput uses scancodes directly. */
          input_keyboard_event(false, keycode, 0, mod);
          return 0;
-      }
 
       case WM_SYSKEYUP:
-      {
-         unsigned scancode = (lparam >> 16) & 0xff;
-         unsigned keycode = input_translate_keysym_to_rk(scancode);
          input_keyboard_event(false, keycode, 0, mod);
          return 0;
-      }
 
       case WM_SYSKEYDOWN:
-      {
-         unsigned scancode = (lparam >> 16) & 0xff;
-         unsigned keycode = input_translate_keysym_to_rk(scancode);
          input_keyboard_event(true, keycode, 0, mod);
 
          switch (wparam)
@@ -78,7 +68,6 @@ LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPAR
                return 0;
          }
          break;
-      }
    }
 
    return DefWindowProc(hwnd, message, wparam, lparam);