leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: subsurfaces

Browse source
This commit is contained in:
Ashley Wulber 2025-03-14 11:16:25 -04:00 • committed by Ashley Wulber
parent 0f37c9922d
commit 93bc4bbd88
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
33 changed files with 1898 additions and 2651 deletions
Download patch file Download diff file Expand all files Collapse all files

143
examples/sctk_subsurface/src/main.rs
View file

@ -1,14 +1,24 @@
// Shows a subsurface with a 1x1 px red buffer, stretch to window size
use cctk::sctk::reexports::{
client::{Connection, Proxy},
protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity},
};
use iced::platform_specific::shell::commands::subsurface::get_subsurface;
use iced::{
event::wayland::Event as WaylandEvent,
platform_specific::shell::subsurface_widget::{self, SubsurfaceBuffer},
widget::text,
platform_specific::{
runtime::wayland::subsurface::SctkSubsurfaceSettings,
shell::subsurface_widget::{self, SubsurfaceBuffer},
},
widget::{button, column, text, text_input},
window::{self, Id, Settings},
Element, Length, Subscription, Task,
};
use cctk::sctk::reexports::client::{Connection, Proxy};
use std::sync::{Arc, Mutex};
mod subsurface_container;
mod wayland;
fn main() -> iced::Result {
@ -23,8 +33,11 @@ fn main() -> iced::Result {
#[derive(Debug, Clone, Default)]
struct SubsurfaceApp {
text: Arc<Mutex<String>>,
counter: Arc<Mutex<u32>>,
connection: Option<Connection>,
red_buffer: Option<SubsurfaceBuffer>,
green_buffer: Option<SubsurfaceBuffer>,
}
#[derive(Debug, Clone)]
@ -33,6 +46,8 @@ pub enum Message {
Wayland(wayland::Event),
Pressed(&'static str),
Id(Id),
Inc,
Text(String),
}
impl SubsurfaceApp {
@ -55,47 +70,106 @@ impl SubsurfaceApp {
fn update(&mut self, message: Message) -> Task<Message> {
match message {
Message::WaylandEvent(evt) => match evt {
WaylandEvent::Output(_evt, output) => {
if self.connection.is_none() {
if let Some(backend) = output.backend().upgrade() {
self.connection =
Some(Connection::from_backend(backend));
Message::WaylandEvent(evt) => {
dbg!(&evt);
match evt {
WaylandEvent::Output(_evt, output) => {
if self.connection.is_none() {
if let Some(backend) = output.backend().upgrade() {
self.connection =
Some(Connection::from_backend(backend));
}
}
}
_ => {}
}
_ => {}
},
}
Message::Wayland(evt) => match evt {
wayland::Event::RedBuffer(buffer) => {
self.red_buffer = Some(buffer);
}
wayland::Event::GreenBuffer(buffer) => {
self.green_buffer = Some(buffer);
}
},
Message::Pressed(side) => println!("{side} surface pressed"),
Message::Id(_) => {}
Message::Id(id) => {
let my_text = self.text.clone();
let my_counter = self.counter.clone();
return get_subsurface(SctkSubsurfaceSettings {
id: window::Id::unique(),
parent: id,
loc: iced::Point::new(100., 200.),
size: Some(iced::Size::new(100., 100.)),
z: 1000,
steal_keyboard_focus: false,
gravity: Gravity::BottomRight,
input_zone: None,
offset: (0, 0),
});
}
Message::Inc => {
let mut guard = self.counter.lock().unwrap();
*guard += 1;
}
Message::Text(s) => {
let mut guard = self.text.lock().unwrap();
*guard = s;
}
}
Task::none()
}
fn view(&self, _id: window::Id) -> Element<Message> {
if let Some(buffer) = &self.red_buffer {
iced::widget::row![
iced::widget::button(
subsurface_widget::Subsurface::new(1, 1, buffer)
.width(Length::Fill)
.height(Length::Fill)
)
.width(Length::Fill)
.height(Length::Fill)
.on_press(Message::Pressed("left")),
iced::widget::button(
subsurface_widget::Subsurface::new(1, 1, buffer)
.width(Length::Fill)
.height(Length::Fill)
)
.width(Length::Fill)
.height(Length::Fill)
.on_press(Message::Pressed("right"))
fn view(&self, id: window::Id) -> Element<Message> {
let my_text_guard = self.text.lock().unwrap();
if let Some((red_buffer, green_buffer)) =
self.red_buffer.iter().zip(self.green_buffer.iter()).next()
{
column![
iced::widget::row![
iced::widget::button(
subsurface_container::SubsurfaceContainer::new()
.width(Length::Fill)
.height(Length::Fill)
.push(
subsurface_widget::Subsurface::new(
red_buffer.clone()
)
.width(Length::Fill)
.height(Length::Fill)
.z(0)
)
.push(
subsurface_widget::Subsurface::new(
green_buffer.clone()
)
.width(Length::Fixed(1920.))
.height(Length::Fixed(200.))
.z(1)
)
.push(
subsurface_widget::Subsurface::new(
red_buffer.clone()
)
.width(Length::Fill)
.height(Length::Fixed(100.))
.z(2)
)
)
.width(Length::Fill)
.height(Length::Fill)
.on_press(Message::Pressed("left")),
iced::widget::button(
subsurface_widget::Subsurface::new(red_buffer.clone())
.width(Length::Fill)
.height(Length::Fill)
)
.width(Length::Fill)
.height(Length::Fill)
.on_press(Message::Pressed("right"))
],
text_input("asdf", &my_text_guard).on_input(Message::Text)
]
.into()
} else {
@ -106,10 +180,13 @@ impl SubsurfaceApp {
fn subscription(&self) -> Subscription<Message> {
let mut subscriptions = vec![iced::event::listen_with(|evt, _, _| {
if let iced::Event::PlatformSpecific(
iced::event::PlatformSpecific::Wayland(evt),
iced::event::PlatformSpecific::Wayland(WaylandEvent::Output(
evt,
output,
)),
) = evt
{
Some(Message::WaylandEvent(evt))
Some(Message::WaylandEvent(WaylandEvent::Output(evt, output)))
} else {
None
}