Wayland support

Dockerfile

@@ -6,7 +6,7 @@ RUN apt-get update -y && apt-get install -y software-properties-common
 RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
 RUN add-apt-repository -y ppa:openjdk-r/ppa
 RUN add-apt-repository -y ppa:git-core/ppa
-RUN apt-get update -y && apt-get install -y wget zip python git build-essential g++-9 cmake ninja-build libxcomposite-dev libxrandr-dev libgl1-mesa-dev libxi-dev libxcursor-dev openjdk-11-jdk-headless
+RUN apt-get update -y && apt-get install -y wget zip python git build-essential g++-9 cmake ninja-build libxcomposite-dev libxrandr-dev libgl1-mesa-dev libxi-dev libxcursor-dev openjdk-11-jdk-headless libegl1-mesa libegl1-mesa-dev extra-cmake-modules wayland-protocols wayland-utils libwayland-dev
 RUN wget --no-verbose https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz --output-document - | tar -xz
 RUN echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64' > /etc/profile.d/02-jdk.sh
 RUN echo 'export PATH=$JAVA_HOME/bin:/root/apache-maven-3.6.3/bin:$PATH' >> /etc/profile.d/02-jdk.sh

examples/dashboard/java/Example.java

@@ -53,10 +53,11 @@ public Example() {
         panelTheme = new PanelTheme(window);
         panelTouch = new PanelTouch(window);
 
-        var scale = window.getScreen().getScale();
+        var scale = window.getScale();
         int count = App._windows.size() - 1;
         Screen screen = App.getScreens()[(count / 5) % App.getScreens().length];
         IRect bounds = screen.getWorkArea();
+        // IRect bounds = new IRect(0, 0, 100, 100);
 
         window.setTitle("JWM Window #" + count);
         if (window instanceof WindowMac windowMac) {
@@ -199,6 +200,18 @@ public void accept(Event e) {
                         window.minimize();
                     case B ->
                         setProgressBar(progressBars.next());
+                    case S -> {
+                        var timer = new Timer();
+                        // delay to allow workspace/focus switching
+                        timer.schedule(new TimerTask() {
+                            public void run() {
+                                App.runOnUIThread(() -> {
+                                        window.focus();
+                                        timer.cancel();
+                                });
+                            }
+                        }, 2000);
+                    }
                 }
             }
         } else if (e instanceof EventFrame) {

examples/dashboard/java/PanelMouseCursors.java

@@ -56,7 +56,7 @@ public void accept(Event e) {
                     keepCursor = false;
                 } else if (!keepCursor) {
                     if (window._lastCursor != MouseCursor.ARROW)
-                        window.requestFrame();
+                       window.requestFrame();
                     window.setMouseCursor(MouseCursor.ARROW);
                 }
                 lastInside = inside;

examples/dashboard/java/PanelRendering.java

@@ -34,6 +34,8 @@ else if (Platform.CURRENT == Platform.WINDOWS)
             layers = new String[] { "LayerD3D12Skija", "LayerGLSkija", "SkijaLayerRaster" };
         else if (Platform.CURRENT == Platform.X11)
             layers = new String[] { "LayerGLSkija", "LayerRasterSkija" };
+        else if (Platform.CURRENT == Platform.WAYLAND)
+            layers = new String[] { "LayerGLSkija", "LayerRasterSkija" };
 
         for (var layerName: layers)
             layersStatus.put(layerName, UNKNOWN);

examples/dashboard/java/PanelScreens.java

@@ -18,7 +18,7 @@ public PanelScreens(Window window) {
         super(window);
         if (Platform.MACOS == Platform.CURRENT) {
             titleStyles = new Options("Default", "Hidden", "Transparent", "Unified", "Unified Compact", "Unified Transparent", "Unified Compact Transparent");
-        } else if (Platform.X11 == Platform.CURRENT) {
+        } else if (Platform.X11 == Platform.CURRENT || Platform.WAYLAND == Platform.CURRENT) {
             titleStyles = new Options("Default", "Hidden");
         }
     }
@@ -66,6 +66,14 @@ public void setTitleStyle(String style) {
             case "Hidden" ->
                 w.setTitlebarVisible(false);
             }
+        } else if (Platform.WAYLAND == Platform.CURRENT) {
+            WindowWayland w = (WindowWayland) window;
+            switch (style) {
+            case "Default" ->
+                w.setTitlebarVisible(true);
+            case "Hidden" ->
+                w.setTitlebarVisible(false);
+            }
         }
     }
 
