1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 00:48:11 +00:00

CEventLoop: Allow manually driving the event loop

Move the bulk of exec() into a new pump(). Since SDL wants to drive the
event loop itself, this is a requirement. We also add a WaitMode flag to
allow for immediately pumping events -- again, this is required because
SDL wants to be in full control of the event loop, and not let us wait.
This commit is contained in:
Robin Burchell 2019-05-18 13:39:21 +02:00 committed by Andreas Kling
parent 85d2e85912
commit d791bce6af
2 changed files with 72 additions and 50 deletions

View file

@ -92,10 +92,18 @@ int CEventLoop::exec()
for (;;) { for (;;) {
if (m_exit_requested) if (m_exit_requested)
return m_exit_code; return m_exit_code;
pump();
}
ASSERT_NOT_REACHED();
}
void CEventLoop::pump(WaitMode mode)
{
// window server event processing...
do_processing(); do_processing();
if (m_queued_events.is_empty()) { if (m_queued_events.is_empty()) {
wait_for_event(); wait_for_event(mode);
do_processing(); do_processing();
} }
decltype(m_queued_events) events; decltype(m_queued_events) events;
@ -114,7 +122,7 @@ int CEventLoop::exec()
switch (event.type()) { switch (event.type()) {
case CEvent::Quit: case CEvent::Quit:
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
return 0; return;
default: default:
dbgprintf("Event type %u with no receiver :(\n", event.type()); dbgprintf("Event type %u with no receiver :(\n", event.type());
} }
@ -132,11 +140,8 @@ int CEventLoop::exec()
auto rejigged_event_queue = move(events); auto rejigged_event_queue = move(events);
rejigged_event_queue.append(move(m_queued_events)); rejigged_event_queue.append(move(m_queued_events));
m_queued_events = move(rejigged_event_queue); m_queued_events = move(rejigged_event_queue);
return m_exit_code;
} }
} }
}
ASSERT_NOT_REACHED();
} }
void CEventLoop::post_event(CObject& receiver, OwnPtr<CEvent>&& event) void CEventLoop::post_event(CObject& receiver, OwnPtr<CEvent>&& event)
@ -148,7 +153,7 @@ void CEventLoop::post_event(CObject& receiver, OwnPtr<CEvent>&& event)
m_queued_events.append({ receiver.make_weak_ptr(), move(event) }); m_queued_events.append({ receiver.make_weak_ptr(), move(event) });
} }
void CEventLoop::wait_for_event() void CEventLoop::wait_for_event(WaitMode mode)
{ {
fd_set rfds; fd_set rfds;
fd_set wfds; fd_set wfds;
@ -182,13 +187,20 @@ void CEventLoop::wait_for_event()
timeval now; timeval now;
struct timeval timeout = { 0, 0 }; struct timeval timeout = { 0, 0 };
bool should_wait_forever = false;
if (mode == WaitMode::WaitForEvents) {
if (!s_timers->is_empty() && queued_events_is_empty) { if (!s_timers->is_empty() && queued_events_is_empty) {
gettimeofday(&now, nullptr); gettimeofday(&now, nullptr);
get_next_timer_expiration(timeout); get_next_timer_expiration(timeout);
AK::timeval_sub(&timeout, &now, &timeout); AK::timeval_sub(&timeout, &now, &timeout);
} else {
should_wait_forever = true;
}
} else {
should_wait_forever = false;
} }
int rc = select(max_fd + 1, &rfds, &wfds, nullptr, (queued_events_is_empty && s_timers->is_empty()) ? nullptr : &timeout); int rc = select(max_fd + 1, &rfds, &wfds, nullptr, should_wait_forever ? nullptr : &timeout);
if (rc < 0) { if (rc < 0) {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }

View file

@ -20,6 +20,15 @@ public:
int exec(); int exec();
enum class WaitMode {
WaitForEvents,
PollForEvents,
};
// processe events, generally called by exec() in a loop.
// this should really only be used for integrating with other event loops
void pump(WaitMode = WaitMode::WaitForEvents);
void post_event(CObject& receiver, OwnPtr<CEvent>&&); void post_event(CObject& receiver, OwnPtr<CEvent>&&);
static CEventLoop& main(); static CEventLoop& main();
@ -46,13 +55,14 @@ protected:
virtual void do_processing() { } virtual void do_processing() { }
private: private:
void wait_for_event(); void wait_for_event(WaitMode);
void get_next_timer_expiration(timeval&); void get_next_timer_expiration(timeval&);
struct QueuedEvent { struct QueuedEvent {
WeakPtr<CObject> receiver; WeakPtr<CObject> receiver;
OwnPtr<CEvent> event; OwnPtr<CEvent> event;
}; };
Vector<QueuedEvent, 64> m_queued_events; Vector<QueuedEvent, 64> m_queued_events;
bool m_running { false }; bool m_running { false };