i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced the sMatchString buffer used for typeahead search by a BString. No

Browse Source 
intended functional change.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35373 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2010-02-01 05:02:05 +00:00
parent 82471975d5
commit 7acdd03f5e
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/PoseView.cpp
+22 -27
View File
@@ -6111,11 +6111,10 @@ BPoseView::KeyDown(const char *bytes, int32 count)
break; break;
if (fSelectionList->IsEmpty()) if (fSelectionList->IsEmpty())
sMatchString[0] = '\0'; sMatchString.Truncate(0);
else { else {
BPose *pose = fSelectionList->FirstItem(); BPose *pose = fSelectionList->FirstItem();
strncpy(sMatchString, pose->TargetModel()->Name(), B_FILE_NAME_LENGTH - 1); sMatchString.SetTo(pose->TargetModel()->Name());
sMatchString[B_FILE_NAME_LENGTH - 1] = '\0';
} }
bool reverse = (Window()->CurrentMessage()->FindInt32("modifiers") bool reverse = (Window()->CurrentMessage()->FindInt32("modifiers")
@@ -6123,11 +6122,11 @@ BPoseView::KeyDown(const char *bytes, int32 count)
int32 index; int32 index;
BPose *pose = FindNextMatch(&index, reverse); BPose *pose = FindNextMatch(&index, reverse);
if (!pose) { // wrap around if (!pose) { // wrap around
if (reverse) { if (reverse)
sMatchString[0] = (char)0xff; sMatchString.SetTo(0x7f, 1);
sMatchString[1] = '\0'; else
} else sMatchString.Truncate(0);
sMatchString[0] = '\0';
pose = FindNextMatch(&index, reverse); pose = FindNextMatch(&index, reverse);
} }
@@ -6170,15 +6169,15 @@ BPoseView::KeyDown(const char *bytes, int32 count)
break; break;
} }
if (strlen(sMatchString) == 0) if (sMatchString.Length() == 0)
break; break;
// remove last char from the typeahead buffer // remove last char from the typeahead buffer
sMatchString[strlen(sMatchString) - 1] = '\0'; sMatchString.Truncate(sMatchString.Length() - 1);
fLastKeyTime = system_time(); fLastKeyTime = system_time();
fCountView->SetTypeAhead(sMatchString); fCountView->SetTypeAhead(sMatchString.String());
// select our new string // select our new string
int32 index; int32 index;
@@ -6231,17 +6230,14 @@ BPoseView::KeyDown(const char *bytes, int32 count)
} }
// add char to existing matchString or start new match string // add char to existing matchString or start new match string
// make sure we don't overfill matchstring if (eventTime - fLastKeyTime < (doubleClickSpeed * 2))
if (eventTime - fLastKeyTime < (doubleClickSpeed * 2)) { sMatchString.Append(searchChar);
uint32 nchars = B_FILE_NAME_LENGTH - strlen(sMatchString); else
strncat(sMatchString, searchChar, nchars); sMatchString.SetTo(searchChar);
} else {
strncpy(sMatchString, searchChar, B_FILE_NAME_LENGTH - 1);
}
sMatchString[B_FILE_NAME_LENGTH - 1] = '\0';
fLastKeyTime = eventTime; fLastKeyTime = eventTime;
fCountView->SetTypeAhead(sMatchString); fCountView->SetTypeAhead(sMatchString.String());
int32 index; int32 index;
BPose *pose = FindBestMatch(&index); BPose *pose = FindBestMatch(&index);
@@ -6267,14 +6263,14 @@ BPoseView::FindNextMatch(int32 *matchingIndex, bool reverse)
BPose *pose = fPoseList->ItemAt(index); BPose *pose = fPoseList->ItemAt(index);
if (reverse) { if (reverse) {
if (strcasecmp(pose->TargetModel()->Name(), sMatchString) < 0) if (sMatchString.ICompare(pose->TargetModel()->Name()) > 0)
if (strcasecmp(pose->TargetModel()->Name(), bestSoFar) >= 0 if (strcasecmp(pose->TargetModel()->Name(), bestSoFar) >= 0
|| !bestSoFar[0]) { || !bestSoFar[0]) {
strcpy(bestSoFar, pose->TargetModel()->Name()); strcpy(bestSoFar, pose->TargetModel()->Name());
poseToSelect = pose; poseToSelect = pose;
*matchingIndex = index; *matchingIndex = index;
} }
} else if (strcasecmp(pose->TargetModel()->Name(), sMatchString) > 0) } else if (sMatchString.ICompare(pose->TargetModel()->Name()) < 0)
if (strcasecmp(pose->TargetModel()->Name(), bestSoFar) <= 0 if (strcasecmp(pose->TargetModel()->Name(), bestSoFar) <= 0
|| !bestSoFar[0]) { || !bestSoFar[0]) {
strcpy(bestSoFar, pose->TargetModel()->Name()); strcpy(bestSoFar, pose->TargetModel()->Name());
@@ -6294,7 +6290,7 @@ BPoseView::FindBestMatch(int32 *index)
BPose *poseToSelect = NULL; BPose *poseToSelect = NULL;
float bestScore = -1; float bestScore = -1;
int32 count = fPoseList->CountItems(); int32 count = fPoseList->CountItems();
size_t matchLength = strlen(sMatchString); size_t matchLength = sMatchString.Length();
// loop through all poses to find match // loop through all poses to find match
for (int32 j = 0; j < CountColumns(); j++) { for (int32 j = 0; j < CountColumns(); j++) {
@@ -6312,12 +6308,12 @@ BPoseView::FindBestMatch(int32 *index)
text = widget->Text(this); text = widget->Text(this);
if (text != NULL) { if (text != NULL) {
score = ComputeTypeAheadScore(text, sMatchString, score = ComputeTypeAheadScore(text, sMatchString.String(),
matchLength); matchLength);
} }
} else { } else {
score = ComputeTypeAheadScore(pose->TargetModel()->Name(), score = ComputeTypeAheadScore(pose->TargetModel()->Name(),
sMatchString, matchLength); sMatchString.String(), matchLength);
} }
if (score > bestScore) { if (score > bestScore) {
@@ -9869,5 +9865,4 @@ float BPoseView::sFontHeight = -1;
font_height BPoseView::sFontInfo = { 0, 0, 0 }; font_height BPoseView::sFontInfo = { 0, 0, 0 };
BFont BPoseView::sCurrentFont; BFont BPoseView::sCurrentFont;
OffscreenBitmap *BPoseView::sOffscreen = new OffscreenBitmap; OffscreenBitmap *BPoseView::sOffscreen = new OffscreenBitmap;
char BPoseView::sMatchString[] = ""; BString BPoseView::sMatchString = "";
src/kits/tracker/PoseView.h
+1 -1
View File
@@ -713,7 +713,7 @@ class BPoseView : public BView {
static float sFontHeight; static float sFontHeight;
static font_height sFontInfo; static font_height sFontInfo;
static BFont sCurrentFont; static BFont sCurrentFont;
static char sMatchString[B_FILE_NAME_LENGTH]; static BString sMatchString;
// used for typeahead - should be replaced by a typeahead state // used for typeahead - should be replaced by a typeahead state
bigtime_t fLastKeyTime; bigtime_t fLastKeyTime;