mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-05-18 17:12:54 +00:00
d94d60219c
Since 9e2bd9d261a8c0c1b5eeafde95ca310efc667204, the OOPWV has been consuming all mouse and keyboard events, preventing action shortcuts from working. So let's fix that. :^) OOPWV now queues up input events, sending them one at a time to the WebContent process and waiting for the new `did_finish_handling_input_event(bool event_was_accepted) =|` IPC call before sending the next one. If the event was not accepted, OOPWV imitates the usual event bubbling: first passing the event to its superclass, then to its parent widget, and finally propagating to any Action shortcuts. With this, shortcuts like Ctrl+I to open Browser's JS console work again, except when a contenteditable field is selected. That's a whole separate stack of yaks. Co-authored-by: Zaggy1024 <zaggy1024@gmail.com>
122 lines
5.3 KiB
C++
122 lines
5.3 KiB
C++
/*
|
|
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
|
|
* Copyright (c) 2021-2022, Linus Groh <linusg@serenityos.org>
|
|
* Copyright (c) 2022, Tim Flynn <trflynn89@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AK/HashMap.h>
|
|
#include <LibIPC/ConnectionFromClient.h>
|
|
#include <LibJS/Forward.h>
|
|
#include <LibJS/Heap/Handle.h>
|
|
#include <LibWeb/CSS/PreferredColorScheme.h>
|
|
#include <LibWeb/Forward.h>
|
|
#include <LibWeb/Loader/FileRequest.h>
|
|
#include <LibWeb/Platform/Timer.h>
|
|
#include <WebContent/Forward.h>
|
|
#include <WebContent/WebContentClientEndpoint.h>
|
|
#include <WebContent/WebContentConsoleClient.h>
|
|
#include <WebContent/WebContentServerEndpoint.h>
|
|
|
|
namespace WebContent {
|
|
|
|
class ConnectionFromClient final
|
|
: public IPC::ConnectionFromClient<WebContentClientEndpoint, WebContentServerEndpoint> {
|
|
C_OBJECT(ConnectionFromClient);
|
|
|
|
public:
|
|
~ConnectionFromClient() override = default;
|
|
|
|
virtual void die() override;
|
|
|
|
void initialize_js_console(Badge<PageHost>);
|
|
|
|
void request_file(NonnullRefPtr<Web::FileRequest>&);
|
|
|
|
Optional<int> fd() { return socket().fd(); }
|
|
|
|
PageHost& page_host() { return *m_page_host; }
|
|
PageHost const& page_host() const { return *m_page_host; }
|
|
|
|
private:
|
|
explicit ConnectionFromClient(NonnullOwnPtr<Core::Stream::LocalSocket>);
|
|
|
|
Web::Page& page();
|
|
Web::Page const& page() const;
|
|
|
|
virtual void connect_to_webdriver(String const& webdriver_ipc_path) 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_screen_rects(Vector<Gfx::IntRect> const&, u32) override;
|
|
virtual void load_url(URL const&) override;
|
|
virtual void load_html(String const&, URL const&) override;
|
|
virtual void paint(Gfx::IntRect const&, i32) override;
|
|
virtual void set_viewport_rect(Gfx::IntRect const&) override;
|
|
virtual void mouse_down(Gfx::IntPoint const&, unsigned, unsigned, unsigned) override;
|
|
virtual void mouse_move(Gfx::IntPoint const&, unsigned, unsigned, unsigned) override;
|
|
virtual void mouse_up(Gfx::IntPoint const&, unsigned, unsigned, unsigned) override;
|
|
virtual void mouse_wheel(Gfx::IntPoint const&, unsigned, unsigned, unsigned, i32, i32) override;
|
|
virtual void doubleclick(Gfx::IntPoint const&, unsigned, unsigned, unsigned) override;
|
|
virtual void key_down(i32, unsigned, u32) override;
|
|
virtual void key_up(i32, unsigned, u32) override;
|
|
virtual void add_backing_store(i32, Gfx::ShareableBitmap const&) override;
|
|
virtual void remove_backing_store(i32) override;
|
|
virtual void debug_request(String const&, String const&) override;
|
|
virtual void get_source() override;
|
|
virtual void inspect_dom_tree() override;
|
|
virtual Messages::WebContentServer::InspectDomNodeResponse inspect_dom_node(i32 node_id, Optional<Web::CSS::Selector::PseudoElement> const& pseudo_element) override;
|
|
virtual Messages::WebContentServer::GetHoveredNodeIdResponse get_hovered_node_id() override;
|
|
virtual Messages::WebContentServer::DumpLayoutTreeResponse dump_layout_tree() override;
|
|
virtual void set_content_filters(Vector<String> const&) override;
|
|
virtual void set_proxy_mappings(Vector<String> const&, HashMap<String, size_t> const&) override;
|
|
virtual void set_preferred_color_scheme(Web::CSS::PreferredColorScheme const&) override;
|
|
virtual void set_has_focus(bool) override;
|
|
virtual void set_is_scripting_enabled(bool) override;
|
|
virtual void set_window_position(Gfx::IntPoint const&) override;
|
|
virtual void set_window_size(Gfx::IntSize const&) override;
|
|
virtual void handle_file_return(i32 error, Optional<IPC::File> const& file, i32 request_id) override;
|
|
virtual void set_system_visibility_state(bool visible) override;
|
|
|
|
virtual void js_console_input(String const&) override;
|
|
virtual void run_javascript(String const&) override;
|
|
virtual void js_console_request_messages(i32) override;
|
|
|
|
virtual void alert_closed() override;
|
|
virtual void confirm_closed(bool accepted) override;
|
|
virtual void prompt_closed(String const& response) override;
|
|
|
|
virtual Messages::WebContentServer::TakeDocumentScreenshotResponse take_document_screenshot() override;
|
|
|
|
virtual Messages::WebContentServer::GetLocalStorageEntriesResponse get_local_storage_entries() override;
|
|
virtual Messages::WebContentServer::GetSessionStorageEntriesResponse get_session_storage_entries() override;
|
|
|
|
virtual Messages::WebContentServer::GetSelectedTextResponse get_selected_text() override;
|
|
virtual void select_all() override;
|
|
|
|
void flush_pending_paint_requests();
|
|
|
|
void report_finished_handling_input_event(bool event_was_handled);
|
|
|
|
NonnullOwnPtr<PageHost> m_page_host;
|
|
struct PaintRequest {
|
|
Gfx::IntRect content_rect;
|
|
NonnullRefPtr<Gfx::Bitmap> bitmap;
|
|
i32 bitmap_id { -1 };
|
|
};
|
|
Vector<PaintRequest> m_pending_paint_requests;
|
|
RefPtr<Web::Platform::Timer> m_paint_flush_timer;
|
|
|
|
HashMap<i32, NonnullRefPtr<Gfx::Bitmap>> m_backing_stores;
|
|
|
|
WeakPtr<JS::Realm> m_realm;
|
|
OwnPtr<WebContentConsoleClient> m_console_client;
|
|
JS::Handle<JS::GlobalObject> m_console_global_object;
|
|
|
|
HashMap<int, NonnullRefPtr<Web::FileRequest>> m_requested_files {};
|
|
int last_id { 0 };
|
|
};
|
|
|
|
}
|