@@ -171,4 +179,4 @@ public void paintImpl(Canvas canvas, int width, int height, float scale) {
         canvas.translate(0, lineHeight);
         canvas.restore();
     }
-}
+}

examples/dashboard/java/PanelTextInput.java

@@ -232,4 +232,4 @@ public String getSubstring(int start, int end) {
         int end2 = Math.min(end, start2);
         return text.substring(start2, end2);
     }
-}
+}

linux/cc/ILayer.cc

@@ -10,4 +10,4 @@ void jwm::ILayer::makeCurrent() {
 }
 void jwm::ILayer::makeCurrentForced() {
     _ourCurrentLayer = this;
-}
+}

linux/cc/ILayer.hh

@@ -20,4 +20,4 @@ public:
     static ILayer* _ourCurrentLayer;
 };
 
-} // namespace jwm
+} // namespace jwm

macos/java/WindowMac.java

@@ -228,6 +228,11 @@ public Window restore() {
         return this;
     }
 
+    @Override
+    public float getScale() {
+        return this.getScreen().getScale();
+    }
+
     @Override
     public Window setFullScreen(boolean value) {
         assert _onUIThread() : "Should be run on UI thread";

script/build.py

@@ -1,8 +1,8 @@
 #! /usr/bin/env python3
 import argparse, build_utils, common, glob, os, platform, subprocess, sys
 
-def build_native():
-  os.chdir(common.basedir + "/" + build_utils.system)
+def build_native_system(system):
+  os.chdir(common.basedir + "/" + system)
   subprocess.check_call(["cmake",
     "-DCMAKE_BUILD_TYPE=Release",
     "-B", "build",
@@ -19,16 +19,30 @@ def build_native():
 
   if os.path.exists('build/libjwm_x64.so'):
     build_utils.copy_newer('build/libjwm_x64.so', '../target/classes/libjwm_x64.so')
+
+  if os.path.exists('build/libjwm_x64_wayland.so'):
+    build_utils.copy_newer('build/libjwm_x64_wayland.so', '../target/classes/libjwm_x64_wayland.so')
 
   if os.path.exists('build/jwm_x64.dll'):
     build_utils.copy_newer('build/jwm_x64.dll', '../target/classes/jwm_x64.dll')
 
   return 0
-
+def build_native():
+  cur_system = build_utils.system;
+  if cur_system == "linux":
+    build_native_system("x11")
+    build_native_system("wayland")
+  else:
+    build_native_system(cur_system)
+  return 0
 def build_java():
   os.chdir(common.basedir)
-  sources = build_utils.files("linux/java/**/*.java", "macos/java/**/*.java", "shared/java/**/*.java",  "windows/java/**/*.java",)
-  build_utils.javac(sources, "target/classes", classpath=common.deps_compile())
+  sources = build_utils.files("x11/java/**/*.java", 
+                              "macos/java/**/*.java", 
+                              "shared/java/**/*.java",  
+                              "windows/java/**/*.java",
+                              "wayland/java/**/*.java")
+  build_utils.javac(sources, "target/classes", classpath=common.deps_compile(), release="16")
   return 0
 
 def main():

script/build_utils.py

@@ -250,4 +250,4 @@ def fetch(path, data = None):
               "stagedRepositoryIds":[repo_id]
         }})
   print('Success! Just released', repo_id)
-  return 0
+  return 0

script/clean.py

@@ -4,9 +4,13 @@
 def main():
   os.chdir(common.basedir)
   build_utils.rmdir("target")
