demo: Added USB portal support

- Added UI for USB - Added rusb to the crates. - Added libusb to the manifest. Signed-off-by: Hubert Figuière <[email protected]>
bilelmoussaoui · Dec 7, 2024 · 85d3611 · 85d3611
1 parent 28fef92
commit 85d3611
Show file tree

Hide file tree

Showing 10 changed files with 530 additions and 1 deletion.
diff --git a/ashpd-demo/Cargo.lock b/ashpd-demo/Cargo.lock
diff --git a/ashpd-demo/Cargo.toml b/ashpd-demo/Cargo.toml
@@ -14,6 +14,7 @@ gettext-rs = {version = "0.7", features = ["gettext-system"]}
 gst = {package = "gstreamer", version = "0.23"}
 gst4gtk = {package = "gst-plugin-gtk4", version = "0.13", features = ["wayland", "x11egl", "x11glx", "gtk_v4_14"]}
 gtk = {package = "gtk4", version = "0.9", features = ["v4_14"]}
+rusb = "0.9.4"
 serde = {version = "1.0", features = ["derive"]}
 shumate = {version = "0.6", package = "libshumate"}
 tracing = "0.1"

diff --git a/ashpd-demo/build-aux/com.belmoussaoui.ashpd.demo.Devel.json b/ashpd-demo/build-aux/com.belmoussaoui.ashpd.demo.Devel.json
@@ -14,6 +14,7 @@
         "--socket=wayland",
         "--device=dri",
         "--own-name=com.belmoussaoui.ashpd.demo",
+        "--usb=all",
         "--env=RUST_LOG=ashpd_demo=debug,ashpd=debug",
         "--env=G_MESSAGES_DEBUG=none",
         "--env=RUST_BACKTRACE=1"
@@ -31,6 +32,16 @@
         ]
     },
     "modules": [
+        {
+            "name": "libusb",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2",
+                    "sha256": "ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575"
+                }
+            ]
+        },
         {
             "name": "libshumate",
             "buildsystem": "meson",

diff --git a/ashpd-demo/data/resources.gresource.xml b/ashpd-demo/data/resources.gresource.xml
@@ -26,6 +26,8 @@
         <file compressed="true" preprocess="xml-stripblanks" alias="screenshot.ui">resources/ui/screenshot.ui</file>
         <file compressed="true" preprocess="xml-stripblanks" alias="screencast.ui">resources/ui/screencast.ui</file>
         <file compressed="true" preprocess="xml-stripblanks" alias="secret.ui">resources/ui/secret.ui</file>
+        <file compressed="true" preprocess="xml-stripblanks" alias="usb.ui">resources/ui/usb.ui</file>
+        <file compressed="true" preprocess="xml-stripblanks" alias="usb_device_row.ui">resources/ui/usb_device_row.ui</file>
         <file compressed="true" preprocess="xml-stripblanks" alias="wallpaper.ui">resources/ui/wallpaper.ui</file>
 
         <file compressed="true" alias="style.css">resources/style.css</file>

diff --git a/ashpd-demo/data/resources/ui/usb.ui b/ashpd-demo/data/resources/ui/usb.ui
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="UsbPage" parent="PortalPage">
+    <child>
+      <object class="AdwClamp">
+        <child>
+          <object class="GtkBox">
+            <property name="hexpand">True</property>
+            <property name="spacing">12</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="AdwPreferencesGroup" id="usb_devices">
+                <property name="title" translatable="yes">Device Access</property>
+                <property name="description" translatable="yes">Calls AcquireDevices or ReleaseDevices on org.freedesktop.portal.Usb.</property>
+                <property name="header-suffix">
+                  <object class="GtkButton">
+                    <property name="label" translatable="yes">Refresh</property>
+                    <property name="icon-name">view-refresh-symbolic</property>
+                    <property name="action-name">usb.refresh</property>
+                  </object>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="orientation">horizontal</property>
+                <child>
+                  <object class="GtkButton">
+                    <property name="label">_Start Session</property>
+                    <property name="use-underline">True</property>
+                    <property name="halign">start</property>
+                    <property name="action-name">usb.start_session</property>
+                    <style>
+                      <class name="pill" />
+                      <class name="suggested-action" />
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="label">_Stop Session</property>
+                    <property name="use-underline">True</property>
+                    <property name="sensitive">false</property>
+                    <property name="halign">end</property>
+                    <property name="hexpand">true</property>
+                    <property name="action-name">usb.stop_session</property>
+                    <style>
+                      <class name="pill" />
+                      <class name="destructive-action" />
+                    </style>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <style>
+          <class name="page-content" />
+        </style>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/ashpd-demo/data/resources/ui/usb_device_row.ui b/ashpd-demo/data/resources/ui/usb_device_row.ui
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="UsbDeviceRow" parent="AdwActionRow">
+    <child type="prefix">
+      <object class="GtkCheckButton" id="checkbox">
+        <property name="sensitive">false</property>
+      </object>
+    </child>
+    <child type="suffix">
+      <object class="GtkBox" id="box1">
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
+        <style>
+          <class name="linked" />
+        </style>
+        <child>
+          <object class="GtkButton" id="acquire">
+            <signal name="clicked" handler="handle_acquire_clicked" swapped="true" />
+            <property name="icon-name">preferences-system-sharing-symbolic</property>
+          </object>
+        </child>
+        <child type="suffix">
+          <object class="GtkButton" id="release">
+            <signal name="clicked" handler="handle_release_clicked" swapped="true"/>
+            <property name="icon-name">process-stop-symbolic</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>
diff --git a/ashpd-demo/data/resources/ui/window.ui b/ashpd-demo/data/resources/ui/window.ui
@@ -155,6 +155,12 @@
                             <property name="page-name">secret</property>
                           </object>
                         </child>
+                        <child>
+                          <object class="SidebarRow">
+                            <property name="title" translatable="yes">USB</property>
+                            <property name="page-name">usb</property>
+                          </object>
+                        </child>
                         <child>
                           <object class="SidebarRow">
                             <property name="title" translatable="yes">Wallpaper</property>
@@ -325,6 +331,14 @@
                             </property>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkStackPage">
+                            <property name="name">usb</property>
+                            <property name="child">
+                              <object class="UsbPage" id="usb" />
+                            </property>
+                          </object>
+                        </child>
                         <child>
                           <object class="GtkStackPage">
                             <property name="name">wallpaper</property>

diff --git a/ashpd-demo/src/portals/desktop/mod.rs b/ashpd-demo/src/portals/desktop/mod.rs
@@ -16,6 +16,7 @@ mod remote_desktop;
 mod screencast;
 mod screenshot;
 mod secret;
+mod usb;
 mod wallpaper;
 
 pub use account::AccountPage;
@@ -36,4 +37,5 @@ pub use remote_desktop::RemoteDesktopPage;
 pub use screencast::ScreenCastPage;
 pub use screenshot::ScreenshotPage;
 pub use secret::SecretPage;
+pub use usb::UsbPage;
 pub use wallpaper::WallpaperPage;