[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (a3d422a89dd7aa2f6298cc8c284896284a029838)
The branch, master has been updated
via a3d422a89dd7aa2f6298cc8c284896284a029838 (commit)
via bc21793c7a97ae345caabd95b15d1d372c9ba31e (commit)
via 790d9c935dc613c131dfd8dccc2450ab0956c27c (commit)
via 600e547d7542ce790c7cafd643eed3cd80146d72 (commit)
via 05dd97fdce05c6b7aeebe64cdcc8efaa220db71e (commit)
from 492990353cd3e53cdc77d5d72e25e6504a53ada5 (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 | 39 ++++++++++++++-------------------------
src/autoplace.c | 2 +-
src/autoroute.c | 2 +-
src/draw.c | 41 +++--------------------------------------
src/draw.h | 4 +---
src/find.c | 2 +-
src/set.c | 2 +-
src/toporouter.c | 2 +-
src/vendor.c | 2 +-
9 files changed, 24 insertions(+), 72 deletions(-)
=================
Commit Messages
=================
commit a3d422a89dd7aa2f6298cc8c284896284a029838
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Remove API ClearAndRedrawOutput(), in favour of Redraw().
These do the same thing anyway.
:100644 100644 ed4ca24... 5dc544e... M src/action.c
:100644 100644 e1461c6... b9db528... M src/autoplace.c
:100644 100644 cecf9c0... 40b3cda... M src/autoroute.c
:100644 100644 7619d25... 8b73644... M src/draw.c
:100644 100644 d62ed7d... adfee36... M src/draw.h
:100644 100644 7620d85... 47bd68c... M src/find.c
:100644 100644 4d56243... 3590472... M src/toporouter.c
:100644 100644 5b7f5eb... 754f7d1... M src/vendor.c
commit bc21793c7a97ae345caabd95b15d1d372c9ba31e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Remove UpdateAll() API, in favour of Redraw(), which is identical
:100644 100644 78df9fe... ed4ca24... M src/action.c
:100644 100644 10da1dd... 7619d25... M src/draw.c
:100644 100644 c60b6d9... d62ed7d... M src/draw.h
:100644 100644 17f7583... 90db719... M src/set.c
commit 790d9c935dc613c131dfd8dccc2450ab0956c27c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Expose local Redraw() function, and remove wrapper RedrawOutput()
Within the one caller ActionDisplay, combine the F_ClearAndRedraw and
F_Redraw cases which have exactly the same effect.
:100644 100644 9bad677... 78df9fe... M src/action.c
:100644 100644 39605ca... 10da1dd... M src/draw.c
:100644 100644 fdd4c70... c60b6d9... M src/draw.h
commit 600e547d7542ce790c7cafd643eed3cd80146d72
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Drop unused area parameters from Redraw(...)
:100644 100644 1415b2e... 39605ca... M src/draw.c
commit 05dd97fdce05c6b7aeebe64cdcc8efaa220db71e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Only set Gathering during hid_expose_callback()
Removes setting of Gathering to false prior to calling UpdateAll()
in ClearAndRedrawOutput(), and removes setting of Gathering to
true after calling gui->invalidate_all() in Redraw()
:100644 100644 c82f25a... 1415b2e... M src/draw.c
=========
Changes
=========
commit a3d422a89dd7aa2f6298cc8c284896284a029838
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Remove API ClearAndRedrawOutput(), in favour of Redraw().
These do the same thing anyway.
diff --git a/src/action.c b/src/action.c
index ed4ca24..5dc544e 100644
--- a/src/action.c
+++ b/src/action.c
@@ -2496,7 +2496,7 @@ ActionDisperseElements (int argc, char **argv, int x, int y)
/* done with our action so increment the undo # */
IncrementUndoSerialNumber ();
- ClearAndRedrawOutput ();
+ Redraw ();
SetChangedFlag (true);
return 0;
@@ -2769,12 +2769,12 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
case F_ToggleThindraw:
TOGGLE_FLAG (THINDRAWFLAG, PCB);
- ClearAndRedrawOutput ();
+ Redraw ();
break;
case F_ToggleThindrawPoly:
TOGGLE_FLAG (THINDRAWPOLYFLAG, PCB);
- ClearAndRedrawOutput ();
+ Redraw ();
break;
case F_ToggleLockNames:
@@ -2789,7 +2789,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
case F_ToggleHideNames:
TOGGLE_FLAG (HIDENAMESFLAG, PCB);
- ClearAndRedrawOutput ();
+ Redraw ();
break;
case F_ToggleShowDRC:
@@ -2820,7 +2820,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
case F_ToggleCheckPlanes:
TOGGLE_FLAG (CHECKPLANESFLAG, PCB);
- ClearAndRedrawOutput ();
+ Redraw ();
break;
case F_ToggleOrthoMove:
@@ -5944,7 +5944,7 @@ ActionNew (int argc, char **argv, int x, int y)
CreateDefaultFont ();
SetCrosshairRange (0, 0, PCB->MaxWidth, PCB->MaxHeight);
CenterDisplay (PCB->MaxWidth / 2, PCB->MaxHeight / 2, false);
- ClearAndRedrawOutput ();
+ Redraw ();
hid_action ("PCBChanged");
RestoreCrosshair ();
@@ -6643,7 +6643,7 @@ ActionSetSame (int argc, char **argv, int x, int y)
if (layer != CURRENT)
{
ChangeGroupVisibility (GetLayerNumber (PCB->Data, layer), true, true);
- ClearAndRedrawOutput ();
+ Redraw ();
}
return 0;
}
diff --git a/src/autoplace.c b/src/autoplace.c
index e1461c6..b9db528 100644
--- a/src/autoplace.c
+++ b/src/autoplace.c
@@ -856,7 +856,7 @@ done:
{
DeleteRats (false);
AddAllRats (false, NULL);
- ClearAndRedrawOutput ();
+ Redraw ();
}
FreePointerListMemory (&Selected);
return (changed);
diff --git a/src/autoroute.c b/src/autoroute.c
index cecf9c0..40b3cda 100644
--- a/src/autoroute.c
+++ b/src/autoroute.c
@@ -5314,7 +5314,7 @@ donerouting:
IncrementUndoSerialNumber ();
- ClearAndRedrawOutput ();
+ Redraw ();
}
RestoreFindFlag ();
#if defined (ROUTE_DEBUG)
diff --git a/src/draw.c b/src/draw.c
index 7619d25..8b73644 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -186,18 +186,6 @@ Draw (void)
Block.X2 = Block.Y2 = -MAXINT;
}
-/* ---------------------------------------------------------------------------
- * redraws the output area after clearing it
- */
-void
-ClearAndRedrawOutput (void)
-{
- Redraw ();
-}
-
-
-
-
/* ----------------------------------------------------------------------
* redraws all the data by the event handlers
*/
diff --git a/src/draw.h b/src/draw.h
index d62ed7d..adfee36 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -37,7 +37,6 @@
void Draw (void);
void Redraw (void);
-void ClearAndRedrawOutput (void);
void DrawVia (PinTypePtr);
void DrawRat (RatTypePtr);
void DrawViaName (PinTypePtr);
diff --git a/src/find.c b/src/find.c
index 7620d85..47bd68c 100644
--- a/src/find.c
+++ b/src/find.c
@@ -3258,7 +3258,7 @@ LookupConnectionsToAllElements (FILE * FP)
gui->beep ();
ResetConnections (false);
FreeConnectionLookupMemory ();
- ClearAndRedrawOutput ();
+ Redraw ();
}
/*---------------------------------------------------------------------------
diff --git a/src/toporouter.c b/src/toporouter.c
index 4d56243..3590472 100644
--- a/src/toporouter.c
+++ b/src/toporouter.c
@@ -7965,7 +7965,7 @@ toporouter (int argc, char **argv, int x, int y)
AddAllRats (false, NULL);
RestoreUndoSerialNumber ();
IncrementUndoSerialNumber ();
- ClearAndRedrawOutput ();
+ Redraw ();
return 0;
}
diff --git a/src/vendor.c b/src/vendor.c
index 5b7f5eb..754f7d1 100644
--- a/src/vendor.c
+++ b/src/vendor.c
@@ -610,7 +610,7 @@ apply_vendor_map (void)
if (changed)
{
SetChangedFlag (true);
- ClearAndRedrawOutput ();
+ Redraw ();
IncrementUndoSerialNumber ();
}
}
commit bc21793c7a97ae345caabd95b15d1d372c9ba31e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Remove UpdateAll() API, in favour of Redraw(), which is identical
diff --git a/src/action.c b/src/action.c
index 78df9fe..ed4ca24 100644
--- a/src/action.c
+++ b/src/action.c
@@ -2829,12 +2829,12 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
case F_ToggleName:
TOGGLE_FLAG (SHOWNUMBERFLAG, PCB);
- UpdateAll ();
+ Redraw ();
break;
case F_ToggleMask:
TOGGLE_FLAG (SHOWMASKFLAG, PCB);
- UpdateAll ();
+ Redraw ();
break;
case F_ToggleClearLine:
@@ -2861,7 +2861,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
/* toggle displaying of the grid */
case F_Grid:
Settings.DrawGrid = !Settings.DrawGrid;
- UpdateAll ();
+ Redraw ();
break;
/* display the pinout of an element */
@@ -2970,7 +2970,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
PCB->GridOffsetX = atoi (argv[1]);
PCB->GridOffsetY = atoi (argv[2]);
if (Settings.DrawGrid)
- UpdateAll ();
+ Redraw ();
}
break;
diff --git a/src/draw.c b/src/draw.c
index 10da1dd..7619d25 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -165,15 +165,6 @@ AddPart (void *b)
}
/*
- * force the whole output to be updated
- */
-void
-UpdateAll (void)
-{
- gui->invalidate_all ();
-}
-
-/*
* initiate the actual drawing to the pixmap/screen
* make the update block slightly larger to handle round-off
* caused by the TO_SCREEN operation
@@ -201,7 +192,7 @@ Draw (void)
void
ClearAndRedrawOutput (void)
{
- UpdateAll ();
+ Redraw ();
}
diff --git a/src/draw.h b/src/draw.h
index c60b6d9..d62ed7d 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -72,7 +72,6 @@ void EraseElementPinsAndPads (ElementTypePtr);
void EraseElementName (ElementTypePtr);
void EraseObject (int, void *, void *);
void LoadBackgroundImage (char *);
-void UpdateAll (void);
/*GdkDrawable *draw_get_current_drawable(void);*/
diff --git a/src/set.c b/src/set.c
index 17f7583..90db719 100644
--- a/src/set.c
+++ b/src/set.c
@@ -82,7 +82,7 @@ SetGrid (double Grid, bool align)
}
PCB->Grid = Grid;
if (Settings.DrawGrid)
- UpdateAll ();
+ Redraw ();
}
}
commit 790d9c935dc613c131dfd8dccc2450ab0956c27c
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Expose local Redraw() function, and remove wrapper RedrawOutput()
Within the one caller ActionDisplay, combine the F_ClearAndRedraw and
F_Redraw cases which have exactly the same effect.
diff --git a/src/action.c b/src/action.c
index 9bad677..78df9fe 100644
--- a/src/action.c
+++ b/src/action.c
@@ -2678,22 +2678,11 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
switch (id = GetFunctionID (function))
{
- /* redraw layout with clearing the background */
+ /* redraw layout */
case F_ClearAndRedraw:
- gui->invalidate_all();
- break;
-
- /* redraw layout without clearing the background */
case F_Redraw:
- {
- BoxType area;
- area.X1 = 0;
- area.Y1 = 0;
- area.X2 = Output.Width;
- area.Y2 = Output.Height;
- RedrawOutput (&area);
- break;
- }
+ Redraw ();
+ break;
/* change the displayed name of elements */
case F_Value:
diff --git a/src/draw.c b/src/draw.c
index 39605ca..10da1dd 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -80,7 +80,6 @@ static const BoxType *clip_box = NULL;
/* ---------------------------------------------------------------------------
* some local prototypes
*/
-static void Redraw (void);
static void DrawEverything (BoxTypePtr);
static void DrawPPV (int group, const BoxType *);
static int DrawLayerGroup (int, const BoxType *);
@@ -197,15 +196,6 @@ Draw (void)
}
/* ---------------------------------------------------------------------------
- * redraws the output area without clearing it
- */
-void
-RedrawOutput (BoxTypePtr area)
-{
- Redraw ();
-}
-
-/* ---------------------------------------------------------------------------
* redraws the output area after clearing it
*/
void
@@ -220,7 +210,7 @@ ClearAndRedrawOutput (void)
/* ----------------------------------------------------------------------
* redraws all the data by the event handlers
*/
-static void
+void
Redraw (void)
{
gui->invalidate_all ();
diff --git a/src/draw.h b/src/draw.h
index fdd4c70..c60b6d9 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -36,7 +36,7 @@
/*bool SwitchDrawingWindow(double, GdkDrawable *, gboolean, gboolean);*/
void Draw (void);
-void RedrawOutput (BoxTypePtr area);
+void Redraw (void);
void ClearAndRedrawOutput (void);
void DrawVia (PinTypePtr);
void DrawRat (RatTypePtr);
commit 600e547d7542ce790c7cafd643eed3cd80146d72
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Drop unused area parameters from Redraw(...)
diff --git a/src/draw.c b/src/draw.c
index 1415b2e..39605ca 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -80,7 +80,7 @@ static const BoxType *clip_box = NULL;
/* ---------------------------------------------------------------------------
* some local prototypes
*/
-static void Redraw (bool, BoxTypePtr);
+static void Redraw (void);
static void DrawEverything (BoxTypePtr);
static void DrawPPV (int group, const BoxType *);
static int DrawLayerGroup (int, const BoxType *);
@@ -202,7 +202,7 @@ Draw (void)
void
RedrawOutput (BoxTypePtr area)
{
- Redraw (true, area);
+ Redraw ();
}
/* ---------------------------------------------------------------------------
@@ -218,12 +218,10 @@ ClearAndRedrawOutput (void)
/* ----------------------------------------------------------------------
- * redraws all the data
- * all necessary sizes are already set by the porthole widget and
- * by the event handlers
+ * redraws all the data by the event handlers
*/
static void
-Redraw (bool ClearWindow, BoxTypePtr screen_area)
+Redraw (void)
{
gui->invalidate_all ();
}
commit 05dd97fdce05c6b7aeebe64cdcc8efaa220db71e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Only set Gathering during hid_expose_callback()
Removes setting of Gathering to false prior to calling UpdateAll()
in ClearAndRedrawOutput(), and removes setting of Gathering to
true after calling gui->invalidate_all() in Redraw()
diff --git a/src/draw.c b/src/draw.c
index c82f25a..1415b2e 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -211,7 +211,6 @@ RedrawOutput (BoxTypePtr area)
void
ClearAndRedrawOutput (void)
{
- Gathering = false;
UpdateAll ();
}
@@ -227,7 +226,6 @@ static void
Redraw (bool ClearWindow, BoxTypePtr screen_area)
{
gui->invalidate_all ();
- Gathering = true;
}
static int
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs