From 48e22877731a7759f01b1f293cb0126e2a60fbfb Mon Sep 17 00:00:00 2001
From: daa <andrey.dubravin@gmail.com>
Date: Sun, 2 Apr 2017 22:09:03 +0300
Subject: [PATCH] Solution try for #3

---
 src/input.rs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/input.rs b/src/input.rs
index 1e4fcba..43c9fcd 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -3,11 +3,14 @@ use gdk;
 use gdk::EventKey;
 use phf;
 
+use std::ascii::AsciiExt;
+
 include!(concat!(env!("OUT_DIR"), "/key_map_table.rs"));
 
 
-pub fn keyval_to_input_string(in_str: &str, state: gdk::ModifierType) -> String {
+pub fn keyval_to_input_string(in_str: &str, in_state: gdk::ModifierType) -> String {
     let mut val = in_str;
+    let mut state = in_state;
     let mut input = String::new();
 
     // CTRL-^ and CTRL-@ don't work in the normal way.
@@ -20,11 +23,24 @@ pub fn keyval_to_input_string(in_str: &str, state: gdk::ModifierType) -> String
         }
     }
 
-    if state.contains(gdk::SHIFT_MASK) {
-        if val != "\"" {
-            input.push_str("S-");
+    let chars: Vec<char> = in_str.chars().collect();
+
+    if chars.len() == 1 {
+        let ch = chars[0];
+
+        // Remove SHIFT
+        if ch.is_ascii() && !ch.is_alphanumeric() {
+            state.remove(gdk::SHIFT_MASK);
         }
     }
+
+    if val == "<" {
+        val = "lt";
+    }
+
+    if state.contains(gdk::SHIFT_MASK) {
+        input.push_str("S-");
+    }
     if state.contains(gdk::CONTROL_MASK) {
         input.push_str("C-");
     }