feat(core): wire up alternative x11 backend

This commit is contained in:
Federico Terzi 2022-04-12 21:38:29 +02:00
parent e7e7d83885
commit d806d419c0
6 changed files with 8 additions and 2 deletions

View File

@ -143,6 +143,7 @@ impl<'a> super::engine::dispatch::executor::clipboard_injector::ClipboardParamsP
restore_clipboard: active.preserve_clipboard(),
restore_clipboard_delay: active.restore_clipboard_delay(),
x11_use_xclip_backend: active.x11_use_xclip_backend(),
x11_use_xdotool_backend: active.x11_use_xdotool_backend(),
}
}
}
@ -164,6 +165,7 @@ impl<'a> super::engine::dispatch::executor::InjectParamsProvider for ConfigManag
inject_delay: active.inject_delay(),
key_delay: active.key_delay(),
evdev_modifier_delay: active.evdev_modifier_delay(),
x11_use_xdotool_backend: active.x11_use_xdotool_backend(),
}
}
}

View File

@ -40,6 +40,7 @@ pub struct ClipboardParams {
pub restore_clipboard: bool,
pub restore_clipboard_delay: usize,
pub x11_use_xclip_backend: bool,
pub x11_use_xdotool_backend: bool,
}
pub struct ClipboardInjectorAdapter<'a> {
@ -95,6 +96,7 @@ impl<'a> ClipboardInjectorAdapter<'a> {
InjectionOptions {
delay: params.paste_shortcut_event_delay as i32,
disable_fast_inject: params.disable_x11_fast_inject,
x11_use_xdotool_fallback: params.x11_use_xdotool_backend,
..Default::default()
},
)?;

View File

@ -67,7 +67,7 @@ impl<'a> TextInjector for EventInjectorAdapter<'a> {
})
.try_into()
.unwrap(),
x11_use_xdotool_fallback: true, // TODO: put actual config
x11_use_xdotool_fallback: params.x11_use_xdotool_backend,
};
// We don't use the lines() method because it skips emtpy lines, which is not what we want.

View File

@ -59,7 +59,7 @@ impl<'a> KeyInjector for KeyInjectorAdapter<'a> {
})
.try_into()
.unwrap(),
x11_use_xdotool_fallback: true, // TODO: put actual config
x11_use_xdotool_fallback: params.x11_use_xdotool_backend,
};
let converted_keys: Vec<_> = keys.iter().map(convert_to_inject_key).collect();

View File

@ -34,4 +34,5 @@ pub struct InjectParams {
pub key_delay: Option<usize>,
pub disable_x11_fast_inject: bool,
pub evdev_modifier_delay: Option<usize>,
pub x11_use_xdotool_backend: bool,
}

View File

@ -53,5 +53,6 @@ generate_patchable_config!(
win32_exclude_orphan_events -> bool,
win32_keyboard_layout_cache_interval -> i64,
x11_use_xclip_backend -> bool,
x11_use_xdotool_backend -> bool,
keyboard_layout -> Option<RMLVOConfig>
);