The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-12-27 03:01:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added "Keyboard & Mouse" and "Match Wii Controls" to control settings.

Browse Source 
Fixed shift key bug.
Keyboard and mouse aren't implemented in the menu yet, but work in-game.
This commit is contained in:
Carl.Kenner 2009-04-08 11:24:39 +00:00
parent 9ed52afbb7
commit 26f4dc1443
2 changed files with 92 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
source/ngc/menu.cpp
View File

@ -1978,6 +1978,35 @@ static int MenuSettingsMappings()
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
#ifdef HW_RVL
GuiText wiiControlsBtnTxt1("Match Wii", 24, (GXColor){0, 0, 0, 255});
#else
GuiText wiiControlsBtnTxt1("Match GC", 24, (GXColor){0, 0, 0, 255});
#endif
GuiText wiiControlsBtnTxt2("Controls", 18, (GXColor){0, 0, 0, 255});
char s[4];
if (GCSettings.WiiControls) sprintf(s, "ON");
else sprintf(s, "OFF");
GuiText wiiControlsBtnTxt3(s, 24, (GXColor){0, 0, 0, 255});
wiiControlsBtnTxt1.SetPosition(0, -20);
wiiControlsBtnTxt3.SetPosition(0, +20);
GuiImage wiiControlsBtnImg(&btnLargeOutline);
GuiImage wiiControlsBtnImgOver(&btnLargeOutlineOver);
GuiImage wiiControlsBtnIcon(&iconNunchuk);
GuiButton wiiControlsBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
wiiControlsBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
wiiControlsBtn.SetPosition(50, 120);
wiiControlsBtn.SetLabel(&wiiControlsBtnTxt1, 0);
wiiControlsBtn.SetLabel(&wiiControlsBtnTxt2, 1);
wiiControlsBtn.SetLabel(&wiiControlsBtnTxt3, 2);
wiiControlsBtn.SetImage(&wiiControlsBtnImg);
wiiControlsBtn.SetImageOver(&wiiControlsBtnImgOver);
wiiControlsBtn.SetIcon(&wiiControlsBtnIcon);
wiiControlsBtn.SetSoundOver(&btnSoundOver);
wiiControlsBtn.SetSoundClick(&btnSoundClick);
wiiControlsBtn.SetTrigger(&trigA);
wiiControlsBtn.SetEffectGrow();
GuiText gamecubeBtnTxt("GameCube Controller", 24, (GXColor){0, 0, 0, 255}); GuiText gamecubeBtnTxt("GameCube Controller", 24, (GXColor){0, 0, 0, 255});
gamecubeBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30); gamecubeBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
GuiImage gamecubeBtnImg(&btnLargeOutline); GuiImage gamecubeBtnImg(&btnLargeOutline);
@ -1985,7 +2014,7 @@ static int MenuSettingsMappings()
GuiImage gamecubeBtnIcon(&iconGamecube); GuiImage gamecubeBtnIcon(&iconGamecube);
GuiButton gamecubeBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); GuiButton gamecubeBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
gamecubeBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); gamecubeBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
gamecubeBtn.SetPosition(-125, 120); gamecubeBtn.SetPosition(0, 120);
gamecubeBtn.SetLabel(&gamecubeBtnTxt); gamecubeBtn.SetLabel(&gamecubeBtnTxt);
gamecubeBtn.SetImage(&gamecubeBtnImg); gamecubeBtn.SetImage(&gamecubeBtnImg);
gamecubeBtn.SetImageOver(&gamecubeBtnImgOver); gamecubeBtn.SetImageOver(&gamecubeBtnImgOver);
@ -2000,8 +2029,8 @@ static int MenuSettingsMappings()
GuiImage wiimoteBtnImgOver(&btnLargeOutlineOver); GuiImage wiimoteBtnImgOver(&btnLargeOutlineOver);
GuiImage wiimoteBtnIcon(&iconWiimote); GuiImage wiimoteBtnIcon(&iconWiimote);
GuiButton wiimoteBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); GuiButton wiimoteBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
wiimoteBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); wiimoteBtn.SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
wiimoteBtn.SetPosition(125, 120); wiimoteBtn.SetPosition(-50, 120);
wiimoteBtn.SetLabel(&wiimoteBtnTxt); wiimoteBtn.SetLabel(&wiimoteBtnTxt);
wiimoteBtn.SetImage(&wiimoteBtnImg); wiimoteBtn.SetImage(&wiimoteBtnImg);
wiimoteBtn.SetImageOver(&wiimoteBtnImgOver); wiimoteBtn.SetImageOver(&wiimoteBtnImgOver);
@ -2018,7 +2047,7 @@ static int MenuSettingsMappings()
GuiImage classicBtnIcon(&iconClassic); GuiImage classicBtnIcon(&iconClassic);
GuiButton classicBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); GuiButton classicBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
classicBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); classicBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
classicBtn.SetPosition(-125, 250); classicBtn.SetPosition(0, 250);
classicBtn.SetLabel(&classicBtnTxt); classicBtn.SetLabel(&classicBtnTxt);
classicBtn.SetImage(&classicBtnImg); classicBtn.SetImage(&classicBtnImg);
classicBtn.SetImageOver(&classicBtnImgOver); classicBtn.SetImageOver(&classicBtnImgOver);
@ -2028,6 +2057,28 @@ static int MenuSettingsMappings()
classicBtn.SetTrigger(&trigA); classicBtn.SetTrigger(&trigA);
classicBtn.SetEffectGrow(); classicBtn.SetEffectGrow();
GuiText keyboardBtnTxt1("Keyboard", 24, (GXColor){0, 0, 0, 255});
GuiText keyboardBtnTxt2("&", 18, (GXColor){0, 0, 0, 255});
GuiText keyboardBtnTxt3("Mouse", 24, (GXColor){0, 0, 0, 255});
keyboardBtnTxt1.SetPosition(0, -20);
keyboardBtnTxt3.SetPosition(0, +20);
GuiImage keyboardBtnImg(&btnLargeOutline);
GuiImage keyboardBtnImgOver(&btnLargeOutlineOver);
//GuiImage keyboardBtnIcon(&iconkeyboard);
GuiButton keyboardBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
keyboardBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
keyboardBtn.SetPosition(50, 250);
keyboardBtn.SetLabel(&keyboardBtnTxt1, 0);
keyboardBtn.SetLabel(&keyboardBtnTxt2, 1);
keyboardBtn.SetLabel(&keyboardBtnTxt3, 2);
keyboardBtn.SetImage(&keyboardBtnImg);
keyboardBtn.SetImageOver(&keyboardBtnImgOver);
//keyboardBtn.SetIcon(&keyboardBtnIcon);
keyboardBtn.SetSoundOver(&btnSoundOver);
keyboardBtn.SetSoundClick(&btnSoundClick);
keyboardBtn.SetTrigger(&trigA);
keyboardBtn.SetEffectGrow();
GuiText nunchukBtnTxt1("Wiimote", 24, (GXColor){0, 0, 0, 255}); GuiText nunchukBtnTxt1("Wiimote", 24, (GXColor){0, 0, 0, 255});
GuiText nunchukBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); GuiText nunchukBtnTxt2("&", 18, (GXColor){0, 0, 0, 255});
GuiText nunchukBtnTxt3("Nunchuk", 24, (GXColor){0, 0, 0, 255}); GuiText nunchukBtnTxt3("Nunchuk", 24, (GXColor){0, 0, 0, 255});
@ -2037,8 +2088,8 @@ static int MenuSettingsMappings()
GuiImage nunchukBtnImgOver(&btnLargeOutlineOver); GuiImage nunchukBtnImgOver(&btnLargeOutlineOver);
GuiImage nunchukBtnIcon(&iconNunchuk); GuiImage nunchukBtnIcon(&iconNunchuk);
GuiButton nunchukBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); GuiButton nunchukBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
nunchukBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); nunchukBtn.SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
nunchukBtn.SetPosition(125, 250); nunchukBtn.SetPosition(-50, 250);
nunchukBtn.SetLabel(&nunchukBtnTxt1, 0); nunchukBtn.SetLabel(&nunchukBtnTxt1, 0);
nunchukBtn.SetLabel(&nunchukBtnTxt2, 1); nunchukBtn.SetLabel(&nunchukBtnTxt2, 1);
nunchukBtn.SetLabel(&nunchukBtnTxt3, 2); nunchukBtn.SetLabel(&nunchukBtnTxt3, 2);
@ -2068,11 +2119,13 @@ static int MenuSettingsMappings()
GuiWindow w(screenwidth, screenheight); GuiWindow w(screenwidth, screenheight);
w.Append(&titleTxt); w.Append(&titleTxt);
w.Append(&wiiControlsBtn);
w.Append(&gamecubeBtn); w.Append(&gamecubeBtn);
#ifdef HW_RVL #ifdef HW_RVL
w.Append(&wiimoteBtn); w.Append(&wiimoteBtn);
w.Append(&nunchukBtn); w.Append(&nunchukBtn);
w.Append(&classicBtn); w.Append(&classicBtn);
w.Append(&keyboardBtn);
#endif #endif
w.Append(&backBtn); w.Append(&backBtn);
@ -2084,7 +2137,17 @@ static int MenuSettingsMappings()
{ {
VIDEO_WaitVSync (); VIDEO_WaitVSync ();
if(wiimoteBtn.GetState() == STATE_CLICKED) if(wiiControlsBtn.GetState() == STATE_CLICKED)
{
menu = MENU_SETTINGS_MAPPINGS;
GCSettings.WiiControls = !GCSettings.WiiControls;
}
else if(keyboardBtn.GetState() == STATE_CLICKED)
{
menu = MENU_SETTINGS_MAPPINGS_MAP;
mapMenuCtrl = CTRLR_KEYBOARD;
}
else if(wiimoteBtn.GetState() == STATE_CLICKED)
{ {
menu = MENU_SETTINGS_MAPPINGS_MAP; menu = MENU_SETTINGS_MAPPINGS_MAP;
mapMenuCtrl = CTRLR_WIIMOTE; mapMenuCtrl = CTRLR_WIIMOTE;
@ -2151,6 +2214,9 @@ ButtonMappingWindow()
sprintf(msg, "Press any button on the GameCube Controller now. Press the C-Stick in any direction to cancel."); sprintf(msg, "Press any button on the GameCube Controller now. Press the C-Stick in any direction to cancel.");
#endif #endif
break; break;
case CTRLR_KEYBOARD:
sprintf(msg, "Press any key or mouse button now. Press Esc or Home to cancel.");
break;
case CTRLR_WIIMOTE: case CTRLR_WIIMOTE:
sprintf(msg, "Press any button on the Wiimote now. Press Home to cancel."); sprintf(msg, "Press any button on the Wiimote now. Press Home to cancel.");
break; break;
@ -2197,6 +2263,18 @@ ButtonMappingWindow()
if(userInput[0].wpad.btns_d == WPAD_BUTTON_HOME) if(userInput[0].wpad.btns_d == WPAD_BUTTON_HOME)
pressed = WPAD_BUTTON_HOME; pressed = WPAD_BUTTON_HOME;
} }
else if(mapMenuCtrl == CTRLR_KEYBOARD)
{
pressed = 0;
for (int i=4; i<=234; i++) {
if (DownUsbKeys[i]) {
pressed = i;
break;
}
}
if(userInput[0].wpad.btns_d == WPAD_BUTTON_HOME)
pressed = KB_ESC;
}
else else
{ {
pressed = userInput[0].wpad.btns_d; pressed = userInput[0].wpad.btns_d;
@ -2214,8 +2292,8 @@ ButtonMappingWindow()
case CTRLR_CLASSIC: case CTRLR_CLASSIC:
if(userInput[0].wpad.exp.type != WPAD_EXP_CLASSIC) if(userInput[0].wpad.exp.type != WPAD_EXP_CLASSIC)
pressed = 0; // not a valid input pressed = 0; // not a valid input
else if(pressed <= 0x1000) //else if(pressed <= 0x1000)
pressed = 0; // not a valid input // pressed = 0; // not a valid input (says Tantric, I disagree)
break; break;
case CTRLR_NUNCHUK: case CTRLR_NUNCHUK:
@ -2227,8 +2305,10 @@ ButtonMappingWindow()
} }
} }
if(pressed == WPAD_BUTTON_HOME if(mapMenuCtrl == CTRLR_KEYBOARD) {
|| pressed == WPAD_CLASSIC_BUTTON_HOME) if (pressed == KB_ESC)
pressed = 0;
} else if(pressed == WPAD_BUTTON_HOME || pressed == WPAD_CLASSIC_BUTTON_HOME)
pressed = 0; pressed = 0;
HaltGui(); HaltGui();

1
source/ngc/wiiusbsupport.cpp
View File

@ -167,6 +167,7 @@ s32 KeyboardCallback(int ret,void * none)
// Update old keys, unless too many keys were held down // Update old keys, unless too many keys were held down
if (KeyData.keys[0]!=1) if (KeyData.keys[0]!=1)
memcpy(OldKeys, KeyData.keys, 6); memcpy(OldKeys, KeyData.keys, 6);
OldShiftKeys = DownUsbShiftKeys;
} }
// no keyboard message // no keyboard message