s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imservice: Rename commit_state to done to match protocol

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-01-14 18:16:26 +00:00
parent 02c24a50d2
commit e3f31cc17f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/imservice.c
View File

@ -8,7 +8,7 @@ void imservice_handle_input_method_activate(void *data, struct zwp_input_method_
void imservice_handle_input_method_deactivate(void *data, struct zwp_input_method_v2 *input_method); void imservice_handle_input_method_deactivate(void *data, struct zwp_input_method_v2 *input_method);
void imservice_handle_surrounding_text(void *data, struct zwp_input_method_v2 *input_method, void imservice_handle_surrounding_text(void *data, struct zwp_input_method_v2 *input_method,
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_done(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); 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,7 +19,7 @@ static const struct zwp_input_method_v2_listener input_method_listener = {
.surrounding_text = imservice_handle_surrounding_text, .surrounding_text = imservice_handle_surrounding_text,
.text_change_cause = imservice_handle_text_change_cause, .text_change_cause = imservice_handle_text_change_cause,
.content_type = imservice_handle_content_type, .content_type = imservice_handle_content_type,
.done = imservice_handle_commit_state, .done = imservice_handle_done,
.unavailable = imservice_handle_unavailable, .unavailable = imservice_handle_unavailable,
}; };

5
src/imservice.rs
View File

@ -122,13 +122,12 @@ pub mod c {
#[no_mangle] #[no_mangle]
pub extern "C" pub extern "C"
fn imservice_handle_commit_state(imservice: *mut IMService, fn imservice_handle_done(imservice: *mut IMService,
im: *const InputMethod) im: *const InputMethod)
{ {
let imservice = check_imservice(imservice, im).unwrap(); let imservice = check_imservice(imservice, im).unwrap();
let active_changed = imservice.current.active ^ imservice.pending.active; let active_changed = imservice.current.active ^ imservice.pending.active;
imservice.serial += Wrapping(1u32);
imservice.current = imservice.pending.clone(); imservice.current = imservice.pending.clone();
imservice.pending = IMProtocolState { imservice.pending = IMProtocolState {
active: imservice.current.active, active: imservice.current.active,