Merge version-stability into master

.gitignore

@@ -1,3 +1,4 @@
+Cargo.lock
 /target/
 /example/target/
 *.bk

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "rustwlc"
 description = "wlc Wayland library bindings for Rust"
-version = "0.2.1"
+version = "0.3.0"
 repository = "https://github.com/Immington-Industries/rust-wlc/"
 keywords = ["wlc", "Wayland", "compositor", "bindings"]
 readme = "README.md"

README.md

@@ -6,15 +6,15 @@
 
 Rust bindings for [wlc](https://github.com/Cloudef/wlc), the Wayland compositor library.
 
-Currently requires a version of wlc from before the `v0.0.1` release.
+Requires [wlc](https:://github.com/Cloudef/wlc) v0.0.1 or later.
 
 ### Rust Example
 
 ```rust
 // For more functional example see example/src/main.rs
 
 extern crate rustwlc;
-use rustwlc::interface::WlcView;
+use rustwlc::callback;
 use rustwlc::types::*;
 
 // Callbacks must be labeled extern as they will be called from C
@@ -29,22 +29,22 @@ extern "C" fn view_focus(view: WlcView, focused: bool) {
 }
 
 fn main() {
-    let interface = WlcInterface::new()
-            .view_created(view_created)
-            .view_focus(view_focus);
+    callback::view_created(view_created)
+    callback::view_focus(view_focus);
 
     // The default log handler will print wlc logs to stdout
     rustwlc::log_set_default_handler();
-    let run_fn = rustwlc::init(interface).expect("Unable to initialize!");
+    let run_fn = rustwlc::init().expect("Unable to initialize!");
     run_fn();
 }
 ```
 
 ### Usage
 We're on [crates.io](https://crates.io/crates/rustwlc), so to use the library simply add:
+
 ```toml
 [depdenencies]
-rustwlc = "0.2.1"
+rustwlc = "^0.3"
 ```
 to your Cargo.toml.
 

example/src/main.rs

@@ -6,7 +6,6 @@ extern crate lazy_static;
 extern crate rustwlc;
 
 use rustwlc::*;
-use rustwlc::interface::*;
 use rustwlc::handle::{WlcView, WlcOutput};
 use rustwlc::types::*;
 use rustwlc::xkb::keysyms;
@@ -286,19 +285,18 @@ extern fn on_pointer_motion(_in_view: WlcView, _time: u32, point: &Point) -> boo
 }
 
 fn main() {
-    let interface = WlcInterface::new()
-        .output_resolution(on_output_resolution)
-        .view_created(on_view_created)
-        .view_destroyed(on_view_destroyed)
-        .view_focus(on_view_focus)
-        .view_request_move(on_view_request_move)
-        .view_request_resize(on_view_request_resize)
-        .keyboard_key(on_keyboard_key)
-        .pointer_button(on_pointer_button)
-        .pointer_motion(on_pointer_motion);
+    callback::output_resolution(on_output_resolution);
+    callback::view_created(on_view_created);
+    callback::view_destroyed(on_view_destroyed);
+    callback::view_focus(on_view_focus);
+    callback::view_request_move(on_view_request_move);
+    callback::view_request_resize(on_view_request_resize);
+    callback::keyboard_key(on_keyboard_key);
+    callback::pointer_button(on_pointer_button);
+    callback::pointer_motion(on_pointer_motion);
 
     rustwlc::log_set_default_handler();
-    let run_fn = rustwlc::init(interface).expect("Unable to initialize!");
+    let run_fn = rustwlc::init2().expect("Unable to initialize wlc!");
     run_fn();
 }