-  build_utils.rmdir(build_utils.system + "/build")
+  if build_utils.system == "linux":
+    build_utils.rmdir("wayland/build")
+    build_utils.rmdir("x11/build")
+  else:
+    build_utils.rmdir(build_utils.system + "/build")
   build_utils.rmdir("examples/dashboard/target")
   return 0
 
 if __name__ == '__main__':
-  sys.exit(main())
+  sys.exit(main())

script/common.py

@@ -8,7 +8,7 @@ def deps_compile():
   parser = argparse.ArgumentParser()
   parser.add_argument('--skija-dir', default=None)
   parser.add_argument('--skija-shared-jar', default=None)
-  parser.add_argument('--skija-version', default='0.116.1')
+  parser.add_argument('--skija-version', default='0.116.2')
   (args, _) = parser.parse_known_args()
 
   deps = [
@@ -38,4 +38,4 @@ def deps_compile():
 
   return deps
 
-version = build_utils.get_arg("version") or build_utils.parse_ref() or build_utils.parse_sha() or "0.0.0-SNAPSHOT"
+version = build_utils.get_arg("version") or build_utils.parse_ref() or build_utils.parse_sha() or "0.0.0-SNAPSHOT"

script/package.py

@@ -22,7 +22,8 @@ def main() -> Tuple[str, str, str]:
   jar = build_utils.jar(f"target/jwm-{common.version}.jar", ("target/classes", "."), ("target/maven", "META-INF"))
 
   build_utils.makedirs("target/src/io/github/humbleui/jwm")
-  shutil.copytree("linux/java", "target/src/io/github/humbleui/jwm", dirs_exist_ok=True)
+  shutil.copytree("x11/java", "target/src/io/github/humbleui/jwm", dirs_exist_ok=True)
+  shutil.copytree("wayland/java", "target/src/io/github/humbleui/jwm", dirs_exist_ok=True)
   shutil.copytree("macos/java", "target/src/io/github/humbleui/jwm", dirs_exist_ok=True)
   shutil.copytree("shared/java", "target/src/io/github/humbleui/jwm", dirs_exist_ok=True)
   shutil.copytree("windows/java", "target/src/io/github/humbleui/jwm", dirs_exist_ok=True)

script/run.py

@@ -5,14 +5,15 @@ def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('--example', default='dashboard')
   parser.add_argument('--jwm-version', default=None)
-  parser.add_argument('--skija-version', default='0.116.1')
+  parser.add_argument('--skija-version', default='0.116.2')
   parser.add_argument('--skija-dir', default=None)
   parser.add_argument('--skija-shared-jar', default=None)
   parser.add_argument('--skija-platform-jar', default=None)
   parser.add_argument('--types-dir', default=None)
+  parser.add_argument('--just-run', action='store_true')
   args = parser.parse_args()
 
-  if not args.jwm_version:
+  if not args.jwm_version and not args.just_run:
     build.main()
 
   if args.skija_dir:
@@ -32,14 +33,21 @@ def main():
     ]
   else:
     classpath += [
-      'target/classes',
-      build_utils.system + '/build'
-    ]
+          'target/classes'
+        ]
+    if build_utils.system == "linux":
+        classpath += [
+          "wayland/build",
+          "x11/build"
+        ]
+    else:
+      classpath += [
+        build_utils.system + '/build'
+      ]
 
   if args.skija_dir:
     classpath += [
-      skija_dir + '/platform/build',
-      skija_dir + '/platform/target/classes',
+      skija_dir + '/platform/target/' + build_utils.system + '-' + build_utils.arch + '/classes',
     ]
   elif args.skija_platform_jar:
     classpath += [

shared/cc/MouseCursor.hh

@@ -51,4 +51,4 @@ namespace jwm {
         }
     }
 
-}
+}

shared/cc/Window.cc

