
This change unfortunately cannot be atomically made without a single commit changing everything. Most of the important changes are in LibIPC/Connection.cpp, LibIPC/ServerConnection.cpp and LibCore/LocalServer.cpp. The notable changes are: - IPCCompiler now generates the decode and decode_message functions such that they take a Core::Stream::LocalSocket instead of the socket fd. - IPC::Decoder now uses the receive_fd method of LocalSocket instead of doing system calls directly on the fd. - IPC::ConnectionBase and related classes now use the Stream API functions. - IPC::ServerConnection no longer constructs the socket itself; instead, a convenience macro, IPC_CLIENT_CONNECTION, is used in place of C_OBJECT and will generate a static try_create factory function for the ServerConnection subclass. The subclass is now responsible for passing the socket constructed in this function to its ServerConnection base; the socket is passed as the first argument to the constructor (as a NonnullOwnPtr<Core::Stream::LocalServer>) before any other arguments. - The functionality regarding taking over sockets from SystemServer has been moved to LibIPC/SystemServerTakeover.cpp. The Core::LocalSocket implementation of this functionality hasn't been deleted due to my intention of removing this class in the near future and to reduce noise on this (already quite noisy) PR.
90 lines
2.1 KiB
C++
90 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <LibGUI/Notification.h>
|
|
#include <LibIPC/ServerConnection.h>
|
|
#include <NotificationServer/NotificationClientEndpoint.h>
|
|
#include <NotificationServer/NotificationServerEndpoint.h>
|
|
|
|
namespace GUI {
|
|
|
|
class NotificationServerConnection final
|
|
: public IPC::ServerConnection<NotificationClientEndpoint, NotificationServerEndpoint>
|
|
, public NotificationClientEndpoint {
|
|
IPC_CLIENT_CONNECTION(NotificationServerConnection, "/tmp/portal/notify")
|
|
|
|
friend class Notification;
|
|
|
|
public:
|
|
virtual void die() override
|
|
{
|
|
m_notification->connection_closed();
|
|
}
|
|
|
|
private:
|
|
explicit NotificationServerConnection(NonnullOwnPtr<Core::Stream::LocalSocket> socket, Notification* notification)
|
|
: IPC::ServerConnection<NotificationClientEndpoint, NotificationServerEndpoint>(*this, move(socket))
|
|
, m_notification(notification)
|
|
{
|
|
}
|
|
Notification* m_notification;
|
|
};
|
|
|
|
Notification::Notification()
|
|
{
|
|
}
|
|
|
|
Notification::~Notification()
|
|
{
|
|
}
|
|
|
|
void Notification::show()
|
|
{
|
|
VERIFY(!m_shown && !m_destroyed);
|
|
auto icon = m_icon ? m_icon->to_shareable_bitmap() : Gfx::ShareableBitmap();
|
|
m_connection = NotificationServerConnection::try_create(this).release_value_but_fixme_should_propagate_errors();
|
|
m_connection->show_notification(m_text, m_title, icon);
|
|
m_shown = true;
|
|
}
|
|
|
|
void Notification::close()
|
|
{
|
|
VERIFY(m_shown);
|
|
if (!m_destroyed) {
|
|
m_connection->close_notification();
|
|
connection_closed();
|
|
return;
|
|
}
|
|
}
|
|
|
|
bool Notification::update()
|
|
{
|
|
VERIFY(m_shown);
|
|
if (m_destroyed) {
|
|
return false;
|
|
}
|
|
|
|
if (m_text_dirty || m_title_dirty) {
|
|
m_connection->update_notification_text(m_text, m_title);
|
|
m_text_dirty = false;
|
|
m_title_dirty = false;
|
|
}
|
|
|
|
if (m_icon_dirty) {
|
|
m_connection->update_notification_icon(m_icon ? m_icon->to_shareable_bitmap() : Gfx::ShareableBitmap());
|
|
m_icon_dirty = false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void Notification::connection_closed()
|
|
{
|
|
m_connection.clear();
|
|
m_destroyed = true;
|
|
}
|
|
|
|
}
|