summaryrefslogtreecommitdiff
path: root/Userland/Services/WindowServer
diff options
context:
space:
mode:
Diffstat (limited to 'Userland/Services/WindowServer')
-rw-r--r--Userland/Services/WindowServer/MenuManager.cpp10
-rw-r--r--Userland/Services/WindowServer/WindowClient.ipc1
-rw-r--r--Userland/Services/WindowServer/WindowManager.cpp6
-rw-r--r--Userland/Services/WindowServer/WindowManager.h1
-rw-r--r--Userland/Services/WindowServer/WindowMode.h9
5 files changed, 0 insertions, 27 deletions
diff --git a/Userland/Services/WindowServer/MenuManager.cpp b/Userland/Services/WindowServer/MenuManager.cpp
index 83dbbe72ea..7b5ac31723 100644
--- a/Userland/Services/WindowServer/MenuManager.cpp
+++ b/Userland/Services/WindowServer/MenuManager.cpp
@@ -355,16 +355,6 @@ void MenuManager::set_current_menu(Menu* menu)
}
m_current_menu = menu;
-
- auto& wm = WindowManager::the();
- if (auto* window = wm.active_input_window()) {
- InputPreemptor preemptor { InputPreemptor::OtherMenu };
- if (window->rect().contains(m_current_menu->unadjusted_position()))
- preemptor = InputPreemptor::ContextMenu;
- else if (!m_current_menu->rect_in_window_menubar().is_null())
- preemptor = InputPreemptor::MenubarMenu;
- wm.notify_input_preempted(*window, preemptor);
- }
}
Menu* MenuManager::previous_menu(Menu* current)
diff --git a/Userland/Services/WindowServer/WindowClient.ipc b/Userland/Services/WindowServer/WindowClient.ipc
index 686d70c3ae..bfe9ec8186 100644
--- a/Userland/Services/WindowServer/WindowClient.ipc
+++ b/Userland/Services/WindowServer/WindowClient.ipc
@@ -20,7 +20,6 @@ endpoint WindowClient
window_activated(i32 window_id) =|
window_deactivated(i32 window_id) =|
window_state_changed(i32 window_id, bool minimized, bool maximized, bool occluded) =|
- window_input_preempted(i32 window_id, i32 preemptor) =|
window_close_request(i32 window_id) =|
window_resized(i32 window_id, Gfx::IntRect new_rect) =|
window_moved(i32 window_id, Gfx::IntRect new_rect) =|
diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp
index dbfeb45a9f..7de186e7a5 100644
--- a/Userland/Services/WindowServer/WindowManager.cpp
+++ b/Userland/Services/WindowServer/WindowManager.cpp
@@ -642,12 +642,6 @@ void WindowManager::notify_progress_changed(Window& window)
tell_wms_window_state_changed(window);
}
-void WindowManager::notify_input_preempted(Window& window, InputPreemptor preemptor)
-{
- if (window.client())
- window.client()->async_window_input_preempted(window.window_id(), (i32)preemptor);
-}
-
void WindowManager::pick_new_active_window(Window* previous_active)
{
Window* desktop = nullptr;
diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h
index a6598e7215..1d5b665db7 100644
--- a/Userland/Services/WindowServer/WindowManager.h
+++ b/Userland/Services/WindowServer/WindowManager.h
@@ -76,7 +76,6 @@ public:
void notify_occlusion_state_changed(Window&);
void notify_progress_changed(Window&);
void notify_modified_changed(Window&);
- void notify_input_preempted(Window&, InputPreemptor = InputPreemptor::Other);
Gfx::IntRect tiled_window_rect(Window const&, WindowTileType tile_type = WindowTileType::Maximized, bool relative_to_window_screen = false) const;
diff --git a/Userland/Services/WindowServer/WindowMode.h b/Userland/Services/WindowServer/WindowMode.h
index 3cb82ee1f8..c70e821337 100644
--- a/Userland/Services/WindowServer/WindowMode.h
+++ b/Userland/Services/WindowServer/WindowMode.h
@@ -24,13 +24,4 @@ enum class WindowMode {
_Count,
};
-// InputPreemptors are Objects which take input precedence over the active input
-// window without changing its activity state or joining its modal chain
-enum class InputPreemptor {
- ContextMenu = 0,
- MenubarMenu,
- OtherMenu,
- Other,
-};
-
}