pcb-src-changes — CVS commit mail for the 'pcb' module

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

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

The branch, master has been updated
       via  16ee2f61be15288605074bb8ab5cd13870c54596 (commit)
      from  a73d3483fb9e10535f5b5150edf0dd13c3988fe4 (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/action.c |   19 -------------------
 src/action.h |    1 -
 2 files changed, 0 insertions(+), 20 deletions(-)


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

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

    action.c: Remove unused action "MovePointer"

:100644 100644 6339e39... 704b98f... M	src/action.c
:100644 100644 ee116e8... e92c578... M	src/action.h

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

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

    action.c: Remove unused action "MovePointer"

diff --git a/src/action.c b/src/action.c
index 6339e39..704b98f 100644
--- a/src/action.c
+++ b/src/action.c
@@ -2108,25 +2108,6 @@ ActionSetThermal (int argc, char **argv, int x, int y)
 }
 
 /* ---------------------------------------------------------------------------
- * action routine to move the X pointer relative to the current position
- * syntax: MovePointer(deltax,deltay)
- */
-void
-ActionMovePointer (char *deltax, char *deltay)
-{
-  LocationType dx, dy;
-
-  dx = (LocationType) (atoi (deltax) * PCB->Grid);
-  dy = (LocationType) (atoi (deltay) * PCB->Grid);
-
-  notify_crosshair_change (false);
-  MoveCrosshairRelative (TO_SCREEN_SIGN_X (dx), TO_SCREEN_SIGN_Y (dy));
-  /* update object position and cursor location */
-  AdjustAttachedObjects ();
-  notify_crosshair_change (true);
-}
-
-/* ---------------------------------------------------------------------------
  * !!! no action routine !!!
  *
  * event handler to set the cursor according to the X pointer position
diff --git a/src/action.h b/src/action.h
index ee116e8..e92c578 100644
--- a/src/action.h
+++ b/src/action.h
@@ -35,7 +35,6 @@
 
 #define CLONE_TYPES LINE_TYPE | ARC_TYPE | VIA_TYPE | POLYGON_TYPE
 
-void ActionMovePointer (char *, char *);
 void ActionAdjustStyle (char *);
 void EventMoveCrosshair (int, int);
 

[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);

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

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

The branch, master has been updated
  discards  94419452ccb345c31d55a13db7ab4f20ef34f512 (commit)
  discards  6dbea16935e0c87b12b62d818a899cdadb745b89 (commit)
       via  87f58f04d32c11e7132629980bcf03a47e78355f (commit)
       via  e43e90ceef7da7be8981dfe834054be1f54d6200 (commit)
       via  e82ad9b7dcb3f9658a8f929b319be46d8c96a61f (commit)
      from  94419452ccb345c31d55a13db7ab4f20ef34f512 (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/action.c |   11 ++---------
 src/select.c |    4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)


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

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

    action.c: Simplify ActionMovePointer()
    
    The save / restore of the crosshair coordinates is unnecessary since
    we are emitting the appropriate change notifications.

:100644 100644 e222dbf... 6339e39... M	src/action.c

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

    action.c: Remove dead code, IgnoreMotionEvents

:100644 100644 d892429... e222dbf... M	src/action.c

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

    misc.c: Remove unused "delta" argument from CenterDisplay()
    
    All the callers are passing absolute locations.

:100644 100644 d6e1d89... d892429... M	src/action.c
:100644 100644 92c8b35... 2f9053d... M	src/find.c
:100644 100644 674e495... 6d50d16... M	src/hid/gtk/gui-drc-window.c
:100644 100644 ce2ab4a... befeeed... M	src/misc.c
:100644 100644 45d6e52... 7926460... M	src/misc.h
:100644 100644 e42d4bb... 8dfe270... M	src/select.c

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

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

    action.c: Simplify ActionMovePointer()
    
    The save / restore of the crosshair coordinates is unnecessary since
    we are emitting the appropriate change notifications.

diff --git a/src/action.c b/src/action.c
index e222dbf..6339e39 100644
--- a/src/action.c
+++ b/src/action.c
@@ -2114,18 +2114,11 @@ ActionSetThermal (int argc, char **argv, int x, int y)
 void
 ActionMovePointer (char *deltax, char *deltay)
 {
-  LocationType x, y, dx, dy;
+  LocationType dx, dy;
 
-  /* save old crosshair position */
-  x = Crosshair.X;
-  y = Crosshair.Y;
   dx = (LocationType) (atoi (deltax) * PCB->Grid);
   dy = (LocationType) (atoi (deltay) * PCB->Grid);
-  MoveCrosshairRelative (TO_SCREEN_SIGN_X (dx), TO_SCREEN_SIGN_Y (dy));
-  FitCrosshairIntoGrid (Crosshair.X, Crosshair.Y);
-  /* restore crosshair for erasure */
-  Crosshair.X = x;
-  Crosshair.Y = y;
+
   notify_crosshair_change (false);
   MoveCrosshairRelative (TO_SCREEN_SIGN_X (dx), TO_SCREEN_SIGN_Y (dy));
   /* update object position and cursor location */

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

    action.c: Remove dead code, IgnoreMotionEvents

diff --git a/src/action.c b/src/action.c
index d892429..e222dbf 100644
--- a/src/action.c
+++ b/src/action.c
@@ -323,7 +323,6 @@ static int defer_updates = 0;
 static int defer_needs_update = 0;
 
 static Cardinal polyIndex = 0;
-static bool IgnoreMotionEvents = false;
 static bool saved_mode = false;
 #ifdef HAVE_LIBSTROKE
 static bool mid_stroke = false;
@@ -2152,18 +2151,12 @@ EventMoveCrosshair (int ev_x, int ev_y)
       return;
     }
 #endif /* HAVE_LIBSTROKE */
-  /* ignore events that are caused by ActionMovePointer */
-  if (!IgnoreMotionEvents)
+  if (MoveCrosshairAbsolute (ev_x, ev_y))
     {
-      if (MoveCrosshairAbsolute (ev_x, ev_y))
-	{
-	  /* update object position and cursor location */
-	  AdjustAttachedObjects ();
-	  notify_crosshair_change (true);
-	}
+      /* update object position and cursor location */
+      AdjustAttachedObjects ();
+      notify_crosshair_change (true);
     }
-  else
-    IgnoreMotionEvents = false;
 }
 
 /* --------------------------------------------------------------------------- */

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

    misc.c: Remove unused "delta" argument from CenterDisplay()
    
    All the callers are passing absolute locations.

diff --git a/src/action.c b/src/action.c
index d6e1d89..d892429 100644
--- a/src/action.c
+++ b/src/action.c
@@ -565,7 +565,7 @@ FinishStroke (void)
 		   log (2.0));
 	    SetZoom (z);
 
-	    CenterDisplay (x, y, false);
+	    CenterDisplay (x, y);
 	    break;
 	  }
 
@@ -3836,8 +3836,7 @@ ActionAddRats (int argc, char **argv, int x, int y)
 	      DrawRat (shorty);
 	      Draw ();
 	      CenterDisplay ((shorty->Point2.X + shorty->Point1.X) / 2,
-			     (shorty->Point2.Y + shorty->Point1.Y) / 2,
-			     false);
+			     (shorty->Point2.Y + shorty->Point1.Y) / 2);
 	    }
 	  break;
 	}
@@ -5957,7 +5956,7 @@ ActionNew (int argc, char **argv, int x, int y)
       ResetStackAndVisibility ();
       CreateDefaultFont ();
       SetCrosshairRange (0, 0, PCB->MaxWidth, PCB->MaxHeight);
-      CenterDisplay (PCB->MaxWidth / 2, PCB->MaxHeight / 2, false);
+      CenterDisplay (PCB->MaxWidth / 2, PCB->MaxHeight / 2);
       Redraw ();
 
       hid_action ("PCBChanged");
diff --git a/src/find.c b/src/find.c
index 92c8b35..2f9053d 100644
--- a/src/find.c
+++ b/src/find.c
@@ -4532,7 +4532,7 @@ GotoError (void)
                              (PCB->Data, (LayerTypePtr) thing_ptr1), true,
                              true);
     }
-  CenterDisplay (X, Y, false);
+  CenterDisplay (X, Y);
 }
 
 void
diff --git a/src/hid/gtk/gui-drc-window.c b/src/hid/gtk/gui-drc-window.c
index 674e495..6d50d16 100644
--- a/src/hid/gtk/gui-drc-window.c
+++ b/src/hid/gtk/gui-drc-window.c
@@ -260,7 +260,7 @@ row_activated_cb (GtkTreeView *view, GtkTreePath *path,
   if (violation == NULL)
     return;
 
-  CenterDisplay (violation->x_coord, violation->y_coord, false);
+  CenterDisplay (violation->x_coord, violation->y_coord);
 }
 
 
diff --git a/src/misc.c b/src/misc.c
index ce2ab4a..befeeed 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -769,17 +769,12 @@ GetDataBoundingBox (DataTypePtr Data)
  * coordinates
  */
 void
-CenterDisplay (LocationType X, LocationType Y, bool Delta)
+CenterDisplay (LocationType X, LocationType Y)
 {
   double save_grid = PCB->Grid;
   PCB->Grid = 1;
-  if (Delta)
-    MoveCrosshairRelative (X, Y);
-  else
-    {
-      if (MoveCrosshairAbsolute (X, Y))
-        notify_crosshair_change (true);
-    }
+  if (MoveCrosshairAbsolute (X, Y))
+    notify_crosshair_change (true);
   gui->set_crosshair (Crosshair.X, Crosshair.Y, HID_SC_WARP_POINTER);
   PCB->Grid = save_grid;
 }
diff --git a/src/misc.h b/src/misc.h
index 45d6e52..7926460 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -59,7 +59,7 @@ bool IsLayerNumEmpty (int);
 bool IsLayerGroupEmpty (int);
 bool IsPasteEmpty (int);
 BoxTypePtr GetDataBoundingBox (DataTypePtr);
-void CenterDisplay (LocationType, LocationType, bool);
+void CenterDisplay (LocationType, LocationType);
 void SetFontInfo (FontTypePtr);
 int ParseGroupString (char *, LayerGroupTypePtr, int /* LayerN */);
 int ParseRouteString (char *, RouteStyleTypePtr, const char *);
diff --git a/src/select.c b/src/select.c
index e42d4bb..8dfe270 100644
--- a/src/select.c
+++ b/src/select.c
@@ -87,7 +87,7 @@ SelectPin (LibraryEntryTypePtr entry, bool toggle)
 	    if (toggle)
 	      {
 		TOGGLE_FLAG (SELECTEDFLAG, pin);
-		CenterDisplay (pin->X, pin->Y, false);
+		CenterDisplay (pin->X, pin->Y);
 	      }
 	    else
 	      SET_FLAG (SELECTEDFLAG, pin);
@@ -103,7 +103,7 @@ SelectPin (LibraryEntryTypePtr entry, bool toggle)
 	    if (toggle)
 	      {
 		TOGGLE_FLAG (SELECTEDFLAG, pad);
-		CenterDisplay (pad->Point1.X, pad->Point1.Y, false);
+		CenterDisplay (pad->Point1.X, pad->Point1.Y);
 	      }
 	    else
 	      SET_FLAG (SELECTEDFLAG, pad);

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

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

The branch, master has been updated
  discards  9f6f22222099b9ce0488823a6f44cca92d3d650f (commit)
       via  94419452ccb345c31d55a13db7ab4f20ef34f512 (commit)
      from  9f6f22222099b9ce0488823a6f44cca92d3d650f (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/action.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


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

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

    action.c: Remove dead code, IgnoreMotionEvents

:100644 100644 d892429... e222dbf... M	src/action.c

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

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

    action.c: Remove dead code, IgnoreMotionEvents

diff --git a/src/action.c b/src/action.c
index d892429..e222dbf 100644
--- a/src/action.c
+++ b/src/action.c
@@ -323,7 +323,6 @@ static int defer_updates = 0;
 static int defer_needs_update = 0;
 
 static Cardinal polyIndex = 0;
-static bool IgnoreMotionEvents = false;
 static bool saved_mode = false;
 #ifdef HAVE_LIBSTROKE
 static bool mid_stroke = false;
@@ -2152,18 +2151,12 @@ EventMoveCrosshair (int ev_x, int ev_y)
       return;
     }
 #endif /* HAVE_LIBSTROKE */
-  /* ignore events that are caused by ActionMovePointer */
-  if (!IgnoreMotionEvents)
+  if (MoveCrosshairAbsolute (ev_x, ev_y))
     {
-      if (MoveCrosshairAbsolute (ev_x, ev_y))
-	{
-	  /* update object position and cursor location */
-	  AdjustAttachedObjects ();
-	  notify_crosshair_change (true);
-	}
+      /* update object position and cursor location */
+      AdjustAttachedObjects ();
+      notify_crosshair_change (true);
     }
-  else
-    IgnoreMotionEvents = false;
 }
 
 /* --------------------------------------------------------------------------- */

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

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

The branch, master has been updated
       via  9f6f22222099b9ce0488823a6f44cca92d3d650f (commit)
       via  6dbea16935e0c87b12b62d818a899cdadb745b89 (commit)
      from  481fe9e27df67e93921d20cac95a38c49ea6a664 (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/action.c                 |   21 +++++++--------------
 src/find.c                   |    2 +-
 src/hid/gtk/gui-drc-window.c |    2 +-
 src/misc.c                   |   11 +++--------
 src/misc.h                   |    2 +-
 5 files changed, 13 insertions(+), 25 deletions(-)


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

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

    action.c: Remove dead code, IgnoreMotionEvents

:100644 100644 d892429... 6a339bb... M	src/action.c

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

    misc.c: Remove unused "delta" argument from CenterDisplay()
    
    All the callers are passing absolute locations.

:100644 100644 d6e1d89... d892429... M	src/action.c
:100644 100644 92c8b35... 2f9053d... M	src/find.c
:100644 100644 674e495... 6d50d16... M	src/hid/gtk/gui-drc-window.c
:100644 100644 ce2ab4a... befeeed... M	src/misc.c
:100644 100644 45d6e52... 7926460... M	src/misc.h

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

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

    action.c: Remove dead code, IgnoreMotionEvents

diff --git a/src/action.c b/src/action.c
index d892429..6a339bb 100644
--- a/src/action.c
+++ b/src/action.c
@@ -323,7 +323,6 @@ static int defer_updates = 0;
 static int defer_needs_update = 0;
 
 static Cardinal polyIndex = 0;
-static bool IgnoreMotionEvents = false;
 static bool saved_mode = false;
 #ifdef HAVE_LIBSTROKE
 static bool mid_stroke = false;
@@ -2153,17 +2152,12 @@ EventMoveCrosshair (int ev_x, int ev_y)
     }
 #endif /* HAVE_LIBSTROKE */
   /* ignore events that are caused by ActionMovePointer */
-  if (!IgnoreMotionEvents)
+  if (MoveCrosshairAbsolute (ev_x, ev_y))
     {
-      if (MoveCrosshairAbsolute (ev_x, ev_y))
-	{
-	  /* update object position and cursor location */
-	  AdjustAttachedObjects ();
-	  notify_crosshair_change (true);
-	}
+      /* update object position and cursor location */
+      AdjustAttachedObjects ();
+      notify_crosshair_change (true);
     }
-  else
-    IgnoreMotionEvents = false;
 }
 
 /* --------------------------------------------------------------------------- */

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

    misc.c: Remove unused "delta" argument from CenterDisplay()
    
    All the callers are passing absolute locations.

diff --git a/src/action.c b/src/action.c
index d6e1d89..d892429 100644
--- a/src/action.c
+++ b/src/action.c
@@ -565,7 +565,7 @@ FinishStroke (void)
 		   log (2.0));
 	    SetZoom (z);
 
-	    CenterDisplay (x, y, false);
+	    CenterDisplay (x, y);
 	    break;
 	  }
 
@@ -3836,8 +3836,7 @@ ActionAddRats (int argc, char **argv, int x, int y)
 	      DrawRat (shorty);
 	      Draw ();
 	      CenterDisplay ((shorty->Point2.X + shorty->Point1.X) / 2,
-			     (shorty->Point2.Y + shorty->Point1.Y) / 2,
-			     false);
+			     (shorty->Point2.Y + shorty->Point1.Y) / 2);
 	    }
 	  break;
 	}
@@ -5957,7 +5956,7 @@ ActionNew (int argc, char **argv, int x, int y)
       ResetStackAndVisibility ();
       CreateDefaultFont ();
       SetCrosshairRange (0, 0, PCB->MaxWidth, PCB->MaxHeight);
-      CenterDisplay (PCB->MaxWidth / 2, PCB->MaxHeight / 2, false);
+      CenterDisplay (PCB->MaxWidth / 2, PCB->MaxHeight / 2);
       Redraw ();
 
       hid_action ("PCBChanged");
diff --git a/src/find.c b/src/find.c
index 92c8b35..2f9053d 100644
--- a/src/find.c
+++ b/src/find.c
@@ -4532,7 +4532,7 @@ GotoError (void)
                              (PCB->Data, (LayerTypePtr) thing_ptr1), true,
                              true);
     }
-  CenterDisplay (X, Y, false);
+  CenterDisplay (X, Y);
 }
 
 void
diff --git a/src/hid/gtk/gui-drc-window.c b/src/hid/gtk/gui-drc-window.c
index 674e495..6d50d16 100644
--- a/src/hid/gtk/gui-drc-window.c
+++ b/src/hid/gtk/gui-drc-window.c
@@ -260,7 +260,7 @@ row_activated_cb (GtkTreeView *view, GtkTreePath *path,
   if (violation == NULL)
     return;
 
-  CenterDisplay (violation->x_coord, violation->y_coord, false);
+  CenterDisplay (violation->x_coord, violation->y_coord);
 }
 
 
diff --git a/src/misc.c b/src/misc.c
index ce2ab4a..befeeed 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -769,17 +769,12 @@ GetDataBoundingBox (DataTypePtr Data)
  * coordinates
  */
 void
-CenterDisplay (LocationType X, LocationType Y, bool Delta)
+CenterDisplay (LocationType X, LocationType Y)
 {
   double save_grid = PCB->Grid;
   PCB->Grid = 1;
-  if (Delta)
-    MoveCrosshairRelative (X, Y);
-  else
-    {
-      if (MoveCrosshairAbsolute (X, Y))
-        notify_crosshair_change (true);
-    }
+  if (MoveCrosshairAbsolute (X, Y))
+    notify_crosshair_change (true);
   gui->set_crosshair (Crosshair.X, Crosshair.Y, HID_SC_WARP_POINTER);
   PCB->Grid = save_grid;
 }
diff --git a/src/misc.h b/src/misc.h
index 45d6e52..7926460 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -59,7 +59,7 @@ bool IsLayerNumEmpty (int);
 bool IsLayerGroupEmpty (int);
 bool IsPasteEmpty (int);
 BoxTypePtr GetDataBoundingBox (DataTypePtr);
-void CenterDisplay (LocationType, LocationType, bool);
+void CenterDisplay (LocationType, LocationType);
 void SetFontInfo (FontTypePtr);
 int ParseGroupString (char *, LayerGroupTypePtr, int /* LayerN */);
 int ParseRouteString (char *, RouteStyleTypePtr, const char *);

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

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

The branch, master has been updated
       via  481fe9e27df67e93921d20cac95a38c49ea6a664 (commit)
       via  73ee8734a76611b4356d52db0cd067e1013743a3 (commit)
      from  17ba60b0515558fdcaaa1af4371cc3dfda657de9 (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
=========

 po/POTFILES.in                          |    4 ++--
 src/Makefile.am                         |   22 ++++++++++++++++------
 src/{gpcb-menu.res => gpcb-menu.res.in} |    0 
 src/{pcb-menu.res => pcb-menu.res.in}   |    2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)
 rename src/{gpcb-menu.res => gpcb-menu.res.in} (100%)
 rename src/{pcb-menu.res => pcb-menu.res.in} (99%)


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

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

    Generate pcb-menu.res and gpcb-menu.res from ".in" files
    
    No functional changes here, just a preliminary cleaning before
    adding the topological autorouter to the menus. Doing so requies
    conditional inclusion of certain lines, as the toporouter is not
    always built.
    
    Based on a patch by Stanislav Brabec <sb...@su...>
    
    Affects-bug: lp-812429

:100644 100644 0e5e331... 8d62595... M	po/POTFILES.in
:100644 100644 7efb2d7... 75c6886... M	src/Makefile.am
:100644 000000 dc594c4... 0000000... D	src/gpcb-menu.res
:000000 100644 0000000... dc594c4... A	src/gpcb-menu.res.in
:100644 000000 1e88e52... 0000000... D	src/pcb-menu.res
:000000 100644 0000000... 1e88e52... A	src/pcb-menu.res.in

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

    pcb-menu.res: Fixup some more whitespace

:100644 100644 bda9bd7... 1e88e52... M	src/pcb-menu.res

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

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

    Generate pcb-menu.res and gpcb-menu.res from ".in" files
    
    No functional changes here, just a preliminary cleaning before
    adding the topological autorouter to the menus. Doing so requies
    conditional inclusion of certain lines, as the toporouter is not
    always built.
    
    Based on a patch by Stanislav Brabec <sb...@su...>
    
    Affects-bug: lp-812429

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0e5e331..8d62595 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,7 +16,7 @@ src/edif.c
 src/error.c
 src/file.c
 src/find.c
-src/gpcb-menu.res
+src/gpcb-menu.res.in
 src/hid/batch/batch.c
 src/hid/common/actions.c
 src/hid/common/hidnogui.c
@@ -40,7 +40,7 @@ src/misc.c
 src/move.c
 src/netlist.c
 src/parse_y.c
-src/pcb-menu.res
+src/pcb-menu.res.in
 src/polygon.c
 src/rats.c
 src/report.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7efb2d7..75c6886 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_LIBRARIES = \
 	liblpr.a libgerber.a libbom.a libpng.a libps.a libnelma.a \
 	libgcode.a
 
-pcblib_DATA=	\
+pcblib_DATA= \
 	default_font \
 	gpcb-menu.res \
 	pcb-menu.res
@@ -230,8 +230,8 @@ EXTRA_DIST= \
 	$(srcdir)/hid/png/hid.conf \
 	$(srcdir)/hid/nelma/hid.conf \
 	$(srcdir)/hid/ps/hid.conf \
-	gpcb-menu.res \
-	pcb-menu.res \
+	gpcb-menu.res.in \
+	pcb-menu.res.in \
 	pcbtest.sh.in \
 	dbus.xml
 
@@ -239,16 +239,24 @@ AM_YFLAGS=	-d
 
 all-local: pcbtest.sh
 
