Skip to content

Commit

Permalink
Add some engine capis (Riey#221)
Browse files Browse the repository at this point in the history
Add kime_engine_set_hangul_enable
Add kime_config_default
  • Loading branch information
Riey authored Feb 7, 2021
1 parent 4bb2678 commit ee89d1e
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 10 deletions.
2 changes: 0 additions & 2 deletions src/engine/capi/cbindgen.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ tab_width = 2
braces = "SameLine"
language = "C"
style = "both"
no_includes = true
sys_includes = ["stdint.h", "stddef.h"]

[macro_expansion]
bitflags = true
Expand Down
13 changes: 13 additions & 0 deletions src/engine/capi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ pub extern "C" fn kime_engine_new() -> *mut InputEngine {
Box::into_raw(Box::new(InputEngine::new()))
}

/// Set hangul enable state
#[no_mangle]
pub unsafe extern "C" fn kime_engine_set_hangul_enable(engine: *mut InputEngine, mode: bool) {
to_mut!(engine);
engine.set_hangul_enable(mode);
}

/// Delete engine
///
/// # Safety
Expand Down Expand Up @@ -91,6 +98,12 @@ pub extern "C" fn kime_config_load() -> *mut Config {
Box::into_raw(Box::new(Config::load_from_config_dir().unwrap_or_default()))
}

/// Create default config note that this function will not read config file
#[no_mangle]
pub extern "C" fn kime_config_default() -> *mut Config {
Box::into_raw(Box::new(Config::default()))
}

/// Delete config
#[no_mangle]
pub unsafe extern "C" fn kime_config_delete(config: *mut Config) {
Expand Down
14 changes: 13 additions & 1 deletion src/engine/cffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ impl InputEngine {
unsafe { ffi::kime_engine_update_hangul_state(self.engine) }
}

pub fn set_hangul_enable(&mut self, mode: bool) {
unsafe { ffi::kime_engine_set_hangul_enable(self.engine, mode) };
}

pub fn press_key(
&mut self,
config: &Config,
Expand Down Expand Up @@ -77,8 +81,16 @@ pub struct Config {
config: *mut ffi::KimeConfig,
}

impl Default for Config {
fn default() -> Self {
Self {
config: unsafe { ffi::kime_config_default() },
}
}
}

impl Config {
pub fn new() -> Self {
pub fn load() -> Self {
Self {
config: unsafe { ffi::kime_config_load() },
}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub struct Config {

impl Default for Config {
fn default() -> Self {
Self::new(Layout::default(), RawConfig::default())
Self::from_raw_config(RawConfig::default(), None)
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl InputEngine {
}
}

pub fn set_enable_hangul(&mut self, enable: bool) {
pub fn set_hangul_enable(&mut self, enable: bool) {
self.enable_hangul = enable;
}

Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/tests/dubeolsik.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn test_input(inputs: &[(Key, InputResult)]) {

let mut engine = InputEngine::new();

engine.set_enable_hangul(true);
engine.set_hangul_enable(true);

for (key, expect_result) in inputs.iter().copied() {
assert_eq!(
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/tests/sebeolsik_390.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn test_input(inputs: &[(Key, InputResult)]) {

let mut engine = InputEngine::new();

engine.set_enable_hangul(true);
engine.set_hangul_enable(true);

for (key, expect_result) in inputs.iter().copied() {
assert_eq!(engine.press_key(key, &config), expect_result);
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/tests/sebeolsik_391.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn test_input(inputs: &[(Key, InputResult)]) {

let mut engine = InputEngine::new();

engine.set_enable_hangul(true);
engine.set_hangul_enable(true);

for (key, expect_result) in inputs.iter().copied() {
assert_eq!(expect_result, engine.press_key(key, &config));
Expand Down
2 changes: 1 addition & 1 deletion src/frontends/wayland/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ impl KimeContext {
timer: TimerFd,
) -> Self {
Self {
config: Config::new(),
config: Config::load(),
engine: InputEngine::new(),
mod_state: 0,
current_state: InputMethodState::default(),
Expand Down
2 changes: 1 addition & 1 deletion src/frontends/xim/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn main() -> Result<(), ServerError> {

log::info!("Start xim server version: {}", env!("CARGO_PKG_VERSION"));

let config = kime_engine_cffi::Config::new();
let config = kime_engine_cffi::Config::load();

let (conn, screen_num) = x11rb::xcb_ffi::XCBConnection::connect(None)?;
let mut server = xim::x11rb::X11rbServer::init(conn, screen_num, "kime", xim::ALL_LOCALES)?;
Expand Down

0 comments on commit ee89d1e

Please sign in to comment.