mirror of
https://github.com/RGBCube/serenity
synced 2025-05-16 18:35:07 +00:00
LibGUI: Put all classes in the GUI namespace and remove the leading G
This took me a moment. Welcome to the new world of GUI::Widget! :^)
This commit is contained in:
Andreas Kling
parent
2d39da5405
commit
c5bd9d4ed1
337 changed files with 5400 additions and 4816 deletions
|
|
@ -39,11 +39,13 @@
|
|||
|
||||
//#define GEVENTLOOP_DEBUG
|
||||
|
||||
GWindowServerConnection& GWindowServerConnection::the()
|
||||
namespace GUI {
|
||||
|
||||
WindowServerConnection& WindowServerConnection::the()
|
||||
{
|
||||
static GWindowServerConnection* s_connection = nullptr;
|
||||
static WindowServerConnection* s_connection = nullptr;
|
||||
if (!s_connection)
|
||||
s_connection = new GWindowServerConnection;
|
||||
s_connection = new WindowServerConnection;
|
||||
return *s_connection;
|
||||
}
|
||||
|
||||
|
|
@ -52,91 +54,91 @@ static void set_system_theme_from_shared_buffer_id(int id)
|
|||
auto system_theme = SharedBuffer::create_from_shared_buffer_id(id);
|
||||
ASSERT(system_theme);
|
||||
set_system_theme(*system_theme);
|
||||
GApplication::the().set_system_palette(*system_theme);
|
||||
Application::the().set_system_palette(*system_theme);
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handshake()
|
||||
void WindowServerConnection::handshake()
|
||||
{
|
||||
auto response = send_sync<WindowServer::Greet>();
|
||||
set_my_client_id(response->client_id());
|
||||
set_system_theme_from_shared_buffer_id(response->system_theme_buffer_id());
|
||||
GDesktop::the().did_receive_screen_rect({}, response->screen_rect());
|
||||
Desktop::the().did_receive_screen_rect({}, response->screen_rect());
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::UpdateSystemTheme& message)
|
||||
void WindowServerConnection::handle(const WindowClient::UpdateSystemTheme& message)
|
||||
{
|
||||
set_system_theme_from_shared_buffer_id(message.system_theme_buffer_id());
|
||||
GWindow::update_all_windows({});
|
||||
Window::update_all_windows({});
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::Paint& message)
|
||||
void WindowServerConnection::handle(const WindowClient::Paint& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("WID=%d Paint\n", message.window_id());
|
||||
#endif
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GMultiPaintEvent>(message.rects(), message.window_size()));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<MultiPaintEvent>(message.rects(), message.window_size()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WindowResized& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WindowResized& message)
|
||||
{
|
||||
if (auto* window = GWindow::from_window_id(message.window_id())) {
|
||||
Core::EventLoop::current().post_event(*window, make<GResizeEvent>(message.old_rect().size(), message.new_rect().size()));
|
||||
if (auto* window = Window::from_window_id(message.window_id())) {
|
||||
Core::EventLoop::current().post_event(*window, make<ResizeEvent>(message.old_rect().size(), message.new_rect().size()));
|
||||
}
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WindowActivated& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WindowActivated& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("(%d) WID=%d WindowActivated\n", getpid(), message.window_id());
|
||||
#endif
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GEvent>(GEvent::WindowBecameActive));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<Event>(Event::WindowBecameActive));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WindowDeactivated& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WindowDeactivated& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("(%d) WID=%d WindowDeactivated\n", getpid(), message.window_id());
|
||||
#endif
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GEvent>(GEvent::WindowBecameInactive));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<Event>(Event::WindowBecameInactive));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WindowCloseRequest& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WindowCloseRequest& message)
|
||||
{
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GEvent>(GEvent::WindowCloseRequest));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<Event>(Event::WindowCloseRequest));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WindowEntered& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WindowEntered& message)
|
||||
{
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GEvent>(GEvent::WindowEntered));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<Event>(Event::WindowEntered));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WindowLeft& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WindowLeft& message)
|
||||
{
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GEvent>(GEvent::WindowLeft));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<Event>(Event::WindowLeft));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::KeyDown& message)
|
||||
void WindowServerConnection::handle(const WindowClient::KeyDown& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("WID=%d KeyDown character=0x%02x\n", message.window_id(), message.character());
|
||||
#endif
|
||||
auto* window = GWindow::from_window_id(message.window_id());
|
||||
auto* window = Window::from_window_id(message.window_id());
|
||||
if (!window)
|
||||
return;
|
||||
|
||||
auto key_event = make<GKeyEvent>(GEvent::KeyDown, message.key(), message.modifiers());
|
||||
auto key_event = make<KeyEvent>(Event::KeyDown, message.key(), message.modifiers());
|
||||
if (message.character() != '\0') {
|
||||
char ch = message.character();
|
||||
key_event->m_text = String(&ch, 1);
|
||||
}
|
||||
|
||||
GAction* action = nullptr;
|
||||
Action* action = nullptr;
|
||||
|
||||
if (auto* focused_widget = window->focused_widget())
|
||||
action = focused_widget->action_for_key_event(*key_event);
|
||||
|
|
@ -145,7 +147,7 @@ void GWindowServerConnection::handle(const WindowClient::KeyDown& message)
|
|||
action = window->action_for_key_event(*key_event);
|
||||
|
||||
if (!action)
|
||||
action = GApplication::the().action_for_key_event(*key_event);
|
||||
action = Application::the().action_for_key_event(*key_event);
|
||||
|
||||
if (action && action->is_enabled()) {
|
||||
action->activate();
|
||||
|
|
@ -154,16 +156,16 @@ void GWindowServerConnection::handle(const WindowClient::KeyDown& message)
|
|||
Core::EventLoop::current().post_event(*window, move(key_event));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::KeyUp& message)
|
||||
void WindowServerConnection::handle(const WindowClient::KeyUp& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("WID=%d KeyUp character=0x%02x\n", message.window_id(), message.character());
|
||||
#endif
|
||||
auto* window = GWindow::from_window_id(message.window_id());
|
||||
auto* window = Window::from_window_id(message.window_id());
|
||||
if (!window)
|
||||
return;
|
||||
|
||||
auto key_event = make<GKeyEvent>(GEvent::KeyUp, message.key(), message.modifiers());
|
||||
auto key_event = make<KeyEvent>(Event::KeyUp, message.key(), message.modifiers());
|
||||
if (message.character() != '\0') {
|
||||
char ch = message.character();
|
||||
key_event->m_text = String(&ch, 1);
|
||||
|
|
@ -172,153 +174,155 @@ void GWindowServerConnection::handle(const WindowClient::KeyUp& message)
|
|||
Core::EventLoop::current().post_event(*window, move(key_event));
|
||||
}
|
||||
|
||||
GMouseButton to_gmousebutton(u32 button)
|
||||
MouseButton to_gmousebutton(u32 button)
|
||||
{
|
||||
switch (button) {
|
||||
case 0:
|
||||
return GMouseButton::None;
|
||||
return MouseButton::None;
|
||||
case 1:
|
||||
return GMouseButton::Left;
|
||||
return MouseButton::Left;
|
||||
case 2:
|
||||
return GMouseButton::Right;
|
||||
return MouseButton::Right;
|
||||
case 4:
|
||||
return GMouseButton::Middle;
|
||||
return MouseButton::Middle;
|
||||
default:
|
||||
ASSERT_NOT_REACHED();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::MouseDown& message)
|
||||
void WindowServerConnection::handle(const WindowClient::MouseDown& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("WID=%d MouseDown %d,%d,%d\n", message.window_id(), message.mouse_position().x(), message.mouse_position().y(), message.wheel_delta();
|
||||
#endif
|
||||
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GMouseEvent>(GEvent::MouseDown, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<MouseEvent>(Event::MouseDown, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::MouseUp& message)
|
||||
void WindowServerConnection::handle(const WindowClient::MouseUp& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("WID=%d MouseUp %d,%d,%d\n", message.window_id(), message.mouse_position().x(), message.mouse_position().y(), message.wheel_delta();
|
||||
#endif
|
||||
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GMouseEvent>(GEvent::MouseUp, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<MouseEvent>(Event::MouseUp, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::MouseMove& message)
|
||||
void WindowServerConnection::handle(const WindowClient::MouseMove& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("WID=%d MouseMove %d,%d,%d\n", message.window_id(), message.mouse_position().x(), message.mouse_position().y(), message.wheel_delta();
|
||||
#endif
|
||||
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GMouseEvent>(GEvent::MouseMove, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<MouseEvent>(Event::MouseMove, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::MouseDoubleClick& message)
|
||||
void WindowServerConnection::handle(const WindowClient::MouseDoubleClick& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("WID=%d MouseDoubleClick %d,%d,%d\n", message.window_id(), message.mouse_position().x(), message.mouse_position().y(), message.wheel_delta();
|
||||
#endif
|
||||
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GMouseEvent>(GEvent::MouseDoubleClick, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<MouseEvent>(Event::MouseDoubleClick, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::MouseWheel& message)
|
||||
void WindowServerConnection::handle(const WindowClient::MouseWheel& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("WID=%d MouseWheel %d,%d,%d\n", message.window_id(), message.mouse_position().x(), message.mouse_position().y(), message.wheel_delta();
|
||||
#endif
|
||||
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GMouseEvent>(GEvent::MouseWheel, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<MouseEvent>(Event::MouseWheel, message.mouse_position(), message.buttons(), to_gmousebutton(message.button()), message.modifiers(), message.wheel_delta()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::MenuItemActivated& message)
|
||||
void WindowServerConnection::handle(const WindowClient::MenuItemActivated& message)
|
||||
{
|
||||
auto* menu = GMenu::from_menu_id(message.menu_id());
|
||||
auto* menu = Menu::from_menu_id(message.menu_id());
|
||||
if (!menu) {
|
||||
dbgprintf("GEventLoop received event for invalid menu ID %d\n", message.menu_id());
|
||||
dbgprintf("EventLoop received event for invalid menu ID %d\n", message.menu_id());
|
||||
return;
|
||||
}
|
||||
if (auto* action = menu->action_at(message.identifier()))
|
||||
action->activate(menu);
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WM_WindowStateChanged& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WM_WindowStateChanged& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("GEventLoop: handle_wm_event: %d\n", (int)event.type);
|
||||
dbgprintf("EventLoop: handle_wm_event: %d\n", (int)event.type);
|
||||
#endif
|
||||
if (auto* window = GWindow::from_window_id(message.wm_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GWMWindowStateChangedEvent>(message.client_id(), message.window_id(), message.title(), message.rect(), message.is_active(), (GWindowType)message.window_type(), message.is_minimized()));
|
||||
if (auto* window = Window::from_window_id(message.wm_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<WMWindowStateChangedEvent>(message.client_id(), message.window_id(), message.title(), message.rect(), message.is_active(), static_cast<WindowType>(message.window_type()), message.is_minimized()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WM_WindowRectChanged& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WM_WindowRectChanged& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("GEventLoop: handle_wm_event: %d\n", (int)event.type);
|
||||
dbgprintf("EventLoop: handle_wm_event: %d\n", (int)event.type);
|
||||
#endif
|
||||
if (auto* window = GWindow::from_window_id(message.wm_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GWMWindowRectChangedEvent>(message.client_id(), message.window_id(), message.rect()));
|
||||
if (auto* window = Window::from_window_id(message.wm_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<WMWindowRectChangedEvent>(message.client_id(), message.window_id(), message.rect()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WM_WindowIconBitmapChanged& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WM_WindowIconBitmapChanged& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("GEventLoop: handle_wm_event: %d\n", (int)event.type);
|
||||
dbgprintf("EventLoop: handle_wm_event: %d\n", (int)event.type);
|
||||
#endif
|
||||
if (auto* window = GWindow::from_window_id(message.wm_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GWMWindowIconBitmapChangedEvent>(message.client_id(), message.window_id(), message.icon_buffer_id(), message.icon_size()));
|
||||
if (auto* window = Window::from_window_id(message.wm_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<WMWindowIconBitmapChangedEvent>(message.client_id(), message.window_id(), message.icon_buffer_id(), message.icon_size()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WM_WindowRemoved& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WM_WindowRemoved& message)
|
||||
{
|
||||
#ifdef GEVENTLOOP_DEBUG
|
||||
dbgprintf("GEventLoop: handle_wm_event: %d\n", (int)event.type);
|
||||
dbgprintf("EventLoop: handle_wm_event: %d\n", (int)event.type);
|
||||
#endif
|
||||
if (auto* window = GWindow::from_window_id(message.wm_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GWMWindowRemovedEvent>(message.client_id(), message.window_id()));
|
||||
if (auto* window = Window::from_window_id(message.wm_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<WMWindowRemovedEvent>(message.client_id(), message.window_id()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::ScreenRectChanged& message)
|
||||
void WindowServerConnection::handle(const WindowClient::ScreenRectChanged& message)
|
||||
{
|
||||
GDesktop::the().did_receive_screen_rect({}, message.rect());
|
||||
Desktop::the().did_receive_screen_rect({}, message.rect());
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::ClipboardContentsChanged& message)
|
||||
void WindowServerConnection::handle(const WindowClient::ClipboardContentsChanged& message)
|
||||
{
|
||||
GClipboard::the().did_receive_clipboard_contents_changed({}, message.content_type());
|
||||
Clipboard::the().did_receive_clipboard_contents_changed({}, message.content_type());
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::AsyncSetWallpaperFinished&)
|
||||
void WindowServerConnection::handle(const WindowClient::AsyncSetWallpaperFinished&)
|
||||
{
|
||||
// This is handled manually by GDesktop::set_wallpaper().
|
||||
// This is handled manually by Desktop::set_wallpaper().
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::DragDropped& message)
|
||||
void WindowServerConnection::handle(const WindowClient::DragDropped& message)
|
||||
{
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<GDropEvent>(message.mouse_position(), message.text(), message.data_type(), message.data()));
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
Core::EventLoop::current().post_event(*window, make<DropEvent>(message.mouse_position(), message.text(), message.data_type(), message.data()));
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::DragAccepted&)
|
||||
void WindowServerConnection::handle(const WindowClient::DragAccepted&)
|
||||
{
|
||||
GDragOperation::notify_accepted({});
|
||||
DragOperation::notify_accepted({});
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::DragCancelled&)
|
||||
void WindowServerConnection::handle(const WindowClient::DragCancelled&)
|
||||
{
|
||||
GDragOperation::notify_cancelled({});
|
||||
DragOperation::notify_cancelled({});
|
||||
}
|
||||
|
||||
void GWindowServerConnection::handle(const WindowClient::WindowStateChanged& message)
|
||||
void WindowServerConnection::handle(const WindowClient::WindowStateChanged& message)
|
||||
{
|
||||
if (auto* window = GWindow::from_window_id(message.window_id()))
|
||||
if (auto* window = Window::from_window_id(message.window_id()))
|
||||
window->notify_state_changed({}, message.minimized(), message.occluded());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue