From 243df1cb72e9d8e0fc80e369aa3f2afb9b51b8df Mon Sep 17 00:00:00 2001 From: daa Date: Sun, 21 May 2017 15:47:29 +0300 Subject: [PATCH] Migrate to new libs versions --- Cargo.lock | 87 ++++++++++++++++++++++++------------------------ Cargo.toml | 6 ++-- src/shell.rs | 10 +++--- src/shell_dlg.rs | 2 +- 4 files changed, 53 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a7f7c9d..64aa4fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,13 +13,13 @@ dependencies = [ "gtk-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "neovim-lib 0.3.1 (git+https://github.com/daa84/neovim-lib)", + "neovim-lib 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "pangocairo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pangocairo 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -39,7 +39,7 @@ dependencies = [ "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -71,7 +71,7 @@ dependencies = [ "c_vec 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-sys-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -80,7 +80,7 @@ name = "cairo-sys-rs" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -113,7 +113,7 @@ dependencies = [ "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -124,7 +124,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdk-pixbuf-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -136,7 +136,7 @@ dependencies = [ "gio-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -151,7 +151,7 @@ dependencies = [ "gio-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pango-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -166,7 +166,7 @@ dependencies = [ "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -177,7 +177,7 @@ dependencies = [ "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -190,7 +190,7 @@ dependencies = [ "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -199,7 +199,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -210,7 +210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -232,7 +232,7 @@ dependencies = [ "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gtk-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -249,7 +249,7 @@ dependencies = [ "gio-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pango-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -275,7 +275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.22" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -288,13 +288,13 @@ name = "memchr" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "neovim-lib" -version = "0.3.1" -source = "git+https://github.com/daa84/neovim-lib#043a9eb2b8054d38e0f99872a670b82e79ac2b1f" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "rmp 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -314,7 +314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pango-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -326,29 +326,30 @@ dependencies = [ "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pangocairo" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cairo-rs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "pangocairo-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pango-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "pangocairo-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pangocairo-sys" -version = "0.1.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cairo-sys-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "pango-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -402,7 +403,7 @@ name = "rand" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -442,12 +443,12 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -489,11 +490,11 @@ dependencies = [ [[package]] name = "thread-id" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -501,7 +502,7 @@ name = "thread_local" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "thread-id 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -510,7 +511,7 @@ name = "toml" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -524,7 +525,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -580,15 +581,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf" -"checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" +"checksum libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "684f330624d8c3784fb9558ca46c4ce488073a8d22450415c5eb4f4cfb0d11b5" "checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad" "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4" -"checksum neovim-lib 0.3.1 (git+https://github.com/daa84/neovim-lib)" = "" +"checksum neovim-lib 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa0477861ec64754cbc089f8a65db8092dc53c68e397315bf342d7781140be1b" "checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99" "checksum pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4215233226ff03c9a3ed7c85cbc3c58257203723e3a93d5a20ce3560f66261b7" "checksum pango-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e401ee469540e60a80d1df63dcea4e9c201115e79344b77529fa3705ea8eadcd" -"checksum pangocairo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a531063948de21fef4d2d265a2a1d97abf41b19dd17273d8575a602f08c23d7" -"checksum pangocairo-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9905562b9ba6ebbd5a9de1c86e449a433f0bfa9dd466c3f412aa0701698b80" +"checksum pangocairo 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1994752fcd20dbefd084a3c231bbcd79ebe67ca2e7f9cd11db0243b64f155c35" +"checksum pangocairo-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02eeea9019eeb6ea32c170664247cac130d871f28902376de3c8b30f001b9e7b" "checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc" "checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f" "checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03" @@ -600,13 +601,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457" "checksum rmp 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ce560a5728f4eec697f07f8d7fa20608893d44b4f5b8f9f5f51a2987f3cffe2" "checksum rmpv 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "45368daa6c60116376d8813ec6a2556df640229709becb8f80df1651f882e7af" -"checksum serde 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "991ef6be409a3b7a46cb9ee701d86156ce851825c65dbee7f16dbd5c4e7e2d47" -"checksum serde_derive 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd81eef9f0b4ec341b11095335b6a4b28ed85581b12dd27585dee1529df35e0" +"checksum serde 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c0c3d79316a6051231925504f6ef893d45088e8823c77a8331a3dcf427ee9087" +"checksum serde_derive 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0019cd5b9f0529a1a0e145a912e9a2d60c325c58f7f260fc36c71976e9d76aee" "checksum serde_derive_internals 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "021c338d22c7e30f957a6ab7e388cb6098499dda9fd4ba1661ee074ca7a180d1" "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -"checksum thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4437c97558c70d129e40629a5b385b3fb1ffac301e63941335e4d354081ec14a" +"checksum thread-id 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8df7875b676fddfadffd96deea3b1124e5ede707d4884248931077518cf1f773" "checksum thread_local 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c85048c6260d17cf486ceae3282d9fb6b90be220bf5b28c400f5485ffc29f0c7" "checksum toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4cc5dbfb20a481e64b99eb7ae280859ec76730c7191570ba5edaa962394edb0a" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" diff --git a/Cargo.toml b/Cargo.toml index ae79731..21b9c8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ glib = "0.1" glib-sys = "0.3" gdk = "0.5" gdk-sys = "0.3" -#neovim-lib = "0.3" +neovim-lib = "0.4" phf = "0.7" gio = "0.1" log = "0.3" @@ -23,8 +23,8 @@ serde = "1.0" serde_derive = "1.0" toml = "0.4" -[dependencies.neovim-lib] -git = "https://github.com/daa84/neovim-lib" +#[dependencies.neovim-lib] +#git = "https://github.com/daa84/neovim-lib" [build-dependencies] phf_codegen = "0.7" diff --git a/src/shell.rs b/src/shell.rs index f77facd..31c061b 100644 --- a/src/shell.rs +++ b/src/shell.rs @@ -4,7 +4,7 @@ use std::sync; use std::sync::Arc; use cairo; -use pangocairo as pc; +use pangocairo::CairoContextExt; use pango; use pango::FontDescription; use gdk::{ModifierType, EventConfigure, EventButton, EventMotion, EventType, EventScroll}; @@ -480,7 +480,7 @@ fn draw_backgound(state: &State, } fn draw(state: &State, ctx: &cairo::Context) { - let layout = pc::create_layout(ctx); + let layout = ctx.create_pango_layout(); let mut desc = state.create_pango_font(); let mut buf = String::with_capacity(4); @@ -553,8 +553,8 @@ fn draw(state: &State, ctx: &cairo::Context) { } ctx.set_source_rgb(fg.0, fg.1, fg.2); - pc::update_layout(ctx, &layout); - pc::show_layout(ctx, &layout); + ctx.update_pango_layout(&layout); + ctx.show_pango_layout(&layout); } if cell.attrs.underline || cell.attrs.undercurl { @@ -609,7 +609,7 @@ fn update_font_description(desc: &mut FontDescription, attrs: &Attrs) { } fn calc_char_bounds(shell: &State, ctx: &cairo::Context) -> (i32, i32) { - let layout = pc::create_layout(ctx); + let layout = ctx.create_pango_layout(); let desc = shell.create_pango_font(); layout.set_font_description(Some(&desc)); diff --git a/src/shell_dlg.rs b/src/shell_dlg.rs index e124619..0d122ee 100644 --- a/src/shell_dlg.rs +++ b/src/shell_dlg.rs @@ -74,7 +74,7 @@ fn show_not_saved_dlg(comps: &UiMutex, fn get_changed_buffers(shell: &Shell) -> Result, CallError> { let state = shell.state.borrow(); let mut nvim = state.nvim(); - let buffers = nvim.get_buffers().unwrap(); + let buffers = nvim.list_bufs().unwrap(); Ok(buffers .iter()