RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:38:12 +00:00
Code Issues Activity Actions

WindowServer: WSWindow can have a pointer to the client rather than an ID.

Browse source 
Since WSWindows are owned by WSConnectionClients, it's fine for them to just
reference the client directly.
This commit is contained in:
Andreas Kling 2019-02-17 08:54:57 +01:00
parent 1056a39bd6
commit 9a39c01551
5 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
WindowServer/WSWindowManager.cpp
View file

@ -755,12 +755,8 @@ void WSWindowManager::set_active_window(WSWindow* window)
WSMessageLoop::the().post_message(m_active_window.ptr(), make<WSMessage>(WSMessage::WindowActivated));
invalidate(*m_active_window);
int client_id = window->client_id();
auto* client = WSClientConnection::from_client_id(client_id);
if (!client) {
dbgprintf("WSWindow{%p} (type=%u) has no client! (id=%d)\n", window, window->type(), client_id);
ASSERT_NOT_REACHED();
}
auto* client = window->client();
ASSERT(client);
set_current_menubar(client->app_menubar());
}
}
@ -846,16 +842,16 @@ void WSWindowManager::close_menubar(WSMenuBar& menubar)
set_current_menubar(nullptr);
}
int WSWindowManager::active_client_id() const
const WSClientConnection* WSWindowManager::active_client() const
{
if (m_active_window)
return m_active_window->client_id();
return m_active_window->client();
return 0;
}
void WSWindowManager::notify_client_changed_app_menubar(WSClientConnection& client)
{
if (active_client_id() == client.client_id())
if (active_client() == &client)
set_current_menubar(client.app_menubar());
invalidate();
}