From 640fac5bf5d8ec88f7d94b1e79cb27211d1c2896 Mon Sep 17 00:00:00 2001
From: Federico Terzi <federicoterzi96@gmail.com>
Date: Fri, 11 Oct 2019 21:40:46 +0200
Subject: [PATCH] Add unicode match support on MacOS

---
 src/context/macos.rs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/context/macos.rs b/src/context/macos.rs
index c419618..1f46a50 100644
--- a/src/context/macos.rs
+++ b/src/context/macos.rs
@@ -18,11 +18,11 @@
  */
 
 use std::sync::mpsc::Sender;
-use std::os::raw::c_void;
+use std::os::raw::{c_void, c_char};
 use crate::bridge::macos::*;
 use crate::event::{Event, KeyEvent, KeyModifier, ActionType};
 use crate::event::KeyModifier::*;
-use std::ffi::CString;
+use std::ffi::{CString, CStr};
 use std::fs;
 use log::{info, error};
 use std::process::exit;
@@ -94,14 +94,19 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, len: i32,
         let _self = _self as *mut MacContext;
 
         if is_modifier == 0 {  // Char event
-            // Convert the received buffer to a character
-            let buffer = std::slice::from_raw_parts(raw_buffer, len as usize);
-            let r = String::from_utf8_lossy(buffer).chars().nth(0);
+            // Convert the received buffer to a string
+            let c_str = CStr::from_ptr(raw_buffer as (*const c_char));
+            let char_str = c_str.to_str();
 
             // Send the char through the channel
-            if let Some(c) = r {
-                let event = Event::Key(KeyEvent::Char(c));
-                (*_self).send_channel.send(event).unwrap();
+            match char_str {
+                Ok(char_str) => {
+                    let event = Event::Key(KeyEvent::Char(char_str.to_owned()));
+                    (*_self).send_channel.send(event).unwrap();
+                },
+                Err(e) => {
+                    error!("Unable to receive char: {}",e);
+                },
             }
         }else{  // Modifier event
             let modifier: Option<KeyModifier> = match key_code {