From e7cd2dbb2590b144aa21064408bdce9348be3ff9 Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Sat, 8 Jan 2022 06:20:07 +0000
Subject: [PATCH] steamcompmgr: Add win_surface helper

Makes this easier to read
---
 src/steamcompmgr.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
index 227e03b..074c400 100644
--- a/src/steamcompmgr.cpp
+++ b/src/steamcompmgr.cpp
@@ -2060,6 +2060,14 @@ found:
 	XFree(children);
 }
 
+wlr_surface *win_surface(win *window)
+{
+	if (!window)
+		return nullptr;
+
+	return window->surface.wlr;
+}
+
 static void
 determine_and_apply_focus()
 {
@@ -2187,11 +2195,11 @@ found:
 	if ( global_focus.inputFocusWindow    != previous_focus.inputFocusWindow ||
 		 global_focus.keyboardFocusWindow != previous_focus.keyboardFocusWindow )
 	{
-		if ( (global_focus.inputFocusWindow && global_focus.inputFocusWindow->surface.wlr != nullptr) ||
-			 (global_focus.keyboardFocusWindow && global_focus.keyboardFocusWindow->surface.wlr != nullptr) )
+		if ( win_surface(global_focus.inputFocusWindow)    != nullptr ||
+			 win_surface(global_focus.keyboardFocusWindow) != nullptr )
 		{
 			wlserver_lock();
-			if ( global_focus.inputFocusWindow && global_focus.inputFocusWindow->surface.wlr != nullptr )
+			if ( win_surface(global_focus.inputFocusWindow) != nullptr )
 			{
 				// Instantly stop pressing left mouse before transitioning to a new window.
 				// for focus.
@@ -2200,7 +2208,7 @@ found:
 				wlserver_mousefocus( global_focus.inputFocusWindow->surface.wlr, global_focus.cursor->x(), global_focus.cursor->y() );
 			}
 
-			if ( global_focus.keyboardFocusWindow && global_focus.keyboardFocusWindow->surface.wlr != nullptr )
+			if ( win_surface(global_focus.keyboardFocusWindow) != nullptr )
 				wlserver_keyboardfocus( global_focus.keyboardFocusWindow->surface.wlr );
 			wlserver_unlock();
 		}