[WIP] Basic WM

compositor_dart/lib/compositor_dart.dart

@@ -1,3 +1,4 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
 library compositor_dart;
 
 import 'dart:async';
@@ -20,16 +21,45 @@ class Surface {
   final int pid;
   final int gid;
   final int uid;
-
-  final Compositor compositor;
+  final bool isPopup;
+  final int parentHandle;
 
   Surface({
     required this.handle,
     required this.pid,
     required this.gid,
     required this.uid,
-    required this.compositor,
+    required this.isPopup,
+    required this.parentHandle,
   });
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+
+    return other is Surface &&
+        other.handle == handle &&
+        other.pid == pid &&
+        other.gid == gid &&
+        other.uid == uid &&
+        other.isPopup == isPopup &&
+        other.parentHandle == parentHandle;
+  }
+
+  @override
+  int get hashCode {
+    return handle.hashCode ^
+        pid.hashCode ^
+        gid.hashCode ^
+        uid.hashCode ^
+        isPopup.hashCode ^
+        parentHandle.hashCode;
+  }
+
+  @override
+  String toString() {
+    return 'Surface(handle: $handle, pid: $pid, gid: $gid, uid: $uid, isPopup: $isPopup, parentHandle: $parentHandle)';
+  }
 }
 
 class _CompositorPlatform {
@@ -79,9 +109,11 @@ class _CompositorPlatform {
       ],
     );
   }
-}
 
-final Compositor compositor = Compositor();
+  Future<void> surfaceFocusViewWithHandle(int handle) async {
+    await channel.invokeMethod("surface_focus_from_handle", [handle]);
+  }
+}
 
 class Compositor {
   static void initLogger() {
@@ -111,17 +143,21 @@ class Compositor {
         pid: call.arguments["client_pid"],
         gid: call.arguments["client_gid"],
         uid: call.arguments["client_uid"],
-        compositor: this,
+        isPopup: call.arguments["is_popup"],
+        parentHandle: call.arguments["parent_handle"],
       );
-      surfaces[surface.handle] = surface;
+      surfaces.putIfAbsent(surface.handle, () => surface);
+
       surfaceMapped.add(surface);
     });
 
     platform.addHandler("surface_unmap", (call) async {
       int handle = call.arguments["handle"];
-      Surface surface = surfaces[handle]!;
-      surfaces.remove(handle);
-      surfaceUnmapped.add(surface);
+      if (surfaces.containsKey(handle)) {
+        Surface surface = surfaces[handle]!;
+        surfaces.remove(handle);
+        surfaceUnmapped.add(surface);
+      }
     });
 
     platform.addHandler("flutter/keyevent", (call) async {});

compositor_dart/lib/surface.dart

@@ -23,7 +23,7 @@ class _MeasureSizeRenderObject extends RenderProxyBox {
     if (oldSize == newSize) return;
 
     oldSize = newSize;
-    WidgetsBinding.instance?.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       onChange(newSize);
     });
   }
@@ -46,8 +46,15 @@ class _MeasureSize extends SingleChildRenderObjectWidget {
 
 class SurfaceView extends StatefulWidget {
   final Surface surface;
+  final Compositor compositor;
+  final Function(Surface surface)? onPointerClick;
 
-  const SurfaceView({Key? key, required this.surface}) : super(key: key);
+  const SurfaceView({
+    Key? key,
+    required this.surface,
+    required this.compositor,
+    this.onPointerClick,
+  }) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
@@ -61,15 +68,23 @@ class _SurfaceViewState extends State<SurfaceView> {
   @override
   void initState() {
     super.initState();
-    controller = _CompositorPlatformViewController(surface: widget.surface);
+    controller = _CompositorPlatformViewController(
+      surface: widget.surface,
+      compositor: widget.compositor,
+      onPointerClick: widget.onPointerClick,
+    );
   }
 
   @override
   void didUpdateWidget(SurfaceView oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.surface != widget.surface) {
       controller.dispose();
-      controller = _CompositorPlatformViewController(surface: widget.surface);
+      controller = _CompositorPlatformViewController(
+        surface: widget.surface,
+        compositor: widget.compositor,
+        onPointerClick: widget.onPointerClick,
+      );
     }
   }
 
@@ -90,7 +105,7 @@ class _SurfaceViewState extends State<SurfaceView> {
           int? keycode = physicalToXkbMap[event.physicalKey.usbHidUsage];
 
           if (keycode != null) {
-            compositor.platform.surfaceSendKey(
+            widget.compositor.platform.surfaceSendKey(
               widget.surface,
               keycode,
               status,
@@ -120,10 +135,16 @@ class _SurfaceViewState extends State<SurfaceView> {
 }
 
 class _CompositorPlatformViewController extends PlatformViewController {
-  Surface surface;
+  final Surface surface;
+  final Compositor compositor;
+  final Function(Surface surface)? onPointerClick;
   Size size = const Size(100, 100);
 
-  _CompositorPlatformViewController({required this.surface});
+  _CompositorPlatformViewController({
+    required this.surface,
+    required this.compositor,
+    this.onPointerClick,
+  });
 
   void setSize(Size size) {
     this.size = size;
@@ -155,6 +176,9 @@ class _CompositorPlatformViewController extends PlatformViewController {
     Offset scrollAmount = Offset.zero;
     if (event is PointerDownEvent) {
       eventType = pointerDownEvent;
+      if (onPointerClick != null) {
+        onPointerClick!(surface);
+      }
     } else if (event is PointerUpEvent) {
       eventType = pointerUpEvent;
     } else if (event is PointerHoverEvent) {

demo/lib/constants.dart

@@ -0,0 +1,8 @@
+import 'package:flutter/material.dart';
+
+final systemBorderRadius = BorderRadius.circular(6);
+
+const double windowWidth = 400;
+const double windowHeight = 500;
+const double initialPositionX = 200;
+const double initialPositionY = 70;

demo/lib/main.dart

@@ -1,7 +1,8 @@
-import 'dart:io';
-
 import 'package:compositor_dart/compositor_dart.dart';
 import 'package:compositor_dart/surface.dart';
+import 'package:demo/constants.dart';
+import 'package:demo/window.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -54,58 +55,55 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  int _counter = 0;
-  Compositor compositor = Compositor();
-  Surface? surface;
+  late Compositor compositor;
+  Map<int, Surface> surfaces = {};
+
+  int? focusedSurface;
+  late double mousePositionX;
+  late double mousePositionY;
+
+  @override
+  void initState() {
+    super.initState();
 
-  _MyHomePageState() {
-    compositor.surfaceMapped.stream.listen((event) {
+    mousePositionX = 0;
+    mousePositionY = 0;
+
+    compositor = Compositor();
+    compositor.surfaceMapped.stream.listen((Surface event) {
       setState(() {
-        surface = event;
+        surfaces.putIfAbsent(event.handle, () => event);
+        focusedSurface = event.handle;
       });
     });
-    compositor.surfaceUnmapped.stream.listen((event) {
-      if (surface == event) {
-        setState(() {
-          surface = null;
-        });
-      }
+    compositor.surfaceUnmapped.stream.listen((Surface event) {
+      setState(() {
+        surfaces.removeWhere((key, value) => key == event.handle);
+        if (surfaces.isNotEmpty) {
+          focusedSurface = surfaces.keys.last;
+        } else {
+          focusedSurface = null;
+        }
+      });
     });
   }
 
-  void _incrementCounter() {
-    setState(() {
-      // This call to setState tells the Flutter framework that something has
-      // changed in this State, which causes it to rerun the build method below
-      // so that the display can reflect the updated values. If we changed
-      // _counter without calling setState(), then the build method would not be
-      // called again, and so nothing would appear to happen.
-      _counter++;
-    });
+  void focusView(int handle) {
+    if (focusedSurface != handle) {
+      compositor.platform.surfaceFocusViewWithHandle(handle);
+      focusedSurface = handle;
+    }
   }
 
   @override
   Widget build(BuildContext context) {
-    Widget? surfaceView;
-    if (surface != null) {
-      surfaceView = SurfaceView(
-        surface: surface!,
-      );
-    }
-
-    // This method is rerun every time setState is called, for instance as done
-    // by the _incrementCounter method above.
-    //
-    // The Flutter framework has been optimized to make rerunning build methods
-    // fast, so that you can just rebuild anything that needs updating rather
-    // than having to individually change instances of widgets.
     return Focus(
       onKeyEvent: (node, KeyEvent event) {
         int? keycode = compositor.keyToXkb(event.physicalKey.usbHidUsage);
 
-        if (keycode != null && surface != null) {
+        if (keycode != null && focusedSurface != null) {
           compositor.platform.surfaceSendKey(
-              surface!,
+              surfaces[focusedSurface]!,
               keycode,
               event is KeyDownEvent ? KeyStatus.pressed : KeyStatus.released,
               event.timeStamp);
@@ -115,50 +113,38 @@ class _MyHomePageState extends State<MyHomePage> {
       autofocus: true,
       child: Scaffold(
         appBar: AppBar(
-          // Here we take the value from the MyHomePage object that was created by
-          // the App.build method, and use it to set our appbar title.
           title: Text(widget.title),
         ),
-        body: Center(
-          // Center is a layout widget. It takes a single child and positions it
-          // in the middle of the parent.
-          child: Column(
-            // Column is also a layout widget. It takes a list of children and
-            // arranges them vertically. By default, it sizes itself to fit its
-            // children horizontally, and tries to be as tall as its parent.
-            //
-            // Invoke "debug painting" (press "p" in the console, choose the
-            // "Toggle Debug Paint" action from the Flutter Inspector in Android
-            // Studio, or the "Toggle Debug Paint" command in Visual Studio Code)
-            // to see the wireframe for each widget.
-            //
-            // Column has various properties to control how it sizes itself and
-            // how it positions its children. Here we use mainAxisAlignment to
-            // center the children vertically; the main axis here is the vertical
-            // axis because Columns are vertical (the cross axis would be
-            // horizontal).
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: <Widget>[
-              const Text(
-                'You have pushed the button this many timesa:',
-              ),
-              Text(
-                '$_counter',
-                style: Theme.of(context).textTheme.headline4,
-              ),
-              Container(
-                color: Colors.amber,
-                padding: const EdgeInsets.all(8.0),
-                child: SizedBox(width: 500, height: 500, child: surfaceView),
-              ),
-            ],
+        body: SizedBox.expand(
+          child: MouseRegion(
+            onHover: (PointerHoverEvent event) {
+              mousePositionX = event.position.dx;
+              mousePositionY = event.position.dy;
+            },
+            child: Stack(
+              children: surfaces.entries.map((MapEntry<int, Surface> entry) {
+                final isPopup = entry.value.isPopup;
+
+                return Window(
+                  initialX: isPopup ? mousePositionX : initialPositionX,
+                  initialY: isPopup ? mousePositionY : initialPositionY,
+                  shouldDecorate: !isPopup,
+                  onTap: () => focusView(entry.key),
+                  child: SizedBox(
+                    width: windowWidth,
+                    height: windowHeight,
+                    child: SurfaceView(
+                        surface: entry.value,
+                        compositor: compositor,
+                        onPointerClick: (Surface surface) {
+                          focusView(surface.handle);
+                        }),
+                  ),
+                );
+              }).toList(),
+            ),
           ),
         ),
-        floatingActionButton: FloatingActionButton(
-          onPressed: _incrementCounter,
-          tooltip: 'Increment',
-          child: const Icon(Icons.add),
-        ), // This trailing comma makes auto-formatting nicer for build methods.
       ),
     );
   }