@@ -6,6 +6,7 @@
 
 jwm::Window::~Window() {
     fEnv->DeleteGlobalRef(fWindow);
+    fWindow = nullptr;
 }
 
 void jwm::Window::dispatch(jobject event) {

shared/java/App.java

@@ -52,6 +52,8 @@ else if (Platform.CURRENT == Platform.MACOS)
             window = new WindowMac();
         else if (Platform.CURRENT == Platform.X11)
             window = new WindowX11();
+        else if (Platform.CURRENT == Platform.WAYLAND)
+            window = new WindowWayland();
         else
             throw new RuntimeException("Unsupported platform: " + Platform.CURRENT);
         _windows.add(window);
@@ -98,12 +100,15 @@ public static Screen[] getScreens() {
      *
      * @return          primary desktop screen
      */
+    @Nullable
     public static Screen getPrimaryScreen() {
         assert _onUIThread() : "Should be run on UI thread";
+        if (Platform.CURRENT == Platform.WAYLAND)
+            return null;
         for (Screen s: getScreens())
             if (s.isPrimary())
                 return s;
-        throw new IllegalStateException("Can't find primary screen");
+        return null;
     }
 
     public static void openSymbolsPalette() {

shared/java/ClipboardEntry.java

@@ -62,7 +62,7 @@ public static ClipboardEntry makeRTF(String text) {
      */
     @NotNull @SneakyThrows
     public static ClipboardEntry makeString(ClipboardFormat format, String text) {
-        if (Platform.CURRENT == Platform.X11 || Platform.CURRENT == Platform.MACOS) {
+        if (Platform.CURRENT == Platform.X11 || Platform.CURRENT == Platform.MACOS || Platform.CURRENT == Platform.WAYLAND) {
             return make(format, text.getBytes("UTF-8"));
         }
         return make(format, text.getBytes("UTF-16LE"));
@@ -76,9 +76,9 @@ public static ClipboardEntry makeString(ClipboardFormat format, String text) {
      */
     @NotNull @SneakyThrows
     public String getString() {
-        if (Platform.CURRENT == Platform.X11 || Platform.CURRENT == Platform.MACOS) {
+        if (Platform.CURRENT == Platform.X11 || Platform.CURRENT == Platform.MACOS || Platform.CURRENT == Platform.WAYLAND) {
             return new String(_data, "UTF-8");
         }
         return new String(_data, "UTF-16LE");
     }
-}
+}

shared/java/Layer.java

@@ -47,4 +47,4 @@ default void swapBuffers() {}
 
     @Override
     default void close() {}
-}
+}

shared/java/LayerGL.java

@@ -15,8 +15,8 @@ public LayerGL() {
     @Override
     public void attach(Window window) {
         assert _onUIThread() : "Should be run on UI thread";
-        _nAttach(window);
         _window = window;
+        _nAttach(window);
     }
 
     @Override
@@ -75,4 +75,4 @@ public void close() {
     @ApiStatus.Internal public native void _nResize(int width, int height);
     @ApiStatus.Internal public native void _nSwapBuffers();
     @ApiStatus.Internal public native void _nClose();
-}
+}

shared/java/LayerRaster.java

@@ -15,8 +15,8 @@ public LayerRaster() {
     @Override
     public void attach(Window window) {
         assert _onUIThread() : "Should be run on UI thread";
-        _nAttach(window);
         _window = window;
+        _nAttach(window);
     }
 
     @Override
@@ -81,4 +81,4 @@ public int getRowBytes() {
     @ApiStatus.Internal public native long _nGetPixelsPtr();
     @ApiStatus.Internal public native int _nGetRowBytes();
     @ApiStatus.Internal public native void _nClose();
-}
+}

shared/java/Platform.java

@@ -3,7 +3,8 @@
 public enum Platform {
     WINDOWS,
     X11,
-    MACOS;
+    MACOS,
+    WAYLAND;
 
     public static final Platform CURRENT;
     static {
@@ -13,8 +14,11 @@ public enum Platform {
         else if (os.contains("windows"))
             CURRENT = WINDOWS;
         else if (os.contains("nux") || os.contains("nix"))
-            CURRENT = X11;
+            if (System.getenv("WAYLAND_DISPLAY") != null)
+                CURRENT = WAYLAND;
+            else 
+                CURRENT = X11;
         else
             throw new RuntimeException("Unsupported platform: " + os);
     }
-}
+}