wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-26 08:25:50 +03:00
Code Issues Projects Releases Wiki Activity

window: point to my xcb for for IME changes

Browse Source 
refs: https://github.com/rust-x-bindings/rust-xcb/pull/190
refs: https://github.com/H-M-H/xcb-imdkit-rs/pull/2
This commit is contained in:
Wez Furlong 2022-05-08 13:59:24 -07:00
parent 0a0a1004eb
commit 4b018f564a
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -5160,8 +5160,7 @@ dependencies = [
[[package]]
name = "xcb"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b127bf5bfe9dbb39118d6567e3773d4bbc795411a8e1ef7b7e056bccac0011a9"
source = "git+https://github.com/wez/rust-xcb?branch=ffi#a4d3014de25becb8d68029fe2f71ad906349549e"
dependencies = [
"bitflags",
"libc",
@ -5172,7 +5171,7 @@ dependencies = [
[[package]]
name = "xcb-imdkit"
version = "0.2.0"
source = "git+https://github.com/wez/xcb-imdkit-rs.git?rev=605f9ed36f2c9a514120d1b1b963b48ea3062280#605f9ed36f2c9a514120d1b1b963b48ea3062280"
source = "git+https://github.com/wez/xcb-imdkit-rs.git?rev=ede7c71b85fe2537efef6cf999a45690316211cf#ede7c71b85fe2537efef6cf999a45690316211cf"
dependencies = [
"bitflags",
"cc",

3
Cargo.toml
View File

@ -20,3 +20,6 @@ opt-level = 3
[profile.dev]
# https://jakedeichert.com/blog/reducing-rust-incremental-compilation-times-on-macos-by-70-percent/
split-debuginfo = "unpacked"
[patch.crates-io]
xcb = {version="1.1", git="https://github.com/wez/rust-xcb", branch="ffi"}

2
window/Cargo.toml
View File

@ -76,7 +76,7 @@ smithay-client-toolkit = {version = "0.15", default-features=false, optional=tru
wayland-protocols = {version="0.29", optional=true}
wayland-client = {version="0.29", optional=true}
wayland-egl = {version="0.29", optional=true}
xcb-imdkit = { version="0.2", git="https://github.com/wez/xcb-imdkit-rs.git", rev="605f9ed36f2c9a514120d1b1b963b48ea3062280"}
xcb-imdkit = { version="0.2", git="https://github.com/wez/xcb-imdkit-rs.git", rev="ede7c71b85fe2537efef6cf999a45690316211cf"}
[target.'cfg(target_os="macos")'.dependencies]
cocoa = "0.20"

3
window/src/os/x11/connection.rs
View File

@ -512,8 +512,7 @@ impl XConnection {
.ime
.borrow_mut()
.set_forward_event_cb(move |_win, e| {
if let err @ Err(_) = conn.process_xcb_event(e)
{
if let err @ Err(_) = conn.process_xcb_event(e) {
if let Err(err) = conn.ime_process_event_result.replace(err) {
log::warn!("IME process event error dropped: {}", err);
}