
Property changes on: gok
___________________________________________________________________
Name: svn:ignore
   - Makefile.in
Makefile
gok
test-gok-action
test-gok-sound
test-gok-feedback
test-gok-bounds

   + Makefile.in
Makefile
gok
test-gok-action
test-gok-sound
test-gok-feedback
test-gok-bounds
GNOME_Gok.server
GNOME_Gok.server.in
create-branching-keyboard


Index: gok/gok-scanner.c
===================================================================
--- gok/gok-scanner.c	(revision 2490)
+++ gok/gok-scanner.c	(working copy)
@@ -2321,7 +2321,7 @@
 	m_MouseX = x;
 	m_MouseY = y;
 	gok_scanner_perform_effects (m_pEffectsMouseMovement);
-	gok_scanner_input_motion_xevie (x, y);
+	if (! gok_main_get_use_corepointer()) gok_scanner_input_motion_xevie (x, y);
 }
 
 /**
Index: gok/main.c
===================================================================
--- gok/main.c	(revision 2490)
+++ gok/main.c	(working copy)
@@ -155,6 +155,7 @@
 	gboolean list_accessmethods;
 	char* usb_vid_pid;
 	gdouble valuator_sensitivity;
+	gboolean nonsystemmouse;
 } GokArgs;
 
 static GokArgs gok_args;
@@ -337,6 +338,15 @@
 		N_("A multiplier to be applied to input device valuator events before processing"),
 		NULL
 	},
+	{
+		"nonsystemmouse", 
+		'\0', 
+		0,
+		G_OPTION_ARG_NONE, 
+		&gok_args.nonsystemmouse, 
+		N_("Attempt to use GOK without the system mouse"),
+		NULL
+	},
 	/* End the list */
 	{	NULL}
 };
@@ -638,7 +648,8 @@
 	    if (ret != Bonobo_ACTIVATION_REG_SUCCESS)
 	    {
 		if (gok_args.is_login)
-		    return 1;
+			g_warning ("GOK running in login mode with a failed bonobo activation");
+		    /* return 1; */
 		else {
 		    gchar *reason = NULL;
 		    if (ret == Bonobo_ACTIVATION_REG_ALREADY_ACTIVE) reason = "already active";
@@ -2910,6 +2921,12 @@
 	return gok_args.valuator_sensitivity;
 }
 
+gboolean
+gok_main_get_use_corepointer(void)
+{
+	return !gok_args.nonsystemmouse;
+}
+
 /**
 * gok_main_get_geometry
 *
@@ -3149,7 +3166,7 @@
 gok_main_warn (gchar *message, gboolean always, GCallback cancelfunc, GCallback okfunc, gboolean opt_out)
 {
 
-	if (always || gok_scanner_current_state_uses_corepointer ()) 
+	if (!gok_main_get_use_corepointer() && ( always || gok_scanner_current_state_uses_corepointer() )) 
 	{
 		GtkWidget*	button;
 
Index: gok/main.h
===================================================================
--- gok/main.h	(revision 2490)
+++ gok/main.h	(working copy)
@@ -93,6 +93,7 @@
 gdouble gok_main_get_valuatorsensitivity_override (void);
 gboolean gok_main_get_extras (void);
 gboolean gok_main_get_login (void);
+gboolean gok_main_get_use_corepointer (void);
 gchar* gok_main_get_inputdevice_name (void);
 void gok_main_check_accessibility (void);
 void gok_main_warn_corepointer (gboolean always, gboolean configuring, gboolean opt_out);
