mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-23 06:41:08 +00:00
Code Issues Projects Releases Wiki Activity

Added handling of quotation marks and search for matches now ignores the case of input and keywords. When completing and there are matching or partly matching uppercase keywords the output will be upercase too. If this is a problem i'll change it.

Browse Source
This commit is contained in:
k1ll 2011-07-19 18:42:34 +02:00
parent ac43d482c5
commit 0ece722ff3
1 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
apps/openmw/mwgui/console.cpp
View File

@ -259,17 +259,43 @@ namespace MWGui
using namespace std; using namespace std;
string output=input; string output=input;
string tmp=input; string tmp=input;
bool has_front_quote = false;
/* Does the input string contain things that don't have to be completed? If yes erase them. */ /* Does the input string contain things that don't have to be completed? If yes erase them. */
for(string::reverse_iterator rit=tmp.rbegin(); rit < tmp.rend(); rit++) { /* Are there quotation marks? */
if( *rit == ' ' ) { if( tmp.find('"') != string::npos ) {
if( rit == tmp.rbegin() ) int numquotes=0;
{ for(string::iterator it=tmp.begin(); it < tmp.end(); it++) {
tmp.clear(); if( *it == '"' )
break; numquotes++;
}
/* Is it terminated?*/
if( numquotes % 2 ) {
tmp.erase( 0, tmp.rfind('"')+1 );
has_front_quote = true;
}
else {
size_t pos;
if( ( ((pos = tmp.rfind(' ')) != string::npos ) ) && ( pos > tmp.rfind('"') ) ) {
tmp.erase( 0, tmp.rfind(' ')+1);
}
else {
tmp.clear();
}
has_front_quote = false;
}
}
/* No quotation marks. Are there spaces?*/
else {
size_t rpos;
if( (rpos=tmp.rfind(' ')) != string::npos ) {
if( rpos == 0 ) {
tmp.clear();
}
else {
tmp.erase(0, rpos+1);
} }
tmp.erase(tmp.begin(), (rit).base());
break;
} }
} }
/* Erase the input from the output string so we can easily append the completed form later. */ /* Erase the input from the output string so we can easily append the completed form later. */
@ -291,7 +317,7 @@ namespace MWGui
/* Is the beginning of the string different from the input string? If yes skip it. */ /* Is the beginning of the string different from the input string? If yes skip it. */
for( string::iterator iter=tmp.begin(), iter2=(*it).begin(); iter < tmp.end();iter++, iter2++) { for( string::iterator iter=tmp.begin(), iter2=(*it).begin(); iter < tmp.end();iter++, iter2++) {
if( *iter != *iter2 ) { if( tolower(*iter) != tolower(*iter2) ) {
string_different=true; string_different=true;
break; break;
} }
@ -312,20 +338,33 @@ namespace MWGui
/* Only one match. We're done. */ /* Only one match. We're done. */
if( matches.size() == 1 ) { if( matches.size() == 1 ) {
/* Adding quotation marks when the input string started with a quotation mark or has spaces in it*/
if( ( matches.front().find(' ') != string::npos ) ) {
if( !has_front_quote )
output.append(string("\""));
return output.append(matches.front() + string("\" "));
}
else if( has_front_quote ) {
return output.append(matches.front() + string("\" "));
}
else {
return output.append(matches.front() + string(" ")); return output.append(matches.front() + string(" "));
} }
}
/* Check if all matching strings match further than input. If yes complete to this match. */ /* Check if all matching strings match further than input. If yes complete to this match. */
int i = tmp.length(); int i = tmp.length();
for(string::iterator iter=matches.front().begin()+tmp.length(); iter < matches.front().end(); iter++, i++) { for(string::iterator iter=matches.front().begin()+tmp.length(); iter < matches.front().end(); iter++, i++) {
for(vector<string>::iterator it=matches.begin(); it < matches.end();it++) { for(vector<string>::iterator it=matches.begin(); it < matches.end();it++) {
if( (*it)[i] != *iter ) { if( tolower((*it)[i]) != tolower(*iter) ) {
/* Append the longest match to the end of the output string*/ /* Append the longest match to the end of the output string*/
return output.append(matches.front().substr( 0, i)); output.append(matches.front().substr( 0, i));
return output;
} }
} }
} }
/* All keywords match with the shortest. Append it to the output string and return it. */ /* All keywords match with the shortest. Append it to the output string and return it. */
return output.append(matches.front()); return output.append(matches.front());
} }