Skip to content

westeros backend : ensure paired execution of prepare and check callbacks #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gavriliuk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

westeros backend : ensure paired execution of prepare and check callbacks #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/westeros/renderer-backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ class EventSource {
GSource source;
GPollFD pfd;
struct wl_display* display;
bool prepared;
};

GSourceFuncs EventSource::sourceFuncs = {
Expand All @@ -126,6 +127,9 @@ GSourceFuncs EventSource::sourceFuncs = {
auto* source = reinterpret_cast<EventSource*>(base);
struct wl_display* display = source->display;

if (source->prepared)
return FALSE;

*timeout = -1;

while (wl_display_prepare_read(display) != 0) {
Expand All @@ -136,6 +140,7 @@ GSourceFuncs EventSource::sourceFuncs = {
}
wl_display_flush(display);

source->prepared = true;
return FALSE;
},
// check
Expand All @@ -144,14 +149,19 @@ GSourceFuncs EventSource::sourceFuncs = {
auto* source = reinterpret_cast<EventSource*>(base);
struct wl_display* display = source->display;

if (!source->prepared)
return FALSE;

if (source->pfd.revents & G_IO_IN) {
if (wl_display_read_events(display) < 0) {
DEBUG_PRINT("Wayland::Display: error in wayland read\n");
return FALSE;
}
source->prepared = false;
return TRUE;
} else {
wl_display_cancel_read(display);
source->prepared = false;
return FALSE;
}
},
Expand Down Expand Up @@ -213,8 +223,7 @@ Backend::Backend()

Backend::~Backend()
{
if (m_eventSource)
g_source_destroy(m_eventSource);
invalidate();

if (m_compositor)
wl_compositor_destroy(m_compositor);
Expand All @@ -227,6 +236,8 @@ Backend::~Backend()
void Backend::invalidate()
{
if (m_eventSource) {
if (m_eventSource->prepared && m_display)
wl_display_cancel_read(m_display);
g_source_destroy(m_eventSource);
m_eventSource = nullptr;
}
Expand All @@ -240,6 +251,7 @@ void Backend::initialize()
m_eventSource = g_source_new(&EventSource::sourceFuncs, sizeof(EventSource));
auto& source = *reinterpret_cast<EventSource*>(m_eventSource);
source.display = m_display;
source.prepared = false;

source.pfd.fd = wl_display_get_fd(m_display);
source.pfd.events = G_IO_IN | G_IO_ERR | G_IO_HUP;
Expand Down