[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (c1914b61192714f3630c830c13041fad9f7ad666)
The branch, master has been updated
via c1914b61192714f3630c830c13041fad9f7ad666 (commit)
via 6ef503ec9e8da4d06ab29a5045ecf889f7174b68 (commit)
from 79448ffea7b8b5a5dbaa31a98d19dd4b4603d501 (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/autoroute.c | 32 ++++++++++++++++----------------
src/draw.c | 6 ------
src/main.c | 4 ----
3 files changed, 16 insertions(+), 26 deletions(-)
=================
Commit Messages
=================
commit c1914b61192714f3630c830c13041fad9f7ad666
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
main.c: Remove setup of global graphics contexts which are never used
draw.c stashes these ones creates its own. Drop the unused ones, and
drop the stashing in draw.c
:100644 100644 a31bdbd... 9ebcba6... M src/draw.c
:100644 100644 ad5ee94... b147a5c... M src/main.c
commit 6ef503ec9e8da4d06ab29a5045ecf889f7174b68
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
autoroute.c: Use the autoroute graphics context, not Output.fgGC
I'm aiming to confine Output.* graphics contexts to draw.c for now.
:100644 100644 40b3cda... 3810abd... M src/autoroute.c
=========
Changes
=========
commit c1914b61192714f3630c830c13041fad9f7ad666
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
main.c: Remove setup of global graphics contexts which are never used
draw.c stashes these ones creates its own. Drop the unused ones, and
drop the stashing in draw.c
diff --git a/src/draw.c b/src/draw.c
index a31bdbd..9ebcba6 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -1727,9 +1727,6 @@ void
hid_expose_callback (HID * hid, BoxType * region, void *item)
{
HID *old_gui = gui;
- hidGC savebg = Output.bgGC;
- hidGC savefg = Output.fgGC;
- hidGC savepm = Output.pmGC;
gui = hid;
Output.fgGC = gui->make_gc ();
@@ -1752,7 +1749,4 @@ hid_expose_callback (HID * hid, BoxType * region, void *item)
gui->destroy_gc (Output.bgGC);
gui->destroy_gc (Output.pmGC);
gui = old_gui;
- Output.fgGC = savefg;
- Output.bgGC = savebg;
- Output.pmGC = savepm;
}
diff --git a/src/main.c b/src/main.c
index ad5ee94..b147a5c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -977,10 +977,6 @@ main (int argc, char *argv[])
if (show_copyright)
copyright ();
- Output.bgGC = gui->make_gc ();
- Output.fgGC = gui->make_gc ();
- Output.pmGC = gui->make_gc ();
-
settings_post_process ();
commit 6ef503ec9e8da4d06ab29a5045ecf889f7174b68
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
autoroute.c: Use the autoroute graphics context, not Output.fgGC
I'm aiming to confine Output.* graphics contexts to draw.c for now.
diff --git a/src/autoroute.c b/src/autoroute.c
index 40b3cda..3810abd 100644
--- a/src/autoroute.c
+++ b/src/autoroute.c
@@ -1460,8 +1460,8 @@ void
fillbox (const BoxType * b)
{
LayerTypePtr SLayer = LAYER_PTR (0);
- gui->set_color (Output.fgGC, SLayer->Color);
- gui->fill_rect (Output.fgGC, b->X1, b->Y1, b->X2, b->Y2);
+ gui->set_color (ar_gc, SLayer->Color);
+ gui->fill_rect (ar_gc, b->X1, b->Y1, b->X2, b->Y2);
}
/* makes a line on the solder layer silk surrounding the box */
@@ -1476,14 +1476,14 @@ showbox (BoxType b, Dimension thickness, int group)
return;
- gui->set_line_width (Output.fgGC, thickness);
- gui->set_line_cap (Output.fgGC, Trace_Cap);
- gui->set_color (Output.fgGC, SLayer->Color);
+ gui->set_line_width (ar_gc, thickness);
+ gui->set_line_cap (ar_gc, Trace_Cap);
+ gui->set_color (ar_gc, SLayer->Color);
- gui->draw_line (Output.fgGC, b.X1, b.Y1, b.X2, b.Y1);
- gui->draw_line (Output.fgGC, b.X1, b.Y2, b.X2, b.Y2);
- gui->draw_line (Output.fgGC, b.X1, b.Y1, b.X1, b.Y2);
- gui->draw_line (Output.fgGC, b.X2, b.Y1, b.X2, b.Y2);
+ gui->draw_line (ar_gc, b.X1, b.Y1, b.X2, b.Y1);
+ gui->draw_line (ar_gc, b.X1, b.Y2, b.X2, b.Y2);
+ gui->draw_line (ar_gc, b.X1, b.Y1, b.X1, b.Y2);
+ gui->draw_line (ar_gc, b.X2, b.Y1, b.X2, b.Y2);
gui->use_mask (HID_FLUSH_DRAW_Q);
#if 1
@@ -1529,23 +1529,23 @@ showedge (edge_t * e)
{
BoxType *b = (BoxType *) e->rb;
- gui->set_line_cap (Output.fgGC, Trace_Cap);
- gui->set_line_width (Output.fgGC, 1);
- gui->set_color (Output.fgGC, Settings.MaskColor);
+ gui->set_line_cap (ar_gc, Trace_Cap);
+ gui->set_line_width (ar_gc, 1);
+ gui->set_color (ar_gc, Settings.MaskColor);
switch (e->expand_dir)
{
case NORTH:
- gui->draw_line (Output.fgGC, b->X1, b->Y1, b->X2, b->Y1);
+ gui->draw_line (ar_gc, b->X1, b->Y1, b->X2, b->Y1);
break;
case SOUTH:
- gui->draw_line (Output.fgGC, b->X1, b->Y2, b->X2, b->Y2);
+ gui->draw_line (ar_gc, b->X1, b->Y2, b->X2, b->Y2);
break;
case WEST:
- gui->draw_line (Output.fgGC, b->X1, b->Y1, b->X1, b->Y2);
+ gui->draw_line (ar_gc, b->X1, b->Y1, b->X1, b->Y2);
break;
case EAST:
- gui->draw_line (Output.fgGC, b->X2, b->Y1, b->X2, b->Y2);
+ gui->draw_line (ar_gc, b->X2, b->Y1, b->X2, b->Y2);
break;
default:
break;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs