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

SteamOS compositor beta update.

Browse source
This commit is contained in:
Pierre-Loup Griffais 2014-09-17 17:23:30 -08:00 committed by Pierre-Loup A. Griffais
parent 8ae95f1f37
commit 33a5f82916
3 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
debian/changelog vendored
View file

@ -1,3 +1,17 @@
steamos-compositor (1.23) alchemist; urgency=medium
* Remove outdated pulseaudio line from SteamOS session script.
-- Pierre-Loup A. Griffais <pgriffais@valvesoftware.com> Wed, 17 Sep 2014 15:17:41 -0700
steamos-compositor (1.22) alchemist; urgency=medium
* Fix issue where Planetary Annihilation window would not get displayed.
* Fix bug with cursor image sometimes not having the right colors.
* Fix bug with cursor sometimes not aiming where it should.
-- Pierre-Loup A. Griffais <pgriffais@valvesoftware.com> Tue, 16 Sep 2014 17:56:34 -0700
steamos-compositor (1.21) alchemist; urgency=medium steamos-compositor (1.21) alchemist; urgency=medium
* Fix issue with 1.20 where overlay would appear flickery. * Fix issue with 1.20 where overlay would appear flickery.

28
src/steamcompmgr.c
View file

@ -542,7 +542,7 @@ paint_fake_cursor (Display *dpy, win *w)
cursorDataBuffer[i] = im->pixels[i]; cursorDataBuffer[i] = im->pixels[i];
glBindTexture(GL_TEXTURE_2D, cursorTextureName); glBindTexture(GL_TEXTURE_2D, cursorTextureName);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, cursorWidth, cursorHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, cursorDataBuffer); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, cursorWidth, cursorHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, cursorDataBuffer);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
@ -552,8 +552,9 @@ paint_fake_cursor (Display *dpy, win *w)
cursorImageDirty = False; cursorImageDirty = False;
} }
scaledCursorX = (win_x - w->a.x) * cursorScaleRatio * globalScaleRatio - cursorHotX + cursorOffsetX; // Actual point on scaled screen where the cursor hotspot should be
scaledCursorY = (win_y - w->a.y) * cursorScaleRatio * globalScaleRatio - cursorHotY + cursorOffsetY; scaledCursorX = (win_x - w->a.x) * cursorScaleRatio * globalScaleRatio + cursorOffsetX;
scaledCursorY = (win_y - w->a.y) * cursorScaleRatio * globalScaleRatio + cursorOffsetY;
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBindTexture(GL_TEXTURE_2D, cursorTextureName); glBindTexture(GL_TEXTURE_2D, cursorTextureName);
@ -563,8 +564,8 @@ paint_fake_cursor (Display *dpy, win *w)
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
win *mainOverlayWindow = find_win(dpy, currentOverlayWindow); win *mainOverlayWindow = find_win(dpy, currentOverlayWindow);
float displayCursorWidth = cursorWidth;
float displayCursorHeight = cursorHeight; float displayCursorScaleRatio = 1.0f;
// Ensure the cursor looks the same size as in Steam or the overlay // Ensure the cursor looks the same size as in Steam or the overlay
if (mainOverlayWindow) if (mainOverlayWindow)
@ -575,14 +576,19 @@ paint_fake_cursor (Display *dpy, win *w)
float steamRatio = (steamScaleX < steamScaleY) ? steamScaleX : steamScaleY; float steamRatio = (steamScaleX < steamScaleY) ? steamScaleX : steamScaleY;
displayCursorWidth *= steamRatio; displayCursorScaleRatio *= steamRatio;
displayCursorHeight *= steamRatio;
// Then any global scale, since it would also apply to the Steam window and its SW cursor // Then any global scale, since it would also apply to the Steam window and its SW cursor
displayCursorWidth *= globalScaleRatio; displayCursorScaleRatio *= globalScaleRatio;
displayCursorHeight *= globalScaleRatio;
} }
// Apply the cursor offset inside the texture using the display scale
scaledCursorX = scaledCursorX - (cursorHotX * displayCursorScaleRatio);
scaledCursorY = scaledCursorY - (cursorHotY * displayCursorScaleRatio);
float displayCursorWidth = cursorWidth * displayCursorScaleRatio;
float displayCursorHeight = cursorHeight * displayCursorScaleRatio;
glColor3f(1.0f, 1.0f, 1.0f); glColor3f(1.0f, 1.0f, 1.0f);
glBegin (GL_QUADS); glBegin (GL_QUADS);
@ -1081,7 +1087,6 @@ determine_and_apply_focus (Display *dpy)
gameFocused = False; gameFocused = False;
unsigned long maxDamageSequence = 0; unsigned long maxDamageSequence = 0;
unsigned long maxMapSequence = 0;
Bool usingOverrideRedirectWindow = False; Bool usingOverrideRedirectWindow = False;
if (unredirectedWindow != None) if (unredirectedWindow != None)
@ -1103,13 +1108,12 @@ determine_and_apply_focus (Display *dpy)
Bool windowIsOverrideRedirect = w->a.override_redirect && !w->ignoreOverrideRedirect; Bool windowIsOverrideRedirect = w->a.override_redirect && !w->ignoreOverrideRedirect;
if (w->gameID && w->a.map_state == IsViewable && w->a.class == InputOutput && if (w->gameID && w->a.map_state == IsViewable && w->a.class == InputOutput &&
(w->damage_sequence > maxDamageSequence || w->map_sequence > maxMapSequence) && (w->damage_sequence > maxDamageSequence) &&
(!windowIsOverrideRedirect || !usingOverrideRedirectWindow)) (!windowIsOverrideRedirect || !usingOverrideRedirectWindow))
{ {
focus = w; focus = w;
gameFocused = True; gameFocused = True;
maxDamageSequence = w->damage_sequence; maxDamageSequence = w->damage_sequence;
maxMapSequence = w->map_sequence;
if (windowIsOverrideRedirect) if (windowIsOverrideRedirect)
{ {

2
usr/bin/steamos-session
View file

@ -15,8 +15,6 @@ xset s off
steamcompmgr & steamcompmgr &
start-pulseaudio-x11
loadargb_cursor /usr/share/icons/steam/arrow.png loadargb_cursor /usr/share/icons/steam/arrow.png
steam -tenfoot -steamos -enableremotecontrol steam -tenfoot -steamos -enableremotecontrol