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.

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

feat: support ext-virtual-keyboard #6

Merged
merged 4 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions iced_examples/counter_virtual_keyboard/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[package]
name = "counter_virtual_keyboard"
authors.workspace = true
edition.workspace = true
version.workspace = true
license.workspace = true
repository.workspace = true
description.workspace = true
keywords.workspace = true
readme.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
iced.workspace = true
iced_runtime.workspace = true
iced_layershell.workspace = true
xkbcommon = "0.6.0"
tempfile.workspace = true
202 changes: 202 additions & 0 deletions iced_examples/counter_virtual_keyboard/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
use std::ffi::CString;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;

use iced::widget::{button, column, row, text, text_input};
use iced::{Alignment, Command, Element, Length, Theme};
use iced_layershell::actions::LayershellCustomActions;
use iced_layershell::reexport::{Anchor, KeyboardInteractivity};
use iced_layershell::settings::{LayerShellSettings, Settings, VirtualKeyboardSettings};
use iced_layershell::Application;

use iced_layershell::reexport::wl_keyboard::KeymapFormat;
use xkbcommon::xkb;

pub fn get_keymap_as_file() -> (File, u32) {
let context = xkb::Context::new(xkb::CONTEXT_NO_FLAGS);

let keymap = xkb::Keymap::new_from_names(
&context,
"",
"",
"us", // if no , it is norwegian
"",
None,
xkb::KEYMAP_COMPILE_NO_FLAGS,
)
.expect("xkbcommon keymap panicked!");
let xkb_state = xkb::State::new(&keymap);
let keymap = xkb_state
.get_keymap()
.get_as_string(xkb::KEYMAP_FORMAT_TEXT_V1);
let keymap = CString::new(keymap).expect("Keymap should not contain interior nul bytes");
let keymap = keymap.as_bytes_with_nul();
let dir = std::env::var_os("XDG_RUNTIME_DIR")
.map(PathBuf::from)
.unwrap_or_else(std::env::temp_dir);
let mut file = tempfile::tempfile_in(dir).expect("File could not be created!");
file.write_all(keymap).unwrap();
file.flush().unwrap();
(file, keymap.len() as u32)
}

pub fn main() -> Result<(), iced_layershell::Error> {
let (file, keymap_size) = get_keymap_as_file();
Counter::run(Settings {
layer_settings: LayerShellSettings {
size: Some((0, 400)),
exclusize_zone: 400,
anchor: Anchor::Bottom | Anchor::Left | Anchor::Right,
keyboard_interactivity: KeyboardInteractivity::None,
..Default::default()
},
virtual_keyboard_support: Some(VirtualKeyboardSettings {
file,
keymap_size,
keymap_format: KeymapFormat::XkbV1,
}),
..Default::default()
})
}

struct Counter {
value: i32,
text: String,
}

#[derive(Debug, Clone, Copy)]
enum WindowDirection {
Top,
Left,
Right,
Bottom,
}

#[derive(Debug, Clone)]
enum Message {
IncrementPressed,
DecrementPressed,
TextInput(String),
Direction(WindowDirection),
InputTest,
}

impl Application for Counter {
type Message = Message;
type Flags = ();
type Theme = Theme;
type Executor = iced::executor::Default;

fn new(_flags: ()) -> (Self, Command<Message>) {
(
Self {
value: 0,
text: "eee".to_string(),
},
Command::none(),
)
}

fn namespace(&self) -> String {
String::from("Counter - Iced")
}

fn update(&mut self, message: Message) -> Command<Message> {
match message {
Message::IncrementPressed => {
self.value += 1;
Command::none()
}
Message::DecrementPressed => {
self.value -= 1;
Command::none()
}
Message::TextInput(text) => {
self.text = text;
Command::none()
}
Message::InputTest => Command::single(
LayershellCustomActions::VirtualKeyboardPressed { time: 100, key: 16 }.into(),
),
Message::Direction(direction) => match direction {
WindowDirection::Left => Command::batch(vec![
Command::single(
LayershellCustomActions::AnchorChange(
Anchor::Left | Anchor::Top | Anchor::Bottom,
)
.into(),
),
Command::single(LayershellCustomActions::SizeChange((400, 0)).into()),
]),
WindowDirection::Right => Command::batch(vec![
Command::single(
LayershellCustomActions::AnchorChange(
Anchor::Right | Anchor::Top | Anchor::Bottom,
)
.into(),
),
Command::single(LayershellCustomActions::SizeChange((400, 0)).into()),
]),
WindowDirection::Bottom => Command::batch(vec![
Command::single(
LayershellCustomActions::AnchorChange(
Anchor::Bottom | Anchor::Left | Anchor::Right,
)
.into(),
),
Command::single(LayershellCustomActions::SizeChange((0, 400)).into()),
]),
WindowDirection::Top => Command::batch(vec![
Command::single(
LayershellCustomActions::AnchorChange(
Anchor::Top | Anchor::Left | Anchor::Right,
)
.into(),
),
Command::single(LayershellCustomActions::SizeChange((0, 400)).into()),
]),
},
}
}

fn view(&self) -> Element<Message> {
let center = column![
button("Increment").on_press(Message::IncrementPressed),
text(self.value).size(50),
button("test_q").on_press(Message::InputTest),
button("Decrement").on_press(Message::DecrementPressed)
]
.padding(20)
.align_items(Alignment::Center)
.width(Length::Fill)
.height(Length::Fill);
row![
button("left")
.on_press(Message::Direction(WindowDirection::Left))
.height(Length::Fill),
column![
button("top")
.on_press(Message::Direction(WindowDirection::Top))
.width(Length::Fill),
center,
text_input("hello", &self.text)
.on_input(Message::TextInput)
.padding(10),
button("bottom")
.on_press(Message::Direction(WindowDirection::Bottom))
.width(Length::Fill),
]
.width(Length::Fill),
button("right")
.on_press(Message::Direction(WindowDirection::Right))
.height(Length::Fill),
]
.padding(20)
.spacing(10)
.align_items(Alignment::Center)
.width(Length::Fill)
.height(Length::Fill)
.into()
}
}
1 change: 1 addition & 0 deletions iced_layershell/src/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pub enum LayershellCustomActions {
AnchorChange(Anchor),
LayerChange(Layer),
SizeChange((u32, u32)),
VirtualKeyboardPressed { time: u32, key: u32 },
}

#[derive(Debug, Clone, Copy)]
Expand Down
Loading