From 34dbd80dab8119a0c82f134595843747294f23cf Mon Sep 17 00:00:00 2001 From: spacy51 Date: Wed, 9 Jan 2008 14:06:52 +0000 Subject: [PATCH] MODIFIED: Input setup dialog ADDED: Clear all keys --- res/todo.txt | 3 +++ src/win32/Joypad.cpp | 49 ++++++++++++++++++++++----------- src/win32/Joypad.h | 7 +---- src/win32/VBA.rc | 64 ++++++++++++++++++++++---------------------- src/win32/resource.h | 4 ++- 5 files changed, 72 insertions(+), 55 deletions(-) diff --git a/res/todo.txt b/res/todo.txt index 7dd5b1c2..eadbb4f6 100644 --- a/res/todo.txt +++ b/res/todo.txt @@ -1,4 +1,7 @@ Important: +- HQ3x/4x ASM implementation produces wrong interpolation on the image's border + - This has already been fixed in the C version; look at hq_base.h / line 343 - 372. The ASM version most likely only has something like skipLine instead of skipLinePlus and skipLineMinus, which is however necessary in order to work correctly. + Unimportant: - DDraw, D3D, OGL: Add full screen device & frequency selection diff --git a/src/win32/Joypad.cpp b/src/win32/Joypad.cpp index 46deeb95..89b81672 100644 --- a/src/win32/Joypad.cpp +++ b/src/win32/Joypad.cpp @@ -62,7 +62,7 @@ CString GetKeyListName(KeyList& Keys) { txtKeys+=theApp.input->getKeyName(Keys.GetNext(p)); if (p!=NULL) - txtKeys+=", "; + txtKeys+=_T(", "); } return txtKeys; } @@ -90,9 +90,6 @@ JoypadEditControl::~JoypadEditControl() BEGIN_MESSAGE_MAP(JoypadEditControl, CEdit) - //{{AFX_MSG_MAP(JoypadEditControl) - ON_WM_CHAR() - //}}AFX_MSG_MAP ON_MESSAGE(JOYCONFIG_MESSAGE, OnJoyConfig) END_MESSAGE_MAP() @@ -100,10 +97,6 @@ BEGIN_MESSAGE_MAP(JoypadEditControl, CEdit) // JoypadEditControl message handlers -void JoypadEditControl::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) -{ -} - LRESULT JoypadEditControl::OnJoyConfig(WPARAM wParam, LPARAM lParam) { AssignKey(m_Keys, ((wParam<<8)|lParam)); @@ -165,6 +158,7 @@ BEGIN_MESSAGE_MAP(JoypadConfig, CDialog) ON_WM_TIMER() ON_WM_KEYDOWN() ON_BN_CLICKED(IDC_APPENDMODE, &JoypadConfig::OnBnClickedAppendmode) + ON_BN_CLICKED(IDC_CLEAR_ALL, &JoypadConfig::OnBnClickedClearAll) END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// @@ -213,10 +207,6 @@ void JoypadConfig::OnTimer(UINT_PTR nIDEvent) CDialog::OnTimer(nIDEvent); } -void JoypadConfig::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) -{ -} - BOOL JoypadConfig::OnInitDialog() { CDialog::OnInitDialog(); @@ -387,10 +377,6 @@ BOOL MotionConfig::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE } -void MotionConfig::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) -{ -} - void MotionConfig::OnTimer(UINT_PTR nIDEvent) { theApp.input->checkDevices(); @@ -433,3 +419,34 @@ void MotionConfig::OnBnClickedAppendmode() { bAppendMode = (::SendMessage(GetDlgItem(IDC_APPENDMODE)->GetSafeHwnd(), BM_GETCHECK, 0, 0L) != 0); } + +void JoypadConfig::OnBnClickedClearAll() +{ + up.m_Keys.RemoveAll(); + speed.m_Keys.RemoveAll(); + right.m_Keys.RemoveAll(); + left.m_Keys.RemoveAll(); + down.m_Keys.RemoveAll(); + capture.m_Keys.RemoveAll(); + buttonStart.m_Keys.RemoveAll(); + buttonSelect.m_Keys.RemoveAll(); + buttonR.m_Keys.RemoveAll(); + buttonL.m_Keys.RemoveAll(); + buttonGS.m_Keys.RemoveAll(); + buttonB.m_Keys.RemoveAll(); + buttonA.m_Keys.RemoveAll(); + + up.SetWindowText( _T("") ); + speed.SetWindowText( _T("") ); + right.SetWindowText( _T("") ); + left.SetWindowText( _T("") ); + down.SetWindowText( _T("") ); + capture.SetWindowText( _T("") ); + buttonStart.SetWindowText( _T("") ); + buttonSelect.SetWindowText( _T("") ); + buttonR.SetWindowText( _T("") ); + buttonL.SetWindowText( _T("") ); + buttonGS.SetWindowText( _T("") ); + buttonB.SetWindowText( _T("") ); + buttonA.SetWindowText( _T("") ); +} diff --git a/src/win32/Joypad.h b/src/win32/Joypad.h index 141a0fae..769ec937 100644 --- a/src/win32/Joypad.h +++ b/src/win32/Joypad.h @@ -58,10 +58,6 @@ public: // Generated message map functions protected: - //{{AFX_MSG(JoypadEditControl) - afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() }; @@ -116,12 +112,12 @@ class JoypadConfig : public CDialog afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnDestroy(); afx_msg void OnTimer(UINT_PTR nIDEvent); - afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); virtual BOOL OnInitDialog(); //}}AFX_MSG DECLARE_MESSAGE_MAP() public: afx_msg void OnBnClickedAppendmode(); + afx_msg void OnBnClickedClearAll(); }; ///////////////////////////////////////////////////////////////////////////// // MotionConfig dialog @@ -161,7 +157,6 @@ class MotionConfig : public CDialog afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnDestroy(); virtual BOOL OnInitDialog(); - afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnTimer(UINT_PTR nIDEvent); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index fa04adc6..2a65e3d7 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -183,41 +183,41 @@ BEGIN "Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,234,90,24 END -IDD_CONFIG DIALOGEX 0, 0, 354, 119 +IDD_CONFIG DIALOGEX 0, 0, 448, 102 STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Joypad configuration" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN RTEXT "Up",IDC_STATIC,6,6,36,12 - EDITTEXT IDC_EDIT_UP,48,6,126,12,ES_AUTOHSCROLL - RTEXT "Down",IDC_STATIC,6,18,36,12 - EDITTEXT IDC_EDIT_DOWN,48,18,126,12,ES_AUTOHSCROLL - RTEXT "Left",IDC_STATIC,6,30,36,12 - EDITTEXT IDC_EDIT_LEFT,48,30,126,12,ES_AUTOHSCROLL - RTEXT "Right",IDC_STATIC,6,42,36,12 - EDITTEXT IDC_EDIT_RIGHT,48,42,126,12,ES_AUTOHSCROLL - RTEXT "A",IDC_STATIC,180,6,36,12 - EDITTEXT IDC_EDIT_BUTTON_A,222,6,126,12,ES_AUTOHSCROLL - RTEXT "B",IDC_STATIC,180,18,36,12 - EDITTEXT IDC_EDIT_BUTTON_B,222,18,126,12,ES_AUTOHSCROLL - RTEXT "L",IDC_STATIC,180,30,36,12 - EDITTEXT IDC_EDIT_BUTTON_L,222,30,126,12,ES_AUTOHSCROLL - RTEXT "R",IDC_STATIC,180,42,36,12 - EDITTEXT IDC_EDIT_BUTTON_R,222,42,126,12,ES_AUTOHSCROLL - RTEXT "Select",IDC_STATIC,180,60,36,12 - EDITTEXT IDC_EDIT_BUTTON_SELECT,222,60,126,12,ES_AUTOHSCROLL - RTEXT "Start",IDC_STATIC,180,72,36,12 - EDITTEXT IDC_EDIT_BUTTON_START,222,72,126,12,ES_AUTOHSCROLL - RTEXT "Speed Up",IDC_STATIC,6,60,36,12 - EDITTEXT IDC_EDIT_SPEED,48,60,126,12,ES_AUTOHSCROLL - RTEXT "Screenshot",IDC_STATIC,6,72,36,12 - EDITTEXT IDC_EDIT_CAPTURE,48,72,126,12,ES_AUTOHSCROLL - RTEXT "GS",IDC_STATIC,6,84,36,12 - EDITTEXT IDC_EDIT_BUTTON_GS,48,84,126,12,ES_AUTOHSCROLL - CONTROL "Assign additional keys to functions",IDC_APPENDMODE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,102,126,12 - DEFPUSHBUTTON "OK",ID_OK,258,96,42,18 - PUSHBUTTON "Cancel",ID_CANCEL,306,96,42,18 + EDITTEXT IDC_EDIT_UP,48,6,96,12,ES_AUTOHSCROLL + RTEXT "Down",IDC_STATIC,6,24,36,12 + EDITTEXT IDC_EDIT_DOWN,48,24,96,12,ES_AUTOHSCROLL + RTEXT "Left",IDC_STATIC,6,42,36,12 + EDITTEXT IDC_EDIT_LEFT,48,42,96,12,ES_AUTOHSCROLL + RTEXT "Right",IDC_STATIC,6,60,36,12 + EDITTEXT IDC_EDIT_RIGHT,48,60,96,12,ES_AUTOHSCROLL + RTEXT "A",IDC_STATIC,156,6,36,12 + EDITTEXT IDC_EDIT_BUTTON_A,198,6,96,12,ES_AUTOHSCROLL + RTEXT "B",IDC_STATIC,156,24,36,12 + EDITTEXT IDC_EDIT_BUTTON_B,198,24,96,12,ES_AUTOHSCROLL + RTEXT "L",IDC_STATIC,156,42,36,12 + EDITTEXT IDC_EDIT_BUTTON_L,198,42,96,12,ES_AUTOHSCROLL + RTEXT "R",IDC_STATIC,156,60,36,12 + EDITTEXT IDC_EDIT_BUTTON_R,198,60,96,12,ES_AUTOHSCROLL + RTEXT "Select",IDC_STATIC,6,84,36,12 + EDITTEXT IDC_EDIT_BUTTON_SELECT,48,84,96,12,ES_AUTOHSCROLL + RTEXT "Start",IDC_STATIC,156,84,36,12 + EDITTEXT IDC_EDIT_BUTTON_START,198,84,96,12,ES_AUTOHSCROLL + RTEXT "Speed Up",IDC_STATIC,306,6,36,12 + EDITTEXT IDC_EDIT_SPEED,348,6,96,12,ES_AUTOHSCROLL + RTEXT "Screenshot",IDC_STATIC,306,24,36,12 + EDITTEXT IDC_EDIT_CAPTURE,348,24,96,12,ES_AUTOHSCROLL + RTEXT "GS",IDC_STATIC,306,42,36,12 + EDITTEXT IDC_EDIT_BUTTON_GS,348,42,96,12,ES_AUTOHSCROLL + CONTROL "Multiple key assignments",IDC_APPENDMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,348,60,96,12 + DEFPUSHBUTTON "OK",ID_OK,348,78,48,18 + PUSHBUTTON "Cancel",ID_CANCEL,396,78,48,18 + PUSHBUTTON "Clear all",IDC_CLEAR_ALL,306,60,36,12 END IDD_CHEATS DIALOG 0, 0, 276, 253 @@ -1156,9 +1156,9 @@ BEGIN IDD_CONFIG, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 347 + RIGHTMARGIN, 441 TOPMARGIN, 7 - BOTTOMMARGIN, 112 + BOTTOMMARGIN, 95 END IDD_CHEATS, DIALOG diff --git a/src/win32/resource.h b/src/win32/resource.h index 7644e8af..795e5378 100644 --- a/src/win32/resource.h +++ b/src/win32/resource.h @@ -520,6 +520,8 @@ #define IDC_ENABLE_GBA_BIOS 1276 #define IDC_SELECT_GB_BIOS_PATH 1277 #define IDC_SELECT_GBA_BIOS_PATH 1278 +#define IDC_BUTTON1 1278 +#define IDC_CLEAR_ALL 1278 #define IDS_OAL_NODEVICE 2000 #define IDS_OAL_NODLL 2001 #define IDS_AVI_CANNOT_CREATE_AVI 2002 @@ -840,7 +842,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 162 #define _APS_NEXT_COMMAND_VALUE 40357 -#define _APS_NEXT_CONTROL_VALUE 1278 +#define _APS_NEXT_CONTROL_VALUE 1279 #define _APS_NEXT_SYMED_VALUE 103 #endif #endif