Skip to content

Commit 71a8978

Browse files
committed
Display: report platform api used for detection
1 parent 0f1ad57 commit 71a8978

File tree

13 files changed

+46
-21
lines changed

13 files changed

+46
-21
lines changed

src/detection/displayserver/displayserver.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ FFDisplayResult* ffdsAppendDisplay(
1313
bool primary,
1414
uint64_t id,
1515
uint32_t physicalWidth,
16-
uint32_t physicalHeight)
16+
uint32_t physicalHeight,
17+
const char* platformApi)
1718
{
1819
if(width == 0 || height == 0)
1920
return NULL;
@@ -31,6 +32,7 @@ FFDisplayResult* ffdsAppendDisplay(
3132
display->physicalWidth = physicalWidth;
3233
display->physicalHeight = physicalHeight;
3334
display->primary = primary;
35+
display->platformApi = platformApi;
3436

3537
display->bitDepth = 0;
3638
display->hdrStatus = FF_DISPLAY_HDR_STATUS_UNKNOWN;

src/detection/displayserver/displayserver.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ typedef struct FFDisplayResult
7070
uint32_t physicalWidth;
7171
uint32_t physicalHeight;
7272
bool primary;
73+
const char* platformApi;
7374
uint8_t bitDepth;
7475
FFDisplayHdrStatus hdrStatus;
7576
uint16_t manufactureYear;
@@ -102,4 +103,5 @@ FFDisplayResult* ffdsAppendDisplay(
102103
bool primary,
103104
uint64_t id,
104105
uint32_t physicalWidth,
105-
uint32_t physicalHeight);
106+
uint32_t physicalHeight,
107+
const char* platformApi);

src/detection/displayserver/displayserver_android.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ static void detectWithDumpsys(FFDisplayServerResult* ds)
6666
false,
6767
0,
6868
0,
69-
0
69+
0,
70+
"dumpsys"
7071
);
7172
}
7273

@@ -100,7 +101,8 @@ static bool detectWithGetprop(FFDisplayServerResult* ds)
100101
false,
101102
0,
102103
0,
103-
0
104+
0,
105+
"getprop"
104106
);
105107
}
106108

src/detection/displayserver/displayserver_apple.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ static void detectDisplays(FFDisplayServerResult* ds)
9494
CGDisplayIsMain(screen),
9595
(uint64_t)screen,
9696
physicalWidth,
97-
physicalHeight
97+
physicalHeight,
98+
"CoreGraphics"
9899
);
99100
if (display)
100101
{

src/detection/displayserver/displayserver_windows.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ static void detectDisplays(FFDisplayServerResult* ds)
165165
!!(monitorInfo->info.dwFlags & MONITORINFOF_PRIMARY),
166166
(uint64_t)(uintptr_t) monitorInfo->handle,
167167
physicalWidth,
168-
physicalHeight
168+
physicalHeight,
169+
"GDI"
169170
);
170171

171172
if (display)

src/detection/displayserver/linux/displayserver_linux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
8686
if (ffSettingsGetFreeBSDKenv("screen.height", &buf))
8787
{
8888
uint32_t height = (uint32_t) ffStrbufToUInt(&buf, 0);
89-
ffdsAppendDisplay(ds, width, height, 0, 0, 0, 0, NULL, FF_DISPLAY_TYPE_UNKNOWN, false, 0, 0, 0);
89+
ffdsAppendDisplay(ds, width, height, 0, 0, 0, 0, NULL, FF_DISPLAY_TYPE_UNKNOWN, false, 0, 0, 0, "kenv");
9090
}
9191
}
9292
}

src/detection/displayserver/linux/drm.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ static const char* drmParseSysfs(FFDisplayServerResult* result)
9090
false,
9191
0,
9292
physicalWidth,
93-
physicalHeight
93+
physicalHeight,
94+
"sysfs-drm"
9495
);
9596
if (item && edidLength)
9697
{
@@ -390,7 +391,8 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
390391
false,
391392
conn->connector_id,
392393
conn->mmWidth,
393-
conn->mmHeight
394+
conn->mmHeight,
395+
"libdrm"
394396
);
395397

396398
if (item)

src/detection/displayserver/linux/wayland/global-output.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ void ffWaylandHandleGlobalOutput(WaylandData* wldata, struct wl_registry* regist
129129
false,
130130
display.id,
131131
(uint32_t) display.physicalWidth,
132-
(uint32_t) display.physicalHeight
132+
(uint32_t) display.physicalHeight,
133+
"wayland-global"
133134
);
134135
if (item)
135136
{

src/detection/displayserver/linux/wayland/kde-output.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ void ffWaylandHandleKdeOutput(WaylandData* wldata, struct wl_registry* registry,
194194
false,
195195
display.id,
196196
(uint32_t) display.physicalWidth,
197-
(uint32_t) display.physicalHeight
197+
(uint32_t) display.physicalHeight,
198+
"wayland-kde"
198199
);
199200
if (item)
200201
{

src/detection/displayserver/linux/wayland/zwlr-output.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ static void waylandHandleZwlrHead(void *data, FF_MAYBE_UNUSED struct zwlr_output
138138
false,
139139
display.id,
140140
(uint32_t) display.physicalWidth,
141-
(uint32_t) display.physicalHeight
141+
(uint32_t) display.physicalHeight,
142+
"wayland-zwlr"
142143
);
143144
if (item)
144145
{

0 commit comments

Comments
 (0)