[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-66-ga29573b)
The branch, master has been updated
via a29573b885273459bbf24ff68ae508d345f1037f (commit)
via d89549022d3ff8fc3e3605fb20186cc4600eef87 (commit)
via 935ca0a8a6329c018d85c8b91f6a0d8deadeafba (commit)
via 957c90a8ff286e6eba4f960cbbcf8ac05d24faf3 (commit)
from e167a181f295b33ffd4771f93b779023eeae948b (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
=========
gschem/include/gschem_struct.h | 1 -
gschem/include/prototype.h | 1 -
gschem/src/gschem_toplevel.c | 1 -
gschem/src/o_move.c | 65 ++++++++++++++++++----------------------
gschem/src/o_path.c | 8 ++--
gschem/src/x_window.c | 7 ----
6 files changed, 33 insertions(+), 50 deletions(-)
=================
Commit Messages
=================
commit a29573b885273459bbf24ff68ae508d345f1037f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 15:32:16 2008 +0000
gschem: Change direct redraws to invalidates in the move action.
These were missed when changing to the invalidate / expose model.
:100644 100644 f5fb7e4... 972761b... M gschem/src/o_move.c
commit d89549022d3ff8fc3e3605fb20186cc4600eef87
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 15:44:18 2008 +0000
gschem: Remove unused device context "bus_gc"
:100644 100644 3f6eb42... bfe378e... M gschem/include/gschem_struct.h
:100644 100644 0bcf5ac... 65cef47... M gschem/src/gschem_toplevel.c
:100644 100644 27a79c5... ae5cfff... M gschem/src/x_window.c
commit 935ca0a8a6329c018d85c8b91f6a0d8deadeafba
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 15:43:38 2008 +0000
gschem: Move code in o_move_stretch_rubberband() into o_move_draw_rubber()
o_move_draw_rubber() was the only caller, and was deferring almost all of
its work to o_move_stretch_rubberband().
:100644 100644 8356944... 634ad6d... M gschem/include/prototype.h
:100644 100644 290705d... f5fb7e4... M gschem/src/o_move.c
commit 957c90a8ff286e6eba4f960cbbcf8ac05d24faf3
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 14:52:49 2008 +0000
gschem: Rename o_path_xor_control_lines() to draw_control_lines()
Since we're using the invalidate/expose model now, there is no
need that these functions must use XOR drawing to the screen.
The function is static, so doesn't need the o_path_ prefix, so
rename it to something simpler.
:100644 100644 33557b6... fe30178... M gschem/src/o_path.c
=========
Changes
=========
commit a29573b885273459bbf24ff68ae508d345f1037f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 15:32:16 2008 +0000
gschem: Change direct redraws to invalidates in the move action.
These were missed when changing to the invalidate / expose model.
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index f5fb7e4..972761b 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -68,7 +68,7 @@ void o_move_start(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
o_select_move_to_place_list(w_current);
w_current->inside_action = 1;
- o_move_draw_rubber (w_current, TRUE);
+ o_move_invalidate_rubber (w_current, TRUE);
}
}
@@ -161,7 +161,7 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
diff_x = w_current->second_wx - w_current->first_wx;
diff_y = w_current->second_wy - w_current->first_wy;
- o_move_draw_rubber (w_current, FALSE);
+ o_move_invalidate_rubber (w_current, FALSE);
w_current->rubber_visible = 0;
if (w_current->netconn_rubberband) {
commit d89549022d3ff8fc3e3605fb20186cc4600eef87
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 15:44:18 2008 +0000
gschem: Remove unused device context "bus_gc"
diff --git a/gschem/include/gschem_struct.h b/gschem/include/gschem_struct.h
index 3f6eb42..bfe378e 100644
--- a/gschem/include/gschem_struct.h
+++ b/gschem/include/gschem_struct.h
@@ -75,7 +75,6 @@ struct st_gschem_toplevel {
GdkGC *xor_gc;
GdkGC *outline_xor_gc;
GdkGC *bounding_xor_gc;
- GdkGC *bus_gc;
/* ---------------- */
/* Drawing surfaces */
diff --git a/gschem/src/gschem_toplevel.c b/gschem/src/gschem_toplevel.c
index 0bcf5ac..65cef47 100644
--- a/gschem/src/gschem_toplevel.c
+++ b/gschem/src/gschem_toplevel.c
@@ -93,7 +93,6 @@ GSCHEM_TOPLEVEL *gschem_toplevel_new ()
w_current->xor_gc = NULL;
w_current->outline_xor_gc = NULL;
w_current->bounding_xor_gc = NULL;
- w_current->bus_gc = NULL;
/* ---------------- */
/* Drawing surfaces */
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 27a79c5..ae5cfff 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -123,13 +123,6 @@ void x_window_setup_gc(GSCHEM_TOPLEVEL *w_current)
fprintf(stderr, _("Couldn't allocate bounding_xor_gc\n"));
exit(-1);
}
-
- w_current->bus_gc = gdk_gc_new(w_current->window);
-
- if (w_current->bus_gc == NULL) {
- fprintf(stderr, _("Couldn't allocate bus_gc\n"));
- exit(-1);
- }
}
/*! \todo Finish function documentation!!!
commit 935ca0a8a6329c018d85c8b91f6a0d8deadeafba
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 15:43:38 2008 +0000
gschem: Move code in o_move_stretch_rubberband() into o_move_draw_rubber()
o_move_draw_rubber() was the only caller, and was deferring almost all of
its work to o_move_stretch_rubberband().
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 8356944..634ad6d 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -606,7 +606,6 @@ void o_move_check_endpoint(GSCHEM_TOPLEVEL *w_current, OBJECT *object);
void o_move_prep_rubberband(GSCHEM_TOPLEVEL *w_current);
int o_move_zero_length(OBJECT *object);
void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x, int world_diff_y, GList **objects, GList **other_objects, GList **connected_objects);
-void o_move_stretch_rubberband(GSCHEM_TOPLEVEL *w_current);
/* o_net.c */
void o_net_reset(GSCHEM_TOPLEVEL *w_current);
void o_net_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 290705d..f5fb7e4 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -360,9 +360,34 @@ void o_move_invalidate_rubber (GSCHEM_TOPLEVEL *w_current, int drawing)
*/
void o_move_draw_rubber (GSCHEM_TOPLEVEL *w_current, int drawing)
{
+ TOPLEVEL *toplevel = w_current->toplevel;
+ GList *s_iter;
+ int diff_x, diff_y;
+
o_place_draw_rubber (w_current, drawing);
- if (w_current->netconn_rubberband)
- o_move_stretch_rubberband(w_current);
+
+ if (!w_current->netconn_rubberband)
+ return;
+
+ diff_x = w_current->second_wx - w_current->first_wx;
+ diff_y = w_current->second_wy - w_current->first_wy;
+
+ for (s_iter = toplevel->page_current->stretch_list;
+ s_iter != NULL; s_iter = g_list_next (s_iter)) {
+ STRETCH *s_current = s_iter->data;
+ OBJECT *object = s_current->object;
+ int whichone = s_current->whichone;
+
+ switch (object->type) {
+ case (OBJ_NET):
+ o_net_draw_stretch (w_current, diff_x, diff_y, whichone, object);
+ break;
+
+ case (OBJ_BUS):
+ o_bus_draw_stretch (w_current, diff_x, diff_y, whichone, object);
+ break;
+ }
+ }
}
@@ -600,35 +625,3 @@ void o_move_end_rubberband (GSCHEM_TOPLEVEL *w_current,
*connected_objects = s_conn_return_others (*connected_objects, object);
}
}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
-void o_move_stretch_rubberband(GSCHEM_TOPLEVEL *w_current)
-{
- TOPLEVEL *toplevel = w_current->toplevel;
- GList *s_iter;
- int diff_x, diff_y;
-
- diff_x = w_current->second_wx - w_current->first_wx;
- diff_y = w_current->second_wy - w_current->first_wy;
-
- for (s_iter = toplevel->page_current->stretch_list;
- s_iter != NULL; s_iter = g_list_next (s_iter)) {
- STRETCH *s_current = s_iter->data;
- OBJECT *object = s_current->object;
- int whichone = s_current->whichone;
-
- switch (object->type) {
- case (OBJ_NET):
- o_net_draw_stretch (w_current, diff_x, diff_y, whichone, object);
- break;
-
- case (OBJ_BUS):
- o_bus_draw_stretch (w_current, diff_x, diff_y, whichone, object);
- break;
- }
- }
-}
commit 957c90a8ff286e6eba4f960cbbcf8ac05d24faf3
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 14:52:49 2008 +0000
gschem: Rename o_path_xor_control_lines() to draw_control_lines()
Since we're using the invalidate/expose model now, there is no
need that these functions must use XOR drawing to the screen.
The function is static, so doesn't need the o_path_ prefix, so
rename it to something simpler.
diff --git a/gschem/src/o_path.c b/gschem/src/o_path.c
index 33557b6..fe30178 100644
--- a/gschem/src/o_path.c
+++ b/gschem/src/o_path.c
@@ -706,14 +706,14 @@ void o_path_draw_rubber (GSCHEM_TOPLEVEL *w_current)
/*! \brief Draw lines between curve segment end-point and their control point.
*
* \par Function Description
- * This function XOR draws lines between the end-points and respective
+ * This function Draws lines between the end-points and respective
* control-points of curve segments in the path.
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
* \param [in] o_current The path OBJECT.
*/
-static void o_path_xor_control_lines (GSCHEM_TOPLEVEL *w_current,
- OBJECT *o_current)
+static void draw_control_lines (GSCHEM_TOPLEVEL *w_current,
+ OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int i;
@@ -787,7 +787,7 @@ void o_path_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
if (w_current->draw_grips == FALSE)
return;
- o_path_xor_control_lines (w_current, o_current);
+ draw_control_lines (w_current, o_current);
for (i = 0; i < o_current->path->num_sections; i++) {
section = &o_current->path->sections[i];
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs