erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-20 12:57:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #8274 from keymanapp/fix/linux/vedic_kbd

Browse source 
fix(linux): Collect consecutive backspaces
This commit is contained in:
Eberhard Beilharz 2023-02-21 08:59:44 +01:00 • committed by GitHub
commit 3d8be16c36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
linux/ibus-keyman/src/engine.c
View file

@ -99,6 +99,7 @@ struct _IBusKeymanEngine {
commit_queue_item commit_queue[MAX_QUEUE_SIZE];
commit_queue_item *commit_item;
guint consecutive_backspaces;
};
struct _IBusKeymanEngineClass {
@ -467,6 +468,7 @@ ibus_keyman_engine_constructor(
keyman->lctrl_pressed = FALSE;
keyman->ralt_pressed = FALSE;
keyman->rctrl_pressed = FALSE;
keyman->consecutive_backspaces = 0;
initialize_queue(keyman, 0, MAX_QUEUE_SIZE);
keyman->commit_item = &keyman->commit_queue[0];
gchar **split_name = g_strsplit(engine_name, ":", 2);
@ -656,8 +658,8 @@ process_backspace_action(
"DAR: %s - client_capabilities=%x, %x", __FUNCTION__, engine->client_capabilities, IBUS_CAP_SURROUNDING_TEXT);
if (client_supports_surrounding_text(engine)) {
g_message("%s: deleting surrounding text 1 char", __FUNCTION__);
ibus_engine_delete_surrounding_text(engine, -1, 1);
keyman->consecutive_backspaces++;
g_message("%s: increment consecutive backspaces to %d", __FUNCTION__, keyman->consecutive_backspaces);
} else {
g_message("%s: forwarding backspace with reset context", __FUNCTION__);
km_kbp_context_item *context_items;
@ -671,6 +673,21 @@ process_backspace_action(
return TRUE;
}
static gboolean
finish_backspace_action(
IBusEngine *engine
) {
IBusKeymanEngine *keyman = (IBusKeymanEngine *)engine;
if (keyman->consecutive_backspaces <= 0)
return TRUE;
g_assert(client_supports_surrounding_text(engine));
g_message("%s: deleting surrounding text %d char", __FUNCTION__, keyman->consecutive_backspaces);
ibus_engine_delete_surrounding_text(engine, -keyman->consecutive_backspaces, keyman->consecutive_backspaces);
keyman->consecutive_backspaces = 0;
return TRUE;
}
static gboolean
process_persist_action(
IBusKeymanEngine *keyman,
@ -816,6 +833,9 @@ process_actions(
IBusKeymanEngine *keyman = (IBusKeymanEngine *)engine;
for (int i = 0; i < num_action_items; i++) {
gboolean continue_with_next_action = TRUE;
if (action_items[i].type != KM_KBP_IT_BACK && keyman->consecutive_backspaces > 0) {
finish_backspace_action(engine);
}
switch (action_items[i].type) {
case KM_KBP_IT_CHAR:
g_message("CHAR action %d/%d", i + 1, (int)num_action_items);