Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update sctk #60

Merged
merged 1 commit into from
Sep 20, 2023
Merged

chore: update sctk #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bitflags = "1.2"
thiserror = "1"
log = "0.4.17"
twox-hash = { version = "1.5", default-features = false }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "c9940f4", optional = true }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "f49df45", optional = true }

[dependencies.palette]
version = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/sctk_drag/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "c9940f4" }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "f49df45" }
iced = { path = "../..", default-features = false, features = ["wayland", "debug", "a11y"] }
iced_style = { path = "../../style" }
env_logger = "0.10"
Expand Down
2 changes: 1 addition & 1 deletion examples/sctk_todos/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ iced = { path = "../..", default-features=false, features = ["async-std", "wayla
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
once_cell = "1.15"
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "c9940f4" }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", rev = "f49df45" }
iced_style = { path = "../../style" }

log = "0.4.17"
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ wayland = ["iced_accessibility?/accesskit_unix", "iced_core/wayland", "sctk"]

[dependencies]
thiserror = "1"
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "c9940f4", optional = true }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "f49df45", optional = true }

[dependencies.iced_core]
version = "0.10"
Expand Down
4 changes: 3 additions & 1 deletion sctk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ a11y = ["iced_accessibility", "iced_runtime/a11y"]
[dependencies]
tracing = "0.1"
thiserror = "1.0"
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "c9940f4" }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "f49df45" }
wayland-protocols = { version = "0.30.0", features = [ "staging"]}
# sctk = { package = "smithay-client-toolkit", path = "../../fork/client-toolkit/" }
raw-window-handle = "0.5"
Expand All @@ -27,6 +27,8 @@ smithay-clipboard = "0.6"
accesskit = { version = "0.8.1", optional = true }
accesskit_unix = { version = "0.1.1", optional = true }
itertools = "0.10"
xkeysym = "0.2.0"
lazy_static = "1.4.0"

[dependencies.iced_runtime]
version = "0.1"
Expand Down
252 changes: 64 additions & 188 deletions sctk/src/conversion.rs
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions sctk/src/handlers/compositor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ impl<T: Debug> CompositorHandler for SctkState<T> {
) {
self.frame_events.push(surface.clone());
}

fn transform_changed(
&mut self,
conn: &Connection,
qh: &QueueHandle<Self>,
surface: &wl_surface::WlSurface,
new_transform: sctk::reexports::client::protocol::wl_output::Transform,
) {
// TODO
// this is not required
}
}

delegate_compositor!(@<T: 'static + Debug> SctkState<T>);
7 changes: 5 additions & 2 deletions sctk/src/handlers/seat/keyboard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ use crate::{
sctk_event::{KeyboardEventVariant, SctkEvent},
};

use sctk::{delegate_keyboard, seat::keyboard::KeyboardHandler};
use sctk::{
delegate_keyboard,
seat::keyboard::{KeyboardHandler, Keysym},
};
use std::fmt::Debug;

impl<T: Debug> KeyboardHandler for SctkState<T> {
Expand All @@ -15,7 +18,7 @@ impl<T: Debug> KeyboardHandler for SctkState<T> {
surface: &sctk::reexports::client::protocol::wl_surface::WlSurface,
_serial: u32,
_raw: &[u32],
_keysyms: &[u32],
_keysyms: &[Keysym],
) {
let (i, mut is_active, seat) = {
let (i, is_active, my_seat) =
Expand Down
28 changes: 15 additions & 13 deletions sctk/src/sctk_event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ impl SctkEvent {
KeyboardEventVariant::Press(ke) => {
let mut skip_char = false;

let mut events: Vec<_> = keysym_to_vkey(ke.keysym)
let mut events: Vec<_> = keysym_to_vkey(ke.keysym.raw())
.map(|k| {
if k == KeyCode::Backspace {
skip_char = true;
Expand Down Expand Up @@ -580,7 +580,7 @@ impl SctkEvent {
KeyboardEventVariant::Repeat(ke) => {
let mut skip_char = false;

let mut events: Vec<_> = keysym_to_vkey(ke.keysym)
let mut events: Vec<_> = keysym_to_vkey(ke.keysym.raw())
.map(|k| {
if k == KeyCode::Backspace {
skip_char = true;
Expand Down Expand Up @@ -609,17 +609,19 @@ impl SctkEvent {
}
events
}
KeyboardEventVariant::Release(k) => keysym_to_vkey(k.keysym)
.map(|k| {
iced_runtime::core::Event::Keyboard(
keyboard::Event::KeyReleased {
key_code: k,
modifiers: modifiers_to_native(*modifiers),
},
)
})
.into_iter()
.collect(),
KeyboardEventVariant::Release(k) => {
keysym_to_vkey(k.keysym.raw())
.map(|k| {
iced_runtime::core::Event::Keyboard(
keyboard::Event::KeyReleased {
key_code: k,
modifiers: modifiers_to_native(*modifiers),
},
)
})
.into_iter()
.collect()
}
KeyboardEventVariant::Modifiers(new_mods) => {
*modifiers = new_mods;
vec![iced_runtime::core::Event::Keyboard(
Expand Down
2 changes: 1 addition & 1 deletion widget/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ wayland = ["sctk"]
[dependencies]
unicode-segmentation = "1.6"
num-traits = "0.2"
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "c9940f4", optional = true }
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "f49df45", optional = true }
thiserror = "1"

[dependencies.iced_runtime]
Expand Down
Loading