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

Avoid to send KeyboardVisibilityChanged on SetKeyboard and SetGroup.

Browse Source
This commit is contained in:
Daiki Ueno
2011-02-23 14:51:25 +09:00
parent 6747e07166
commit 50895d08e1
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/system-client-main.c → src/desktop-client-main.c
View File

0
src/system-client.c → src/desktop-client.c
View File

0
src/system-client.h → src/desktop-client.h
View File

17
src/server-context.c
View File

@ -93,6 +93,7 @@ struct _ServerContext {
gulong key_pressed_handler; gulong key_pressed_handler;
gulong key_released_handler; gulong key_released_handler;
gulong notify_visible_handler;
}; };
struct _ServerContextClass { struct _ServerContextClass {
@ -207,8 +208,9 @@ update_widget (ServerContext *context)
context->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); context->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (context->window, "destroy", g_signal_connect (context->window, "destroy",
G_CALLBACK(on_destroy), context); G_CALLBACK(on_destroy), context);
g_signal_connect (context->window, "notify::visible", context->notify_visible_handler =
G_CALLBACK(on_notify_visible), context); g_signal_connect (context->window, "notify::visible",
G_CALLBACK(on_notify_visible), context);
gtk_container_add (GTK_CONTAINER(context->window), context->widget); gtk_container_add (GTK_CONTAINER(context->window), context->widget);
gtk_widget_set_can_focus (context->window, FALSE); gtk_widget_set_can_focus (context->window, FALSE);
@ -471,9 +473,14 @@ handle_method_call (GDBusConnection *connection,
if (context->window) { if (context->window) {
gboolean was_visible = gtk_widget_get_visible (context->window); gboolean was_visible = gtk_widget_get_visible (context->window);
/* avoid to send KeyboardVisibilityChanged */
g_signal_handler_block (context->window,
context->notify_visible_handler);
update_widget (context); update_widget (context);
if (was_visible) if (was_visible)
gtk_widget_show_all (context->window); gtk_widget_show_all (context->window);
g_signal_handler_unblock (context->window,
context->notify_visible_handler);
} }
g_dbus_method_invocation_return_value (invocation, NULL); g_dbus_method_invocation_return_value (invocation, NULL);
@ -496,9 +503,15 @@ handle_method_call (GDBusConnection *connection,
if (context->window) { if (context->window) {
gboolean was_visible = gtk_widget_get_visible (context->window); gboolean was_visible = gtk_widget_get_visible (context->window);
/* avoid to send KeyboardVisibilityChanged */
g_signal_handler_block (context->window,
context->notify_visible_handler);
update_widget (context); update_widget (context);
if (was_visible) if (was_visible)
gtk_widget_show_all (context->window); gtk_widget_show_all (context->window);
g_signal_handler_unblock (context->window,
context->notify_visible_handler);
} }
g_dbus_method_invocation_return_value (invocation, NULL); g_dbus_method_invocation_return_value (invocation, NULL);