[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (f44e131e610bded26cf7ac6ef5c955a916df5f03)
The branch, master has been updated
via f44e131e610bded26cf7ac6ef5c955a916df5f03 (commit)
via f096227f70f76d813b6d07494617ce66715c9c9b (commit)
via 6eb1db9998872af14b89eafc26b9741caaf074c8 (commit)
from 6438ea7a47f0179564644cf5aa570bda70c07661 (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/data.c | 1 -
src/data.h | 2 --
src/draw.c | 32 +++++++++++++-------------------
3 files changed, 13 insertions(+), 22 deletions(-)
=================
Commit Messages
=================
commit f44e131e610bded26cf7ac6ef5c955a916df5f03
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Initialise integer counters with 0, not "false".
For the "doing_assy" flag, fix its type to "bool" rather than "int".
:100644 100644 03724f5... a763d3c... M src/draw.c
commit f096227f70f76d813b6d07494617ce66715c9c9b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Remove "HaveGathered" parameter from DrawLineLowLevel()
This is superflous, as it is only passed as TRUE when the Gathering
variable it overrides is known to be FALSE anyway.
:100644 100644 7311fb6... 03724f5... M src/draw.c
commit 6eb1db9998872af14b89eafc26b9741caaf074c8
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Remove unused global variable "render", and "extern bool RedrawOnEnter"
The "render" variable was set and reset, but was not used anywhere.
:100644 100644 d07413f... 73e53f2... M src/data.c
:100644 100644 101e3db... ce27339... M src/data.h
:100644 100644 1bbbaa1... 7311fb6... M src/draw.c
=========
Changes
=========
commit f44e131e610bded26cf7ac6ef5c955a916df5f03
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Initialise integer counters with 0, not "false".
For the "doing_assy" flag, fix its type to "bool" rather than "int".
diff --git a/src/draw.c b/src/draw.c
index 03724f5..a763d3c 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -77,10 +77,10 @@ FloatPolyType, *FloatPolyTypePtr;
*/
static BoxType Block;
static bool Gathering = true;
-static int Erasing = false;
+static int Erasing = 0;
-static int doing_pinout = false;
-static int doing_assy = false;
+static int doing_pinout = 0;
+static bool doing_assy = false;
static const BoxType *clip_box = NULL;
/* ---------------------------------------------------------------------------
commit f096227f70f76d813b6d07494617ce66715c9c9b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
draw.c: Remove "HaveGathered" parameter from DrawLineLowLevel()
This is superflous, as it is only passed as TRUE when the Gathering
variable it overrides is known to be FALSE anyway.
diff --git a/src/draw.c b/src/draw.c
index 7311fb6..03724f5 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -97,7 +97,7 @@ static void DrawPlainVia (PinTypePtr, bool);
static void DrawPinOrViaNameLowLevel (PinTypePtr);
static void DrawPadLowLevel (hidGC, PadTypePtr, bool, bool);
static void DrawPadNameLowLevel (PadTypePtr);
-static void DrawLineLowLevel (LineTypePtr, bool);
+static void DrawLineLowLevel (LineTypePtr);
static void DrawRegularText (LayerTypePtr, TextTypePtr, int);
static void DrawPolygonLowLevel (PolygonTypePtr);
static void DrawArcLowLevel (ArcTypePtr);
@@ -1497,9 +1497,9 @@ ClearPad (PadTypePtr Pad, bool mask)
* lowlevel drawing routine for lines
*/
static void
-DrawLineLowLevel (LineTypePtr Line, bool HaveGathered)
+DrawLineLowLevel (LineTypePtr Line)
{
- if (Gathering && !HaveGathered)
+ if (Gathering)
{
AddPart (Line);
return;
@@ -1570,7 +1570,7 @@ DrawTextLowLevel (TextTypePtr Text, int min_line_width)
newline.Point1.Y += Text->Y;
newline.Point2.X += Text->X;
newline.Point2.Y += Text->Y;
- DrawLineLowLevel (&newline, true);
+ DrawLineLowLevel (&newline);
}
/* move on to next cursor position */
@@ -1656,7 +1656,7 @@ DrawElementPackageLowLevel (ElementTypePtr Element, int unused)
/* draw lines, arcs, text and pins */
ELEMENTLINE_LOOP (Element);
{
- DrawLineLowLevel (line, false);
+ DrawLineLowLevel (line);
}
END_LOOP;
ARC_LOOP (Element);
@@ -1818,7 +1818,7 @@ DrawLine (LayerTypePtr Layer, LineTypePtr Line, int unused)
else
gui->set_color (Output.fgGC, Layer->Color);
}
- DrawLineLowLevel (Line, false);
+ DrawLineLowLevel (Line);
}
/* ---------------------------------------------------------------------------
@@ -1867,7 +1867,7 @@ DrawRat (RatTypePtr Line, int unused)
}
}
else
- DrawLineLowLevel ((LineTypePtr) Line, false);
+ DrawLineLowLevel ((LineTypePtr) Line);
}
/* ---------------------------------------------------------------------------
@@ -2120,7 +2120,7 @@ EraseRat (RatTypePtr Rat)
w * 2, w * 2, 0, 360);
}
else
- DrawLineLowLevel ((LineTypePtr) Rat, false);
+ DrawLineLowLevel ((LineTypePtr) Rat);
Erasing--;
}
@@ -2197,7 +2197,7 @@ EraseLine (LineTypePtr Line)
{
Erasing++;
gui->set_color (Output.fgGC, Settings.BackgroundColor);
- DrawLineLowLevel (Line, false);
+ DrawLineLowLevel (Line);
Erasing--;
}
@@ -2256,7 +2256,7 @@ EraseElement (ElementTypePtr Element)
gui->set_color (Output.fgGC, Settings.BackgroundColor);
ELEMENTLINE_LOOP (Element);
{
- DrawLineLowLevel (line, false);
+ DrawLineLowLevel (line);
}
END_LOOP;
ARC_LOOP (Element);
commit 6eb1db9998872af14b89eafc26b9741caaf074c8
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Remove unused global variable "render", and "extern bool RedrawOnEnter"
The "render" variable was set and reset, but was not used anywhere.
diff --git a/src/data.c b/src/data.c
index d07413f..73e53f2 100644
--- a/src/data.c
+++ b/src/data.c
@@ -56,7 +56,6 @@ int LayerStack[MAX_LAYER]; /* determines the layer draw order */
BufferType Buffers[MAX_BUFFER]; /* my buffers */
LibraryType Library; /* the library */
bool Bumped; /* if the undo serial number has changed */
-bool render; /* whether or not to re-render the pixmap */
LocationType Xorig, Yorig; /* origin offset for drawing in pixmap */
diff --git a/src/data.h b/src/data.h
index 101e3db..ce27339 100644
--- a/src/data.h
+++ b/src/data.h
@@ -68,8 +68,6 @@ extern char *InputTranslations;
extern int addedLines;
extern int LayerStack[MAX_LAYER];
-extern bool RedrawOnEnter;
-extern bool render;
extern bool Bumped;
extern FlagType no_flags;
diff --git a/src/draw.c b/src/draw.c
index 1bbbaa1..7311fb6 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -187,9 +187,6 @@ UpdateAll (void)
void
Draw (void)
{
-
- render = true;
-
HideCrosshair (true);
/* clear and create event if not drawing to a pixmap
@@ -217,7 +214,6 @@ RedrawOutput (BoxTypePtr area)
void
ClearAndRedrawOutput (void)
{
- render = true;
Gathering = false;
UpdateAll ();
}
@@ -235,7 +231,6 @@ Redraw (bool ClearWindow, BoxTypePtr screen_area)
{
gui->invalidate_all ();
Gathering = true;
- render = false;
}
static int
@@ -2420,7 +2415,6 @@ hid_expose_callback (HID * hid, BoxType * region, void *item)
Output.bgGC = gui->make_gc ();
Output.pmGC = gui->make_gc ();
- render = true;
Gathering = false;
/*printf("\033[32mhid_expose_callback, s=%p %d\033[0m\n", &(SWAP_IDENT), SWAP_IDENT); */
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs