[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (9f6f22222099b9ce0488823a6f44cca92d3d650f)
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 <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
action.c: Remove dead code, IgnoreMotionEvents
:100644 100644 d892429... 6a339bb... M src/action.c
commit 6dbea16935e0c87b12b62d818a899cdadb745b89
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
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 <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
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 <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
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 *);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs