me/unfettered-keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: use Rust 2018 import paths

Browse source 
Rust 2018 is required for D-Bus support with tokio/zbus.
This commit is contained in:
Richard Acayan 2024-07-24 22:21:30 -04:00
parent f282a741dd
commit 78f389beaa
13 changed files with 119 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/button.rs
View file

@ -3,12 +3,11 @@
* Copyright (c) 2024, Richard Acayan. All rights reserved.
*/
use core::Display;
use core::Graphics;
use core::Layout;
use core::layout::Key;
use core::layout::MODIFIERS_MAX;
use core::xkeysym::Keysym;
use crate::core::Display;
use crate::core::Graphics;
use crate::core::Layout;
use crate::core::layout::Key;
use crate::core::layout::MODIFIERS_MAX;
use std::collections::VecDeque;
use std::convert::TryInto;
use std::iter;
@ -17,6 +16,7 @@ use std::sync::Arc;
use std::sync::Mutex;
use std::time::Duration;
use std::time::Instant;
use xkeysym::Keysym;
/*
* The available states for the modifier keys.

23
src/core/graphics.rs
View file

@ -3,23 +3,22 @@
* Copyright (c) 2024, Richard Acayan. All rights reserved.
*/
use core::button::ModState;
use core::fontconfig;
use core::freetype::freetype;
use core::imgref::ImgRefMut;
use core::imgref::ImgRef;
use core::imgref::ImgVec;
use core::Layout;
use core::layout::Key;
use core::layout::Part;
use core::rgb::alt::BGR;
use core::rgb::alt::BGRA;
use core::xkeysym::Keysym;
use crate::core::Layout;
use crate::core::button::ModState;
use crate::core::layout::Key;
use crate::core::layout::Part;
use freetype::freetype;
use imgref::ImgRef;
use imgref::ImgRefMut;
use imgref::ImgVec;
use rgb::alt::BGR;
use rgb::alt::BGRA;
use std::collections::HashMap;
use std::fs::File;
use std::io::Read;
use std::iter;
use std::ptr;
use xkeysym::Keysym;
fn convert_gray_to_bgrx(mut dest: ImgRefMut<BGRA<u8>>, src: ImgRef<u8>, fg_color: BGR<f32>)
{

6
src/core/layout.rs
View file

@ -3,9 +3,8 @@
* Copyright (c) 2024, Richard Acayan. All rights reserved.
*/
use core::button::ModState;
use core::expat;
use core::xkeysym::Keysym;
use crate::core::button::ModState;
use crate::core::expat;
use std::cmp::Ordering;
use std::collections::HashMap;
use std::str::FromStr;
@ -18,6 +17,7 @@ use std::os::raw::c_char;
use std::os::raw::c_void;
use std::path::Path;
use std::ptr;
use xkeysym::Keysym;
unsafe extern "C" fn start_elem(data: *mut c_void,
c_name: *const expat::XML_Char,

6
src/core/mod.rs
View file

@ -3,12 +3,6 @@
* Copyright (c) 2024, Richard Acayan. All rights reserved.
*/
pub extern crate fontconfig;
pub extern crate freetype;
pub extern crate imgref;
pub extern crate rgb;
pub extern crate xkeysym;
mod button;
mod expat;
mod graphics;