Skip to content
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.

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

Try to fix protocol error in lib_webview #169

Merged
merged 1 commit into from
Dec 28, 2023
Merged
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions qtwayland_6.6.1/0006-fix-gtk4-embedding.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 207158bf..0eb919e0 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -975,7 +975,7 @@ bool QWaylandSurface::setRole(QWaylandSurfaceRole *role, wl_resource *errorResou
{
Q_D(QWaylandSurface);

- if (d->role && d->role != role) {
+ if (d->role && role && d->role != role) {
wl_resource_post_error(errorResource, errorCode,
"Cannot assign role %s to wl_surface@%d, already has role %s\n",
role->name().constData(), wl_resource_get_id(resource()),
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 871f0cf6..d47de4f9 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -1346,6 +1346,7 @@ void QWaylandXdgToplevelPrivate::xdg_toplevel_destroy(QtWaylandServer::xdg_tople
if (Q_UNLIKELY(m_decoration))
qWarning() << "Client error: xdg_toplevel destroyed before its decoration object";

+ m_xdgSurface->surface()->setRole(nullptr, resource->handle, XDG_WM_BASE_ERROR_ROLE);
wl_resource_destroy(resource->handle);
//TODO: Should the xdg surface be desroyed as well? Or is it allowed to recreate a new toplevel for it?
}
@@ -1921,7 +1922,7 @@ uint QWaylandXdgPopupPrivate::sendConfigure(const QRect &geometry)

void QWaylandXdgPopupPrivate::xdg_popup_destroy(QtWaylandServer::xdg_popup::Resource *resource)
{
- Q_UNUSED(resource);
+ m_xdgSurface->surface()->setRole(nullptr, resource->handle, XDG_WM_BASE_ERROR_ROLE);
qWarning() << Q_FUNC_INFO << "Not implemented"; //TODO
}