Skip to content
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
9 changes: 5 additions & 4 deletions src/steamcompmgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ unsigned int g_BlurFadeDuration = 0;
int g_BlurRadius = 5;
unsigned int g_BlurFadeStartTime = 0;

pid_t focusWindow_pid;
pid_t focusWindow_pid, sdFocusWindow_pid;
std::shared_ptr<std::string> focusWindow_engine = nullptr;

focus_t g_steamcompmgr_xdg_focus;
Expand Down Expand Up @@ -4161,8 +4161,8 @@ determine_and_apply_focus( global_focus_t *pFocus )

#if HAVE_LIBSYSTEMD
pid_t newFocusedWindowPID = pFocus->focusWindow ? pFocus->focusWindow->pid : 0;
if (g_dbus && focusWindow_pid != newFocusedWindowPID) {
const char *unfocusedWindowUnit = unit_from_pid(focusWindow_pid);
if (g_dbus && sdFocusWindow_pid != newFocusedWindowPID) {
const char *unfocusedWindowUnit = unit_from_pid(sdFocusWindow_pid);
const char *focusedWindowUnit = unit_from_pid(newFocusedWindowPID);
bool sameUnit = unfocusedWindowUnit && focusedWindowUnit && !strcmp(unfocusedWindowUnit, focusedWindowUnit);

Expand All @@ -4187,7 +4187,7 @@ determine_and_apply_focus( global_focus_t *pFocus )
focusedBaseAppId = pFocus->focusWindow->appID;
focusedAppId = pFocus->inputFocusWindow->appID;
focused_display = get_win_display_name(pFocus->focusWindow);
focusWindow_pid = pFocus->focusWindow->pid;
sdFocusWindow_pid = pFocus->focusWindow->pid;
}

g_focusedBaseAppId = (uint32_t)focusedAppId;
Expand Down Expand Up @@ -6507,6 +6507,7 @@ bool handle_done_commit( steamcompmgr_win_t *w, xwayland_ctx_t *ctx, uint64_t co
hasRepaint = true;

focusWindow_engine = w->engineName;
focusWindow_pid = w->pid;
}

if ( w == pFocus->overrideWindow )
Expand Down