Display: init support of JSON config

This commit is contained in:
李通洲
2023-03-10 10:56:36 +08:00
parent da81111575
commit 04180a7389
19 changed files with 318 additions and 168 deletions
@@ -121,5 +121,5 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds, const FFinstance* ins
ffStrbufAppendS(&ds->dePrettyName, "Aqua");
ffListInitA(&ds->displays, sizeof(FFDisplayResult), 4);
detectDisplays(ds, instance->config.displayDetectName);
detectDisplays(ds, instance->config.display.detectName);
}
@@ -113,7 +113,7 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds, const FFinstance* ins
ffStrbufInit(&ds->deVersion);
ffListInit(&ds->displays, sizeof(FFDisplayResult));
detectDisplays(ds, instance->config.displayDetectName);
detectDisplays(ds, instance->config.display.detectName);
//https://github.com/hykilpikonna/hyfetch/blob/master/neofetch#L2067
const FFOSResult* os = ffDetectOS(instance);
+1 -1
View File
@@ -225,7 +225,7 @@ bool detectWayland(const FFinstance* instance, FFDisplayServerResult* result)
if(data.display == NULL)
return false;
data.detectName = instance->config.displayDetectName;
data.detectName = instance->config.display.detectName;
waylandDetectWM(ffwl_display_get_fd(data.display), result);