Global (Android): enable X11 related stuff

src/detection/displayserver/displayserver.h

@@ -44,6 +44,7 @@
 #define FF_WM_PROTOCOL_TTY "TTY"
 #define FF_WM_PROTOCOL_X11 "X11"
 #define FF_WM_PROTOCOL_WAYLAND "Wayland"
+#define FF_WM_PROTOCOL_SURFACEFLINGER "SurfaceFlinger"
 
 typedef enum __attribute__((__packed__)) FFDisplayType {
     FF_DISPLAY_TYPE_UNKNOWN,

src/detection/displayserver/displayserver_android.c

@@ -1,6 +1,7 @@
 #include "displayserver.h"
 #include "common/settings.h"
 #include "common/processing.h"
+#include "linux/displayserver_linux.h"
 
 #include <math.h>
 
@@ -147,10 +148,19 @@ static bool detectWithGetprop(FFDisplayServerResult* ds)
 
 void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
 {
+    const char* error = ffdsConnectXcbRandr(ds);
+    if (error)
+        error = ffdsConnectXrandr(ds);
+    if (!error)
+    {
+        ffdsDetectWMDE(ds);
+        return;
+    }
+
     // https://source.android.com/docs/core/graphics/surfaceflinger-windowmanager
     ffStrbufSetStatic(&ds->wmProcessName, "system_server");
     ffStrbufSetStatic(&ds->wmPrettyName, "WindowManager"); // A system service managed by system_server
-    ffStrbufSetStatic(&ds->wmProtocolName, "SurfaceFlinger");
+    ffStrbufSetStatic(&ds->wmProtocolName, FF_WM_PROTOCOL_SURFACEFLINGER);
 
     if (!detectWithGetprop(ds))
         detectWithDumpsys(ds);

src/detection/displayserver/linux/common.c

@@ -0,0 +1,16 @@
+#include "displayserver_linux.h"
+#include "util/stringUtils.h"
+
+FFDisplayType ffdsGetDisplayType(const char* name)
+{
+    if(ffStrStartsWith(name, "eDP-") || ffStrStartsWith(name, "LVDS-"))
+        return FF_DISPLAY_TYPE_BUILTIN;
+    else if(ffStrStartsWith(name, "HDMI-") ||
+            ffStrStartsWith(name, "DP-") ||
+            ffStrStartsWith(name, "DisplayPort-") ||
+            ffStrStartsWith(name, "DVI-") ||
+            ffStrStartsWith(name, "VGA-"))
+        return FF_DISPLAY_TYPE_EXTERNAL;
+
+    return FF_DISPLAY_TYPE_UNKNOWN;
+}

src/detection/displayserver/linux/displayserver_linux.c

@@ -95,17 +95,3 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
         ffdsDetectWMDE(ds);
     }
 }
-
-FFDisplayType ffdsGetDisplayType(const char* name)
-{
-    if(ffStrStartsWith(name, "eDP-") || ffStrStartsWith(name, "LVDS-"))
-        return FF_DISPLAY_TYPE_BUILTIN;
-    else if(ffStrStartsWith(name, "HDMI-") ||
-            ffStrStartsWith(name, "DP-") ||
-            ffStrStartsWith(name, "DisplayPort-") ||
-            ffStrStartsWith(name, "DVI-") ||
-            ffStrStartsWith(name, "VGA-"))
-        return FF_DISPLAY_TYPE_EXTERNAL;
-
-    return FF_DISPLAY_TYPE_UNKNOWN;
-}

src/detection/displayserver/linux/wmde.c

@@ -65,7 +65,7 @@ static const char* parseEnv(void)
     if(getenv("SWAYSOCK") != NULL)
         return "Sway";
 
-    #ifdef __linux__
+    #if __linux__ && !__ANDROID__
     if(
         getenv("WAYLAND_DISPLAY") != NULL &&
         ffPathExists("/mnt/wslg/", FF_PATHTYPE_DIRECTORY)
@@ -433,6 +433,11 @@ static const char* getFromProcesses(FFDisplayServerResult* result)
 
 void ffdsDetectWMDE(FFDisplayServerResult* result)
 {
+    #if __ANDROID__
+    if(ffStrbufIgnCaseEqualS(&result->wmProtocolName, FF_WM_PROTOCOL_SURFACEFLINGER))
+        return; // Only supported when connected to X11
+    #endif
+
     const char* env = parseEnv();
 
     if(result->wmProcessName.length > 0)