+pcb-menu.res : pcb-menu.res.in
+	echo '/* AUTOMATICALLY GENERATED FROM pcb-menu.res.in DO NOT EDIT */' > $@
+	cat ${srcdir}/pcb-menu.res.in >> $@
+
 pcb-menu.h : pcb-menu.res
 	echo '/* AUTOMATICALLY GENERATED FROM pcb-menu.res DO NOT EDIT */' > $@
 	echo 'const char *pcb_menu_default[] = {' >> $@
-	sed 's/\\/\\\\/g; s/"/\\"/g; s/^/"/; s/$$/",/' < ${srcdir}/pcb-menu.res >> $@
+	sed 's/\\/\\\\/g; s/"/\\"/g; s/^/"/; s/$$/",/' < pcb-menu.res >> $@
 	echo '0};' >> $@
 
+gpcb-menu.res : gpcb-menu.res.in
+	echo '/* AUTOMATICALLY GENERATED FROM gpcb-menu.res.in DO NOT EDIT */' > $@
+	cat ${srcdir}/gpcb-menu.res.in >> $@
+
 gpcb-menu.h : gpcb-menu.res
 	echo '/* AUTOMATICALLY GENERATED FROM gpcb-menu.res DO NOT EDIT */' > $@
 	echo 'const char *gpcb_menu_default[] = {' >> $@
-	sed 's/\\/\\\\/g; s/"/\\"/g; s/^/"/; s/$$/",/' < ${srcdir}/gpcb-menu.res >> $@
+	sed 's/\\/\\\\/g; s/"/\\"/g; s/^/"/; s/$$/",/' < gpcb-menu.res >> $@
 	echo '0};' >> $@
 
 hid/common/hidlist.h : Makefile
@@ -449,7 +457,9 @@ DISTCLEANFILES= pcbtest.sh gpcb-menu.h pcb-menu.h \
 	hid/nelma/nelma_lists.h \
 	hid/ps/ps_lists.h \
 	core_lists.h \
-	dbus-introspect.h
+	dbus-introspect.h \
+	gpcb-menu.res \
+	pcb-menu.res
 
 # create wrapper script that lets you test pcb prior to installation
 pcbtest.sh:	$(srcdir)/pcbtest.sh.in Makefile
