diff --git a/src/detection/displayserver/displayserver_haiku.cpp b/src/detection/displayserver/displayserver_haiku.cpp index 41bdf1717..438bfb09f 100644 --- a/src/detection/displayserver/displayserver_haiku.cpp +++ b/src/detection/displayserver/displayserver_haiku.cpp @@ -1,7 +1,5 @@ extern "C" { #include "displayserver.h" -#include "common/settings.h" -#include "common/processing.h" } #include @@ -31,7 +29,8 @@ static void detectDisplays(FFDisplayServerResult* ds) monitor_info monitor; // WARNING: This is experimental new Haiku API status_t err = s.GetMonitorInfo(&monitor); - if (err == B_OK) { + if (err == B_OK) + { ffStrbufSetF(&name, "%s %s", monitor.vendor, monitor.name); ffStrbufTrimRightSpace(&name); } @@ -39,7 +38,7 @@ static void detectDisplays(FFDisplayServerResult* ds) uint32_t width = (uint32_t) s.Frame().Width() + 1; uint32_t height = (uint32_t) (uint32_t)s.Frame().Height() + 1; double scaleFactor = (double) 1.0; - ffdsAppendDisplay(ds, + FFDisplayResult* res = ffdsAppendDisplay(ds, width, height, (double)mode.timing.pixel_clock * 1000 / (mode.timing.v_total * mode.timing.h_total), @@ -52,11 +51,16 @@ static void detectDisplays(FFDisplayServerResult* ds) &name, FF_DISPLAY_TYPE_UNKNOWN, main, - s.ID().id, + (uint64_t) s.ID().id, 0, 0, "BScreen" ); + if (err == B_OK) + { + res->manufactureWeek = monitor.produced.week; + res->manufactureYear = monitor.produced.year; + } main = false; } while (s.SetToNext() == B_OK);