graphview: Draw links using new gdk path API instead of cairo

update Helvum to track the latest pipewire0.8.0

.gitignore

@@ -1,3 +1,5 @@
+/.flatpak
 /.flatpak-builder
 /.vscode
+/_build
 /target

.gitlab-ci.yml

@@ -1,75 +1,53 @@
-include:
-  - project: 'freedesktop/ci-templates'             # the project to include from
-    ref: '34f4ade99434043f88e164933f570301fd18b125' # git ref of that project
-    file: '/templates/fedora.yml'                   # the actual file to include
-
 stages:
-  - prepare
+  - build
   - lint
-  - test
-  - extras
 
+.flatpak:
+  image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-46'
   variables:
-  FDO_UPSTREAM_REPO: 'pipewire/helvum'
+    FLATPAK_BUILD_DIR: _build
+    MANIFEST_PATH: build-aux/org.pipewire.Helvum.json
+    APP_FLATPAK_MODULE: Helvum
+  before_script:
+    - flatpak --version
+    - flatpak info org.gnome.Platform
+    - flatpak info org.gnome.Sdk
+    - flatpak info org.freedesktop.Sdk.Extension.llvm16
+    - flatpak info org.freedesktop.Sdk.Extension.rust-stable
+    - flatpak-builder --version
 
-# Version and tag for our current container
+build:
-.fedora:
+  stage: build
-  variables:
+  extends: .flatpak
-    FDO_DISTRIBUTION_VERSION: '38'
-    # Update this to trigger a container rebuild
-    FDO_DISTRIBUTION_TAG: '2023-08-17.0'
-
-build-fedora-container:
-  extends:
-  - .fedora                            # our template job above
-  - .fdo.container-build@fedora@x86_64 # the CI template
-  stage: prepare
-  variables:
-    # clang-devel: required by rust bindgen
-    FDO_DISTRIBUTION_PACKAGES: >-
-      rust
-      cargo
-      rustfmt
-      clippy
-      pipewire-devel
-      gtk4-devel
-      clang-devel
-
-rustfmt:
-  extends:
-    - .fedora
-    - .fdo.distribution-image@fedora
-  stage: lint
   script:
-    - cargo fmt --version
+    - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
-    - cargo fmt -- --color=always --check
 
-test-stable:
+# TODO: Run meson test
-  extends:
-    - .fedora
-    - .fdo.distribution-image@fedora
-  stage: test
-  script:
-    - rustc --version
-    - cargo build --color=always --all-targets
-    - cargo test --color=always
-
-rustdoc:
-  extends:
-    - .fedora
-    - .fdo.distribution-image@fedora
-  stage: extras
-  variables:
-    RUSTDOCFLAGS: '-Dwarnings'
-  script:
-    - rustdoc --version
-    - cargo doc --no-deps
 
 clippy:
-  extends:
+  stage: lint
-    - .fedora
+  extends: .flatpak
-    - .fdo.distribution-image@fedora
-  stage: extras
   script:
