11#include "displayserver_linux.h"
22#include "common/io/io.h"
3- #include "common/time.h"
43#include "util/edidHelper.h"
54#include "util/stringUtils.h"
65
@@ -81,8 +80,6 @@ static void parseDRM(FFDisplayServerResult* result)
8180
8281void ffConnectDisplayServerImpl (FFDisplayServerResult * ds )
8382{
84- uint64_t start = ffTimeGetTick ();
85- printf ("DS start: %lums\n" , ffTimeGetTick () - start );
8683 ffStrbufInit (& ds -> wmProcessName );
8784 ffStrbufInit (& ds -> wmPrettyName );
8885 ffStrbufInit (& ds -> wmProtocolName );
@@ -93,40 +90,32 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
9390
9491 if (!instance .config .dsForceDrm )
9592 {
96- printf ("DS Wayland start: %lums\n" , ffTimeGetTick () - start );
9793 //We try wayland as our prefered display server, as it supports the most features.
9894 //This method can't detect the name of our WM / DE
9995 ffdsConnectWayland (ds );
10096
101- printf ("DS XcbRandr start: %lums\n" , ffTimeGetTick () - start );
10297 //Try the x11 libs, from most feature rich to least.
10398 //We use the display list to detect if a connection is needed.
10499 //They respect wmProtocolName, and only detect display if it is set.
105100
106101 if (ds -> displays .length == 0 )
107102 ffdsConnectXcbRandr (ds );
108103
109- printf ("DS Xrandr start: %lums\n" , ffTimeGetTick () - start );
110104 if (ds -> displays .length == 0 )
111105 ffdsConnectXrandr (ds );
112106
113- printf ("DS Xcb start: %lums\n" , ffTimeGetTick () - start );
114107 if (ds -> displays .length == 0 )
115108 ffdsConnectXcb (ds );
116109
117- printf ("DS Xlib start: %lums\n" , ffTimeGetTick () - start );
118110 if (ds -> displays .length == 0 )
119111 ffdsConnectXlib (ds );
120112 }
121113
122- printf ("DS DRM start: %lums\n" , ffTimeGetTick () - start );
123114 //This display detection method is display server independent.
124115 //Use it if all connections failed
125116 if (ds -> displays .length == 0 )
126117 parseDRM (ds );
127118
128- printf ("DS WMDE start: %lums\n" , ffTimeGetTick () - start );
129119 //This fills in missing information about WM / DE by using env vars and iterating processes
130120 ffdsDetectWMDE (ds );
131- printf ("DS end: %lums\n" , ffTimeGetTick () - start );
132121}
0 commit comments