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.

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

Jump to bottom

Workaround steam overlay's issues with attaching to wayland windows to allow steam overlay/input in nested mode #1232

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Workaround steam overlay's issues with attaching to wayland windows to allow steam overlay/input in nested mode #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52fbc91
workaround steam overlay's issue with nested wayland
VoidAndCaffeine Apr 6, 2024
0fd9441
add a launch option to control steam overlay workaround
VoidAndCaffeine Apr 6, 2024
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
2 changes: 2 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ const struct option *gamescope_options = (struct option[]){
{ "debug-hud", no_argument, nullptr, 'v' },
{ "debug-events", no_argument, nullptr, 0 },
{ "steam", no_argument, nullptr, 'e' },
{ "overlay-workaround", no_argument, nullptr, 0 },
{ "force-composition", no_argument, nullptr, 'c' },
{ "composite-debug", no_argument, nullptr, 0 },
{ "disable-xres", no_argument, nullptr, 'x' },
Expand Down Expand Up @@ -168,6 +169,7 @@ const char usage[] =
" -T, --stats-path write statistics to path\n"
" -C, --hide-cursor-delay hide cursor image after delay\n"
" -e, --steam enable Steam integration\n"
" --overlay-workaround workaround steam overlay's issues with wayland by allowing the overlay attach to the game rather than gamescope\n"
" --xwayland-count create N xwayland servers\n"
" --prefer-vk-device prefer Vulkan device for compositing (ex: 1002:7300)\n"
" --force-orientation rotate the internal display (left, right, normal, upsidedown)\n"
Expand Down
9 changes: 8 additions & 1 deletion src/steamcompmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@ static bool debugFocus = false;
static bool drawDebugInfo = false;
static bool debugEvents = false;
bool steamMode = false;
bool overlayWorkaround = false;
bool alwaysComposite = false;
static bool useXRes = true;

Expand Down Expand Up @@ -6541,6 +6542,10 @@ spawn_client( char **argv, bool bAsyncChild )
const char *pchCurrentPreload = getenv( "LD_PRELOAD" );
bool bFirst = true;

if( overlayWorkaround ){
xwm_log.debugf( "Working around steam overlay" );
}

if ( pchCurrentPreload != nullptr )
{
pchPreloadCopy = strdup( pchCurrentPreload );
Expand All @@ -6561,7 +6566,7 @@ spawn_client( char **argv, bool bAsyncChild )
// If there's a string and it's not gameoverlayrenderer, append it to our new LD_PRELOAD
if ( pchPreloadCopy[ i ] != '\0' )
{
if ( strstr( pchPreloadCopy + i, "gameoverlayrenderer.so" ) == nullptr )
if ( overlayWorkaround || strstr( pchPreloadCopy + i, "gameoverlayrenderer.so" ) == nullptr )
{
if ( bFirst == false )
{
Expand Down Expand Up @@ -7415,6 +7420,8 @@ steamcompmgr_main(int argc, char **argv)
debugFocus = true;
} else if (strcmp(opt_name, "synchronous-x11") == 0) {
synchronize = true;
} else if (strcmp(opt_name, "overlay-workaround") == 0) {
overlayWorkaround = true;
} else if (strcmp(opt_name, "debug-events") == 0) {
debugEvents = true;
} else if (strcmp(opt_name, "cursor") == 0) {
Expand Down