-    - cargo clippy --version
+    - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --stop-at=${APP_FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
-    - cargo clippy --color=always --all-targets -- -D warnings
+    - >-
+      flatpak-builder --run ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
+      cargo clippy --color=always --all-targets -- -D warnings
+
+rustfmt:
+  stage: lint
+  image: "rust:slim" # TODO: Check image
+  script:
+    - rustup component add rustfmt
+    - rustc -Vv && cargo -Vv
+    - cargo fmt --version
+    - cargo fmt --all -- --color=always --check
+
+rustdoc:
+  stage: lint
+  extends: .flatpak
+  script:
+    - flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse --stop-at=${APP_FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
+    - >-
+      flatpak-builder --run ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
+      env RUSTDOCFLAGS=-Dwarnings cargo doc --no-deps
+

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "helvum"
-version = "0.4.1"
+version = "0.5.1"
-authors = ["Tom A. Wagner <tom.a.wagner@protonmail.com>"]
+authors = ["Tom Wagner <tom.a.wagner@protonmail.com>"]
 edition = "2021"
 rust-version = "1.70"
 license = "GPL-3.0-only"
@@ -14,10 +14,14 @@ categories = ["gui", "multimedia"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-pipewire = "0.7"
+pipewire = "0.8.0"
-gtk = { version = "0.7", package = "gtk4" }
+adw = { version = "0.6", package = "libadwaita", features = ["v1_4"] }
-glib = { version = "0.18", features = ["log"] }
+gtk = { version = "0.8", package = "gtk4", features = ["v4_14"] }
+glib = { version = "0.19", features = ["log"] }
+async-channel = "2.2"
 
 log = "0.4.11"
 
-once_cell = "1.7.2"
+once_cell = "1.19"
+
+libc = "0.2"

README.md

@@ -23,7 +23,7 @@ $ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.fl
 
 Then install the required flatpak platform and SDK, if you dont have them already:
 ```shell
-$ flatpak install org.gnome.{Platform,Sdk}//43 org.freedesktop.Sdk.Extension.rust-stable//22.08 org.freedesktop.Sdk.Extension.llvm14//22.08
+$ flatpak install org.gnome.{Platform,Sdk}//46 org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.llvm16//23.08
 ```
 
 To compile and install as a flatpak, clone the project, change to the project directory, and run:
@@ -42,7 +42,7 @@ For compilation, you will need:
 - Meson
 - An up-to-date rust toolchain
 - `libclang-3.7` or higher
-- `gtk-4.0` and `pipewire-0.3` development headers
+- `libadwaita-1` and `libpipewire-0.3` development packages and their dependencies
 
 To compile and install, run
 

build-aux/org.pipewire.Helvum.json

@@ -1,11 +1,11 @@
 {
-    "app-id": "org.pipewire.Helvum",
+    "id": "org.pipewire.Helvum",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "43",
+    "runtime-version": "46",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm14"
+        "org.freedesktop.Sdk.Extension.llvm16"
     ],
     "command": "helvum",
     "finish-args": [
@@ -16,8 +16,8 @@
         "--filesystem=xdg-run/pipewire-0"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm14/bin",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
-        "prepend-ld-library-path": "/usr/lib/sdk/llvm14/lib",
+        "prepend-ld-library-path": "/usr/lib/sdk/llvm16/lib",
         "build-args": [
             "--share=network"
         ]

data/org.pipewire.Helvum.metainfo.xml.in

@@ -23,6 +23,8 @@
     <url type="bugtracker">https://gitlab.freedesktop.org/pipewire/helvum/-/issues</url>
     <content_rating type="oars-1.0" />
     <releases>
+        <release version="0.5.1" date="2023-09-28" />
+        <release version="0.5.0" date="2023-09-28" />
         <release version="0.4.1" date="2023-08-18" />
         <release version="0.4.0" date="2023-02-12" />
         <release version="0.3.4" date="2022-02-02" />

meson.build

@@ -1,7 +1,7 @@
 project(
   'helvum',
   'rust',
-  version: '0.4.1',
+  version: '0.5.1',
   license: 'GPL-3.0',
   meson_version: '>=0.59.0'
 )
@@ -11,7 +11,8 @@ gnome = import('gnome')
 base_id = 'org.pipewire.Helvum'
 
 dependency('glib-2.0',     version: '>= 2.66')
-dependency('gtk4',     version: '>= 4.4.0')
+dependency('gtk4',         version: '>= 4.14.0')
+dependency('libadwaita-1', version: '>= 1.4')
 dependency('libpipewire-0.3')
 
 desktop_file_validate = find_program('desktop-file-validate', required: false)

src/application.rs

@@ -14,9 +14,10 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-use gtk::{
+use adw::{
     gio,
-    glib::{self, clone, Receiver},
+    glib::{self, clone},
+    gtk,
     prelude::*,
     subclass::prelude::*,
 };
@@ -25,15 +26,20 @@ use pipewire::channel::Sender;
 use crate::{graph_manager::GraphManager, ui, GtkMessage, PipewireMessage};
 
 static STYLE: &str = include_str!("style.css");
+static APP_ID: &str = "org.pipewire.Helvum";
+static VERSION: &str = env!("CARGO_PKG_VERSION");
+static AUTHORS: &str = env!("CARGO_PKG_AUTHORS");
 
 mod imp {
     use super::*;
 
-    use once_cell::unsync::OnceCell;
+    use std::cell::OnceCell;
+
+    use adw::subclass::prelude::AdwApplicationImpl;
 
     #[derive(Default)]
     pub struct Application {
-        pub(super) graphview: ui::graph::GraphView,
+        pub(super) window: ui::Window,
         pub(super) graph_manager: OnceCell<GraphManager>,
     }
 
@@ -41,7 +47,7 @@ mod imp {
     impl ObjectSubclass for Application {
         const NAME: &'static str = "HelvumApplication";
         type Type = super::Application;
-        type ParentType = gtk::Application;
+        type ParentType = adw::Application;
     }
 
     impl ObjectImpl for Application {}
@@ -49,41 +55,28 @@ mod imp {
         fn activate(&self) {
             let app = &*self.obj();
 
-            let scrollwindow = gtk::ScrolledWindow::builder()
+            let graphview = self.window.graph();
-                .child(&self.graphview)
-                .build();
-            let headerbar = gtk::HeaderBar::new();
-            let zoomentry = ui::graph::ZoomEntry::new(&self.graphview);
-            headerbar.pack_end(&zoomentry);
 
-            let window = gtk::ApplicationWindow::builder()
+            self.window.set_application(Some(app));
-                .application(app)
-                .default_width(1280)
-                .default_height(720)
-                .title("Helvum - Pipewire Patchbay")
-                .child(&scrollwindow)
-                .build();
-            window
-                .settings()
-                .set_gtk_application_prefer_dark_theme(true);
-            window.set_titlebar(Some(&headerbar));
 
             let zoom_set_action =
                 gio::SimpleAction::new("set-zoom", Some(&f64::static_variant_type()));
-            zoom_set_action.connect_activate(
+            zoom_set_action.connect_activate(clone!(@weak graphview => move|_, param| {
-                clone!(@weak self.graphview as graphview => move|_, param| {
                 let zoom_factor = param.unwrap().get::<f64>().unwrap();
                 graphview.set_zoom_factor(zoom_factor, None)
-                }),
+            }));
-            );
+            self.window.add_action(&zoom_set_action);
-            window.add_action(&zoom_set_action);
 
-            window.show();
+            self.window.show();
         }
 
         fn startup(&self) {
             self.parent_startup();
 
+            self.obj()
+                .style_manager()
+                .set_color_scheme(adw::ColorScheme::PreferDark);
+
             // Load CSS from the STYLE variable.
             let provider = gtk::CssProvider::new();
             provider.load_from_data(STYLE);
@@ -92,14 +85,58 @@ mod imp {
                 &provider,
                 gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
             );
+
+            self.setup_actions();
         }
     }
     impl GtkApplicationImpl for Application {}
+    impl AdwApplicationImpl for Application {}
+
+    impl Application {
+        fn setup_actions(&self) {
+            let obj = &*self.obj();
+
+            // Add <Control-Q> shortcut for quitting the application.
+            let quit = gtk::gio::SimpleAction::new("quit", None);
+            quit.connect_activate(clone!(@weak obj => move |_, _| {
+                obj.quit();
+            }));
+            obj.set_accels_for_action("app.quit", &["<Control>Q"]);
+            obj.add_action(&quit);
+
+            let action_about = gio::ActionEntry::builder("about")
+                .activate(|obj: &super::Application, _, _| {
+                    obj.imp().show_about_dialog();
+                })
+                .build();
+            obj.add_action_entries([action_about]);
+        }
+
+        fn show_about_dialog(&self) {
+            let obj = &*self.obj();
+            let window = obj.active_window().unwrap();
+            let authors: Vec<&str> = AUTHORS.split(':').collect();
+
+            let about_window = adw::AboutWindow::builder()
+                .transient_for(&window)
+                .application_icon(APP_ID)
+                .application_name("Helvum")
+                .developer_name("Tom Wagner")
+                .developers(authors)
+                .version(VERSION)
+                .website("https://gitlab.freedesktop.org/pipewire/helvum")
+                .issue_url("https://gitlab.freedesktop.org/pipewire/helvum/-/issues")
+                .license_type(gtk::License::Gpl30Only)
+                .build();
+
+            about_window.present();
+        }
+    }
 }
 
 glib::wrapper! {
     pub struct Application(ObjectSubclass<imp::Application>)
-        @extends gio::Application, gtk::Application,
+        @extends gio::Application, gtk::Application, adw::Application,
         @implements gio::ActionGroup, gio::ActionMap;
 }
 
@@ -107,27 +144,24 @@ impl Application {
     /// Create the view.
     /// This will set up the entire user interface and prepare it for being run.
     pub(super) fn new(
-        gtk_receiver: Receiver<PipewireMessage>,
+        gtk_receiver: async_channel::Receiver<PipewireMessage>,
         pw_sender: Sender<GtkMessage>,
     ) -> Self {
         let app: Application = glib::Object::builder()
-            .property("application-id", "org.pipewire.Helvum")
+            .property("application-id", APP_ID)
             .build();
 
         let imp = app.imp();
 
         imp.graph_manager
-            .set(GraphManager::new(&imp.graphview, pw_sender, gtk_receiver))
+            .set(GraphManager::new(
+                &imp.window.graph(),
+                &imp.window.connection_banner(),
+                pw_sender,
+                gtk_receiver,
+            ))
             .expect("Should be able to set graph manager");
 
-        // Add <Control-Q> shortcut for quitting the application.
-        let quit = gtk::gio::SimpleAction::new("quit", None);
-        quit.connect_activate(clone!(@weak app => move |_, _| {
-            app.quit();
-        }));
-        app.set_accels_for_action("app.quit", &["<Control>Q"]);
-        app.add_action(&quit);
-
         app
     }
 }

src/graph_manager.rs

@@ -14,7 +14,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-use gtk::{glib, prelude::*, subclass::prelude::*};
+use adw::{glib, prelude::*, subclass::prelude::*};
 
 use pipewire::channel::Sender as PwSender;
 
@@ -23,9 +23,7 @@ use crate::{ui::graph::GraphView, GtkMessage, PipewireMessage};
 mod imp {
     use super::*;
 
-    use std::{cell::RefCell, collections::HashMap};
+    use std::{cell::OnceCell, cell::RefCell, collections::HashMap};
-
-    use once_cell::unsync::OnceCell;
 
     use crate::{ui::graph, MediaType, NodeType};
 
@@ -35,6 +33,9 @@ mod imp {
         #[property(get, set, construct_only)]
         pub graph: OnceCell<crate::ui::graph::GraphView>,
 
+        #[property(get, set, construct_only)]
+        pub connection_banner: OnceCell<adw::Banner>,
+
         pub pw_sender: OnceCell<PwSender<crate::GtkMessage>>,
         pub items: RefCell<HashMap<u32, glib::Object>>,
     }
@@ -50,22 +51,58 @@ mod imp {
     impl ObjectImpl for GraphManager {}
 
     impl GraphManager {
-        pub fn attach_receiver(&self, receiver: glib::Receiver<crate::PipewireMessage>) {
+        pub async fn receive(&self, receiver: async_channel::Receiver<crate::PipewireMessage>) {
-            receiver.attach(None, glib::clone!(
+            loop {
-                @weak self as imp => @default-return glib::ControlFlow::Continue,
+                let Ok(msg) = receiver.recv().await else {
-                move |msg| {
+                    continue;
-                    match msg {
+                };
-                        PipewireMessage::NodeAdded{ id, name, node_type } => imp.add_node(id, name.as_str(), node_type),
+                match msg {
-                        PipewireMessage::PortAdded{ id, node_id, name, direction, media_type } => imp.add_port(id, name.as_str(), node_id, direction, media_type),
+                    PipewireMessage::NodeAdded {
-                        PipewireMessage::LinkAdded{ id, port_from, port_to, active} => imp.add_link(id, port_from, port_to, active),
+                        id,
-                        PipewireMessage::LinkStateChanged { id, active } => imp.link_state_changed(id, active),
+                        name,
-                        PipewireMessage::NodeRemoved { id } => imp.remove_node(id),
+                        node_type,
-                        PipewireMessage::PortRemoved { id, node_id } => imp.remove_port(id, node_id),
+                    } => self.add_node(id, name.as_str(), node_type),
-                        PipewireMessage::LinkRemoved { id } => imp.remove_link(id)
+                    PipewireMessage::NodeNameChanged {
+                        id,
+                        name,
+                        media_name,
+                    } => self.node_name_changed(id, &name, &media_name),
+                    PipewireMessage::PortAdded {
+                        id,
+                        node_id,
+                        name,
+                        direction,
+                    } => self.add_port(id, name.as_str(), node_id, direction),
+                    PipewireMessage::PortFormatChanged { id, media_type } => {
+                        self.port_media_type_changed(id, media_type)
+                    }
+                    PipewireMessage::LinkAdded {
+                        id,
+                        port_from,
+                        port_to,
+                        active,
+                        media_type,
+                    } => self.add_link(id, port_from, port_to, active, media_type),
+                    PipewireMessage::LinkStateChanged { id, active } => {
+                        self.link_state_changed(id, active)
+                    }
+                    PipewireMessage::LinkFormatChanged { id, media_type } => {
+                        self.link_format_changed(id, media_type)
+                    }
+                    PipewireMessage::NodeRemoved { id } => self.remove_node(id),
+                    PipewireMessage::PortRemoved { id, node_id } => self.remove_port(id, node_id),
+                    PipewireMessage::LinkRemoved { id } => self.remove_link(id),
+                    PipewireMessage::Connecting => {
+                        self.obj().connection_banner().set_revealed(true);
+                    }
+                    PipewireMessage::Connected => {
+                        self.obj().connection_banner().set_revealed(false);
+                    }
+                    PipewireMessage::Disconnected => {
+                        self.clear();
+                    }
                 };
-                    glib::ControlFlow::Continue
             }
-            ));
         }
 
         /// Add a new node to the view.
@@ -79,6 +116,23 @@ mod imp {
             self.obj().graph().add_node(node, node_type);
         }
 
+        /// Update a node tooltip to the view.
+        fn node_name_changed(&self, id: u32, node_name: &str, media_name: &str) {
+            let items = self.items.borrow();
+
+            let Some(node) = items.get(&id) else {
+                log::warn!("Node (id: {id}) for changed name not found in graph manager");
+                return;
+            };
+            let Some(node) = node.dynamic_cast_ref::<graph::Node>() else {
+                log::warn!("Graph Manager item under node (id: {id}) is not a node");
+                return;
+            };
+
+            node.set_node_name(node_name);
+            node.set_media_name(media_name);
+        }
+
         /// Remove the node with the specified id from the view.
         fn remove_node(&self, id: u32) {
             log::info!("Removing node from graph: id {}", id);
@@ -101,8 +155,7 @@ mod imp {
             id: u32,
             name: &str,
             node_id: u32,
-            direction: pipewire::spa::Direction,
+            direction: pipewire::spa::utils::Direction,
-            media_type: Option<MediaType>,
         ) {
             log::info!("Adding port to graph: id {}", id);
 
@@ -117,7 +170,7 @@ mod imp {
                 return;
             };
 
-            let port = graph::Port::new(id, name, direction, media_type);
+            let port = graph::Port::new(id, name, direction);
 
             // Create or delete a link if the widget emits the "port-toggled" signal.
             port.connect_local(
@@ -139,6 +192,21 @@ mod imp {
             node.add_port(port);
         }
 
+        fn port_media_type_changed(&self, id: u32, media_type: MediaType) {
+            let items = self.items.borrow();
+
+            let Some(port) = items.get(&id) else {
+                log::warn!("Port (id: {id}) for changed media type not found in graph manager");
+                return;
+            };
+            let Some(port) = port.dynamic_cast_ref::<graph::Port>() else {
+                log::warn!("Graph Manager item under port id {id} is not a port");
+                return;
+            };
+
+            port.set_media_type(media_type.as_raw())
+        }
+
         /// Remove the port with the id `id` from the node with the id `node_id`
         /// from the view.
         fn remove_port(&self, id: u32, node_id: u32) {
@@ -167,7 +235,14 @@ mod imp {
         }
 
         /// Add a new link to the view.
-        fn add_link(&self, id: u32, output_port_id: u32, input_port_id: u32, active: bool) {
+        fn add_link(
+            &self,
+            id: u32,
+            output_port_id: u32,
+            input_port_id: u32,
+            active: bool,
+            media_type: MediaType,
+        ) {
             log::info!("Adding link to graph: id {}", id);
 
             let mut items = self.items.borrow_mut();
@@ -193,6 +268,7 @@ mod imp {
             link.set_output_port(Some(&output_port));
             link.set_input_port(Some(&input_port));
             link.set_active(active);
+            link.set_media_type(media_type);
 
             items.insert(id, link.clone().upcast());
 
@@ -223,6 +299,24 @@ mod imp {
             link.set_active(active);
         }
 
+        fn link_format_changed(
+            &self,
+            id: u32,
+            media_type: pipewire::spa::param::format::MediaType,
+        ) {
+            let items = self.items.borrow();
+
+            let Some(link) = items.get(&id) else {
+                log::warn!("Link (id: {id}) for changed media type not found in graph manager");
+                return;
+            };
+            let Some(link) = link.dynamic_cast_ref::<graph::Link>() else {
+                log::warn!("Graph Manager item under link id {id} is not a link");
+                return;
+            };
+            link.set_media_type(media_type);
+        }
+
         // Toggle a link between the two specified ports on the remote pipewire server.
         fn toggle_link(&self, port_from: u32, port_to: u32) {
             let sender = self.pw_sender.get().expect("pw_sender shoud be set");
@@ -246,6 +340,11 @@ mod imp {
 
             self.obj().graph().remove_link(&link);
         }
+
+        fn clear(&self) {
+            self.items.borrow_mut().clear();
+            self.obj().graph().clear();
+        }
     }
 }
 
@@ -253,15 +352,23 @@ glib::wrapper! {
     pub struct GraphManager(ObjectSubclass<imp::GraphManager>);
 }
 
+async fn receive(graph_manager: GraphManager, receiver: async_channel::Receiver<PipewireMessage>) {
+    graph_manager.imp().receive(receiver).await
+}
+
 impl GraphManager {
     pub fn new(
         graph: &GraphView,
+        connection_banner: &adw::Banner,
         sender: PwSender<GtkMessage>,
-        receiver: glib::Receiver<PipewireMessage>,
+        receiver: async_channel::Receiver<PipewireMessage>,
     ) -> Self {
-        let res: Self = glib::Object::builder().property("graph", graph).build();
+        let res: Self = glib::Object::builder()
+            .property("graph", graph)
+            .property("connection-banner", connection_banner)
+            .build();
 
-        res.imp().attach_receiver(receiver);
+        glib::MainContext::default().spawn_local(receive(res.clone(), receiver));
         assert!(
             res.imp().pw_sender.set(sender).is_ok(),
             "Should be able to set pw_sender)"

src/main.rs

@@ -19,8 +19,8 @@ mod graph_manager;
 mod pipewire_connection;
 mod ui;
 
-use gtk::prelude::*;
+use adw::{gtk, prelude::*};
-use pipewire::spa::Direction;
+use pipewire::spa::{param::format::MediaType, utils::Direction};
 
 /// Messages sent by the GTK thread to notify the pipewire thread.
 #[derive(Debug, Clone)]
@@ -39,23 +39,36 @@ pub enum PipewireMessage {
         name: String,
         node_type: Option<NodeType>,
     },
+    NodeNameChanged {
+        id: u32,
+        name: String,
+        media_name: String,
+    },
     PortAdded {
         id: u32,
         node_id: u32,
         name: String,
         direction: Direction,
-        media_type: Option<MediaType>,
+    },
+    PortFormatChanged {
+        id: u32,
+        media_type: MediaType,
     },
     LinkAdded {
         id: u32,
         port_from: u32,
         port_to: u32,
         active: bool,
+        media_type: MediaType,
     },
     LinkStateChanged {
         id: u32,
         active: bool,
     },
+    LinkFormatChanged {
+        id: u32,
+        media_type: MediaType,
+    },
     NodeRemoved {
         id: u32,
     },
@@ -66,6 +79,9 @@ pub enum PipewireMessage {
     LinkRemoved {
         id: u32,
     },
+    Connecting,
+    Connected,
+    Disconnected,
 }
 
 #[derive(Debug, Clone)]
@@ -74,13 +90,6 @@ pub enum NodeType {
     Output,
 }
 
-#[derive(Debug, Copy, Clone)]
-pub enum MediaType {
-    Audio,
-    Video,
-    Midi,
-}
-
 #[derive(Debug, Clone)]
 pub struct PipewireLink {
     pub node_from: u32,
@@ -111,7 +120,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Start the pipewire thread with channels in both directions.
 
-    let (gtk_sender, gtk_receiver) = glib::MainContext::channel(glib::Priority::DEFAULT);
+    let (gtk_sender, gtk_receiver) = async_channel::unbounded();
     let (pw_sender, pw_receiver) = pipewire::channel::channel();
     let pw_thread =
         std::thread::spawn(move || pipewire_connection::thread_main(gtk_sender, pw_receiver));

src/pipewire_connection.rs

@@ -1,314 +0,0 @@
-// Copyright 2021 Tom A. Wagner <tom.a.wagner@protonmail.com>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 3 as published by
-// the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-only
-
-mod state;
-
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
-
-use gtk::glib::{self, clone};
-use log::{debug, info, warn};
-use pipewire::{
-    link::{Link, LinkChangeMask, LinkListener, LinkState},
-    prelude::*,
-    properties,
-    registry::{GlobalObject, Registry},
-    spa::{Direction, ForeignDict},
-    types::ObjectType,
-    Context, Core, MainLoop,
-};
-
-use crate::{GtkMessage, MediaType, NodeType, PipewireMessage};
-use state::{Item, State};
-
-enum ProxyItem {
-    Link {
-        _proxy: Link,
-        _listener: LinkListener,
-    },
-}
-
-/// The "main" function of the pipewire thread.
-pub(super) fn thread_main(
-    gtk_sender: glib::Sender<PipewireMessage>,
-    pw_receiver: pipewire::channel::Receiver<GtkMessage>,
-) {
-    let mainloop = MainLoop::new().expect("Failed to create mainloop");
-    let context = Context::new(&mainloop).expect("Failed to create context");
-    let core = Rc::new(context.connect(None).expect("Failed to connect to remote"));
-    let registry = Rc::new(core.get_registry().expect("Failed to get registry"));
-
-    // Keep proxies and their listeners alive so that we can receive info events.
-    let proxies = Rc::new(RefCell::new(HashMap::new()));
-
-    let state = Rc::new(RefCell::new(State::new()));
-
-    let _receiver = pw_receiver.attach(&mainloop, {
-        clone!(@strong mainloop, @weak core, @weak registry, @strong state => move |msg| match msg {
-            GtkMessage::ToggleLink { port_from, port_to } => toggle_link(port_from, port_to, &core, &registry, &state),
-            GtkMessage::Terminate => mainloop.quit(),
-        })
-    });
-
-    let _listener = registry
-        .add_listener_local()
-        .global(clone!(@strong gtk_sender, @weak registry, @strong proxies, @strong state =>
-            move |global| match global.type_ {
-                ObjectType::Node => handle_node(global, &gtk_sender, &state),
-                ObjectType::Port => handle_port(global, &gtk_sender, &state),
-                ObjectType::Link => handle_link(global, &gtk_sender, &registry, &proxies, &state),
-                _ => {
-                    // Other objects are not interesting to us
-                }
-            }
-        ))
-        .global_remove(clone!(@strong proxies, @strong state => move |id| {
-            if let Some(item) = state.borrow_mut().remove(id) {
-                gtk_sender.send(match item {
-                    Item::Node { .. } => PipewireMessage::NodeRemoved {id},
-                    Item::Port { node_id } => PipewireMessage::PortRemoved {id, node_id},
-                    Item::Link { .. } => PipewireMessage::LinkRemoved {id},
-                }).expect("Failed to send message");
-            } else {
-                warn!(
-                    "Attempted to remove item with id {} that is not saved in state",
-                    id
-                );
-            }
-
-            proxies.borrow_mut().remove(&id);
-        }))
-        .register();
-
-    mainloop.run();
-}
-
-/// Handle a new node being added
-fn handle_node(
-    node: &GlobalObject<ForeignDict>,
-    sender: &glib::Sender<PipewireMessage>,
-    state: &Rc<RefCell<State>>,
-) {
-    let props = node
-        .props
-        .as_ref()
-        .expect("Node object is missing properties");
-
-    // Get the nicest possible name for the node, using a fallback chain of possible name attributes.
-    let name = String::from(
-        props
-            .get("node.description")
-            .or_else(|| props.get("node.nick"))
-            .or_else(|| props.get("node.name"))
-            .unwrap_or_default(),
-    );
-
-    // FIXME: Instead of checking these props, the "EnumFormat" parameter should be checked instead.
-    let media_type = props.get("media.class").and_then(|class| {
-        if class.contains("Audio") {
-            Some(MediaType::Audio)
-        } else if class.contains("Video") {
-            Some(MediaType::Video)
-        } else if class.contains("Midi") {
-            Some(MediaType::Midi)
-        } else {
-            None
-        }
-    });
-
-    let media_class = |class: &str| {
-        if class.contains("Sink") || class.contains("Input") {
-            Some(NodeType::Input)
-        } else if class.contains("Source") || class.contains("Output") {
-            Some(NodeType::Output)
-        } else {
-            None
-        }
-    };
-
-    let node_type = props
-        .get("media.category")
-        .and_then(|class| {
-            if class.contains("Duplex") {
-                None
-            } else {
-                props.get("media.class").and_then(media_class)
-            }
-        })
-        .or_else(|| props.get("media.class").and_then(media_class));
-
-    state.borrow_mut().insert(
-        node.id,
-        Item::Node {
-            // widget: node_widget,
-            media_type,
-        },
-    );
-
-    sender
-        .send(PipewireMessage::NodeAdded {
-            id: node.id,
-            name,
-            node_type,
-        })
-        .expect("Failed to send message");
-}
-
-/// Handle a new port being added
-fn handle_port(
-    port: &GlobalObject<ForeignDict>,
-    sender: &glib::Sender<PipewireMessage>,
-    state: &Rc<RefCell<State>>,
-) {
-    let props = port
-        .props
-        .as_ref()
-        .expect("Port object is missing properties");
-    let name = props.get("port.name").unwrap_or_default().to_string();
-    let node_id: u32 = props
-        .get("node.id")
-        .expect("Port has no node.id property!")
-        .parse()
-        .expect("Could not parse node.id property");
-    let direction = if matches!(props.get("port.direction"), Some("in")) {
-        Direction::Input
-    } else {
-        Direction::Output
-    };
-
-    // Find out the nodes media type so that the port can be colored.
-    let media_type = if let Some(Item::Node { media_type, .. }) = state.borrow().get(node_id) {
-        media_type.to_owned()
-    } else {
-        warn!("Node not found for Port {}", port.id);
-        None
-    };
-
-    // Save node_id so we can delete this port easily.
-    state.borrow_mut().insert(port.id, Item::Port { node_id });
-
-    sender
-        .send(PipewireMessage::PortAdded {
-            id: port.id,
-            node_id,
-            name,
-            direction,
-            media_type,
-        })
-        .expect("Failed to send message");
-}
-
-/// Handle a new link being added
-fn handle_link(
-    link: &GlobalObject<ForeignDict>,
-    sender: &glib::Sender<PipewireMessage>,
-    registry: &Rc<Registry>,
-    proxies: &Rc<RefCell<HashMap<u32, ProxyItem>>>,
-    state: &Rc<RefCell<State>>,
-) {
-    debug!(
-        "New link (id:{}) appeared, setting up info listener.",
-        link.id
-    );
-
-    let proxy: Link = registry.bind(link).expect("Failed to bind to link proxy");
-    let listener = proxy
-        .add_listener_local()
-        .info(clone!(@strong state, @strong sender => move |info| {
-            debug!("Received link info: {:?}", info);
-
-            let id = info.id();
-
-            let mut state = state.borrow_mut();
-            if let Some(Item::Link { .. }) = state.get(id) {
-                // Info was an update - figure out if we should notify the gtk thread
-                if info.change_mask().contains(LinkChangeMask::STATE) {
-                    sender.send(PipewireMessage::LinkStateChanged {
-                        id,
-                        active: matches!(info.state(), LinkState::Active)
-                    }).expect("Failed to send message");
-                }
-                // TODO -- check other values that might have changed
-            } else {
-                // First time we get info. We can now notify the gtk thread of a new link.
-                let port_from = info.output_port_id();
-                let port_to = info.input_port_id();
-
-                state.insert(id, Item::Link {
-                    port_from, port_to
-                });
-
-                sender.send(PipewireMessage::LinkAdded {
-                    id,
-                    port_from,
-                    port_to,
-                    active: matches!(info.state(), LinkState::Active)
-                }).expect(
-                    "Failed to send message"
-                );
-            }
-        }))
-        .register();
-
-    proxies.borrow_mut().insert(
-        link.id,
-        ProxyItem::Link {
-            _proxy: proxy,
-            _listener: listener,
-        },
-    );
-}
-
-/// Toggle a link between the two specified ports.
-fn toggle_link(
-    port_from: u32,
-    port_to: u32,
-    core: &Rc<Core>,
-    registry: &Rc<Registry>,
-    state: &Rc<RefCell<State>>,
-) {
-    let state = state.borrow_mut();
-    if let Some(id) = state.get_link_id(port_from, port_to) {
-        info!("Requesting removal of link with id {}", id);
-
-        // FIXME: Handle error
-        registry.destroy_global(id);
-    } else {
-        info!(
-            "Requesting creation of link from port id:{} to port id:{}",
-            port_from, port_to
-        );
-
-        let node_from = state
-            .get_node_of_port(port_from)
-            .expect("Requested port not in state");
-        let node_to = state
-            .get_node_of_port(port_to)
-            .expect("Requested port not in state");
-
-        if let Err(e) = core.create_object::<Link, _>(
-            "link-factory",
-            &properties! {
-                "link.output.node" => node_from.to_string(),
-                "link.output.port" => port_from.to_string(),
-                "link.input.node" => node_to.to_string(),
-                "link.input.port" => port_to.to_string(),
-                "object.linger" => "1"
-            },
-        ) {
-            warn!("Failed to create link: {}", e);
-        }
-    }
-}

src/pipewire_connection/mod.rs

@@ -0,0 +1,525 @@
+// Copyright 2021 Tom A. Wagner <tom.a.wagner@protonmail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 3 as published by
+// the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+mod state;
+
+use std::{
+    cell::{Cell, RefCell},
+    collections::HashMap,
+    rc::Rc,
+    time::Duration,
+};
+
+use adw::glib::{self, clone};
+use log::{debug, error, info, warn};
+use pipewire::{
+    context::Context,
+    core::{Core, PW_ID_CORE},
+    keys,
+    link::{Link, LinkChangeMask, LinkInfoRef, LinkListener, LinkState},
+    main_loop::MainLoop,
+    node::{Node, NodeInfoRef, NodeListener},
+    port::{Port, PortChangeMask, PortInfoRef, PortListener},
+    properties::properties,
+    registry::{GlobalObject, Registry},
+    spa::{
+        param::{ParamInfoFlags, ParamType},
+        utils::dict::DictRef,
+        utils::result::SpaResult,
+    },
+    types::ObjectType,
+};
+
+use crate::{GtkMessage, MediaType, NodeType, PipewireMessage};
+use state::{Item, State};
+
+enum ProxyItem {
+    Node {
+        _proxy: Node,
+        _listener: NodeListener,
+    },
+    Port {
+        proxy: Port,
+        _listener: PortListener,
+    },
+    Link {
+        _proxy: Link,
+        _listener: LinkListener,
+    },
+}
+
+/// The "main" function of the pipewire thread.
+pub(super) fn thread_main(
+    gtk_sender: async_channel::Sender<PipewireMessage>,
+    mut pw_receiver: pipewire::channel::Receiver<GtkMessage>,
+) {
+    let mainloop = MainLoop::new(None).expect("Failed to create mainloop");
+    let context = Rc::new(Context::new(&mainloop).expect("Failed to create context"));
+    let is_stopped = Rc::new(Cell::new(false));
+    let mut is_connecting = false;
+
+    while !is_stopped.get() {
+        // Try to connect
+        let core = match context.connect(Some(properties! {
+            "media.category" => "Manager"
+        })) {
+            Ok(core) => Rc::new(core),
+            Err(_) => {
+                if !is_connecting {
+                    is_connecting = true;
+                    gtk_sender
+                        .send_blocking(PipewireMessage::Connecting)
+                        .expect("Failed to send message");
+                }
+
+                // If connection is failed, try to connect again in 200ms
+                let interval = Some(Duration::from_millis(200));
+
+                let timer = mainloop
+                    .loop_()
+                    .add_timer(clone!(@strong mainloop => move |_| {
+                        mainloop.quit();
+                    }));
+
+                timer.update_timer(interval, None).into_result().unwrap();
+
+                let receiver = pw_receiver.attach(mainloop.loop_(), {
+                    clone!(@strong mainloop, @strong is_stopped => move |msg|
+                        if let GtkMessage::Terminate = msg {
+                            // main thread requested stop
+                            is_stopped.set(true);
+                            mainloop.quit();
+                        }
+                    )
+                });
+
+                mainloop.run();
+                pw_receiver = receiver.deattach();
+
+                continue;
+            }
+        };
+
+        if is_connecting {
+            is_connecting = false;
+            gtk_sender
+                .send_blocking(PipewireMessage::Connected)
+                .expect("Failed to send message");
+        }
+
+        let registry = Rc::new(core.get_registry().expect("Failed to get registry"));
+
+        // Keep proxies and their listeners alive so that we can receive info events.
+        let proxies = Rc::new(RefCell::new(HashMap::new()));
+        let state = Rc::new(RefCell::new(State::new()));
+
+        let receiver = pw_receiver.attach(mainloop.loop_(), {
+            clone!(@strong mainloop, @weak core, @weak registry, @strong state, @strong is_stopped => move |msg| match msg {
+                GtkMessage::ToggleLink { port_from, port_to } => toggle_link(port_from, port_to, &core, &registry, &state),
+                GtkMessage::Terminate => {
+                    // main thread requested stop
+                    is_stopped.set(true);
+                    mainloop.quit();
+                }
+            })
+        });
+
+        let gtk_sender = gtk_sender.clone();
+        let _listener = core.add_listener_local()
+            .error(clone!(@strong mainloop, @strong gtk_sender, @strong is_stopped => move |id, _seq, res, message| {
+                if id != PW_ID_CORE {
+                    return;
+                }
+
+                if res == -libc::EPIPE {
+                    gtk_sender.send_blocking(PipewireMessage::Disconnected)
+                        .expect("Failed to send message");
+                    mainloop.quit();
+                } else {
+                    let serr = SpaResult::from_c(res).into_result().unwrap_err();
+                    error!("Pipewire Core received error {serr}: {message}");
+                }
+            }))
+            .register();
+
+        let _listener = registry
+            .add_listener_local()
+            .global(clone!(@strong gtk_sender, @weak registry, @strong proxies, @strong state =>
+                move |global| match global.type_ {
+                    ObjectType::Node => handle_node(global, &gtk_sender, &registry, &proxies, &state),
+                    ObjectType::Port => handle_port(global, &gtk_sender, &registry, &proxies, &state),
+                    ObjectType::Link => handle_link(global, &gtk_sender, &registry, &proxies, &state),
+                    _ => {
+                        // Other objects are not interesting to us
+                    }
+                }
+            ))
+            .global_remove(clone!(@strong proxies, @strong state => move |id| {
+                if let Some(item) = state.borrow_mut().remove(id) {
+                    gtk_sender.send_blocking(match item {
+                        Item::Node { .. } => PipewireMessage::NodeRemoved {id},
+                        Item::Port { node_id } => PipewireMessage::PortRemoved {id, node_id},
+                        Item::Link { .. } => PipewireMessage::LinkRemoved {id},
+                    }).expect("Failed to send message");
+                } else {
+                    warn!(
+                        "Attempted to remove item with id {} that is not saved in state",
+                        id
+                    );
+                }
+
+                proxies.borrow_mut().remove(&id);
+            }))
+            .register();
+
+        mainloop.run();
+        pw_receiver = receiver.deattach();
+    }
+}
+
+/// Get the nicest possible name for the node, using a fallback chain of possible name attributes
+fn get_node_name(props: &DictRef) -> &str {
+    props
+        .get(&keys::NODE_DESCRIPTION)
+        .or_else(|| props.get(&keys::NODE_NICK))
+        .or_else(|| props.get(&keys::NODE_NAME))
+        .unwrap_or_default()
+}
+
+/// Handle a new node being added
+fn handle_node(
+    node: &GlobalObject<&DictRef>,
+    sender: &async_channel::Sender<PipewireMessage>,
+    registry: &Rc<Registry>,
+    proxies: &Rc<RefCell<HashMap<u32, ProxyItem>>>,
+    state: &Rc<RefCell<State>>,
+) {
+    let props = node
+        .props
+        .as_ref()
+        .expect("Node object is missing properties");
+
+    let name = get_node_name(props).to_string();
+    let media_class = |class: &str| {
+        if class.contains("Sink") || class.contains("Input") {
+            Some(NodeType::Input)
+        } else if class.contains("Source") || class.contains("Output") {
+            Some(NodeType::Output)
+        } else {
+            None
+        }
+    };
+
+    let node_type = props
+        .get("media.category")
+        .and_then(|class| {
+            if class.contains("Duplex") {
+                None
+            } else {
+                props.get("media.class").and_then(media_class)
+            }
+        })
+        .or_else(|| props.get("media.class").and_then(media_class));
+
+    state.borrow_mut().insert(node.id, Item::Node);
+
+    sender
+        .send_blocking(PipewireMessage::NodeAdded {
+            id: node.id,
+            name,
+            node_type,
+        })
+        .expect("Failed to send message");
+
+    let proxy: Node = registry.bind(node).expect("Failed to bind to node proxy");
+    let listener = proxy
+        .add_listener_local()
+        .info(clone!(@strong sender, @strong proxies => move |info| {
+            handle_node_info(info, &sender, &proxies);
+        }))
+        .register();
+
+    proxies.borrow_mut().insert(
+        node.id,
+        ProxyItem::Node {
+            _proxy: proxy,
+            _listener: listener,
+        },
+    );
+}
+
+fn handle_node_info(
+    info: &NodeInfoRef,
+    sender: &async_channel::Sender<PipewireMessage>,
+    proxies: &Rc<RefCell<HashMap<u32, ProxyItem>>>,
+) {
+    debug!("Received node info: {:?}", info);
+
+    let id = info.id();
+    let proxies = proxies.borrow();
+    let Some(ProxyItem::Node { .. }) = proxies.get(&id) else {
+        error!("Received info on unknown node with id {id}");
+        return;
+    };
+
+    let props = info.props().expect("NodeInfo object is missing properties");
+    if let Some(media_name) = props.get(&keys::MEDIA_NAME) {
+        let name = get_node_name(props).to_string();
+
+        sender
+            .send_blocking(PipewireMessage::NodeNameChanged {
+                id,
+                name,
+                media_name: media_name.to_string(),
+            })
+            .expect("Failed to send message");
+    }
+}
+
+/// Handle a new port being added
+fn handle_port(
+    port: &GlobalObject<&DictRef>,
+    sender: &async_channel::Sender<PipewireMessage>,
+    registry: &Rc<Registry>,
+    proxies: &Rc<RefCell<HashMap<u32, ProxyItem>>>,
+    state: &Rc<RefCell<State>>,
+) {
+    let port_id = port.id;
+    let proxy: Port = registry.bind(port).expect("Failed to bind to port proxy");
+    let listener = proxy
+        .add_listener_local()
+        .info(
+            clone!(@strong proxies, @strong state, @strong sender => move |info| {
+                handle_port_info(info, &proxies, &state, &sender);
+            }),
+        )
+        .param(clone!(@strong sender => move |_, param_id, _, _, param| {
+            if param_id == ParamType::EnumFormat {
+                handle_port_enum_format(port_id, param, &sender)
+            }
+        }))
+        .register();
+
+    proxies.borrow_mut().insert(
+        port.id,
+        ProxyItem::Port {
+            proxy,
+            _listener: listener,
+        },
+    );
+}
+
+fn handle_port_info(
+    info: &PortInfoRef,
+    proxies: &Rc<RefCell<HashMap<u32, ProxyItem>>>,
+    state: &Rc<RefCell<State>>,
+    sender: &async_channel::Sender<PipewireMessage>,
+) {
+    debug!("Received port info: {:?}", info);
+
+    let id = info.id();
+    let proxies = proxies.borrow();
+    let Some(ProxyItem::Port { proxy, .. }) = proxies.get(&id) else {
+        log::error!("Received info on unknown port with id {id}");
+        return;
+    };
+
+    let mut state = state.borrow_mut();
+
+    if let Some(Item::Port { .. }) = state.get(id) {
+        // Info was an update, figure out if we should notify the GTK thread
+        if info.change_mask().contains(PortChangeMask::PARAMS) {
+            // TODO: React to param changes
+        }
+    } else {
+        // First time we get info. We can now notify the gtk thread of a new link.
+        let props = info.props().expect("Port object is missing properties");
+        let name = props.get("port.name").unwrap_or_default().to_string();
+        let node_id: u32 = props
+            .get("node.id")
+            .expect("Port has no node.id property!")
+            .parse()
+            .expect("Could not parse node.id property");
+
+        state.insert(id, Item::Port { node_id });
+
+        let params = info.params();
+        let enum_format_info = params
+            .iter()
+            .find(|param| param.id() == ParamType::EnumFormat);
+        if let Some(enum_format_info) = enum_format_info {
+            if enum_format_info.flags().contains(ParamInfoFlags::READ) {
+                proxy.enum_params(0, Some(ParamType::EnumFormat), 0, u32::MAX);
+            }
+        }
+
+        sender
+            .send_blocking(PipewireMessage::PortAdded {
+                id,
+                node_id,
+                name,
+                direction: info.direction(),
+            })
+            .expect("Failed to send message");
+    }
+}
+
+fn handle_port_enum_format(
+    port_id: u32,
+    param: Option<&pipewire::spa::pod::Pod>,
+    sender: &async_channel::Sender<PipewireMessage>,
+) {
+    let media_type = param
+        .and_then(|param| pipewire::spa::param::format_utils::parse_format(param).ok())
+        .map(|(media_type, _media_subtype)| media_type)
+        .unwrap_or(MediaType::Unknown);
+
+    sender
+        .send_blocking(PipewireMessage::PortFormatChanged {
+            id: port_id,
+            media_type,
+        })
+        .expect("Failed to send message")
+}
+
+/// Handle a new link being added
+fn handle_link(
+    link: &GlobalObject<&DictRef>,
+    sender: &async_channel::Sender<PipewireMessage>,
+    registry: &Rc<Registry>,
+    proxies: &Rc<RefCell<HashMap<u32, ProxyItem>>>,
+    state: &Rc<RefCell<State>>,
+) {
+    debug!(
+        "New link (id:{}) appeared, setting up info listener.",
+        link.id
+    );
+
+    let proxy: Link = registry.bind(link).expect("Failed to bind to link proxy");
+    let listener = proxy
+        .add_listener_local()
+        .info(clone!(@strong state, @strong sender => move |info| {
+            handle_link_info(info, &state, &sender);
+        }))
+        .register();
+
+    proxies.borrow_mut().insert(
+        link.id,
+        ProxyItem::Link {
+            _proxy: proxy,
+            _listener: listener,
+        },
+    );
+}
+
+fn handle_link_info(
+    info: &LinkInfoRef,
+    state: &Rc<RefCell<State>>,
+    sender: &async_channel::Sender<PipewireMessage>,
+) {
+    debug!("Received link info: {:?}", info);
+
+    let id = info.id();
+
+    let mut state = state.borrow_mut();
+    if let Some(Item::Link { .. }) = state.get(id) {
+        // Info was an update - figure out if we should notify the gtk thread
+        if info.change_mask().contains(LinkChangeMask::STATE) {
+            sender
+                .send_blocking(PipewireMessage::LinkStateChanged {
+                    id,
+                    active: matches!(info.state(), LinkState::Active),
+                })
+                .expect("Failed to send message");
+        }
+        if info.change_mask().contains(LinkChangeMask::FORMAT) {
+            sender
+                .send_blocking(PipewireMessage::LinkFormatChanged {
+                    id,
+                    media_type: get_link_media_type(info),
+                })
+                .expect("Failed to send message");
+        }
+    } else {
+        // First time we get info. We can now notify the gtk thread of a new link.
+        let port_from = info.output_port_id();
+        let port_to = info.input_port_id();
+
+        state.insert(id, Item::Link { port_from, port_to });
+
+        sender
+            .send_blocking(PipewireMessage::LinkAdded {
+                id,
+                port_from,
+                port_to,
+                active: matches!(info.state(), LinkState::Active),
+                media_type: get_link_media_type(info),
+            })
+            .expect("Failed to send message");
+    }
+}
+
+/// Toggle a link between the two specified ports.
+fn toggle_link(
+    port_from: u32,
+    port_to: u32,
+    core: &Rc<Core>,
+    registry: &Rc<Registry>,
+    state: &Rc<RefCell<State>>,
+) {
+    let state = state.borrow_mut();
+    if let Some(id) = state.get_link_id(port_from, port_to) {
+        info!("Requesting removal of link with id {}", id);
+
+        // FIXME: Handle error
+        registry.destroy_global(id);
+    } else {
+        info!(
+            "Requesting creation of link from port id:{} to port id:{}",
+            port_from, port_to
+        );
+
+        let node_from = state
+            .get_node_of_port(port_from)
+            .expect("Requested port not in state");
+        let node_to = state
+            .get_node_of_port(port_to)
+            .expect("Requested port not in state");
+
+        if let Err(e) = core.create_object::<Link>(
+            "link-factory",
+            &properties! {
+                "link.output.node" => node_from.to_string(),
+                "link.output.port" => port_from.to_string(),
+                "link.input.node" => node_to.to_string(),
+                "link.input.port" => port_to.to_string(),
+                "object.linger" => "1"
+            },
+        ) {
+            warn!("Failed to create link: {}", e);
+        }
+    }
+}
+
+fn get_link_media_type(link_info: &LinkInfoRef) -> MediaType {
+    let media_type = link_info
+        .format()
+        .and_then(|format| pipewire::spa::param::format_utils::parse_format(format).ok())
+        .map(|(media_type, _media_subtype)| media_type)
+        .unwrap_or(MediaType::Unknown);
+
+    media_type
+}

src/pipewire_connection/state.rs

@@ -16,15 +16,10 @@
 
 use std::collections::HashMap;
 
-use crate::MediaType;
-
 /// Any pipewire item we need to keep track of.
 /// These will be saved in the `State` struct associated with their id.
 pub(super) enum Item {
-    Node {
+    Node,
-        // Keep track of the nodes media type to color ports on it.
-        media_type: Option<MediaType>,
-    },
     Port {
         // Save the id of the node this is on so we can remove the port from it
         // when it is deleted.

src/style.css

@@ -15,26 +15,58 @@
    SPDX-License-Identifier: GPL-3.0-only
 */
 
-@define-color audio rgb(50,100,240);
+@define-color media-type-audio   rgb( 50, 100, 240);
-@define-color video rgb(200,200,0);
+@define-color media-type-video   rgb(200, 200,   0);
-@define-color midi rgb(200,0,50);
+@define-color media-type-midi    rgb(200,   0,  50);
-@define-color graphview-link #808080;
+@define-color media-type-unknown rgb(128, 128, 128);
 
 .audio {
-    background: @audio;
+    background: @media-type-audio;
     color: black;
 }
 
 .video {
-    background: @video;
+    background: @media-type-video;
     color: black;
 }
 
 .midi {
-    background: @midi;
+    background: @media-type-midi;
     color: black;
 }
 
-graphview {
+node {
-    background-color: @text_view_bg;
+    /* Compared to the default card color, this is not transparent in dark-mode
+       and provides a better contrast to the background in light mode */
+	background-color: @headerbar_bg_color;
+}
+
+node .node-title {
+	padding: 4px 7px;
+}
+
+port label {
+    padding: 4px 6px;
+}
+
+port-handle {
+    border-radius: 50%;
+    background-color: @media-type-unknown;
+}
+
+button.rounded {
+    padding: 6px;
+    border-radius: 9999px;
+}
+
+entry.rounded {
+    border-radius: 9999px;
+}
+
+entry.rounded > :first-child {
+    padding-left: 12px;
+}
+
+entry.rounded > :nth-child(2) {
+    padding-right: 12px;
 }

src/ui/graph/graph_view.rs

@@ -14,11 +14,14 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-use gtk::{
+use adw::{
-    cairo, gio,
+    gio,
     glib::{self, clone},
+    gtk::{
+        self, cairo,
         graphene::{self, Point},
         gsk,
+    },
     prelude::*,
     subclass::prelude::*,
 };
@@ -36,14 +39,29 @@ mod imp {
     use std::cell::{Cell, RefCell};
     use std::collections::{HashMap, HashSet};
 
-    use gtk::{
+    use adw::gtk::gdk::{self};
-        gdk::{self, RGBA},
-        graphene::Rect,
-        gsk::ColorStop,
-    };
     use log::warn;
     use once_cell::sync::Lazy;
-    use pipewire::spa::Direction;
+    use pipewire::spa::param::format::MediaType;
+    use pipewire::spa::utils::Direction;
+
+    pub struct Colors {
+        audio: gdk::RGBA,
+        video: gdk::RGBA,
+        midi: gdk::RGBA,
+        unknown: gdk::RGBA,
+    }
+
+    impl Colors {
+        pub fn color_for_media_type(&self, media_type: MediaType) -> &gdk::RGBA {
+            match media_type {
+                MediaType::Audio => &self.audio,
+                MediaType::Video => &self.video,
+                MediaType::Stream | MediaType::Application => &self.midi,
+                _ => &self.unknown,
+            }
+        }
+    }
 
     pub struct DragState {
         node: glib::WeakRef<Node>,
@@ -75,6 +93,9 @@ mod imp {
         // Memorized data for an in-progress zoom gesture
         pub zoom_gesture_initial_zoom: Cell<Option<f64>>,
         pub zoom_gesture_anchor: Cell<Option<(f64, f64)>>,
+
+        // This keeps track of an ongoing move view gesture.
+        pub move_view_state: Cell<(f64, f64)>,
     }
 
     impl Default for GraphView {
@@ -90,13 +111,14 @@ mod imp {
                 port_drag_cursor: Cell::new(Point::new(0.0, 0.0)),
                 zoom_gesture_initial_zoom: Default::default(),
                 zoom_gesture_anchor: Default::default(),
+                move_view_state: Default::default(),
             }
         }
     }
 
     #[glib::object_subclass]
     impl ObjectSubclass for GraphView {
-        const NAME: &'static str = "GraphView";
+        const NAME: &'static str = "HelvumGraphView";
         type Type = super::GraphView;
         type ParentType = gtk::Widget;
         type Interfaces = (gtk::Scrollable,);
@@ -110,12 +132,15 @@ mod imp {
         fn constructed(&self) {
             self.parent_constructed();
 
+            self.obj().add_css_class("view");
+
             self.obj().set_overflow(gtk::Overflow::Hidden);
 
             self.setup_node_dragging();
             self.setup_port_drag_and_drop();
             self.setup_scroll_zooming();
             self.setup_zoom_gesture();
+            self.setup_move_view();
         }
 
         fn dispose(&self) {
@@ -205,8 +230,6 @@ mod imp {
             let widget = &*self.obj();
             let alloc = widget.allocation();
 
-            self.snapshot_background(widget, snapshot);
-
             // Draw all visible children
             self.nodes
                 .borrow()
@@ -270,7 +293,9 @@ mod imp {
                     // Drag the Node around the screen.
                     let node = target.dynamic_cast_ref::<Node>().unwrap();
 
-                    let Some(canvas_node_pos) = widget.node_position(node) else { return };
+                    let Some(canvas_node_pos) = widget.node_position(node) else {
+                        return;
+                    };
                     let canvas_cursor_pos = widget
                         .imp()
                         .screen_space_to_canvas_space_transform()
@@ -293,7 +318,9 @@ mod imp {
                     .dynamic_cast::<super::GraphView>()
                     .expect("drag-update event is not on the GraphView");
                 let dragged_node = widget.imp().dragged_node.borrow();
-                let Some(DragState { node, offset }) = dragged_node.as_ref() else { return };
+                let Some(DragState { node, offset }) = dragged_node.as_ref() else {
+                    return;
+                };
                 let Some(node) = node.upgrade() else { return };
 
                 let (start_x, start_y) = drag_controller
@@ -443,91 +470,66 @@ mod imp {
             self.obj().add_controller(zoom_gesture);
         }
 
-        fn snapshot_background(&self, widget: &super::GraphView, snapshot: &gtk::Snapshot) {
+        fn setup_move_view(&self) {
-            // Grid size and line width during neutral zoom (factor 1.0).
+            let drag_controller = gtk::GestureDrag::new();
-            const NORMAL_GRID_SIZE: f32 = 20.0;
-            const NORMAL_GRID_LINE_WIDTH: f32 = 1.0;
 
-            let zoom_factor = self.zoom_factor.get();
+            drag_controller.set_button(gtk::gdk::BUTTON_MIDDLE);
-            let grid_size = NORMAL_GRID_SIZE * zoom_factor as f32;
-            let grid_line_width = NORMAL_GRID_LINE_WIDTH * zoom_factor as f32;
 
-            let alloc = widget.allocation();
+            // TODO: set `all-scroll` cursor while dragging view
 
-            // We need to offset the lines between 0 and (excluding) `grid_size` so the grid moves with
+            drag_controller.connect_drag_begin(|drag_controller, _, _| {
-            // the rest of the view when scrolling.
+                let widget = drag_controller
-            // The offset is rounded so the grid is always aligned to a row of pixels.
+                    .widget()
-            let hadj = self
+                    .downcast::<super::GraphView>()
-                .hadjustment
+                    .unwrap();
-                .borrow()
-                .as_ref()
-                .map(|hadjustment| hadjustment.value())
-                .unwrap_or(0.0);
-            let hoffset = (grid_size - (hadj as f32 % grid_size)) % grid_size;
-            let vadj = self
-                .vadjustment
-                .borrow()
-                .as_ref()
-                .map(|vadjustment| vadjustment.value())
-                .unwrap_or(0.0);
-            let voffset = (grid_size - (vadj as f32 % grid_size)) % grid_size;
 
-            snapshot.push_repeat(
+                widget.imp().move_view_state.set((0.0, 0.0));
-                &Rect::new(0.0, 0.0, alloc.width() as f32, alloc.height() as f32),
+            });
-                Some(&Rect::new(0.0, voffset, alloc.width() as f32, grid_size)),
-            );
-            let grid_color = RGBA::new(0.137, 0.137, 0.137, 1.0);
-            snapshot.append_linear_gradient(
-                &Rect::new(0.0, voffset, alloc.width() as f32, grid_line_width),
-                &Point::new(0.0, 0.0),
-                &Point::new(alloc.width() as f32, 0.0),
-                &[
-                    ColorStop::new(0.0, grid_color),
-                    ColorStop::new(1.0, grid_color),
-                ],
-            );
-            snapshot.pop();
 
-            snapshot.push_repeat(
+            drag_controller.connect_drag_update(|drag_controller, x, y| {
-                &Rect::new(0.0, 0.0, alloc.width() as f32, alloc.height() as f32),
+                let widget = drag_controller
-                Some(&Rect::new(hoffset, 0.0, grid_size, alloc.height() as f32)),
+                    .widget()
-            );
+                    .downcast::<super::GraphView>()
-            snapshot.append_linear_gradient(
+                    .unwrap();
-                &Rect::new(hoffset, 0.0, grid_line_width, alloc.height() as f32),
+
-                &Point::new(0.0, 0.0),
+                let imp = widget.imp();
-                &Point::new(0.0, alloc.height() as f32),
+                let state = imp.move_view_state.replace((x, y));
-                &[
+                let delta_x = state.0 - x;
-                    ColorStop::new(0.0, grid_color),
+                let delta_y = state.1 - y;
-                    ColorStop::new(1.0, grid_color),
+
-                ],
+                let hadjustment_ref = imp.hadjustment.borrow();
-            );
+                let vadjustment_ref = imp.vadjustment.borrow();
-            snapshot.pop();
+                let hadjustment = hadjustment_ref.as_ref().unwrap();
+                let vadjustment = vadjustment_ref.as_ref().unwrap();
+
+                let new_hadjustment = hadjustment.value() + delta_x;
+                let new_vadjustment = vadjustment.value() + delta_y;
+
+                hadjustment.set_value(new_hadjustment);
+                vadjustment.set_value(new_vadjustment);
+            });
+
+            self.obj().add_controller(drag_controller);
         }
 
-        fn draw_link(
+        fn snapshot_link(
             &self,
-            link_cr: &cairo::Context,
+            snapshot: &gtk::Snapshot,
             output_anchor: &Point,
             input_anchor: &Point,
             active: bool,
+            color: &gdk::RGBA,
         ) {
-            let output_x: f64 = output_anchor.x().into();
+            let output_x = output_anchor.x();
-            let output_y: f64 = output_anchor.y().into();
+            let output_y = output_anchor.y();
-            let input_x: f64 = input_anchor.x().into();
+            let input_x = input_anchor.x();
-            let input_y: f64 = input_anchor.y().into();
+            let input_y = input_anchor.y();
-
-            // Use dashed line for inactive links, full line otherwise.
-            if active {
-                link_cr.set_dash(&[], 0.0);
-            } else {
-                link_cr.set_dash(&[10.0, 5.0], 0.0);
-            }
 
             // If the output port is farther right than the input port and they have
             // a similar y coordinate, apply a y offset to the control points
             // so that the curve sticks out a bit.
             let y_control_offset = if output_x > input_x {
-                f64::max(0.0, 25.0 - (output_y - input_y).abs())
+                f32::max(0.0, 25.0 - (output_y - input_y).abs())
             } else {
                 0.0
             };
@@ -535,9 +537,10 @@ mod imp {
             // Place curve control offset by half the x distance between the two points.
             // This makes the curve scale well for varying distances between the two ports,
             // especially when the output port is farther right than the input port.
-            let half_x_dist = f64::abs(output_x - input_x) / 2.0;
+            let half_x_dist = f32::abs(output_x - input_x) / 2.0;
-            link_cr.move_to(output_x, output_y);
+            let path_builder = gsk::PathBuilder::new();
-            link_cr.curve_to(
+            path_builder.move_to(output_x, output_y);
+            path_builder.cubic_to(
                 output_x + half_x_dist,
                 output_y - y_control_offset,
                 input_x - half_x_dist,
@@ -545,13 +548,20 @@ mod imp {
                 input_x,
                 input_y,
             );
+            let path = path_builder.to_path();
 
-            if let Err(e) = link_cr.stroke() {
+            let stroke = gsk::Stroke::new(2.0 * (self.zoom_factor.get() as f32));
-                warn!("Failed to draw graphview links: {}", e);
+            // Use dashed line for inactive links, full line otherwise.
-            };
+            if active {
+                stroke.set_dash(&[]);
+            } else {
+                stroke.set_dash(&[10.0, 5.0]);
             }
 
-        fn draw_dragged_link(&self, port: &Port, link_cr: &cairo::Context) {
+            snapshot.append_stroke(&path, &stroke, color);
+        }
+
+        fn snapshot_dragged_link(&self, snapshot: &gtk::Snapshot, port: &Port, colors: &Colors) {
             let Some(port_anchor) = port.compute_point(&*self.obj(), &port.link_anchor()) else {
                 return;
             };
@@ -573,51 +583,57 @@ mod imp {
             });
             let other_anchor = picked_port_anchor.unwrap_or(drag_cursor);
 
-            let (output_anchor, input_anchor) = match port.direction() {
+            let (output_anchor, input_anchor) = match Direction::from_raw(port.direction()) {
                 Direction::Output => (&port_anchor, &other_anchor),
                 Direction::Input => (&other_anchor, &port_anchor),
                 _ => unreachable!(),
             };
 
-            self.draw_link(link_cr, output_anchor, input_anchor, false);
+            let color = &colors.color_for_media_type(MediaType::from_raw(port.media_type()));
+
+            self.snapshot_link(snapshot, output_anchor, input_anchor, false, color);
         }
 
         fn snapshot_links(&self, widget: &super::GraphView, snapshot: &gtk::Snapshot) {
-            let alloc = widget.allocation();
+            let colors = Colors {
-
+                audio: widget
-            let link_cr = snapshot.append_cairo(&graphene::Rect::new(
-                0.0,
-                0.0,
-                alloc.width() as f32,
-                alloc.height() as f32,
-            ));
-
-            link_cr.set_line_width(2.0 * self.zoom_factor.get());
-
-            let rgba = widget
                     .style_context()
-                .lookup_color("graphview-link")
+                    .lookup_color("media-type-audio")
-                .unwrap_or(gtk::gdk::RGBA::BLACK);
+                    .expect("color not found"),
-
+                video: widget
-            link_cr.set_source_rgba(
+                    .style_context()
-                rgba.red().into(),
+                    .lookup_color("media-type-video")
-                rgba.green().into(),
+                    .expect("color not found"),
-                rgba.blue().into(),
+                midi: widget
-                rgba.alpha().into(),
+                    .style_context()
-            );
+                    .lookup_color("media-type-midi")
+                    .expect("color not found"),
+                unknown: widget
+                    .style_context()
+                    .lookup_color("media-type-unknown")
+                    .expect("color not found"),
+            };
 
             for link in self.links.borrow().iter() {
+                let color = &colors.color_for_media_type(link.media_type());
+
                 // TODO: Do not draw links when they are outside the view
                 let Some((output_anchor, input_anchor)) = self.get_link_coordinates(link) else {
                     warn!("Could not get allocation of ports of link: {:?}", link);
                     continue;
                 };
 
-                self.draw_link(&link_cr, &output_anchor, &input_anchor, link.active());
+                self.snapshot_link(
+                    snapshot,
+                    &output_anchor,
+                    &input_anchor,
+                    link.active(),
+                    color,
+                );
             }
 
             if let Some(port) = self.dragged_port.upgrade() {
-                self.draw_dragged_link(&port, &link_cr);
+                self.snapshot_dragged_link(&snapshot, &port, &colors);
             }
         }
 
@@ -793,6 +809,12 @@ impl GraphView {
                 graph.queue_draw();
             }),
         );
+        link.connect_notify_local(
+            Some("media-type"),
+            glib::clone!(@weak self as graph => move |_, _| {
+                graph.queue_draw();
+            }),
+        );
         self.imp().links.borrow_mut().insert(link);
         self.queue_draw();
     }
@@ -804,6 +826,14 @@ impl GraphView {
         self.queue_draw();
     }
 
+    pub fn clear(&mut self) {
+        self.imp().links.borrow_mut().clear();
+        for (node, _) in self.imp().nodes.borrow_mut().drain() {
+            node.unparent();
+        }
+        self.queue_draw();
+    }
+
     /// Get the position of the specified node inside the graphview.
     ///
     /// The returned position is in canvas-space (non-zoomed, (0, 0) fixed in the middle of the canvas).

src/ui/graph/link.rs

@@ -14,7 +14,8 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-use gtk::{glib, prelude::*, subclass::prelude::*};
+use adw::{glib, prelude::*, subclass::prelude::*};
+use pipewire::spa::param::format::MediaType;
 
 use super::Port;
 
@@ -25,11 +26,22 @@ mod imp {
 
     use once_cell::sync::Lazy;
 
-    #[derive(Default)]
     pub struct Link {
         pub output_port: glib::WeakRef<Port>,
         pub input_port: glib::WeakRef<Port>,
         pub active: Cell<bool>,
+        pub media_type: Cell<MediaType>,
+    }
+
+    impl Default for Link {
+        fn default() -> Self {
+            Self {
+                output_port: glib::WeakRef::default(),
+                input_port: glib::WeakRef::default(),
+                active: Cell::default(),
+                media_type: Cell::new(MediaType::Unknown),
+            }
+        }
     }
 
     #[glib::object_subclass]
@@ -53,6 +65,10 @@ mod imp {
                         .default_value(false)
                         .flags(glib::ParamFlags::READWRITE)
                         .build(),
+                    glib::ParamSpecUInt::builder("media-type")
+                        .default_value(MediaType::Unknown.as_raw())
+                        .flags(glib::ParamFlags::READWRITE)
+                        .build(),
                 ]
             });
 
@@ -64,6 +80,7 @@ mod imp {
                 "output-port" => self.output_port.upgrade().to_value(),
                 "input-port" => self.input_port.upgrade().to_value(),
                 "active" => self.active.get().to_value(),
+                "media-type" => self.media_type.get().as_raw().to_value(),
                 _ => unimplemented!(),
             }
         }
@@ -73,6 +90,9 @@ mod imp {
                 "output-port" => self.output_port.set(value.get().unwrap()),
                 "input-port" => self.input_port.set(value.get().unwrap()),
                 "active" => self.active.set(value.get().unwrap()),
+                "media-type" => self
+                    .media_type
+                    .set(MediaType::from_raw(value.get().unwrap())),
                 _ => unimplemented!(),
             }
         }
@@ -111,6 +131,14 @@ impl Link {
     pub fn set_active(&self, active: bool) {
         self.set_property("active", active);
     }
+
+    pub fn media_type(&self) -> MediaType {
+        MediaType::from_raw(self.property("media-type"))
+    }
+
+    pub fn set_media_type(&self, media_type: MediaType) {
+        self.set_property("media-type", media_type.as_raw())
+    }
 }
 
 impl Default for Link {

src/ui/graph/mod.rs

@@ -20,6 +20,8 @@ mod node;
 pub use node::*;
 mod port;
 pub use port::*;
+mod port_handle;
+pub use port_handle::*;
 mod link;
 pub use link::*;
 mod zoomentry;

src/ui/graph/node.rs

@@ -14,8 +14,8 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-use gtk::{glib, prelude::*, subclass::prelude::*};
+use adw::{glib, gtk, prelude::*, subclass::prelude::*};
-use pipewire::spa::Direction;
+use pipewire::spa::utils::Direction;
 
 use super::Port;
 
@@ -27,24 +27,38 @@ mod imp {
         collections::HashSet,
     };
 
-    #[derive(glib::Properties)]
+    #[derive(glib::Properties, gtk::CompositeTemplate, Default)]
     #[properties(wrapper_type = super::Node)]
+    #[template(file = "node.ui")]
     pub struct Node {
         #[property(get, set, construct_only)]
         pub(super) pipewire_id: Cell<u32>,
-        pub(super) grid: gtk::Grid,
         #[property(
-            name = "name", type = String,
+            name = "node-name", type = String,
-            get = |this: &Self| this.label.text().to_string(),
+            get = |this: &Self| this.node_name.text().to_string(),
             set = |this: &Self, val| {
-                this.label.set_text(val);
+                this.node_name.set_text(val);
-                this.label.set_tooltip_text(Some(val));
+                this.node_name.set_tooltip_text(Some(val));
             }
         )]
-        pub(super) label: gtk::Label,
+        #[template_child]
+        pub(super) node_name: TemplateChild<gtk::Label>,
+        #[property(
+            name = "media-name", type = String,
+            get = |this: &Self| this.media_name.text().to_string(),
+            set = |this: &Self, val| {
+                this.media_name.set_text(val);
+                this.media_name.set_tooltip_text(Some(val));
+                this.media_name.set_visible(!val.is_empty());
+            }
+        )]
+        #[template_child]
+        pub(super) media_name: TemplateChild<gtk::Label>,
+        #[template_child]
+        pub(super) separator: TemplateChild<gtk::Separator>,
+        #[template_child]
+        pub(super) port_grid: TemplateChild<gtk::Grid>,
         pub(super) ports: RefCell<HashSet<Port>>,
-        pub(super) num_ports_in: Cell<i32>,
-        pub(super) num_ports_out: Cell<i32>,
     }
 
     #[glib::object_subclass]
@@ -54,31 +68,15 @@ mod imp {
         type ParentType = gtk::Widget;
 
         fn class_init(klass: &mut Self::Class) {
-            klass.set_layout_manager_type::<gtk::BinLayout>();
+            klass.set_layout_manager_type::<gtk::BoxLayout>();
+
+            klass.bind_template();
+
+            klass.set_css_name("node");
         }
 
-        fn new() -> Self {
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
-            let grid = gtk::Grid::new();
+            obj.init_template();
-
-            let label = gtk::Label::new(None);
-            label.set_wrap(true);
-            label.set_lines(2);
-            label.set_max_width_chars(20);
-            label.set_ellipsize(gtk::pango::EllipsizeMode::End);
-
-            grid.attach(&label, 0, 0, 2, 1);
-
-            // Display a grab cursor when the mouse is over the label so the user knows the node can be dragged.
-            label.set_cursor(gtk::gdk::Cursor::from_name("grab", None).as_ref());
-
-            Self {
-                pipewire_id: Cell::new(0),
-                grid,
-                label,
-                ports: RefCell::new(HashSet::new()),
-                num_ports_in: Cell::new(0),
-                num_ports_out: Cell::new(0),
-            }
         }
     }
 
@@ -86,15 +84,67 @@ mod imp {
     impl ObjectImpl for Node {
         fn constructed(&self) {
             self.parent_constructed();
-            self.grid.set_parent(&*self.obj());
+
+            // Force left-to-right direction for the ports grid to avoid messed up UI when defaulting to right-to-left
+            self.port_grid.set_direction(gtk::TextDirection::Ltr);
+
+            // Display a grab cursor when the mouse is over the label so the user knows the node can be dragged.
+            self.node_name
+                .set_cursor(gtk::gdk::Cursor::from_name("grab", None).as_ref());
         }
 
         fn dispose(&self) {
-            self.grid.unparent();
+            if let Some(child) = self.obj().first_child() {
+                child.unparent();
+            }
         }
     }
 
     impl WidgetImpl for Node {}
+
+    impl Node {
+        /// Update the internal ports grid to reflect the ports stored in the ports set.
+        pub fn update_ports(&self) {
+            // We first remove all ports from the grid, then re-add them all, so that
+            // ports that have been removed do not leave gaps in the grid.
+
+            while let Some(ref child) = self.port_grid.first_child() {
+                self.port_grid.remove(child);
+            }
+
+            let ports = self.ports.borrow();
+
+            let mut ports_out = Vec::new();
+            let mut ports_in = Vec::new();
+
+            ports
+                .iter()
+                .for_each(|port| match Direction::from_raw(port.direction()) {
+                    Direction::Output => {
+                        ports_out.push(port);
+                    }
+                    Direction::Input => {
+                        ports_in.push(port);
+                    }
+                    _ => unreachable!(),
+                });
+
+            ports_out.sort_unstable_by_key(|port| port.name());
+            ports_in.sort_unstable_by_key(|port| port.name());
+
+            // In case no ports have been added to the port, hide the seperator as it is not needed
+            self.separator
+                .set_visible(!ports_out.is_empty() || !ports_in.is_empty());
+
+            for (i, port) in ports_in.into_iter().enumerate() {
+                self.port_grid.attach(port, 0, i.try_into().unwrap(), 1, 1);
+            }
+
+            for (i, port) in ports_out.into_iter().enumerate() {
+                self.port_grid.attach(port, 1, i.try_into().unwrap(), 1, 1);
+            }
+        }
+    }
 }
 
 glib::wrapper! {
@@ -105,39 +155,21 @@ glib::wrapper! {
 impl Node {
     pub fn new(name: &str, pipewire_id: u32) -> Self {
         glib::Object::builder()
-            .property("name", name)
+            .property("node-name", name)
             .property("pipewire-id", pipewire_id)
             .build()
     }
 
     pub fn add_port(&self, port: Port) {
         let imp = self.imp();
-
-        match port.direction() {
-            Direction::Input => {
-                imp.grid.attach(&port, 0, imp.num_ports_in.get() + 1, 1, 1);
-                imp.num_ports_in.set(imp.num_ports_in.get() + 1);
-            }
-            Direction::Output => {
-                imp.grid.attach(&port, 1, imp.num_ports_out.get() + 1, 1, 1);
-                imp.num_ports_out.set(imp.num_ports_out.get() + 1);
-            }
-            _ => unreachable!(),
-        }
-
         imp.ports.borrow_mut().insert(port);
+        imp.update_ports();
     }
 
     pub fn remove_port(&self, port: &Port) {
         let imp = self.imp();
         if imp.ports.borrow_mut().remove(port) {
-            match port.direction() {
+            imp.update_ports();
-                Direction::Input => imp.num_ports_in.set(imp.num_ports_in.get() - 1),
-                Direction::Output => imp.num_ports_in.set(imp.num_ports_out.get() - 1),
-                _ => unreachable!(),
-            }
-
-            port.unparent();
         } else {
             log::warn!("Tried to remove non-existant port widget from node");
         }

src/ui/graph/node.ui

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="HelvumNode" parent="GtkWidget">
+    <style>
+      <class name="card"></class>
+    </style>>
+    <child>
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <style>
+              <class name="node-title"></class>
+            </style>
+            <property name="orientation">vertical</property>
+            <property name="spacing">1</property>
+            <child>
+              <object class="GtkLabel" id="node_name">
+                <style>
+                  <class name="heading"></class>
+                </style>
+                <property name="wrap">true</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                <property name="lines">2</property>
+                <property name="max-width-chars">20</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="media_name">
+                <style>
+                  <class name="dim-label"></class>
+                  <class name="caption"></class>
+                </style>
+                <property name="visible">false</property>
+                <property name="wrap">true</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                <property name="lines">2</property>
+                <property name="max-width-chars">20</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator" id="separator">
+            <!-- The node will show the seperator only once ports are added to it -->
+            <property name="visible">false</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkGrid" id="port_grid"></object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>

src/ui/graph/port.rs

@@ -14,29 +14,45 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-use gtk::{
+use adw::{
     gdk,
     glib::{self, subclass::Signal},
-    graphene,
+    gtk::{self, graphene},
     prelude::*,
     subclass::prelude::*,
 };
-use pipewire::spa::Direction;
+use pipewire::spa::utils::Direction;
 
-use crate::MediaType;
+use super::PortHandle;
 
 mod imp {
     use super::*;
 
-    use once_cell::{sync::Lazy, unsync::OnceCell};
+    use std::cell::{Cell, OnceCell};
-    use pipewire::spa::Direction;
+
+    use once_cell::sync::Lazy;
+    use pipewire::spa::{param::format::MediaType, utils::Direction};
 
     /// Graphical representation of a pipewire port.
-    #[derive(Default, glib::Properties)]
+    #[derive(gtk::CompositeTemplate, glib::Properties)]
     #[properties(wrapper_type = super::Port)]
+    #[template(file = "port.ui")]
     pub struct Port {
         #[property(get, set, construct_only)]
         pub(super) pipewire_id: OnceCell<u32>,
+        #[property(
+            type = u32,
+            get = |_| self.media_type.get().as_raw(),
+            set = Self::set_media_type
+        )]
+        pub(super) media_type: Cell<MediaType>,
+        #[property(
+            type = u32,
+            get = |_| self.direction.get().as_raw(),
+            set = Self::set_direction,
+            construct_only
+        )]
+        pub(super) direction: Cell<Direction>,
         #[property(
             name = "name", type = String,
             get = |this: &Self| this.label.text().to_string(),
@@ -45,8 +61,22 @@ mod imp {
                 this.label.set_tooltip_text(Some(val));
             }
         )]
-        pub(super) label: gtk::Label,
+        #[template_child]
-        pub(super) direction: OnceCell<Direction>,
+        pub(super) label: TemplateChild<gtk::Label>,
+        #[template_child]
+        pub(super) handle: TemplateChild<PortHandle>,
+    }
+
+    impl Default for Port {
+        fn default() -> Self {
+            Self {
+                pipewire_id: OnceCell::default(),
+                media_type: Cell::new(MediaType::Unknown),
+                direction: Cell::new(Direction::Output),
+                label: TemplateChild::default(),
+                handle: TemplateChild::default(),
+            }
+        }
     }
 
     #[glib::object_subclass]
@@ -56,10 +86,13 @@ mod imp {
         type ParentType = gtk::Widget;
 
         fn class_init(klass: &mut Self::Class) {
-            klass.set_layout_manager_type::<gtk::BinLayout>();
+            klass.set_css_name("port");
 
-            // Make it look like a GTK button.
+            klass.bind_template();
-            klass.set_css_name("button");
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
         }
     }
 
@@ -68,19 +101,16 @@ mod imp {
         fn constructed(&self) {
             self.parent_constructed();
 
-            self.label.set_parent(&*self.obj());
+            // Force left-to-right direction for the ports grid to avoid messed up UI when defaulting to right-to-left
-            self.label.set_wrap(true);
+            self.obj().set_direction(gtk::TextDirection::Ltr);
-            self.label.set_lines(2);
+
-            self.label.set_max_width_chars(20);
+            // Display a grab cursor when the mouse is over the port so the user knows it can be dragged to another port.
-            self.label.set_ellipsize(gtk::pango::EllipsizeMode::End);
+            self.obj()
+                .set_cursor(gtk::gdk::Cursor::from_name("grab", None).as_ref());
 
             self.setup_port_drag_and_drop();
         }
 
-        fn dispose(&self) {
-            self.label.unparent()
-        }
-
         fn signals() -> &'static [Signal] {
             static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
                 vec![Signal::builder("port-toggled")
@@ -92,7 +122,81 @@ mod imp {
             SIGNALS.as_ref()
         }
     }
-    impl WidgetImpl for Port {}
+
+    impl WidgetImpl for Port {
+        fn measure(&self, orientation: gtk::Orientation, for_size: i32) -> (i32, i32, i32, i32) {
+            match orientation {
+                gtk::Orientation::Horizontal => {
+                    let (min_handle_width, nat_handle_width, _, _) =
+                        self.handle.measure(orientation, for_size);
+                    let (min_label_width, nat_label_width, _, _) = self
+                        .label
+                        .measure(orientation, i32::max(for_size - (nat_handle_width / 2), -1));
+
+                    (
+                        (min_handle_width / 2) + min_label_width,
+                        (nat_handle_width / 2) + nat_label_width,
+                        -1,
+                        -1,
+                    )
+                }
+                gtk::Orientation::Vertical => {
+                    let (min_label_height, nat_label_height, _, _) =
+                        self.label.measure(orientation, for_size);
+                    let (min_handle_height, nat_handle_height, _, _) =
+                        self.handle.measure(orientation, for_size);
+
+                    (
+                        i32::max(min_label_height, min_handle_height),
+                        i32::max(nat_label_height, nat_handle_height),
+                        -1,
+                        -1,
+                    )
+                }
+                _ => unimplemented!(),
+            }
+        }
+
+        fn size_allocate(&self, width: i32, height: i32, _baseline: i32) {
+            let (_, nat_handle_height, _, _) =
+                self.handle.measure(gtk::Orientation::Vertical, height);
+            let (_, nat_handle_width, _, _) =
+                self.handle.measure(gtk::Orientation::Horizontal, width);
+
+            match Direction::from_raw(self.obj().direction()) {
+                Direction::Input => {
+                    let alloc = gtk::Allocation::new(
+                        -nat_handle_width / 2,
+                        (height - nat_handle_height) / 2,
+                        nat_handle_width,
+                        nat_handle_height,
+                    );
+                    self.handle.size_allocate(&alloc, -1);
+
+                    let alloc = gtk::Allocation::new(
+                        nat_handle_width / 2,
+                        0,
+                        width - (nat_handle_width / 2),
+                        height,
+                    );
+                    self.label.size_allocate(&alloc, -1);
+                }
+                Direction::Output => {
+                    let alloc = gtk::Allocation::new(
+                        width - (nat_handle_width / 2),
+                        (height - nat_handle_height) / 2,
+                        nat_handle_width,
+                        nat_handle_height,
+                    );
+                    self.handle.size_allocate(&alloc, -1);
+
+                    let alloc = gtk::Allocation::new(0, 0, width - (nat_handle_width / 2), height);
+                    self.label.size_allocate(&alloc, -1);
+                }
+                _ => unreachable!(),
+            }
+        }
+    }
 
     impl Port {
         fn setup_port_drag_and_drop(&self) {
@@ -168,7 +272,7 @@ mod imp {
                     return false;
                 }
 
-                let (output_port, input_port) = match port.direction() {
+                let (output_port, input_port) = match Direction::from_raw(port.direction()) {
                     Direction::Output => (&port, &other_port),
                     Direction::Input => (&other_port, &port),
                     _ => unreachable!(),
@@ -183,6 +287,42 @@ mod imp {
             });
             obj.add_controller(drop_target);
         }
+
+        fn set_media_type(&self, media_type: u32) {
+            let media_type = MediaType::from_raw(media_type);
+
+            self.media_type.set(media_type);
+
+            for css_class in ["video", "audio", "midi"] {
+                self.handle.remove_css_class(css_class)
+            }
+
+            // Color the port according to its media type.
+            match media_type {
+                MediaType::Video => self.handle.add_css_class("video"),
+                MediaType::Audio => self.handle.add_css_class("audio"),
+                MediaType::Application | MediaType::Stream => self.handle.add_css_class("midi"),
+                _ => {}
+            }
+        }
+
+        fn set_direction(&self, direction: u32) {
+            let direction = Direction::from_raw(direction);
+
+            self.direction.set(direction);
+
+            match direction {
+                Direction::Input => {
+                    self.obj().set_halign(gtk::Align::Start);
+                    self.label.set_halign(gtk::Align::Start);
+                }
+                Direction::Output => {
+                    self.obj().set_halign(gtk::Align::End);
+                    self.label.set_halign(gtk::Align::End);
+                }
+                _ => unreachable!(),
+            }
+        }
     }
 }
 
@@ -192,39 +332,12 @@ glib::wrapper! {
 }
 
 impl Port {
-    pub fn new(id: u32, name: &str, direction: Direction, media_type: Option<MediaType>) -> Self {
+    pub fn new(id: u32, name: &str, direction: Direction) -> Self {
-        // Create the widget and initialize needed fields
+        glib::Object::builder()
-        let res: Self = glib::Object::builder()
             .property("pipewire-id", id)
+            .property("direction", direction.as_raw())
             .property("name", name)
-            .build();
+            .build()
-
-        let imp = res.imp();
-
-        imp.direction
-            .set(direction)
-            .expect("Port direction already set");
-
-        // Display a grab cursor when the mouse is over the port so the user knows it can be dragged to another port.
-        res.set_cursor(gtk::gdk::Cursor::from_name("grab", None).as_ref());
-
-        // Color the port according to its media type.
-        match media_type {
-            Some(MediaType::Video) => res.add_css_class("video"),
-            Some(MediaType::Audio) => res.add_css_class("audio"),
-            Some(MediaType::Midi) => res.add_css_class("midi"),
-            None => {}
-        }
-
-        res
-    }
-
-    pub fn direction(&self) -> Direction {
-        *self
-            .imp()
-            .direction
-            .get()
-            .expect("Port direction is not set")
     }
 
     pub fn link_anchor(&self) -> graphene::Point {
@@ -234,8 +347,9 @@ impl Port {
         let padding_left: f32 = style_context.padding().left().into();
         let border_left: f32 = style_context.border().left().into();
 
+        let direction = Direction::from_raw(self.direction());
         graphene::Point::new(
-            match self.direction() {
+            match direction {
                 Direction::Output => self.width() as f32 + padding_right + border_right,
                 Direction::Input => 0.0 - padding_left - border_left,
                 _ => unreachable!(),

src/ui/graph/port.ui

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="HelvumPort" parent="GtkWidget">
+    <property name="hexpand">true</property>
+    <child>
+      <object class="GtkLabel" id="label">
+        <property name="wrap">true</property>
+        <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+        <property name="lines">2</property>
+        <property name="max-width-chars">20</property>
+      </object>
+    </child>
+    <child>
+      <object class="HelvumPortHandle" id="handle"></object>
+    </child>
+  </template>
+</interface>
+

src/ui/graph/port_handle.rs

@@ -0,0 +1,84 @@
+// Copyright 2021 Tom A. Wagner <tom.a.wagner@protonmail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 3 as published by
+// the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+use adw::{glib, gtk, prelude::*, subclass::prelude::*};
+
+mod imp {
+    use super::*;
+
+    #[derive(Default)]
+    pub struct PortHandle {}
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for PortHandle {
+        const NAME: &'static str = "HelvumPortHandle";
+        type Type = super::PortHandle;
+        type ParentType = gtk::Widget;
+
+        fn class_init(klass: &mut Self::Class) {
+            klass.set_css_name("port-handle");
+        }
+    }
+
+    impl ObjectImpl for PortHandle {
+        fn constructed(&self) {
+            self.parent_constructed();
+
+            let obj = &*self.obj();
+
+            obj.set_halign(gtk::Align::Center);
+            obj.set_valign(gtk::Align::Center);
+        }
+    }
+
+    impl WidgetImpl for PortHandle {
+        fn request_mode(&self) -> gtk::SizeRequestMode {
+            gtk::SizeRequestMode::ConstantSize
+        }
+
+        fn measure(&self, _orientation: gtk::Orientation, _for_size: i32) -> (i32, i32, i32, i32) {
+            (Self::HANDLE_SIZE, Self::HANDLE_SIZE, -1, -1)
+        }
+    }
+
+    impl PortHandle {
+        pub const HANDLE_SIZE: i32 = 14;
+    }
+}
+
+glib::wrapper! {
+    pub struct PortHandle(ObjectSubclass<imp::PortHandle>)
+        @extends gtk::Widget;
+}
+
+impl PortHandle {
+    pub fn new() -> Self {
+        glib::Object::new()
+    }
+
+    pub fn get_link_anchor(&self) -> gtk::graphene::Point {
+        gtk::graphene::Point::new(
+            imp::PortHandle::HANDLE_SIZE as f32 / 2.0,
+            imp::PortHandle::HANDLE_SIZE as f32 / 2.0,
+        )
+    }
+}
+
+impl Default for PortHandle {
+    fn default() -> Self {
+        Self::new()
+    }
+}

src/ui/graph/zoomentry.rs

@@ -1,4 +1,4 @@
-use gtk::{glib, prelude::*, subclass::prelude::*};
+use adw::{glib, gtk, prelude::*, subclass::prelude::*};
 
 use super::GraphView;
 
@@ -34,6 +34,7 @@ mod imp {
             menu.append(Some("200%"), Some("win.set-zoom(2.0)"));
             menu.append(Some("300%"), Some("win.set-zoom(3.0)"));
             let popover = gtk::PopoverMenu::from_model(Some(&menu));
+            popover.set_position(gtk::PositionType::Top);
 
             ZoomEntry {
                 graphview: Default::default(),
@@ -127,7 +128,8 @@ mod imp {
         fn set_property(&self, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
             match pspec.name() {
                 "zoomed-widget" => {
-                    let widget: GraphView = value.get().unwrap();
+                    let widget: Option<GraphView> = value.get().unwrap();
+                    if let Some(ref widget) = widget {
                         widget.connect_notify_local(
                             Some("zoom-factor"),
                             clone!(@weak self as imp => move |graphview, _| {
@@ -135,7 +137,8 @@ mod imp {
                             }),
                         );
                         self.update_zoom_factor_text(widget.zoom_factor());
-                    *self.graphview.borrow_mut() = Some(widget);
+                    }
+                    *self.graphview.borrow_mut() = widget;
                 }
                 _ => unimplemented!(),
             }

src/ui/graph/zoomentry.ui

@@ -1,26 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="HelvumZoomEntry" parent="GtkBox">
-    <child>
+    <property name="spacing">12</property>
-      <object class="GtkButton" id="zoom_out_button">
-        <property name="icon-name">zoom-out-symbolic</property>
-        <property name="tooltip-text">Zoom out</property>
-      </object>
-    </child>
     <child>
       <object class="GtkEntry" id="entry">
         <property name="secondary-icon-name">go-down-symbolic</property>
         <property name="input-purpose">digits</property>
+        <property name="max-width-chars">5</property>
+        <style>
+          <class name="osd"/>
+          <class name="rounded"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkButton" id="zoom_out_button">
+        <property name="icon-name">zoom-out-symbolic</property>
+        <property name="tooltip-text">Zoom out</property>
+        <style>
+          <class name="osd"/>
+          <class name="rounded"/>
+        </style>
       </object>
     </child>
     <child>
       <object class="GtkButton" id="zoom_in_button">
         <property name="icon-name">zoom-in-symbolic</property>
         <property name="tooltip-text">Zoom in</property>
+        <style>
+          <class name="osd"/>
+          <class name="rounded"/>
+        </style>
       </object>
     </child>
-    <style>
-      <class name="linked"/>
-    </style>
   </template>
 </interface>

src/ui/mod.rs

@@ -19,3 +19,6 @@
 //! This module contains gtk widgets needed to present the graphical user interface.
 
 pub mod graph;
+
+mod window;
+pub use window::*;

src/ui/window.rs

@@ -0,0 +1,65 @@
+use adw::{gio, gtk, prelude::*, subclass::prelude::*};
+
+use super::graph;
+
+mod imp {
+    use super::*;
+
+    #[derive(Default, gtk::CompositeTemplate, glib::Properties)]
+    #[properties(wrapper_type = super::Window)]
+    #[template(file = "window.ui")]
+    pub struct Window {
+        #[template_child]
+        pub header_bar: TemplateChild<adw::HeaderBar>,
+        #[template_child]
+        #[property(type = adw::Banner, get = |_| self.connection_banner.clone())]
+        pub connection_banner: TemplateChild<adw::Banner>,
+        #[template_child]
+        #[property(type = graph::GraphView, get = |_| self.graph.clone())]
+        pub graph: TemplateChild<graph::GraphView>,
+    }
+
+    #[glib::object_subclass]
+    impl ObjectSubclass for Window {
+        const NAME: &'static str = "HelvumWindow";
+        type Type = super::Window;
+        type ParentType = adw::ApplicationWindow;
+
+        fn class_init(klass: &mut Self::Class) {
+            // Ensure custom types are registered
+            graph::GraphView::ensure_type();
+            graph::ZoomEntry::ensure_type();
+
+            klass.bind_template();
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    #[glib::derived_properties]
+    impl ObjectImpl for Window {}
+    impl WidgetImpl for Window {}
+    impl WindowImpl for Window {}
+    impl ApplicationWindowImpl for Window {}
+    impl AdwApplicationWindowImpl for Window {}
+}
+
+glib::wrapper! {
+    pub struct Window(ObjectSubclass<imp::Window>)
+        @extends adw::ApplicationWindow, gtk::ApplicationWindow, gtk::Window, gtk::Widget,
+        @implements gio::ActionGroup, gio::ActionMap;
+}
+
+impl Window {
+    pub fn new() -> Self {
+        glib::Object::new()
+    }
+}
+
+impl Default for Window {
+    fn default() -> Self {
+        Self::new()
+    }
+}

src/ui/window.ui

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <requires lib="Adw" version="1.4"/>
+  <menu id="primary_menu">
+    <section>
+      <item>
+        <attribute name="label">_About Helvum</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
+  <template class="HelvumWindow" parent="AdwApplicationWindow">
+    <property name="default-width">1280</property>
+    <property name="default-height">720</property>
+    <property name="title">Helvum - Pipewire Patchbay</property>
+    <child>
+      <object class="AdwToolbarView">
+        <child type="top">
+          <object class="AdwHeaderBar" id="header_bar">
+            <child type="end">
+              <object class="GtkMenuButton">
+                <property name="icon-name">open-menu-symbolic</property>
+                <property name="menu-model">primary_menu</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <property name="content">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="AdwBanner" id="connection_banner">
+                <property name="title" translatable="yes">Disconnected</property>
+                <property name="revealed">false</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkOverlay">
+                <child>
+                  <object class="GtkScrolledWindow">
+                    <child>
+                      <object class="HelvumGraphView" id="graph">
+                        <property name="hexpand">true</property>
+                        <property name="vexpand">true</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="overlay">
+                  <object class="HelvumZoomEntry">
+                    <property name="zoomed-widget">graph</property>
+                    <property name="halign">end</property>
+                    <property name="valign">end</property>
+                    <property name="margin-end">24</property>
+                    <property name="margin-bottom">24</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </property>
+      </object>
+    </child>
+  </template>
+</interface>