ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MODIFIED: Input setup dialog 

ADDED: Clear all keys
This commit is contained in:
spacy51 2008-01-09 14:06:52 +00:00
parent 0513b50156
commit 34dbd80dab
5 changed files with 72 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/todo.txt
View File

@ -1,4 +1,7 @@
Important: 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: Unimportant:
- DDraw, D3D, OGL: Add full screen device & frequency selection - DDraw, D3D, OGL: Add full screen device & frequency selection

49
src/win32/Joypad.cpp
View File

@ -62,7 +62,7 @@ CString GetKeyListName(KeyList& Keys)
{ {
txtKeys+=theApp.input->getKeyName(Keys.GetNext(p)); txtKeys+=theApp.input->getKeyName(Keys.GetNext(p));
if (p!=NULL) if (p!=NULL)
txtKeys+=", "; txtKeys+=_T(", ");
} }
return txtKeys; return txtKeys;
} }
@ -90,9 +90,6 @@ JoypadEditControl::~JoypadEditControl()
BEGIN_MESSAGE_MAP(JoypadEditControl, CEdit) BEGIN_MESSAGE_MAP(JoypadEditControl, CEdit)
//{{AFX_MSG_MAP(JoypadEditControl)
ON_WM_CHAR()
//}}AFX_MSG_MAP
ON_MESSAGE(JOYCONFIG_MESSAGE, OnJoyConfig) ON_MESSAGE(JOYCONFIG_MESSAGE, OnJoyConfig)
END_MESSAGE_MAP() END_MESSAGE_MAP()
@ -100,10 +97,6 @@ BEGIN_MESSAGE_MAP(JoypadEditControl, CEdit)
// JoypadEditControl message handlers // JoypadEditControl message handlers
void JoypadEditControl::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags)
{
}
LRESULT JoypadEditControl::OnJoyConfig(WPARAM wParam, LPARAM lParam) LRESULT JoypadEditControl::OnJoyConfig(WPARAM wParam, LPARAM lParam)
{ {
AssignKey(m_Keys, ((wParam<<8)|lParam)); AssignKey(m_Keys, ((wParam<<8)|lParam));
@ -165,6 +158,7 @@ BEGIN_MESSAGE_MAP(JoypadConfig, CDialog)
ON_WM_TIMER() ON_WM_TIMER()
ON_WM_KEYDOWN() ON_WM_KEYDOWN()
ON_BN_CLICKED(IDC_APPENDMODE, &JoypadConfig::OnBnClickedAppendmode) ON_BN_CLICKED(IDC_APPENDMODE, &JoypadConfig::OnBnClickedAppendmode)
ON_BN_CLICKED(IDC_CLEAR_ALL, &JoypadConfig::OnBnClickedClearAll)
END_MESSAGE_MAP() END_MESSAGE_MAP()
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -213,10 +207,6 @@ void JoypadConfig::OnTimer(UINT_PTR nIDEvent)
CDialog::OnTimer(nIDEvent); CDialog::OnTimer(nIDEvent);
} }
void JoypadConfig::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
{
}
BOOL JoypadConfig::OnInitDialog() BOOL JoypadConfig::OnInitDialog()
{ {
CDialog::OnInitDialog(); CDialog::OnInitDialog();
@ -387,10 +377,6 @@ BOOL MotionConfig::OnInitDialog()
// EXCEPTION: OCX Property Pages should return FALSE // EXCEPTION: OCX Property Pages should return FALSE
} }
void MotionConfig::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
{
}
void MotionConfig::OnTimer(UINT_PTR nIDEvent) void MotionConfig::OnTimer(UINT_PTR nIDEvent)
{ {
theApp.input->checkDevices(); theApp.input->checkDevices();
@ -433,3 +419,34 @@ void MotionConfig::OnBnClickedAppendmode()
{ {
bAppendMode = (::SendMessage(GetDlgItem(IDC_APPENDMODE)->GetSafeHwnd(), BM_GETCHECK, 0, 0L) != 0); 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("") );
}

7
src/win32/Joypad.h
View File

@ -58,10 +58,6 @@ public:
// Generated message map functions // Generated message map functions
protected: protected:
//{{AFX_MSG(JoypadEditControl)
afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
//}}AFX_MSG
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()
}; };
@ -116,12 +112,12 @@ class JoypadConfig : public CDialog
afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
afx_msg void OnDestroy(); afx_msg void OnDestroy();
afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
virtual BOOL OnInitDialog(); virtual BOOL OnInitDialog();
//}}AFX_MSG //}}AFX_MSG
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()
public: public:
afx_msg void OnBnClickedAppendmode(); afx_msg void OnBnClickedAppendmode();
afx_msg void OnBnClickedClearAll();
}; };
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// MotionConfig dialog // MotionConfig dialog
@ -161,7 +157,6 @@ class MotionConfig : public CDialog
afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
afx_msg void OnDestroy(); afx_msg void OnDestroy();
virtual BOOL OnInitDialog(); virtual BOOL OnInitDialog();
afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnTimer(UINT_PTR nIDEvent);
//}}AFX_MSG //}}AFX_MSG
DECLARE_MESSAGE_MAP() DECLARE_MESSAGE_MAP()

