Fix internal display touchscreen orientation when it's forced

3003n · Apr 10, 2024 · ef8d0b1 · ef8d0b1
1 parent 95983d1
commit ef8d0b1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/src/backend.h b/src/backend.h
@@ -105,6 +105,11 @@ namespace gamescope
         virtual const char *GetName() const = 0;
         virtual const char *GetMake() const = 0;
         virtual const char *GetModel() const = 0;
+
+        virtual bool DisplayTypeInternal() const
+        { 
+            return GetScreenType() == GAMESCOPE_SCREEN_TYPE_INTERNAL; 
+        }
     };
 
     class INestedHints

diff --git a/src/drm.cpp b/src/drm.cpp
@@ -300,7 +300,7 @@ namespace gamescope
 			return GAMESCOPE_SCREEN_TYPE_EXTERNAL;
 		}
 
-		bool GetDisplayTypeInternal()
+		bool DisplayTypeInternal() const override
 		{
 			return m_pConnector->connector_type == DRM_MODE_CONNECTOR_eDP ||
 						m_pConnector->connector_type == DRM_MODE_CONNECTOR_LVDS ||
@@ -1950,7 +1950,7 @@ namespace gamescope
 	{
 		if ( this->GetScreenType() == GAMESCOPE_SCREEN_TYPE_EXTERNAL &&
 			g_eGamescopePanelExternalOrientation != GAMESCOPE_PANEL_EXTERNAL_ORIENTATION_AUTO &&
-			this->GetDisplayTypeInternal() )
+			this->DisplayTypeInternal() )
 		{
 			switch ( g_eGamescopePanelExternalOrientation )
 			{

diff --git a/src/main.cpp b/src/main.cpp
@@ -276,6 +276,8 @@ bool g_bForceRelativeMouse = false;
 
 bool g_bGrabbed = false;
 
+bool g_bExternalForced = false;
+
 float g_mouseSensitivity = 1.0;
 
 GamescopeUpscaleFilter g_upscaleFilter = GamescopeUpscaleFilter::LINEAR;
@@ -421,12 +423,16 @@ GamescopePanelExternalOrientation g_eGamescopePanelExternalOrientation = GAMESCO
 static GamescopePanelExternalOrientation force_external_orientation(const char *str)
 {
 	if (strcmp(str, "normal") == 0) {
+		g_bExternalForced = true;
 		return GAMESCOPE_PANEL_EXTERNAL_ORIENTATION_0;
 	} else if (strcmp(str, "right") == 0) {
+		g_bExternalForced = true;
 		return GAMESCOPE_PANEL_EXTERNAL_ORIENTATION_270;
 	} else if (strcmp(str, "left") == 0) {
+		g_bExternalForced = true;
 		return GAMESCOPE_PANEL_EXTERNAL_ORIENTATION_90;
 	} else if (strcmp(str, "upsidedown") == 0) {
+		g_bExternalForced = true;
 		return GAMESCOPE_PANEL_EXTERNAL_ORIENTATION_180;
 	} else {
 		fprintf( stderr, "gamescope: invalid value for --force-external-orientation\n" );

diff --git a/src/main.hpp b/src/main.hpp
@@ -26,6 +26,8 @@ extern bool g_bFullscreen;
 
 extern bool g_bGrabbed;
 
+extern bool g_bExternalForced;
+
 extern float g_mouseSensitivity;
 extern const char *g_sOutputName;
 

diff --git a/src/wlserver.cpp b/src/wlserver.cpp
@@ -2013,8 +2013,12 @@ static void apply_touchscreen_orientation(double *x, double *y )
 	double tx = 0;
 	double ty = 0;
 
-	// Use internal screen always for orientation purposes.
-	switch ( GetBackend()->GetConnector( gamescope::GAMESCOPE_SCREEN_TYPE_INTERNAL )->GetCurrentOrientation() )
+	auto orientation = GAMESCOPE_PANEL_ORIENTATION_AUTO;
+	if ( GetBackend() && GetBackend()->GetCurrentConnector(  ) )
+	{
+		orientation = GetBackend()->GetCurrentConnector()->GetCurrentOrientation();
+	}
+	switch ( orientation )
 	{
 		default:
 		case GAMESCOPE_PANEL_ORIENTATION_AUTO: