From 1eae252f41eab7612864fb479263dc93310d8930 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Wed, 2 Jul 2025 23:36:30 +0200 Subject: init --- .gitignore | 42 ++++ build-logic/build.gradle.kts | 13 ++ build-logic/src/main/kotlin/DownloadArchiveFile.kt | 71 +++++++ build-logic/src/main/kotlin/DownloadExtension.kt | 27 +++ build-logic/src/main/kotlin/DownloadTarFile.kt | 49 +++++ build-logic/src/main/kotlin/DownloadZipFile.kt | 35 +++ .../src/main/kotlin/mossbar.downloads.gradle.kts | 2 + build.gradle.kts | 58 +++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 234 +++++++++++++++++++++ gradlew.bat | 89 ++++++++ protocols/build.gradle.kts | 64 ++++++ .../java/org/freedesktop/wayland/package-info.java | 22 ++ settings.gradle.kts | 3 + src/main/java/moe/nea/mossbar/Launch.java | 18 ++ src/main/java/moe/nea/mossbar/concepts/Bar.java | 103 +++++++++ .../java/moe/nea/mossbar/concepts/Display.java | 146 +++++++++++++ src/main/java/moe/nea/mossbar/concepts/Scope.java | 27 +++ .../java/moe/nea/mossbar/concepts/ScopeObject.java | 12 ++ .../moe/nea/mossbar/concepts/ScopeObjectProxy.java | 16 ++ .../moe/nea/mossbar/concepts/ShmBufferPool.java | 89 ++++++++ .../lang/AutoCloseable/ScopeObjectCloseable.java | 25 +++ .../wayland/client/Proxy/ProxyExtension.java | 20 ++ 24 files changed, 1171 insertions(+) create mode 100644 .gitignore create mode 100644 build-logic/build.gradle.kts create mode 100644 build-logic/src/main/kotlin/DownloadArchiveFile.kt create mode 100644 build-logic/src/main/kotlin/DownloadExtension.kt create mode 100644 build-logic/src/main/kotlin/DownloadTarFile.kt create mode 100644 build-logic/src/main/kotlin/DownloadZipFile.kt create mode 100644 build-logic/src/main/kotlin/mossbar.downloads.gradle.kts create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 protocols/build.gradle.kts create mode 100644 protocols/src/main/java/org/freedesktop/wayland/package-info.java create mode 100644 settings.gradle.kts create mode 100644 src/main/java/moe/nea/mossbar/Launch.java create mode 100644 src/main/java/moe/nea/mossbar/concepts/Bar.java create mode 100644 src/main/java/moe/nea/mossbar/concepts/Display.java create mode 100644 src/main/java/moe/nea/mossbar/concepts/Scope.java create mode 100644 src/main/java/moe/nea/mossbar/concepts/ScopeObject.java create mode 100644 src/main/java/moe/nea/mossbar/concepts/ScopeObjectProxy.java create mode 100644 src/main/java/moe/nea/mossbar/concepts/ShmBufferPool.java create mode 100644 src/main/java/mossbar/extensions/java/lang/AutoCloseable/ScopeObjectCloseable.java create mode 100644 src/main/java/mossbar/extensions/org/freedesktop/wayland/client/Proxy/ProxyExtension.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts new file mode 100644 index 0000000..44083e8 --- /dev/null +++ b/build-logic/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + java + `kotlin-dsl` + kotlin("jvm") version "2.1.21" +} +repositories { + mavenCentral() +} +java.toolchain.languageVersion.set(JavaLanguageVersion.of(24)) + +dependencies { + implementation("org.apache.commons:commons-compress:1.23.0") +} diff --git a/build-logic/src/main/kotlin/DownloadArchiveFile.kt b/build-logic/src/main/kotlin/DownloadArchiveFile.kt new file mode 100644 index 0000000..c7f549c --- /dev/null +++ b/build-logic/src/main/kotlin/DownloadArchiveFile.kt @@ -0,0 +1,71 @@ +import org.gradle.api.DefaultTask +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.OutputDirectory +import org.gradle.api.tasks.TaskAction +import java.io.InputStream +import java.net.URI + +abstract class DownloadArchiveFile : DefaultTask() { + @get:Input + abstract val url: Property + + @get:Input + abstract val stripRoot: Property + + @get:Input + abstract val subDirectory: Property + + @get:OutputDirectory + abstract val outputDir: DirectoryProperty + + init { + subDirectory.convention("") + stripRoot.convention(false) + } + + fun url(string: String) { + url.set(URI.create(string)) + } + + abstract fun mapInputStream(inputStream: InputStream): T + abstract fun nextEntry(stream: T): String? + + @TaskAction + fun execute() { + val baseFolder = outputDir.get().asFile + baseFolder.deleteRecursively() + baseFolder.mkdirs() + val pathFilter = this.subDirectory.get() + require(pathFilter.isEmpty() || pathFilter.endsWith("/")) { + "subdirectory '$pathFilter' does not end with a /" + } + url.get().toURL().openStream().buffered().use { input -> + val mappedStream = mapInputStream(input) + while (true) { + val entry = nextEntry(mappedStream) ?: break + var name = entry + if (name.endsWith("/")) continue + if (stripRoot.get()) { + name = name.substringAfter("/") + } + if (pathFilter.isNotEmpty()) { + if (!name.startsWith(pathFilter)) { + continue + } else { + name = name.substring(pathFilter.length) + } + } + val fileLocation = baseFolder.resolve(name).absoluteFile + if (baseFolder !in generateSequence(fileLocation) { it.parentFile }) { + error("File escaping output jail: $name") + } + fileLocation.parentFile.mkdirs() + fileLocation.outputStream().use { output -> + mappedStream.copyTo(output) + } + } + } + } +} diff --git a/build-logic/src/main/kotlin/DownloadExtension.kt b/build-logic/src/main/kotlin/DownloadExtension.kt new file mode 100644 index 0000000..efd9cbf --- /dev/null +++ b/build-logic/src/main/kotlin/DownloadExtension.kt @@ -0,0 +1,27 @@ +import org.gradle.api.Project +import org.gradle.api.tasks.TaskProvider +import java.util.* +import javax.inject.Inject + +abstract class DownloadExtension { + @get:Inject + abstract val project: Project + + fun downloadTaskName(name: String) = + "download" + name.capitalize(Locale.ROOT) + + inline fun > archive(name: String, noinline configure: T.() -> Unit) + : TaskProvider = + project.tasks.register(downloadTaskName(name), T::class.java) { + outputDir.convention(project.layout.buildDirectory.dir("downloadedSources/$name")) + configure(this) + } + + fun zip(name: String, configure: DownloadZipFile.() -> Unit): TaskProvider { + return archive(name, configure) + } + + fun tar(name: String, configure: DownloadTarFile.() -> Unit): TaskProvider { + return archive(name, configure) + } +} diff --git a/build-logic/src/main/kotlin/DownloadTarFile.kt b/build-logic/src/main/kotlin/DownloadTarFile.kt new file mode 100644 index 0000000..a23a336 --- /dev/null +++ b/build-logic/src/main/kotlin/DownloadTarFile.kt @@ -0,0 +1,49 @@ +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Input +import java.io.InputStream +import java.net.URI +import java.util.zip.GZIPInputStream + +abstract class DownloadTarFile : DownloadArchiveFile() { + @get:Input + abstract val gunzip: Property + + init { + gunzip.convention(url.map { it.path.endsWith(".tar.gz") }) + } + + abstract class CGitSource { + abstract val domain: Property + abstract val projectPath: Property + abstract val hash: Property + + fun toUrl(): URI { + return URI.create("https://${domain.get()}/${projectPath.get()}/snapshot/${hash.get()}.tar.gz") + } + } + + fun cGit(configure: CGitSource.() -> Unit) { + stripRoot.convention(true) + url.set( + project.provider( + project.objects.newInstance(CGitSource::class.java).also(configure)::toUrl + ) + ) + } + + + override fun mapInputStream(inputStream: InputStream): TarArchiveInputStream { + return TarArchiveInputStream( + if (gunzip.get()) { + GZIPInputStream(inputStream, 8192) + } else { + inputStream + } + ) + } + + override fun nextEntry(stream: TarArchiveInputStream): String? { + return stream.nextTarEntry?.name + } +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/DownloadZipFile.kt b/build-logic/src/main/kotlin/DownloadZipFile.kt new file mode 100644 index 0000000..475f195 --- /dev/null +++ b/build-logic/src/main/kotlin/DownloadZipFile.kt @@ -0,0 +1,35 @@ +import org.gradle.api.provider.Property +import java.io.InputStream +import java.net.URI +import java.util.zip.ZipInputStream + +abstract class DownloadZipFile : DownloadArchiveFile() { + abstract class GitLabSource { + abstract val domain: Property + abstract val owner: Property + abstract val project: Property + abstract val hash: Property + + fun toUrl(): URI { + return URI.create("https://${domain.get()}/${owner.get()}/${project.get()}/-/archive/${hash.get()}/${project.get()}-${hash.get()}.zip") + } + + } + + fun gitlab(configure: GitLabSource.() -> Unit) { + stripRoot.convention(true) + url.set( + project.provider( + project.objects.newInstance(GitLabSource::class.java).also(configure)::toUrl + ) + ) + } + + override fun mapInputStream(inputStream: InputStream): ZipInputStream { + return ZipInputStream(inputStream) + } + + override fun nextEntry(stream: ZipInputStream): String? { + return stream.nextEntry?.name + } +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/mossbar.downloads.gradle.kts b/build-logic/src/main/kotlin/mossbar.downloads.gradle.kts new file mode 100644 index 0000000..63b6369 --- /dev/null +++ b/build-logic/src/main/kotlin/mossbar.downloads.gradle.kts @@ -0,0 +1,2 @@ + +extensions.create("downloads", DownloadExtension::class) diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..02c865a --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,58 @@ +plugins { + id("java") + id("systems.manifold.manifold-gradle-plugin") version "0.0.2-alpha" + application +} + +allprojects { + group = "moe.nea" + version = "1.0-SNAPSHOT" + + repositories { + mavenCentral() + mavenLocal() + maven("https://repo.nea.moe/mirror") + maven("https://repo.nea.moe/release") + } +} + +manifold { + manifoldVersion.set("2025.1.24") +} + +application { + mainClass.set("moe.nea.mossbar.Launch") + // We LOVE deprecating methods without an upgrade path!! shoutout to varhandle for being useless + applicationDefaultJvmArgs += listOf("--add-opens=java.base/java.lang=ALL-UNNAMED", "--enable-native-access=ALL-UNNAMED") + + // on nix: set LD_LIBRARY_PATH=$(nix-build '' -A wayland) +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(24)) + +dependencies { + val manifoldSubSystems = listOf( + "json" to true, + "params" to true, + "strings" to false, + "props" to true, + ) + manifoldSubSystems.forEach { (name, rt) -> + if (rt) + implementation("systems.manifold:manifold-$name-rt:${manifold.manifoldVersion.get()}") + annotationProcessor("systems.manifold:manifold-$name:${manifold.manifoldVersion.get()}") + } + + + implementation(project(":protocols")) + implementation("org.jspecify:jspecify:1.0.0") + + runtimeOnly("org.slf4j:slf4j-simple:2.0.17") + + testImplementation(platform("org.junit:junit-bom:5.10.0")) + testImplementation("org.junit.jupiter:junit-jupiter") +} + +tasks.test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2313ec2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Jun 01 21:22:39 CEST 2025 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/protocols/build.gradle.kts b/protocols/build.gradle.kts new file mode 100644 index 0000000..37d3966 --- /dev/null +++ b/protocols/build.gradle.kts @@ -0,0 +1,64 @@ +plugins { + id("mossbar.downloads") + `java-library` +} + +dependencies { + annotationProcessor("org.freedesktop.wayland:wayland-scanner:2.0.0-nea-SNAPSHOT") + api("org.freedesktop.wayland:stubs-client:2.0.0-nea-SNAPSHOT") + implementation("com.github.spotbugs:spotbugs-annotations:4.9.3") +} + +fun DownloadZipFile.GitLabSource.freeDesktopOrg() { + domain.set("gitlab.freedesktop.org") +} + +val waylandCoreProtocols = downloads.zip("waylandCore") { + gitlab { + freeDesktopOrg() + owner.set("wayland") + project.set("wayland") + hash.set("1.23.91") + } + subDirectory.set("protocol/") +} + +val wlrootsProtocols = downloads.zip("wlroots") { + gitlab { + freeDesktopOrg() + owner.set("wlroots") + project.set("wlr-protocols") + hash.set("a5028afbe4a1cf0daf020c4104c1565a09d6e58a") + } +} + +val waylandProtocols = downloads.zip("waylandExtra") { + gitlab { + freeDesktopOrg() + owner.set("wayland") + project.set("wayland-protocols") + hash.set("1.44") + } +} + +val allProtocols = tasks.register("allProtocols", Copy::class) { + from(waylandProtocols) { + into("extra") + } + from(waylandCoreProtocols) { + into("core") + } + from(wlrootsProtocols) { + into("wlr") + } + into(layout.buildDirectory.dir("allProtocols")) +} + +tasks.compileJava { + dependsOn(allProtocols) + options.compilerArgs.add( + "-Awayland.scanner.protocol.root=${ + allProtocols.map { it.destinationDir.absolutePath }.get() + }" + ) +} diff --git a/protocols/src/main/java/org/freedesktop/wayland/package-info.java b/protocols/src/main/java/org/freedesktop/wayland/package-info.java new file mode 100644 index 0000000..5202cf6 --- /dev/null +++ b/protocols/src/main/java/org/freedesktop/wayland/package-info.java @@ -0,0 +1,22 @@ + +@WaylandCustomProtocols({ + @WaylandCustomProtocol( + path = "core/wayland.xml", + generateServer = false + ), + @WaylandCustomProtocol( + path = "wlr/unstable/wlr-layer-shell-unstable-v1.xml", + generateServer = false + ) +}) +@WaylandProtocols( + pkgConfig = "", + path = "extra", + generateServer = false, + withUnstable = false +) +package org.freedesktop.wayland; + +import org.freedesktop.wayland.generator.api.WaylandCustomProtocol; +import org.freedesktop.wayland.generator.api.WaylandCustomProtocols; +import org.freedesktop.wayland.generator.api.WaylandProtocols; \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..ac27a7a --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,3 @@ +rootProject.name = "mossbar" +includeBuild("build-logic") +include("protocols") \ No newline at end of file diff --git a/src/main/java/moe/nea/mossbar/Launch.java b/src/main/java/moe/nea/mossbar/Launch.java new file mode 100644 index 0000000..23d3868 --- /dev/null +++ b/src/main/java/moe/nea/mossbar/Launch.java @@ -0,0 +1,18 @@ +package moe.nea.mossbar; + +import moe.nea.mossbar.concepts.Bar; +import moe.nea.mossbar.concepts.Display; +import moe.nea.mossbar.concepts.Scope; + +public class Launch { + public static void main(String[] args) { + var rootScope = Scope.root(); + var display = new Display().bindTo(rootScope); + var bar = new Bar(display, display.outputs.first).bindTo(rootScope); + bar.renderOnce(); + while (display.proxy.dispatch() >= 0) { + } + + rootScope.closeObject(); + } +} diff --git a/src/main/java/moe/nea/mossbar/concepts/Bar.java b/src/main/java/moe/nea/mossbar/concepts/Bar.java new file mode 100644 index 0000000..891b28a --- /dev/null +++ b/src/main/java/moe/nea/mossbar/concepts/Bar.java @@ -0,0 +1,103 @@ +package moe.nea.mossbar.concepts; + +import org.freedesktop.wayland.client.*; +import org.freedesktop.wayland.shared.WlOutputTransform; +import org.freedesktop.wayland.shared.ZwlrLayerShellV1Layer; +import org.freedesktop.wayland.shared.ZwlrLayerSurfaceV1Anchor; +import org.freedesktop.wayland.util.EnumUtil; + +import java.io.IOException; +import java.nio.IntBuffer; +import java.util.EnumSet; + +public class Bar extends Scope { + private final Display display; + private final WlSurfaceProxy surface; + private final ZwlrLayerSurfaceV1Proxy layer; + private final ShmBufferPool bufferPool; + private WlCallbackProxy callbackProxy; + + + public Bar(Display display, WlOutputProxy output) { + this.display = display; + this.surface = display.compositorProxy.createSurface(new WlSurfaceEventsV6() { + @Override + public void enter(WlSurfaceProxy emitter, WlOutputProxy output) { + System.out.println("Surface entered"); + } + + @Override + public void leave(WlSurfaceProxy emitter, WlOutputProxy output) { + System.out.println("Left surface"); + } + + @Override + public void preferredBufferScale(WlSurfaceProxy emitter, int factor) { + System.out.println("Preferred buffer scale ${factor}"); + } + + @Override + public void preferredBufferTransform(WlSurfaceProxy emitter, int transform) { + var transforms = EnumUtil.decode(WlOutputTransform.class, transform); + System.out.println("Preferred buffer transform ${transforms}"); + } + }).bindTo(this); + this.layer = display.layerShell.getLayerSurface(new ZwlrLayerSurfaceV1EventsV4() { + @Override + public void configure(ZwlrLayerSurfaceV1Proxy emitter, int serial, int width, int height) { + System.out.println("Configure layer ${serial} ${width}x${height}"); + emitter.ackConfigure(serial); + } + + @Override + public void closed(ZwlrLayerSurfaceV1Proxy emitter) { + System.out.println("layer closed"); + } + }, this.surface, output, ZwlrLayerShellV1Layer.OVERLAY.getValue(), "mossbar") + .bindTo(this); + int width = 1920; + int height = 30; + layer.setSize(width, height); // TODO??? this should really not be a hardcoded width + layer.setAnchor(EnumUtil.encode(EnumSet.of(ZwlrLayerSurfaceV1Anchor.TOP, ZwlrLayerSurfaceV1Anchor.RIGHT, ZwlrLayerSurfaceV1Anchor.LEFT))); + surface.commit(); + try { + bufferPool = ShmBufferPool.newARGBPool(display, width, height, 2); + } catch (IOException e) { + throw new RuntimeException(e); + } + display.roundtrip(); + } + + public void renderOnce() { + System.out.println("Rendering"); + var nextBuffer = bufferPool.poll(); + assert nextBuffer != null; + var pixels = nextBuffer.getByteBuffer().asIntBuffer(); + fill(pixels, 0xFFFF00A0); + surface.attach(nextBuffer.getProxy(), 0, 0); + surface.damage(0, 0, nextBuffer.width, nextBuffer.height); + queueNextFrame(); + surface.commit(); + System.out.println("surface committed"); + } + + private void queueNextFrame() { + if (callbackProxy != null) + callbackProxy.destroy(); + callbackProxy = surface.frame((_, _) -> renderOnce()); + } + + @Override + public void closeObject() { + callbackProxy.destroy(); + super.closeObject(); + } + + private static void fill(IntBuffer buffer, int value) { + buffer.clear(); + buffer.limit(buffer.capacity()); + while (buffer.hasRemaining()) { + buffer.put(value); + } + } +} diff --git a/src/main/java/moe/nea/mossbar/concepts/Display.java b/src/main/java/moe/nea/mossbar/concepts/Display.java new file mode 100644 index 0000000..0234739 --- /dev/null +++ b/src/main/java/moe/nea/mossbar/concepts/Display.java @@ -0,0 +1,146 @@ +package moe.nea.mossbar.concepts; + +import manifold.ext.props.rt.api.PropOption; +import manifold.ext.props.rt.api.get; +import manifold.ext.props.rt.api.set; +import org.freedesktop.wayland.client.*; +import org.freedesktop.wayland.shared.WlSeatCapability; +import org.freedesktop.wayland.util.EnumUtil; +import org.jspecify.annotations.NonNull; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class Display extends Scope { + private final WlDisplayProxy proxy; + private final WlRegistryProxy registry; + private int shmFormat = 0; + private WlCompositorProxy compositorProxy; + private final List outputs = new ArrayList<>(); + + public List getOutputs() { + return outputs; + } + + public WlCompositorProxy getCompositorProxy() { + return compositorProxy; + } + + @get + @set(PropOption.Private) + WlShmProxy shmProxy; + @get + @set(PropOption.Private) + WlSeatProxy seatProxy; + @get + @set(PropOption.Private) + XdgWmBaseProxy xdgWmBaseProxy; + @get + @set(PropOption.Private) + ZwlrLayerShellV1Proxy layerShell; + + public Display() { + proxy = WlDisplayProxy.connect(Objects.requireNonNull(System.getenv("WAYLAND_DISPLAY"), "No WAYLAND_DISPLAY found")); + registry = proxy.getRegistry(new WlRegistryEvents() { + @Override + public void global(WlRegistryProxy emitter, int name, @NonNull String interfaceName, int version) { + System.out.println("Receiving interface " + interfaceName + "." + version); + registerInterface(name, interfaceName); + } + + @Override + public void globalRemove(WlRegistryProxy emitter, int name) { + System.out.println("Removed " + name); + } + }); + + proxy.roundtrip(); + proxy.roundtrip(); + + Objects.requireNonNull(layerShell); + Objects.requireNonNull(compositorProxy); + Objects.requireNonNull(xdgWmBaseProxy); + Objects.requireNonNull(seatProxy); + if (outputs.isEmpty) // TODO: dynamically find more outputs + throw new IllegalStateException("No outputs found"); + } + + + private > T bind(int name, Class proxyType, int version, J implementation) { + var proxy = registry + .bind(name, proxyType, version, implementation); + proxy.bindTo(this); + return proxy; + } + + private void registerInterface(int name, String interfaceName) { + switch (interfaceName) { + case WlCompositorProxy.INTERFACE_NAME -> + Display.this.compositorProxy = bind(name, WlCompositorProxy.class, WlCompositorEventsV6.VERSION, new WlCompositorEventsV6() { + }); + case WlShmProxy.INTERFACE_NAME -> + Display.this.shmProxy = bind(name, WlShmProxy.class, WlShmEvents.VERSION, new WlShmEvents() { + @Override + public void format(WlShmProxy emitter, int format) { + Display.this.shmFormat |= (1 << format); + } + }); + case XdgWmBaseProxy.INTERFACE_NAME -> + Display.this.xdgWmBaseProxy = bind(name, XdgWmBaseProxy.class, XdgWmBaseEventsV5.VERSION, new XdgWmBaseEventsV5() { + @Override + public void ping(XdgWmBaseProxy emitter, int serial) { + emitter.pong(serial); + } + }); + case ZwlrLayerShellV1Proxy.INTERFACE_NAME -> + Display.this.layerShell = bind(name, ZwlrLayerShellV1Proxy.class, ZwlrLayerShellV1EventsV4.VERSION, new ZwlrLayerShellV1EventsV4() { + }); + case WlOutputProxy.INTERFACE_NAME -> + outputs.add(bind(name, WlOutputProxy.class, WlOutputEvents.VERSION, new WlOutputEvents() { + @Override + public void geometry(WlOutputProxy emitter, int x, int y, int physicalWidth, int physicalHeight, int subpixel, String make, String model, int transform) { + + } + + @Override + public void mode(WlOutputProxy emitter, int flags, int width, int height, int refresh) { + + } + })); + case WlSeatProxy.INTERFACE_NAME -> + Display.this.seatProxy = bind(name, WlSeatProxy.class, WlSeatEventsV3.VERSION, new WlSeatEventsV3() { + @Override + public void capabilities(WlSeatProxy emitter, int capabilities) { + var caps = EnumUtil.decode(WlSeatCapability.class, capabilities); + System.out.println("capabilities: " + caps); + } + + @Override + public void name(WlSeatProxy emitter, @NonNull String name) { + System.out.println("Obtained seat " + name); + } + }); + } + } + + public WlDisplayProxy getProxy() { + return proxy; + } + + @Override + public void closeObject() { + super.closeObject(); + System.out.println("Destroying registry"); + registry.destroy(); + System.out.println("Destroyed registry"); + proxy.flush(); + System.out.println("Flushed proxy"); + proxy.disconnect(); + System.out.println("Destroyed proxy"); + } + + public void roundtrip() { + proxy.roundtrip(); + } +} diff --git a/src/main/java/moe/nea/mossbar/concepts/Scope.java b/src/main/java/moe/nea/mossbar/concepts/Scope.java new file mode 100644 index 0000000..68c5cc1 --- /dev/null +++ b/src/main/java/moe/nea/mossbar/concepts/Scope.java @@ -0,0 +1,27 @@ +package moe.nea.mossbar.concepts; + +import java.util.ArrayList; +import java.util.List; + +public abstract class Scope implements ScopeObject { + List scopedObjects = new ArrayList<>(); + + public static Scope root() { + return new Scope() { + }; + } + + protected T bind(T scopeObject) { + scopedObjects.add(scopeObject); + return scopeObject; + } + + @Override + public void closeObject() { + for (int i = scopedObjects.size() - 1; i >= 0; i--) { + ScopeObject scopeObject = scopedObjects.get(i); + scopeObject.closeObject(); + } + } + +} diff --git a/src/main/java/moe/nea/mossbar/concepts/ScopeObject.java b/src/main/java/moe/nea/mossbar/concepts/ScopeObject.java new file mode 100644 index 0000000..4c59f3b --- /dev/null +++ b/src/main/java/moe/nea/mossbar/concepts/ScopeObject.java @@ -0,0 +1,12 @@ +package moe.nea.mossbar.concepts; + +import manifold.ext.rt.api.Self; + +public interface ScopeObject { + + default @Self ScopeObject bindTo(Scope scope) { + return scope.bind(this); + } + + void closeObject(); +} diff --git a/src/main/java/moe/nea/mossbar/concepts/ScopeObjectProxy.java b/src/main/java/moe/nea/mossbar/concepts/ScopeObjectProxy.java new file mode 100644 index 0000000..6bf96a2 --- /dev/null +++ b/src/main/java/moe/nea/mossbar/concepts/ScopeObjectProxy.java @@ -0,0 +1,16 @@ +package moe.nea.mossbar.concepts; + +import org.freedesktop.wayland.client.Proxy; + +public class ScopeObjectProxy implements ScopeObject { + private final Proxy proxy; + + public ScopeObjectProxy(Proxy proxy) { + this.proxy = proxy; + } + + @Override + public void closeObject() { + proxy.destroy(); + } +} diff --git a/src/main/java/moe/nea/mossbar/concepts/ShmBufferPool.java b/src/main/java/moe/nea/mossbar/concepts/ShmBufferPool.java new file mode 100644 index 0000000..f7cd636 --- /dev/null +++ b/src/main/java/moe/nea/mossbar/concepts/ShmBufferPool.java @@ -0,0 +1,89 @@ +package moe.nea.mossbar.concepts; + +import manifold.ext.props.rt.api.get; +import org.freedesktop.wayland.client.WlBufferEvents; +import org.freedesktop.wayland.client.WlBufferProxy; +import org.freedesktop.wayland.client.WlShmPoolEvents; +import org.freedesktop.wayland.shared.WlShmFormat; +import org.freedesktop.wayland.util.ShmPool; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayDeque; +import java.util.Queue; + +public class ShmBufferPool extends Scope { + private boolean destroyed = false; + private Queue ready = new ArrayDeque<>(); + + void enqueue(Buffer buffer) { + requireNotDestroyed(); + ready.add(buffer); + } + + public class Buffer extends Scope implements WlBufferEvents, WlShmPoolEvents { + private final WlBufferProxy bufferProxy; + private final ShmPool shmPool; + @get + final int width; + @get + final int height; + @get + final int byteWidth; + @get + final @NonNull WlShmFormat format; + + Buffer(Display display, int width, int height, int byteWidth, WlShmFormat format) throws IOException { + this.width = width; + this.height = height; + this.byteWidth = byteWidth; + this.format = format; + int bufferSize = width * height * byteWidth; + shmPool = new ShmPool(bufferSize).bindTo(this); // TODO: shouldnt this be a long upstream? maybe wayland is just 32 bit like that + var poolProxy = display.shmProxy.createPool(this, shmPool.fd, bufferSize); + bufferProxy = poolProxy.createBuffer(this, 0, width, height, width * byteWidth, format.value).bindTo(this); + poolProxy.destroy(); + } + + public ByteBuffer getByteBuffer() { + return shmPool.asByteBuffer(); + } + + @Override + public void release(WlBufferProxy emitter) { + enqueue(this); + } + + public WlBufferProxy getProxy() { + return bufferProxy; + } + } + + private void requireNotDestroyed() { + if (destroyed) + throw new IllegalStateException("pool destroyed"); + } + + public @Nullable Buffer poll() { + requireNotDestroyed(); + return ready.poll(); + } + + @Override + public void closeObject() { + super.closeObject(); + destroyed = true; + } + + public ShmBufferPool(Display display, int width, int height, int bufferCount, int byteWidth, WlShmFormat shmFormat) throws IOException { + for (int i = 0; i < bufferCount; i++) { + ready.add(new Buffer(display, width, height, byteWidth, shmFormat).bindTo(this)); + } + } + + public static ShmBufferPool newARGBPool(Display display, int width, int height, int bufferCount) throws IOException { + return new ShmBufferPool(display, width, height, bufferCount, 4, WlShmFormat.ARGB8888); + } +} diff --git a/src/main/java/mossbar/extensions/java/lang/AutoCloseable/ScopeObjectCloseable.java b/src/main/java/mossbar/extensions/java/lang/AutoCloseable/ScopeObjectCloseable.java new file mode 100644 index 0000000..6268327 --- /dev/null +++ b/src/main/java/mossbar/extensions/java/lang/AutoCloseable/ScopeObjectCloseable.java @@ -0,0 +1,25 @@ +package mossbar.extensions.java.lang.AutoCloseable; + +import manifold.ext.rt.api.Extension; +import manifold.ext.rt.api.Self; +import manifold.ext.rt.api.This; +import moe.nea.mossbar.concepts.Scope; +import moe.nea.mossbar.concepts.ScopeObject; + +@Extension +public class ScopeObjectCloseable { + public static ScopeObject asScopeObject(@This AutoCloseable closeable) { + return () -> { + try { + closeable.close(); + } catch (Exception e) { + throw new RuntimeException(e); + } + }; + } + + public static @Self AutoCloseable bindTo(@Self @This AutoCloseable thiz, Scope scope) { + thiz.asScopeObject().bindTo(scope); + return thiz; + } +} \ No newline at end of file diff --git a/src/main/java/mossbar/extensions/org/freedesktop/wayland/client/Proxy/ProxyExtension.java b/src/main/java/mossbar/extensions/org/freedesktop/wayland/client/Proxy/ProxyExtension.java new file mode 100644 index 0000000..50aee26 --- /dev/null +++ b/src/main/java/mossbar/extensions/org/freedesktop/wayland/client/Proxy/ProxyExtension.java @@ -0,0 +1,20 @@ +package mossbar.extensions.org.freedesktop.wayland.client.Proxy; + +import manifold.ext.rt.api.Extension; +import manifold.ext.rt.api.Self; +import manifold.ext.rt.api.This; +import moe.nea.mossbar.concepts.Scope; +import moe.nea.mossbar.concepts.ScopeObjectProxy; +import org.freedesktop.wayland.client.Proxy; + +@Extension +public class ProxyExtension { + public static ScopeObjectProxy asScopeObject(@This Proxy thiz) { + return new ScopeObjectProxy(thiz); + } + + public static @Self Proxy bindTo(@Self @This Proxy thiz, Scope scope) { + asScopeObject(thiz).bindTo(scope); + return thiz; + } +} \ No newline at end of file -- cgit