RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 18:18:12 +00:00
Code Issues Activity Actions

LibCore+LibGUI: Remove GEventLoop and use CEventLoop everywhere

Browse source 
GEventLoop was just a dummy subclass of CEventLoop anyway. The only
thing it actually did was make sure a GWindowServerConnectionw was
instantiated. We now take care of that in GApplication instead.

CEventLoop is now non-virtual and a little less confusing. :^)
This commit is contained in:
Andreas Kling 2019-09-22 20:50:39 +02:00
parent edac8704de
commit 34d0e96aec
12 changed files with 23 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibGUI/GApplication.cpp
View file

@ -21,7 +21,8 @@ GApplication::GApplication(int argc, char** argv)
(void)argv;
ASSERT(!s_the);
s_the = this;
m_event_loop = make<GEventLoop>();
m_event_loop = make<CEventLoop>();
GWindowServerConnection::the();
}
GApplication::~GApplication()

4
Libraries/LibGUI/GApplication.h
View file

@ -5,8 +5,8 @@
#include <AK/OwnPtr.h>
#include <LibGUI/GShortcut.h>
class CEventLoop;
class GAction;
class GEventLoop;
class GKeyEvent;
class GMenuBar;
class GWindow;
@ -36,7 +36,7 @@ public:
void did_delete_last_window(Badge<GWindow>);
private:
OwnPtr<GEventLoop> m_event_loop;
OwnPtr<CEventLoop> m_event_loop;
OwnPtr<GMenuBar> m_menubar;
HashMap<GShortcut, GAction*> m_global_shortcut_actions;
class TooltipWindow;

5
Libraries/LibGUI/GDialog.cpp
View file

@ -1,12 +1,10 @@
#include <LibGUI/GDesktop.h>
#include <LibGUI/GDialog.h>
#include <LibGUI/GEventLoop.h>
GDialog::GDialog(CObject* parent)
: GWindow(parent)
{
set_modal(true);
}
GDialog::~GDialog()
@ -16,7 +14,7 @@ GDialog::~GDialog()
int GDialog::exec()
{
ASSERT(!m_event_loop);
m_event_loop = make<GEventLoop>();
m_event_loop = make<CEventLoop>();
auto new_rect = rect();
if (parent() && parent()->is_window()) {
auto& parent_window = *static_cast<GWindow*>(parent());
@ -47,4 +45,3 @@ void GDialog::close()
GWindow::close();
m_event_loop->quit(ExecCancel);
}

4
Libraries/LibGUI/GDialog.h
View file

@ -1,6 +1,6 @@
#pragma once
#include <LibGUI/GEventLoop.h>
#include <LibCore/CEventLoop.h>
#include <LibGUI/GWindow.h>
class GDialog : public GWindow {
@ -25,6 +25,6 @@ protected:
explicit GDialog(CObject* parent);
private:
OwnPtr<GEventLoop> m_event_loop;
OwnPtr<CEventLoop> m_event_loop;
int m_result { ExecAborted };
};

11
Libraries/LibGUI/GEventLoop.cpp
View file

@ -43,17 +43,6 @@ void GWindowServerConnection::handshake()
handle_greeting(response);
}
GEventLoop::GEventLoop()
{
// ensure the WS connection is up, as our users might be expecting it to be
// valid very early (via e.g. GDesktop) :)
GWindowServerConnection::the();
}
GEventLoop::~GEventLoop()
{
}
void GWindowServerConnection::handle_paint_event(const WSAPI_ServerMessage& event, GWindow& window, const ByteBuffer& extra_data)
{
#ifdef GEVENTLOOP_DEBUG

11
Libraries/LibGUI/GEventLoop.h
View file

@ -33,14 +33,3 @@ private:
void handle_wm_event(const WSAPI_ServerMessage&, GWindow&);
void handle_greeting(WSAPI_ServerMessage&);
};
class GEventLoop final : public CEventLoop {
public:
GEventLoop();
virtual ~GEventLoop() override;
static GEventLoop& current() { return static_cast<GEventLoop&>(CEventLoop::current()); }
private:
void process_unprocessed_bundles();
};

8
Libraries/LibGUI/GWindow.cpp
View file

@ -497,12 +497,12 @@ void GWindow::set_focused_widget(GWidget* widget)
if (m_focused_widget == widget)
return;
if (m_focused_widget) {
GEventLoop::current().post_event(*m_focused_widget, make<GEvent>(GEvent::FocusOut));
CEventLoop::current().post_event(*m_focused_widget, make<GEvent>(GEvent::FocusOut));
m_focused_widget->update();
}
m_focused_widget = widget ? widget->make_weak_ptr() : nullptr;
if (m_focused_widget) {
GEventLoop::current().post_event(*m_focused_widget, make<GEvent>(GEvent::FocusIn));
CEventLoop::current().post_event(*m_focused_widget, make<GEvent>(GEvent::FocusIn));
m_focused_widget->update();
}
}
@ -567,12 +567,12 @@ void GWindow::set_hovered_widget(GWidget* widget)
return;
if (m_hovered_widget)
GEventLoop::current().post_event(*m_hovered_widget, make<GEvent>(GEvent::Leave));
CEventLoop::current().post_event(*m_hovered_widget, make<GEvent>(GEvent::Leave));
m_hovered_widget = widget ? widget->make_weak_ptr() : nullptr;
if (m_hovered_widget)
GEventLoop::current().post_event(*m_hovered_widget, make<GEvent>(GEvent::Enter));
CEventLoop::current().post_event(*m_hovered_widget, make<GEvent>(GEvent::Enter));
}
void GWindow::set_current_backing_bitmap(GraphicsBitmap& bitmap, bool flush_immediately)