forked from hrydgard/ppsspp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement on-screen touch combo keys.
Replace A,B,cross1,square1,triangle1 with number images 1-6 Rebuild the atlas, update the code to use combo keys 1-5 Also add psp_display.png from pull request hrydgard#8082.
- Loading branch information
1 parent
6a373fe
commit 14e7658
Showing
30 changed files
with
5,219 additions
and
4,581 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,201 @@ | ||
| // Copyright (c) 2013- PPSSPP Project. | ||
|
|
||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, version 2.0 or later versions. | ||
|
|
||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License 2.0 for more details. | ||
|
|
||
| // A copy of the GPL 2.0 should have been included with the program. | ||
| // If not, see http://www.gnu.org/licenses/ | ||
|
|
||
| // Official git repository and contact information can be found at | ||
| // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. | ||
|
|
||
| #include "TouchControlVisibilityScreen.h" | ||
| #include "Core/Config.h" | ||
| #include "UI/ui_atlas.h" | ||
| #include "i18n/i18n.h" | ||
| #include "ComboKeyMappingScreen.h" | ||
| #include "base/colorutil.h" | ||
| #include "base/display.h" | ||
| #include "base/timeutil.h" | ||
| #include "file/path.h" | ||
| #include "gfx_es2/draw_buffer.h" | ||
| #include "math/curves.h" | ||
| #include "base/stringutil.h" | ||
| #include "ui/ui_context.h" | ||
| #include "ui/view.h" | ||
| #include "ui/viewgroup.h" | ||
|
|
||
| void Combo_keyScreen::CreateViews() { | ||
| using namespace UI; | ||
| I18NCategory *co = GetI18NCategory("Controls"); | ||
| root_ = new LinearLayout(ORIENT_VERTICAL); | ||
| root_->Add(new ItemHeader(co->T("Combo Key Setting"))); | ||
| LinearLayout *root__ = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); | ||
| root_->Add(root__); | ||
| LinearLayout *leftColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(120, FILL_PARENT)); | ||
| I18NCategory *di = GetI18NCategory("Dialog"); | ||
|
|
||
| static const int comboKeyImages[5] = { | ||
| I_1, I_2, I_3, I_4, I_5, | ||
| }; | ||
|
|
||
| comboselect = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(10, 10, NONE, NONE)); | ||
| comboselect->SetSpacing(10); | ||
| for (int i = 0; i < 5; i++) { | ||
| comboselect->AddChoice(comboKeyImages[i]); | ||
| } | ||
| comboselect->SetSelection(*mode); | ||
| comboselect->OnChoice.Handle(this, &Combo_keyScreen::onCombo); | ||
| leftColumn->Add(comboselect); | ||
| root__->Add(leftColumn); | ||
| rightScroll_ = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)); | ||
| LinearLayout *rightColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)); | ||
| rightScroll_->Add(rightColumn); | ||
| leftColumn->Add(new Spacer(new LinearLayoutParams(1.0f))); | ||
| leftColumn->Add(new Choice(di->T("Back")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack); | ||
| root__->Add(rightScroll_); | ||
|
|
||
| const int cellSize = 400; | ||
|
|
||
| UI::GridLayoutSettings gridsettings(cellSize, 64, 5); | ||
| gridsettings.fillCells = true; | ||
| GridLayout *grid = rightColumn->Add(new GridLayout(gridsettings, new LayoutParams(FILL_PARENT, WRAP_CONTENT))); | ||
|
|
||
| memset(array, 0, sizeof(array)); | ||
| switch (*mode) { | ||
| case 0: | ||
| for (int i = 0; i < 16; i++) | ||
| array[i] = (0x01 == ((g_Config.iCombokey0 >> i) & 0x01)); | ||
| break; | ||
| case 1: | ||
| for (int i = 0; i < 16; i++) | ||
| array[i] = (0x01 == ((g_Config.iCombokey1 >> i) & 0x01)); | ||
| break; | ||
| case 2: | ||
| for (int i = 0; i < 16; i++) | ||
| array[i] = (0x01 == ((g_Config.iCombokey2 >> i) & 0x01)); | ||
| break; | ||
| case 3: | ||
| for (int i = 0; i < 16; i++) | ||
| array[i] = (0x01 == ((g_Config.iCombokey3 >> i) & 0x01)); | ||
| break; | ||
| case 4: | ||
| for (int i = 0; i < 16; i++) | ||
| array[i] = (0x01 == ((g_Config.iCombokey4 >> i) & 0x01)); | ||
| break; | ||
| } | ||
|
|
||
| std::map<std::string, int> keyImages; | ||
| keyImages["Circle"] = I_CIRCLE; | ||
| keyImages["Cross"] = I_CROSS; | ||
| keyImages["Square"] = I_SQUARE; | ||
| keyImages["Triangle"] = I_TRIANGLE; | ||
| keyImages["L"] = I_L; | ||
| keyImages["R"] = I_R; | ||
| keyImages["Start"] = I_START; | ||
| keyImages["Select"] = I_SELECT; | ||
| keyToggles["Circle"] = &array[13]; | ||
| keyToggles["Cross"] = &array[14]; | ||
| keyToggles["Square"] = &array[15]; | ||
| keyToggles["Triangle"] = &array[12]; | ||
| keyToggles["L"] = &array[8]; | ||
| keyToggles["R"] = &array[9]; | ||
| keyToggles[co->T("Left")] = &array[7]; | ||
| keyToggles[co->T("Up")] = &array[4]; | ||
| keyToggles[co->T("Right")] = &array[5]; | ||
| keyToggles[co->T("Down")] = &array[6]; | ||
| keyToggles["Start"] = &array[3]; | ||
| keyToggles["Select"] = &array[0]; | ||
|
|
||
| std::map<std::string, int>::iterator imageFinder; | ||
|
|
||
| I18NCategory *mc = GetI18NCategory("MappableControls"); | ||
|
|
||
| for (auto i = keyToggles.begin(); i != keyToggles.end(); ++i) { | ||
| LinearLayout *row = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); | ||
| row->SetSpacing(0); | ||
|
|
||
| CheckBox *checkbox = new CheckBox(i->second, "", "", new LinearLayoutParams(50, WRAP_CONTENT)); | ||
| row->Add(checkbox); | ||
|
|
||
| imageFinder = keyImages.find(i->first); | ||
| Choice *choice; | ||
| if (imageFinder != keyImages.end()) { | ||
| choice = new Choice(keyImages[imageFinder->first], new LinearLayoutParams(1.0f)); | ||
| } | ||
| else { | ||
| choice = new Choice(mc->T(i->first.c_str()), new LinearLayoutParams(1.0f)); | ||
| } | ||
|
|
||
| ChoiceEventHandler *choiceEventHandler = new ChoiceEventHandler(checkbox); | ||
| choice->OnClick.Handle(choiceEventHandler, &ChoiceEventHandler::onChoiceClick); | ||
|
|
||
| choice->SetCentered(true); | ||
|
|
||
| row->Add(choice); | ||
| grid->Add(row); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| static int arrayToInt(bool ary[16]) { | ||
| int value = 0; | ||
| for (int i = 15; i >= 0; i--) { | ||
| value |= ary[i] ? 1 : 0; | ||
| value = value << 1; | ||
| } | ||
| return value >> 1; | ||
| } | ||
|
|
||
| void Combo_keyScreen::onFinish(DialogResult result) { | ||
| switch (*mode) { | ||
| case 0: | ||
| g_Config.iCombokey0 = arrayToInt(array); | ||
| break; | ||
| case 1: | ||
| g_Config.iCombokey1 = arrayToInt(array); | ||
| break; | ||
| case 2: | ||
| g_Config.iCombokey2 = arrayToInt(array); | ||
| break; | ||
| case 3: | ||
| g_Config.iCombokey3 = arrayToInt(array); | ||
| break; | ||
| case 4: | ||
| g_Config.iCombokey4 = arrayToInt(array); | ||
| break; | ||
| } | ||
| g_Config.Save(); | ||
| } | ||
|
|
||
| UI::EventReturn Combo_keyScreen::ChoiceEventHandler::onChoiceClick(UI::EventParams &e){ | ||
| checkbox_->Toggle(); | ||
|
|
||
|
|
||
| return UI::EVENT_DONE; | ||
| }; | ||
|
|
||
| UI::EventReturn Combo_keyScreen::onCombo(UI::EventParams &e) { | ||
| switch (*mode){ | ||
| case 0:g_Config.iCombokey0 = arrayToInt(array); | ||
| break; | ||
| case 1:g_Config.iCombokey1 = arrayToInt(array); | ||
| break; | ||
| case 2:g_Config.iCombokey2 = arrayToInt(array); | ||
| break; | ||
| case 3:g_Config.iCombokey3 = arrayToInt(array); | ||
| break; | ||
| case 4:g_Config.iCombokey4 = arrayToInt(array); | ||
| } | ||
| *mode = comboselect->GetSelection(); | ||
| CreateViews(); | ||
| return UI::EVENT_DONE; | ||
| } | ||
|
|
||
|
|
Oops, something went wrong.