#define _GNU_SOURCE
#include "config.h"
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <droute/droute.h>
#include <atspi/atspi.h>
+#include <atk-bridge.h>
#include "bridge.h"
#include "event.h"
SpiBridge *spi_global_app_data = NULL;
+static gboolean inited = FALSE;
+
/*---------------------------------------------------------------------------*/
static void
}
/*
+ * Checks the status of the environment variables
+ *
+ * At this moment it only checks NO_AT_BRIDGE
+ *
+ * Returns TRUE if there isn't anything on the environment preventing
+ * you to load the bridge, FALSE otherwise
+ */
+static gboolean
+check_envvar (void)
+{
+ const gchar *envvar;
+
+ envvar = g_getenv ("NO_AT_BRIDGE");
+
+ if (envvar && atoi (envvar) == 1)
+ return FALSE;
+ else
+ return TRUE;
+}
+
+/*
* spi_app_init
*
* The following needs to be initialized.
*
*/
int
-adaptor_init (gint * argc, gchar ** argv[])
+atk_bridge_adaptor_init (gint * argc, gchar ** argv[])
{
GOptionContext *opt;
GError *err = NULL;
DBusError error;
AtkObject *root;
- static gboolean inited = FALSE;
+ gboolean load_bridge;
+
+ load_bridge = check_envvar ();
+ if (inited && !load_bridge)
+ g_warning ("ATK Bridge is disabled but a11y has already been enabled.");
- if (inited)
+ if (inited || !load_bridge)
return 0;
inited = TRUE;
}
void
-adaptor_cleanup (void)
+atk_bridge_adaptor_cleanup (void)
{
GList *l;
GSList *ls;
+ g_return_if_fail (inited);
+
if (!spi_global_app_data)
return;
g_free (spi_global_app_data);
spi_global_app_data = NULL;
+
+ inited = FALSE;
}
/*---------------------------------------------------------------------------*/