NotificationServer: Add a system service for desktop notifications
This patch adds NotificationServer, which runs as the "notify" user and provides an IPC API for desktop notifications. LibGUI gains the GUI::Notification class for showing notifications. NotificationServer is spawned on demand and will unspawn after dimissing all visible notifications. :^) Finally, this also comes with a small /bin/notify utility.
This commit is contained in:
parent
a6e69bda71
commit
9f54ea9bcd
Notes:
sideshowbarker
2024-07-19 09:16:10 +09:00
Author: https://github.com/awesomekling Commit: https://github.com/SerenityOS/serenity/commit/9f54ea9bcd8
16 changed files with 486 additions and 1 deletions
|
@ -20,6 +20,14 @@ Priority=low
|
||||||
KeepAlive=1
|
KeepAlive=1
|
||||||
User=lookup
|
User=lookup
|
||||||
|
|
||||||
|
[NotificationServer]
|
||||||
|
Socket=/tmp/portal/notify
|
||||||
|
SocketPermissions=660
|
||||||
|
Lazy=1
|
||||||
|
Priority=low
|
||||||
|
KeepAlive=1
|
||||||
|
User=notify
|
||||||
|
|
||||||
[WindowServer]
|
[WindowServer]
|
||||||
Socket=/tmp/portal/window
|
Socket=/tmp/portal/window
|
||||||
SocketPermissions=660
|
SocketPermissions=660
|
||||||
|
|
|
@ -5,5 +5,6 @@ phys:x:3:window
|
||||||
audio:x:4:anon
|
audio:x:4:anon
|
||||||
lookup:x:10:protocol,anon
|
lookup:x:10:protocol,anon
|
||||||
protocol:x:11:anon
|
protocol:x:11:anon
|
||||||
window:x:13:anon
|
notify:x:12:anon
|
||||||
|
window:x:13:anon,notify
|
||||||
users:x:100:anon
|
users:x:100:anon
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
root:x:0:0:root:/:/bin/sh
|
root:x:0:0:root:/:/bin/sh
|
||||||
lookup:x:10:10:LookupServer,,,:/:/bin/false
|
lookup:x:10:10:LookupServer,,,:/:/bin/false
|
||||||
protocol:x:11:11:ProtocolServer,,,:/:/bin/false
|
protocol:x:11:11:ProtocolServer,,,:/:/bin/false
|
||||||
|
notify:x:12:12:NotificationServer,,,:/:/bin/false
|
||||||
window:x:13:13:WindowServer,,,:/:/bin/false
|
window:x:13:13:WindowServer,,,:/:/bin/false
|
||||||
anon:x:100:100:Anonymous,,,:/home/anon:/bin/sh
|
anon:x:100:100:Anonymous,,,:/home/anon:/bin/sh
|
||||||
nona:x:200:200:Nona,,,:/home/nona:/bin/sh
|
nona:x:200:200:Nona,,,:/home/nona:/bin/sh
|
||||||
|
|
|
@ -154,6 +154,7 @@ cp ../Servers/AudioServer/AudioServer mnt/bin/AudioServer
|
||||||
cp ../Servers/TTYServer/TTYServer mnt/bin/TTYServer
|
cp ../Servers/TTYServer/TTYServer mnt/bin/TTYServer
|
||||||
cp ../Servers/TelnetServer/TelnetServer mnt/bin/TelnetServer
|
cp ../Servers/TelnetServer/TelnetServer mnt/bin/TelnetServer
|
||||||
cp ../Servers/ProtocolServer/ProtocolServer mnt/bin/ProtocolServer
|
cp ../Servers/ProtocolServer/ProtocolServer mnt/bin/ProtocolServer
|
||||||
|
cp ../Servers/NotificationServer/NotificationServer mnt/bin/NotificationServer
|
||||||
cp ../Servers/WebServer/WebServer mnt/bin/WebServer
|
cp ../Servers/WebServer/WebServer mnt/bin/WebServer
|
||||||
cp ../Shell/Shell mnt/bin/Shell
|
cp ../Shell/Shell mnt/bin/Shell
|
||||||
cp ../MenuApplets/Audio/Audio.MenuApplet mnt/bin/
|
cp ../MenuApplets/Audio/Audio.MenuApplet mnt/bin/
|
||||||
|
|
|
@ -40,6 +40,7 @@ OBJS = \
|
||||||
Model.o \
|
Model.o \
|
||||||
ModelIndex.o \
|
ModelIndex.o \
|
||||||
ModelSelection.o \
|
ModelSelection.o \
|
||||||
|
Notification.o \
|
||||||
Painter.o \
|
Painter.o \
|
||||||
ProgressBar.o \
|
ProgressBar.o \
|
||||||
RadioButton.o \
|
RadioButton.o \
|
||||||
|
@ -71,6 +72,8 @@ LIBRARY = libgui.a
|
||||||
|
|
||||||
Application.cpp: ../../Servers/WindowServer/WindowServerEndpoint.h
|
Application.cpp: ../../Servers/WindowServer/WindowServerEndpoint.h
|
||||||
|
|
||||||
|
Notification.cpp: ../../Servers/NotificationServer/NotificationServerEndpoint.h
|
||||||
|
|
||||||
../../Servers/WindowServer/WindowServerEndpoint.h:
|
../../Servers/WindowServer/WindowServerEndpoint.h:
|
||||||
@flock $(dir $(@)) $(MAKE) -C $(dir $(@))
|
@flock $(dir $(@)) $(MAKE) -C $(dir $(@))
|
||||||
|
|
||||||
|
|
48
Libraries/LibGUI/Notification.cpp
Normal file
48
Libraries/LibGUI/Notification.cpp
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
#include <LibGUI/Notification.h>
|
||||||
|
#include <LibIPC/ServerConnection.h>
|
||||||
|
#include <NotificationServer/NotificationClientEndpoint.h>
|
||||||
|
#include <NotificationServer/NotificationServerEndpoint.h>
|
||||||
|
|
||||||
|
namespace GUI {
|
||||||
|
|
||||||
|
class NotificationServerConnection : public IPC::ServerConnection<NotificationClientEndpoint, NotificationServerEndpoint>
|
||||||
|
, public NotificationClientEndpoint {
|
||||||
|
C_OBJECT(NotificationServerConnection)
|
||||||
|
public:
|
||||||
|
virtual void handshake() override
|
||||||
|
{
|
||||||
|
auto response = send_sync<Messages::NotificationServer::Greet>();
|
||||||
|
set_my_client_id(response->client_id());
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
NotificationServerConnection()
|
||||||
|
: IPC::ServerConnection<NotificationClientEndpoint, NotificationServerEndpoint>(*this, "/tmp/portal/notify")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
virtual void handle(const Messages::NotificationClient::Dummy&) override {}
|
||||||
|
};
|
||||||
|
|
||||||
|
Notification::Notification()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
Notification::~Notification()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static NotificationServerConnection& notification_server_connection()
|
||||||
|
{
|
||||||
|
static NotificationServerConnection* connection;
|
||||||
|
if (!connection)
|
||||||
|
connection = &NotificationServerConnection::construct().leak_ref();
|
||||||
|
return *connection;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Notification::show()
|
||||||
|
{
|
||||||
|
notification_server_connection().post_message(Messages::NotificationServer::ShowNotification(m_text, m_title));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
28
Libraries/LibGUI/Notification.h
Normal file
28
Libraries/LibGUI/Notification.h
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <LibCore/Object.h>
|
||||||
|
|
||||||
|
namespace GUI {
|
||||||
|
|
||||||
|
class Notification : public Core::Object {
|
||||||
|
C_OBJECT(Notification);
|
||||||
|
|
||||||
|
public:
|
||||||
|
virtual ~Notification() override;
|
||||||
|
|
||||||
|
const String& text() const { return m_text; }
|
||||||
|
void set_text(const String& text) { m_text = text; }
|
||||||
|
|
||||||
|
const String& title() const { return m_title; }
|
||||||
|
void set_title(const String& title) { m_title = title; }
|
||||||
|
|
||||||
|
void show();
|
||||||
|
|
||||||
|
private:
|
||||||
|
Notification();
|
||||||
|
|
||||||
|
String m_title;
|
||||||
|
String m_text;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
62
Servers/NotificationServer/ClientConnection.cpp
Normal file
62
Servers/NotificationServer/ClientConnection.cpp
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "ClientConnection.h"
|
||||||
|
#include "NotificationClientEndpoint.h"
|
||||||
|
#include "NotificationWindow.h"
|
||||||
|
#include <AK/HashMap.h>
|
||||||
|
|
||||||
|
namespace NotificationServer {
|
||||||
|
|
||||||
|
static HashMap<int, RefPtr<ClientConnection>> s_connections;
|
||||||
|
|
||||||
|
ClientConnection::ClientConnection(Core::LocalSocket& client_socket, int client_id)
|
||||||
|
: IPC::ClientConnection<NotificationServerEndpoint>(*this, client_socket, client_id)
|
||||||
|
{
|
||||||
|
s_connections.set(client_id, *this);
|
||||||
|
}
|
||||||
|
|
||||||
|
ClientConnection::~ClientConnection()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClientConnection::die()
|
||||||
|
{
|
||||||
|
s_connections.remove(client_id());
|
||||||
|
}
|
||||||
|
|
||||||
|
OwnPtr<Messages::NotificationServer::GreetResponse> ClientConnection::handle(const Messages::NotificationServer::Greet&)
|
||||||
|
{
|
||||||
|
return make<Messages::NotificationServer::GreetResponse>(client_id());
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClientConnection::handle(const Messages::NotificationServer::ShowNotification& message)
|
||||||
|
{
|
||||||
|
auto window = NotificationWindow::construct(message.text(), message.title());
|
||||||
|
window->show();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
49
Servers/NotificationServer/ClientConnection.h
Normal file
49
Servers/NotificationServer/ClientConnection.h
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <LibIPC/ClientConnection.h>
|
||||||
|
#include <NotificationServer/NotificationServerEndpoint.h>
|
||||||
|
|
||||||
|
namespace NotificationServer {
|
||||||
|
|
||||||
|
class ClientConnection final : public IPC::ClientConnection<NotificationServerEndpoint>
|
||||||
|
, public NotificationServerEndpoint {
|
||||||
|
C_OBJECT(ClientConnection)
|
||||||
|
public:
|
||||||
|
~ClientConnection() override;
|
||||||
|
|
||||||
|
virtual void die() override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
explicit ClientConnection(Core::LocalSocket&, int client_id);
|
||||||
|
|
||||||
|
virtual OwnPtr<Messages::NotificationServer::GreetResponse> handle(const Messages::NotificationServer::Greet&) override;
|
||||||
|
virtual void handle(const Messages::NotificationServer::ShowNotification&) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
24
Servers/NotificationServer/Makefile
Normal file
24
Servers/NotificationServer/Makefile
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
OBJS = \
|
||||||
|
main.o \
|
||||||
|
ClientConnection.o \
|
||||||
|
NotificationWindow.o
|
||||||
|
|
||||||
|
PROGRAM = NotificationServer
|
||||||
|
|
||||||
|
LIB_DEPS = GUI Gfx Core IPC
|
||||||
|
|
||||||
|
EXTRA_CLEAN = NotificationServerEndpoint.h NotificationClientEndpoint.h
|
||||||
|
|
||||||
|
*.cpp: NotificationServerEndpoint.h NotificationClientEndpoint.h
|
||||||
|
|
||||||
|
NotificationServerEndpoint.h: NotificationServer.ipc | IPCCOMPILER
|
||||||
|
@echo "IPC $<"; $(IPCCOMPILER) $< > $@
|
||||||
|
|
||||||
|
NotificationClientEndpoint.h: NotificationClient.ipc | IPCCOMPILER
|
||||||
|
@echo "IPC $<"; $(IPCCOMPILER) $< > $@
|
||||||
|
|
||||||
|
install:
|
||||||
|
mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/NotificationServer/
|
||||||
|
cp *.h $(SERENITY_BASE_DIR)/Root/usr/include/NotificationServer/
|
||||||
|
|
||||||
|
include ../../Makefile.common
|
4
Servers/NotificationServer/NotificationClient.ipc
Normal file
4
Servers/NotificationServer/NotificationClient.ipc
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
endpoint NotificationClient = 92
|
||||||
|
{
|
||||||
|
Dummy() =|
|
||||||
|
}
|
7
Servers/NotificationServer/NotificationServer.ipc
Normal file
7
Servers/NotificationServer/NotificationServer.ipc
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
endpoint NotificationServer = 95
|
||||||
|
{
|
||||||
|
// Basic protocol
|
||||||
|
Greet() => (i32 client_id)
|
||||||
|
|
||||||
|
ShowNotification(String text, String title) =|
|
||||||
|
}
|
86
Servers/NotificationServer/NotificationWindow.cpp
Normal file
86
Servers/NotificationServer/NotificationWindow.cpp
Normal file
|
@ -0,0 +1,86 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "NotificationWindow.h"
|
||||||
|
#include <AK/HashTable.h>
|
||||||
|
#include <LibGUI/BoxLayout.h>
|
||||||
|
#include <LibGUI/Button.h>
|
||||||
|
#include <LibGUI/Desktop.h>
|
||||||
|
#include <LibGUI/Label.h>
|
||||||
|
#include <LibGUI/Widget.h>
|
||||||
|
#include <LibGfx/Font.h>
|
||||||
|
|
||||||
|
namespace NotificationServer {
|
||||||
|
|
||||||
|
static HashTable<RefPtr<NotificationWindow>> s_windows;
|
||||||
|
|
||||||
|
NotificationWindow::NotificationWindow(const String& text, const String& title)
|
||||||
|
{
|
||||||
|
s_windows.set(this);
|
||||||
|
|
||||||
|
set_window_type(GUI::WindowType::Tooltip);
|
||||||
|
|
||||||
|
Gfx::Rect rect;
|
||||||
|
rect.set_width(200);
|
||||||
|
rect.set_height(40);
|
||||||
|
rect.set_location(GUI::Desktop::the().rect().top_right().translated(-rect.width() - 8, 26));
|
||||||
|
set_rect(rect);
|
||||||
|
|
||||||
|
auto widget = GUI::Widget::construct();
|
||||||
|
widget->set_fill_with_background_color(true);
|
||||||
|
|
||||||
|
widget->set_layout(make<GUI::HorizontalBoxLayout>());
|
||||||
|
widget->layout()->set_margins({ 4, 4, 4, 4 });
|
||||||
|
widget->layout()->set_spacing(4);
|
||||||
|
|
||||||
|
auto left_container = GUI::Widget::construct(widget.ptr());
|
||||||
|
left_container->set_layout(make<GUI::VerticalBoxLayout>());
|
||||||
|
|
||||||
|
auto title_label = GUI::Label::construct(title, left_container);
|
||||||
|
title_label->set_font(Gfx::Font::default_bold_font());
|
||||||
|
title_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||||
|
auto text_label = GUI::Label::construct(text, left_container);
|
||||||
|
text_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||||
|
|
||||||
|
auto right_container = GUI::Widget::construct(widget.ptr());
|
||||||
|
right_container->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||||
|
right_container->set_preferred_size(40, 0);
|
||||||
|
right_container->set_layout(make<GUI::HorizontalBoxLayout>());
|
||||||
|
|
||||||
|
auto button = GUI::Button::construct("Okay", right_container);
|
||||||
|
button->on_click = [this](auto&) {
|
||||||
|
s_windows.remove(this);
|
||||||
|
close();
|
||||||
|
};
|
||||||
|
|
||||||
|
set_main_widget(widget);
|
||||||
|
}
|
||||||
|
|
||||||
|
NotificationWindow::~NotificationWindow()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
43
Servers/NotificationServer/NotificationWindow.h
Normal file
43
Servers/NotificationServer/NotificationWindow.h
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <LibGUI/Window.h>
|
||||||
|
|
||||||
|
namespace NotificationServer {
|
||||||
|
|
||||||
|
class NotificationWindow final : public GUI::Window {
|
||||||
|
C_OBJECT(NotificationWindow);
|
||||||
|
|
||||||
|
public:
|
||||||
|
virtual ~NotificationWindow() override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
NotificationWindow(const String& text, const String& title);
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
71
Servers/NotificationServer/main.cpp
Normal file
71
Servers/NotificationServer/main.cpp
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "ClientConnection.h"
|
||||||
|
#include <LibCore/EventLoop.h>
|
||||||
|
#include <LibCore/LocalServer.h>
|
||||||
|
#include <LibGUI/Application.h>
|
||||||
|
#include <LibGUI/WindowServerConnection.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
if (pledge("stdio shared_buffer accept rpath wpath cpath unix fattr", nullptr) < 0) {
|
||||||
|
perror("pledge");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
GUI::Application app(argc, argv);
|
||||||
|
auto server = Core::LocalServer::construct();
|
||||||
|
|
||||||
|
bool ok = server->take_over_from_system_server();
|
||||||
|
ASSERT(ok);
|
||||||
|
server->on_ready_to_accept = [&] {
|
||||||
|
auto client_socket = server->accept();
|
||||||
|
if (!client_socket) {
|
||||||
|
dbg() << "NotificationServer: accept failed.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
static int s_next_client_id = 0;
|
||||||
|
int client_id = ++s_next_client_id;
|
||||||
|
IPC::new_client_connection<NotificationServer::ClientConnection>(*client_socket, client_id);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (unveil("/res", "r") < 0) {
|
||||||
|
perror("unveil");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
unveil(nullptr, nullptr);
|
||||||
|
|
||||||
|
if (pledge("stdio shared_buffer accept rpath", nullptr) < 0) {
|
||||||
|
perror("pledge");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return app.exec();
|
||||||
|
}
|
49
Userland/notify.cpp
Normal file
49
Userland/notify.cpp
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <LibCore/ArgsParser.h>
|
||||||
|
#include <LibGUI/Application.h>
|
||||||
|
#include <LibGUI/Notification.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
GUI::Application app(argc, argv);
|
||||||
|
|
||||||
|
Core::ArgsParser args_parser;
|
||||||
|
const char* title = nullptr;
|
||||||
|
const char* message = nullptr;
|
||||||
|
args_parser.add_positional_argument(title, "Title of the notification", "title");
|
||||||
|
args_parser.add_positional_argument(message, "Message to display in the notification", "message");
|
||||||
|
args_parser.parse(argc, argv);
|
||||||
|
|
||||||
|
auto notification = GUI::Notification::construct();
|
||||||
|
notification->set_text(message);
|
||||||
|
notification->set_title(title);
|
||||||
|
notification->show();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue