Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hex mode text input now works. BTextView is really lacking in some parts.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6809 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-02-29 18:20:04 +00:00
parent ba25ca5cf0
commit f19cd99782
1 changed files with 118 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
src/apps/diskprobe/FindWindow.cpp
View File

@ -48,6 +48,8 @@ class FindTextView : public BTextView {
int32 offset, const text_run_array *runs); int32 offset, const text_run_array *runs);
private: private:
void HexReformat(int32 oldCursor, int32 &newCursor);
BScrollView *fScrollView; BScrollView *fScrollView;
find_mode fMode; find_mode fMode;
}; };
@ -83,32 +85,47 @@ FindTextView::TargetedByScrollView(BScrollView *view)
} }
void void
FindTextView::KeyDown(const char *bytes, int32 numBytes) FindTextView::HexReformat(int32 oldCursor, int32 &newCursor)
{ {
if (fMode == kHexMode) { const char *text = Text();
// filter out invalid characters int32 textLength = TextLength();
if (numBytes > 1) char *insert = (char *)malloc(textLength * 2);
return; if (insert == NULL)
return;
if (bytes[0] == B_DELETE || bytes[0] == B_BACKSPACE) {
// ToDo newCursor = TextLength();
return; int32 out = 0;
for (int32 i = 0; i < textLength; i++) {
if (i == oldCursor) {
// this is the end of the inserted text
newCursor = out;
} }
if (!strchr("0123456789abcdefABCDEF", bytes[0])) char c = text[i];
return; if (c >= 'A' && c <= 'F')
c += 'A' - 'a';
if ((c >= 'a' && c <= 'f') || (c >= '0' && c <= '9'))
insert[out++] = c;
// the original KeyDown() has severe cursor setting if ((out % 48) == 47)
// problems with our InsertText(). insert[out++] = '\n';
else if ((out % 3) == 2)
int32 start, end; insert[out++] = ' ';
GetSelection(&start, &end);
InsertText(bytes, 1, start, NULL);
Invalidate();
return;
} }
BTextView::KeyDown(bytes, numBytes); insert[out] = '\0';
DeleteText(0, textLength);
// InsertText() does not work here, as we need the text
// to be reformatted as well (newlines, breaks, whatever).
// IOW the BTextView class is not very nicely done.
// BTextView::InsertText(insert, out, 0, NULL);
fMode = kAsciiMode;
Insert(0, insert, out);
fMode = kHexMode;
free(insert);
} }
@ -124,45 +141,94 @@ FindTextView::InsertText(const char *text, int32 length, int32 offset,
// lets add anything, and then start to filter out // lets add anything, and then start to filter out
// (since we have to reformat the whole text) // (since we have to reformat the whole text)
const char *text = Text();
int32 textLength = TextLength();
char *insert = (char *)malloc(textLength * 2);
if (insert == NULL)
return;
int32 cursor = TextLength();
int32 out = 0;
for (int32 i = 0; i < textLength; i++) {
char c = text[i];
if (c >= 'A' && c <= 'F')
c += 'A' - 'a';
if ((c >= 'a' && c <= 'f') || (c >= '0' && c <= '9'))
insert[out++] = c;
if (i == offset && length == 1) {
// this is the end of the inserted text
cursor = out;
}
if ((out % 3) == 2)
insert[out++] = ' ';
}
insert[out] = '\0';
DeleteText(0, textLength);
BTextView::InsertText(insert, out, 0, NULL);
int32 start, end; int32 start, end;
GetSelection(&start, &end); GetSelection(&start, &end);
if (start == offset)
Select(cursor, cursor);
free(insert); int32 cursor;
HexReformat(offset, cursor);
if (length == 1 && start == offset)
Select(cursor + 1, cursor + 1);
} else } else
BTextView::InsertText(text, length, offset, runs); BTextView::InsertText(text, length, offset, runs);
} }
void
FindTextView::KeyDown(const char *bytes, int32 numBytes)
{
if (fMode == kHexMode) {
// filter out invalid (for hex mode) characters
if (numBytes > 1)
return;
switch (bytes[0]) {
case B_RIGHT_ARROW:
case B_LEFT_ARROW:
case B_UP_ARROW:
case B_DOWN_ARROW:
case B_HOME:
case B_END:
case B_PAGE_UP:
case B_PAGE_DOWN:
break;
case B_BACKSPACE:
{
int32 start, end;
GetSelection(&start, &end);
if (bytes[0] == B_BACKSPACE) {
start--;
if (start < 0)
return;
}
if (Text()[start] == ' ')
BTextView::KeyDown(bytes, numBytes);
BTextView::KeyDown(bytes, numBytes);
GetSelection(&start, &end);
HexReformat(start, start);
Select(start, start);
return;
}
case B_DELETE:
{
int32 start, end;
GetSelection(&start, &end);
if (Text()[start] == ' ')
BTextView::KeyDown(bytes, numBytes);
BTextView::KeyDown(bytes, numBytes);
HexReformat(start, start);
Select(start, start);
return;
}
default:
{
if (!strchr("0123456789abcdefABCDEF", bytes[0]))
return;
// the original KeyDown() has severe cursor setting
// problems with our InsertText().
int32 start, end;
GetSelection(&start, &end);
InsertText(bytes, 1, start, NULL);
return;
}
}
}
BTextView::KeyDown(bytes, numBytes);
}
status_t status_t
FindTextView::SetMode(find_mode mode) FindTextView::SetMode(find_mode mode)
{ {