Merge pull request #346 from danigm/keyval-functions

Nicer bindings for Key(val) related functions

.travis.yml

@@ -21,6 +21,7 @@ addons:
     packages:
     - libgtk-3-dev
     - libmount-dev
+    - xvfb
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
@@ -34,7 +35,8 @@ script:
       make regen_check;
     fi
   - cargo doc --features "dox,embed-lgpl-docs"
-  - cargo test --features "$FEATURES,embed-lgpl-docs"
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then xvfb-run cargo test --features "$FEATURES,embed-lgpl-docs"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cargo test --features "$FEATURES,embed-lgpl-docs"; fi
   # catch any sneaked in lgpl docs
   - cargo build --features "$FEATURES,purge-lgpl-docs" --jobs 1
   - git diff -R --exit-code

appveyor.yml

@@ -17,8 +17,8 @@ install:
 
 build_script:
   - cargo doc --features "dox"
-  - cargo test
-  - cargo test --features v3_24
+  - IF "%BITS%" == "64" cargo test
+  - IF "%BITS%" == "64" cargo test --features v3_24
   - cargo doc --features "dox"
   - mkdir .cargo
   - echo paths = ["."] > .cargo\config

src/event_key.rs

@@ -20,8 +20,8 @@ impl EventKey {
         from_glib(self.as_ref().state)
     }
 
-    pub fn get_keyval(&self) -> ::enums::key::Key {
-        self.as_ref().keyval as ::enums::key::Key
+    pub fn get_keyval(&self) -> ::keys::Key {
+        from_glib(self.as_ref().keyval)
     }
 
     pub fn get_length(&self) -> u32 {

src/lib.rs

@@ -35,8 +35,6 @@ pub mod prelude;
 pub use self::auto::functions::*;
 pub use auto::*;
 
-pub mod enums;
-
 mod atom;
 mod cairo_interaction;
 mod change_data;
@@ -77,7 +75,7 @@ mod functions;
 mod geometry;
 mod keymap;
 mod keymap_key;
-mod keys;
+pub mod keys;
 mod rectangle;
 mod rgba;
 mod screen;

tests/check_event.rs

@@ -0,0 +1,22 @@
+extern crate gdk;
+extern crate gdk_sys;
+
+#[test]
+fn check_event() {
+    gdk::init();
+    let base_ev = gdk::Event::new(gdk::EventType::KeyPress);
+    let mut ev: gdk::EventKey = base_ev.downcast().unwrap();
+    ev.as_mut().keyval = *gdk::keys::constants::A;
+
+    let keyval = gdk::keyval_to_unicode(*ev.get_keyval());
+    let keyval2 = ev.get_keyval().to_unicode();
+
+    assert_eq!(keyval, Some('A'));
+    assert_eq!(keyval, keyval2);
+
+    let name = gdk::keyval_name(*ev.get_keyval());
+    let name2 = ev.get_keyval().name();
+
+    assert_eq!(name, Some("A".into()));
+    assert_eq!(name, name2);
+}