mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 17:17:45 +00:00
WindowServer+Keymap+LibGUI: Add widget to display current keymap
This commit is contained in:
parent
68a01f0e27
commit
b9c558f6c6
14 changed files with 160 additions and 17 deletions
|
@ -3,3 +3,4 @@ add_subdirectory(ClipboardHistory)
|
|||
add_subdirectory(Network)
|
||||
add_subdirectory(ResourceGraph)
|
||||
add_subdirectory(WorkspacePicker)
|
||||
add_subdirectory(Keymap)
|
||||
|
|
13
Userland/Applets/Keymap/CMakeLists.txt
Normal file
13
Userland/Applets/Keymap/CMakeLists.txt
Normal file
|
@ -0,0 +1,13 @@
|
|||
serenity_component(
|
||||
Keymap.Applet
|
||||
REQUIRED
|
||||
TARGETS Keymap.Applet
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
KeymapStatusWindow.cpp
|
||||
main.cpp
|
||||
)
|
||||
|
||||
serenity_bin(Keymap.Applet)
|
||||
target_link_libraries(Keymap.Applet LibGUI LibCore LibGfx LibMain LibKeyboard)
|
44
Userland/Applets/Keymap/KeymapStatusWindow.cpp
Normal file
44
Userland/Applets/Keymap/KeymapStatusWindow.cpp
Normal file
|
@ -0,0 +1,44 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Timur Sultanov <SultanovTS@yandex.ru>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "KeymapStatusWindow.h"
|
||||
#include <LibGUI/Painter.h>
|
||||
#include <LibGUI/WindowManagerServerConnection.h>
|
||||
#include <LibKeyboard/CharacterMap.h>
|
||||
|
||||
KeymapStatusWindow::KeymapStatusWindow()
|
||||
{
|
||||
set_window_type(GUI::WindowType::Applet);
|
||||
set_has_alpha_channel(true);
|
||||
m_label = &set_main_widget<GUI::Label>();
|
||||
|
||||
auto current_keymap = MUST(Keyboard::CharacterMap::fetch_system_map());
|
||||
auto current_keymap_name = current_keymap.character_map_name();
|
||||
m_label->set_tooltip(current_keymap_name);
|
||||
m_label->set_text(current_keymap_name.substring(0, 2));
|
||||
}
|
||||
|
||||
KeymapStatusWindow::~KeymapStatusWindow()
|
||||
{
|
||||
}
|
||||
|
||||
void KeymapStatusWindow::wm_event(GUI::WMEvent& event)
|
||||
{
|
||||
if (event.type() == GUI::WMEvent::WM_KeymapChanged) {
|
||||
auto& keymap_event = static_cast<GUI::WMKeymapChangedEvent&>(event);
|
||||
auto keymap = keymap_event.keymap();
|
||||
set_keymap_text(keymap);
|
||||
}
|
||||
}
|
||||
|
||||
void KeymapStatusWindow::set_keymap_text(const String& keymap)
|
||||
{
|
||||
GUI::Painter painter(*m_label);
|
||||
painter.clear_rect(m_label->rect(), Color::from_rgba(0));
|
||||
|
||||
m_label->set_tooltip(keymap);
|
||||
m_label->set_text(keymap.substring(0, 2));
|
||||
}
|
27
Userland/Applets/Keymap/KeymapStatusWindow.h
Normal file
27
Userland/Applets/Keymap/KeymapStatusWindow.h
Normal file
|
@ -0,0 +1,27 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Timur Sultanov <SultanovTS@yandex.ru>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LibGUI/Label.h>
|
||||
#include <LibGUI/Window.h>
|
||||
|
||||
class KeymapStatusWidget;
|
||||
|
||||
class KeymapStatusWindow final : public GUI::Window {
|
||||
C_OBJECT(KeymapStatusWindow)
|
||||
public:
|
||||
virtual ~KeymapStatusWindow() override;
|
||||
|
||||
private:
|
||||
void wm_event(GUI::WMEvent&) override;
|
||||
|
||||
KeymapStatusWindow();
|
||||
|
||||
RefPtr<GUI::Label> m_label;
|
||||
|
||||
void set_keymap_text(String const& keymap);
|
||||
};
|
30
Userland/Applets/Keymap/main.cpp
Normal file
30
Userland/Applets/Keymap/main.cpp
Normal file
|
@ -0,0 +1,30 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Timur Sultanov <SultanovTS@yandex.ru>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "KeymapStatusWindow.h"
|
||||
#include <LibCore/System.h>
|
||||
#include <LibGUI/Application.h>
|
||||
#include <LibGUI/WindowManagerServerConnection.h>
|
||||
#include <LibMain/Main.h>
|
||||
#include <WindowServer/Window.h>
|
||||
|
||||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
{
|
||||
TRY(Core::System::pledge("stdio recvfd sendfd rpath unix getkeymap"));
|
||||
|
||||
auto app = TRY(GUI::Application::try_create(arguments));
|
||||
|
||||
auto window = TRY(KeymapStatusWindow::try_create());
|
||||
window->set_has_alpha_channel(true);
|
||||
window->set_title("Keymap");
|
||||
window->resize(16, 16);
|
||||
window->show();
|
||||
window->make_window_manager(WindowServer::WMEventMask::KeymapChanged);
|
||||
|
||||
TRY(Core::System::pledge("stdio recvfd sendfd rpath getkeymap"));
|
||||
|
||||
return app->exec();
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue