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

* There is now a server_read_only_memory structure that is placed in a (surprise!)

Browse Source 
read-only area shared between the Desktop and all applications.
* Right now, this area only contains the desktop colors, ie. B_PANEL_BACKGROUND_COLOR
  etc.; ui_color() no longer needs to ask the server for these colors.
* The ui_colors are now maintained by DesktopSettings, though ColorSet is still there.
* The default colors are now hardcoded once and for everyone in InterfaceDefs.h, ie.
  the app_server uses them as well.
* Desktop::Init() can now also return an error (but that is not yet accounted for).
* Cleaned up InterfaceDefs.h.
* Fixed wrong include in moreUTF8.h.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17232 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-04-25 20:12:06 +00:00
parent 7225520c09
commit 6d5488e18a
15 changed files with 284 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Application.cpp
+20 -8
View File
@@ -660,11 +660,11 @@ bool
BApplication::IsCursorHidden() const
{
BPrivate::AppServerLink link;
int32 code = SERVER_FALSE;
int32 status = B_ERROR;
link.StartMessage(AS_QUERY_CURSOR_HIDDEN);
link.FlushWithReply(code);
link.FlushWithReply(status);
return code == SERVER_TRUE;
return status == B_OK;
}
@@ -995,10 +995,6 @@ BApplication::_InitGUIContext()
if (error != B_OK)
return error;
error = _SetupServerAllocator();
if (error != B_OK)
return error;
// Initialize the IK after we have set be_app because of a construction of a
// AppServerLink (which depends on be_app) nested inside the call to get_menu_info.
error = _init_interface_kit_();
@@ -1061,21 +1057,37 @@ BApplication::_ConnectToServer()
fServerLink->Attach<int32>(_get_object_token_(this));
fServerLink->AttachString(fAppName);
area_id sharedReadOnlyArea;
if (fServerLink->FlushWithReply(code) == B_OK
&& code == B_OK) {
// We don't need to contact the main app_server anymore
// directly; we now talk to our server alter ego only.
fServerLink->Read<port_id>(&serverPort);
fServerLink->SetSenderPort(serverPort);
fServerLink->Read<area_id>(&sharedReadOnlyArea);
} else {
fServerLink->SetSenderPort(-1);
debugger("BApplication: couldn't obtain new app_server comm port");
return B_ERROR;
}
fServerLink->SetSenderPort(serverPort);
status_t status = _SetupServerAllocator();
if (status != B_OK)
return status;
area_id area;
uint8* base;
status = fServerAllocator->AddArea(sharedReadOnlyArea, area, base, true);
if (status < B_OK)
return status;
fServerReadOnlyMemory = base;
return B_OK;
}
#if 0
void
BApplication::send_drag(BMessage *message, int32 vs_token, BPoint offset,