Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3577] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2014-01-15 20:43:13
|
Revision: 3577
http://sourceforge.net/p/modplug/code/3577
Author: saga-games
Date: 2014-01-15 20:43:07 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
[Imp] Default keybindings are now automatically added when loading existing, possibly incomplete keybindings (http://bugs.openmpt.org/view.php?id=4).
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2014-01-15 18:39:04 UTC (rev 3576)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2014-01-15 20:43:07 UTC (rev 3577)
@@ -1506,24 +1506,24 @@
}
-bool CCommandSet::LoadFile(std::istream& iStrm, const std::wstring &filenameDescription)
-//--------------------------------------------------------------------------------------
+bool CCommandSet::LoadFile(std::istream& iStrm, const std::wstring &filenameDescription, CCommandSet *commandSet)
+//---------------------------------------------------------------------------------------------------------------
{
KeyCombination kc;
CommandID cmd=kcNumCommands;
char s[1024];
CString curLine, token;
int commentStart;
- CCommandSet *pTempCS;
int l=0;
int fileVersion = 0;
- pTempCS = new CCommandSet();
+ // If commandSet is valid, add new commands to it (this is used for adding the default shortcuts to existing keymaps)
+ CCommandSet *pTempCS = commandSet ? commandSet : new CCommandSet();
int errorCount=0;
CString errText = "";
- while(iStrm.getline(s, sizeof(s)))
+ while(iStrm.getline(s, CountOf(s)))
{
curLine = s;
@@ -1612,10 +1612,9 @@
errText += err + "\n";
Log(err);
}
- }
- else
+ } else
{
- pTempCS->Add(kc, cmd, true);
+ pTempCS->Add(kc, cmd, commandSet == nullptr);
}
}
@@ -1623,6 +1622,26 @@
l++;
}
+ //if(fileVersion < KEYMAP_VERSION) UpgradeKeymap(pTempCS, fileVersion);
+
+ if(commandSet == nullptr)
+ {
+ // Add the default command set to our freshly loaded command set.
+ const char *pData = nullptr;
+ HGLOBAL hglob = nullptr;
+ size_t nSize = 0;
+ if(LoadResource(MAKEINTRESOURCE(IDR_DEFAULT_KEYBINDINGS), TEXT("KEYBINDINGS"), pData, nSize, hglob) != nullptr)
+ {
+ std::istringstream iStrm(std::string(pData, nSize));
+ LoadFile(iStrm, std::wstring(), pTempCS);
+ FreeResource(hglob);
+ }
+ } else
+ {
+ // We were just adding stuff to an existing command set - don't delete it!
+ return true;
+ }
+
if(!errText.IsEmpty())
{
std::wstring err = L"The following problems have been encountered while trying to load the key binding file " + filenameDescription + L":\n";
@@ -1630,8 +1649,6 @@
Reporting::Warning(err);
}
- if(fileVersion < KEYMAP_VERSION) UpgradeKeymap(pTempCS, fileVersion);
-
Copy(pTempCS);
delete pTempCS;
@@ -1656,93 +1673,11 @@
bool CCommandSet::LoadDefaultKeymap()
//-----------------------------------
{
- bool success = false;
- const char* pData = nullptr;
- HGLOBAL hglob = nullptr;
- size_t nSize = 0;
- if (LoadResource(MAKEINTRESOURCE(IDR_DEFAULT_KEYBINDINGS), TEXT("KEYBINDINGS"), pData, nSize, hglob) != nullptr)
- {
- std::istringstream iStrm(std::string(pData, nSize));
- success = LoadFile(iStrm, L"\"executable resource\"");
- FreeResource(hglob);
- }
- return success;
+ std::istringstream s;
+ return LoadFile(s, L"\"executable resource\"");
}
-// Fix outdated keymap files
-void CCommandSet::UpgradeKeymap(CCommandSet *pCommands, int oldVersion)
-//---------------------------------------------------------------------
-{
- // no orderlist context
- if(oldVersion == 0)
- {
- KeyCombination kc(kCtxCtrlOrderlist, 0, 0, kKeyEventDown | kKeyEventRepeat);
-
- kc.KeyCode(VK_DELETE);
- pCommands->Add(kc, kcOrderlistEditDelete, false);
-
- kc.KeyCode(VK_INSERT);
- pCommands->Add(kc, kcOrderlistEditInsert, false);
-
- kc.KeyCode(VK_RETURN);
- pCommands->Add(kc, kcOrderlistEditPattern, false);
-
- kc.KeyCode(VK_TAB);
- pCommands->Add(kc, kcOrderlistSwitchToPatternView, false);
-
- kc.KeyCode(VK_LEFT);
- pCommands->Add(kc, kcOrderlistNavigateLeft, false);
- kc.KeyCode(VK_UP);
- pCommands->Add(kc, kcOrderlistNavigateLeft, false);
-
- kc.KeyCode(VK_RIGHT);
- pCommands->Add(kc, kcOrderlistNavigateRight, false);
- kc.KeyCode(VK_DOWN);
- pCommands->Add(kc, kcOrderlistNavigateRight, false);
-
- kc.KeyCode(VK_HOME);
- pCommands->Add(kc, kcOrderlistNavigateFirst, false);
-
- kc.KeyCode(VK_END);
- pCommands->Add(kc, kcOrderlistNavigateLast, false);
-
- kc.KeyCode(VK_ADD);
- pCommands->Add(kc, kcOrderlistPatPlus, false);
- kc.KeyCode(VK_OEM_PLUS);
- pCommands->Add(kc, kcOrderlistPatPlus, false);
-
- kc.KeyCode(VK_SUBTRACT);
- pCommands->Add(kc, kcOrderlistPatMinus, false);
- kc.KeyCode(VK_OEM_MINUS);
- pCommands->Add(kc, kcOrderlistPatMinus, false);
-
- STATIC_ASSERT(VK_NUMPAD0 + 9 == VK_NUMPAD9);
- STATIC_ASSERT(kcOrderlistPat0 + 9 == kcOrderlistPat9);
- for(int i = 0; i <= 9; i++)
- {
- kc.KeyCode('0' + i);
- pCommands->Add(kc, static_cast<CommandID>(kcOrderlistPat0 + i), false);
- kc.KeyCode(VK_NUMPAD0 + i);
- pCommands->Add(kc, static_cast<CommandID>(kcOrderlistPat0 + i), false);
- }
-
- kc.KeyCode('I');
- pCommands->Add(kc, kcOrderlistPatIgnore, false);
-
- kc.KeyCode(VK_SPACE);
- pCommands->Add(kc, kcOrderlistPatInvalid, false);
-
- kc.KeyCode('L');
- kc.Modifier(HOTKEYF_CONTROL);
- pCommands->Add(kc, kcOrderlistLockPlayback, false);
-
- kc.KeyCode('U');
- pCommands->Add(kc, kcOrderlistUnlockPlayback, false);
- }
-}
-
-
//Could do better search algo but this is not perf critical.
int CCommandSet::FindCmd(int uid)
//-------------------------------
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2014-01-15 18:39:04 UTC (rev 3576)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2014-01-15 20:43:07 UTC (rev 3577)
@@ -1233,12 +1233,6 @@
};
-struct Rule
-{
- UINT ID;
- CString desc;
- bool enforce;
-};
enum RuleID
{
@@ -1315,8 +1309,7 @@
void GenKeyMap(KeyMap &km); // Generate a keymap from this command set
bool SaveFile(const mpt::PathString &filename);
bool LoadFile(const mpt::PathString &filename);
- bool LoadFile(std::istream& iStrm, const std::wstring &filenameDescription);
+ bool LoadFile(std::istream& iStrm, const std::wstring &filenameDescription, CCommandSet *commandSet = nullptr);
bool LoadDefaultKeymap();
- void UpgradeKeymap(CCommandSet *pCommands, int oldVersion);
};
Modified: trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
===================================================================
--- trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2014-01-15 18:39:04 UTC (rev 3576)
+++ trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2014-01-15 20:43:07 UTC (rev 3577)
@@ -387,7 +387,7 @@
19:1817:0:187:5 //Increase pattern index : = (KeyDown|KeyHold)
19:1818:0:109:5 //Decrease pattern index: NUM SUB (KeyDown|KeyHold)
19:1818:0:189:5 //Decrease pattern index: - (KeyDown|KeyHold)
-19:1853:0:83:1 //Separator (+++) Index: S (KeyDown)
+19:1853:0:73:1 //Separator (+++) Index: I (KeyDown)
19:1854:0:32:1 //Stop (---) Index: SPACE (KeyDown)
19:1875:2:76:1 //Lock Playback to Selection: Ctrl+L (KeyDown)
19:1876:2:85:1 //Unlock Playback: Ctrl+U (KeyDown)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
