RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 23:47:45 +00:00
Code Issues Activity Actions

Userland: Make IPC results with one return value available directly

Browse source 
This changes client methods so that they return the IPC response's
return value directly - instead of the response struct - for IPC
methods which only have a single return value.
This commit is contained in:
Gunnar Beutner 2021-05-03 13:55:29 +02:00 • committed by Andreas Kling
parent 5bb79ea0a7
commit eb21aa65d1
18 changed files with 58 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGUI/Application.cpp
View file

@ -186,7 +186,7 @@ void Application::tooltip_show_timer_did_fire()
Gfx::IntRect desktop_rect = Desktop::the().rect();
const int margin = 30;
Gfx::IntPoint adjusted_pos = WindowServerConnection::the().get_global_cursor_position().position();
Gfx::IntPoint adjusted_pos = WindowServerConnection::the().get_global_cursor_position();
adjusted_pos.translate_by(0, 18);

2
Userland/Libraries/LibGUI/Desktop.cpp
View file

@ -59,7 +59,7 @@ bool Desktop::set_wallpaper(const StringView& path, bool save_config)
String Desktop::wallpaper() const
{
return WindowServerConnection::the().get_wallpaper().path();
return WindowServerConnection::the().get_wallpaper();
}
}

4
Userland/Libraries/LibGUI/DragOperation.cpp
View file

@ -37,12 +37,12 @@ DragOperation::Outcome DragOperation::exec()
drag_bitmap = bitmap->to_shareable_bitmap();
}
auto response = WindowServerConnection::the().start_drag(
auto started = WindowServerConnection::the().start_drag(
m_mime_data->text(),
m_mime_data->all_data(),
drag_bitmap);
if (!response.started()) {
if (!started) {
m_outcome = Outcome::Cancelled;
return m_outcome;
}

2
Userland/Libraries/LibGUI/Menu.cpp
View file

@ -85,7 +85,7 @@ void Menu::dismiss()
int Menu::realize_menu(RefPtr<Action> default_action)
{
unrealize_menu();
m_menu_id = WindowServerConnection::the().create_menu(m_name).menu_id();
m_menu_id = WindowServerConnection::the().create_menu(m_name);
dbgln_if(MENU_DEBUG, "GUI::Menu::realize_menu(): New menu ID: {}", m_menu_id);
VERIFY(m_menu_id > 0);

2
Userland/Libraries/LibGUI/Menubar.cpp
View file

@ -30,7 +30,7 @@ Menu& Menubar::add_menu(String name)
int Menubar::realize_menubar()
{
return WindowServerConnection::the().create_menubar().menubar_id();
return WindowServerConnection::the().create_menubar();
}
void Menubar::unrealize_menubar()

21
Userland/Libraries/LibGUI/Window.cpp
View file

@ -119,7 +119,7 @@ void Window::show()
auto* parent_window = find_parent_window();
auto response = WindowServerConnection::the().create_window(
m_window_id = WindowServerConnection::the().create_window(
m_rect_when_windowless,
!m_moved_by_client,
m_has_alpha_channel,
@ -138,7 +138,6 @@ void Window::show()
(i32)m_window_type,
m_title_when_windowless,
parent_window ? parent_window->window_id() : 0);
m_window_id = response.window_id();
m_visible = true;
apply_icon();
@ -178,10 +177,10 @@ void Window::hide()
{
if (!is_visible())
return;
auto response = WindowServerConnection::the().destroy_window(m_window_id);
auto destroyed_window_ids = WindowServerConnection::the().destroy_window(m_window_id);
server_did_destroy();
for (auto child_window_id : response.destroyed_window_ids()) {
for (auto child_window_id : destroyed_window_ids) {
if (auto* window = Window::from_window_id(child_window_id)) {
window->server_did_destroy();
}
@ -212,20 +211,20 @@ String Window::title() const
{
if (!is_visible())
return m_title_when_windowless;
return WindowServerConnection::the().get_window_title(m_window_id).title();
return WindowServerConnection::the().get_window_title(m_window_id);
}
Gfx::IntRect Window::applet_rect_on_screen() const
{
VERIFY(m_window_type == WindowType::Applet);
return WindowServerConnection::the().get_applet_rect_on_screen(m_window_id).rect();
return WindowServerConnection::the().get_applet_rect_on_screen(m_window_id);
}
Gfx::IntRect Window::rect() const
{
if (!is_visible())
return m_rect_when_windowless;
return WindowServerConnection::the().get_window_rect(m_window_id).rect();
return WindowServerConnection::the().get_window_rect(m_window_id);
}
void Window::set_rect(const Gfx::IntRect& a_rect)
@ -240,7 +239,7 @@ void Window::set_rect(const Gfx::IntRect& a_rect)
m_main_widget->resize(m_rect_when_windowless.size());
return;
}
auto window_rect = WindowServerConnection::the().set_window_rect(m_window_id, a_rect).rect();
auto window_rect = WindowServerConnection::the().set_window_rect(m_window_id, a_rect);
if (m_back_store && m_back_store->size() != window_rect.size())
m_back_store = nullptr;
if (m_front_store && m_front_store->size() != window_rect.size())
@ -254,7 +253,7 @@ Gfx::IntSize Window::minimum_size() const
if (!is_visible())
return m_minimum_size_when_windowless;
return WindowServerConnection::the().get_window_minimum_size(m_window_id).size();
return WindowServerConnection::the().get_window_minimum_size(m_window_id);
}
void Window::set_minimum_size(const Gfx::IntSize& size)
@ -904,7 +903,7 @@ bool Window::is_maximized() const
if (!is_visible())
return false;
return WindowServerConnection::the().is_maximized(m_window_id).maximized();
return WindowServerConnection::the().is_maximized(m_window_id);
}
void Window::schedule_relayout()
@ -1084,7 +1083,7 @@ bool Window::is_modified() const
{
if (!m_window_id)
return false;
return WindowServerConnection::the().is_window_modified(m_window_id).modified();
return WindowServerConnection::the().is_window_modified(m_window_id);
}
void Window::set_modified(bool modified)