diff --git a/Cargo.lock b/Cargo.lock index 68e7163f1..861009928 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1080,7 +1080,7 @@ dependencies = [ "i18n-embed-fl 0.8.0", "image 0.25.4", "itertools 0.13.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", "memmap2 0.9.5", "once_cell", "rand", @@ -1100,7 +1100,7 @@ dependencies = [ name = "cosmic-app-list-config" version = "0.1.0" dependencies = [ - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", "serde", ] @@ -1112,7 +1112,7 @@ dependencies = [ "cosmic-time", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "once_cell", "rust-embed 8.5.0", "tokio", @@ -1130,7 +1130,7 @@ dependencies = [ "cosmic-time", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "libpulse-binding", "mpris2-zbus", "rust-embed 8.5.0", @@ -1154,7 +1154,7 @@ dependencies = [ "futures", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "once_cell", "rust-embed 8.5.0", "tokio", @@ -1175,7 +1175,7 @@ dependencies = [ "futures", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "once_cell", "rand", "rust-embed 8.5.0", @@ -1192,7 +1192,7 @@ dependencies = [ "cosmic-comp-config", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "libpulse-binding", "once_cell", "rust-embed 8.5.0", @@ -1212,7 +1212,7 @@ dependencies = [ "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", "image 0.25.4", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "memmap2 0.9.5", "once_cell", "rust-embed 8.5.0", @@ -1235,7 +1235,7 @@ dependencies = [ "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", "itertools 0.13.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "rust-embed 8.5.0", "tokio", "tracing", @@ -1255,7 +1255,7 @@ dependencies = [ "cosmic-time", "i18n-embed 0.13.9", "i18n-embed-fl 0.6.7", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "ron", "rust-embed 6.8.1", "rust-embed-utils 7.8.1", @@ -1274,7 +1274,7 @@ version = "0.1.0" dependencies = [ "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "logind-zbus", "once_cell", "rust-embed 8.5.0", @@ -1290,7 +1290,7 @@ name = "cosmic-applet-status-area" version = "0.1.0" dependencies = [ "futures", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "serde", "tokio", "tracing", @@ -1310,7 +1310,7 @@ dependencies = [ "cosmic-time", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "once_cell", "rust-embed 8.5.0", "tokio", @@ -1329,7 +1329,7 @@ dependencies = [ "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", "icu", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "once_cell", "rust-embed 8.5.0", "timedate-zbus", @@ -1350,7 +1350,7 @@ dependencies = [ "futures", "i18n-embed 0.14.1", "i18n-embed-fl 0.8.0", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "once_cell", "rust-embed 8.5.0", "tokio", @@ -1378,7 +1378,7 @@ dependencies = [ "cosmic-applet-time", "cosmic-applet-workspaces", "cosmic-panel-button", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "tracing", "tracing-log", "tracing-subscriber", @@ -1400,22 +1400,44 @@ name = "cosmic-comp-config" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-comp.git?rev=5eb5af4#5eb5af46756f2f2bc5e812cf68fe4c4b79efd924" dependencies = [ - "cosmic-config", + "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)", "input", "serde", ] +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "atomicwrites", + "cosmic-config-derive 0.1.0 (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "cosmic-settings-daemon", + "dirs 5.0.1", + "futures-util", + "iced_futures 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "known-folders", + "notify", + "once_cell", + "ron", + "serde", + "tokio", + "tracing", + "xdg", + "zbus 4.4.0", +] + [[package]] name = "cosmic-config" version = "0.1.0" source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "atomicwrites", - "cosmic-config-derive", + "cosmic-config-derive 0.1.0 (git+https://github.com/pop-os/libcosmic)", "cosmic-settings-daemon", "dirs 5.0.1", "futures-util", - "iced_futures", + "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "known-folders", "notify", "once_cell", @@ -1427,6 +1449,15 @@ dependencies = [ "zbus 4.4.0", ] +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "cosmic-config-derive" version = "0.1.0" @@ -1463,7 +1494,7 @@ name = "cosmic-notifications-config" version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-notifications#980b9621332502af4754c837f54e514282581c2f" dependencies = [ - "cosmic-config", + "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)", "serde", ] @@ -1484,9 +1515,9 @@ dependencies = [ name = "cosmic-panel-button" version = "0.1.0" dependencies = [ - "cosmic-config", + "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)", "freedesktop-desktop-entry 0.7.5", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "once_cell", "serde", "tracing", @@ -1500,7 +1531,7 @@ version = "0.1.0" source = "git+https://github.com/pop-os/cosmic-panel#d114bd9c84ca6dec44fee6297d822ecde41ea403" dependencies = [ "anyhow", - "cosmic-config", + "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)", "ron", "serde", "smithay-client-toolkit", @@ -1538,7 +1569,7 @@ source = "git+https://github.com/pop-os/cosmic-settings-subscriptions#ff9883a029 dependencies = [ "cosmic-dbus-networkmanager", "futures", - "iced_futures", + "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "itertools 0.13.0", "libpulse-binding", "log", @@ -1575,13 +1606,30 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "almost", + "cosmic-config 0.1.0 (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "csscolorparser", + "dirs 5.0.1", + "lazy_static", + "palette", + "ron", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "cosmic-theme" version = "0.1.0" source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "almost", - "cosmic-config", + "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)", "csscolorparser", "dirs 5.0.1", "lazy_static", @@ -1598,7 +1646,7 @@ version = "0.4.0" source = "git+https://github.com/pop-os/cosmic-time#b1816cd260e1517d40f39d5fbdee44cd825ebdde" dependencies = [ "float-cmp", - "libcosmic", + "libcosmic 0.1.0 (git+https://github.com/pop-os/libcosmic)", "once_cell", ] @@ -2995,24 +3043,51 @@ dependencies = [ "cc", ] +[[package]] +name = "iced" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "dnd", + "iced_accessibility 0.1.0 (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_core 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_futures 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_renderer 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_widget 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_winit 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "image 0.24.9", + "mime 0.1.0", + "thiserror", + "window_clipboard", +] + [[package]] name = "iced" version = "0.14.0-dev" source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "dnd", - "iced_accessibility", - "iced_core", - "iced_futures", - "iced_renderer", - "iced_widget", - "iced_winit", + "iced_accessibility 0.1.0 (git+https://github.com/pop-os/libcosmic)", + "iced_core 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_renderer 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_widget 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_winit 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "image 0.24.9", "mime 0.1.0", "thiserror", "window_clipboard", ] +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "accesskit", + "accesskit_winit", +] + [[package]] name = "iced_accessibility" version = "0.1.0" @@ -3022,6 +3097,30 @@ dependencies = [ "accesskit_winit", ] +[[package]] +name = "iced_core" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "dnd", + "glam", + "log", + "mime 0.1.0", + "num-traits", + "once_cell", + "palette", + "raw-window-handle", + "rustc-hash 2.0.0", + "serde", + "smithay-client-toolkit", + "smol_str", + "thiserror", + "web-time", + "window_clipboard", +] + [[package]] name = "iced_core" version = "0.14.0-dev" @@ -3046,13 +3145,27 @@ dependencies = [ "window_clipboard", ] +[[package]] +name = "iced_futures" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "futures", + "iced_core 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "log", + "rustc-hash 2.0.0", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + [[package]] name = "iced_futures" version = "0.14.0-dev" source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "futures", - "iced_core", + "iced_core 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "log", "rustc-hash 2.0.0", "tokio", @@ -3072,6 +3185,28 @@ dependencies = [ "wgpu", ] +[[package]] +name = "iced_graphics" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "cosmic-text", + "half", + "iced_core 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_futures 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "image 0.24.9", + "kamadak-exif", + "log", + "lyon_path", + "once_cell", + "raw-window-handle", + "rustc-hash 2.0.0", + "thiserror", + "unicode-segmentation", +] + [[package]] name = "iced_graphics" version = "0.14.0-dev" @@ -3081,8 +3216,8 @@ dependencies = [ "bytemuck", "cosmic-text", "half", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "image 0.24.9", "kamadak-exif", "log", @@ -3094,18 +3229,45 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "iced_renderer" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "iced_graphics 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_tiny_skia 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_wgpu 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "log", + "thiserror", +] + [[package]] name = "iced_renderer" version = "0.14.0-dev" source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ - "iced_graphics", - "iced_tiny_skia", - "iced_wgpu", + "iced_graphics 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_tiny_skia 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_wgpu 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "log", "thiserror", ] +[[package]] +name = "iced_runtime" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "bytes", + "dnd", + "iced_core 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_futures 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "raw-window-handle", + "smithay-client-toolkit", + "thiserror", + "window_clipboard", +] + [[package]] name = "iced_runtime" version = "0.14.0-dev" @@ -3113,14 +3275,30 @@ source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393f dependencies = [ "bytes", "dnd", - "iced_core", - "iced_futures", + "iced_core 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "raw-window-handle", "smithay-client-toolkit", "thiserror", "window_clipboard", ] +[[package]] +name = "iced_tiny_skia" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "kurbo 0.10.4", + "log", + "resvg", + "rustc-hash 2.0.0", + "softbuffer", + "tiny-skia", +] + [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" @@ -3128,7 +3306,7 @@ source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393f dependencies = [ "bytemuck", "cosmic-text", - "iced_graphics", + "iced_graphics 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "kurbo 0.10.4", "log", "resvg", @@ -3137,6 +3315,37 @@ dependencies = [ "tiny-skia", ] +[[package]] +name = "iced_wgpu" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "as-raw-xcb-connection", + "bitflags 2.6.0", + "bytemuck", + "futures", + "glam", + "guillotiere", + "iced_glyphon", + "iced_graphics 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustc-hash 2.0.0", + "rustix 0.38.38", + "smithay-client-toolkit", + "thiserror", + "tiny-xlib", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-sys", + "wgpu", + "x11rb", +] + [[package]] name = "iced_wgpu" version = "0.14.0-dev" @@ -3149,7 +3358,7 @@ dependencies = [ "glam", "guillotiere", "iced_glyphon", - "iced_graphics", + "iced_graphics 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "log", "lyon", "once_cell", @@ -3168,14 +3377,32 @@ dependencies = [ "x11rb", ] +[[package]] +name = "iced_widget" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "dnd", + "iced_renderer 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_runtime 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "num-traits", + "once_cell", + "ouroboros", + "rustc-hash 2.0.0", + "smithay-client-toolkit", + "thiserror", + "unicode-segmentation", + "window_clipboard", +] + [[package]] name = "iced_widget" version = "0.14.0-dev" source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "dnd", - "iced_renderer", - "iced_runtime", + "iced_renderer 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_runtime 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "num-traits", "once_cell", "ouroboros", @@ -3186,15 +3413,42 @@ dependencies = [ "window_clipboard", ] +[[package]] +name = "iced_winit" +version = "0.14.0-dev" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "dnd", + "iced_futures 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_graphics 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_runtime 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "log", + "raw-window-handle", + "rustc-hash 2.0.0", + "smithay-client-toolkit", + "thiserror", + "tracing", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-protocols", + "web-sys", + "winapi", + "window_clipboard", + "winit", + "xkbcommon", + "xkbcommon-dl", + "xkeysym", +] + [[package]] name = "iced_winit" version = "0.14.0-dev" source = "git+https://github.com/pop-os/libcosmic#4b562867eccb65895953023a19393fa293aafb4b" dependencies = [ "dnd", - "iced_futures", - "iced_graphics", - "iced_runtime", + "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_graphics 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_runtime 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "log", "raw-window-handle", "rustc-hash 2.0.0", @@ -3927,6 +4181,52 @@ version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term#98f6808888050341256d6202cc119bb781640ad4" +dependencies = [ + "apply", + "ashpd 0.9.2", + "chrono", + "cosmic-client-toolkit", + "cosmic-config 0.1.0 (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "cosmic-panel-config", + "cosmic-settings-daemon", + "cosmic-theme 0.1.0 (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "css-color", + "derive_setters", + "fraction", + "freedesktop-desktop-entry 0.5.2", + "freedesktop-icons", + "iced 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_core 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_futures 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_renderer 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_runtime 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_tiny_skia 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_widget 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "iced_winit 0.14.0-dev (git+https://github.com/jpttrssn/libcosmic?branch=launch-app-in-term)", + "lazy_static", + "libc", + "mime 0.3.17", + "palette", + "rfd", + "ron", + "rustix 0.38.38", + "serde", + "shlex", + "slotmap", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", + "ustr", + "zbus 4.4.0", +] + [[package]] name = "libcosmic" version = "0.1.0" @@ -3936,23 +4236,23 @@ dependencies = [ "ashpd 0.9.2", "chrono", "cosmic-client-toolkit", - "cosmic-config", + "cosmic-config 0.1.0 (git+https://github.com/pop-os/libcosmic)", "cosmic-panel-config", "cosmic-settings-daemon", - "cosmic-theme", + "cosmic-theme 0.1.0 (git+https://github.com/pop-os/libcosmic)", "css-color", "derive_setters", "fraction", "freedesktop-desktop-entry 0.5.2", "freedesktop-icons", - "iced", - "iced_core", - "iced_futures", - "iced_renderer", - "iced_runtime", - "iced_tiny_skia", - "iced_widget", - "iced_winit", + "iced 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_core 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_futures 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_renderer 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_runtime 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_tiny_skia 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_widget 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", + "iced_winit 0.14.0-dev (git+https://github.com/pop-os/libcosmic)", "lazy_static", "libc", "mime 0.3.17", diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml index 1b83e5ff5..2e30099f0 100644 --- a/cosmic-app-list/Cargo.toml +++ b/cosmic-app-list/Cargo.toml @@ -14,7 +14,17 @@ i18n-embed.workspace = true i18n-embed-fl.workspace = true image = { version = "0.25.0", default-features = false } itertools = "0.13.0" -libcosmic.workspace = true +# libcosmic.workspace = true +libcosmic = { git = "https://github.com/jpttrssn/libcosmic", branch = "launch-app-in-term", default-features = false, features = [ + "applet", + "applet-token", + "multi-window", + "tokio", + "wayland", + "desktop-systemd-scope", + "winit", + "dbus-config", +] } memmap2 = "0.9.4" once_cell = "1.19" rand = "0.8.5" diff --git a/cosmic-app-list/cosmic-app-list-config/Cargo.toml b/cosmic-app-list/cosmic-app-list-config/Cargo.toml index 8d6753c94..4ad182a39 100644 --- a/cosmic-app-list/cosmic-app-list-config/Cargo.toml +++ b/cosmic-app-list/cosmic-app-list-config/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libcosmic.workspace = true -libcosmic.features = [] +# libcosmic.workspace = true +# libcosmic.features = [] +libcosmic = { git = "https://github.com/jpttrssn/libcosmic", branch = "launch-app-in-term", default-features = false, features = [] } serde = { version = "1.0", features = ["derive"] } diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index ebf95da03..34da602da 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -349,7 +349,7 @@ enum Message { ClosePopup, Activate(ZcosmicToplevelHandleV1), Toggle(ZcosmicToplevelHandleV1), - Exec(String, Option), + Exec(String, Option, bool), Quit(String), NewSeat(WlSeat), RemovedSeat, @@ -1124,6 +1124,7 @@ impl cosmic::Application for CosmicAppList { app_id, exec, gpu_idx, + terminal, } => { let mut envs = Vec::new(); if let Some(token) = token { @@ -1139,7 +1140,13 @@ impl cosmic::Application for CosmicAppList { ); } tokio::spawn(async move { - cosmic::desktop::spawn_desktop_exec(exec, envs, app_id.as_deref()).await + cosmic::desktop::spawn_desktop_exec( + exec, + envs, + app_id.as_deref(), + terminal, + ) + .await }); } } @@ -1150,12 +1157,13 @@ impl cosmic::Application for CosmicAppList { Message::RemovedSeat => { self.seat.take(); } - Message::Exec(exec, gpu_idx) => { + Message::Exec(exec, gpu_idx, terminal) => { if let Some(tx) = self.wayland_sender.as_ref() { let _ = tx.send(WaylandRequest::TokenRequest { app_id: Self::APP_ID.to_string(), exec, gpu_idx, + terminal, }); } } @@ -1671,10 +1679,10 @@ impl cosmic::Application for CosmicAppList { if let Some(exec) = desktop_info.exec() { if !toplevels.is_empty() { - content = content.push( - menu_button(text::body(fl!("new-window"))) - .on_press(Message::Exec(exec.to_string(), None)), - ); + content = + content.push(menu_button(text::body(fl!("new-window"))).on_press( + Message::Exec(exec.to_string(), None, desktop_info.terminal()), + )); } else if let Some(gpus) = self.gpus.as_ref() { let default_idx = if desktop_info.prefers_non_default_gpu() { gpus.iter().position(|gpu| !gpu.default).unwrap_or(0) @@ -1692,14 +1700,17 @@ impl cosmic::Application for CosmicAppList { String::new() } ))) - .on_press(Message::Exec(exec.to_string(), Some(i))), + .on_press(Message::Exec( + exec.to_string(), + Some(i), + desktop_info.terminal(), + )), ); } } else { - content = content.push( - menu_button(text::body(fl!("run"))) - .on_press(Message::Exec(exec.to_string(), None)), - ); + content = content.push(menu_button(text::body(fl!("run"))).on_press( + Message::Exec(exec.to_string(), None, desktop_info.terminal()), + )); } for action in desktop_info.actions().into_iter().flatten() { if action == "new-window" { @@ -1715,8 +1726,11 @@ impl cosmic::Application for CosmicAppList { continue; }; content = content.push( - menu_button(text::body(name)) - .on_press(Message::Exec(exec.into(), None)), + menu_button(text::body(name)).on_press(Message::Exec( + exec.into(), + None, + false, + )), ); } content = content.push(divider::horizontal::light()); @@ -2169,7 +2183,11 @@ fn launch_on_preferred_gpu(desktop_info: &DesktopEntry, gpus: Option<&[Gpu]>) -> } }); - Some(Message::Exec(exec.to_string(), gpu_idx)) + Some(Message::Exec( + exec.to_string(), + gpu_idx, + desktop_info.terminal(), + )) } #[derive(Debug, Default, Clone)] diff --git a/cosmic-app-list/src/wayland_handler.rs b/cosmic-app-list/src/wayland_handler.rs index e943cbba4..b9db6ab23 100644 --- a/cosmic-app-list/src/wayland_handler.rs +++ b/cosmic-app-list/src/wayland_handler.rs @@ -158,6 +158,7 @@ struct ExecRequestData { data: RequestData, exec: String, gpu_idx: Option, + terminal: bool, } impl RequestDataExt for ExecRequestData { @@ -182,6 +183,7 @@ impl ActivationHandler for AppData { app_id: data.app_id().map(|x| x.to_owned()), exec: data.exec.clone(), gpu_idx: data.gpu_idx, + terminal: data.terminal, }); } } @@ -658,6 +660,7 @@ pub(crate) fn wayland_handler( app_id, exec, gpu_idx, + terminal, } => { if let Some(activation_state) = state.activation_state.as_ref() { activation_state.request_token_with_data( @@ -674,6 +677,7 @@ pub(crate) fn wayland_handler( }, exec, gpu_idx, + terminal, }, ); } else { @@ -682,6 +686,7 @@ pub(crate) fn wayland_handler( app_id: Some(app_id), exec, gpu_idx, + terminal, }); } } diff --git a/cosmic-app-list/src/wayland_subscription.rs b/cosmic-app-list/src/wayland_subscription.rs index 10ff5f529..8312ffda3 100644 --- a/cosmic-app-list/src/wayland_subscription.rs +++ b/cosmic-app-list/src/wayland_subscription.rs @@ -119,6 +119,7 @@ pub enum WaylandUpdate { app_id: Option, exec: String, gpu_idx: Option, + terminal: bool, }, Image(ZcosmicToplevelHandleV1, WaylandImage), } @@ -144,6 +145,7 @@ pub enum WaylandRequest { app_id: String, exec: String, gpu_idx: Option, + terminal: bool, }, Screencopy(ZcosmicToplevelHandleV1), }