From b897cc0b3385bb24c402e4212339508bbc55b147 Mon Sep 17 00:00:00 2001
From: mauzus <mauzus@users.sf.net>
Date: Tue, 13 May 2008 03:43:12 +0000
Subject: [PATCH] added option to enable/disable L+R/U+D

---
 src/drivers/win/input.cpp  |  19 +++++++++++++++++++
 src/drivers/win/res.rc     | Bin 145562 -> 145576 bytes
 src/drivers/win/resource.h |   1 +
 3 files changed, 20 insertions(+)

diff --git a/src/drivers/win/input.cpp b/src/drivers/win/input.cpp
index ed7cbe4b..1f6d35b8 100644
--- a/src/drivers/win/input.cpp
+++ b/src/drivers/win/input.cpp
@@ -136,6 +136,7 @@ static int DIPS=0;
 //#define KEY(__a) keys_nr[MKK(__a)]
 
 int cidisabled=0;
+static int disableUDLR=0;
 
 #define MK(x)   {{BUTTC_KEYBOARD},{0},{MKK(x)},1}
 #define MC(x)   {{BUTTC_KEYBOARD},{0},{x},1}
@@ -220,6 +221,16 @@ void UpdateGamepad()
    if(DTestButton(&GamePadConfig[wg][x]))
     JS|=(1<<x)<<(wg<<3);
 
+  // Check if U+D/L+R is disabled
+  if(disableUDLR)
+  {
+	  for(x=0;x<32;x+=8)
+	  {
+	   if((JS & (0xC0<<x) ) == (0xC0<<x) ) JS&=~(0xC0<<x);
+	   if((JS & (0x30<<x) ) == (0x30<<x) ) JS&=~(0x30<<x);
+	  }
+  }
+
 //  if(rapidAlternator)
    for(x=0;x<2;x++)
      if(DTestButton(&GamePadConfig[wg][8+x]))
@@ -1034,6 +1045,8 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 		switch(uMsg)
 		{
 			case WM_INITDIALOG:     
+				// Update the disable UDLR checkbox based on the current value
+				CheckDlgButton(hwndDlg,BTN_DISABLE_LRUD,disableUDLR?BST_CHECKED:BST_UNCHECKED);
 
 				// Add the help text
 				SetDlgItemText(hwndDlg, LBL_INPUT_HELP, "Select the device you want to be enabled on input ports 1 and 2, and the Famicom expansion port.  You may configure the device listed above each drop-down list by pressing \"Configure\", if applicable.  The device currently being emulated on the each port is listed above the drop down list; loading certain games will override your settings, but only temporarily.  If you select a device to be on the emulated Famicom Expansion Port, you should probably have emulated gamepads on the emulated NES-style input ports.");
@@ -1151,6 +1164,12 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 				EndDialog(hwndDlg, 0);
 
 			case WM_COMMAND:
+				// Handle disable UD/LR option
+				if(HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == BTN_DISABLE_LRUD)
+				{
+					FCEU_printf("Disable UDLR toggled\n");
+					disableUDLR = !disableUDLR;
+				}
 
 				if(HIWORD(wParam) == CBN_SELENDOK)
 				{
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index a44f53c94adf6d8ca41502bd8e03041b90605525..43c44e7179001a229635c02f445ae071f07d9e83 100644
GIT binary patch
delta 129
zcmbRBkz>V2jtyI8a~d-kGUzavFqlmaj5MD7VYU;eDVm6xs0mPo8G{j!G-5D^$xe6N
z!)QF&;FG}QUvq?5oftwG{3d_w7H0Qh2x16jaGA{59VloCR&2-sq0JeLn;YkDZ=B00
GIU4{xA|j0d

delta 144
zcmZ4Skz>|JjtyI8a~d&NFz7ItG8j${j5MD7VYU;e37UwRs0mPo8G{j!Gy>8v^^Chk
zCp*~6P1ZQbH~G&TAwf?D7Y1jBcp&y*a0QaylMR0c^MiEgFc>meGJs4mpWNsrI=x{o
VqtbMRpNwqHr{-=yHJ9<;EC3{JC_DfF

diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h
index ddd821c3..518fe485 100644
--- a/src/drivers/win/resource.h
+++ b/src/drivers/win/resource.h
@@ -210,6 +210,7 @@
 #define GUI_BOT_TITLEL6                 1113
 #define GUI_BOT_COUNTERS                1114
 #define IDC_CHECK1                      1117
+#define BTN_DISABLE_LRUD                1117
 #define IDC_BUTTON2                     1119
 #define IDC_BUTTON3                     1120
 #define IDC_BUTTON4                     1121