64
src/win32/VBA.rc
View File

@ -183,41 +183,41 @@ BEGIN
"Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,234,90,24 "Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,234,90,24
END 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 STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Joypad configuration" CAPTION "Joypad configuration"
FONT 8, "MS Sans Serif", 0, 0, 0x0 FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN BEGIN
RTEXT "Up",IDC_STATIC,6,6,36,12 RTEXT "Up",IDC_STATIC,6,6,36,12
EDITTEXT IDC_EDIT_UP,48,6,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_UP,48,6,96,12,ES_AUTOHSCROLL
RTEXT "Down",IDC_STATIC,6,18,36,12 RTEXT "Down",IDC_STATIC,6,24,36,12
EDITTEXT IDC_EDIT_DOWN,48,18,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_DOWN,48,24,96,12,ES_AUTOHSCROLL
RTEXT "Left",IDC_STATIC,6,30,36,12 RTEXT "Left",IDC_STATIC,6,42,36,12
EDITTEXT IDC_EDIT_LEFT,48,30,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_LEFT,48,42,96,12,ES_AUTOHSCROLL
RTEXT "Right",IDC_STATIC,6,42,36,12 RTEXT "Right",IDC_STATIC,6,60,36,12
EDITTEXT IDC_EDIT_RIGHT,48,42,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_RIGHT,48,60,96,12,ES_AUTOHSCROLL
RTEXT "A",IDC_STATIC,180,6,36,12 RTEXT "A",IDC_STATIC,156,6,36,12
EDITTEXT IDC_EDIT_BUTTON_A,222,6,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_BUTTON_A,198,6,96,12,ES_AUTOHSCROLL
RTEXT "B",IDC_STATIC,180,18,36,12 RTEXT "B",IDC_STATIC,156,24,36,12
EDITTEXT IDC_EDIT_BUTTON_B,222,18,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_BUTTON_B,198,24,96,12,ES_AUTOHSCROLL
RTEXT "L",IDC_STATIC,180,30,36,12 RTEXT "L",IDC_STATIC,156,42,36,12
EDITTEXT IDC_EDIT_BUTTON_L,222,30,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_BUTTON_L,198,42,96,12,ES_AUTOHSCROLL
RTEXT "R",IDC_STATIC,180,42,36,12 RTEXT "R",IDC_STATIC,156,60,36,12
EDITTEXT IDC_EDIT_BUTTON_R,222,42,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_BUTTON_R,198,60,96,12,ES_AUTOHSCROLL
RTEXT "Select",IDC_STATIC,180,60,36,12 RTEXT "Select",IDC_STATIC,6,84,36,12
EDITTEXT IDC_EDIT_BUTTON_SELECT,222,60,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_BUTTON_SELECT,48,84,96,12,ES_AUTOHSCROLL
RTEXT "Start",IDC_STATIC,180,72,36,12 RTEXT "Start",IDC_STATIC,156,84,36,12
EDITTEXT IDC_EDIT_BUTTON_START,222,72,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_BUTTON_START,198,84,96,12,ES_AUTOHSCROLL
RTEXT "Speed Up",IDC_STATIC,6,60,36,12 RTEXT "Speed Up",IDC_STATIC,306,6,36,12
EDITTEXT IDC_EDIT_SPEED,48,60,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_SPEED,348,6,96,12,ES_AUTOHSCROLL
RTEXT "Screenshot",IDC_STATIC,6,72,36,12 RTEXT "Screenshot",IDC_STATIC,306,24,36,12
EDITTEXT IDC_EDIT_CAPTURE,48,72,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_CAPTURE,348,24,96,12,ES_AUTOHSCROLL
RTEXT "GS",IDC_STATIC,6,84,36,12 RTEXT "GS",IDC_STATIC,306,42,36,12
EDITTEXT IDC_EDIT_BUTTON_GS,48,84,126,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_BUTTON_GS,348,42,96,12,ES_AUTOHSCROLL
CONTROL "Assign additional keys to functions",IDC_APPENDMODE, CONTROL "Multiple key assignments",IDC_APPENDMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,348,60,96,12
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,102,126,12 DEFPUSHBUTTON "OK",ID_OK,348,78,48,18
DEFPUSHBUTTON "OK",ID_OK,258,96,42,18 PUSHBUTTON "Cancel",ID_CANCEL,396,78,48,18
PUSHBUTTON "Cancel",ID_CANCEL,306,96,42,18 PUSHBUTTON "Clear all",IDC_CLEAR_ALL,306,60,36,12
END END
IDD_CHEATS DIALOG 0, 0, 276, 253 IDD_CHEATS DIALOG 0, 0, 276, 253
@ -1156,9 +1156,9 @@ BEGIN
IDD_CONFIG, DIALOG IDD_CONFIG, DIALOG
BEGIN BEGIN
LEFTMARGIN, 7 LEFTMARGIN, 7
RIGHTMARGIN, 347 RIGHTMARGIN, 441
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 112 BOTTOMMARGIN, 95
END END
IDD_CHEATS, DIALOG IDD_CHEATS, DIALOG

