From 57edcb54c221e7f0352e0f17ffe70485398b4c71 Mon Sep 17 00:00:00 2001 From: asliturk Date: Sun, 9 Feb 2020 11:53:24 +0300 Subject: [PATCH] MenuApplets: Add UserName applet. Move code from WindowServer.WSMenuManager to the applet. --- Kernel/build-root-filesystem.sh | 1 + MenuApplets/UserName/.gitignore | 1 + MenuApplets/UserName/Makefile | 7 +++ MenuApplets/UserName/main.cpp | 106 ++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 MenuApplets/UserName/.gitignore create mode 100644 MenuApplets/UserName/Makefile create mode 100644 MenuApplets/UserName/main.cpp diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh index 07c5ef13bd3..d1177f5a818 100755 --- a/Kernel/build-root-filesystem.sh +++ b/Kernel/build-root-filesystem.sh @@ -152,6 +152,7 @@ cp ../Shell/Shell mnt/bin/Shell cp ../MenuApplets/Audio/Audio.MenuApplet mnt/bin/ cp ../MenuApplets/CPUGraph/CPUGraph.MenuApplet mnt/bin/ cp ../MenuApplets/Clock/Clock.MenuApplet mnt/bin/ +cp ../MenuApplets/UserName/UserName.MenuApplet mnt/bin echo "done" printf "installing dynamic libraries... " diff --git a/MenuApplets/UserName/.gitignore b/MenuApplets/UserName/.gitignore new file mode 100644 index 00000000000..7aeb4e8be77 --- /dev/null +++ b/MenuApplets/UserName/.gitignore @@ -0,0 +1 @@ +UserName.MenuApplet diff --git a/MenuApplets/UserName/Makefile b/MenuApplets/UserName/Makefile new file mode 100644 index 00000000000..13713befeee --- /dev/null +++ b/MenuApplets/UserName/Makefile @@ -0,0 +1,7 @@ +OBJS = main.o + +PROGRAM = UserName.MenuApplet + +LIB_DEPS = GUI IPC Gfx Core + +include ../../Makefile.common diff --git a/MenuApplets/UserName/main.cpp b/MenuApplets/UserName/main.cpp new file mode 100644 index 00000000000..34d590993d8 --- /dev/null +++ b/MenuApplets/UserName/main.cpp @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2020-2020, Hüseyin Aslıtürk + * 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 +#include +#include +#include +#include +#include + +class UserNameWidget final : public GUI::Widget { + C_OBJECT(UserNameWidget) +public: + UserNameWidget() + : GUI::Widget(nullptr) + { + m_username = getlogin(); + m_username_width = Gfx::Font::default_bold_font().width(m_username); + } + + virtual ~UserNameWidget() override {} + + int get_width() + { + return m_username_width + menubar_menu_margin(); + } + +private: + static int menubar_menu_margin() { return 4; } + + virtual void paint_event(GUI::PaintEvent& event) override + { + GUI::Painter painter(*this); + painter.fill_rect(event.rect(), palette().window()); + painter.draw_text(event.rect(), m_username, Gfx::Font::default_bold_font(), Gfx::TextAlignment::Center, palette().window_text()); + } + + String m_username; + int m_username_width; +}; + +int main(int argc, char** argv) +{ + if (pledge("stdio shared_buffer rpath cpath unix fattr", nullptr) < 0) { + perror("pledge"); + return 1; + } + + if (unveil("/res", "r") < 0) { + perror("unveil"); + return 1; + } + + if (unveil("/tmp", "rwc") < 0) { + perror("unveil"); + return 1; + } + + if (unveil("/etc/passwd", "r") < 0) { + perror("unveil"); + return 1; + } + + unveil(nullptr, nullptr); + + GUI::Application app(argc, argv); + + auto window = GUI::Window::construct(); + window->set_window_type(GUI::WindowType::MenuApplet); + + auto widget = UserNameWidget::construct(); + + window->resize(widget->get_width(), 16); + window->set_main_widget(widget); + window->show(); + + if (pledge("stdio shared_buffer rpath", nullptr) < 0) { + perror("pledge"); + return 1; + } + + return app.exec(); +}