imservice: Handle text change cause
Nothing is being done with this information yet
This commit is contained in:
@ -5,8 +5,6 @@
|
|||||||
#include "eekboard/eekboard-context-service.h"
|
#include "eekboard/eekboard-context-service.h"
|
||||||
|
|
||||||
|
|
||||||
void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method, uint32_t cause) {}
|
|
||||||
|
|
||||||
void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method) {}
|
void imservice_handle_unavailable(void *data, struct zwp_input_method_v2 *input_method) {}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -19,5 +19,6 @@ void imservice_handle_surrounding_text(void *data, struct zwp_input_method_v2 *i
|
|||||||
const char *text, uint32_t cursor, uint32_t anchor);
|
const char *text, uint32_t cursor, uint32_t anchor);
|
||||||
void imservice_handle_commit_state(void *data, struct zwp_input_method_v2 *input_method);
|
void imservice_handle_commit_state(void *data, struct zwp_input_method_v2 *input_method);
|
||||||
void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method, uint32_t hint, uint32_t purpose);
|
void imservice_handle_content_type(void *data, struct zwp_input_method_v2 *input_method, uint32_t hint, uint32_t purpose);
|
||||||
|
void imservice_handle_text_change_cause(void *data, struct zwp_input_method_v2 *input_method, uint32_t cause);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -104,7 +104,7 @@ pub mod c {
|
|||||||
content_hint: {
|
content_hint: {
|
||||||
ContentHint::from_bits(hint).unwrap_or_else(|| {
|
ContentHint::from_bits(hint).unwrap_or_else(|| {
|
||||||
eprintln!("Warning: received invalid hint flags");
|
eprintln!("Warning: received invalid hint flags");
|
||||||
ContentHint::default()
|
ContentHint::NONE
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
content_purpose: {
|
content_purpose: {
|
||||||
@ -117,6 +117,24 @@ pub mod c {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub unsafe extern "C"
|
||||||
|
fn imservice_handle_text_change_cause(imservice: *mut IMService,
|
||||||
|
_im: *const InputMethod,
|
||||||
|
cause: u32)
|
||||||
|
{
|
||||||
|
let imservice = &mut *imservice;
|
||||||
|
imservice.pending = IMProtocolState {
|
||||||
|
text_change_cause: {
|
||||||
|
ChangeCause::from_num(cause).unwrap_or_else(|| {
|
||||||
|
eprintln!("Warning: received invalid cause flags");
|
||||||
|
ChangeCause::InputMethod
|
||||||
|
})
|
||||||
|
},
|
||||||
|
..imservice.pending.clone()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C"
|
pub unsafe extern "C"
|
||||||
fn imservice_handle_commit_state(imservice: *mut IMService,
|
fn imservice_handle_commit_state(imservice: *mut IMService,
|
||||||
@ -150,8 +168,8 @@ pub mod c {
|
|||||||
|
|
||||||
bitflags!{
|
bitflags!{
|
||||||
/// Map to `text_input_unstable_v3.content_hint` values
|
/// Map to `text_input_unstable_v3.content_hint` values
|
||||||
#[derive(Default)]
|
|
||||||
pub struct ContentHint: u32 {
|
pub struct ContentHint: u32 {
|
||||||
|
const NONE = 0x0;
|
||||||
const COMPLETION = 0x1;
|
const COMPLETION = 0x1;
|
||||||
const SPELLCHECK = 0x2;
|
const SPELLCHECK = 0x2;
|
||||||
const AUTO_CAPITALIZATION = 0x4;
|
const AUTO_CAPITALIZATION = 0x4;
|
||||||
@ -184,12 +202,6 @@ pub enum ContentPurpose {
|
|||||||
Terminal,
|
Terminal,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for ContentPurpose {
|
|
||||||
fn default() -> ContentPurpose {
|
|
||||||
ContentPurpose::Normal
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ContentPurpose {
|
impl ContentPurpose {
|
||||||
fn from_num(num: u32) -> Option<ContentPurpose> {
|
fn from_num(num: u32) -> Option<ContentPurpose> {
|
||||||
use ContentPurpose::*;
|
use ContentPurpose::*;
|
||||||
@ -232,16 +244,53 @@ impl ContentPurpose {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Map to `text_input_unstable_v3.change_cause` values
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub enum ChangeCause {
|
||||||
|
InputMethod,
|
||||||
|
Other,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ChangeCause {
|
||||||
|
pub fn from_num(num: u32) -> Option<ChangeCause> {
|
||||||
|
match num {
|
||||||
|
0 => Some(ChangeCause::InputMethod),
|
||||||
|
1 => Some(ChangeCause::Other),
|
||||||
|
_ => None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn as_num(&self) -> u32 {
|
||||||
|
match &self {
|
||||||
|
ChangeCause::InputMethod => 0,
|
||||||
|
ChangeCause::Other => 1,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Describes the desired state of the input method as requested by the server
|
/// Describes the desired state of the input method as requested by the server
|
||||||
#[derive(Default, Clone)]
|
#[derive(Clone)]
|
||||||
struct IMProtocolState {
|
struct IMProtocolState {
|
||||||
surrounding_text: CString,
|
surrounding_text: CString,
|
||||||
surrounding_cursor: u32,
|
surrounding_cursor: u32,
|
||||||
content_purpose: ContentPurpose,
|
content_purpose: ContentPurpose,
|
||||||
content_hint: ContentHint,
|
content_hint: ContentHint,
|
||||||
|
text_change_cause: ChangeCause,
|
||||||
active: bool,
|
active: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for IMProtocolState {
|
||||||
|
fn default() -> IMProtocolState {
|
||||||
|
IMProtocolState {
|
||||||
|
surrounding_text: CString::default(),
|
||||||
|
surrounding_cursor: 0, // TODO: mark that there's no cursor
|
||||||
|
content_hint: ContentHint::NONE,
|
||||||
|
content_purpose: ContentPurpose::Normal,
|
||||||
|
text_change_cause: ChangeCause::InputMethod,
|
||||||
|
active: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub struct IMService {
|
pub struct IMService {
|
||||||
/// Owned reference (still created and destroyed in C)
|
/// Owned reference (still created and destroyed in C)
|
||||||
im: *const c::InputMethod,
|
im: *const c::InputMethod,
|
||||||
|
|||||||
Reference in New Issue
Block a user