Call gdmcomm_check with FALSE so that ti doesn't try to pop-up a GUI.

2006-06-06  Brian Cameron  <brian.cameron@sun.com>

        * gui/gdmflexiserver.c:  Call gdmcomm_check with FALSE so that ti
          doesn't try to pop-up a GUI.  Sometimes gdmflexiserver is called
          by processes that do not have access to the display so this causes
          a crash, and gdmflexiserver prints out errors anyway.
        * gui/modules/AccessDwellMouseEvents.in: Added gestures so you can
          run the same commands as in AccessKeyMouseEvents.in with dwell
          gestures.
        * gui/modules/AccessKeyMouseEvents.in: Cleanup
        * gui/modules/keymouselisttener.c, gui/modules/dwellmouselistener.c:
          Added debug.

6 files changed, 40 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d37c737..8e9fdb7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-06-06  Brian Cameron  <brian.cameron@sun.com>
+
+	* gui/gdmflexiserver.c:  Call gdmcomm_check with FALSE so that ti
+	  doesn't try to pop-up a GUI.  Sometimes gdmflexiserver is called
+	  by processes that do not have access to the display so this causes
+	  a crash, and gdmflexiserver prints out errors anyway.
+	* gui/modules/AccessDwellMouseEvents.in: Added gestures so you can
+	  run the same commands as in AccessKeyMouseEvents.in with dwell
+	  gestures.
+	* gui/modules/AccessKeyMouseEvents.in: Cleanup
+	* gui/modules/keymouselisttener.c, gui/modules/dwellmouselistener.c:
+	  Added debug.
+
 2006-05-31  Brian Cameron  <brian.cameron@sun.com>
 
 	*  gui/greeter/greeter_item_ulist.c: Correction to previous fix.
diff --git a/gui/gdmflexiserver.c b/gui/gdmflexiserver.c
index 99f4e7c1..096b1543 100644
--- a/gui/gdmflexiserver.c
+++ b/gui/gdmflexiserver.c
@@ -727,7 +727,7 @@ main (int argc, char *argv[])
 	if (args_remaining != NULL && args_remaining[0] != NULL)
 		server = args_remaining[0];
 
-	if ( ! gdmcomm_check (TRUE)) {
+	if ( ! gdmcomm_check (FALSE)) {
 		return 1;
 	}
 
diff --git a/gui/modules/AccessDwellMouseEvents.in b/gui/modules/AccessDwellMouseEvents.in
index f0b7ee66..7852a80d 100644
--- a/gui/modules/AccessDwellMouseEvents.in
+++ b/gui/modules/AccessDwellMouseEvents.in
@@ -32,5 +32,22 @@
 #
 # <Add>           @AT_BINDIR@/gnome-mag
 
-# current:
+# GNOME On-Screen Keyboard - support several different options for different
+# user needs.  Note these gestures all start by moving the mouse into the top
+# window border.
+#
 TBLR I 10000    @AT_BINDIR@/gok --login --access-method=dwellselection
+TLBR I 10000    @AT_BINDIR@/gok --login --access-method=automaticscanning --scan-action=switch1 --select-action=switch1
+TRBL I 10000    @AT_BINDIR@/gok --login --access-method=inversescanning --scan-action=switch1 --select-action=switch2
+TBRL I 10000    @AT_BINDIR@/gok --login  --access-method=automaticscanning --scan-action=switch3 --select-action=switch3
+
+# Gnopernicus.  Note these gestures all start by moving the mouse into the
+# bottom window border.
+#
+# Speech
+BTRL I 10000    @AT_BINDIR@/srcore --login --enable-speech
+# Magnifier
+BTLR I 10000    @AT_BINDIR@/srcore --login --enable-magnifier --disable-speech --disable-braille
+# Speech and Magnifier
+BRTL I 10000    @AT_BINDIR@/srcore --login
+
diff --git a/gui/modules/AccessKeyMouseEvents.in b/gui/modules/AccessKeyMouseEvents.in
index 47b3cc18..7d3a8690 100644
--- a/gui/modules/AccessKeyMouseEvents.in
+++ b/gui/modules/AccessKeyMouseEvents.in
@@ -73,4 +73,5 @@
 # press ctrl-m for 1 second to launch gnopernicus magnifier
 <Control>m  1 1000 10000  @AT_BINDIR@/srcore --login --enable-magnifier --disable-speech --disable-braille
 # press ctrl-g for 1 second to launch both gnopernicus speech and magnifier
-<Control>g  1 1000 10000  @AT_BINDIR@/srcore --login 
+<Control>g  1 1000 10000  @AT_BINDIR@/srcore --login
+
diff --git a/gui/modules/dwellmouselistener.c b/gui/modules/dwellmouselistener.c
index 5bc2f7b5..ed5b6ef1 100644
--- a/gui/modules/dwellmouselistener.c
+++ b/gui/modules/dwellmouselistener.c
@@ -643,6 +643,9 @@ leave_enter_emission_hook (GSignalInvocationHint        *ihint,
 
 			envp = get_exec_environment (gtk_window_get_screen(window));
 
+			if (debug_gestures)
+				syslog (LOG_WARNING, "Action is %s", action);
+
 			retval = g_spawn_async (NULL, argv, envp,
 				G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
 
diff --git a/gui/modules/keymouselistener.c b/gui/modules/keymouselistener.c
index 2999ad87..8dea5e6e 100644
--- a/gui/modules/keymouselistener.c
+++ b/gui/modules/keymouselistener.c
@@ -906,6 +906,9 @@ gestures_filter (GdkXEvent *gdk_xevent,
 
 				envp = get_exec_environment (xevent);
 
+				if (debug_gestures)
+				    syslog (LOG_WARNING, "Action is %s", action);
+
 				retval = g_spawn_async (NULL,
 							argv,
 							envp,