Compositor (#348)

.github/actions/web/action.yaml

@@ -27,6 +27,10 @@ runs:
     - name: Build website
       shell: bash
       run: cd web && make prod
+    - name: Generate libblight docs
+      shell: bash
+      run: |
+        cd shared/libblight && make prod
     - name: Generate liboxide docs
       shell: bash
       run: |

.github/workflows/build.yml

@@ -93,6 +93,8 @@ jobs:
         with:
           setup: |
             set -ex
+            opkg update
+            opkg install python3 # needed for reboot-guard
             wget https://github.com/Eeems-Org/sysfs_preload/releases/download/1.0.0/packages.zip -O /tmp/packages.zip
             unzip /tmp/packages.zip -d /tmp
             opkg install /tmp/rmall/sysfs_preload_1.0.0-1_rmall.ipk
@@ -103,11 +105,13 @@ jobs:
             set -ex
             echo Y | toltecctl generate-opkg-conf
             opkg update
-            opkg install oxide
+            opkg install oxide oxide-tests
             # systemctl disable --now xochitl
             # systemctl enable --now tarnish
-            # TODO install and run tests
-            opkg remove --force-removal-of-dependent-packages liboxide
+            find /opt/share/tests -type f | while read -r test;do
+              $test;
+            done
+            opkg remove --force-removal-of-dependent-packages liboxide libblight
           path: ${{ steps.download.outputs.download-path }}
   release:
     needs: [build,test,lint]

.github/workflows/web.yaml

@@ -15,6 +15,7 @@ on:
     paths:
       - 'web/**'
       - 'shared/liboxide/**'
+      - 'shared/libblight/**'
       - '.github/actions/web/**'
 jobs:
   web:

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "shared/liboxide/doxygen-awesome-css"]
-	path = shared/liboxide/doxygen-awesome-css
+[submodule "shared/doxygen-awesome-css"]
+	path = shared/doxygen-awesome-css
 	url = https://github.com/jothepro/doxygen-awesome-css.git

Makefile

@@ -24,10 +24,14 @@ clean: clean-base
 	rm -rf $(BUILD)
 
 release: clean-base build $(DIST)
+ifneq ($(filter sentry,$(FEATURES)),)
 	# Force sentry makefile to regenerate so that install targets get when being build in toltecmk
 	cd $(BUILD)/oxide/shared/sentry && make qmake
+endif
 	# Force liboxide makefile to regenerate so that install targets get when being build in toltecmk
 	cd $(BUILD)/oxide/shared/liboxide && make qmake
+	# Force libblight makefile to regenerate so that install targets get when being build in toltecmk
+	cd $(BUILD)/oxide/shared/libblight && make qmake
 	INSTALL_ROOT=$(DIST) $(MAKE) --output-sync=target -C $(BUILD)/oxide install
 
 build: $(OBJ)
@@ -96,7 +100,7 @@ $(BUILD)/package/oxide.tar.gz: $(BUILD)/package/package $(PKG_OBJ)
 		oxide.pro \
 		Makefile
 
-SRC_FILES = $(shell find -name '*.sh' | grep -v shared/sentry)
+SRC_FILES = $(shell find -name '*.sh' | grep -v shared/sentry | grep -v shared/doxygen-awesome-css)
 SRC_FILES += package
 
 lint:

applications/applications.pro

@@ -10,7 +10,6 @@ SUBDIRS = \
     lockscreen \
     notify-send \
     process-manager \
-    screenshot-tool \
     screenshot-viewer \
     settings-manager \
     system-service \
@@ -20,13 +19,15 @@ SUBDIRS = \
     xdg-desktop-menu \
     xdg-icon-resource \
     xdg-open \
-    xdg-settings
+    xdg-settings \
+    display-server \
+    fbinfo \
+    xclip
 
 launcher.depends = system-service update-desktop-database
 lockscreen.depends = system-service
 notify-send.depends = system-service
 process-manager.depends =
-screenshot-tool.depends = system-service
 screenshot-viewer.depends = system-service
 settings-manager.depends = system-service
 system-service.depends =
@@ -41,5 +42,7 @@ xdg-icon-resource.depends = system-service
 desktop-file-edit.depends =
 desktop-file-install.depends =
 inject_evdev.depends =
-
+display-server.depends = system-service
+fbinfo.depends =
+xclip.depends = system-service
 INSTALLS += $$SUBDIRS

applications/display-server/Surface.qml

@@ -0,0 +1,24 @@
+import QtQuick 2.15
+import QtQuick.Window 2.15
+import codes.eeems.blight 1.0 as Blight
+
+Item{
+    Blight.Surface{
+        identifier: parent.objectName
+        anchors.fill: parent
+    }
+    // MouseArea{
+    //     anchors.fill: parent
+    // }
+    // MultiPointTouchArea{
+    //     anchors.fill: parent
+    // }
+    // Keys.onPressed: function(event){
+    //     console.log(event);
+    //     event.accepted = true;
+    // }
+    // Keys.onReleased: function(event){
+    //     console.log(event);
+    //     event.accepted = true;
+    // }
+}

applications/display-server/Workspace.qml

@@ -0,0 +1,25 @@
+import QtQuick 2.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+
+ApplicationWindow {
+    id: workspace
+    objectName: "Workspace"
+    width: Screen.width
+    height: Screen.height
+    x: 0
+    y: 0
+    visible: true
+    function loadComponent(url: string, props): string{
+        var comp = Qt.createComponent(url, Component.PreferSynchronous);
+        if(comp.status === Component.Error){
+            return comp.errorString();
+        }
+        return comp.createObject(workspace, props).objectName;
+    }
+    background: Rectangle{
+        color: "white"
+        anchors.fill: parent
+    }
+    contentData: []
+}

applications/display-server/blight-client

@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_PRELOAD=/opt/lib/libblight_client.so:$LD_PRELOAD RM2FB_SHIM=1 RM2FB_DISABLE=1 exec -a "$1" "$@"