hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update version dependency, fix compilations

Browse Source
This commit is contained in:
daa84 2016-06-23 17:32:30 +03:00
parent 4e0d3e2e5a
commit c7813afe19
4 changed files with 139 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
Cargo.lock generated
View File

@ -2,27 +2,27 @@
name = "neovim-gtk" name = "neovim-gtk"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"cairo-rs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gtk 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "gtk 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"neovim-lib 0.1.0", "neovim-lib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_codegen 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "atk-sys" name = "atk-sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -31,6 +31,11 @@ name = "bitflags"
version = "0.4.0" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "bitflags"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "byteorder" name = "byteorder"
version = "0.3.13" version = "0.3.13"
@ -43,229 +48,248 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "cairo-rs" name = "cairo-rs"
version = "0.0.8" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"c_vec 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", "c_vec 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
"cairo-sys-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "cairo-sys-rs" name = "cairo-sys-rs"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "gdk" name = "gdk"
version = "0.3.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cairo-rs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-pixbuf 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "gio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pango 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pango 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "gdk-pixbuf" name = "gdk-pixbuf"
version = "0.0.1" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"gdk-pixbuf-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "gdk-pixbuf-sys" name = "gdk-pixbuf-sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gio-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "gdk-sys" name = "gdk-sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cairo-sys-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-pixbuf-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gio-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pango-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "gio"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "gio-sys" name = "gio-sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "glib" name = "glib"
version = "0.0.8" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"gio-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "glib-sys" name = "glib-sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "gobject-sys" name = "gobject-sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "gtk" name = "gtk"
version = "0.0.7" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cairo-rs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cairo-sys-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-pixbuf 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "gdk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gtk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pango 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gtk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pango 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "gtk-sys" name = "gtk-sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"atk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "atk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cairo-sys-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-pixbuf-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gio-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pango-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.8" version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "log" name = "log"
version = "0.3.5" version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "neovim-lib" name = "neovim-lib"
version = "0.1.0" version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rmp-serialize 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "rmp-serialize 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "pango" name = "pango"
version = "0.0.7" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"glib 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pango-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "pango-sys" name = "pango-sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "phf" name = "phf"
version = "0.7.14" version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "phf_codegen" name = "phf_codegen"
version = "0.7.14" version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"phf_generator 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "phf_generator 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "phf_generator" name = "phf_generator"
version = "0.7.14" version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"phf_shared 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "phf_shared" name = "phf_shared"
version = "0.7.14" version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -278,7 +302,7 @@ name = "rand"
version = "0.3.14" version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -295,11 +319,11 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "rustc-serialize" name = "rustc-serialize"
version = "0.3.18" version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"

13
Cargo.toml
View File

@ -5,22 +5,19 @@ authors = ["daa84 <daa84@inbox.ru>"]
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
cairo-rs = "0.0.8" cairo-rs = "0.1"
glib = "0.0.8" glib = "0.1"
glib-sys = "0.3" glib-sys = "0.3"
gdk = "0.3" gdk = "0.5"
gdk-sys = "0.3" gdk-sys = "0.3"
#neovim-lib = "0.1" neovim-lib = "^0.1.1"
rmp = "0.7" rmp = "0.7"
phf = "0.7" phf = "0.7"
[build-dependencies] [build-dependencies]
phf_codegen = "0.7" phf_codegen = "0.7"
[dependencies.neovim-lib]
path = "../neovim-lib/"
[dependencies.gtk] [dependencies.gtk]
version = "0.0.7" version = "0.1"
features = ["v3_10"] features = ["v3_10"]

6
src/input.rs
View File

@ -8,13 +8,13 @@ include!(concat!(env!("OUT_DIR"), "/key_map_table.rs"));
pub fn keyval_to_input_string(val: &str, state: gdk::ModifierType) -> String { pub fn keyval_to_input_string(val: &str, state: gdk::ModifierType) -> String {
let mut input = String::from("<"); let mut input = String::from("<");
if state.contains(gdk::enums::modifier_type::ShiftMask) { if state.contains(gdk::SHIFT_MASK) {
input.push_str("S-"); input.push_str("S-");
} }
if state.contains(gdk::enums::modifier_type::ControlMask) { if state.contains(gdk::CONTROL_MASK) {
input.push_str("C-"); input.push_str("C-");
} }
if state.contains(gdk::enums::modifier_type::Mod1Mask) { if state.contains(gdk::MOD1_MASK) {
input.push_str("A-"); input.push_str("A-");
} }
input.push_str(val); input.push_str(val);

4
src/ui.rs
View File

@ -231,7 +231,7 @@ fn gtk_draw(_: &DrawingArea, ctx: &cairo::Context) -> Inhibit {
Inhibit(false) Inhibit(false)
} }
fn gtk_configure_event(_: &DrawingArea, ev: &EventConfigure) -> Inhibit { fn gtk_configure_event(_: &DrawingArea, ev: &EventConfigure) -> bool {
UI.with(|ui_cell| { UI.with(|ui_cell| {
let mut ui = ui_cell.borrow_mut(); let mut ui = ui_cell.borrow_mut();
let (width, height) = ev.get_size(); let (width, height) = ev.get_size();
@ -260,7 +260,7 @@ fn gtk_configure_event(_: &DrawingArea, ev: &EventConfigure) -> Inhibit {
} }
} }
}); });
Inhibit(false) false
} }
fn draw(ui: &Ui, ctx: &cairo::Context) { fn draw(ui: &Ui, ctx: &cairo::Context) {