keysyms: Derive from Unicode labels

src/symbol.rs

@@ -2,37 +2,22 @@
 
 use std::ffi::CString;
 
-/// Just defines some int->identifier mappings for convenience
-#[derive(Debug, Clone)]
-pub enum KeySym {
-    Unknown = 0,
-    Shift = 0xffe1,
-}
-
-impl KeySym {
-    pub fn from_u32(num: u32) -> KeySym {
-        match num {
-            0xffe1 => KeySym::Shift,
-            _ => KeySym::Unknown,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct XKeySym(pub u32);
+/// Name of the keysym
+#[derive(Debug, Clone, PartialEq)]
+pub struct KeySym(pub String);
 
 /// Use to switch layouts
 type Level = String;
 
 /// Use to send modified keypresses
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Modifier {
     Control,
     Alt,
 }
 
 /// Action to perform on the keypress and, in reverse, on keyrelease
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Action {
     /// Switch to this view
     SetLevel(Level),
@@ -49,12 +34,12 @@ pub enum Action {
         /// Text to submit with input-method
         text: Option<CString>,
         /// The key events this symbol submits when submitting text is not possible
-        keys: Vec<XKeySym>,
+        keys: Vec<KeySym>,
     },
 }
 
 /// Contains a static description of a particular key's actions
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Symbol {
     /// The action that this key performs
     pub action: Action,