Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

SteamOS compositor 1.12 with Bard's Tale, Long Live the Queen fixes.

Browse source
This commit is contained in:
Pierre-Loup Griffais 2013-11-13 18:26:14 -08:00 committed by Pierre-Loup A. Griffais
parent 1fc30b7e60
commit 967feaabe5
2 changed files with 41 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
debian/changelog vendored
View file

@ -1,3 +1,18 @@
steamos-compositor (1.12) alchemist; urgency=low
* Only honor size hints if they specify the same min and max size, since
"Long Live the Queen" sets a maximum size of 4k X 4k.
* Listen for pointer motion on all children of the focus window.
-- Pierre-Loup A. Griffais <pgriffais@valvesoftware.com> Wed, 13 Nov 2013 16:04:35 -0800
steamos-compositor (1.11) alchemist; urgency=low
* The Bard's Tale has a single override redirect window; allow using it but
always prefer regular windows if they're available.
-- Pierre-Loup A. Griffais <pgriffais@valvesoftware.com> Wed, 13 Nov 2013 11:40:15 -0800
steamos-compositor (1.10) alchemist; urgency=low steamos-compositor (1.10) alchemist; urgency=low
* Monitor mouse input of the child window the legacy SDL1.2 fullscreen. * Monitor mouse input of the child window the legacy SDL1.2 fullscreen.

43
src/steamcompmgr.c
View file

@ -1030,6 +1030,7 @@ determine_and_apply_focus (Display *dpy)
unsigned long maxDamageSequence = 0; unsigned long maxDamageSequence = 0;
unsigned long maxMapSequence = 0; unsigned long maxMapSequence = 0;
Bool usingOverrideRedirectWindow = False;
if (unredirectedWindow != None) if (unredirectedWindow != None)
{ {
@ -1045,14 +1046,23 @@ determine_and_apply_focus (Display *dpy)
focus = w; focus = w;
} }
// We allow using an override redirect window in some cases, but if we have
// a choice between two windows we always prefer the non-override redirect one.
Bool windowIsOverrideRedirect = w->a.override_redirect && !w->ignoreOverrideRedirect;
if (w->gameID && w->a.map_state == IsViewable && if (w->gameID && w->a.map_state == IsViewable &&
(w->damage_sequence > maxDamageSequence || w->map_sequence > maxMapSequence) && (w->damage_sequence > maxDamageSequence || w->map_sequence > maxMapSequence) &&
(!w->a.override_redirect || w->ignoreOverrideRedirect)) (!windowIsOverrideRedirect || !usingOverrideRedirectWindow))
{ {
focus = w; focus = w;
gameFocused = True; gameFocused = True;
maxDamageSequence = w->damage_sequence; maxDamageSequence = w->damage_sequence;
maxMapSequence = w->map_sequence; maxMapSequence = w->map_sequence;
if (windowIsOverrideRedirect)
{
usingOverrideRedirectWindow = True;
}
} }
if (w->isOverlay) if (w->isOverlay)
@ -1133,10 +1143,20 @@ determine_and_apply_focus (Display *dpy)
XResizeWindow(dpy, focus->id, focus->requestedWidth, focus->requestedHeight); XResizeWindow(dpy, focus->id, focus->requestedWidth, focus->requestedHeight);
} }
if (focus->a.width > root_width || focus->a.height > root_height) Window root_return = None, parent_return = None;
Window *children = NULL;
unsigned int nchildren = 0;
unsigned int i = 0;
XQueryTree (dpy, w->id, &root_return, &parent_return, &children, &nchildren);
while (i < nchildren)
{ {
XResizeWindow(dpy, focus->id, root_width, root_height); XSelectInput(dpy, children[i], PointerMotionMask);
i++;
} }
XFree (children);
} }
/* Get prop from window /* Get prop from window
@ -1172,16 +1192,13 @@ get_size_hints(Display *dpy, win *w)
XGetWMNormalHints(dpy, w->id, &hints, &hintsSpecified); XGetWMNormalHints(dpy, w->id, &hints, &hintsSpecified);
if (hintsSpecified & PMaxSize && hints.max_width * hints.max_height) if (hintsSpecified & (PMaxSize | PMinSize) &&
hints.max_width * hints.max_height * hints.min_width * hints.min_height &&
hints.max_width == hints.min_width && hints.min_height == hints.max_height)
{ {
w->requestedWidth = hints.max_width; w->requestedWidth = hints.max_width;
w->requestedHeight = hints.max_height; w->requestedHeight = hints.max_height;
if (w->requestedWidth > root_width)
w->requestedWidth = root_width;
if (w->requestedHeight > root_height)
w->requestedHeight = root_height;
w->sizeHintsSpecified = True; w->sizeHintsSpecified = True;
} }
else else
@ -1217,17 +1234,9 @@ get_size_hints(Display *dpy, win *w)
w->requestedWidth = attribs.width; w->requestedWidth = attribs.width;
w->requestedHeight = attribs.height; w->requestedHeight = attribs.height;
if (w->requestedWidth > root_width)
w->requestedWidth = root_width;
if (w->requestedHeight > root_height)
w->requestedHeight = root_height;
XMoveWindow(dpy, children[0], 0, 0); XMoveWindow(dpy, children[0], 0, 0);
w->ignoreOverrideRedirect = True; w->ignoreOverrideRedirect = True;
// Look for mouse motion in that child while we're at it.
XSelectInput(dpy, children[0], PointerMotionMask);
} }
} }