Development/compositor enhancements

Compositor/CMakeLists.txt

@@ -53,11 +53,9 @@ option(PLUGIN_COMPOSITOR_TEST "Build a compositor test client" OFF)
 option(PLUGIN_COMPOSITOR_NXSERVER "Include a nexus server (Used in Wayland)" OFF)
 
 set(PLUGIN_COMPOSITOR_IMPLEMENTATION_LIB "lib${PLATFORM_COMPOSITOR}.so" CACHE STRING "Specify a library with a compositor implementation." )
-set(PLUGIN_COMPOSITOR_RESOLUTION "720p" CACHE STRING "Specify the startup resolution")
+set(PLUGIN_COMPOSITOR_RESOLUTION "Unknown" CACHE STRING "Specify the startup resolution")
 
 set(PLUGIN_COMPOSITOR_OUTPUT "HDMI-A-1"  CACHE STRING "Specify the output (name1;h;w) that the compositor should use." )
-set(PLUGIN_COMPOSITOR_CANVAS_HEIGHT "1080"  CACHE STRING "Specify the height of the canvas that the compositor uses for drawing." )
-set(PLUGIN_COMPOSITOR_CANVAS_WIDTH "1920"  CACHE STRING "Specify the width of the canvas that the compositor uses for drawing." )
 set(PLUGIN_COMPOSITOR_RENDER_NODE ""  CACHE STRING "Manually specify the render node to use (e.g. /dev/dri/renderDxxx or /dev/dri/cardx)." )
 
 set(PLUGIN_COMPOSITOR_WESTON_TTY_LIST "1;2;3;4" CACHE STRING "TTY ids for weston drm backend")

Compositor/Compositor.conf.in

@@ -73,10 +73,7 @@ if "@PLUGIN_COMPOSITOR_IMPLEMENTATION@" == "Wayland":
                     output_configs_list.append(output_config_dict)
             configuration.add("outputs", output_configs_list)
 
-if "@PLUGIN_COMPOSITOR_IMPLEMENTATION@" == "Mesa":
-    configuration.add("height", "@PLUGIN_COMPOSITOR_CANVAS_HEIGHT@")
-    configuration.add("width", "@PLUGIN_COMPOSITOR_CANVAS_WIDTH@")
-
+if "@PLUGIN_COMPOSITOR_IMPLEMENTATION@" == "Mesa":    
     if "@PLUGIN_COMPOSITOR_RENDER_NODE@":
         configuration.add("render", "@PLUGIN_COMPOSITOR_RENDER_NODE@")
 

Compositor/Compositor.cpp

@@ -208,13 +208,18 @@ namespace Plugin {
         } else {
             RegisterAll();
             _composition->Register(&_notification);
-            _composition->Configure(_service);
 
-            _inputSwitch = _composition->QueryInterface<Exchange::IInputSwitch>();
-            _inputSwitchCallsign = config.InputSwitch.Value();
-            _newOnTop = config.NewOnTop.Value();
+            uint32_t result = _composition->Configure(_service);
 
-            _brightness = _composition->QueryInterface<Exchange::IBrightness>();
+            if (result != Core::ERROR_NONE) {
+                message = "Instantiating the compositor failed. Could not configure: CompositorImplementation Error: " + std::string(Core::ErrorToString(result));
+            } else {
+                _inputSwitch = _composition->QueryInterface<Exchange::IInputSwitch>();
+                _inputSwitchCallsign = config.InputSwitch.Value();
+                _newOnTop = config.NewOnTop.Value();
+
+                _brightness = _composition->QueryInterface<Exchange::IBrightness>();
+            }
         }
 
         // On success return empty, to indicate there is no error text.
@@ -247,7 +252,7 @@ namespace Plugin {
                 // It should have been the last reference we are releasing,
                 // so it should endup in a DESTRUCTION_SUCCEEDED, if not we
                 // are leaking...
-                ASSERT( (result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
+                ASSERT((result == Core::ERROR_CONNECTION_CLOSED) || (result == Core::ERROR_DESTRUCTION_SUCCEEDED));
                 // If this was running in a (container) process...
                 if (connection != nullptr) {
                     // Lets trigger the cleanup sequence for

Compositor/cmake/Findlibdecor.cmake

@@ -0,0 +1,29 @@
+# If not stated otherwise in this file or this component's LICENSE file the
+# following copyright and licenses apply:
+#
+# Copyright 2025 Metrological
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if(LIBDECOR_FIND_QUIETLY)
+    set(_LIBDECOR_MODE QUIET)
+elseif(LIBDECOR_FIND_REQUIRED)
+    set(_LIBDECOR_MODE REQUIRED)
+endif()
+
+find_package(PkgConfig)
+pkg_check_modules(libdecor ${_LIBDECOR_MODE} IMPORTED_TARGET GLOBAL libdecor-0)
+
+if (libdecor_FOUND)
+   add_library(libdecor::libdecor ALIAS PkgConfig::libdecor)
+endif()