Added a selection observer notice (in addition to cursor position).

Now listens to B_SELECT_ALL, and B_COPY.
B_COPY copies the selection as "application/octect-stream" and, if
it's a valid ASCII string, also as "text/plain".


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6706 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-02-24 03:33:14 +00:00
parent 0e3cec8c6d
commit 6a3227322b

View File

@ -9,6 +9,8 @@
#include <Window.h> #include <Window.h>
#include <ScrollBar.h> #include <ScrollBar.h>
#include <Clipboard.h>
#include <Mime.h>
static const uint32 kBlockSize = 16; static const uint32 kBlockSize = 16;
@ -20,6 +22,31 @@ static const uint32 kHexByteWidth = 3;
// these are determined by the implementation of DataView::ConvertLine() // these are determined by the implementation of DataView::ConvertLine()
/** This function checks if the buffer contains a valid ASCII
* string, following the convention from the DataView::ConvertLine()
* method: everything that's not replaced by a '.' there will be
* accepted.
*/
bool
is_valid_ascii(uint8 *data, size_t size)
{
for (size_t i = 0; i < size; i++) {
// accept a terminating null byte
if (i == size - 1 && data[0] == '\0')
return true;
if (data[i] < ' ' || data[i] == 0x7f || data[i] & 0x80)
return false;
}
return true;
}
// #pragma mark -
DataView::DataView(BRect rect, DataEditor &editor) DataView::DataView(BRect rect, DataEditor &editor)
: BView(rect, "dataView", B_FOLLOW_ALL, B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS), : BView(rect, "dataView", B_FOLLOW_ALL, B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS),
fEditor(editor), fEditor(editor),
@ -74,6 +101,8 @@ DataView::UpdateFromEditor(BMessage */*message*/)
memcpy(fData, data, fDataSize); memcpy(fData, data, fDataSize);
fEditor.Unlock(); fEditor.Unlock();
Invalidate();
} }
} }
@ -82,18 +111,10 @@ void
DataView::MessageReceived(BMessage *message) DataView::MessageReceived(BMessage *message)
{ {
switch (message->what) { switch (message->what) {
case B_OBSERVER_NOTICE_CHANGE: { case kMsgUpdateData:
int32 what; case kMsgDataEditorUpdate:
if (message->FindInt32(B_OBSERVE_WHAT_CHANGE, &what) != B_OK)
break;
switch (what) {
case kDataEditorUpdate:
UpdateFromEditor(message); UpdateFromEditor(message);
break; break;
}
break;
}
case kMsgBaseType: case kMsgBaseType:
{ {
@ -105,6 +126,37 @@ DataView::MessageReceived(BMessage *message)
break; break;
} }
case B_SELECT_ALL:
SetSelection(0, fDataSize - 1);
break;
case B_COPY:
{
if (!be_clipboard->Lock())
break;
be_clipboard->Clear();
BMessage *clip;
if ((clip = be_clipboard->Data()) != NULL) {
uint8 *data = fData + fStart;
size_t length = fEnd + 1 - fStart;
clip->AddData(B_FILE_MIME_TYPE, B_MIME_TYPE, data, length);
if (is_valid_ascii(data, length))
clip->AddData("text/plain", B_MIME_TYPE, data, length);
be_clipboard->Commit();
}
be_clipboard->Unlock();
break;
}
case B_PASTE:
break;
default: default:
BView::MessageReceived(message); BView::MessageReceived(message);
} }
@ -156,7 +208,7 @@ DataView::Draw(BRect updateRect)
BPoint location(kHorizontalSpace, kVerticalSpace + fAscent); BPoint location(kHorizontalSpace, kVerticalSpace + fAscent);
for (uint32 i = 0; i < fDataSize; i += kBlockSize) { for (uint32 i = 0; i < fDataSize; i += kBlockSize) {
ConvertLine(line, fOffset + i, fData + i, fDataSize - i); ConvertLine(line, /*fOffset + */i, fData + i, fDataSize - i);
DrawString(line, location); DrawString(line, location);
location.y += fFontHeight; location.y += fFontHeight;
@ -449,6 +501,11 @@ DataView::SetSelection(int32 start, int32 end, view_focus focus)
SendNotices(kDataViewCursorPosition, &update); SendNotices(kDataViewCursorPosition, &update);
} }
BMessage update;
update.AddInt64("start", start);
update.AddInt64("end", end);
SendNotices(kDataViewSelection, &update);
// remove old selection // remove old selection
// ToDo: this could be drastically improved if only the changed // ToDo: this could be drastically improved if only the changed
// parts are drawn! Of course, this would only work for the // parts are drawn! Of course, this would only work for the