Augustin Cavalier
49a92384f4
* It's not really possible to distinguish between a first startup and a restart inside app_server itself. Due to the new BServer setup, the same port will still be used, too. So, change the messages sent to just "AppServerStarted". * Since the message is sent out much later than the port is created, by the time applications see it, the app_server may have already been started a while and applications may have connected to it. So, check if we really need to reconnect in BApplication before actually trying to do that. * BWindow now starts with updates disabled, so they must be enabled after reconnecting. After this commit, basic app_server restart functionality works again; it's restarted automatically by launch_daemon after dying or being killed and applications automatically reconnect. However, some problems still linger (e.g. Terminal doesn't always recreate its windows, colors on the Desktop look wrong, missing desktop background image, etc.)
106 lines
3.1 KiB
C++
106 lines
3.1 KiB
C++
/*
|
|
* Copyright 2001-2015, Haiku.
|
|
* Distributed under the terms of the MIT License.
|
|
*
|
|
* Authors:
|
|
* Ingo Weinhold ([email protected])
|
|
*/
|
|
#ifndef _ROSTER_PRIVATE_H
|
|
#define _ROSTER_PRIVATE_H
|
|
|
|
|
|
#include <Messenger.h>
|
|
#include <Roster.h>
|
|
|
|
|
|
const int32 kMsgAppServerStarted = '_ASt';
|
|
|
|
|
|
class BRoster::Private {
|
|
public:
|
|
Private() : fRoster(const_cast<BRoster*>(be_roster)) {}
|
|
Private(BRoster &roster) : fRoster(&roster) {}
|
|
Private(BRoster *roster) : fRoster(roster) {}
|
|
|
|
void SetTo(BMessenger mainMessenger, BMessenger mimeMessenger);
|
|
|
|
status_t SendTo(BMessage *message, BMessage *reply, bool mime);
|
|
bool IsMessengerValid(bool mime) const;
|
|
|
|
status_t Launch(const char* mimeType, const entry_ref* ref,
|
|
const BList* messageList, int argc, const char* const* args,
|
|
const char** environment, team_id* appTeam,
|
|
thread_id* appThread, port_id* appPort, uint32* appToken,
|
|
bool launchSuspended)
|
|
{ return fRoster->_LaunchApp(mimeType, ref, messageList, argc,
|
|
args, environment, appTeam, appThread, appPort, appToken,
|
|
launchSuspended); }
|
|
|
|
status_t ShutDown(bool reboot, bool confirm, bool synchronous)
|
|
{ return fRoster->_ShutDown(reboot, confirm, synchronous); }
|
|
status_t IsShutDownInProgress(bool* inProgress)
|
|
{ return fRoster->_IsShutDownInProgress(inProgress); }
|
|
|
|
// needed by BApplication
|
|
|
|
status_t AddApplication(const char *mimeSig, const entry_ref *ref,
|
|
uint32 flags, team_id team, thread_id thread,
|
|
port_id port, bool fullReg, uint32 *token,
|
|
team_id *otherTeam) const
|
|
{ return fRoster->_AddApplication(mimeSig, ref, flags, team, thread,
|
|
port, fullReg, token, otherTeam); }
|
|
|
|
status_t SetSignature(team_id team, const char *mimeSig) const
|
|
{ return fRoster->_SetSignature(team, mimeSig); }
|
|
|
|
status_t CompleteRegistration(team_id team, thread_id thread,
|
|
port_id port) const
|
|
{ return fRoster->_CompleteRegistration(team, thread, port); }
|
|
|
|
status_t IsAppRegistered(const entry_ref *ref, team_id team,
|
|
uint32 token, bool *preRegistered, app_info *info) const
|
|
{ return fRoster->_IsAppRegistered(ref, team, token, preRegistered,
|
|
info); }
|
|
|
|
void SetWithoutRegistrar(bool noRegistrar) const
|
|
{ fRoster->_SetWithoutRegistrar(noRegistrar); }
|
|
|
|
status_t RemoveApp(team_id team) const
|
|
{ return fRoster->_RemoveApp(team); }
|
|
|
|
// needed by GetRecentTester
|
|
|
|
void AddToRecentApps(const char *appSig) const
|
|
{ fRoster->_AddToRecentApps(appSig); }
|
|
|
|
void ClearRecentDocuments() const
|
|
{ fRoster->_ClearRecentDocuments(); }
|
|
|
|
void ClearRecentFolders() const
|
|
{ fRoster->_ClearRecentFolders(); }
|
|
|
|
void ClearRecentApps() const
|
|
{ fRoster->_ClearRecentApps(); }
|
|
|
|
void LoadRecentLists(const char *file) const
|
|
{ fRoster->_LoadRecentLists(file); }
|
|
|
|
void SaveRecentLists(const char *file) const
|
|
{ fRoster->_SaveRecentLists(file); }
|
|
|
|
// needed by the debug server
|
|
void ApplicationCrashed(team_id team) const
|
|
{ fRoster->_ApplicationCrashed(team); }
|
|
|
|
void UpdateActiveApp(team_id team) const
|
|
{ fRoster->_UpdateActiveApp(team); }
|
|
|
|
static void InitBeRoster();
|
|
static void DeleteBeRoster();
|
|
|
|
private:
|
|
BRoster *fRoster;
|
|
};
|
|
|
|
#endif // _ROSTER_PRIVATE_H
|