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

Finished up some scripting-related items.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5080 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
ejakowatz 2003-10-18 04:55:28 +00:00
parent a33c76090e
commit b07c31a73f
2 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/kits/app/Looper.cpp
View File

@ -729,6 +729,8 @@ BHandler* BLooper::ResolveSpecifier(BMessage* msg, int32 index,
*/ */
BPropertyInfo PropertyInfo(gLooperPropInfo); BPropertyInfo PropertyInfo(gLooperPropInfo);
uint32 data; uint32 data;
status_t err = B_OK;
const char* errMsg = "";
if (PropertyInfo.FindMatch(msg, index, specifier, form, property, &data) >= 0) if (PropertyInfo.FindMatch(msg, index, specifier, form, property, &data) >= 0)
{ {
switch (data) switch (data)
@ -752,9 +754,16 @@ BHandler* BLooper::ResolveSpecifier(BMessage* msg, int32 index,
} }
else else
{ {
// TODO: test and implement err = B_BAD_INDEX;
errMsg = "handler index out of range";
} }
break;
} }
default:
err = B_BAD_SCRIPT_SYNTAX;
errMsg = "Didn't understand the specifier(s)";
break;
} }
} }
else else
@ -764,8 +773,8 @@ BHandler* BLooper::ResolveSpecifier(BMessage* msg, int32 index,
} }
BMessage Reply(B_MESSAGE_NOT_UNDERSTOOD); BMessage Reply(B_MESSAGE_NOT_UNDERSTOOD);
Reply.AddInt32("error", B_BAD_SCRIPT_SYNTAX); Reply.AddInt32("error", err);
Reply.AddString("message", "Didn't understand the specifier(s)"); Reply.AddString("message", errMsg);
msg->SendReply(&Reply); msg->SendReply(&Reply);
return NULL; return NULL;
@ -1476,7 +1485,7 @@ BHandler* BLooper::top_level_filter(BMessage* msg, BHandler* target)
{ {
if (target->Looper() != this) if (target->Looper() != this)
{ {
// TODO: debugger message? debugger("Targeted handler does not belong to the looper.");
target = NULL; target = NULL;
} }
else else
@ -1501,7 +1510,7 @@ BHandler* BLooper::handler_only_filter(BMessage* msg, BHandler* target)
target = apply_filters(oldTarget->FilterList(), msg, oldTarget); target = apply_filters(oldTarget->FilterList(), msg, oldTarget);
if (target && (target->Looper() != this)) if (target && (target->Looper() != this))
{ {
// TODO: debugger message? debugger("Targeted handler does not belong to the looper.");
target = NULL; target = NULL;
} }
} }
@ -1574,8 +1583,48 @@ void BLooper::check_lock()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
BHandler* BLooper::resolve_specifier(BHandler* target, BMessage* msg) BHandler* BLooper::resolve_specifier(BHandler* target, BMessage* msg)
{ {
// TODO: implement // Check params
return NULL; if (!target || !msg)
{
return NULL;
}
int32 index;
BMessage specifier;
int32 form;
const char* property;
status_t err = B_OK;
BHandler* newTarget = target;
// Loop to deal with nested specifiers
// (e.g., the 3rd button on the 4th view)
do
{
err = msg->GetCurrentSpecifier(&index, &specifier, &form, &property);
if (err)
{
BMessage reply(B_REPLY);
reply.AddInt32("error", err);
msg->SendReply(&reply);
return NULL;
}
// Current target gets what was the new target
target = newTarget;
newTarget = target->ResolveSpecifier(msg, index, &specifier, form,
property);
// Check that new target is owned by looper;
// use IndexOf() to avoid dereferencing newTarget
// (possible race condition with object destruction
// by another looper)
if (!newTarget || IndexOf(newTarget) < 0)
{
return NULL;
}
// Get current specifier index (may change in ResolveSpecifier())
msg->GetCurrentSpecifier(&index);
} while (newTarget && newTarget != target && index >= 0);
return newTarget;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BLooper::UnlockFully() void BLooper::UnlockFully()

3
src/kits/app/Message.cpp
View File

@ -577,7 +577,8 @@ status_t BMessage::Flatten(BDataIO* stream, ssize_t* size) const
if (!err) if (!err)
{ {
// size is an optional parameter, don't crash on NULL // size is an optional parameter, don't crash on NULL
if (size != NULL) { if (size != NULL)
{
*size = len; *size = len;
} }
err = stream->Write(buffer, len); err = stream->Write(buffer, len);