[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.4.0-20080127-80-g62a3123)
The branch, master has been updated
via 62a3123ce33d825855735ed8727c8f617b46b61e (commit)
via ec074cb3ca38db23516d89df6bf4f60f13229822 (commit)
from 4768b20db9983ae7d0b3221d9340a61ca2a805c0 (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/prototype.h | 4 +++-
gschem/src/i_callbacks.c | 2 +-
gschem/src/o_complex.c | 22 ++++++++++++++++++----
gschem/src/o_move.c | 18 ++++++++++++++++++
gschem/src/x_compselect.c | 2 +-
gschem/src/x_event.c | 21 +++------------------
6 files changed, 44 insertions(+), 25 deletions(-)
=================
Commit Messages
=================
commit 62a3123ce33d825855735ed8727c8f617b46b61e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun May 18 14:27:46 2008 +0100
Add o_move_rubbermove(...) function to keep move logic in o_move.c
:100644 100644 4130b0a... fe7b689... M gschem/include/prototype.h
:100644 100644 4b221a0... 1054f06... M gschem/src/o_move.c
:100644 100644 c9b8ad6... a4dcf7c... M gschem/src/x_event.c
commit ec074cb3ca38db23516d89df6bf4f60f13229822
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun May 18 14:27:44 2008 +0100
Rework o_complex_rubbercomplex(...) to follow usual semantics.
Renames o_complex_rubbercomplex() o_complex_rubbercomplex_xor() and
re-adds o_complex_rubbercomplex() which now follows the "undraw, move,
draw" sequence like the other functions with this naming pattern.
:100644 100644 89059b9... 4130b0a... M gschem/include/prototype.h
:100644 100644 cfaf52b... f71c110... M gschem/src/i_callbacks.c
:100644 100644 5b235a0... 16cb31d... M gschem/src/o_complex.c
:100644 100644 7001ae7... 7cac6e1... M gschem/src/x_compselect.c
:100644 100644 2bd86e5... c9b8ad6... M gschem/src/x_event.c
=========
Changes
=========
commit 62a3123ce33d825855735ed8727c8f617b46b61e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun May 18 14:27:46 2008 +0100
Add o_move_rubbermove(...) function to keep move logic in o_move.c
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 4130b0a..fe7b689 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -636,6 +636,7 @@ void o_autosave_backups(GSCHEM_TOPLEVEL *w_current);
void o_move_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_move_end_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *list, int type, int diff_x, int diff_y, GList **other_objects, GList **connected_objects);
void o_move_end(GSCHEM_TOPLEVEL *w_current);
+void o_move_rubbermove(GSCHEM_TOPLEVEL *w_current, int x, int y);
int o_move_return_whichone(OBJECT *object, int x, int y);
void o_move_check_endpoint(GSCHEM_TOPLEVEL *w_current, OBJECT *object);
void o_move_prep_rubberband(GSCHEM_TOPLEVEL *w_current);
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 4b221a0..1054f06 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -251,6 +251,24 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
toplevel->page_current->complex_place_list = NULL;
}
+
+/*! \todo Finish function documentation!!!
+ * \brief
+ * \par Function Description
+ *
+ */
+void o_move_rubbermove(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+{
+ if (w_current->netconn_rubberband)
+ o_move_stretch_rubberband(w_current);
+
+ o_complex_rubbercomplex(w_current, w_x, w_y);
+
+ if (w_current->netconn_rubberband)
+ o_move_stretch_rubberband(w_current);
+}
+
+
/*! \todo Finish function documentation!!!
* \brief
* \par Function Description
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index c9b8ad6..a4dcf7c 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -903,18 +903,8 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
/* Fall through */
case(ENDMOVE):
case(MOVE):
- if (w_current->inside_action) {
-
- if (w_current->netconn_rubberband) {
- o_move_stretch_rubberband(w_current);
- }
-
- o_complex_rubbercomplex(w_current, w_x, w_y);
-
- if (w_current->netconn_rubberband) {
- o_move_stretch_rubberband(w_current);
- }
- }
+ if (w_current->inside_action)
+ o_move_rubbermove(w_current, w_x, w_y);
break;
case(ENDCOPY):
commit ec074cb3ca38db23516d89df6bf4f60f13229822
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun May 18 14:27:44 2008 +0100
Rework o_complex_rubbercomplex(...) to follow usual semantics.
Renames o_complex_rubbercomplex() o_complex_rubbercomplex_xor() and
re-adds o_complex_rubbercomplex() which now follows the "undraw, move,
draw" sequence like the other functions with this naming pattern.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 89059b9..4130b0a 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -544,7 +544,8 @@ void o_complex_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_complex_place_changed_run_hook(GSCHEM_TOPLEVEL *w_current);
void o_complex_place_rotate(GSCHEM_TOPLEVEL *w_current);
void o_complex_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_complex_rubbercomplex(GSCHEM_TOPLEVEL *w_current);
+void o_complex_rubbercomplex(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_complex_rubbercomplex_xor(GSCHEM_TOPLEVEL *w_current);
void o_complex_translate_all(GSCHEM_TOPLEVEL *w_current, int offset);
/* o_copy.c */
void o_copy_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index cfaf52b..f71c110 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -3422,7 +3422,7 @@ DEFINE_I_CALLBACK(cancel)
/* user hit escape key when placing components */
/* Undraw any XOR outline of the place list */
- o_complex_rubbercomplex(w_current);
+ o_complex_rubbercomplex_xor(w_current);
/* Free the complex place list and its contents */
s_delete_object_glist(w_current->toplevel,
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index 5b235a0..16cb31d 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -336,11 +336,25 @@ void o_complex_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \par Function Description
*
*/
-void o_complex_rubbercomplex(GSCHEM_TOPLEVEL *w_current)
+void o_complex_rubbercomplex (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
- o_drawbounding(w_current,
- w_current->toplevel->page_current->complex_place_list,
- x_get_darkcolor(w_current->bb_color), FALSE);
+ o_complex_rubbercomplex_xor (w_current);
+ w_current->second_wx = w_x;
+ w_current->second_wy = w_y;
+ o_complex_rubbercomplex_xor (w_current);
+}
+
+
+/*! \todo Finish function documentation!!!
+ * \brief
+ * \par Function Description
+ *
+ */
+void o_complex_rubbercomplex_xor (GSCHEM_TOPLEVEL *w_current)
+{
+ o_drawbounding (w_current,
+ w_current->toplevel->page_current->complex_place_list,
+ x_get_darkcolor (w_current->bb_color), FALSE);
}
diff --git a/gschem/src/x_compselect.c b/gschem/src/x_compselect.c
index 7001ae7..7cac6e1 100644
--- a/gschem/src/x_compselect.c
+++ b/gschem/src/x_compselect.c
@@ -145,7 +145,7 @@ x_compselect_callback_response (GtkDialog *dialog,
switch (w_current->event_state) {
case ENDCOMP:
/* Undraw the component which was being placed */
- o_complex_rubbercomplex(w_current);
+ o_complex_rubbercomplex_xor(w_current);
/* Fall through */
case DRAWCOMP:
s_delete_object_glist(toplevel,
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index 2bd86e5..c9b8ad6 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -909,10 +909,8 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
o_move_stretch_rubberband(w_current);
}
- o_complex_rubbercomplex(w_current);
- w_current->second_wx = w_x;
- w_current->second_wy = w_y;
- o_complex_rubbercomplex(w_current);
+ o_complex_rubbercomplex(w_current, w_x, w_y);
+
if (w_current->netconn_rubberband) {
o_move_stretch_rubberband(w_current);
}
@@ -992,10 +990,7 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
break;
case(ENDCOMP):
- o_complex_rubbercomplex(w_current);
- w_current->second_wx = w_x;
- w_current->second_wy = w_y;
- o_complex_rubbercomplex(w_current);
+ o_complex_rubbercomplex(w_current, w_x, w_y);
break;
case(ENDPASTE):
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs