[Pcb-src-changes] pcb.git: branch: master updated (a73d3483fb9e10535f5b5150edf0dd13c3988fe4)

[<gi...@gp...>]

The branch, master has been updated
       via  a73d3483fb9e10535f5b5150edf0dd13c3988fe4 (commit)
      from  87f58f04d32c11e7132629980bcf03a47e78355f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/gtk/gui-misc.c |   56 +-----------------------------------------------
 1 files changed, 1 insertions(+), 55 deletions(-)


=================
 Commit Messages
=================

commit a73d3483fb9e10535f5b5150edf0dd13c3988fe4
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    hid/gtk: Remove dead "MovePointer" keyboard navigation code.
    
    This was not working correctly anyway, as the action was not
    properly registered. Obviously no-one missed it, so let it die.
    
    Whilst we are here, kill off the hard-coded panning actions
    in this sub-main loop. Eventually, we should use common code
    for any keyboard navigation.
    
    This only affects operation of the ghid_get_user_xy() function,
    e.g. the one which temporarily greys out the PCB user interface
    whilst waiting for the user to supply a location.

:100644 100644 730db5e... cadd2aa... M	src/hid/gtk/gui-misc.c

=========
 Changes
=========

commit a73d3483fb9e10535f5b5150edf0dd13c3988fe4
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    hid/gtk: Remove dead "MovePointer" keyboard navigation code.
    
    This was not working correctly anyway, as the action was not
    properly registered. Obviously no-one missed it, so let it die.
    
    Whilst we are here, kill off the hard-coded panning actions
    in this sub-main loop. Eventually, we should use common code
    for any keyboard navigation.
    
    This only affects operation of the ghid_get_user_xy() function,
    e.g. the one which temporarily greys out the PCB user interface
    whilst waiting for the user to supply a location.

diff --git a/src/hid/gtk/gui-misc.c b/src/hid/gtk/gui-misc.c
index 730db5e..cadd2aa 100644
--- a/src/hid/gtk/gui-misc.c
+++ b/src/hid/gtk/gui-misc.c
@@ -293,73 +293,19 @@ ghid_restore_cursor (void)
 static gboolean got_location;
 
   /* If user hits a key instead of the mouse button, we'll abort unless
-     |  it's one of the cursor keys.  Move the layout if a cursor key.
+     |  it's the enter key (which accepts the current crosshair location).
    */
 static gboolean
 loop_key_press_cb (GtkWidget * drawing_area, GdkEventKey * kev,
 		   GMainLoop ** loop)
 {
-  ModifierKeysState mk;
-  GdkModifierType state;
   gint ksym = kev->keyval;
 
   if (ghid_is_modifier_key_sym (ksym))
     return TRUE;
-  state = (GdkModifierType) (kev->state);
-  mk = ghid_modifier_keys_state (&state);
 
-  /* Duplicate the cursor key actions in gui-output-events.c
-   */
   switch (ksym)
     {
-    case GDK_Up:
-      if (mk == CONTROL_PRESSED)
-	{
-	  hid_actionl ("Display", "Scroll", "8", NULL);
-	  hid_actionl ("Display", "Scroll", "0", NULL);
-	}
-      else if (mk == SHIFT_PRESSED)
-	hid_actionl ("MovePointer", "0", "-10", NULL);
-      else if (mk == NONE_PRESSED)
-	hid_actionl ("MovePointer", "0", "-1", NULL);
-      break;
-
-    case GDK_Down:
-      if (mk == CONTROL_PRESSED)
-	{
-	  hid_actionl ("Display", "Scroll", "2", NULL);
-	  hid_actionl ("Display", "Scroll", "0", NULL);
-	}
-      else if (mk == SHIFT_PRESSED)
-	hid_actionl ("MovePointer", "0", "10", NULL);
-      else if (mk == NONE_PRESSED)
-	hid_actionl ("MovePointer", "0", "1", NULL);
-      break;
-
-    case GDK_Left:
-      if (mk == CONTROL_PRESSED)
-	{
-	  hid_actionl ("Display", "Scroll", "4", NULL);
-	  hid_actionl ("Display", "Scroll", "0", NULL);
-	}
-      else if (mk == SHIFT_PRESSED)
-	hid_actionl ("MovePointer", "-10", "0", NULL);
-      else if (mk == NONE_PRESSED)
-	hid_actionl ("MovePointer", "-1", "0", NULL);
-      break;
-
-    case GDK_Right:
-      if (mk == CONTROL_PRESSED)
-	{
-	  hid_actionl ("Display", "Scroll", "6", NULL);
-	  hid_actionl ("Display", "Scroll", "0", NULL);
-	}
-      else if (mk == SHIFT_PRESSED)
-	hid_actionl ("MovePointer", "10", "0", NULL);
-      else if (mk == NONE_PRESSED)
-	hid_actionl ("MovePointer", "1", "0", NULL);
-      break;
-
     case GDK_Return:		/* Accept cursor location */
       if (g_main_loop_is_running (*loop))
 	g_main_loop_quit (*loop);