DisplayServer: merge serverVender into wmProtocolName

Fix #1888

Author: CarterLi

src/detection/displayserver/displayserver.c

@@ -61,7 +61,6 @@ const FFDisplayServerResult* ffConnectDisplayServer()
         ffStrbufInit(&result.wmProtocolName);
         ffStrbufInit(&result.deProcessName);
         ffStrbufInit(&result.dePrettyName);
-        ffStrbufInit(&result.serverVendor);
         ffListInit(&result.displays, sizeof(FFDisplayResult));
         ffConnectDisplayServerImpl(&result);
     }

src/detection/displayserver/displayserver.h

@@ -91,7 +91,6 @@ typedef struct FFDisplayServerResult
     FFstrbuf wmProtocolName;
     FFstrbuf deProcessName;
     FFstrbuf dePrettyName;
-    FFstrbuf serverVendor;
     FFlist displays; //List of FFDisplayResult
 } FFDisplayServerResult;
 

src/detection/displayserver/linux/xcb.c

@@ -101,11 +101,13 @@ static void xcbFetchServerVendor(XcbPropertyData* data, xcb_connection_t* connec
     if(length <= 0)
         return;
 
-    ffStrbufSetNS(&result->serverVendor, (uint32_t) length, data->ffxcb_setup_vendor(setup));
+    FF_STRBUF_AUTO_DESTROY serverVendor = ffStrbufCreateNS((uint32_t) length, data->ffxcb_setup_vendor(setup));
 
-    //Shorten Xorg vendor string
-    if (!ffStrbufCompS(&result->serverVendor, "The X.Org Foundation"))
-        ffStrbufSetS(&result->serverVendor, "Xorg");
+    if (!ffStrbufEqualS(&serverVendor, "The X.Org Foundation")) // Original
+    {
+        ffStrbufDestroy(&result->wmProtocolName);
+        ffStrbufInitMove(&result->wmProtocolName, &serverVendor);
+    }
 }
 
 typedef struct XcbRandrData

src/detection/displayserver/linux/xlib.c

@@ -66,16 +66,9 @@ static void x11DetectWMFromEWMH(X11PropertyData* data, Display* display, FFDispl
 
 static void x11FetchServerVendor(X11PropertyData* data, Display* display, FFDisplayServerResult* result)
 {
-    if(result->serverVendor.length > 0 || ffStrbufCompS(&result->wmProtocolName, FF_WM_PROTOCOL_WAYLAND) == 0)
-        return;
-
     const char* serverVendor = data->ffXServerVendor(display);
-    if(ffStrSet(serverVendor)) {
-        ffStrbufSetS(&result->serverVendor, serverVendor);
-
-        //Shorten Xorg vendor string
-        if (!ffStrbufCompS(&result->serverVendor, "The X.Org Foundation"))
-            ffStrbufSetS(&result->serverVendor, "Xorg");
+    if (serverVendor && !ffStrEquals(serverVendor, "The X.Org Foundation")) {
+        ffStrbufSetS(&result->wmProtocolName, serverVendor);
     }
 
 

src/modules/wm/wm.c

@@ -42,13 +42,6 @@ void ffPrintWM(FFWMOptions* options)
             putchar(')');
         }
 
-        if(result->serverVendor.length > 0)
-        {
-            fputs(" [", stdout);
-            ffStrbufWriteTo(&result->serverVendor, stdout);
-            putchar(']');
-        }
-
         if(pluginName.length > 0)
         {
             fputs(" (with ", stdout);