diff --git a/src/gpcb-menu.res b/src/gpcb-menu.res
deleted file mode 100644
index dc594c4..0000000
--- a/src/gpcb-menu.res
+++ /dev/null
@@ -1,532 +0,0 @@
-# -*- c -*-
-# Note - gpcb-menu.res is used to build gpcb-menu.h
-# Note - parameters are sensitive to extra spaces around the commas
-
-Mouse =
-{
-  Left = {
-    Mode(Notify)
-    ctrl = { Mode(Save) Mode(None) Mode(Restore) Mode(Notify) }
-    shift-ctrl = { Mode(Save) Mode(Remove) Mode(Notify) Mode(Restore) }
-    up = Mode(Release)
-  }
-  Right = {
-    Pan(1)
-    up = Pan(0)
-    shift = Popup(Popup1)
-    ctrl = Display(CycleCrosshair)
-  }
-  Middle = {
-    Mode(Stroke)
-    up = Mode(Release)
-    ctrl = { Mode(Save) Mode(Copy) Mode(Notify) }
-    up-ctrl = { Mode(Notify) Mode(Restore) }
-    shift-ctrl = { Display(ToggleRubberbandMode) Mode(Save) Mode(Move) Mode(Notify) }
-    up-shift-ctrl = { Mode(Notify) Mode(Restore) Display(ToggleRubberbandMode) }
-  }
-  Up = {
-    Zoom(0.8)
-    shift = Scroll(up)
-    ctrl = Scroll(left)
-  }
-  Down = {
-    Zoom(1.25)
-    shift = Scroll(down)
-    ctrl = Scroll(right)
-  }
-# If you want zoom to center, do this instead.
-  #Up = { {Zoom(0.8) Center()} }
-  #Down = { {Zoom(1.25) Center()} }
-}
-
-MainMenu =
-{
-
-#
-# File Menu
-#
-  {"File"
-   {"Save Layout" Save(Layout) tip="Saves current layout" m=S a={"Ctrl-S" "Ctrl<Key>s"}}
-   {"Save Layout As..." Save(LayoutAs) tip="Saves current layout into a new file" m=A a={"Shift Ctrl-S" "Shift Ctrl<Key>s"}}
-   -
-   {"Revert" Load(Revert,none) tip="Revert to the layout stored on disk"}
-   -
-   {"Import Schematics" Import() }
-   {"Load layout" Load(Layout) tip="Load a layout from a file"}
-   {"Load element data to paste-buffer" PasteBuffer(Clear) Load(ElementTobuffer)}
-   {"Load layout data to paste-buffer" PasteBuffer(Clear) Load(LayoutTobuffer)}
-   {"Load netlist file" Load(Netlist)}
-   {"Load vendor resource file" LoadVendorFrom()}
-   -
-   {"Save connection data of"
-     {" a single element" GetXY(Click to set the element mark <>) Save(ElementConnections)}
-     {" all elements" Save(AllConnections)}
-     {" unused pins" Save(AllUnusedPins)}
-   }
-   -
-   {"Print layout..." Print()}
-   {"Export layout..." Export()}
-   {"Calibrate Printer..." PrintCalibrate()}
-   -
-   {"Start New Layout" New() a={"Ctrl-N" "Ctrl<Key>n"}}
-   -
-   {"Preferences..." DoWindows(Preferences)}
-   -
-   {"Quit Program" Quit()  a={"Ctrl-Q" "Ctrl<Key>q"}}
-  }
-
-#
-# Edit Menu
-#
-  {"Edit"
-   {"Undo last operation" Undo() a={"U" "<Key>u"}}
-   {"Redo last undone operation" Redo() a={"Shift-R" "Shift<Key>r"}}
-   {"Clear undo-buffer" Undo(ClearList) a={"Shift-Ctrl-U" "Shift Ctrl<Key>u"}}
-   -
-   {"Cut selection to buffer" GetXY(Click to set the snap point for this buffer)
-    PasteBuffer(Clear) PasteBuffer(AddSelected) RemoveSelected() Mode(PasteBuffer)
-    a={"Ctrl-X" "Ctrl<Key>x"}}
-   {"Copy selection to buffer" GetXY(Click to set the snap point for this buffer)
-    PasteBuffer(Clear) PasteBuffer(AddSelected) Unselect(All) Mode(PasteBuffer)
-    a={"Ctrl-C" "Ctrl<Key>c"}}
-   {"Paste buffer to layout" Mode(PasteBuffer) a={"Ctrl-V" "Ctrl<Key>v"}}
-   -
-   {"Unselect all" Unselect(All) a={"Shift-Alt-A" "Shift Alt<Key>a"}}
-   {"Select all visible" Select(All) a={"Alt-A" "Alt<Key>a"}}
-   -
-   {"Edit name of"
-     {"text on layout" ChangeName(Object) a={"N" "<Key>n"}}
-     {"layout" ChangeName(Layout)}
-     {"active layer" ChangeName(Layer)}
-   }
-   {"Edit attributes of"
-    {"Layout" Attributes(Layout)}
-    {"CurrentLayer" Attributes(Layer)}
-    {"Element" Attributes(Element)}
-   }
-   -
-   {"Route Styles" @routestyles
-    -
-    {"Edit..." AdjustStyle(0)}
-   }
-  }
-
-#
-# View Menu
-#
-  {"View"
-   {"Enable visible grid" checked=drawgrid Display(Grid)}
-   {"Grid units"
-    {"mil" checked=grid_units_mm,0 SetUnits(mil)}
-    {"mm"  checked=grid_units_mm,1 SetUnits(mm)}
-   }
-   {"Grid size"
-    {"No Grid" checked=gridsize,1 SetValue(Grid,1)}
-    -
-    {  "0.1 mil" checked=gridsize,10 SetUnits(mil) SetValue(Grid,10)}
-    {  "1 mil"   checked=gridsize,100 SetUnits(mil) SetValue(Grid,100)}
-    {  "5 mil"   checked=gridsize,500 SetUnits(mil) SetValue(Grid,500)}
-    { "10 mil"   checked=gridsize,1000 SetUnits(mil) SetValue(Grid,1000)}
-    { "25 mil"   checked=gridsize,2500 SetUnits(mil) SetValue(Grid,2500)}
-    { "50 mil"   checked=gridsize,5000 SetUnits(mil) SetValue(Grid,5000)}
-    {"100 mil"   checked=gridsize,10000 SetUnits(mil) SetValue(Grid,10000)}
-    -
-    {"0.01 mm" checked=gridsize,39 SetUnits(mm) SetValue(Grid,0.01mm)}
-    {"0.05 mm" checked=gridsize,197 SetUnits(mm) SetValue(Grid,0.05mm)}
-    {"0.1 mm"  checked=gridsize,394 SetUnits(mm) SetValue(Grid,0.1mm)}
-    {"0.25 mm" checked=gridsize,984 SetUnits(mm) SetValue(Grid,0.25mm)}
-    {"0.5 mm"  checked=gridsize,1969 SetUnits(mm) SetValue(Grid,0.5mm)}
-    {"1 mm"    checked=gridsize,3937 SetUnits(mm) SetValue(Grid,1mm)}
-    -
-    {"Grid -5mil" SetValue(Grid,-5,mil) a={"Shift-G" "Shift<Key>g"}}
-    {"Grid +5mil" SetValue(Grid,+5,mil) a={"G" "<Key>g"}}
-    {"Grid -0.05mm" SetValue(Grid,-0.05,mm) a={"Shift-Ctrl-G" "Shift Ctrl<Key>g"}}
-    {"Grid +0.05mm" SetValue(Grid,+0.05,mm) a={"Ctrl-G" "Ctrl<Key>g"}}
-   }
-   {"Realign grid" GetXY(Click to set the grid origin) Display(ToggleGrid)}
-   -
-   {"Displayed element name"
-    {"Description" Display(Description) checked=elementname,1}
-    {"Reference Designator" Display(NameOnPCB) checked=elementname,2}
-    {"Value" Display(Value) checked=elementname,3}
-   }
-   {"Enable Pinout shows number" checked=shownumber Display(ToggleName)}
-   {"Pins/Via show Name/Number" Display(PinOrPadName) a={"D" "<Key>d"}}
-   -
-   {"Zoom In 20%" Zoom(-1.2) m=Z a={"Z" "<Key>z"}}
-   {"Zoom Out 20%" Zoom(+1.2) m=O a={"Shift-Z" "Shift<Key>z"}}
-   {"More zooms and view changes"
-    {"Zoom Max" Zoom() m=M a={"V" "<Key>v"}}
-    {"Zoom In 2X" Zoom(-2)}
-    {"Zoom Out 2X" Zoom(+2)}
-    {"Zoom to 0.1mil/px" Zoom(=10)}
-    {"Zoom to 0.01mm/px" Zoom(=39.37)}
-    {"Zoom to 1mil/px" Zoom(=100)}
-    {"Zoom to 0.05mm/px" Zoom(=196.8504)}
-    {"Zoom to 2.5mil/px" Zoom(=250)}
-    {"Zoom to 0.1mm/px" Zoom(=393.7)}
-    {"Zoom to 10mil/px" Zoom(=1000)}
-    {"Zoom In 20% and center" Zoom(-1.2) Center() m=Z }
-    {"Zoom Out 20% and center" Zoom(+1.2) Center() m=O }
-    {"Flip up/down" checked=flip_y SwapSides(V) a={"Tab" "<Key>Tab"}}
-    {"Flip left/right" checked=flip_x SwapSides(H) a={"Shift-Tab" "Shift<Key>Tab"}}
-    {"Spin 180 degrees" SwapSides(R) a={"Ctrl-Tab" "Ctrl<Key>Tab"}}
-    {"Swap Sides" SwapSides() a={"Ctrl-Shift-Tab" "Ctrl Shift<Key>Tab"}}
-    {"Center cursor" Center() a={"C" "<Key>c"}}
-   }
-   -
-   {"Shown Layers"
-    @layerview
-    -
-    {"Edit Layer Groups" EditLayerGroups()}
-   }
-   {"Current Layer"
-    @layerpick
-    -
-    {"Delete current layer" MoveLayer(c,-1)}
-    {"Add new layer" MoveLayer(-1,c)}
-    {"Move current layer up" MoveLayer(c,up)}
-    {"Move current layer down" MoveLayer(c,down)}
-   }
-  }
-
-#
-# Settings menu
-#
-  {"Settings"
-   {"'All-direction' lines" checked=alldirection Display(Toggle45Degree) a={"." "<Key>."}}
-   {"Auto swap line start angle" checked=swapstartdir Display(ToggleStartDirection)}
-   {"Orthogonal moves" checked=orthomove Display(ToggleOrthoMove)}
-   {"Crosshair snaps to pins and pads" checked=snappin Display(ToggleSnapPin)}
-   {"Crosshair shows DRC clearance" checked=showdrc Display(ToggleShowDRC)}
-   {"Auto enforce DRC clearance" checked=autodrc Display(ToggleAutoDRC)}
-   {"Lock Names" checked=locknames Display(ToggleLockNames)}
-   {"Only Names" checked=onlynames Display(ToggleOnlyNames)}
-   {"Hide Names" checked=hidenames Display(ToggleHideNames)}
-   -
-   {"Rubber band mode" checked=rubberband Display(ToggleRubberBandMode)}
-   {"Require unique element names" checked=uniquename Display(ToggleUniqueNames)}
-   {"Auto-zero delta measurements" checked=localref Display(ToggleLocalRef)}
-   {"New lines, arcs clear polygons" checked=clearnew Display(ToggleClearLine)}
-   {"New polygons are full ones" checked=newfullpoly Display(ToggleFullPoly)}
-   {"Show autorouter trials" checked=liveroute Display(ToggleLiveRoute)}
-   {"Thin draw" checked=thindraw Display(ToggleThindraw) a={"|" "<Key>|"}}
-   {"Thin draw poly" checked=thindrawpoly Display(ToggleThindrawPoly) a={"Ctrl-Shift-P" "Ctrl Shift<Key>p"}}
-   {"Check polygons" checked=checkplanes Display(ToggleCheckPlanes)}
-   -
-   {"Vendor drill mapping" ToggleVendor() checked=VendorMapOn}
-   {"Import New Elements at" m=I
-    {" Center" Import(setnewpoint,center) m=C}
-    {" Mark" Import(setnewpoint,mark) m=M}
-    {" Crosshair" Import(setnewpoint) m=h}
-    -
-    {"Set Dispersion" Import(setdisperse) m=D}
-   }
-  }
-
-#
-# Select menu
-#
-  {"Select"
-   {"Select all visible objects" Select(All)}
-   {"Select all connected objects" Select(Connection)}
-   -
-   {"Unselect all objects" Unselect(All)}
-   {"unselect all connected objects" Unselect(Connection)}
-   -
-   {"Select by name"
-    {"All objects" Select(ObjectByName) active=have_regex}
-    {"Elements" Select(ElementByName) active=have_regex}
-    {"Pads" Select(PadByName) active=have_regex}
-    {"Pins" Select(PinByName) active=have_regex}
-    {"Text" Select(TextByName) active=have_regex}
-    {"Vias" Select(ViaByName) active=have_regex}
-   }
-   -
-   {"Auto-place selected elements" AutoPlaceSelected() a={"Ctrl-P" "Ctrl<Key>p"}}
-   {"Disperse all elements" DisperseElements(All)}
-   {"Disperse selected elements" DisperseElements(Selected)}
-   -
-   {"Move selected elements to other side" Flip(SelectedElements) a={"Shift-B" "Shift<Key>b"}}
-   {"Move selected to current layer" MoveToCurrentLayer(Selected) a={"Shift-M" "Shift<Key>m"}}
-   {"Remove selected objects" RemoveSelected() a={"Shift-Delete" "Shift<Key>Delete"}}
-   {"Convert selection to element" Select(Convert)}
-   -
-   {"Optimize selected rats" DeleteRats(SelectedRats) AddRats(SelectedRats)}
-   {"Auto-route selected rats" AutoRoute(SelectedRats) a={"Alt-R" "Alt<Key>r"}}
-   {"Rip up selected auto-routed tracks" RipUp(Selected)}
-   -
-   {"Change size of selected objects"
-    {"Lines -10 mil" ChangeSize(SelectedLines,-10,mil) ChangeSize(SelectedArcs,-10,mil)}
-    {"Lines +10 mil" ChangeSize(SelectedLines,+10,mil) ChangeSize(SelectedArcs,+10,mil)}
-    {"Pads -10 mil" ChangeSize(SelectedPads,-10,mil)}
-    {"Pads +10 mil" ChangeSize(SelectedPads,+10,mil)}
-    {"Pins -10 mil" ChangeSize(SelectedPins,-10,mil)}
-    {"Pins +10 mil" ChangeSize(SelectedPins,+10,mil)}
-    {"Texts -10 mil" ChangeSize(SelectedTexts,-10,mil)}
-    {"Texts +10 mil" ChangeSize(SelectedTexts,+10,mil)}
-    {"Vias -10 mil" ChangeSize(SelectedVias,-10,mil)}
-    {"Vias +10 mil" ChangeSize(SelectedVias,+10,mil)}
-   }
-   -
-   {"Change drilling hole of selected objects"
-    {"Vias -10 mil" ChangeDrillSize(SelectedVias,-10,mil)}
-    {"Vias +10 mil" ChangeDrillSize(SelectedVias,+10,mil)}
-    {"Pins -10 mil" ChangeDrillSize(SelectedPins,-10,mil)}
-    {"Pins +10 mil" ChangeDrillSize(SelectedPins,+10,mil)}
-   }
-   -
-   {"Change square-flag of selected objects"
-    {"Elements" ChangeSquare(SelectedElements)}
-    {"Pins" ChangeSquare(SelectedPins)}
-   }
-  }
-
-#
-# Buffer menu
-#
-  {"Buffer"
-   {"Cut selection to buffer" GetXY(Click to set the snap point for this buffer)
-    PasteBuffer(Clear) PasteBuffer(AddSelected) RemoveSelected() Mode(PasteBuffer)}
-   {"Paste buffer to layout" Mode(PasteBuffer)}
-   -
-   {"Rotate buffer 90 deg CCW" Mode(PasteBuffer) PasteBuffer(Rotate,1)
-    a={"Shift-F7" "Shift<Key>F7"}}
-   {"Rotate buffer 90 deg CW" Mode(PasteBuffer) PasteBuffer(Rotate,3)}
-   {"Arbitrarily Rotate Buffer" Mode(PasteBuffer) FreeRotateBuffer()}
-   {"Mirror buffer (up/down)" Mode(PasteBuffer) PasteBuffer(Mirror)}
-   {"Mirror buffer (left/right)" Mode(PasteBuffer) PasteBuffer(Rotate,1)
-    PasteBuffer(Mirror) PasteBuffer(Rotate,3)}
-   -
-   {"Clear buffer" PasteBuffer(Clear)}
-   {"Convert buffer to element" PasteBuffer(Convert)}
-   {"Break buffer elements to pieces" PasteBuffer(Restore)}
-   {"Save buffer elements to file" Save(PasteBuffer)}
-   -
-   {"Select Buffer #1" checked=buffer,1 PasteBuffer(1) m=1 a={"Shift-1" "Shift<Key>1"}}
-   {"Select Buffer #2" checked=buffer,2 PasteBuffer(2) m=2 a={"Shift-2" "Shift<Key>2"}}
-   {"Select Buffer #3" checked=buffer,3 PasteBuffer(3) m=3 a={"Shift-3" "Shift<Key>3"}}
-   {"Select Buffer #4" checked=buffer,4 PasteBuffer(4) m=4 a={"Shift-4" "Shift<Key>4"}}
-   {"Select Buffer #5" checked=buffer,5 PasteBuffer(5) m=5 a={"Shift-5" "Shift<Key>5"}}
-  }
-
-#
-# Connects menu
-#
-  {"Connects"
-   {"Lookup connection to object" GetXY(Click on the object) Connection(Find) a={"Ctrl-F" "Ctrl<Key>f"}}
-   {"Reset scanned pads/pins/vias" Connection(ResetPinsViasAndPads) Display(Redraw)}
-   {"Reset scanned lines/polygons" Connection(ResetLinesAndPolygons) Display(Redraw)}
-   {"Reset all connections" Connection(Reset) Display(Redraw) a={"Shift-F" "Shift<Key>f"}}
-   -
-   {"Optimize rats nest" Atomic(Save) DeleteRats(AllRats)
-    Atomic(Restore) AddRats(AllRats) Atomic(Block) a={"O" "<Key>o"}}
-   {"Erase rats nest" DeleteRats(AllRats) a={"E" "<Key>e"}}
-   {"Erase selected rats" DeleteRats(SelectedRats) a={"Shift-E" "Shift<Key>e"}}
-   -
-   {"Auto-route selected rats" AutoRoute(Selected)}
-   {"Auto-route all rats" AutoRoute(AllRats)}
-   {"Rip up all auto-routed tracks" RipUp(All)}
-   -
-   {"Optimize routed tracks"
-    {"Auto-Optimize" djopt(auto)  a={"Shift-=" "Shift<Key>="}}
-    {"Debumpify" djopt(debumpify) }
-    {"Unjaggy" djopt(unjaggy) }
-    {"Vianudge" djopt(vianudge) }
-    {"Viatrim" djopt(viatrim) }
-    {"Ortho pull" djopt(orthopull) }
-    {"Simple optimization" djopt(simple)  a={"=" "<Key>="}}
-    {"Miter" djopt(miter) }
-    {"Puller" a={"Y" "<Key>y"} Puller() }
-    {"Global Puller"
-     {"Selected" GlobalPuller(selected) }
-     {"Found" GlobalPuller(found) }
-     {"All" GlobalPuller() }
-    }
-    -
-    {"Only autorouted nets" OptAutoOnly() checked=optautoonly}
-   }
-   -
-   {"Design Rule Checker" DRC()}
-   -
-   {"Apply vendor drill mapping" ApplyVendor()}
-  }
-
-#
-# Info Menu
-#
-  {"Info"
-   {"Generate object report" ReportObject() a={"Ctrl-R" "Ctrl<Key>r"}}
-   {"Generate drill summary" Report(DrillReport)}
-   {"Report found pins/pads" Report(FoundPins)}
-   {"Key Bindings"
-    {"Remove" a={"Delete" "<Key>Delete"}
-     Mode(Save)
-     Mode(Remove)
-     Mode(Notify)
-     Mode(Restore)
-    }
-    {"Remove Selected" a={"Backspace" "<Key>BackSpace"}
-     RemoveSelected()
-    }
-    {"Remove Connected" a={"Shift-Backspace" "Shift<Key>BackSpace"}
-     Atomic(Save)
-     Connection(Reset)
-     Atomic(Restore)
-     Unselect(All)
-     Atomic(Restore)
-     Connection(Find)
-     Atomic(Restore)
-     Select(Connection)
-     Atomic(Restore)
-     RemoveSelected()
-     Atomic(Restore)
-     Connection(Reset)
-     Atomic(Restore)
-     Unselect(All)
-     Atomic(Block)
-    }
-    {"Remove Connected"
-     Atomic(Save)
-     Connection(Reset)
-     Atomic(Restore)
-     Unselect(All)
-     Atomic(Restore)
-     Connection(Find)
-     Atomic(Restore)
-     Select(Connection)
-     Atomic(Restore)
-     RemoveSelected()
-     Atomic(Restore)
-     Connection(Reset)
-     Atomic(Restore)
-     Unselect(All)
-     Atomic(Block)
-    }
-    {"Set Same" a={"A" "<Key>a"} SetSame()}
-    {"Flip Object" a={"B" "<Key>b"} Flip(Object)}
-    {"Find Connections" a={"F" "<Key>f"} Connection(Reset) Connection(Find)}
-    {"ToggleHideName Object" a={"H" "<Key>h"} ToggleHideName(Object)}
-    {"ToggleHideName SelectedElement" a={"Shift-H" "Shift<Key>h"} ToggleHideName(SelectedElements)}
-    {"ChangeHole Object" a={"Ctrl-H" "Ctrl<Key>h"} ChangeHole(Object)}
-    {"ChangeJoin Object" a={"J" "<Key>j"} ChangeJoin(Object)}
-    {"ChangeJoin SelectedObject" a={"Shift-J" "Shift<Key>j"} ChangeJoin(SelectedObjects)}
-    {"Clear Object +2 mil" a={"K" "<Key>k"} ChangeClearSize(Object,+2,mil)}
-    {"Clear Object -2 mil" a={"Shift-K" "Shift<Key>k"} ChangeClearSize(Object,-2,mil)}
-    {"Clear Selected +2 mil" a={"Ctrl-K" "Ctrl<Key>k"} ChangeClearSize(SelectedObjects,+2,mil)}
-    {"Clear Selected -2 mil" a={"Shift-Ctrl-K" "Shift Ctrl<Key>k"} ChangeClearSize(SelectedObjects,-2,mil)}
-    {"Line Tool size +5 mil" a={"L" "<Key>l"} SetValue(LineSize,+5,mil)}
-    {"Line Tool size -5 mil" a={"Shift-L" "Shift<Key>l"} SetValue(LineSize,-5,mil)}
-    {"Move Object to current layer" a={"M" "<Key>m"} MoveToCurrentLayer(Object)}
-    {"MarkCrosshair" a={"Ctrl-M" "Ctrl<Key>m"} MarkCrosshair()}
-    {"Select shortest rat" a={"Shift-N" "Shift<Key>n"} AddRats(Close)}
-    {"AddRats to selected pins" a={"Shift-O" "Shift<Key>o"}
-     Atomic(Save)
-     DeleteRats(AllRats)
-     Atomic(Restore)
-     AddRats(SelectedRats)
-     Atomic(Block) }
-    {"ChangeOctagon Object" a={"Ctrl-O" "Ctrl<Key>o"} ChangeOctagon(Object)}
-    {"Polygon PreviousPoint" a={"P" "<Key>p"} Polygon(PreviousPoint)}
-    {"Polygon Close" a={"Shift-P" "Shift<Key>p"} Polygon(Close)}
-    {"ChangeSquare Object" a={"Q" "<Key>q"} ChangeSquare(ToggleObject)}
-    {"ChangeSize +5 mil" a={"S" "<Key>s"} ChangeSize(Object,+5,mil)}
-    {"ChangeSize -5 mil" a={"Shift-S" "Shift<Key>s"} ChangeSize(Object,-5,mil)}
-    {"ChangeDrill +5 mil" a={"Alt-S" "Alt<Key>s"} ChangeDrillSize(Object,+5,mil)}
-    {"ChangeDrill -5 mil" a={"Alt-Shift-S" "Alt Shift<Key>s"} ChangeDrillSize(Object,-5,mil)}
-    {"Text Tool scale +10 mil" a={"T" "<Key>t"} SetValue(TextScale,+10,mil)}
-    {"Text Tool scale -10 mil" a={"Shift-T" "Shift<Key>t"} SetValue(TextScale,-10,mil)}
-    {"Via Tool size +5 mil" a={"Shift-V" "Shift<Key>v"} SetValue(ViaSize,+5,mil)}
-    {"Via Tool size -5 mil" a={"Shift-Ctrl-V" "Shift Ctrl<Key>v"} SetValue(ViaSize,-5,mil)}
-    {"Via Tool drill +5 mil" a={"Alt-V" "Alt<Key>v"} SetValue(ViaDrillingHole,+5,mil)}
-    {"Via Tool drill -5 mil" a={"Alt-Shift-V" "Alt Shift<Key>v"} SetValue(ViaDrillingHole,-5,mil)}
-    {"AddRats Selected" a={"Shift-W" "Shift<Key>w"} AddRats(SelectedRats)}
-    {"Add All Rats" a={"W" "<Key>w"} AddRats(AllRats)}
-    {"Cycle Clip" a={"/" "<Key>/"} Display(CycleClip)}
-    {"Arrow Mode" a={"Space" "<Key>space"} Mode(Arrow) checked=arrowmode,1}
-    {"Temp Arrow ON" a={"[" "<Key>["} Mode(Save) Mode(Arrow) Mode(Notify)}
-    {"Temp Arrow OFF" a={"]" "<Key>]"} Mode(Release) Mode(Restore)}
-    -
-    {"Step Up" a={"Up" "<Key>Up"} Cursor(Warp,0,1,grid)}
-    {"Step Down" a={"Down" "<Key>Down"} Cursor(Warp,0,-1,grid)}
-    {"Step Left" a={"Left" "<Key>Left"} Cursor(Warp,-1,0,grid)}
-    {"Step Right" a={"Right" "<Key>Right"} Cursor(Warp,1,0,grid)}
-    {"Step +Up" a={"Up" "Shift<Key>Up"} Cursor(Pan,0,50,view)}
-    {"Step +Down" a={"Down" "Shift<Key>Down"} Cursor(Pan,0,-50,view)}
-    {"Step +Left" a={"Left" "Shift<Key>Left"} Cursor(Pan,-50,0,view)}
-    {"Step +Right" a={"Right" "Shift<Key>Right"} Cursor(Pan,50,0,view)}
-    {'"Click"' a={"Enter" "<Key>Enter"} Mode(Notify) Mode(Release)}
-    -
-   }
-  }
-
-#
-# Window Menu
-#
-  {"Window"
-   {"Library" DoWindows(Library) a={"i" "<Key>i"}}
-   {"Message Log" DoWindows(Log)}
-   {"DRC Check" DoWindows(DRC)}
-   {"Netlist" DoWindows(Netlist)}
-   {"Command Entry" Command() a={":" "<Key>:"}}
-   {"Pinout" Display(Pinout) a={"Shift-D" "Shift<Key>d"}}
-   -
-   {"About..." About()}
-  }
-}
-
-PopupMenus =
-  {
-    Popup1 =
-    {
-      {"Operations on selections"
-       {"Unselect all objects" Unselect(All)}
-       {"Remove selected objects" RemoveSelected()}
-       {"Copy selection to buffer"
-        GetXY(Click to set the snap point for this buffer)
-        PasteBuffer(Clear)
-        PasteBuffer(AddSelected)
-        Mode(PasteBuffer)
-       }
-       {"Cut selection to buffer"
-        GetXY(Click to set the snap point for this buffer)
-        PasteBuffer(Clear)
-        PasteBuffer(AddSelected)
-        RemoveSelected()
-        Mode(PasteBuffer)
-       }
-       {"Convert selection to element" Select(Convert)}
-       {"Auto place selected elements" AutoPlaceSelected()}
-       {"Autoroute selected elements" AutoRoute(SelectedRats)}
-       {"Rip up selected auto-routed tracks" RipUp(Selected)}
-      }
-      {"Operations on this location"
-       {"Generate object report" GetXY(Click on the object) Report(Object)}
-      }
-      -
-      {"Undo last operation" Undo()}
-      {"Redo last undone operation" Redo()}
-      -
-      {Tools
-       {"None" checked=nomode,1 Mode(None)}
-       {"Via" checked=viamode,1 Mode(Via) a={"F1" "<Key>F1"}}
-       {"Line" checked=linemode,1 Mode(Line) a={"F2" "<Key>F2"}}
-       {"Arc" checked=arcmode,1 Mode(Arc) a={"F3" "<Key>F3"}}
-       {"Text" checked=textmode,1 Mode(Text) a={"F4" "<Key>F4"}}
-       {"Rectangle" checked=rectanglemode,1 Mode(Rectangle) a={"F5" "<Key>F5"}}
-       {"Polygon" checked=polygonmode,1 Mode(Polygon) a={"F6" "<Key>F6"}}
-       {"Polygon Hole" checked=polygonholemode,1 Mode(PolygonHole)}
-       {"Buffer" checked=pastebuffermode,1 Mode(PasteBuffer) a={"F7" "<Key>F7"}}
-       {"Remove" checked=removemode,1 Mode(Remove) a={"F8" "<Key>F8"}}
-       {"Rotate" checked=rotatemode,1 Mode(Rotate) a={"F9" "<Key>F9"}}
-       {"Thermal" checked=thermalmode,1 Mode(Thermal) a={"F10" "<Key>F10"}}
-       {"Arrow" checked=arrowmode,1 Mode(Arrow)  a={"F11" "<Key>F11"}}
-       {"Insert Point" checked=insertpointmode,1 Mode(InsertPoint) a={"Insert" "<Key>Insert"}}
-       {"Move" checked=movemode,1 Mode(Move)}
-       {"Copy" checked=copymode,1 Mode(Copy)}
-       {"Lock" checked=lockmode,1 Mode(Lock) a={"F12" "<Key>F12"}}
-       {"Cancel" Mode(Escape) a={"Esc" "<Key>Escape"}}
-      }
-    }
-  }
-
diff --git a/src/gpcb-menu.res.in b/src/gpcb-menu.res.in
new file mode 100644
index 0000000..dc594c4
--- /dev/null
+++ b/src/gpcb-menu.res.in
@@ -0,0 +1,532 @@
+# -*- c -*-
+# Note - gpcb-menu.res is used to build gpcb-menu.h
+# Note - parameters are sensitive to extra spaces around the commas
+
+Mouse =
+{
+  Left = {
+    Mode(Notify)
+    ctrl = { Mode(Save) Mode(None) Mode(Restore) Mode(Notify) }
+    shift-ctrl = { Mode(Save) Mode(Remove) Mode(Notify) Mode(Restore) }
+    up = Mode(Release)
+  }
+  Right = {
+    Pan(1)
+    up = Pan(0)
+    shift = Popup(Popup1)
+    ctrl = Display(CycleCrosshair)
+  }
+  Middle = {
+    Mode(Stroke)
+    up = Mode(Release)
+    ctrl = { Mode(Save) Mode(Copy) Mode(Notify) }
+    up-ctrl = { Mode(Notify) Mode(Restore) }
+    shift-ctrl = { Display(ToggleRubberbandMode) Mode(Save) Mode(Move) Mode(Notify) }
+    up-shift-ctrl = { Mode(Notify) Mode(Restore) Display(ToggleRubberbandMode) }
+  }
+  Up = {
+    Zoom(0.8)
+    shift = Scroll(up)
+    ctrl = Scroll(left)
+  }
+  Down = {
+    Zoom(1.25)
+    shift = Scroll(down)
+    ctrl = Scroll(right)
+  }
+# If you want zoom to center, do this instead.
+  #Up = { {Zoom(0.8) Center()} }
+  #Down = { {Zoom(1.25) Center()} }
+}
+
+MainMenu =
+{
+
+#
+# File Menu
+#
+  {"File"
+   {"Save Layout" Save(Layout) tip="Saves current layout" m=S a={"Ctrl-S" "Ctrl<Key>s"}}
+   {"Save Layout As..." Save(LayoutAs) tip="Saves current layout into a new file" m=A a={"Shift Ctrl-S" "Shift Ctrl<Key>s"}}
+   -
+   {"Revert" Load(Revert,none) tip="Revert to the layout stored on disk"}
+   -
+   {"Import Schematics" Import() }
+   {"Load layout" Load(Layout) tip="Load a layout from a file"}
+   {"Load element data to paste-buffer" PasteBuffer(Clear) Load(ElementTobuffer)}
+   {"Load layout data to paste-buffer" PasteBuffer(Clear) Load(LayoutTobuffer)}
+   {"Load netlist file" Load(Netlist)}
+   {"Load vendor resource file" LoadVendorFrom()}
+   -
+   {"Save connection data of"
+     {" a single element" GetXY(Click to set the element mark <>) Save(ElementConnections)}
+     {" all elements" Save(AllConnections)}
+     {" unused pins" Save(AllUnusedPins)}
+   }
+   -
+   {"Print layout..." Print()}
+   {"Export layout..." Export()}
+   {"Calibrate Printer..." PrintCalibrate()}
+   -
+   {"Start New Layout" New() a={"Ctrl-N" "Ctrl<Key>n"}}
+   -
+   {"Preferences..." DoWindows(Preferences)}
+   -
+   {"Quit Program" Quit()  a={"Ctrl-Q" "Ctrl<Key>q"}}
+  }
+
+#
+# Edit Menu
+#
+  {"Edit"
+   {"Undo last operation" Undo() a={"U" "<Key>u"}}
+   {"Redo last undone operation" Redo() a={"Shift-R" "Shift<Key>r"}}
+   {"Clear undo-buffer" Undo(ClearList) a={"Shift-Ctrl-U" "Shift Ctrl<Key>u"}}
+   -
+   {"Cut selection to buffer" GetXY(Click to set the snap point for this buffer)
+    PasteBuffer(Clear) PasteBuffer(AddSelected) RemoveSelected() Mode(PasteBuffer)
+    a={"Ctrl-X" "Ctrl<Key>x"}}
+   {"Copy selection to buffer" GetXY(Click to set the snap point for this buffer)
+    PasteBuffer(Clear) PasteBuffer(AddSelected) Unselect(All) Mode(PasteBuffer)
+    a={"Ctrl-C" "Ctrl<Key>c"}}
+   {"Paste buffer to layout" Mode(PasteBuffer) a={"Ctrl-V" "Ctrl<Key>v"}}
+   -
+   {"Unselect all" Unselect(All) a={"Shift-Alt-A" "Shift Alt<Key>a"}}
+   {"Select all visible" Select(All) a={"Alt-A" "Alt<Key>a"}}
+   -
+   {"Edit name of"
+     {"text on layout" ChangeName(Object) a={"N" "<Key>n"}}
+     {"layout" ChangeName(Layout)}
+     {"active layer" ChangeName(Layer)}
+   }
+   {"Edit attributes of"
+    {"Layout" Attributes(Layout)}
+    {"CurrentLayer" Attributes(Layer)}
+    {"Element" Attributes(Element)}
+   }
+   -
+   {"Route Styles" @routestyles
+    -
+    {"Edit..." AdjustStyle(0)}
+   }
+  }
+
+#
+# View Menu
+#
+  {"View"
+   {"Enable visible grid" checked=drawgrid Display(Grid)}
+   {"Grid units"
+    {"mil" checked=grid_units_mm,0 SetUnits(mil)}
+    {"mm"  checked=grid_units_mm,1 SetUnits(mm)}
+   }
+   {"Grid size"
+    {"No Grid" checked=gridsize,1 SetValue(Grid,1)}
+    -
+    {  "0.1 mil" checked=gridsize,10 SetUnits(mil) SetValue(Grid,10)}
+    {  "1 mil"   checked=gridsize,100 SetUnits(mil) SetValue(Grid,100)}
+    {  "5 mil"   checked=gridsize,500 SetUnits(mil) SetValue(Grid,500)}
+    { "10 mil"   checked=gridsize,1000 SetUnits(mil) SetValue(Grid,1000)}
+    { "25 mil"   checked=gridsize,2500 SetUnits(mil) SetValue(Grid,2500)}
+    { "50 mil"   checked=gridsize,5000 SetUnits(mil) SetValue(Grid,5000)}
+    {"100 mil"   checked=gridsize,10000 SetUnits(mil) SetValue(Grid,10000)}
+    -
+    {"0.01 mm" checked=gridsize,39 SetUnits(mm) SetValue(Grid,0.01mm)}
+    {"0.05 mm" checked=gridsize,197 SetUnits(mm) SetValue(Grid,0.05mm)}
+    {"0.1 mm"  checked=gridsize,394 SetUnits(mm) SetValue(Grid,0.1mm)}
+    {"0.25 mm" checked=gridsize,984 SetUnits(mm) SetValue(Grid,0.25mm)}
+    {"0.5 mm"  checked=gridsize,1969 SetUnits(mm) SetValue(Grid,0.5mm)}
+    {"1 mm"    checked=gridsize,3937 SetUnits(mm) SetValue(Grid,1mm)}
+    -
+    {"Grid -5mil" SetValue(Grid,-5,mil) a={"Shift-G" "Shift<Key>g"}}
+    {"Grid +5mil" SetValue(Grid,+5,mil) a={"G" "<Key>g"}}
+    {"Grid -0.05mm" SetValue(Grid,-0.05,mm) a={"Shift-Ctrl-G" "Shift Ctrl<Key>g"}}
+    {"Grid +0.05mm" SetValue(Grid,+0.05,mm) a={"Ctrl-G" "Ctrl<Key>g"}}
+   }
+   {"Realign grid" GetXY(Click to set the grid origin) Display(ToggleGrid)}
+   -
+   {"Displayed element name"
+    {"Description" Display(Description) checked=elementname,1}
+    {"Reference Designator" Display(NameOnPCB) checked=elementname,2}
+    {"Value" Display(Value) checked=elementname,3}
+   }
+   {"Enable Pinout shows number" checked=shownumber Display(ToggleName)}
+   {"Pins/Via show Name/Number" Display(PinOrPadName) a={"D" "<Key>d"}}
+   -
+   {"Zoom In 20%" Zoom(-1.2) m=Z a={"Z" "<Key>z"}}
+   {"Zoom Out 20%" Zoom(+1.2) m=O a={"Shift-Z" "Shift<Key>z"}}
+   {"More zooms and view changes"
+    {"Zoom Max" Zoom() m=M a={"V" "<Key>v"}}
+    {"Zoom In 2X" Zoom(-2)}
+    {"Zoom Out 2X" Zoom(+2)}
+    {"Zoom to 0.1mil/px" Zoom(=10)}
+    {"Zoom to 0.01mm/px" Zoom(=39.37)}
+    {"Zoom to 1mil/px" Zoom(=100)}
+    {"Zoom to 0.05mm/px" Zoom(=196.8504)}
+    {"Zoom to 2.5mil/px" Zoom(=250)}
+    {"Zoom to 0.1mm/px" Zoom(=393.7)}
+    {"Zoom to 10mil/px" Zoom(=1000)}
+    {"Zoom In 20% and center" Zoom(-1.2) Center() m=Z }
+    {"Zoom Out 20% and center" Zoom(+1.2) Center() m=O }
+    {"Flip up/down" checked=flip_y SwapSides(V) a={"Tab" "<Key>Tab"}}
+    {"Flip left/right" checked=flip_x SwapSides(H) a={"Shift-Tab" "Shift<Key>Tab"}}
+    {"Spin 180 degrees" SwapSides(R) a={"Ctrl-Tab" "Ctrl<Key>Tab"}}
+    {"Swap Sides" SwapSides() a={"Ctrl-Shift-Tab" "Ctrl Shift<Key>Tab"}}
+    {"Center cursor" Center() a={"C" "<Key>c"}}
+   }
+   -
+   {"Shown Layers"
+    @layerview
+    -
+    {"Edit Layer Groups" EditLayerGroups()}
+   }
+   {"Current Layer"
+    @layerpick
+    -
+    {"Delete current layer" MoveLayer(c,-1)}
+    {"Add new layer" MoveLayer(-1,c)}
+    {"Move current layer up" MoveLayer(c,up)}
+    {"Move current layer down" MoveLayer(c,down)}
+   }
+  }
+
+#
+# Settings menu
+#
+  {"Settings"
+   {"'All-direction' lines" checked=alldirection Display(Toggle45Degree) a={"." "<Key>."}}
+   {"Auto swap line start angle" checked=swapstartdir Display(ToggleStartDirection)}
+   {"Orthogonal moves" checked=orthomove Display(ToggleOrthoMove)}
+   {"Crosshair snaps to pins and pads" checked=snappin Display(ToggleSnapPin)}
+   {"Crosshair shows DRC clearance" checked=showdrc Display(ToggleShowDRC)}
+   {"Auto enforce DRC clearance" checked=autodrc Display(ToggleAutoDRC)}
+   {"Lock Names" checked=locknames Display(ToggleLockNames)}
+   {"Only Names" checked=onlynames Display(ToggleOnlyNames)}
+   {"Hide Names" checked=hidenames Display(ToggleHideNames)}
+   -
+   {"Rubber band mode" checked=rubberband Display(ToggleRubberBandMode)}
+   {"Require unique element names" checked=uniquename Display(ToggleUniqueNames)}
+   {"Auto-zero delta measurements" checked=localref Display(ToggleLocalRef)}
+   {"New lines, arcs clear polygons" checked=clearnew Display(ToggleClearLine)}
+   {"New polygons are full ones" checked=newfullpoly Display(ToggleFullPoly)}
+   {"Show autorouter trials" checked=liveroute Display(ToggleLiveRoute)}
+   {"Thin draw" checked=thindraw Display(ToggleThindraw) a={"|" "<Key>|"}}
+   {"Thin draw poly" checked=thindrawpoly Display(ToggleThindrawPoly) a={"Ctrl-Shift-P" "Ctrl Shift<Key>p"}}
+   {"Check polygons" checked=checkplanes Display(ToggleCheckPlanes)}
+   -
+   {"Vendor drill mapping" ToggleVendor() checked=VendorMapOn}
+   {"Import New Elements at" m=I
+    {" Center" Import(setnewpoint,center) m=C}
+    {" Mark" Import(setnewpoint,mark) m=M}
+    {" Crosshair" Import(setnewpoint) m=h}
+    -
+    {"Set Dispersion" Import(setdisperse) m=D}
+   }
+  }
+
+#
+# Select menu
+#
+  {"Select"
+   {"Select all visible objects" Select(All)}
+   {"Select all connected objects" Select(Connection)}
+   -
+   {"Unselect all objects" Unselect(All)}
+   {"unselect all connected objects" Unselect(Connection)}
+   -
+   {"Select by name"
+    {"All objects" Select(ObjectByName) active=have_regex}
+    {"Elements" Select(ElementByName) active=have_regex}
+    {"Pads" Select(PadByName) active=have_regex}
+    {"Pins" Select(PinByName) active=have_regex}
+    {"Text" Select(TextByName) active=have_regex}
+    {"Vias" Select(ViaByName) active=have_regex}
+   }
+   -
+   {"Auto-place selected elements" AutoPlaceSelected() a={"Ctrl-P" "Ctrl<Key>p"}}
+   {"Disperse all elements" DisperseElements(All)}
+   {"Disperse selected elements" DisperseElements(Selected)}
+   -
+   {"Move selected elements to other side" Flip(SelectedElements) a={"Shift-B" "Shift<Key>b"}}
+   {"Move selected to current layer" MoveToCurrentLayer(Selected) a={"Shift-M" "Shift<Key>m"}}
+   {"Remove selected objects" RemoveSelected() a={"Shift-Delete" "Shift<Key>Delete"}}
+   {"Convert selection to element" Select(Convert)}
+   -
+   {"Optimize selected rats" DeleteRats(SelectedRats) AddRats(SelectedRats)}
+   {"Auto-route selected rats" AutoRoute(SelectedRats) a={"Alt-R" "Alt<Key>r"}}
+   {"Rip up selected auto-routed tracks" RipUp(Selected)}
+   -
+   {"Change size of selected objects"
+    {"Lines -10 mil" ChangeSize(SelectedLines,-10,mil) ChangeSize(SelectedArcs,-10,mil)}
+    {"Lines +10 mil" ChangeSize(SelectedLines,+10,mil) ChangeSize(SelectedArcs,+10,mil)}
+    {"Pads -10 mil" ChangeSize(SelectedPads,-10,mil)}
+    {"Pads +10 mil" ChangeSize(SelectedPads,+10,mil)}
+    {"Pins -10 mil" ChangeSize(SelectedPins,-10,mil)}
+    {"Pins +10 mil" ChangeSize(SelectedPins,+10,mil)}
+    {"Texts -10 mil" ChangeSize(SelectedTexts,-10,mil)}
+    {"Texts +10 mil" ChangeSize(SelectedTexts,+10,mil)}
+    {"Vias -10 mil" ChangeSize(SelectedVias,-10,mil)}
+    {"Vias +10 mil" ChangeSize(SelectedVias,+10,mil)}
+   }
+   -
+   {"Change drilling hole of selected objects"
+    {"Vias -10 mil" ChangeDrillSize(SelectedVias,-10,mil)}
+    {"Vias +10 mil" ChangeDrillSize(SelectedVias,+10,mil)}
+    {"Pins -10 mil" ChangeDrillSize(SelectedPins,-10,mil)}
+    {"Pins +10 mil" ChangeDrillSize(SelectedPins,+10,mil)}
+   }
+   -
+   {"Change square-flag of selected objects"
+    {"Elements" ChangeSquare(SelectedElements)}
+    {"Pins" ChangeSquare(SelectedPins)}
+   }
+  }
+
+#
+# Buffer menu
+#
+  {"Buffer"
+   {"Cut selection to buffer" GetXY(Click to set the snap point for this buffer)
+    PasteBuffer(Clear) PasteBuffer(AddSelected) RemoveSelected() Mode(PasteBuffer)}
+   {"Paste buffer to layout" Mode(PasteBuffer)}
+   -
+   {"Rotate buffer 90 deg CCW" Mode(PasteBuffer) PasteBuffer(Rotate,1)
+    a={"Shift-F7" "Shift<Key>F7"}}
+   {"Rotate buffer 90 deg CW" Mode(PasteBuffer) PasteBuffer(Rotate,3)}
+   {"Arbitrarily Rotate Buffer" Mode(PasteBuffer) FreeRotateBuffer()}
+   {"Mirror buffer (up/down)" Mode(PasteBuffer) PasteBuffer(Mirror)}
+   {"Mirror buffer (left/right)" Mode(PasteBuffer) PasteBuffer(Rotate,1)
+    PasteBuffer(Mirror) PasteBuffer(Rotate,3)}
+   -
+   {"Clear buffer" PasteBuffer(Clear)}
+   {"Convert buffer to element" PasteBuffer(Convert)}
+   {"Break buffer elements to pieces" PasteBuffer(Restore)}
+   {"Save buffer elements to file" Save(PasteBuffer)}
+   -
+   {"Select Buffer #1" checked=buffer,1 PasteBuffer(1) m=1 a={"Shift-1" "Shift<Key>1"}}
+   {"Select Buffer #2" checked=buffer,2 PasteBuffer(2) m=2 a={"Shift-2" "Shift<Key>2"}}
+   {"Select Buffer #3" checked=buffer,3 PasteBuffer(3) m=3 a={"Shift-3" "Shift<Key>3"}}
+   {"Select Buffer #4" checked=buffer,4 PasteBuffer(4) m=4 a={"Shift-4" "Shift<Key>4"}}
+   {"Select Buffer #5" checked=buffer,5 PasteBuffer(5) m=5 a={"Shift-5" "Shift<Key>5"}}
+  }
+
+#
+# Connects menu
+#
+  {"Connects"
+   {"Lookup connection to object" GetXY(Click on the object) Connection(Find) a={"Ctrl-F" "Ctrl<Key>f"}}
+   {"Reset scanned pads/pins/vias" Connection(ResetPinsViasAndPads) Display(Redraw)}
+   {"Reset scanned lines/polygons" Connection(ResetLinesAndPolygons) Display(Redraw)}
+   {"Reset all connections" Connection(Reset) Display(Redraw) a={"Shift-F" "Shift<Key>f"}}
+   -
+   {"Optimize rats nest" Atomic(Save) DeleteRats(AllRats)
+    Atomic(Restore) AddRats(AllRats) Atomic(Block) a={"O" "<Key>o"}}
+   {"Erase rats nest" DeleteRats(AllRats) a={"E" "<Key>e"}}
+   {"Erase selected rats" DeleteRats(SelectedRats) a={"Shift-E" "Shift<Key>e"}}
+   -
+   {"Auto-route selected rats" AutoRoute(Selected)}
+   {"Auto-route all rats" AutoRoute(AllRats)}
+   {"Rip up all auto-routed tracks" RipUp(All)}
+   -
+   {"Optimize routed tracks"
+    {"Auto-Optimize" djopt(auto)  a={"Shift-=" "Shift<Key>="}}
+    {"Debumpify" djopt(debumpify) }
+    {"Unjaggy" djopt(unjaggy) }
+    {"Vianudge" djopt(vianudge) }
+    {"Viatrim" djopt(viatrim) }
+    {"Ortho pull" djopt(orthopull) }
+    {"Simple optimization" djopt(simple)  a={"=" "<Key>="}}
+    {"Miter" djopt(miter) }
+    {"Puller" a={"Y" "<Key>y"} Puller() }
+    {"Global Puller"
+     {"Selected" GlobalPuller(selected) }
+     {"Found" GlobalPuller(found) }
+     {"All" GlobalPuller() }
+    }
+    -
+    {"Only autorouted nets" OptAutoOnly() checked=optautoonly}
+   }
+   -
+   {"Design Rule Checker" DRC()}
+   -
+   {"Apply vendor drill mapping" ApplyVendor()}
+  }
+
+#
+# Info Menu
+#
+  {"Info"
+   {"Generate object report" ReportObject() a={"Ctrl-R" "Ctrl<Key>r"}}
+   {"Generate drill summary" Report(DrillReport)}
+   {"Report found pins/pads" Report(FoundPins)}
+   {"Key Bindings"
+    {"Remove" a={"Delete" "<Key>Delete"}
+     Mode(Save)
+     Mode(Remove)
+     Mode(Notify)
+     Mode(Restore)
+    }
+    {"Remove Selected" a={"Backspace" "<Key>BackSpace"}
+     RemoveSelected()
+    }
+    {"Remove Connected" a={"Shift-Backspace" "Shift<Key>BackSpace"}
+     Atomic(Save)
+     Connection(Reset)
+     Atomic(Restore)
+     Unselect(All)
+     Atomic(Restore)
+     Connection(Find)
+     Atomic(Restore)
+     Select(Connection)
+     Atomic(Restore)
+     RemoveSelected()
+     Atomic(Restore)
+     Connection(Reset)
+     Atomic(Restore)
+     Unselect(All)
+     Atomic(Block)
+    }
+    {"Remove Connected"
+     Atomic(Save)
+     Connection(Reset)
+     Atomic(Restore)
+     Unselect(All)
+     Atomic(Restore)
+     Connection(Find)
+     Atomic(Restore)
+     Select(Connection)
+     Atomic(Restore)
+     RemoveSelected()
+     Atomic(Restore)
+     Connection(Reset)
+     Atomic(Restore)
+     Unselect(All)
+     Atomic(Block)
+    }
+    {"Set Same" a={"A" "<Key>a"} SetSame()}
+    {"Flip Object" a={"B" "<Key>b"} Flip(Object)}
+    {"Find Connections" a={"F" "<Key>f"} Connection(Reset) Connection(Find)}
+    {"ToggleHideName Object" a={"H" "<Key>h"} ToggleHideName(Object)}
+    {"ToggleHideName SelectedElement" a={"Shift-H" "Shift<Key>h"} ToggleHideName(SelectedElements)}
+    {"ChangeHole Object" a={"Ctrl-H" "Ctrl<Key>h"} ChangeHole(Object)}
+    {"ChangeJoin Object" a={"J" "<Key>j"} ChangeJoin(Object)}
+    {"ChangeJoin SelectedObject" a={"Shift-J" "Shift<Key>j"} ChangeJoin(SelectedObjects)}
+    {"Clear Object +2 mil" a={"K" "<Key>k"} ChangeClearSize(Object,+2,mil)}
+    {"Clear Object -2 mil" a={"Shift-K" "Shift<Key>k"} ChangeClearSize(Object,-2,mil)}
+    {"Clear Selected +2 mil" a={"Ctrl-K" "Ctrl<Key>k"} ChangeClearSize(SelectedObjects,+2,mil)}
+    {"Clear Selected -2 mil" a={"Shift-Ctrl-K" "Shift Ctrl<Key>k"} ChangeClearSize(SelectedObjects,-2,mil)}
+    {"Line Tool size +5 mil" a={"L" "<Key>l"} SetValue(LineSize,+5,mil)}
+    {"Line Tool size -5 mil" a={"Shift-L" "Shift<Key>l"} SetValue(LineSize,-5,mil)}
+    {"Move Object to current layer" a={"M" "<Key>m"} MoveToCurrentLayer(Object)}
+    {"MarkCrosshair" a={"Ctrl-M" "Ctrl<Key>m"} MarkCrosshair()}
+    {"Select shortest rat" a={"Shift-N" "Shift<Key>n"} AddRats(Close)}
+    {"AddRats to selected pins" a={"Shift-O" "Shift<Key>o"}
+     Atomic(Save)
+     DeleteRats(AllRats)
+     Atomic(Restore)
+     AddRats(SelectedRats)
+     Atomic(Block) }
+    {"ChangeOctagon Object" a={"Ctrl-O" "Ctrl<Key>o"} ChangeOctagon(Object)}
+    {"Polygon PreviousPoint" a={"P" "<Key>p"} Polygon(PreviousPoint)}
+    {"Polygon Close" a={"Shift-P" "Shift<Key>p"} Polygon(Close)}
+    {"ChangeSquare Object" a={"Q" "<Key>q"} ChangeSquare(ToggleObject)}
+    {"ChangeSize +5 mil" a={"S" "<Key>s"} ChangeSize(Object,+5,mil)}
+    {"ChangeSize -5 mil" a={"Shift-S" "Shift<Key>s"} ChangeSize(Object,-5,mil)}
+    {"ChangeDrill +5 mil" a={"Alt-S" "Alt<Key>s"} ChangeDrillSize(Object,+5,mil)}
+    {"ChangeDrill -5 mil" a={"Alt-Shift-S" "Alt Shift<Key>s"} ChangeDrillSize(Object,-5,mil)}
+    {"Text Tool scale +10 mil" a={"T" "<Key>t"} SetValue(TextScale,+10,mil)}
+    {"Text Tool scale -10 mil" a={"Shift-T" "Shift<Key>t"} SetValue(TextScale,-10,mil)}
+    {"Via Tool size +5 mil" a={"Shift-V" "Shift<Key>v"} SetValue(ViaSize,+5,mil)}
+    {"Via Tool size -5 mil" a={"Shift-Ctrl-V" "Shift Ctrl<Key>v"} SetValue(ViaSize,-5,mil)}
+    {"Via Tool drill +5 mil" a={"Alt-V" "Alt<Key>v"} SetValue(ViaDrillingHole,+5,mil)}
+    {"Via Tool drill -5 mil" a={"Alt-Shift-V" "Alt Shift<Key>v"} SetValue(ViaDrillingHole,-5,mil)}
+    {"AddRats Selected" a={"Shift-W" "Shift<Key>w"} AddRats(SelectedRats)}
+    {"Add All Rats" a={"W" "<Key>w"} AddRats(AllRats)}
+    {"Cycle Clip" a={"/" "<Key>/"} Display(CycleClip)}
+    {"Arrow Mode" a={"Space" "<Key>space"} Mode(Arrow) checked=arrowmode,1}
+    {"Temp Arrow ON" a={"[" "<Key>["} Mode(Save) Mode(Arrow) Mode(Notify)}
+    {"Temp Arrow OFF" a={"]" "<Key>]"} Mode(Release) Mode(Restore)}
+    -
+    {"Step Up" a={"Up" "<Key>Up"} Cursor(Warp,0,1,grid)}
+    {"Step Down" a={"Down" "<Key>Down"} Cursor(Warp,0,-1,grid)}
+    {"Step Left" a={"Left" "<Key>Left"} Cursor(Warp,-1,0,grid)}
+    {"Step Right" a={"Right" "<Key>Right"} Cursor(Warp,1,0,grid)}
+    {"Step +Up" a={"Up" "Shift<Key>Up"} Cursor(Pan,0,50,view)}
+    {"Step +Down" a={"Down" "Shift<Key>Down"} Cursor(Pan,0,-50,view)}
+    {"Step +Left" a={"Left" "Shift<Key>Left"} Cursor(Pan,-50,0,view)}
+    {"Step +Right" a={"Right" "Shift<Key>Right"} Cursor(Pan,50,0,view)}
+    {'"Click"' a={"Enter" "<Key>Enter"} Mode(Notify) Mode(Release)}
+    -
+   }
+  }
+
+#
+# Window Menu
+#
+  {"Window"
+   {"Library" DoWindows(Library) a={"i" "<Key>i"}}
+   {"Message Log" DoWindows(Log)}
+   {"DRC Check" DoWindows(DRC)}
+   {"Netlist" DoWindows(Netlist)}
+   {"Command Entry" Command() a={":" "<Key>:"}}
+   {"Pinout" Display(Pinout) a={"Shift-D" "Shift<Key>d"}}
+   -
+   {"About..." About()}
+  }
+}
+
+PopupMenus =
+  {
+    Popup1 =
+    {
+      {"Operations on selections"
+       {"Unselect all objects" Unselect(All)}
+       {"Remove selected objects" RemoveSelected()}
+       {"Copy selection to buffer"
+        GetXY(Click to set the snap point for this buffer)
+        PasteBuffer(Clear)
+        PasteBuffer(AddSelected)
+        Mode(PasteBuffer)
+       }
+       {"Cut selection to buffer"
+        GetXY(Click to set the snap point for this buffer)
+        PasteBuffer(Clear)
+        PasteBuffer(AddSelected)
+        RemoveSelected()
+        Mode(PasteBuffer)
+       }
+       {"Convert selection to element" Select(Convert)}
+       {"Auto place selected elements" AutoPlaceSelected()}
+       {"Autoroute selected elements" AutoRoute(SelectedRats)}
+       {"Rip up selected auto-routed tracks" RipUp(Selected)}
+      }
+      {"Operations on this location"
+       {"Generate object report" GetXY(Click on the object) Report(Object)}
+      }
+      -
+      {"Undo last operation" Undo()}
+      {"Redo last undone operation" Redo()}
+      -
+      {Tools
+       {"None" checked=nomode,1 Mode(None)}
+       {"Via" checked=viamode,1 Mode(Via) a={"F1" "<Key>F1"}}
+       {"Line" checked=linemode,1 Mode(Line) a={"F2" "<Key>F2"}}
+       {"Arc" checked=arcmode,1 Mode(Arc) a={"F3" "<Key>F3"}}
+       {"Text" checked=textmode,1 Mode(Text) a={"F4" "<Key>F4"}}
+       {"Rectangle" checked=rectanglemode,1 Mode(Rectangle) a={"F5" "<Key>F5"}}
+       {"Polygon" checked=polygonmode,1 Mode(Polygon) a={"F6" "<Key>F6"}}
+       {"Polygon Hole" checked=polygonholemode,1 Mode(PolygonHole)}
+       {"Buffer" checked=pastebuffermode,1 Mode(PasteBuffer) a={"F7" "<Key>F7"}}
+       {"Remove" checked=removemode,1 Mode(Remove) a={"F8" "<Key>F8"}}
+       {"Rotate" checked=rotatemode,1 Mode(Rotate) a={"F9" "<Key>F9"}}
+       {"Thermal" checked=thermalmode,1 Mode(Thermal) a={"F10" "<Key>F10"}}
+       {"Arrow" checked=arrowmode,1 Mode(Arrow)  a={"F11" "<Key>F11"}}
+       {"Insert Point" checked=insertpointmode,1 Mode(InsertPoint) a={"Insert" "<Key>Insert"}}
+       {"Move" checked=movemode,1 Mode(Move)}
+       {"Copy" checked=copymode,1 Mode(Copy)}
+       {"Lock" checked=lockmode,1 Mode(Lock) a={"F12" "<Key>F12"}}
+       {"Cancel" Mode(Escape) a={"Esc" "<Key>Escape"}}
+      }
+    }
+  }
+
diff --git a/src/pcb-menu.res b/src/pcb-menu.res
deleted file mode 100644
index 1e88e52..0000000
--- a/src/pcb-menu.res
+++ /dev/null
@@ -1,441 +0,0 @@
-# -*- c -*-
-# Note - pcb-menu.res is used to build pcb-menu.h
-# Note - parameters are sensitive to extra spaces around the commas
-
-Mouse =
-{
-  Left = {
-    Mode(Notify)
-    up = Mode(Release)
-  }
-  Right = {
-    { Mode(Save) Mode(Rotate) Mode(Notify) Mode(Release) Mode(Restore) }
-    ctrl = Display(CycleCrosshair)
-  }
-  Middle = {
-    Pan(1)
-    up = Pan(0)
-    ctrl = Pan(thumb,1)
-    ctrl-up = Pan(thumb,0)
-  }
-  Up = Zoom(0.8)
-  Down = Zoom(1.25)
-# If you want zoom to center, do this instead.
-  #Up = { {Zoom(0.8) Center()} }
-  #Down = { {Zoom(1.25) Center()} }
-}
-
-MainMenu =
-{
-  {File
-   {"About..." About()}
-   {"Save layout" Save(Layout) m=S a={"Ctrl-S" "Ctrl<Key>s"}}
-   {"Save layout as..." Save(LayoutAs) m=A a={"Shift Ctrl-S" "Shift Ctrl<Key>s"}}
-   {"Revert" Load(Revert,none)}
-   {"Import Schematics" Import() }
-   {"Load layout" Load(Layout)}
-   {"Load element data to paste-buffer" PasteBuffer(Clear) Load(ElementTobuffer)}
-   {"Load layout data to paste-buffer" PasteBuffer(Clear) Load(LayoutTobuffer)}
-   {"Load netlist file" Load(Netlist)}
-   {"Load vendor resource file" LoadVendor()}
-   {"Print layout..." Print()}
-   {"Export layout..." Export()}
-   {"Calibrate Printer..." PrintCalibrate()}
-   -
-   {"Save connection data of..." foreground=grey50 sensitive=false}
-   {" a single element" GetXY(Click to set the element mark <>) Save(ElementConnections)}
-   {" all elements" Save(AllConnections)}
-   {" unused pins" Save(AllUnusedPins)}
-   -
-   {"Start new layout" New() a={"Ctrl-N" "Ctrl<Key>n"}}
-   -
-   {"Quit Program" Quit() m=Q a={"Ctrl-Q" "Ctrl<Key>q"}}
-  }
-  {View
-   {"Flip up/down" checked=flip_y SwapSides(V) a={"Tab" "<Key>Tab"}}
-   {"Flip left/right" checked=flip_x SwapSides(H) a={"Shift-Tab" "Shift<Key>Tab"}}
-   {"Spin 180°" SwapSides(R) a={"Ctrl-Tab" "Ctrl<Key>Tab"}}
-   {"Swap Sides" SwapSides() a={"Ctrl-Shift-Tab" "Ctrl Shift<Key>Tab"}}
-   {"Center cursor" Center() a={"C" "<Key>c"}}
-   {"Show soldermask" checked=showmask Display(ToggleMask)}
-   -
-   {"Displayed element-name..." foreground=grey50 sensitive=false}
-   {"Description" Display(Description) checked=elementname,1}
-   {"Reference Designator" Display(NameOnPCB) checked=elementname,2}
-   {"Value" Display(Value) checked=elementname,3}
-   {"Lock Names" checked=locknames Display(ToggleLockNames)}
-   {"Only Names" checked=onlynames Display(ToggleOnlyNames)}
-   {"Hide Names" checked=hidenames Display(ToggleHideNames)}
-   -
-   {"Pinout shows number" checked=shownumber Display(ToggleName)}
-   {"Open pinout menu" Display(Pinout) a={"Shift-D" "Shift<Key>d"}}
-   -
-   {Zoom
-    {"Zoom In 2X" Zoom(-2)}
-    {"Zoom In 20%" Zoom(-1.2) m=Z a={"Z" "<Key>z"}}
-    {"Zoom Out 20%" Zoom(+1.2) m=O a={"Shift-Z" "Shift<Key>z"}}
-# If you want zoom to center, do this instead.
-    #{"Zoom In 20%" Zoom(-1.2) Center() m=Z a={"Z" "<Key>z"}}
-    #{"Zoom Out 20%" Zoom(+1.2) Center() m=O a={"Shift-Z" "Shift<Key>z"}}
-    {"Zoom Out 2X" Zoom(+2)}
-    {"Zoom Max" Zoom() m=M a={"V" "<Key>v"}}
-    {"Zoom Toggle" Zoom(Toggle) a={"`" "<Key>`"}}
-    -
-    {"Zoom to 0.1mil/px" Zoom(=10)}
-    {"Zoom to 0.01mm/px" Zoom(=39.37)}
-    {"Zoom to 1mil/px" Zoom(=100)}
-    {"Zoom to 0.05mm/px" Zoom(=196.8504)}
-    {"Zoom to 2.5mil/px" Zoom(=250)}
-    {"Zoom to 0.1mm/px" Zoom(=393.7)}
-    {"Zoom to 10mil/px" Zoom(=1000)}
-   }
-   {Grid
-    {"mil" checked=grid_units_mm,0 SetUnits(mil)}
-    {"mm"  checked=grid_units_mm,1 SetUnits(mm)}
-    {"Display grid" checked=drawgrid Display(Grid)}
-    {"Realign grid" GetXY(Click to set the grid origin) Display(ToggleGrid)}
-    {"No Grid" checked=gridsize,1 SetValue(Grid,1)}
-    -
-    {  "0.1 mil" checked=gridsize,10 SetUnits(mil) SetValue(Grid,10)}
-    {  "1 mil"   checked=gridsize,100 SetUnits(mil) SetValue(Grid,100)}
-    {  "5 mil"   checked=gridsize,500 SetUnits(mil) SetValue(Grid,500)}
-    { "10 mil"   checked=gridsize,1000 SetUnits(mil) SetValue(Grid,1000)}
-    { "25 mil"   checked=gridsize,2500 SetUnits(mil) SetValue(Grid,2500)}
-    { "50 mil"   checked=gridsize,5000 SetUnits(mil) SetValue(Grid,5000)}
-    {"100 mil"   checked=gridsize,10000 SetUnits(mil) SetValue(Grid,10000)}
-    -
-    {"0.01 mm" checked=gridsize,39 SetUnits(mm) SetValue(Grid,0.01mm)}
-    {"0.05 mm" checked=gridsize,197 SetUnits(mm) SetValue(Grid,0.05mm)}
-    {"0.1 mm"  checked=gridsize,394 SetUnits(mm) SetValue(Grid,0.1mm)}
-    {"0.25 mm" checked=gridsize,984 SetUnits(mm) SetValue(Grid,0.25mm)}
-    {"0.5 mm"  checked=gridsize,1969 SetUnits(mm) SetValue(Grid,0.5mm)}
-    {"1 mm"    checked=gridsize,3937 SetUnits(mm) SetValue(Grid,1mm)}
-    -
-    {"Grid -5mil" SetValue(Grid,-5,mil) a={"Shift-G" "Shift<Key>g"}}
-    {"Grid +5mil" SetValue(Grid,+5,mil) a={"G" "<Key>g"}}
-    {"Grid -0.05mm" SetValue(Grid,-0.05,mm) a={"Shift-Ctrl-G" "Shift Ctrl<Key>g"}}
-    {"Grid +0.05mm" SetValue(Grid,+0.05,mm) a={"Ctrl-G" "Ctrl<Key>g"}}
-   }
-   -
-   {"Shown Layers"
-    @layerview
-    -
-    {"Edit Layer Groups" EditLayerGroups()}
-   }
-   {"Current Layer"
-    @layerpick
-    -
-    {"Delete current layer" MoveLayer(c,-1)}
-    {"Add new layer" MoveLayer(-1,c)}
-    {"Move current layer up" MoveLayer(c,up)}
-    {"Move current layer down" MoveLayer(c,down)}
-   }
-  }
-  {Edit
-   {"Undo last operation" Undo() a={"U" "<Key>u"}}
-   {"Redo last undone operation" Redo() a={"Shift-R" "Shift<Key>r"}}
-   {"Clear undo-buffer" Undo(ClearList) a={"Shift-Ctrl-U" "Shift Ctrl<Key>u"}}
-   -
-   {"Cut selection to buffer" GetXY(Click to set the snap point for this buffer)
-    PasteBuffer(Clear) PasteBuffer(AddSelected) RemoveSelected() Mode(PasteBuffer)
-    a={"Ctrl-X" "Ctrl<Key>x"}}
-   {"Copy selection to buffer" GetXY(Click to set the snap point for this buffer)
-    PasteBuffer(Clear) PasteBuffer(AddSelected) Mode(PasteBuffer)
-    a={"Ctrl-C" "Ctrl<Key>c"}}
-   {"Paste buffer to layout" Mode(PasteBuffer) a={"Ctrl-V" "Ctrl<Key>v"}}
-   -
-   {"Unselect all" Unselect(All) a={"Shift-Alt-A" "Shift Alt<Key>a"}}
-   {"Select all visible" Select(All) a={"Alt-A" "Alt<Key>a"}}
-   -
-   {"Edit Names..." foreground=grey50 sensitive=false}
-   {" Change text on layout" ChangeName(Object) a={"N" "<Key>n"}}
-   {" Edit name of layout" ChangeName(Layout)}
-   {" Edit name of active layer" ChangeName(Layer)}
-   {"Edit Attributes..." foreground=grey50 sensitive=false}
-   {" Layout" Attributes(Layout)}
-   {" CurrentLayer" Attributes(Layer)}
-   {" Element" Attributes(Element)}
-   -
-   {"Board Sizes" AdjustSizes()}
-   {"Route Styles"
-    @routestyles
-    -
-    {"Edit..." AdjustStyle(0)}
-   }
-  }
-  {Tools
-   {"None" checked=nomode,1 Mode(None)}
-   {"Via" checked=viamode,1 Mode(Via) a={"F1" "<Key>F1"}}
-   {"Line" checked=linemode,1 Mode(Line) a={"F2" "<Key>F2"}}
-   {"Arc" checked=arcmode,1 Mode(Arc) a={"F3" "<Key>F3"}}
-   {"Text" checked=textmode,1 Mode(Text) a={"F4" "<Key>F4"}}
-   {"Rectangle" checked=rectanglemode,1 Mode(Rectangle) a={"F5" "<Key>F5"}}
-   {"Polygon" checked=polygonmode,1 Mode(Polygon) a={"F6" "<Key>F6"}}
-   {"Polygon Hole" checked=polygonholemode,1 Mode(PolygonHole)}
-   {"Buffer" checked=pastebuffermode,1 Mode(PasteBuffer) a={"F7" "<Key>F7"}}
-   {"Remove" checked=removemode,1 Mode(Remove) a={"F8" "<Key>F8"}}
-   {"Rotate" checked=rotatemode,1 Mode(Rotate) a={"F9" "<Key>F9"}}
-   {"Thermal" checked=thermalmode,1 Mode(Thermal) a={"F10" "<Key>F10"}}
-   {"Arrow" checked=arrowmode,1 Mode(Arrow)  a={"F11" "<Key>F11"}}
-   {"Insert Point" checked=insertpointmode,1 Mode(InsertPoint) a={"Insert" "<Key>Insert"}}
-   {"Move" checked=movemode,1 Mode(Move)}
-   {"Copy" checked=copymode,1 Mode(Copy)}
-   {"Lock" checked=lockmode,1 Mode(Lock) a={"F12" "<Key>F12"}}
-   {"Cancel" Mode(Cancel) a={"Esc" "<Key>Escape"}}
-   -
-   {"Command" Command() a={":" "<Key>:"}}
-  }
-  {Settings
-   {"Layer groups" foreground=grey50 sensitive=false}
-   {"Edit layer groupings" EditLayerGroups()}
-   -
-   {"'All-direction' lines" checked=alldirection Display(Toggle45Degree) a={"." "<Key>."}}
-   {"Auto swap line start angle" checked=swapstartdir Display(ToggleStartDirection)}
-   {"Orthogonal moves" checked=orthomove Display(ToggleOrthoMove)}
-   {"Crosshair snaps to pins and pads" checked=snappin Display(ToggleSnapPin)}
-   {"Crosshair shows DRC clearance" checked=showdrc Display(ToggleShowDRC)}
-   {"Auto enforce DRC clearance" checked=autodrc Display(ToggleAutoDRC)}
-   -
-   {"Rubber band mode" checked=rubberband Display(ToggleRubberBandMode)}
-   {"Require unique element names" checked=uniquename Display(ToggleUniqueNames)}
-   {"Auto-zero delta measurements" checked=localref Display(ToggleLocalRef)}
-   {"New lines, arcs clear polygons" checked=clearnew Display(ToggleClearLine)}
-   {"New polygons are full ones" checked=newfullpoly Display(ToggleFullPoly)}
-   {"Show autorouter trials" checked=liveroute Display(ToggleLiveRoute)}
-   {"Thin draw" checked=thindraw Display(ToggleThindraw) a={"|" "<Key>|"}}
-   {"Thin draw poly" checked=thindrawpoly Display(ToggleThindrawPoly) a={"Ctrl-Shift-P" "Ctrl Shift<Key>p"}}
-   {"Check polygons" checked=checkplanes Display(ToggleCheckPlanes)}
-   -
-   {"Pinout shows number" checked=shownumber Display(ToggleName)}
-   {"Pins/Via show Name/Number" Display(PinOrPadName) a={"D" "<Key>d"}}
-   {"Enable vendor drill mapping" ToggleVendor() checked=VendorMapOn}
-   {"Import Settings"
-    {"New elements added at..." foreground=grey50 sensitive=false}
-    {" Center" Import(setnewpoint,center)}
-    {" Mark" Import(setnewpoint,mark)}
-    {" Crosshair" Import(setnewpoint)}
-    -
-    {"Set Dispersion" Import(setdisperse)}
-   }
-  }
-
-  {Select
-   {"Select all visible objects" Select(All)}
-   {"Select all connected objects" Select(Connection)}
-   -
-   {"Unselect all objects" Unselect(All)}
-   {"unselect all connected objects" Unselect(Connection)}
-   -
-   {"Select by name" foreground=grey50 sensitive=false}
-   {"All objects" Select(ObjectByName) active=have_regex}
-   {"Elements" Select(ElementByName) active=have_regex}
-   {"Pads" Select(PadByName) active=have_regex}
-   {"Pins" Select(PinByName) active=have_regex}
-   {"Text Objects" Select(TextByName) active=have_regex}
-   {"Vias" Select(ViaByName) active=have_regex}
-   -
-   {"Auto-place selected elements" AutoPlaceSelected() a={"Ctrl-P" "Ctrl<Key>p"}}
-   {"Disperse all elements" DisperseElements(All)}
-   {"Move selected elements to other side" Flip(SelectedElements) a={"Shift-B" "Shift<Key>b"}}
-   {"Move selected to current layer" MoveToCurrentLayer(Selected) a={"Shift-M" "Shift<Key>m"}}
-   {"Delete selected objects" Delete(Selected) a={"Delete" "<Key>Delete"}}
-   {"Convert selection to element" Select(Convert)}
-   -
-   {"Optimize selected rats" DeleteRats(SelectedRats) AddRats(SelectedRats)}
-   {"Auto-route selected rats" AutoRoute(SelectedRats) a={"Alt-R" "Alt<Key>r"}}
-   {"Rip up selected auto-routed tracks" RipUp(Selected)}
-   -
-   {"Change size of selected objects" foreground=grey50 sensitive=false}
-   {"Lines -10 mil" ChangeSize(SelectedLines,-10,mil) ChangeSize(SelectedArcs,-10,mil)}
-   {"Lines +10 mil" ChangeSize(SelectedLines,+10,mil) ChangeSize(SelectedArcs,+10,mil)}
-   {"Pads -10 mil" ChangeSize(SelectedPads,-10,mil)}
-   {"Pads +10 mil" ChangeSize(SelectedPads,+10,mil)}
-   {"Pins -10 mil" ChangeSize(SelectedPins,-10,mil)}
-   {"Pins +10 mil" ChangeSize(SelectedPins,+10,mil)}
-   {"Texts -10 mil" ChangeSize(SelectedTexts,-10,mil)}
-   {"Texts +10 mil" ChangeSize(SelectedTexts,+10,mil)}
-   {"Vias -10 mil" ChangeSize(SelectedVias,-10,mil)}
-   {"Vias +10 mil" ChangeSize(SelectedVias,+10,mil)}
-   -
-   {"Change drilling hole of selected objects" foreground=grey50 sensitive=false}
-   {"Vias -10 mil" ChangeDrillSize(SelectedVias,-10,mil)}
-   {"Vias +10 mil" ChangeDrillSize(SelectedVias,+10,mil)}
-   {"Pins -10 mil" ChangeDrillSize(SelectedPins,-10,mil)}
-   {"Pins +10 mil" ChangeDrillSize(SelectedPins,+10,mil)}
-   -
-   {"Change square-flag of selected objects" foreground=grey50 sensitive=false}
-   {"Elements" ChangeSquare(SelectedElements)}
-   {"Pins" ChangeSquare(Se...
 
[truncated message content]

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

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

The branch, master has been updated
       via  17ba60b0515558fdcaaa1af4371cc3dfda657de9 (commit)
      from  54c01a9af1080c6b96462626d027fb21fbd1a9a9 (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/action.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


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

commit 17ba60b0515558fdcaaa1af4371cc3dfda657de9
Author: Stanislav Brabec <sb...@su...>
Commit: Peter Clifton <pc...@ca...>

    RipUp(): Rip arcs created by toporouter.
    
    Toporouter creates not only lines but also arcs.
    Rip up all auto routed tracks should rip these arcs as well.
    
    Closes-bug: lp-812380
    
    Reviewed-by: Peter Clifton <pc...@ca...>

:100644 100644 9b67924... d6e1d89... M	src/action.c

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

commit 17ba60b0515558fdcaaa1af4371cc3dfda657de9
Author: Stanislav Brabec <sb...@su...>
Commit: Peter Clifton <pc...@ca...>

    RipUp(): Rip arcs created by toporouter.
    
    Toporouter creates not only lines but also arcs.
    Rip up all auto routed tracks should rip these arcs as well.
    
    Closes-bug: lp-812380
    
    Reviewed-by: Peter Clifton <pc...@ca...>

diff --git a/src/action.c b/src/action.c
index 9b67924..d6e1d89 100644
--- a/src/action.c
+++ b/src/action.c
@@ -3683,6 +3683,15 @@ ActionRipUp (int argc, char **argv, int x, int y)
 	      }
 	  }
 	  ENDALL_LOOP;
+	  ALLARC_LOOP (PCB->Data);
+	  {
+	    if (TEST_FLAG (AUTOFLAG, arc) && !TEST_FLAG (LOCKFLAG, arc))
+	      {
+		RemoveObject (ARC_TYPE, layer, arc, arc);
+		changed = true;
+	      }
+	  }
+	  ENDALL_LOOP;
 	  VIA_LOOP (PCB->Data);
 	  {
 	    if (TEST_FLAG (AUTOFLAG, via) && !TEST_FLAG (LOCKFLAG, via))

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

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

The branch, master has been updated
       via  54c01a9af1080c6b96462626d027fb21fbd1a9a9 (commit)
       via  616c999af6d2eaae71eefaf3b1c11282a57467f4 (commit)
       via  a19ee251500de2979d0866e29bcc7dad93c1ed75 (commit)
       via  404f619b9c18e8a8ac3e8337ae1209fa23e874ee (commit)
      from  a6bf59afc18f3e6f89c44a55b7c4270c485f4fd7 (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
=========

 doc/Makefile.am    |    2 ++
 po/POTFILES.in     |    2 ++
 src/gpcb-menu.res  |   18 +++++++++---------
 src/pcb-menu.res   |    8 ++++----
 4 files changed, 17 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 doc/Makefile.am
 mode change 100755 => 100644 doc/gs/Makefile.am


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

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

    POTFILES.in: Add src/crosshair.c and src/autoroute.c
    
    We were missing translations before.
    
    "make distcheck" now passes ;)

:100644 100644 3bfb3ed... 0e5e331... M	po/POTFILES.in

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

    doc: Don't make any DVI targets
    
    We don't have rules to build all the prerequisites, and we don't care
    about DVI. This is one of the issues causing "make distcheck" to fail.

:100644 100644 6d1e457... 55f8fed... M	doc/Makefile.am

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

    doc: Remove execute permissions on Makefile.am and gs/Makefile.am

:100755 100644 6d1e457... 6d1e457... M	doc/Makefile.am
:100755 100644 12f36ac... 12f36ac... M	doc/gs/Makefile.am

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

    Clean up whitespace in [g]pcb-menu.res

:100644 100644 e9469e9... dc594c4... M	src/gpcb-menu.res
:100644 100644 aaf48c4... bda9bd7... M	src/pcb-menu.res

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

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

    POTFILES.in: Add src/crosshair.c and src/autoroute.c
    
    We were missing translations before.
    
    "make distcheck" now passes ;)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3bfb3ed..0e5e331 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,9 +7,11 @@ data/x-pcb-layout.desktop.in
 data/x-pcb-netlist.desktop.in
 src/action.c
 src/autoplace.c
+src/autoroute.c
 src/buffer.c
 src/change.c
 src/create.c
+src/crosshair.c
 src/edif.c
 src/error.c
 src/file.c

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

    doc: Don't make any DVI targets
    
    We don't have rules to build all the prerequisites, and we don't care
    about DVI. This is one of the issues causing "make distcheck" to fail.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6d1e457..55f8fed 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -49,6 +49,8 @@ dist_man_MANS=	pcb.1
 html_docs=	${info_TEXINFOS:.texi=.html}
 pdf_docs=	${info_TEXINFOS:.texi=.pdf} refcard.pdf
 
+DVIS=
+
 # put the html manual into 1 file instead of multiple files?
 AM_MAKEINFOHTMLFLAGS=	--css-include=$(srcdir)/pcb.css --no-split
 

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

    doc: Remove execute permissions on Makefile.am and gs/Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
old mode 100755
new mode 100644
diff --git a/doc/gs/Makefile.am b/doc/gs/Makefile.am
old mode 100755
new mode 100644

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

    Clean up whitespace in [g]pcb-menu.res

diff --git a/src/gpcb-menu.res b/src/gpcb-menu.res
index e9469e9..dc594c4 100644
--- a/src/gpcb-menu.res
+++ b/src/gpcb-menu.res
@@ -483,17 +483,17 @@ PopupMenus =
        {"Unselect all objects" Unselect(All)}
        {"Remove selected objects" RemoveSelected()}
        {"Copy selection to buffer"
-	GetXY(Click to set the snap point for this buffer)
-	PasteBuffer(Clear)
-	PasteBuffer(AddSelected)
-	Mode(PasteBuffer)
+        GetXY(Click to set the snap point for this buffer)
+        PasteBuffer(Clear)
+        PasteBuffer(AddSelected)
+        Mode(PasteBuffer)
        }
        {"Cut selection to buffer"
-	GetXY(Click to set the snap point for this buffer)
-	PasteBuffer(Clear)
-	PasteBuffer(AddSelected)
-	RemoveSelected()
-	Mode(PasteBuffer)
+        GetXY(Click to set the snap point for this buffer)
+        PasteBuffer(Clear)
+        PasteBuffer(AddSelected)
+        RemoveSelected()
+        Mode(PasteBuffer)
        }
        {"Convert selection to element" Select(Convert)}
        {"Auto place selected elements" AutoPlaceSelected()}
diff --git a/src/pcb-menu.res b/src/pcb-menu.res
index aaf48c4..bda9bd7 100644
--- a/src/pcb-menu.res
+++ b/src/pcb-menu.res
@@ -218,7 +218,7 @@ MainMenu =
     {"Set Dispersion" Import(setdisperse)}
    }
   }
-    
+
   {Select
    {"Select all visible objects" Select(All)}
    {"Select all connected objects" Select(Connection)}
@@ -267,7 +267,7 @@ MainMenu =
    {"Elements" ChangeSquare(SelectedElements)}
    {"Pins" ChangeSquare(SelectedPins)}
   }
-    
+
   {Buffer
    {"Copy selection to buffer" GetXY(Click to set the snap point for this buffer)
     PasteBuffer(Clear) PasteBuffer(AddSelected) Mode(PasteBuffer)}
@@ -295,7 +295,7 @@ MainMenu =
    {"#4" checked=buffer,4 PasteBuffer(4) a={"Shift-4" "Shift<Key>4"}}
    {"#5" checked=buffer,5 PasteBuffer(5) a={"Shift-5" "Shift<Key>5"}}
   }
-    
+
   {Connects
    {"Lookup connection to object" GetXY(Click on the object) Connection(Find) a={"Ctrl-F" "Ctrl<Key>f"}}
    {"Reset scanned pads/pins/vias" Connection(ResetPinsViasAndPads) Display(Redraw)}
@@ -331,7 +331,7 @@ MainMenu =
    -
    {"Apply vendor drill mapping" ApplyVendor()}
   }
-    
+
   {Info
    {"Generate object report" ReportObject() a={"Ctrl-R" "Ctrl<Key>r"}}
    {"Generate drill summary" Report(DrillReport)}

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

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

The branch, master has been updated
       via  a6bf59afc18f3e6f89c44a55b7c4270c485f4fd7 (commit)
      from  b0fd3fe6acc9fe632b6c0cd3d5a8485f293d7889 (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/crosshair.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


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

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

    crosshair.c: Fix layer check for off-grid line snapping in line-draw mode

:100644 100644 bb0a87b... 76b072b... M	src/crosshair.c

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

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

    crosshair.c: Fix layer check for off-grid line snapping in line-draw mode

diff --git a/src/crosshair.c b/src/crosshair.c
index bb0a87b..76b072b 100644
--- a/src/crosshair.c
+++ b/src/crosshair.c
@@ -850,8 +850,7 @@ check_snap_offgrid_line (struct snap_data *snap_data,
    * the same layer), and when moving a line end-point
    * (but don't snap to the same line)
    */
-  if ((Settings.Mode != LINE_MODE ||
-       Crosshair.AttachedObject.Ptr1 != ptr1) &&
+  if ((Settings.Mode != LINE_MODE || CURRENT != ptr1) &&
       (Settings.Mode != MOVE_MODE ||
        Crosshair.AttachedObject.Ptr1 != ptr1 ||
        Crosshair.AttachedObject.Type != LINEPOINT_TYPE ||

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

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

The branch, master has been updated
       via  b0fd3fe6acc9fe632b6c0cd3d5a8485f293d7889 (commit)
      from  ba3a56929b240c5c3ab1ee1af7149b30dcdbb8cf (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/crosshair.c |  161 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 93 insertions(+), 68 deletions(-)


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

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

    crosshair.c: Revise heuristic for snapping on off-grid lines
    
    Only snap to an off-grid section of a line when:
    
    Drawing lines on the same layer as the one being snapped to
    When manipulating the end-point of a _different) line on the
    same layer as the one being snapped to.
    
    This should hopefully reduce the tendancy of the off-grid-line
    code to cause lots of unnecessary snapping.

:100644 100644 4024881... bb0a87b... M	src/crosshair.c

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

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

    crosshair.c: Revise heuristic for snapping on off-grid lines
    
    Only snap to an off-grid section of a line when:
    
    Drawing lines on the same layer as the one being snapped to
    When manipulating the end-point of a _different) line on the
    same layer as the one being snapped to.
    
    This should hopefully reduce the tendancy of the off-grid-line
    code to cause lots of unnecessary snapping.

diff --git a/src/crosshair.c b/src/crosshair.c
index 4024881..bb0a87b 100644
--- a/src/crosshair.c
+++ b/src/crosshair.c
@@ -819,6 +819,98 @@ check_snap_object (struct snap_data *snap_data, LocationType x, LocationType y,
     }
 }
 
+static void
+check_snap_offgrid_line (struct snap_data *snap_data,
+                         LocationType nearest_grid_x,
+                         LocationType nearest_grid_y)
+{
+  void *ptr1, *ptr2, *ptr3;
+  int ans;
+  LineType *line;
+  LocationType try_x, try_y;
+  double dx, dy;
+  double dist;
+
+  if (!TEST_FLAG (SNAPPINFLAG, PCB))
+    return;
+
+  /* Code to snap at some sensible point along a line */
+  /* Pick the nearest grid-point in the x or y direction
+   * to align with, then adjust until we hit the line
+   */
+  ans = SearchScreenGridSlop (Crosshair.X, Crosshair.Y,
+                              LINE_TYPE, &ptr1, &ptr2, &ptr3);
+
+  if (ans == NO_TYPE)
+    return;
+
+  line = (LineType *)ptr2;
+
+  /* Allow snapping to off-grid lines when drawing new lines (on
+   * the same layer), and when moving a line end-point
+   * (but don't snap to the same line)
+   */
+  if ((Settings.Mode != LINE_MODE ||
+       Crosshair.AttachedObject.Ptr1 != ptr1) &&
+      (Settings.Mode != MOVE_MODE ||
+       Crosshair.AttachedObject.Ptr1 != ptr1 ||
+       Crosshair.AttachedObject.Type != LINEPOINT_TYPE ||
+       Crosshair.AttachedObject.Ptr2 == line))
+    return;
+
+  dx = line->Point2.X - line->Point1.X;
+  dy = line->Point2.Y - line->Point1.Y;
+
+  /* Try snapping along the X axis */
+  if (dy != 0.)
+    {
+      /* Move in the X direction until we hit the line */
+      try_x = (nearest_grid_y - line->Point1.Y) / dy * dx + line->Point1.X;
+      try_y = nearest_grid_y;
+      check_snap_object (snap_data, try_x, try_y, true);
+    }
+
+  /* Try snapping along the Y axis */
+  if (dx != 0.)
+    {
+      try_x = nearest_grid_x;
+      try_y = (nearest_grid_x - line->Point1.X) / dx * dy + line->Point1.Y;
+      check_snap_object (snap_data, try_x, try_y, true);
+    }
+
+  if (dx != dy) /* If line not parallel with dX = dY direction.. */
+    {
+      /* Try snapping diagonally towards the line in the dX = dY direction */
+
+      if (dy == 0)
+        dist = line->Point1.Y - nearest_grid_y;
+      else
+        dist = ((line->Point1.X - nearest_grid_x) -
+                (line->Point1.Y - nearest_grid_y) * dx / dy) / (1 - dx / dy);
+
+      try_x = nearest_grid_x + dist;
+      try_y = nearest_grid_y + dist;
+
+      check_snap_object (snap_data, try_x, try_y, true);
+    }
+
+  if (dx != -dy) /* If line not parallel with dX = -dY direction.. */
+    {
+      /* Try snapping diagonally towards the line in the dX = -dY direction */
+
+      if (dy == 0)
+        dist = nearest_grid_y - line->Point1.Y;
+      else
+        dist = ((line->Point1.X - nearest_grid_x) -
+                (line->Point1.Y - nearest_grid_y) * dx / dy) / (1 + dx / dy);
+
+      try_x = nearest_grid_x + dist;
+      try_y = nearest_grid_y - dist;
+
+      check_snap_object (snap_data, try_x, try_y, true);
+    }
+}
+
 /* ---------------------------------------------------------------------------
  * recalculates the passed coordinates to fit the current grid setting
  */
@@ -976,74 +1068,7 @@ FitCrosshairIntoGrid (LocationType X, LocationType Y)
       check_snap_object (&snap_data, pnt->X, pnt->Y, true);
     }
 
-  /* Code to snap at some sensible point along a line */
-  /* Pick the nearest grid-point in the x or y direction
-   * to align with, then adjust until we hit the line
-   */
-  ans = NO_TYPE;
-  if (TEST_FLAG (SNAPPINFLAG, PCB))
-    ans = SearchScreenGridSlop (Crosshair.X, Crosshair.Y,
-                                LINE_TYPE, &ptr1, &ptr2, &ptr3);
-
-  if (ans != NO_TYPE)
-    {
-      LineType *line = (LineType *)ptr2;
-      LocationType try_x, try_y;
-      double dx, dy;
-      double dist;
-
-      dx = line->Point2.X - line->Point1.X;
-      dy = line->Point2.Y - line->Point1.Y;
-
-      /* Try snapping along the X axis */
-      if (dy != 0.)
-        {
-          /* Move in the X direction until we hit the line */
-          try_x = (nearest_grid_y - line->Point1.Y) / dy * dx + line->Point1.X;
-          try_y = nearest_grid_y;
-          check_snap_object (&snap_data, try_x, try_y, true);
-        }
-
-      /* Try snapping along the Y axis */
-      if (dx != 0.)
-        {
-          try_x = nearest_grid_x;
-          try_y = (nearest_grid_x - line->Point1.X) / dx * dy + line->Point1.Y;
-          check_snap_object (&snap_data, try_x, try_y, true);
-        }
-
-      if (dx != dy) /* If line not parallel with dX = dY direction.. */
-        {
-          /* Try snapping diagonally towards the line in the dX = dY direction */
-
-          if (dy == 0)
-            dist = line->Point1.Y - nearest_grid_y;
-          else
-            dist = ((line->Point1.X - nearest_grid_x) -
-                    (line->Point1.Y - nearest_grid_y) * dx / dy) / (1 - dx / dy);
-
-          try_x = nearest_grid_x + dist;
-          try_y = nearest_grid_y + dist;
-
-          check_snap_object (&snap_data, try_x, try_y, true);
-        }
-
-      if (dx != -dy) /* If line not parallel with dX = -dY direction.. */
-        {
-          /* Try snapping diagonally towards the line in the dX = -dY direction */
-
-          if (dy == 0)
-            dist = nearest_grid_y - line->Point1.Y;
-          else
-            dist = ((line->Point1.X - nearest_grid_x) -
-                    (line->Point1.Y - nearest_grid_y) * dx / dy) / (1 + dx / dy);
-
-          try_x = nearest_grid_x + dist;
-          try_y = nearest_grid_y - dist;
-
-          check_snap_object (&snap_data, try_x, try_y, true);
-        }
-    }
+  check_snap_offgrid_line (&snap_data, nearest_grid_x, nearest_grid_y);
 
   ans = NO_TYPE;
   if (TEST_FLAG (SNAPPINFLAG, PCB))

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

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

The branch, master has been updated
       via  ba3a56929b240c5c3ab1ee1af7149b30dcdbb8cf (commit)
      from  7819244c48a6e38a8d4b486e8205549f4b35a94d (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/lesstif/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

commit ba3a56929b240c5c3ab1ee1af7149b30dcdbb8cf
Author: Gabriel Paubert <pa...@ir...>
Commit: Andrew Poelstra <as...@sf...>

    Correct parameter order in Distance function in hid/lesstif/main.c
    
    in src/did/lesstif/main.c, the Distance function is called
    with the parameters in the wrong order.
    
    This small patches fixes the problem. I still think that
    the format is wrong, or at least the rounding to integer
    mm/mil taking only the grid into account, but I've not yet
    decided on how to fix it. The worse is that often the display
    is wrong because the decimal part is truncated (displaying
    say -24 between two grid points on a 5mil grid).
    
            Gabriel

:100644 100644 811ac26... be9a330... M	src/hid/lesstif/main.c

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

commit ba3a56929b240c5c3ab1ee1af7149b30dcdbb8cf
Author: Gabriel Paubert <pa...@ir...>
Commit: Andrew Poelstra <as...@sf...>

    Correct parameter order in Distance function in hid/lesstif/main.c
    
    in src/did/lesstif/main.c, the Distance function is called
    with the parameters in the wrong order.
    
    This small patches fixes the problem. I still think that
    the format is wrong, or at least the rounding to integer
    mm/mil taking only the grid into account, but I've not yet
    decided on how to fix it. The worse is that often the display
    is wrong because the decimal part is truncated (displaying
    say -24 between two grid points on a 5mil grid).
    
            Gabriel

diff --git a/src/hid/lesstif/main.c b/src/hid/lesstif/main.c
index 811ac26..be9a330 100644
--- a/src/hid/lesstif/main.c
+++ b/src/hid/lesstif/main.c
@@ -2321,7 +2321,7 @@ mark_delta_to_widget (BDimension dx, BDimension dy, Widget w)
   else
     {
       int angle = atan2 (dy, -dx) * 180 / M_PI;
-      BDimension dist = Distance (0, dx, 0, dy);
+      BDimension dist = Distance (0, 0, dx, dy);
 
       buf = pcb_g_strdup_printf ("%m+%+.*mS, %+.*mS (%.*mS, %d\260)", UUNIT,
                              prec, dx, prec, dy, prec, dist, angle);

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

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

The branch, master has been updated
       via  7819244c48a6e38a8d4b486e8205549f4b35a94d (commit)
      from  e51bd61678dcedf2e1855f3c244f113e77073f54 (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/png/png.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

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

    hid/png: Increase the maximum allowable DPI of the exporter
    
    Sometimes for rendering fiddly boards, you just need the detail.
    
    Move the arbitrary 1000 dpi limit to still arbitrary, 10000 dpi.

:100644 100644 86631a7... bfa98ad... M	src/hid/png/png.c

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

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

    hid/png: Increase the maximum allowable DPI of the exporter
    
    Sometimes for rendering fiddly boards, you just need the detail.
    
    Move the arbitrary 1000 dpi limit to still arbitrary, 10000 dpi.

diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index 86631a7..bfa98ad 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -169,7 +169,7 @@ HID_Attribute png_attribute_list[] = {
 #define HA_pngfile 0
 
   {"dpi", "Scale factor (pixels/inch). 0 to scale to fix specified size",
-   HID_Integer, 0, 1000, {100, 0, 0}, 0, 0},
+   HID_Integer, 0, 10000, {100, 0, 0}, 0, 0},
 #define HA_dpi 1
 
   {"x-max", "Maximum width (pixels).  0 to not constrain.",

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

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

The branch, master has been updated
  discards  da92b12d00068daaf4ad7118ab31c327e1317056 (commit)
       via  e51bd61678dcedf2e1855f3c244f113e77073f54 (commit)
      from  da92b12d00068daaf4ad7118ab31c327e1317056 (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/ps/ps.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


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

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

    hid/ps: Fix arc drawing since pcb_printf patch
    
    The last parameter to the arc macro we use for drawing arcs is unitless,
    so should be a double. This was broken by:
    
    commit fa9ae1f6b1eabaab961795ce7be53afe46eaa735
    
        Convert ps/eps/lpr HID's to use pcb-printf
    
    I've reverted the change, and added an extra (double) cast compared
    to what was there before, I'm not sure we wouldn't get an integer
    division without it. One day I should learn these type promotion /
    casting rules properly! ;)

:100644 100644 f2e0706... 201b721... M	src/hid/ps/ps.c

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

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

    hid/ps: Fix arc drawing since pcb_printf patch
    
    The last parameter to the arc macro we use for drawing arcs is unitless,
    so should be a double. This was broken by:
    
    commit fa9ae1f6b1eabaab961795ce7be53afe46eaa735
    
        Convert ps/eps/lpr HID's to use pcb-printf
    
    I've reverted the change, and added an extra (double) cast compared
    to what was there before, I'm not sure we wouldn't get an integer
    division without it. One day I should learn these type promotion /
    casting rules properly! ;)

diff --git a/src/hid/ps/ps.c b/src/hid/ps/ps.c
index f2e0706..201b721 100644
--- a/src/hid/ps/ps.c
+++ b/src/hid/ps/ps.c
@@ -1055,9 +1055,9 @@ ps_draw_arc (hidGC gc, int cx, int cy, int width, int height,
 	  cx, cy, width, height, start_angle, delta_angle, sa, ea);
 #endif
   use_gc (gc);
-  pcb_fprintf (global.f, "%d %d %mi %mi %mi %mi %mi a\n",
+  pcb_fprintf (global.f, "%d %d %mi %mi %mi %mi %g a\n",
                sa, ea, -width, height, cx, cy,
-               (global.linewidth + 2 * global.bloat) / width);
+               (double) (global.linewidth + 2 * global.bloat) / (double) width);
 }
 
 static void

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

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

The branch, master has been updated
       via  da92b12d00068daaf4ad7118ab31c327e1317056 (commit)
      from  1bed1e3cadae8910ceb3a2b08c7a8248e8a95f93 (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
=========



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


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

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

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

The branch, master has been updated
       via  1bed1e3cadae8910ceb3a2b08c7a8248e8a95f93 (commit)
      from  72c69958ada7b07057bf210e0ee6f2d1b2d648f1 (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/gtkhid-gdk.c     |    7 +++++++
 src/hid/gtk/gtkhid-gl.c      |    7 +++++++
 src/hid/gtk/gui-top-window.c |    1 +
 src/hid/gtk/gui.h            |    1 +
 4 files changed, 16 insertions(+), 0 deletions(-)


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

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

    hid/gtk: Add a shutdown function to the renderer backends
    
    This will be necessary to stop any event handlers / timers which
    should not fire as the GUI is being shut down.
    
    This code isn't actually very "live" at the moment, as the place I've
    hooked up its trigger (the destroy event of the main window), doesn't
    actually appear to get called.
    
    This seems to be because the core "Quit" action just kills the program
    dead, rather than attempting to shut down the GUI.

:100644 100644 4fdb8d3... 25d38fd... M	src/hid/gtk/gtkhid-gdk.c
:100644 100644 ed34ea1... 2d7fec0... M	src/hid/gtk/gtkhid-gl.c
:100644 100644 b11d32c... e9c2669... M	src/hid/gtk/gui-top-window.c
:100644 100644 114574f... b0bbe0a... M	src/hid/gtk/gui.h

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

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

    hid/gtk: Add a shutdown function to the renderer backends
    
    This will be necessary to stop any event handlers / timers which
    should not fire as the GUI is being shut down.
    
    This code isn't actually very "live" at the moment, as the place I've
    hooked up its trigger (the destroy event of the main window), doesn't
    actually appear to get called.
    
    This seems to be because the core "Quit" action just kills the program
    dead, rather than attempting to shut down the GUI.

diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index 4fdb8d3..25d38fd 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -1073,6 +1073,13 @@ ghid_init_renderer (int *argc, char ***argv, GHidPort *port)
 }
 
 void
+ghid_shutdown_renderer (GHidPort *port)
+{
+  g_free (port->render_priv);
+  port->render_priv = NULL;
+}
+
+void
 ghid_init_drawing_widget (GtkWidget *widget, GHidPort *port)
 {
 }
diff --git a/src/hid/gtk/gtkhid-gl.c b/src/hid/gtk/gtkhid-gl.c
index ed34ea1..2d7fec0 100644
--- a/src/hid/gtk/gtkhid-gl.c
+++ b/src/hid/gtk/gtkhid-gl.c
@@ -822,6 +822,13 @@ ghid_init_renderer (int *argc, char ***argv, GHidPort *port)
 }
 
 void
+ghid_shutdown_renderer (GHidPort *port)
+{
+  g_free (port->render_priv);
+  port->render_priv = NULL;
+}
+
+void
 ghid_init_drawing_widget (GtkWidget *widget, GHidPort *port)
 {
   render_priv *priv = port->render_priv;
diff --git a/src/hid/gtk/gui-top-window.c b/src/hid/gtk/gui-top-window.c
index b11d32c..e9c2669 100644
--- a/src/hid/gtk/gui-top-window.c
+++ b/src/hid/gtk/gui-top-window.c
@@ -1851,6 +1851,7 @@ delete_chart_cb (GtkWidget * widget, GdkEvent * event, GHidPort * port)
 static void
 destroy_chart_cb (GtkWidget * widget, GHidPort * port)
 {
+  ghid_shutdown_renderer (port);
   gtk_main_quit ();
 }
 
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 114574f..b0bbe0a 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -490,6 +490,7 @@ void ghid_invalidate_all ();
 void ghid_notify_crosshair_change (bool changes_complete);
 void ghid_notify_mark_change (bool changes_complete);
 void ghid_init_renderer (int *, char ***, GHidPort *);
+void ghid_shutdown_renderer (GHidPort *);
 void ghid_init_drawing_widget (GtkWidget *widget, GHidPort *);
 void ghid_drawing_area_configure_hook (GHidPort *port);
 void ghid_screen_update (void);

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

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

The branch, master has been updated
       via  72c69958ada7b07057bf210e0ee6f2d1b2d648f1 (commit)
       via  cdc4b1830fd567efc51322a3ee9587e910f92283 (commit)
       via  88bcf416c7c3f26292b604197bfcacdc7d16f9d7 (commit)
      from  2407ce806639116f3f7dc1e85c45bef6a73e7758 (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-netlist-window.c |   21 ++-------------------
 src/hid/gtk/gui.h                |    1 -
 2 files changed, 2 insertions(+), 20 deletions(-)


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

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

    hid/gtk: Do not run a main loop from within the netlist window code.
    
    It turns out that this is a really bad idea.. if the main loop is kept
    busy, the new main-loop never exits and the events can become reentrant.
    
    I discovered this when testing code for an animation which used the main
    event loop for its timing. Each time a node was selected in the netlist
    window, stack-frame would grow - as the new nested main loops never
    became idle. Segfaults ensued quite readily, presumably due to the code
    not being designed to be reentrant.
    
    It appears from reading the code, that these:
    
      while (gtk_events_pending ())        /* Make sure everything gets built */
        gtk_main_iteration ();
    
    Are not actually necessary.

:100644 100644 0f65d8b... 31caa2e... M	src/hid/gtk/gui-netlist-window.c

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

    hid/gtk: Skip check before calling ghid_netlist_window_create
    
    If the window already exists, ghid_netlist_window_create()
    is a NOOP, so there is no point in checking twice.

:100644 100644 7ec5b95... 0f65d8b... M	src/hid/gtk/gui-netlist-window.c

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

    hid/gtk: Remove unused function ghid_netlist_nodes_update ()

:100644 100644 26b97bb... 7ec5b95... M	src/hid/gtk/gui-netlist-window.c
:100644 100644 930df19... 114574f... M	src/hid/gtk/gui.h

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

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

    hid/gtk: Do not run a main loop from within the netlist window code.
    
    It turns out that this is a really bad idea.. if the main loop is kept
    busy, the new main-loop never exits and the events can become reentrant.
    
    I discovered this when testing code for an animation which used the main
    event loop for its timing. Each time a node was selected in the netlist
    window, stack-frame would grow - as the new nested main loops never
    became idle. Segfaults ensued quite readily, presumably due to the code
    not being designed to be reentrant.
    
    It appears from reading the code, that these:
    
      while (gtk_events_pending ())        /* Make sure everything gets built */
        gtk_main_iteration ();
    
    Are not actually necessary.

diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c
index 0f65d8b..31caa2e 100644
--- a/src/hid/gtk/gui-netlist-window.c
+++ b/src/hid/gtk/gui-netlist-window.c
@@ -622,9 +622,6 @@ node_get_node_from_name (gchar * node_name, LibraryMenuType ** node_net)
    */
   ghid_netlist_window_create (gport);
 
-  while (gtk_events_pending ())	/* Make sure everything gets built */
-    gtk_main_iteration ();
-
   /* Now walk through node entries of each net in the net model looking for
      |  the node_name.
    */
@@ -883,9 +880,6 @@ ghid_get_net_from_node_name (gchar * node_name, gboolean enabled_only)
    */
   ghid_netlist_window_create (gport);
 
-  while (gtk_events_pending ())	/* Make sure everything gets built */
-    gtk_main_iteration ();
-
   /* If no netlist is loaded the window doesn't appear. */
   if (netlist_window == NULL)
     return NULL;

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

    hid/gtk: Skip check before calling ghid_netlist_window_create
    
    If the window already exists, ghid_netlist_window_create()
    is a NOOP, so there is no point in checking twice.

diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c
index 7ec5b95..0f65d8b 100644
--- a/src/hid/gtk/gui-netlist-window.c
+++ b/src/hid/gtk/gui-netlist-window.c
@@ -620,8 +620,7 @@ node_get_node_from_name (gchar * node_name, LibraryMenuType ** node_net)
   /* Have to force the netlist window created because we need the treeview
      |  models constructed to do the search.
    */
-  if (!netlist_window)
-    ghid_netlist_window_create (gport);
+  ghid_netlist_window_create (gport);
 
   while (gtk_events_pending ())	/* Make sure everything gets built */
     gtk_main_iteration ();
@@ -882,8 +881,7 @@ ghid_get_net_from_node_name (gchar * node_name, gboolean enabled_only)
      |  models constructed so we can find the LibraryMenuType pointer the
      |  caller wants.
    */
-  if (!netlist_window)
-    ghid_netlist_window_create (gport);
+  ghid_netlist_window_create (gport);
 
   while (gtk_events_pending ())	/* Make sure everything gets built */
     gtk_main_iteration ();

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

    hid/gtk: Remove unused function ghid_netlist_nodes_update ()

diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c
index 26b97bb..7ec5b95 100644
--- a/src/hid/gtk/gui-netlist-window.c
+++ b/src/hid/gtk/gui-netlist-window.c
@@ -111,9 +111,6 @@ static LibraryMenuType *node_selected_net;
    |		PCB calls this to tell the gui netlist code the layout net has
    |		changed and the gui data structures (net and optionally node data
    |		models) should be rebuilt.
-   |
-   |   ghid_netlist_nodes_update(LibraryMenuType *net)
-   |		Called when the node model should be updated to a netlist.
 */
 
 
@@ -965,12 +962,6 @@ ghid_netlist_highlight_node (gchar * node_name)
     while (gtk_tree_model_iter_next (node_model, &iter));
 }
 
-void
-ghid_netlist_nodes_update (LibraryMenuType * net)
-{
-  node_model_update (net);
-}
-
 /* If code in PCB should change the netlist, call this to update
    |  what's in the netlist window.
 */
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 930df19..114574f 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -441,7 +441,6 @@ void ghid_set_status_line_label (void);
 void ghid_netlist_window_create (GHidPort * out);
 void ghid_netlist_window_show (GHidPort * out, gboolean raise);
 void ghid_netlist_window_update (gboolean init_nodes);
-void ghid_netlist_nodes_update (LibraryMenuType * net);
 
 LibraryMenuType *ghid_get_net_from_node_name (gchar * name, gboolean);
 void ghid_netlist_highlight_node (gchar * name);

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

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

The branch, master has been updated
       via  2407ce806639116f3f7dc1e85c45bef6a73e7758 (commit)
      from  a0ec8ebe927fb1128f1f50c4bba23a7ad1486eeb (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/default_font |  241 ++++++++++++++++++++++++++----------------------------
 1 files changed, 117 insertions(+), 124 deletions(-)


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

commit 2407ce806639116f3f7dc1e85c45bef6a73e7758
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>

    Tweak default font.
    
    Minor changes to various glyphs to improve readability and legibility,
    such as making V look less like U, or 8 less like 0.  No changes to font
    metrics, bounding boxes, or spacing.

:100644 100644 860566c... df80afc... M	src/default_font

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

commit 2407ce806639116f3f7dc1e85c45bef6a73e7758
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>

    Tweak default font.
    
    Minor changes to various glyphs to improve readability and legibility,
    such as making V look less like U, or 8 less like 0.  No changes to font
    metrics, bounding boxes, or spacing.

diff --git a/src/default_font b/src/default_font
index 860566c..df80afc 100644
--- a/src/default_font
+++ b/src/default_font
@@ -125,9 +125,9 @@ Symbol('0' 12)
 )
 Symbol('1' 12)
 (
-	SymbolLine(5 40 15 40 8)
-	SymbolLine(10 0 10 40 8)
-	SymbolLine(0 10 10 0 8)
+	SymbolLine( 0  8  8  0 8)
+	SymbolLine( 8  0  8 40 8)
+	SymbolLine( 0 40 15 40 8)
 )
 Symbol('2' 12)
 (
@@ -140,19 +140,23 @@ Symbol('2' 12)
 )
 Symbol('3' 12)
 (
-	SymbolLine(0 5 5 0 8)
-	SymbolLine(5 0 15 0 8)
-	SymbolLine(15 0 20 5 8)
-	SymbolLine(20 5 20 35 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
 	SymbolLine(15 40 20 35 8)
-	SymbolLine(5 40 15 40 8)
-	SymbolLine(0 35 5 40 8)
-	SymbolLine(5 20 20 20 8)
+	SymbolLine( 5 40 15 40 8)
+	SymbolLine( 0 35  5 40 8)
+
+	SymbolLine( 5 18 15 18 8)
+	SymbolLine(20  5 20 13 8)
+	SymbolLine(20 23 20 35 8)
+	SymbolLine(20 23 15 18 8)
+	SymbolLine(20 13 15 18 8)
 )
 Symbol('4' 12)
 (
-	SymbolLine(0 20 20 0 8)
-	SymbolLine(0 20 25 20 8)
+	SymbolLine(0 25 20 0 8)
+	SymbolLine(0 25 25 25 8)
 	SymbolLine(20 0 20 40 8)
 )
 Symbol('5' 12)
@@ -169,44 +173,43 @@ Symbol('5' 12)
 )
 Symbol('6' 12)
 (
-	SymbolLine(15 0 20 5 8)
-	SymbolLine(5 0 15 0 8)
-	SymbolLine(0 5 5 0 8)
-	SymbolLine(0 5 0 35 8)
-	SymbolLine(0 35 5 40 8)
-	SymbolLine(15 20 20 25 8)
-	SymbolLine(0 20 15 20 8)
-	SymbolLine(5 40 15 40 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 0  5  0 35 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine(15 18 20 23 8)
+	SymbolLine( 0 18 15 18 8)
+	SymbolLine( 5 40 15 40 8)
 	SymbolLine(15 40 20 35 8)
-	SymbolLine(20 25 20 35 8)
+	SymbolLine(20 23 20 35 8)
 )
 Symbol('7' 12)
 (
-	SymbolLine(0 40 25 15 8)
-	SymbolLine(25 0 25 15 8)
-	SymbolLine(0 0 25 0 8)
+	SymbolLine( 5 40 25  0 8)
+	SymbolLine( 0  0 25  0 8)
 )
 Symbol('8' 12)
 (
-	SymbolLine(0 35 5 40 8)
-	SymbolLine(0 25 0 35 8)
-	SymbolLine(0 25 5 20 8)
-	SymbolLine(5 20 15 20 8)
-	SymbolLine(15 20 20 25 8)
-	SymbolLine(20 25 20 35 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine( 0 27  0 35 8)
+	SymbolLine( 0 27  7 20 8)
+	SymbolLine( 7 20 13 20 8)
+	SymbolLine(13 20 20 27 8)
+	SymbolLine(20 27 20 35 8)
 	SymbolLine(15 40 20 35 8)
-	SymbolLine(5 40 15 40 8)
-	SymbolLine(0 15 5 20 8)
-	SymbolLine(0 5 0 15 8)
-	SymbolLine(0 5 5 0 8)
-	SymbolLine(5 0 15 0 8)
-	SymbolLine(15 0 20 5 8)
-	SymbolLine(20 5 20 15 8)
-	SymbolLine(15 20 20 15 8)
+	SymbolLine( 5 40 15 40 8)
+	SymbolLine( 0 13  7 20 8)
+	SymbolLine( 0  5  0 13 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine(20  5 20 13 8)
+	SymbolLine(13 20 20 13 8)
 )
 Symbol('9' 12)
 (
-	SymbolLine(0 40 20 20 8)
+	SymbolLine(5 40 20 20 8)
 	SymbolLine(20 5 20 20 8)
 	SymbolLine(15 0 20 5 8)
 	SymbolLine(5 0 15 0 8)
@@ -253,55 +256,55 @@ Symbol('?' 12)
 )
 Symbol('A' 12)
 (
-	SymbolLine(0 5 0 40 8)
-	SymbolLine(0 5 5 0 8)
-	SymbolLine(5 0 20 0 8)
-	SymbolLine(20 0 25 5 8)
-	SymbolLine(25 5 25 40 8)
-	SymbolLine(0 20 25 20 8)
+	SymbolLine( 0 10  0 40 8)
+	SymbolLine( 0 10  7  0 8)
+	SymbolLine( 7  0 18  0 8)
+	SymbolLine(18  0 25 10 8)
+	SymbolLine(25 10 25 40 8)
+	SymbolLine( 0 20 25 20 8)
 )
 Symbol('B' 12)
 (
-	SymbolLine(0 40 20 40 8)
+	SymbolLine( 0 40 20 40 8)
 	SymbolLine(20 40 25 35 8)
-	SymbolLine(25 25 25 35 8)
-	SymbolLine(20 20 25 25 8)
-	SymbolLine(5 20 20 20 8)
-	SymbolLine(5 0 5 40 8)
-	SymbolLine(0 0 20 0 8)
-	SymbolLine(20 0 25 5 8)
-	SymbolLine(25 5 25 15 8)
-	SymbolLine(20 20 25 15 8)
+	SymbolLine(25 23 25 35 8)
+	SymbolLine(20 18 25 23 8)
+	SymbolLine( 5 18 20 18 8)
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine( 0  0 20  0 8)
+	SymbolLine(20  0 25  5 8)
+	SymbolLine(25  5 25 13 8)
+	SymbolLine(20 18 25 13 8)
 )
 Symbol('C' 12)
 (
-	SymbolLine(5 40 20 40 8)
-	SymbolLine(0 35 5 40 8)
-	SymbolLine(0 5 0 35 8)
-	SymbolLine(0 5 5 0 8)
-	SymbolLine(5 0 20 0 8)
+	SymbolLine(7 40 20 40 8)
+	SymbolLine(0 33  7 40 8)
+	SymbolLine(0  7  0 33 8)
+	SymbolLine(0  7  7  0 8)
+	SymbolLine(7  0 20  0 8)
 )
 Symbol('D' 12)
 (
-	SymbolLine(5 0 5 40 8)
-	SymbolLine(20 0 25 5 8)
-	SymbolLine(25 5 25 35 8)
-	SymbolLine(20 40 25 35 8)
-	SymbolLine(0 40 20 40 8)
-	SymbolLine(0 0 20 0 8)
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine(18  0 25  7 8)
+	SymbolLine(25  7 25 33 8)
+	SymbolLine(18 40 25 33 8)
+	SymbolLine( 0 40 18 40 8)
+	SymbolLine( 0  0 18  0 8)
 )
 Symbol('E' 12)
 (
-	SymbolLine(0 20 15 20 8)
+	SymbolLine(0 18 15 18 8)
 	SymbolLine(0 40 20 40 8)
-	SymbolLine(0 0 0 40 8)
-	SymbolLine(0 0 20 0 8)
+	SymbolLine(0  0  0 40 8)
+	SymbolLine(0  0 20  0 8)
 )
 Symbol('F' 12)
 (
-	SymbolLine(0 0 0 40 8)
-	SymbolLine(0 0 20 0 8)
-	SymbolLine(0 20 15 20 8)
+	SymbolLine(0  0  0 40 8)
+	SymbolLine(0  0 20  0 8)
+	SymbolLine(0 18 15 18 8)
 )
 Symbol('G' 12)
 (
@@ -330,11 +333,12 @@ Symbol('I' 12)
 )
 Symbol('J' 12)
 (
-	SymbolLine(0 0 15 0 8)
-	SymbolLine(15 0 15 35 8)
+	SymbolLine( 7  0 15  0 8)
+	SymbolLine(15  0 15 35 8)
 	SymbolLine(10 40 15 35 8)
-	SymbolLine(5 40 10 40 8)
-	SymbolLine(0 35 5 40 8)
+	SymbolLine( 5 40 10 40 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine( 0 35  0 30 8)
 )
 Symbol('K' 12)
 (
@@ -350,15 +354,14 @@ Symbol('L' 12)
 Symbol('M' 12)
 (
 	SymbolLine(0 0 0 40 8)
-	SymbolLine(0 0 15 15 8)
-	SymbolLine(15 15 30 0 8)
+	SymbolLine(0 0 15 20 8)
+	SymbolLine(15 20 30 0 8)
 	SymbolLine(30 0 30 40 8)
 )
 Symbol('N' 12)
 (
 	SymbolLine(0 0 0 40 8)
-	SymbolLine(0 0 0 5 8)
-	SymbolLine(0 5 25 30 8)
+	SymbolLine(0 0 25 40 8)
 	SymbolLine(25 0 25 40 8)
 )
 Symbol('O' 12)
@@ -383,25 +386,25 @@ Symbol('P' 12)
 )
 Symbol('Q' 12)
 (
-	SymbolLine(0 5 0 35 8)
-	SymbolLine(0 5 5 0 8)
-	SymbolLine(5 0 15 0 8)
-	SymbolLine(15 0 20 5 8)
-	SymbolLine(20 5 20 35 8)
-	SymbolLine(15 40 20 35 8)
-	SymbolLine(5 40 15 40 8)
-	SymbolLine(0 35 5 40 8)
-	SymbolLine(10 30 20 40 8)
+	SymbolLine( 0  5  0 35 8)
+	SymbolLine( 0  5  5  0 8)
+	SymbolLine( 5  0 15  0 8)
+	SymbolLine(15  0 20  5 8)
+	SymbolLine(20  5 20 30 8)
+	SymbolLine(10 40 20 30 8)
+	SymbolLine( 5 40 10 40 8)
+	SymbolLine( 0 35  5 40 8)
+	SymbolLine(10 25 20 40 8)
 )
 Symbol('R' 12)
 (
-	SymbolLine(0 0 20 0 8)
-	SymbolLine(20 0 25 5 8)
-	SymbolLine(25 5 25 15 8)
+	SymbolLine( 0  0 20  0 8)
+	SymbolLine(20  0 25  5 8)
+	SymbolLine(25  5 25 15 8)
 	SymbolLine(20 20 25 15 8)
-	SymbolLine(5 20 20 20 8)
-	SymbolLine(5 0 5 40 8)
-	SymbolLine(5 20 25 40 8)
+	SymbolLine( 5 20 20 20 8)
+	SymbolLine( 5  0  5 40 8)
+	SymbolLine(13 20 25 40 8)
 )
 Symbol('S' 12)
 (
@@ -432,42 +435,34 @@ Symbol('U' 12)
 )
 Symbol('V' 12)
 (
-	SymbolLine(0 0 0 30 8)
-	SymbolLine(0 30 10 40 8)
-	SymbolLine(10 40 20 30 8)
-	SymbolLine(20 0 20 30 8)
+	SymbolLine( 0  0 10 40 8)
+	SymbolLine(10 40 20  0 8)
 )
 Symbol('W' 12)
 (
-	SymbolLine(0 0 0 40 8)
-	SymbolLine(0 40 15 25 8)
-	SymbolLine(15 25 30 40 8)
-	SymbolLine(30 0 30 40 8)
+	SymbolLine( 0  0  0 20 8)
+	SymbolLine( 0 20  5 40 8)
+	SymbolLine( 5 40 15 20 8)
+	SymbolLine(15 20 25 40 8)
+	SymbolLine(25 40 30 20 8)
+	SymbolLine(30 20 30  0 8)
 )
 Symbol('X' 12)
 (
-	SymbolLine(0 0 0 5 8)
-	SymbolLine(0 5 25 30 8)
-	SymbolLine(25 30 25 40 8)
-	SymbolLine(0 30 0 40 8)
-	SymbolLine(0 30 25 5 8)
-	SymbolLine(25 0 25 5 8)
+	SymbolLine( 0 40 25  0 8)
+	SymbolLine( 0  0 25 40 8)
 )
 Symbol('Y' 12)
 (
-	SymbolLine(0 0 0 5 8)
-	SymbolLine(0 5 10 15 8)
-	SymbolLine(10 15 20 5 8)
-	SymbolLine(20 0 20 5 8)
-	SymbolLine(10 15 10 40 8)
+	SymbolLine( 0  0 10 20 8)
+	SymbolLine(10 20 20  0 8)
+	SymbolLine(10 20 10 40 8)
 )
 Symbol('Z' 12)
 (
-	SymbolLine(0 0 25 0 8)
-	SymbolLine(25 0 25 5 8)
-	SymbolLine(0 30 25 5 8)
-	SymbolLine(0 30 0 40 8)
-	SymbolLine(0 40 25 40 8)
+	SymbolLine( 0  0 25  0 8)
+	SymbolLine( 0 40 25  0 8)
+	SymbolLine( 0 40 25 40 8)
 )
 Symbol('[' 12)
 (
@@ -578,12 +573,12 @@ Symbol('h' 12)
 )
 Symbol('i' 10)
 (
-	SymbolLine(0 10 0 15 8)
+	SymbolLine(0 10 0 11 10)
 	SymbolLine(0 25 0 40 8)
 )
 Symbol('j' 10)
 (
-	SymbolLine(5 10 5 15 8)
+	SymbolLine(5 10 5 11 10)
 	SymbolLine(5 25 5 50 8)
 	SymbolLine(0 55 5 50 8)
 )
@@ -689,10 +684,8 @@ Symbol('u' 12)
 )
 Symbol('v' 12)
 (
-	SymbolLine(0 20 0 30 8)
-	SymbolLine(0 30 10 40 8)
-	SymbolLine(10 40 20 30 8)
-	SymbolLine(20 20 20 30 8)
+	SymbolLine( 0 20 10 40 8)
+	SymbolLine(20 20 10 40 8)
 )
 Symbol('w' 12)
 (

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

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

The branch, master has been updated
       via  a0ec8ebe927fb1128f1f50c4bba23a7ad1486eeb (commit)
       via  583daf65957133968e5e5fe674db6d8a4501cc63 (commit)
       via  af5bb35cfb2283037a28cb5f7ec97734a95738d2 (commit)
      from  f9ad6634a55f7f79106945e3307aafe0d39eae61 (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/gtkhid-main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


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

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

    hid/gtk: Fix up paning when flipping the board.
    
    I'm not sure when this got broken, but it was probably my fault ;)

:100644 100644 c917e43... 83df23f... M	src/hid/gtk/gtkhid-main.c

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

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

    hid/gtk: Fix up paning when flipping the board.
    
    I'm not sure when this got broken, but it was probably my fault ;)

diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index c917e43..83df23f 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -1458,12 +1458,12 @@ SwapSides (int argc, char **argv, int x, int y)
   if (do_flip_x)
     {
 	flipd = PCB->MaxWidth / 2 - SIDE_X (gport->pcb_x);
-	ghid_port_ranges_pan (2 * flipd, 0, TRUE);
+	ghid_port_ranges_pan (-2 * flipd, 0, TRUE);
     }
   if (do_flip_y)
     {
 	flipd = PCB->MaxHeight / 2 - SIDE_Y (gport->pcb_y);
-	ghid_port_ranges_pan (0, 2 * flipd, TRUE);
+	ghid_port_ranges_pan (0, -2 * flipd, TRUE);
     }
 
   ghid_invalidate_all ();

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

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

The branch, master has been updated
       via  f9ad6634a55f7f79106945e3307aafe0d39eae61 (commit)
      from  f04424e76db53f9405e0b2e28edb880ce614b88d (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/pcb-printf.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


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

commit f9ad6634a55f7f79106945e3307aafe0d39eae61
Author: Andrew Poelstra <as...@sf...>
Commit: Andrew Poelstra <as...@sf...>

    Fix %ma specifier

:100644 100644 7562a57... 4410691... M	src/pcb-printf.c

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

commit f9ad6634a55f7f79106945e3307aafe0d39eae61
Author: Andrew Poelstra <as...@sf...>
Commit: Andrew Poelstra <as...@sf...>

    Fix %ma specifier

diff --git a/src/pcb-printf.c b/src/pcb-printf.c
index 7562a57..4410691 100644
--- a/src/pcb-printf.c
+++ b/src/pcb-printf.c
@@ -359,11 +359,10 @@ static gchar *pcb_vprintf(const char *fmt, va_list args)
                     unit_str = CoordsToString(value, 1, spec->str, mask & ALLOW_ALL, suffix);
                   break;
                 case 'a':
-                  value[0] = va_arg(args, Angle);
                   g_string_append (spec, ".0f");
                   if (suffix == SUFFIX)
                     g_string_append (spec, " deg");
-                  unit_str = g_strdup_printf (spec->str, value[0]);
+                  unit_str = g_strdup_printf (spec->str, (double) va_arg(args, Angle));
                   break;
                 case '+':
                   mask = va_arg(args, enum e_allow);

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

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

The branch, master has been updated
  discards  5eb54cbaab5033c5f5257d128987053f3bba3330 (commit)
       via  f04424e76db53f9405e0b2e28edb880ce614b88d (commit)
      from  5eb54cbaab5033c5f5257d128987053f3bba3330 (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
=========

 doc/pcb.texi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


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

commit f04424e76db53f9405e0b2e28edb880ce614b88d
Author: Felix Ruoff <Fe...@po...>
Commit: Peter Clifton <pc...@ca...>

    doc: Rat lines are drawn differently to other lines
    
    Fixes up documentation to reflect actual behaviour. The old docs stated
    that rat lines are drawn stippled, however this is not how any of the
    supported HIDs actually draws them.
    
    Just state that they may be drawn differently to distinguish them from
    other tracks.
    
    [Minor edits to the sentence and commit message by Peter Clifton]
    
    Signed-off-by: Peter Clifton <pc...@ca...>

:100644 100644 5bdb5fb... cb09c00... M	doc/pcb.texi

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

commit f04424e76db53f9405e0b2e28edb880ce614b88d
Author: Felix Ruoff <Fe...@po...>
Commit: Peter Clifton <pc...@ca...>

    doc: Rat lines are drawn differently to other lines
    
    Fixes up documentation to reflect actual behaviour. The old docs stated
    that rat lines are drawn stippled, however this is not how any of the
    supported HIDs actually draws them.
    
    Just state that they may be drawn differently to distinguish them from
    other tracks.
    
    [Minor edits to the sentence and commit message by Peter Clifton]
    
    Signed-off-by: Peter Clifton <pc...@ca...>

diff --git a/doc/pcb.texi b/doc/pcb.texi
index 5bdb5fb..cb09c00 100644
--- a/doc/pcb.texi
+++ b/doc/pcb.texi
@@ -2194,7 +2194,7 @@ If the layout is already completely wired, nothing will be added, and you will
 get a message that the wiring is complete.
 
 Rat-lines are lines having the special property that they only connect to pins and
-pads at their end points.  Rat-lines are drawn on the screen with a stippled pattern
+pads at their end points.  Rat-lines may be drawn differently to other lines
 to make them easier to identify since they have special behavior and cannot
 remain in a completed layout.
 Rat-lines are added in the minimum length straight-line tree pattern
@@ -3602,7 +3602,7 @@ Adds rat-lines to the layout using the loaded netlist file (see the @emph{:rn},
 line thickness shown in the status line.
 Only missing connectivity is added by the
 AddRats command so if, for example, the layout is complete nothing will be added.
-Rat lines are drawn on the screen with a stippled pattern
+Rat lines may be drawn different to other lines on the screen
 to make them easier to identify since they cannot appear in a completed layout.
 The rat-lines are added in the minimum length straight-line tree pattern
 (always ending on pins or pads) that satisfies the missing connectivity in the circuit.

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

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

The branch, master has been updated
       via  5eb54cbaab5033c5f5257d128987053f3bba3330 (commit)
      from  5580b5e80e8a9a9973099a5fa3fe9fc91d25726d (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
=========

 doc/pcb.texi |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


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

commit 5eb54cbaab5033c5f5257d128987053f3bba3330
Author: Felix Ruoff <Fe...@po...>
Commit: Peter Clifton <pc...@ca...>

    doc: Rat lines are drawn differently to other lines
    
    Fixes up documentation to reflect actual behaviour. The old docs stated
    that rat lines are drawn stippled, however this is not how any of the
    supported HIDs actually draws them.
    
    Just state that they may be drawn differently to distinguish them from
    other tracks.
    
    [Minor edits to the sentence and commit message by Peter Clifton]
    
    Signed-off-by: Peter Clifton <pc...@ca...>

:100644 100644 5bdb5fb... 17f5051... M	doc/pcb.texi

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

commit 5eb54cbaab5033c5f5257d128987053f3bba3330
Author: Felix Ruoff <Fe...@po...>
Commit: Peter Clifton <pc...@ca...>

    doc: Rat lines are drawn differently to other lines
    
    Fixes up documentation to reflect actual behaviour. The old docs stated
    that rat lines are drawn stippled, however this is not how any of the
    supported HIDs actually draws them.
    
    Just state that they may be drawn differently to distinguish them from
    other tracks.
    
    [Minor edits to the sentence and commit message by Peter Clifton]
    
    Signed-off-by: Peter Clifton <pc...@ca...>

diff --git a/doc/pcb.texi b/doc/pcb.texi
index 5bdb5fb..17f5051 100644
--- a/doc/pcb.texi
+++ b/doc/pcb.texi
@@ -2194,7 +2194,7 @@ If the layout is already completely wired, nothing will be added, and you will
 get a message that the wiring is complete.
 
 Rat-lines are lines having the special property that they only connect to pins and
-pads at their end points.  Rat-lines are drawn on the screen with a stippled pattern
+pads at their end points.  Rat-lines may be drawn different to other lines
 to make them easier to identify since they have special behavior and cannot
 remain in a completed layout.
 Rat-lines are added in the minimum length straight-line tree pattern
@@ -3602,7 +3602,7 @@ Adds rat-lines to the layout using the loaded netlist file (see the @emph{:rn},
 line thickness shown in the status line.
 Only missing connectivity is added by the
 AddRats command so if, for example, the layout is complete nothing will be added.
-Rat lines are drawn on the screen with a stippled pattern
+Rat lines may be drawn different to other lines on the screen
 to make them easier to identify since they cannot appear in a completed layout.
 The rat-lines are added in the minimum length straight-line tree pattern
 (always ending on pins or pads) that satisfies the missing connectivity in the circuit.

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

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

The branch, master has been updated
       via  5580b5e80e8a9a9973099a5fa3fe9fc91d25726d (commit)
      from  bf22e47db5134b5f70548a98779e36a530387467 (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/gtkhid-main.c |   20 ++++----------------
 1 files changed, 4 insertions(+), 16 deletions(-)


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

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

    hid/gtk: Fixup Zoom() and zoom_by() so they don't ignore passed coordinates.
    
    The Zoom() action was passing bogus coordinates (in pixels), and
    zoom_by() was ignoring the passed coordinates and just using the mouse
    pointer location last recorded in gport->pcb_x and gport->pcb_y.
    
    Fix zoom_by() to use the passed coordinates, fix Zoom() to not mangle
    the passed board coordinates into screen space.. zoom_by() wants
    board coords.
    
    Finally, remove a special case from the Zoom() action where if the passed
    coordinates were both zero, we would pass the PCB coordinates of the board
    center. I'm hopeful that things will "just work" without this.

:100644 100644 a92937f... c917e43... M	src/hid/gtk/gtkhid-main.c

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

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

    hid/gtk: Fixup Zoom() and zoom_by() so they don't ignore passed coordinates.
    
    The Zoom() action was passing bogus coordinates (in pixels), and
    zoom_by() was ignoring the passed coordinates and just using the mouse
    pointer location last recorded in gport->pcb_x and gport->pcb_y.
    
    Fix zoom_by() to use the passed coordinates, fix Zoom() to not mangle
    the passed board coordinates into screen space.. zoom_by() wants
    board coords.
    
    Finally, remove a special case from the Zoom() action where if the passed
    coordinates were both zero, we would pass the PCB coordinates of the board
    center. I'm hopeful that things will "just work" without this.

diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index a92937f..c917e43 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -134,18 +134,6 @@ Zoom (int argc, char **argv, int x, int y)
   if (argc > 1)
     AFAIL (zoom);
 
-  if (x == 0 && y == 0)
-    {
-      x = gport->view_width / 2;
-      y = gport->view_height / 2;
-    }
-  else
-    {
-      /* Px converts view->pcb, Vx converts pcb->view */
-      x = Vx (x);
-      y = Vy (y);
-    }
-
   if (argc < 1)
     {
       zoom_fit ();
@@ -204,15 +192,15 @@ zoom_to (double new_zoom, int x, int y)
   if (gport->zoom == new_zoom)
     return;
 
-  xtmp = (SIDE_X (gport->pcb_x) - gport->view_x0) / (double)gport->view_width;
-  ytmp = (SIDE_Y (gport->pcb_y) - gport->view_y0) / (double)gport->view_height;
+  xtmp = (SIDE_X (x) - gport->view_x0) / (double)gport->view_width;
+  ytmp = (SIDE_Y (y) - gport->view_y0) / (double)gport->view_height;
 
   gport->zoom = new_zoom;
   pixel_slop = new_zoom;
   ghid_port_ranges_scale (FALSE);
 
-  gport->view_x0 = MAX (0, SIDE_X (gport->pcb_x) - xtmp * gport->view_width);
-  gport->view_y0 = MAX (0, SIDE_Y (gport->pcb_y) - ytmp * gport->view_height);
+  gport->view_x0 = MAX (0, SIDE_X (x) - xtmp * gport->view_width);
+  gport->view_y0 = MAX (0, SIDE_Y (y) - ytmp * gport->view_height);
 
   ghidgui->adjustment_changed_holdoff = TRUE;
   gtk_range_set_value (GTK_RANGE (ghidgui->h_range), gport->view_x0);

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

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

The branch, master has been updated
       via  bf22e47db5134b5f70548a98779e36a530387467 (commit)
       via  6352ae63bc408c6453e5760c523a67d3abd7a9c0 (commit)
      from  8d1d20e9ccc256edbaceec81696eb6496f4c0ac5 (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/gtkhid-main.c       |   16 ++++++++++---
 src/hid/gtk/gui-output-events.c |   46 ---------------------------------------
 src/hid/gtk/gui.h               |    1 -
 3 files changed, 12 insertions(+), 51 deletions(-)


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

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

    hid/gtk: Introduce a zoom_fit() function, remove duplicated code.
    
    Several places in the code invoke a "zoom_fit" type function by calling
    zoom_to() or ghid_port_ranges_zoom() with bogus parameters.
    
    Implement a specific function which restricts this to one location, then
    remove the now redundant ghid_port_ranges_zoom(), which basically just
    duplicated the code from zoom_by() with an added check for a 0.0 zoom
    factor to trigger the zoom-to-fit feature.

:100644 100644 9cab107... a92937f... M	src/hid/gtk/gtkhid-main.c
:100644 100644 951a001... bc47214... M	src/hid/gtk/gui-output-events.c
:100644 100644 e825b75... 930df19... M	src/hid/gtk/gui.h

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

    hid/gtk: Add missing static parameter to zoom_by() function.

:100644 100644 c71e70b... 9cab107... M	src/hid/gtk/gtkhid-main.c

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

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

    hid/gtk: Introduce a zoom_fit() function, remove duplicated code.
    
    Several places in the code invoke a "zoom_fit" type function by calling
    zoom_to() or ghid_port_ranges_zoom() with bogus parameters.
    
    Implement a specific function which restricts this to one location, then
    remove the now redundant ghid_port_ranges_zoom(), which basically just
    duplicated the code from zoom_by() with an added check for a 0.0 zoom
    factor to trigger the zoom-to-fit feature.

diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index 9cab107..a92937f 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -31,6 +31,7 @@ RCSID ("$Id$");
 
 static void zoom_to (double factor, int x, int y);
 static void zoom_by (double factor, int x, int y);
+static void zoom_fit (void);
 
 int ghid_flip_x = 0, ghid_flip_y = 0;
 
@@ -64,7 +65,7 @@ ghid_pan_fixup ()
   if (gport->view_width > PCB->MaxWidth &&
       gport->view_height > PCB->MaxHeight)
     {
-      zoom_by (1, 0, 0);
+      zoom_fit ();
       return;
     }
 
@@ -147,7 +148,7 @@ Zoom (int argc, char **argv, int x, int y)
 
   if (argc < 1)
     {
-      zoom_to (1000000, 0, 0);
+      zoom_fit ();
       return 0;
     }
 
@@ -228,6 +229,13 @@ zoom_by (double factor, int x, int y)
   zoom_to (gport->zoom * factor, x, y);
 }
 
+static void
+zoom_fit (void)
+{
+  zoom_to (MAX (PCB->MaxWidth  / gport->width,
+                PCB->MaxHeight / gport->height), 0, 0);
+}
+
 /* ------------------------------------------------------------ */
 
 void
@@ -1181,7 +1189,7 @@ PCBChanged (int argc, char **argv, int x, int y)
   RouteStylesChanged (0, NULL, 0, 0);
   ghid_port_ranges_scale (TRUE);
   ghid_port_ranges_pan (0, 0, FALSE);
-  ghid_port_ranges_zoom (0);
+  zoom_fit ();
   ghid_port_ranges_changed ();
   ghid_sync_with_new_layout ();
   return 0;
diff --git a/src/hid/gtk/gui-output-events.c b/src/hid/gtk/gui-output-events.c
index 951a001..bc47214 100644
--- a/src/hid/gtk/gui-output-events.c
+++ b/src/hid/gtk/gui-output-events.c
@@ -147,52 +147,6 @@ ghid_port_ranges_scale (gboolean emit_changed)
     gtk_signal_emit_by_name (GTK_OBJECT (adj), "changed");
 }
 
-void
-ghid_port_ranges_zoom (gdouble zoom)
-{
-  gdouble xtmp, ytmp;
-  gint		x0, y0;
-
-  /* figure out zoom values in that would just make the width fit and
-   * that would just make the height fit
-   */
-  xtmp = (gdouble) PCB->MaxWidth / gport->width;
-  ytmp = (gdouble) PCB->MaxHeight / gport->height;
-
-  /* if we've tried to zoom further out than what would make the
-   * entire board fit or we passed 0, then pick a zoom that just makes
-   * the board fit.
-   */
-  if ((zoom > xtmp && zoom > ytmp) || zoom == 0.0)
-    zoom = (xtmp > ytmp) ? xtmp : ytmp;
-
-  xtmp = (SIDE_X (gport->pcb_x) - gport->view_x0) /
-            (gdouble) gport->view_width;
-  ytmp = (SIDE_Y (gport->pcb_y) - gport->view_y0) /
-            (gdouble) gport->view_height;
-
-  gport->zoom = zoom;
-  pixel_slop = zoom;
-  ghid_port_ranges_scale(FALSE);
-
-  x0 = SIDE_X (gport->pcb_x) - xtmp * gport->view_width;
-  if (x0 < 0)
-    x0 = 0;
-  gport->view_x0 = x0;
-
-  y0 = SIDE_Y (gport->pcb_y) - ytmp * gport->view_height;
-  if (y0 < 0)
-    y0 = 0;
-  gport->view_y0 = y0;
-
-  ghidgui->adjustment_changed_holdoff = TRUE;
-  gtk_range_set_value (GTK_RANGE (ghidgui->h_range), gport->view_x0);
-  gtk_range_set_value (GTK_RANGE (ghidgui->v_range), gport->view_y0);
-  ghidgui->adjustment_changed_holdoff = FALSE;
-
-  ghid_port_ranges_changed();
-}
-
 
 /* ---------------------------------------------------------------------- 
  * handles all events from PCB drawing area
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index e825b75..930df19 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -276,7 +276,6 @@ void ghid_get_pointer (gint *, gint *);
 /* gui-output-events.c function prototypes.
 */
 void ghid_port_ranges_changed (void);
-void ghid_port_ranges_zoom (gdouble zoom);
 gboolean ghid_port_ranges_pan (gdouble x, gdouble y, gboolean relative);
 void ghid_port_ranges_scale (gboolean emit_changed);
 void ghid_port_ranges_update_ranges (void);

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

    hid/gtk: Add missing static parameter to zoom_by() function.

diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index c71e70b..9cab107 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -222,7 +222,7 @@ zoom_to (double new_zoom, int x, int y)
   ghid_set_status_line_label ();
 }
 
-void
+static void
 zoom_by (double factor, int x, int y)
 {
   zoom_to (gport->zoom * factor, x, y);

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

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

The branch, master has been updated
       via  8d1d20e9ccc256edbaceec81696eb6496f4c0ac5 (commit)
       via  17d90bcba9db4e96f9c49ed3871f516a8ad28d83 (commit)
      from  c6338c9b813787819812fa95bfacabb7088e9632 (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/gtkhid-main.c |  107 ++++++++++----------------------------------
 1 files changed, 25 insertions(+), 82 deletions(-)


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

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

    hid/gtk: Some cleanups to the zoom_to() function
    
    Still confusing, but at least its not the fault of the code formatting now.

:100644 100644 0f9fdea... c71e70b... M	src/hid/gtk/gtkhid-main.c

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

    hid/gtk: Remove old debugging code from zoom_to and zoom_by() functions
    
    This code was adding to clutter in the functions, and appears in some
    cases to be bit-rotten. (The coordinates it operated on don't appear to
    be have been consistent with the current GUI code).

:100644 100644 8500f6a... 0f9fdea... M	src/hid/gtk/gtkhid-main.c

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

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

    hid/gtk: Some cleanups to the zoom_to() function
    
    Still confusing, but at least its not the fault of the code formatting now.

diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index 0f9fdea..c71e70b 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -179,64 +179,46 @@ Zoom (int argc, char **argv, int x, int y)
 static void
 zoom_to (double new_zoom, int x, int y)
 {
-  double max_zoom;
+  double min_zoom, max_zoom;
+  double xtmp, ytmp;
 
   /* gport->zoom:
    * zoom value is PCB units per screen pixel.  Larger numbers mean zooming
    * out - the largest value means you are looking at the whole board.
    *
-   * PCB units per screen pixel
-   *
    * gport->view_width and gport->view_height are in PCB coordinates
    */
 
-  /* Find the zoom that would just make the entire board fit */
-  max_zoom = PCB->MaxWidth / gport->width;
-  if (max_zoom < PCB->MaxHeight / gport->height)
-    max_zoom = PCB->MaxHeight / gport->height;
+  /* Set the "minimum" zoom constant (maximum zoom),
+   * at 1 pixel per PCB unit */
+  min_zoom = 1;
 
-  /* 
-   * clip the zooming so we can never have more than 1 pixel per PCB
-   * unit and never zoom out more than viewing the entire board
-   */
-     
-  if (new_zoom < 1)
-    new_zoom = 1;
-  if (new_zoom > max_zoom)
-    new_zoom = max_zoom;
+  /* Set the "maximum" zoom constant (minimum zoom),
+   * to make the entire board just fit inside the viewport */
+  max_zoom = MAX (PCB->MaxWidth  / gport->width,
+                  PCB->MaxHeight / gport->height);
 
-  if (gport->zoom != new_zoom)
-    {
-      gdouble xtmp, ytmp;
-      gint x0, y0;
-
-      xtmp = (SIDE_X (gport->pcb_x) - gport->view_x0) /
-                (gdouble) gport->view_width;
-      ytmp = (SIDE_Y (gport->pcb_y) - gport->view_y0) /
-                (gdouble) gport->view_height;
-
-      gport->zoom = new_zoom;
-      pixel_slop = new_zoom;
-      ghid_port_ranges_scale(FALSE);
-
-      x0 = SIDE_X (gport->pcb_x) - xtmp * gport->view_width;
-      if (x0 < 0)
-        x0 = 0;
-      gport->view_x0 = x0;
-
-      y0 = SIDE_Y (gport->pcb_y) - ytmp * gport->view_height;
-      if (y0 < 0)
-        y0 = 0;
-      gport->view_y0 = y0;
-
-      ghidgui->adjustment_changed_holdoff = TRUE;
-      gtk_range_set_value (GTK_RANGE (ghidgui->h_range), gport->view_x0);
-      gtk_range_set_value (GTK_RANGE (ghidgui->v_range), gport->view_y0);
-      ghidgui->adjustment_changed_holdoff = FALSE;
-
-      ghid_port_ranges_changed();
-    }
+  new_zoom = MIN (MAX (min_zoom, new_zoom), max_zoom);
+
+  if (gport->zoom == new_zoom)
+    return;
+
+  xtmp = (SIDE_X (gport->pcb_x) - gport->view_x0) / (double)gport->view_width;
+  ytmp = (SIDE_Y (gport->pcb_y) - gport->view_y0) / (double)gport->view_height;
+
+  gport->zoom = new_zoom;
+  pixel_slop = new_zoom;
+  ghid_port_ranges_scale (FALSE);
 
+  gport->view_x0 = MAX (0, SIDE_X (gport->pcb_x) - xtmp * gport->view_width);
+  gport->view_y0 = MAX (0, SIDE_Y (gport->pcb_y) - ytmp * gport->view_height);
+
+  ghidgui->adjustment_changed_holdoff = TRUE;
+  gtk_range_set_value (GTK_RANGE (ghidgui->h_range), gport->view_x0);
+  gtk_range_set_value (GTK_RANGE (ghidgui->v_range), gport->view_y0);
+  ghidgui->adjustment_changed_holdoff = FALSE;
+
+  ghid_port_ranges_changed ();
   ghid_set_status_line_label ();
 }
 

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

    hid/gtk: Remove old debugging code from zoom_to and zoom_by() functions
    
    This code was adding to clutter in the functions, and appears in some
    cases to be bit-rotten. (The coordinates it operated on don't appear to
    be have been consistent with the current GUI code).

diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c
index 8500f6a..0f9fdea 100644
--- a/src/hid/gtk/gtkhid-main.c
+++ b/src/hid/gtk/gtkhid-main.c
@@ -179,10 +179,7 @@ Zoom (int argc, char **argv, int x, int y)
 static void
 zoom_to (double new_zoom, int x, int y)
 {
-  double max_zoom, xfrac, yfrac;
-#ifdef DEBUG
-  int cx, cy;
-#endif
+  double max_zoom;
 
   /* gport->zoom:
    * zoom value is PCB units per screen pixel.  Larger numbers mean zooming
@@ -193,27 +190,11 @@ zoom_to (double new_zoom, int x, int y)
    * gport->view_width and gport->view_height are in PCB coordinates
    */
 
-#ifdef DEBUG
-  pcb_printf ("\nzoom_to( %g, %#mS, %#mS)\n", new_zoom, x, y);
-#endif
-
-  xfrac = (double) x / (double) gport->view_width;
-  yfrac = (double) y / (double) gport->view_height;
-
-  if (ghid_flip_x)
-    xfrac = 1-xfrac;
-  if (ghid_flip_y)
-    yfrac = 1-yfrac;
-
   /* Find the zoom that would just make the entire board fit */
   max_zoom = PCB->MaxWidth / gport->width;
   if (max_zoom < PCB->MaxHeight / gport->height)
     max_zoom = PCB->MaxHeight / gport->height;
 
-#ifdef DEBUG
-  printf ("zoom_to():  max_zoom = %g\n", max_zoom);
-#endif
-
   /* 
    * clip the zooming so we can never have more than 1 pixel per PCB
    * unit and never zoom out more than viewing the entire board
@@ -224,18 +205,6 @@ zoom_to (double new_zoom, int x, int y)
   if (new_zoom > max_zoom)
     new_zoom = max_zoom;
 
-#ifdef DEBUG
-  printf ("max_zoom = %g, xfrac = %g, yfrac = %g, new_zoom = %g\n", 
-	  max_zoom, xfrac, yfrac, new_zoom);
-
-  /* find center x and y */
-  cx = gport->view_x0 + gport->view_width * xfrac * gport->zoom;
-  cy = gport->view_y0 + gport->view_height * yfrac * gport->zoom;
-
-  pcb_printf ("zoom_to():  x0 = %#mS, cx = %#mS\n", gport->view_x0, cx);
-  pcb_printf ("zoom_to():  y0 = %#mS, cy = %#mS\n", gport->view_y0, cy);
-#endif
-
   if (gport->zoom != new_zoom)
     {
       gdouble xtmp, ytmp;
@@ -268,20 +237,12 @@ zoom_to (double new_zoom, int x, int y)
       ghid_port_ranges_changed();
     }
 
-#ifdef DEBUG
-  printf ("zoom_to():  new x0 = %d\n", gport->view_x0);
-  printf ("zoom_to():  new y0 = %d\n", gport->view_y0);
-#endif
   ghid_set_status_line_label ();
 }
 
 void
 zoom_by (double factor, int x, int y)
 {
-#ifdef DEBUG
-  pcb_printf ("\nzoom_by( %g, %#mS, %#mS).  old gport->zoom = %g\n", 
-	  factor, x, y, gport->zoom);
-#endif
   zoom_to (gport->zoom * factor, x, y);
 }
 

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

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

The branch, master has been updated
       via  c6338c9b813787819812fa95bfacabb7088e9632 (commit)
      from  f5423195c8dcd95e028cb5ee6776eb4e58b46e37 (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/gtkhid-gdk.c        |    9 +++++++++
 src/hid/gtk/gtkhid-gl.c         |    9 +++++++++
 src/hid/gtk/gui-output-events.c |    4 ++--
 src/hid/gtk/gui.h               |    1 +
 4 files changed, 21 insertions(+), 2 deletions(-)


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

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

    hid/gtk: Abstract away event coordinate conversion to PCB base units

:100644 100644 5da8000... 4fdb8d3... M	src/hid/gtk/gtkhid-gdk.c
:100644 100644 044d7c5... ed34ea1... M	src/hid/gtk/gtkhid-gl.c
:100644 100644 1a10251... 951a001... M	src/hid/gtk/gui-output-events.c
:100644 100644 29a5407... e825b75... M	src/hid/gtk/gui.h

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

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

    hid/gtk: Abstract away event coordinate conversion to PCB base units

diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index 5da8000..4fdb8d3 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -1308,3 +1308,12 @@ ghid_finish_debug_draw (void)
   /* No special tear down requirements
    */
 }
+
+bool
+ghid_event_to_pcb_coords (int event_x, int event_y, Coord *pcb_x, Coord *pcb_y)
+{
+  *pcb_x = EVENT_TO_PCB_X (event_x);
+  *pcb_y = EVENT_TO_PCB_Y (event_y);
+
+  return true;
+}
diff --git a/src/hid/gtk/gtkhid-gl.c b/src/hid/gtk/gtkhid-gl.c
index 044d7c5..ed34ea1 100644
--- a/src/hid/gtk/gtkhid-gl.c
+++ b/src/hid/gtk/gtkhid-gl.c
@@ -1272,3 +1272,12 @@ ghid_finish_debug_draw (void)
 
   ghid_end_drawing (gport);
 }
+
+bool
+ghid_event_to_pcb_coords (int event_x, int event_y, Coord *pcb_x, Coord *pcb_y)
+{
+  *pcb_x = EVENT_TO_PCB_X (event_x);
+  *pcb_y = EVENT_TO_PCB_Y (event_y);
+
+  return true;
+}
diff --git a/src/hid/gtk/gui-output-events.c b/src/hid/gtk/gui-output-events.c
index 1a10251..951a001 100644
--- a/src/hid/gtk/gui-output-events.c
+++ b/src/hid/gtk/gui-output-events.c
@@ -226,8 +226,8 @@ ghid_note_event_location (GdkEventButton * ev)
       event_x = ev->x;
       event_y = ev->y;
     }
-  gport->pcb_x = EVENT_TO_PCB_X (event_x);
-  gport->pcb_y = EVENT_TO_PCB_Y (event_y);
+
+  ghid_event_to_pcb_coords (event_x, event_y, &gport->pcb_x, &gport->pcb_y);
 
   moved = MoveCrosshairAbsolute (gport->pcb_x, gport->pcb_y);
   if (moved)
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 29a5407..e825b75 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -504,6 +504,7 @@ GdkPixmap *ghid_render_pixmap (int cx, int cy, double zoom,
 HID *ghid_request_debug_draw (void);
 void ghid_flush_debug_draw (void);
 void ghid_finish_debug_draw (void);
+bool ghid_event_to_pcb_coords (int event_x, int event_y, Coord *pcb_x, Coord *pcb_y);
 
 /* gtkhid-main.c */
 void ghid_pan_fixup (void);