open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(detect): use c_char alias to fix build on ARM linux. Fix #801

Browse Source
This commit is contained in:
Federico Terzi 2021-10-22 20:02:54 +02:00
parent 4204bcf5ea
commit d9d7966cfc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
espanso-detect/src/evdev/device.rs
View File

@ -6,6 +6,7 @@ use libc::{input_event, size_t, ssize_t, EWOULDBLOCK, O_CLOEXEC, O_NONBLOCK, O_R
use log::trace; use log::trace;
use scopeguard::ScopeGuard; use scopeguard::ScopeGuard;
use std::collections::HashMap; use std::collections::HashMap;
use std::os::raw::c_char;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::{ use std::{
ffi::{c_void, CStr}, ffi::{c_void, CStr},
@ -160,16 +161,16 @@ impl Device {
} }
// Extract the utf8 char // Extract the utf8 char
let mut buffer: [u8; 16] = [0; 16]; let mut buffer: [c_char; 16] = [0; 16];
unsafe { unsafe {
xkb_state_key_get_utf8( xkb_state_key_get_utf8(
self.get_state(), self.get_state(),
keycode, keycode,
buffer.as_mut_ptr() as *mut i8, buffer.as_mut_ptr(),
std::mem::size_of_val(&buffer), std::mem::size_of_val(&buffer),
) )
}; };
let content_raw = unsafe { CStr::from_ptr(buffer.as_ptr() as *mut i8) }; let content_raw = unsafe { CStr::from_ptr(buffer.as_ptr()) };
let content = content_raw.to_string_lossy().to_string(); let content = content_raw.to_string_lossy().to_string();
let event = RawKeyboardEvent { let event = RawKeyboardEvent {