463aff827e
Previously Menus set themselves as active input solely to make sure CaptureInput modals would close, but this is a functional half-truth. Menus don't actually use the active input role; they preempt normal Windows during event handling instead. Now the active input window is notified on preemption and Menus can remain outside the active input concept. This lets us make more granular choices about modal behavior. For now, the only thing clients care about is menu preemption on popup. Fixes windows which close on changes to active input closing on their own context menus.
67 lines
3.3 KiB
C++
67 lines
3.3 KiB
C++
/*
|
|
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <LibIPC/ConnectionToServer.h>
|
|
#include <WindowServer/ScreenLayout.h>
|
|
#include <WindowServer/WindowClientEndpoint.h>
|
|
#include <WindowServer/WindowServerEndpoint.h>
|
|
|
|
namespace GUI {
|
|
|
|
class ConnectionToWindowServer final
|
|
: public IPC::ConnectionToServer<WindowClientEndpoint, WindowServerEndpoint>
|
|
, public WindowClientEndpoint {
|
|
IPC_CLIENT_CONNECTION(ConnectionToWindowServer, "/tmp/portal/window"sv)
|
|
public:
|
|
static ConnectionToWindowServer& the();
|
|
i32 expose_client_id() { return m_client_id; }
|
|
|
|
private:
|
|
ConnectionToWindowServer(NonnullOwnPtr<Core::Stream::LocalSocket>);
|
|
|
|
virtual void fast_greet(Vector<Gfx::IntRect> const&, u32, u32, u32, Core::AnonymousBuffer const&, String const&, String const&, String const&, Vector<bool> const&, i32) override;
|
|
virtual void paint(i32, Gfx::IntSize const&, Vector<Gfx::IntRect> const&) override;
|
|
virtual void mouse_move(i32, Gfx::IntPoint const&, u32, u32, u32, i32, i32, i32, i32, bool, Vector<String> const&) override;
|
|
virtual void mouse_down(i32, Gfx::IntPoint const&, u32, u32, u32, i32, i32, i32, i32) override;
|
|
virtual void mouse_double_click(i32, Gfx::IntPoint const&, u32, u32, u32, i32, i32, i32, i32) override;
|
|
virtual void mouse_up(i32, Gfx::IntPoint const&, u32, u32, u32, i32, i32, i32, i32) override;
|
|
virtual void mouse_wheel(i32, Gfx::IntPoint const&, u32, u32, u32, i32, i32, i32, i32) override;
|
|
virtual void window_entered(i32) override;
|
|
virtual void window_left(i32) override;
|
|
virtual void key_down(i32, u32, u32, u32, u32) override;
|
|
virtual void key_up(i32, u32, u32, u32, u32) override;
|
|
virtual void window_activated(i32) override;
|
|
virtual void window_deactivated(i32) override;
|
|
virtual void window_input_entered(i32) override;
|
|
virtual void window_input_left(i32) override;
|
|
virtual void window_close_request(i32) override;
|
|
virtual void window_resized(i32, Gfx::IntRect const&) override;
|
|
virtual void menu_item_activated(i32, u32) override;
|
|
virtual void menu_item_entered(i32, u32) override;
|
|
virtual void menu_item_left(i32, u32) override;
|
|
virtual void menu_visibility_did_change(i32, bool) override;
|
|
virtual void screen_rects_changed(Vector<Gfx::IntRect> const&, u32, u32, u32) override;
|
|
virtual void applet_area_rect_changed(Gfx::IntRect const&) override;
|
|
virtual void drag_dropped(i32, Gfx::IntPoint const&, String const&, HashMap<String, ByteBuffer> const&) override;
|
|
virtual void drag_accepted() override;
|
|
virtual void drag_cancelled() override;
|
|
virtual void update_system_theme(Core::AnonymousBuffer const&) override;
|
|
virtual void update_system_fonts(String const&, String const&, String const&) override;
|
|
virtual void update_system_effects(Vector<bool> const&) override;
|
|
virtual void window_state_changed(i32, bool, bool, bool) override;
|
|
virtual void window_input_preempted(i32, i32) override;
|
|
virtual void display_link_notification() override;
|
|
virtual void track_mouse_move(Gfx::IntPoint const&) override;
|
|
virtual void ping() override;
|
|
|
|
bool m_in_command_palette { false };
|
|
bool m_display_link_notification_pending { false };
|
|
i32 m_client_id;
|
|
};
|
|
|
|
}
|