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

Fix focus listener logic.

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-08 11:26:15 +09:00
parent bed39570ff
commit 2f7aa77c11
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/desktop-client.c
View File

@ -68,6 +68,7 @@ struct _EekboardDesktopClient {
gulong key_released_handler; gulong key_released_handler;
#ifdef HAVE_CSPI #ifdef HAVE_CSPI
Accessible *acc;
AccessibleEventListener *focus_listener; AccessibleEventListener *focus_listener;
AccessibleEventListener *keystroke_listener; AccessibleEventListener *keystroke_listener;
#endif /* HAVE_CSPI */ #endif /* HAVE_CSPI */
@ -433,10 +434,24 @@ focus_listener_cb (const AccessibleEvent *event,
case SPI_ROLE_PARAGRAPH: case SPI_ROLE_PARAGRAPH:
case SPI_ROLE_PASSWORD_TEXT: case SPI_ROLE_PASSWORD_TEXT:
case SPI_ROLE_TERMINAL: case SPI_ROLE_TERMINAL:
case SPI_ROLE_ENTRY: if (strncmp (event->type, "focus", 5) == 0 || event->detail1 == 1) {
if (g_strcmp0 (event->type, "focus") == 0 || event->detail1 == 1) { client->acc = accessible;
eekboard_context_show_keyboard (client->context, NULL); eekboard_context_show_keyboard (client->context, NULL);
} else if (event->detail1 == 0 && accessible == client->acc) {
client->acc = NULL;
eekboard_context_hide_keyboard (client->context, NULL);
} }
break;
case SPI_ROLE_ENTRY:
if (strncmp (event->type, "focus", 5) == 0 || event->detail1 == 1) {
client->acc = accessible;
eekboard_context_show_keyboard (client->context, NULL);
} else if (event->detail1 == 0) {
client->acc = NULL;
eekboard_context_hide_keyboard (client->context, NULL);
}
break;
default: default:
; ;
} }