Avoid to send KeyboardVisibilityChanged on SetKeyboard and SetGroup.

2011-02-23 14:51:25 +09:00
parent 6747e07166
commit 50895d08e1
4 changed files with 15 additions and 2 deletions
--- a/src/desktop-client-main.c
+++ b/src/desktop-client-main.c
@ -0,0 +1,146 @@
+/* 
+ * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
+ * Copyright (C) 2010-2011 Red Hat, Inc.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif  /* HAVE_CONFIG_H */
+
+#include <stdlib.h>
+#include <cspi/spi.h>
+#include <gtk/gtk.h>
+#include <gconf/gconf-client.h>
+#include "eekboard/eekboard.h"
+#include "system-client.h"
+
+#ifdef HAVE_CSPI
+gboolean opt_focus = FALSE;
+gboolean opt_keystroke = FALSE;
+#endif  /* HAVE_CSPI */
+
+static const GOptionEntry options[] = {
+#ifdef HAVE_CSPI
+    {"listen-focus", 'f', 0, G_OPTION_ARG_NONE, &opt_focus,
+     "Listen focus change events with AT-SPI"},
+    {"listen-keystroke", 's', 0, G_OPTION_ARG_NONE, &opt_keystroke,
+     "Listen keystroke events with AT-SPI"},
+#endif  /* HAVE_CSPI */
+    {NULL}
+};
+
+static void
+on_notify_keyboard_visible (GObject    *object,
+                            GParamSpec *spec,
+                            gpointer    user_data)
+{
+    GMainLoop *loop = user_data;
+    gboolean visible;
+
+    g_object_get (object, "keyboard-visible", &visible, NULL);
+
+    /* user explicitly closed the window */
+    if (!visible && eekboard_context_is_enabled (EEKBOARD_CONTEXT(object)))
+        g_main_loop_quit (loop);
+}
+
+int
+main (int argc, char **argv)
+{
+    EekboardSystemClient *client;
+    EekboardContext *context;
+    GDBusConnection *connection;
+    GError *error;
+    GConfClient *gconfc;
+    GOptionContext *option_context;
+    GMainLoop *loop;
+
+    if (!gtk_init_check (&argc, &argv)) {
+        g_printerr ("Can't init GTK\n");
+        exit (1);
+    }
+
+    option_context = g_option_context_new ("eekboard-system-client");
+    g_option_context_add_main_entries (option_context, options, NULL);
+    g_option_context_parse (option_context, &argc, &argv, NULL);
+    g_option_context_free (option_context);
+
+    error = NULL;
+    connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+    if (error) {
+        g_printerr ("%s\n", error->message);
+        exit (1);
+    }
+    client = eekboard_system_client_new (connection);
+
+    gconfc = gconf_client_get_default ();
+
+#ifdef HAVE_CSPI
+    error = NULL;
+    if (opt_focus || opt_keystroke) {
+        if (gconf_client_get_bool (gconfc,
+                                   "/desktop/gnome/interface/accessibility",
+                                   &error) ||
+            gconf_client_get_bool (gconfc,
+                                   "/desktop/gnome/interface/accessibility2",
+                                   &error)) {
+            if (SPI_init () != 0) {
+                g_printerr ("Can't init CSPI\n");
+                exit (1);
+            }
+
+            if (opt_focus &&
+                !eekboard_system_client_enable_cspi_focus (client)) {
+                g_printerr ("Can't register focus change event listeners\n");
+                exit (1);
+            }
+
+            if (opt_keystroke &&
+                !eekboard_system_client_enable_cspi_keystroke (client)) {
+                g_printerr ("Can't register keystroke event listeners\n");
+                exit (1);
+            }
+        } else {
+            g_printerr ("System accessibility support is disabled");
+            exit (1);
+        }
+    }
+#endif  /* HAVE_CSPI */
+
+    if (!eekboard_system_client_enable_xkl (client)) {
+        g_printerr ("Can't register xklavier event listeners\n"); 
+        exit (1);
+    }
+
+#ifdef HAVE_FAKEKEY
+    if (!eekboard_system_client_enable_fakekey (client)) {
+        g_printerr ("Can't init fakekey\n"); 
+        exit (1);
+    }
+#endif  /* HAVE_FAKEKEY */
+
+    loop = g_main_loop_new (NULL, FALSE);
+    if (opt_focus) {
+        g_object_get (client, "context", &context, NULL);
+        g_signal_connect (context, "notify::keyboard-visible",
+                          G_CALLBACK(on_notify_keyboard_visible), loop);
+        g_object_unref (context);
+    }
+
+    g_main_loop_run (loop);
+    g_main_loop_unref (loop);
+
+    return 0;
+}