RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 03:07:43 +00:00
Code Issues Activity Actions

Port LibGUI to use CIPCClientSideConnection

Browse source 
As a consequence, move to use an explicit handshake() method rather than
calling virtuals from the constructor. This seemed to not bother
AClientConnection, but LibGUI crashes (rightfully) because of it.
This commit is contained in:
Robin Burchell 2019-07-17 18:28:30 +02:00 • committed by Andreas Kling
parent 41bece0682
commit 2177594c96
18 changed files with 195 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Libraries/LibGUI/GEventLoop.h
View file

@ -1,6 +1,7 @@
#pragma once
#include <LibCore/CEventLoop.h>
#include <LibCore/CIPCClientSideConnection.h>
#include <LibGUI/GEvent.h>
#include <WindowServer/WSAPITypes.h>
@ -9,48 +10,16 @@ class CObject;
class CNotifier;
class GWindow;
class GEventLoop final : public CEventLoop {
class GWindowServerConnection : public CIPCClientSideConnection<WSAPI_ServerMessage, WSAPI_ClientMessage> {
public:
GEventLoop();
virtual ~GEventLoop() override;
GWindowServerConnection()
: CIPCClientSideConnection("/tmp/wsportal")
{}
static GEventLoop& current() { return static_cast<GEventLoop&>(CEventLoop::current()); }
static bool post_message_to_server(const WSAPI_ClientMessage&, const ByteBuffer& extra_data = {});
bool wait_for_specific_event(WSAPI_ServerMessage::Type, WSAPI_ServerMessage&);
WSAPI_ServerMessage sync_request(const WSAPI_ClientMessage& request, WSAPI_ServerMessage::Type response_type);
static pid_t server_pid() { return s_server_pid; }
static int my_client_id() { return s_my_client_id; }
virtual void take_pending_events_from(CEventLoop& other) override
{
CEventLoop::take_pending_events_from(other);
m_unprocessed_bundles.append(move(static_cast<GEventLoop&>(other).m_unprocessed_bundles));
}
void handshake() override;
private:
virtual void add_file_descriptors_for_select(fd_set& fds, int& max_fd_added) override
{
FD_SET(s_windowserver_fd, &fds);
max_fd_added = s_windowserver_fd;
}
virtual void process_file_descriptors_after_select(const fd_set& fds) override
{
if (FD_ISSET(s_windowserver_fd, &fds))
drain_messages_from_server();
}
virtual void do_processing() override
{
while (!m_unprocessed_bundles.is_empty())
process_unprocessed_bundles();
}
void wait_for_event();
bool drain_messages_from_server();
void process_unprocessed_bundles();
void postprocess_bundles(Vector<IncomingASMessageBundle>& m_unprocessed_bundles) override;
void handle_paint_event(const WSAPI_ServerMessage&, GWindow&, const ByteBuffer& extra_data);
void handle_resize_event(const WSAPI_ServerMessage&, GWindow&);
void handle_mouse_event(const WSAPI_ServerMessage&, GWindow&);
@ -61,15 +30,18 @@ private:
void handle_window_entered_or_left_event(const WSAPI_ServerMessage&, GWindow&);
void handle_wm_event(const WSAPI_ServerMessage&, GWindow&);
void handle_greeting(WSAPI_ServerMessage&);
void connect_to_server();
struct IncomingWSMessageBundle {
WSAPI_ServerMessage message;
ByteBuffer extra_data;
};
Vector<IncomingWSMessageBundle> m_unprocessed_bundles;
static pid_t s_server_pid;
static int s_my_client_id;
static int s_windowserver_fd;
};
class GEventLoop final : public CEventLoop {
public:
GEventLoop();
virtual ~GEventLoop() override;
static GEventLoop& current() { return static_cast<GEventLoop&>(CEventLoop::current()); }
GWindowServerConnection& connection() { return m_connection; }
private:
void process_unprocessed_bundles();
GWindowServerConnection m_connection;
};