4
src/win32/resource.h
View File

@ -520,6 +520,8 @@
#define IDC_ENABLE_GBA_BIOS 1276 #define IDC_ENABLE_GBA_BIOS 1276
#define IDC_SELECT_GB_BIOS_PATH 1277 #define IDC_SELECT_GB_BIOS_PATH 1277
#define IDC_SELECT_GBA_BIOS_PATH 1278 #define IDC_SELECT_GBA_BIOS_PATH 1278
#define IDC_BUTTON1 1278
#define IDC_CLEAR_ALL 1278
#define IDS_OAL_NODEVICE 2000 #define IDS_OAL_NODEVICE 2000
#define IDS_OAL_NODLL 2001 #define IDS_OAL_NODLL 2001
#define IDS_AVI_CANNOT_CREATE_AVI 2002 #define IDS_AVI_CANNOT_CREATE_AVI 2002
@ -840,7 +842,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 162 #define _APS_NEXT_RESOURCE_VALUE 162
#define _APS_NEXT_COMMAND_VALUE 40357 #define _APS_NEXT_COMMAND_VALUE 40357
#define _APS_NEXT_CONTROL_VALUE 1278 #define _APS_NEXT_CONTROL_VALUE 1279
#define _APS_NEXT_SYMED_VALUE 103 #define _APS_NEXT_SYMED_VALUE 103
#endif #endif
#endif #endif