Skip to content

[X11] Workaround 1x1 Wine window to allow unredirect, fix not working setting responsible for unredirect. #715

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −24
Open

[X11] Workaround 1x1 Wine window to allow unredirect, fix not working setting responsible for unredirect. #715

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion src/compositor/meta-surface-actor-x11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@ meta_surface_actor_x11_is_opaque (MetaSurfaceActor *actor)
gboolean
meta_surface_actor_x11_should_unredirect (MetaSurfaceActorX11 *self)
{
if (!meta_prefs_get_unredirect_fullscreen_windows ())
return FALSE;

MetaWindow *window = self->window;

if (meta_window_requested_dont_bypass_compositor (window))
Expand All @@ -277,7 +280,7 @@ meta_surface_actor_x11_should_unredirect (MetaSurfaceActorX11 *self)
if (meta_window_is_override_redirect (window))
return TRUE;

if (self->does_full_damage && meta_prefs_get_unredirect_fullscreen_windows ())
if (self->does_full_damage)
return TRUE;

return FALSE;
Expand Down
43 changes: 24 additions & 19 deletions src/core/window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,25 +1100,30 @@ _meta_window_shared_new (MetaDisplay *display,
/* avoid tons of stack updates */
meta_stack_freeze (window->display->stack);

window->rect.x = attrs->x;
window->rect.y = attrs->y;
window->rect.width = attrs->width;
window->rect.height = attrs->height;

/* size_hints are the "request" */
window->size_hints.x = attrs->x;
window->size_hints.y = attrs->y;
window->size_hints.width = attrs->width;
window->size_hints.height = attrs->height;
/* initialize the remaining size_hints as if size_hints.flags were zero */
meta_set_normal_hints (window, NULL);

/* And this is our unmaximized size */
window->saved_rect = window->rect;
window->unconstrained_rect = window->rect;

window->depth = attrs->depth;
window->xvisual = attrs->visual;
if (attrs->width != 1 &&
attrs->height != 1)
{
window->rect.x = attrs->x;
window->rect.y = attrs->y;
window->rect.width = attrs->width;
window->rect.height = attrs->height;

/* size_hints are the "request" */
window->size_hints.x = attrs->x;
window->size_hints.y = attrs->y;
window->size_hints.width = attrs->width;
window->size_hints.height = attrs->height;

/* initialize the remaining size_hints as if size_hints.flags were zero */
meta_set_normal_hints (window, NULL);

/* And this is our unmaximized size */
window->saved_rect = window->rect;
window->unconstrained_rect = window->rect;

window->depth = attrs->depth;
window->xvisual = attrs->visual;
}

window->title = NULL;
window->icon = NULL;
Expand Down
12 changes: 8 additions & 4 deletions src/x11/window-x11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3817,10 +3817,14 @@ meta_window_x11_configure_notify (MetaWindow *window,
g_assert (window->override_redirect);
g_assert (window->frame == NULL);

window->rect.x = event->x;
window->rect.y = event->y;
window->rect.width = event->width;
window->rect.height = event->height;
if (event->width != 1 &&
event->height != 1)
{
window->rect.x = event->x;
window->rect.y = event->y;
window->rect.width = event->width;
window->rect.height = event->height;
}

priv->client_rect = window->rect;
window->buffer_rect = window->rect;
Expand Down