notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
menu: pass extension lists as argument
[libpicofe.git]
/
win32
/
in_vk.c
diff --git
a/win32/in_vk.c
b/win32/in_vk.c
index
625268a
..
ae8888a
100644
(file)
--- a/
win32/in_vk.c
+++ b/
win32/in_vk.c
@@
-1,10
+1,21
@@
+/*
+ * (C) GraÅžvydas "notaz" Ignotas, 2009
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ * - GNU GPL, version 2 or later.
+ * - GNU LGPL, version 2.1 or later.
+ * - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
#define RC_INVOKED // we only need defines
#include <winuser.h>
#undef RC_INVOKED
#include <string.h>
#define RC_INVOKED // we only need defines
#include <winuser.h>
#undef RC_INVOKED
#include <string.h>
-#include "../
common/
input.h"
-#include "../
common/
emu.h" // array_size
+#include "../input.h"
+#include "../emu.h" // array_size
#include "in_vk.h"
#define IN_VK_PREFIX "vk:"
#include "in_vk.h"
#define IN_VK_PREFIX "vk:"
@@
-65,7
+76,7
@@
static int in_vk_keys_down[4];
static void in_vk_probe(void)
{
memset(in_vk_keys_down, 0, sizeof(in_vk_keys_down));
static void in_vk_probe(void)
{
memset(in_vk_keys_down, 0, sizeof(in_vk_keys_down));
- in_register(IN_VK_PREFIX "vk", IN_DRVID_VK, -1, (void *)1, IN_VK_NKEYS, 0);
+ in_register(IN_VK_PREFIX "vk", IN_DRVID_VK, -1, (void *)1, IN_VK_NKEYS,
NULL,
0);
}
static int in_vk_get_bind_count(void)
}
static int in_vk_get_bind_count(void)
@@
-145,7
+156,7
@@
static const struct {
#define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
#define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
-static int in_vk_menu_translate(int keycode)
+static int in_vk_menu_translate(
void *drv_data,
int keycode)
{
int i;
if (keycode < 0)
{
int i;
if (keycode < 0)
@@
-216,6
+227,10
@@
static const struct {
{ 'D', IN_BINDTYPE_PLAYER12, 5 }, /* C */
{ 'A', IN_BINDTYPE_PLAYER12, 6 }, /* A */
{ VK_RETURN, IN_BINDTYPE_PLAYER12, 7 },
{ 'D', IN_BINDTYPE_PLAYER12, 5 }, /* C */
{ 'A', IN_BINDTYPE_PLAYER12, 6 }, /* A */
{ VK_RETURN, IN_BINDTYPE_PLAYER12, 7 },
+ { 'E', IN_BINDTYPE_PLAYER12, 8 }, /* Z */
+ { 'W', IN_BINDTYPE_PLAYER12, 9 }, /* Y */
+ { 'Q', IN_BINDTYPE_PLAYER12,10 }, /* X */
+ { 'R', IN_BINDTYPE_PLAYER12,11 }, /* M */
/*
{ BTN_SELECT, IN_BINDTYPE_EMU, PEVB_MENU },
// { BTN_Y, IN_BINDTYPE_EMU, PEVB_SWITCH_RND },
/*
{ BTN_SELECT, IN_BINDTYPE_EMU, PEVB_MENU },
// { BTN_Y, IN_BINDTYPE_EMU, PEVB_SWITCH_RND },