Drop squeek_key

src/keyboard.h

@@ -1,12 +0,0 @@
-#ifndef __KEYBOARD_H
-#define __KEYBOARD_H
-
-#include "inttypes.h"
-#include "stdbool.h"
-#include "virtual-keyboard-unstable-v1-client-protocol.h"
-
-struct squeek_key;
-
-uint32_t squeek_key_is_pressed(struct squeek_key *key);
-uint32_t squeek_key_is_locked(struct squeek_key *key);
-#endif

src/keyboard.rs

@@ -10,30 +10,6 @@ use ::action::Action;
 
 use std::io::Write;
 use std::iter::{ FromIterator, IntoIterator };
-use ::util::CloneOwned;
-
-/// Gathers stuff defined in C or called by C
-pub mod c {
-    use super::*;
-    use ::util::c;
-
-    pub type CKeyState = c::Wrapped<KeyState>;
-
-    // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
-
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_key_is_pressed(key: CKeyState) -> u32 {
-        //let key = unsafe { Rc::from_raw(key.0) };
-        return key.clone_owned().pressed as u32;
-    }
-
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_key_is_locked(key: CKeyState) -> u32 {
-        return key.clone_owned().locked as u32;
-    }
-}
 
 #[derive(Debug, Clone, Copy)]
 pub enum PressType {

src/layout.h

@@ -6,7 +6,6 @@
 #include "eek/eek-element.h"
 #include "eek/eek-gtk-keyboard.h"
 #include "eek/eek-types.h"
-#include "src/keyboard.h"
 #include "virtual-keyboard-unstable-v1-client-protocol.h"
 
 enum squeek_arrangement_kind {
@@ -40,9 +39,6 @@ const char *squeek_button_get_icon_name(const struct squeek_button*);
 const char *squeek_button_get_name(const struct squeek_button*);
 const char *squeek_button_get_outline_name(const struct squeek_button*);
 
-struct squeek_key *squeek_button_get_key(const struct squeek_button*);
-uint32_t *squeek_button_has_key(const struct squeek_button* button,
-                                const struct squeek_key *key);
 void squeek_button_print(const struct squeek_button* button);
 
 

src/layout.rs

@@ -129,16 +129,6 @@ pub mod c {
         button.bounds.clone()
     }
 
-    /// Borrow a new reference to key state. Doesn't need freeing
-    #[no_mangle]
-    pub extern "C"
-    fn squeek_button_get_key(
-        button: *const ::layout::Button
-    ) -> ::keyboard::c::CKeyState {
-        let button = unsafe { &*button };
-        ::keyboard::c::CKeyState::wrap(button.state.clone())
-    }
-
     #[no_mangle]
     pub extern "C"
     fn squeek_button_get_label(