Cleaned up some code.
This commit is contained in:
parent
880030665f
commit
afad3527d7
|
@ -3,133 +3,17 @@
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "keyscan.h"
|
#include "keyscan.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
|
#include "gui.h"
|
||||||
#include "../../input.h"
|
#include "../../input.h"
|
||||||
|
|
||||||
static int* ConflictTable=0;
|
|
||||||
static uint8 keyonce[MKK_COUNT];
|
|
||||||
static unsigned char *keys_nr=0;
|
|
||||||
|
|
||||||
void KeyboardUpdateState(void); //mbg merge 7/17/06 yech had to add this
|
void KeyboardUpdateState(void); //mbg merge 7/17/06 yech had to add this
|
||||||
|
|
||||||
static const char* ScanNames[256]=
|
|
||||||
{
|
|
||||||
/* 0x00-0x0f */ 0, "Escape", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Minus", "Equals", "Backspace", "Tab",
|
|
||||||
/* 0x10-0x1f */ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "[", "]", "Enter", "Left Ctrl", "A", "S",
|
|
||||||
/* 0x20-0x2f */ "D", "F", "G", "H", "J", "K", "L", "Semicolon", "Apostrophe", "Tilde", "Left Shift", "Backslash", "Z", "X", "C", "V",
|
|
||||||
/* 0x30-0x3f */ "B", "N", "M", "Comma", "Period", "Slash", "Right Shift", "Numpad *", "Left Alt", "Space", "Caps Lock", "F1", "F2", "F3", "F4", "F5",
|
|
||||||
/* 0x40-0x4f */ "F6", "F7", "F8", "F9", "F10", "NumLock", "ScrollLock", "Numpad 7", "Numpad 8", "Numpad 9", "Numpad Minus", "Numpad 4", "Numpad 5", "Numpad 6", "Numpad Plus", "Numpad 1",
|
|
||||||
/* 0x50-0x5f */ "Numpad 2", "Numpad 3", "Numpad 0", "Numpad Period", 0, 0, "Backslash", "F11", "F12", 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 0x60-0x6f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 0x70-0x7f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 0x80-0x8f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 0x90-0x9f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Numpad Enter", "Right Ctrl", 0, 0,
|
|
||||||
/* 0xa0-0xaf */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 0xb0-0xbf */ 0, 0, 0, 0, 0, "Numpad Divide", 0, "PrintScrn", "Right Alt", 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 0xc0-0xcf */ 0, 0, 0, 0, 0, "Pause", 0, "Home", "Up Arrow", "PgUp", 0, "Left Arrow", 0, "Right Arrow", 0, "End",
|
|
||||||
/* 0xd0-0xdf */ "Down Arrow", "PgDn", "Ins", "Del", 0, 0, 0, 0, 0, 0, 0, "Left Win", "Right Win", "AppMenu", 0, 0,
|
|
||||||
/* 0xe0-0xef */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
/* 0xf0-0xff */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
struct INPUTDLGTHREADARGS
|
struct INPUTDLGTHREADARGS
|
||||||
{
|
{
|
||||||
HANDLE hThreadExit;
|
HANDLE hThreadExit;
|
||||||
HWND hwndDlg;
|
HWND hwndDlg;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int _keyonly(int a)
|
|
||||||
{
|
|
||||||
if(keys_nr[a])
|
|
||||||
{
|
|
||||||
if(!keyonce[a])
|
|
||||||
{
|
|
||||||
keyonce[a]=1;
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
keyonce[a]=0;
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int GetKeyPressed()
|
|
||||||
{
|
|
||||||
int key=0;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
keys_nr=GetKeyboard_nr();
|
|
||||||
|
|
||||||
for(i=0; i<256 && !key; ++i)
|
|
||||||
{
|
|
||||||
if(_keyonly(i))
|
|
||||||
key=i;
|
|
||||||
}
|
|
||||||
return key;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int NothingPressed()
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
keys_nr=GetKeyboard_nr();
|
|
||||||
|
|
||||||
for(i=0; i<256; ++i)
|
|
||||||
{
|
|
||||||
if(keys_nr[i])
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int GetKeyMeta(int key)
|
|
||||||
{
|
|
||||||
int meta = key & (~CMD_KEY_MASK);
|
|
||||||
switch(key & CMD_KEY_MASK)
|
|
||||||
{
|
|
||||||
case SCAN_LEFTCONTROL:
|
|
||||||
case SCAN_RIGHTCONTROL: return CMD_KEY_CTRL | meta;
|
|
||||||
case SCAN_LEFTALT:
|
|
||||||
case SCAN_RIGHTALT: return CMD_KEY_ALT | meta;
|
|
||||||
case SCAN_LEFTSHIFT:
|
|
||||||
case SCAN_RIGHTSHIFT: return CMD_KEY_SHIFT | meta;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return meta;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ClearExtraMeta(int* key)
|
|
||||||
{
|
|
||||||
switch((*key)&0xff)
|
|
||||||
{
|
|
||||||
case SCAN_LEFTCONTROL:
|
|
||||||
case SCAN_RIGHTCONTROL: *key &= ~(CMD_KEY_CTRL); break;
|
|
||||||
case SCAN_LEFTALT:
|
|
||||||
case SCAN_RIGHTALT: *key &= ~(CMD_KEY_ALT); break;
|
|
||||||
case SCAN_LEFTSHIFT:
|
|
||||||
case SCAN_RIGHTSHIFT: *key &= ~(CMD_KEY_SHIFT); break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static DWORD WINAPI NewInputDialogThread(LPVOID lpvArg)
|
|
||||||
{
|
|
||||||
struct INPUTDLGTHREADARGS* args = (struct INPUTDLGTHREADARGS*)lpvArg;
|
|
||||||
|
|
||||||
while (args->hThreadExit)
|
|
||||||
{
|
|
||||||
if (WaitForSingleObject(args->hThreadExit, 20) == WAIT_OBJECT_0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
// Poke our owner dialog periodically.
|
|
||||||
PostMessage(args->hwndDlg, WM_USER, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct
|
static struct
|
||||||
{
|
{
|
||||||
int cmd;
|
int cmd;
|
||||||
|
@ -200,110 +84,432 @@ static struct
|
||||||
|
|
||||||
#define NUM_DEFAULT_MAPPINGS (sizeof(DefaultCommandMapping)/sizeof(DefaultCommandMapping[0]))
|
#define NUM_DEFAULT_MAPPINGS (sizeof(DefaultCommandMapping)/sizeof(DefaultCommandMapping[0]))
|
||||||
|
|
||||||
static const char* GetKeyName(int code)
|
static uint8 keyonce[MKK_COUNT];
|
||||||
|
static unsigned char *keys_nr = 0;
|
||||||
|
|
||||||
|
static const char* ScanNames[256]=
|
||||||
|
{
|
||||||
|
/* 0x00-0x0f */ 0, "Escape", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Minus", "Equals", "Backspace", "Tab",
|
||||||
|
/* 0x10-0x1f */ "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "[", "]", "Enter", "Left Ctrl", "A", "S",
|
||||||
|
/* 0x20-0x2f */ "D", "F", "G", "H", "J", "K", "L", "Semicolon", "Apostrophe", "Tilde", "Left Shift", "Backslash", "Z", "X", "C", "V",
|
||||||
|
/* 0x30-0x3f */ "B", "N", "M", "Comma", "Period", "Slash", "Right Shift", "Numpad *", "Left Alt", "Space", "Caps Lock", "F1", "F2", "F3", "F4", "F5",
|
||||||
|
/* 0x40-0x4f */ "F6", "F7", "F8", "F9", "F10", "NumLock", "ScrollLock", "Numpad 7", "Numpad 8", "Numpad 9", "Numpad Minus", "Numpad 4", "Numpad 5", "Numpad 6", "Numpad Plus", "Numpad 1",
|
||||||
|
/* 0x50-0x5f */ "Numpad 2", "Numpad 3", "Numpad 0", "Numpad Period", 0, 0, "Backslash", "F11", "F12", 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
/* 0x60-0x6f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
/* 0x70-0x7f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
/* 0x80-0x8f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
/* 0x90-0x9f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Numpad Enter", "Right Ctrl", 0, 0,
|
||||||
|
/* 0xa0-0xaf */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
/* 0xb0-0xbf */ 0, 0, 0, 0, 0, "Numpad Divide", 0, "PrintScrn", "Right Alt", 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
/* 0xc0-0xcf */ 0, 0, 0, 0, 0, "Pause", 0, "Home", "Up Arrow", "PgUp", 0, "Left Arrow", 0, "Right Arrow", 0, "End",
|
||||||
|
/* 0xd0-0xdf */ "Down Arrow", "PgDn", "Ins", "Del", 0, 0, 0, 0, 0, 0, 0, "Left Win", "Right Win", "AppMenu", 0, 0,
|
||||||
|
/* 0xe0-0xef */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
/* 0xf0-0xff */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
int _keyonly(int a)
|
||||||
|
{
|
||||||
|
if(keys_nr[a])
|
||||||
|
{
|
||||||
|
if(!keyonce[a])
|
||||||
|
{
|
||||||
|
keyonce[a] = 1;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
keyonce[a] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int GetKeyPressed()
|
||||||
|
{
|
||||||
|
int key = 0;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
keys_nr = GetKeyboard_nr();
|
||||||
|
|
||||||
|
for(i = 0; i < 256 && !key; ++i)
|
||||||
|
{
|
||||||
|
if(_keyonly(i))
|
||||||
|
{
|
||||||
|
key = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
int NothingPressed()
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
keys_nr = GetKeyboard_nr();
|
||||||
|
|
||||||
|
for(i = 0; i < 256; ++i)
|
||||||
|
{
|
||||||
|
if(keys_nr[i])
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int GetKeyMeta(int key)
|
||||||
|
{
|
||||||
|
int meta = key & (~CMD_KEY_MASK);
|
||||||
|
|
||||||
|
switch(key & CMD_KEY_MASK)
|
||||||
|
{
|
||||||
|
case SCAN_LEFTCONTROL:
|
||||||
|
case SCAN_RIGHTCONTROL:
|
||||||
|
return CMD_KEY_CTRL | meta;
|
||||||
|
|
||||||
|
case SCAN_LEFTALT:
|
||||||
|
case SCAN_RIGHTALT:
|
||||||
|
return CMD_KEY_ALT | meta;
|
||||||
|
|
||||||
|
case SCAN_LEFTSHIFT:
|
||||||
|
case SCAN_RIGHTSHIFT:
|
||||||
|
return CMD_KEY_SHIFT | meta;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return meta;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClearExtraMeta(int* key)
|
||||||
|
{
|
||||||
|
switch((*key)&0xff)
|
||||||
|
{
|
||||||
|
case SCAN_LEFTCONTROL:
|
||||||
|
case SCAN_RIGHTCONTROL:
|
||||||
|
*key &= ~(CMD_KEY_CTRL);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SCAN_LEFTALT:
|
||||||
|
case SCAN_RIGHTALT:
|
||||||
|
*key &= ~(CMD_KEY_ALT);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SCAN_LEFTSHIFT:
|
||||||
|
case SCAN_RIGHTSHIFT:
|
||||||
|
*key &= ~(CMD_KEY_SHIFT);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
DWORD WINAPI NewInputDialogThread(LPVOID lpvArg)
|
||||||
|
{
|
||||||
|
struct INPUTDLGTHREADARGS* args = (struct INPUTDLGTHREADARGS*)lpvArg;
|
||||||
|
|
||||||
|
while (args->hThreadExit)
|
||||||
|
{
|
||||||
|
if (WaitForSingleObject(args->hThreadExit, 20) == WAIT_OBJECT_0)
|
||||||
|
break;
|
||||||
|
|
||||||
|
// Poke our owner dialog periodically.
|
||||||
|
PostMessage(args->hwndDlg, WM_USER, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the name of a single key.
|
||||||
|
*
|
||||||
|
* @param code Keycode
|
||||||
|
*
|
||||||
|
* @return Name of the key
|
||||||
|
*
|
||||||
|
* TODO: Replace return value with parameter.
|
||||||
|
**/
|
||||||
|
const char* GetKeyName(int code)
|
||||||
{
|
{
|
||||||
static char name[16];
|
static char name[16];
|
||||||
|
|
||||||
code &= 0xff;
|
code &= 0xff;
|
||||||
|
|
||||||
if(ScanNames[code])
|
if(ScanNames[code])
|
||||||
|
{
|
||||||
return ScanNames[code];
|
return ScanNames[code];
|
||||||
|
}
|
||||||
|
|
||||||
sprintf(name, "Key 0x%.2x", code);
|
sprintf(name, "Key 0x%.2x", code);
|
||||||
|
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char* GetKeyComboName(int c)
|
/**
|
||||||
|
* Returns the name of a pressed key combination.
|
||||||
|
*
|
||||||
|
* @param c A keycode
|
||||||
|
*
|
||||||
|
* @return The name of the key combination.
|
||||||
|
*
|
||||||
|
* TODO: Replace return value with parameter.
|
||||||
|
**/
|
||||||
|
char* GetKeyComboName(int c)
|
||||||
{
|
{
|
||||||
static char text[80];
|
static char text[80];
|
||||||
|
|
||||||
text[0] = '\0';
|
text[0] = '\0';
|
||||||
if(!c)
|
|
||||||
return text;
|
|
||||||
|
|
||||||
if ((c & CMD_KEY_CTRL) == CMD_KEY_CTRL) strcat(text, "Ctrl + ");
|
if(!c)
|
||||||
else if ((c & CMD_KEY_CTRL) == CMD_KEY_LCTRL) strcat(text, "Left Ctrl + ");
|
{
|
||||||
else if ((c & CMD_KEY_CTRL) == CMD_KEY_RCTRL) strcat(text, "Right Ctrl + ");
|
return text;
|
||||||
if ((c & CMD_KEY_ALT) == CMD_KEY_ALT) strcat(text, "Alt + ");
|
}
|
||||||
else if ((c & CMD_KEY_ALT) == CMD_KEY_LALT) strcat(text, "Left Alt + ");
|
|
||||||
else if ((c & CMD_KEY_ALT) == CMD_KEY_RALT) strcat(text, "Right Alt + ");
|
if ((c & CMD_KEY_CTRL) == CMD_KEY_CTRL)
|
||||||
if ((c & CMD_KEY_SHIFT) == CMD_KEY_SHIFT) strcat(text, "Shift + ");
|
{
|
||||||
else if ((c & CMD_KEY_SHIFT) == CMD_KEY_LSHIFT) strcat(text, "Left Shift + ");
|
strcat(text, "Ctrl + ");
|
||||||
else if ((c & CMD_KEY_SHIFT) == CMD_KEY_RSHIFT) strcat(text, "Right Shift + ");
|
}
|
||||||
|
else if ((c & CMD_KEY_CTRL) == CMD_KEY_LCTRL)
|
||||||
|
{
|
||||||
|
strcat(text, "Left Ctrl + ");
|
||||||
|
}
|
||||||
|
else if ((c & CMD_KEY_CTRL) == CMD_KEY_RCTRL)
|
||||||
|
{
|
||||||
|
strcat(text, "Right Ctrl + ");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((c & CMD_KEY_ALT) == CMD_KEY_ALT)
|
||||||
|
{
|
||||||
|
strcat(text, "Alt + ");
|
||||||
|
}
|
||||||
|
else if ((c & CMD_KEY_ALT) == CMD_KEY_LALT)
|
||||||
|
{
|
||||||
|
strcat(text, "Left Alt + ");
|
||||||
|
}
|
||||||
|
else if ((c & CMD_KEY_ALT) == CMD_KEY_RALT)
|
||||||
|
{
|
||||||
|
strcat(text, "Right Alt + ");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((c & CMD_KEY_SHIFT) == CMD_KEY_SHIFT)
|
||||||
|
{
|
||||||
|
strcat(text, "Shift + ");
|
||||||
|
}
|
||||||
|
else if ((c & CMD_KEY_SHIFT) == CMD_KEY_LSHIFT)
|
||||||
|
{
|
||||||
|
strcat(text, "Left Shift + ");
|
||||||
|
}
|
||||||
|
else if ((c & CMD_KEY_SHIFT) == CMD_KEY_RSHIFT)
|
||||||
|
{
|
||||||
|
strcat(text, "Right Shift + ");
|
||||||
|
}
|
||||||
|
|
||||||
strcat(text, GetKeyName(c & CMD_KEY_MASK));
|
strcat(text, GetKeyName(c & CMD_KEY_MASK));
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ApplyDefaultCommandMapping(void)
|
/**
|
||||||
|
* Callback function for the dialog where the user can change hotkeys.
|
||||||
|
**/
|
||||||
|
BOOL CALLBACK ChangeInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
int i;
|
static HANDLE hThread = NULL;
|
||||||
|
static DWORD dwThreadId = 0;
|
||||||
|
static struct INPUTDLGTHREADARGS threadargs;
|
||||||
|
static int key = 0;
|
||||||
|
|
||||||
memset(FCEUD_CommandMapping, 0, sizeof(FCEUD_CommandMapping));
|
switch (uMsg)
|
||||||
|
|
||||||
for(i=0; i<NUM_DEFAULT_MAPPINGS; ++i)
|
|
||||||
{
|
{
|
||||||
FCEUD_CommandMapping[DefaultCommandMapping[i].cmd] = DefaultCommandMapping[i].key;
|
case WM_INITDIALOG:
|
||||||
}
|
{
|
||||||
|
// Start the message thread.
|
||||||
|
threadargs.hThreadExit = CreateEvent(NULL, TRUE, FALSE, NULL);
|
||||||
|
threadargs.hwndDlg = hwndDlg;
|
||||||
|
hThread = CreateThread(NULL, 0, NewInputDialogThread, (LPVOID)&threadargs, 0, &dwThreadId);
|
||||||
|
|
||||||
|
key = 0;
|
||||||
|
memset(keyonce, 0, sizeof(keyonce));
|
||||||
|
|
||||||
|
KeyboardSetBackgroundAccess(1);
|
||||||
|
SetFocus(GetDlgItem(hwndDlg, 100));
|
||||||
|
|
||||||
|
CenterWindowOnScreen(hwndDlg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ShouldDisplayMapping(int mapn, int filter)
|
return FALSE;
|
||||||
|
|
||||||
|
case WM_COMMAND:
|
||||||
|
if(LOWORD(wParam) == BTN_CANCEL && HIWORD(wParam) == BN_CLICKED)
|
||||||
|
{
|
||||||
|
key = 0;
|
||||||
|
|
||||||
|
// Send quit message.
|
||||||
|
PostMessage(hwndDlg, WM_USER + 1, 0, 0);
|
||||||
|
}
|
||||||
|
else if(LOWORD(wParam) == BTN_CLEAR && HIWORD(wParam) == BN_CLICKED)
|
||||||
|
{
|
||||||
|
key = -1;
|
||||||
|
|
||||||
|
// Send quit message.
|
||||||
|
PostMessage(hwndDlg, WM_USER+1, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
case WM_USER:
|
||||||
|
{
|
||||||
|
// Our thread sent us a timer signal.
|
||||||
|
int newkey;
|
||||||
|
int meta = GetKeyMeta(key);
|
||||||
|
|
||||||
|
KeyboardUpdateState();
|
||||||
|
|
||||||
|
if((newkey = GetKeyPressed()) != 0)
|
||||||
|
{
|
||||||
|
key = newkey | meta;
|
||||||
|
ClearExtraMeta(&key);
|
||||||
|
SetDlgItemText(hwndDlg, 100, GetKeyComboName(key));
|
||||||
|
}
|
||||||
|
else if(NothingPressed() && key)
|
||||||
|
{
|
||||||
|
PostMessage(hwndDlg, WM_USER+1, 0, 0); // Send quit message.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case WM_USER+1:
|
||||||
|
{
|
||||||
|
// Done with keyboard.
|
||||||
|
KeyboardSetBackgroundAccess(0);
|
||||||
|
|
||||||
|
// Kill the thread.
|
||||||
|
SetEvent(threadargs.hThreadExit);
|
||||||
|
WaitForSingleObject(hThread, INFINITE);
|
||||||
|
CloseHandle(hThread);
|
||||||
|
CloseHandle(threadargs.hThreadExit);
|
||||||
|
|
||||||
|
// End the dialog.
|
||||||
|
EndDialog(hwndDlg, key);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether a key should be shown in the current filter mode.
|
||||||
|
*
|
||||||
|
* @param mapn Index of the key.
|
||||||
|
* @param filter Current filter.
|
||||||
|
* @param conflictTable A populated conflict table.
|
||||||
|
*
|
||||||
|
* @return Key should be shown (true) or not shown (false)
|
||||||
|
**/
|
||||||
|
bool ShouldDisplayMapping(int mapn, int filter, const int* conflictTable)
|
||||||
{
|
{
|
||||||
//mbg merge 7/17/06 changed to if..elseif
|
//mbg merge 7/17/06 changed to if..elseif
|
||||||
if(filter == 0) /* No filter */
|
if(filter == 0) /* No filter */
|
||||||
return 1;
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
else if(filter <= EMUCMDTYPE_MAX) /* Filter by type */
|
else if(filter <= EMUCMDTYPE_MAX) /* Filter by type */
|
||||||
return (FCEUI_CommandTable[mapn].type == filter-1);
|
{
|
||||||
|
return FCEUI_CommandTable[mapn].type == filter - 1;
|
||||||
|
}
|
||||||
else if(filter == EMUCMDTYPE_MAX + 1) /* Assigned */
|
else if(filter == EMUCMDTYPE_MAX + 1) /* Assigned */
|
||||||
return FCEUD_CommandMapping[mapn];
|
{
|
||||||
|
return FCEUD_CommandMapping[mapn] != 0;
|
||||||
|
}
|
||||||
else if(filter == EMUCMDTYPE_MAX + 2) /* Unassigned */
|
else if(filter == EMUCMDTYPE_MAX + 2) /* Unassigned */
|
||||||
return !(FCEUD_CommandMapping[mapn]);
|
{
|
||||||
|
return FCEUD_CommandMapping[mapn] == 0;
|
||||||
|
}
|
||||||
else if(filter == EMUCMDTYPE_MAX + 3) /* Conflicts */
|
else if(filter == EMUCMDTYPE_MAX + 3) /* Conflicts */
|
||||||
return ConflictTable[mapn];
|
{
|
||||||
|
return conflictTable[mapn] != 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
static void PopulateMappingDisplay(HWND hwndDlg)
|
* Populates a conflict table.
|
||||||
|
*
|
||||||
|
* @param conflictTable The conflict table to populate.
|
||||||
|
**/
|
||||||
|
void PopulateConflictTable(int* conflictTable)
|
||||||
{
|
{
|
||||||
LVITEM lvi;
|
// Check whether there are conflicts between the
|
||||||
int i;
|
// selected hotkeys.
|
||||||
int idx;
|
for(unsigned i = 0; i < EMUCMD_MAX - 1; ++i)
|
||||||
HWND hwndListView = GetDlgItem(hwndDlg, 1003);
|
|
||||||
int num=SendMessage(hwndListView, LVM_GETITEMCOUNT, 0, 0);
|
|
||||||
int filter = (int)SendDlgItemMessage(hwndDlg, 300, CB_GETCURSEL, 0, 0);
|
|
||||||
|
|
||||||
// Delete everything in the current display.
|
|
||||||
for(i=num; i>0; --i)
|
|
||||||
SendMessage(hwndListView, LVM_DELETEITEM, (WPARAM)i-1, 0);
|
|
||||||
|
|
||||||
// Get the filter type.
|
|
||||||
ConflictTable=0;
|
|
||||||
if (filter == EMUCMDTYPE_MAX+3)
|
|
||||||
{
|
{
|
||||||
// Set up the conflict table.
|
for(unsigned int j = i + 1; j < EMUCMD_MAX; ++j)
|
||||||
ConflictTable=(int*)malloc(sizeof(int)*EMUCMD_MAX);
|
|
||||||
memset(ConflictTable, 0, sizeof(int)*EMUCMD_MAX);
|
|
||||||
for(i=0; i<EMUCMD_MAX-1; ++i)
|
|
||||||
{
|
|
||||||
int j;
|
|
||||||
for(j=i+1; j<EMUCMD_MAX; ++j)
|
|
||||||
{
|
{
|
||||||
if(FCEUD_CommandMapping[i] &&
|
if(FCEUD_CommandMapping[i] &&
|
||||||
FCEUD_CommandMapping[i] == FCEUD_CommandMapping[j])
|
FCEUD_CommandMapping[i] == FCEUD_CommandMapping[j])
|
||||||
{
|
{
|
||||||
ConflictTable[i]=1;
|
conflictTable[i] = 1;
|
||||||
ConflictTable[j]=1;
|
conflictTable[j] = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Populate display.
|
/**
|
||||||
for(i=0, idx=0; i<EMUCMD_MAX; ++i)
|
* Populates the hotkey ListView according to the rules set
|
||||||
|
* by the current filter.
|
||||||
|
*
|
||||||
|
* @param hwndDlg Handle of the Map Input dialog.
|
||||||
|
**/
|
||||||
|
void PopulateMappingDisplay(HWND hwndDlg)
|
||||||
{
|
{
|
||||||
if(ShouldDisplayMapping(i, filter))
|
// Get the ListView handle.
|
||||||
|
HWND hwndListView = GetDlgItem(hwndDlg, LV_MAPPING);
|
||||||
|
|
||||||
|
// Get the number of items in the ListView.
|
||||||
|
int num = SendMessage(hwndListView, LVM_GETITEMCOUNT, 0, 0);
|
||||||
|
|
||||||
|
// Get the selected filter.
|
||||||
|
int filter = (int)SendDlgItemMessage(hwndDlg, COMBO_FILTER, CB_GETCURSEL, 0, 0);
|
||||||
|
|
||||||
|
// Delete everything in the current display.
|
||||||
|
for(unsigned i = num; i>0; --i)
|
||||||
|
{
|
||||||
|
SendMessage(hwndListView, LVM_DELETEITEM, (WPARAM)i-1, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
int* conflictTable = 0;
|
||||||
|
|
||||||
|
// Get the filter type.
|
||||||
|
if (filter == EMUCMDTYPE_MAX + 3)
|
||||||
|
{
|
||||||
|
// Set up the conflict table.
|
||||||
|
conflictTable = (int*)malloc(sizeof(int)*EMUCMD_MAX);
|
||||||
|
memset(conflictTable, 0, sizeof(int)*EMUCMD_MAX);
|
||||||
|
|
||||||
|
PopulateConflictTable(conflictTable);
|
||||||
|
}
|
||||||
|
|
||||||
|
LVITEM lvi;
|
||||||
|
|
||||||
|
// Populate display.
|
||||||
|
for(int i = 0, idx = 0; i < EMUCMD_MAX; ++i)
|
||||||
|
{
|
||||||
|
// Check if the current key should be displayed
|
||||||
|
// according to the current filter.
|
||||||
|
if(ShouldDisplayMapping(i, filter, conflictTable))
|
||||||
{
|
{
|
||||||
memset(&lvi, 0, sizeof(lvi));
|
memset(&lvi, 0, sizeof(lvi));
|
||||||
lvi.mask = LVIF_TEXT | LVIF_PARAM;
|
lvi.mask = LVIF_TEXT | LVIF_PARAM;
|
||||||
|
@ -334,98 +540,23 @@ static void PopulateMappingDisplay(HWND hwndDlg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(ConflictTable)
|
if(conflictTable)
|
||||||
free(ConflictTable);
|
{
|
||||||
|
free(conflictTable);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static BOOL CALLBACK ChangeInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
/**
|
||||||
|
* Initializes the ListView control that shows the key mappings.
|
||||||
|
*
|
||||||
|
* @param The handle of the Map Input dialog.
|
||||||
|
*
|
||||||
|
* @return The handle of the ListView control.
|
||||||
|
**/
|
||||||
|
HWND InitializeListView(HWND hwndDlg)
|
||||||
{
|
{
|
||||||
static HANDLE hThread = NULL;
|
HWND hwndListView = GetDlgItem(hwndDlg, LV_MAPPING);
|
||||||
static DWORD dwThreadId = 0;
|
|
||||||
static struct INPUTDLGTHREADARGS threadargs;
|
|
||||||
static int key=0;
|
|
||||||
|
|
||||||
switch (uMsg)
|
|
||||||
{
|
|
||||||
case WM_INITDIALOG:
|
|
||||||
{
|
|
||||||
// Start the message thread.
|
|
||||||
threadargs.hThreadExit = CreateEvent(NULL, TRUE, FALSE, NULL);
|
|
||||||
threadargs.hwndDlg = hwndDlg;
|
|
||||||
hThread = CreateThread(NULL, 0, NewInputDialogThread, (LPVOID)&threadargs, 0, &dwThreadId);
|
|
||||||
key=0;
|
|
||||||
memset(keyonce, 0, sizeof(keyonce));
|
|
||||||
KeyboardSetBackgroundAccess(1);
|
|
||||||
SetFocus(GetDlgItem(hwndDlg, 100));
|
|
||||||
}
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
case WM_COMMAND:
|
|
||||||
if(LOWORD(wParam) == 202 && HIWORD(wParam) == BN_CLICKED)
|
|
||||||
{
|
|
||||||
key=0;
|
|
||||||
PostMessage(hwndDlg, WM_USER+1, 0, 0); // Send quit message.
|
|
||||||
}
|
|
||||||
else if(LOWORD(wParam) == 200 && HIWORD(wParam) == BN_CLICKED)
|
|
||||||
{
|
|
||||||
key=-1;
|
|
||||||
PostMessage(hwndDlg, WM_USER+1, 0, 0); // Send quit message.
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case WM_USER:
|
|
||||||
{
|
|
||||||
// Our thread sent us a timer signal.
|
|
||||||
int newkey;
|
|
||||||
int meta=GetKeyMeta(key);
|
|
||||||
|
|
||||||
KeyboardUpdateState();
|
|
||||||
|
|
||||||
if((newkey=GetKeyPressed()) != 0)
|
|
||||||
{
|
|
||||||
key = newkey | meta;
|
|
||||||
ClearExtraMeta(&key);
|
|
||||||
SetDlgItemText(hwndDlg, 100, GetKeyComboName(key));
|
|
||||||
}
|
|
||||||
else if(NothingPressed() && key)
|
|
||||||
PostMessage(hwndDlg, WM_USER+1, 0, 0); // Send quit message.
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case WM_USER+1:
|
|
||||||
{
|
|
||||||
// Done with keyboard.
|
|
||||||
KeyboardSetBackgroundAccess(0);
|
|
||||||
|
|
||||||
// Kill the thread.
|
|
||||||
SetEvent(threadargs.hThreadExit);
|
|
||||||
WaitForSingleObject(hThread, INFINITE);
|
|
||||||
CloseHandle(hThread);
|
|
||||||
CloseHandle(threadargs.hThreadExit);
|
|
||||||
|
|
||||||
// End the dialog.
|
|
||||||
EndDialog(hwndDlg, key);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
|
||||||
{
|
|
||||||
switch(uMsg)
|
|
||||||
{
|
|
||||||
case WM_INITDIALOG:
|
|
||||||
{
|
|
||||||
HWND hwndListView = GetDlgItem(hwndDlg, 1003);
|
|
||||||
LVCOLUMN lv;
|
LVCOLUMN lv;
|
||||||
//LVITEM lvi; //mbg merge 7/17/06 removed
|
|
||||||
int i;
|
|
||||||
|
|
||||||
// Set full row select.
|
// Set full row select.
|
||||||
SendMessage(hwndListView, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
|
SendMessage(hwndListView, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
|
||||||
|
@ -454,15 +585,97 @@ static BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
|
||||||
|
|
||||||
SendMessage(hwndListView, LVM_INSERTCOLUMN, (WPARAM)2, (LPARAM)&lv);
|
SendMessage(hwndListView, LVM_INSERTCOLUMN, (WPARAM)2, (LPARAM)&lv);
|
||||||
|
|
||||||
// Populate the filter combobox.
|
return hwndListView;
|
||||||
SendDlgItemMessage(hwndDlg, 300, CB_INSERTSTRING, 0, (LPARAM)"None");
|
}
|
||||||
for(i=0; i<EMUCMDTYPE_MAX; ++i)
|
|
||||||
SendDlgItemMessage(hwndDlg, 300, CB_INSERTSTRING, i+1, (LPARAM)FCEUI_CommandTypeNames[i]);
|
|
||||||
SendDlgItemMessage(hwndDlg, 300, CB_INSERTSTRING, ++i, (LPARAM)"Assigned");
|
|
||||||
SendDlgItemMessage(hwndDlg, 300, CB_INSERTSTRING, ++i, (LPARAM)"Unassigned");
|
|
||||||
SendDlgItemMessage(hwndDlg, 300, CB_INSERTSTRING, ++i, (LPARAM)"Conflicts");
|
|
||||||
|
|
||||||
SendDlgItemMessage(hwndDlg, 300, CB_SETCURSEL, 0, 0); // Default filter is "none".
|
/**
|
||||||
|
* Fills the filter combobox.
|
||||||
|
*
|
||||||
|
* @param hwndDlg Handle of the Map Input dialog.
|
||||||
|
**/
|
||||||
|
void InitFilterComboBox(HWND hwndDlg)
|
||||||
|
{
|
||||||
|
// Populate the filter combobox.
|
||||||
|
SendDlgItemMessage(hwndDlg, COMBO_FILTER, CB_INSERTSTRING, 0, (LPARAM)"None");
|
||||||
|
|
||||||
|
for(unsigned i = 0; i < EMUCMDTYPE_MAX; ++i)
|
||||||
|
{
|
||||||
|
SendDlgItemMessage(hwndDlg, COMBO_FILTER, CB_INSERTSTRING, i+1, (LPARAM)FCEUI_CommandTypeNames[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
SendDlgItemMessage(hwndDlg, COMBO_FILTER, CB_INSERTSTRING, ++i, (LPARAM)"Assigned");
|
||||||
|
SendDlgItemMessage(hwndDlg, COMBO_FILTER, CB_INSERTSTRING, ++i, (LPARAM)"Unassigned");
|
||||||
|
SendDlgItemMessage(hwndDlg, COMBO_FILTER, CB_INSERTSTRING, ++i, (LPARAM)"Conflicts");
|
||||||
|
|
||||||
|
// Default filter is "none".
|
||||||
|
SendDlgItemMessage(hwndDlg, COMBO_FILTER, CB_SETCURSEL, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks what ListView line was selected and shows the dialog
|
||||||
|
* that prompts the user to enter a hotkey.
|
||||||
|
**/
|
||||||
|
void AskForHotkey(HWND hwndListView)
|
||||||
|
{
|
||||||
|
int nSel = SendMessage(hwndListView, LVM_GETNEXTITEM, (WPARAM)-1, LVNI_SELECTED);
|
||||||
|
|
||||||
|
if (nSel != -1)
|
||||||
|
{
|
||||||
|
LVITEM lvi;
|
||||||
|
|
||||||
|
// Get the corresponding input
|
||||||
|
memset(&lvi, 0, sizeof(lvi));
|
||||||
|
lvi.mask = LVIF_PARAM;
|
||||||
|
lvi.iItem = nSel;
|
||||||
|
lvi.iSubItem = 0;
|
||||||
|
|
||||||
|
SendMessage(hwndListView, LVM_GETITEM, 0, (LPARAM)&lvi);
|
||||||
|
|
||||||
|
int nCmd = lvi.lParam;
|
||||||
|
|
||||||
|
int nRet = DialogBox(fceu_hInstance, "NEWINPUT", hwndListView, ChangeInputDialogProc);
|
||||||
|
|
||||||
|
if (nRet)
|
||||||
|
{
|
||||||
|
// nRet will be -1 when the user selects "clear".
|
||||||
|
FCEUD_CommandMapping[nCmd] = ( nRet < 0) ? 0 : nRet;
|
||||||
|
|
||||||
|
memset(&lvi, 0, sizeof(lvi));
|
||||||
|
lvi.mask = LVIF_TEXT;
|
||||||
|
lvi.iItem = nSel;
|
||||||
|
lvi.iSubItem = 2;
|
||||||
|
lvi.pszText = GetKeyComboName(FCEUD_CommandMapping[nCmd]);
|
||||||
|
|
||||||
|
SendMessage(hwndListView, LVM_SETITEM, (WPARAM)0, (LPARAM)&lvi);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Restores the default hotkey mapping.
|
||||||
|
**/
|
||||||
|
void ApplyDefaultCommandMapping()
|
||||||
|
{
|
||||||
|
memset(FCEUD_CommandMapping, 0, sizeof(FCEUD_CommandMapping));
|
||||||
|
|
||||||
|
for(unsigned i = 0; i < NUM_DEFAULT_MAPPINGS; ++i)
|
||||||
|
{
|
||||||
|
FCEUD_CommandMapping[DefaultCommandMapping[i].cmd] = DefaultCommandMapping[i].key;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Callback function of the Map Input dialog
|
||||||
|
**/
|
||||||
|
BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
|
{
|
||||||
|
switch(uMsg)
|
||||||
|
{
|
||||||
|
case WM_INITDIALOG:
|
||||||
|
{
|
||||||
|
HWND hwndListView = InitializeListView(hwndDlg);
|
||||||
|
|
||||||
|
InitFilterComboBox(hwndDlg);
|
||||||
|
|
||||||
// Now populate the mapping display.
|
// Now populate the mapping display.
|
||||||
PopulateMappingDisplay(hwndDlg);
|
PopulateMappingDisplay(hwndDlg);
|
||||||
|
@ -470,10 +683,13 @@ static BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
|
||||||
// Autosize last column.
|
// Autosize last column.
|
||||||
SendMessage(hwndListView, LVM_SETCOLUMNWIDTH, (WPARAM)2, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
|
SendMessage(hwndListView, LVM_SETCOLUMNWIDTH, (WPARAM)2, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
|
||||||
|
|
||||||
|
CenterWindowOnScreen(hwndDlg);
|
||||||
}
|
}
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
case WM_COMMAND:
|
case WM_COMMAND:
|
||||||
|
|
||||||
if(HIWORD(wParam) == CBN_SELCHANGE)
|
if(HIWORD(wParam) == CBN_SELCHANGE)
|
||||||
{
|
{
|
||||||
PopulateMappingDisplay(hwndDlg);
|
PopulateMappingDisplay(hwndDlg);
|
||||||
|
@ -490,7 +706,7 @@ static BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
|
||||||
EndDialog(hwndDlg, 0);
|
EndDialog(hwndDlg, 0);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
case 200:
|
case BTN_RESTORE_DEFAULTS:
|
||||||
ApplyDefaultCommandMapping();
|
ApplyDefaultCommandMapping();
|
||||||
PopulateMappingDisplay(hwndDlg);
|
PopulateMappingDisplay(hwndDlg);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -501,45 +717,25 @@ static BOOL CALLBACK MapInputDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_NOTIFY:
|
case WM_NOTIFY:
|
||||||
|
|
||||||
switch(LOWORD(wParam))
|
switch(LOWORD(wParam))
|
||||||
{
|
{
|
||||||
case 1003:
|
case LV_MAPPING:
|
||||||
if (lParam)
|
if (lParam)
|
||||||
{
|
{
|
||||||
HWND hwndListView = GetDlgItem(hwndDlg, 1003);
|
|
||||||
NMHDR* pnm = (NMHDR*)lParam;
|
NMHDR* pnm = (NMHDR*)lParam;
|
||||||
|
|
||||||
if (pnm->code == LVN_ITEMACTIVATE)
|
if (pnm->code == LVN_ITEMACTIVATE)
|
||||||
{
|
{
|
||||||
int nSel = SendMessage(hwndListView, LVM_GETNEXTITEM, (WPARAM)-1, LVNI_SELECTED);
|
HWND hwndListView = GetDlgItem(hwndDlg, LV_MAPPING);
|
||||||
if (nSel != -1)
|
|
||||||
{
|
|
||||||
int nCmd;
|
|
||||||
int nRet;
|
|
||||||
LVITEM lvi;
|
|
||||||
|
|
||||||
// Get the corresponding input
|
AskForHotkey(hwndListView);
|
||||||
memset(&lvi, 0, sizeof(lvi));
|
|
||||||
lvi.mask = LVIF_PARAM;
|
|
||||||
lvi.iItem = nSel;
|
|
||||||
lvi.iSubItem = 0;
|
|
||||||
SendMessage(hwndListView, LVM_GETITEM, 0, (LPARAM)&lvi);
|
|
||||||
nCmd = lvi.lParam;
|
|
||||||
|
|
||||||
nRet = DialogBox(fceu_hInstance,"NEWINPUT",hwndListView,ChangeInputDialogProc);
|
// TODO: Only redraw if Conflicts filter
|
||||||
if (nRet)
|
// is active.
|
||||||
{
|
PopulateMappingDisplay(hwndDlg);
|
||||||
// nRet will be -1 when the user selects "clear".
|
}
|
||||||
FCEUD_CommandMapping[nCmd] = (nRet<0) ? 0 : nRet;
|
|
||||||
|
|
||||||
memset(&lvi, 0, sizeof(lvi));
|
|
||||||
lvi.mask = LVIF_TEXT;
|
|
||||||
lvi.iItem = nSel;
|
|
||||||
lvi.iSubItem = 2;
|
|
||||||
lvi.pszText = GetKeyComboName(FCEUD_CommandMapping[nCmd]);
|
|
||||||
SendMessage(hwndListView, LVM_SETITEM, (WPARAM)0, (LPARAM)&lvi);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Binary file not shown.
|
@ -41,6 +41,8 @@
|
||||||
#define MENU_RESET 200
|
#define MENU_RESET 200
|
||||||
#define BUTTON_CHEATS 200
|
#define BUTTON_CHEATS 200
|
||||||
#define TXT_PAD1 200
|
#define TXT_PAD1 200
|
||||||
|
#define BTN_RESTORE_DEFAULTS 200
|
||||||
|
#define BTN_CLEAR 200
|
||||||
#define MENU_POWER 201
|
#define MENU_POWER 201
|
||||||
#define TXT_PAD2 201
|
#define TXT_PAD2 201
|
||||||
#define MENU_EJECT_DISK 202
|
#define MENU_EJECT_DISK 202
|
||||||
|
@ -49,6 +51,7 @@
|
||||||
#define MENU_INSERT_COIN 204
|
#define MENU_INSERT_COIN 204
|
||||||
#define MENU_HIDE_MENU 300
|
#define MENU_HIDE_MENU 300
|
||||||
#define CHECK_SCREENSHOT_NAMES 300
|
#define CHECK_SCREENSHOT_NAMES 300
|
||||||
|
#define COMBO_FILTER 300
|
||||||
#define MENU_RUN_IN_BACKGROUND 301
|
#define MENU_RUN_IN_BACKGROUND 301
|
||||||
#define MENU_BACKGROUND_INPUT 302
|
#define MENU_BACKGROUND_INPUT 302
|
||||||
#define MENU_SHOW_STATUS_ICON 303
|
#define MENU_SHOW_STATUS_ICON 303
|
||||||
|
@ -62,6 +65,7 @@
|
||||||
#define GUI_BOT_B_1 1001
|
#define GUI_BOT_B_1 1001
|
||||||
#define GUI_BOT_SELECT_1 1002
|
#define GUI_BOT_SELECT_1 1002
|
||||||
#define GUI_BOT_START_1 1003
|
#define GUI_BOT_START_1 1003
|
||||||
|
#define LV_MAPPING 1003
|
||||||
#define GUI_BOT_UP_1 1004
|
#define GUI_BOT_UP_1 1004
|
||||||
#define GUI_BOT_DOWN_1 1005
|
#define GUI_BOT_DOWN_1 1005
|
||||||
#define GUI_BOT_LEFT_1 1006
|
#define GUI_BOT_LEFT_1 1006
|
||||||
|
|
Loading…
Reference in New Issue