[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-381-ga6df391)
The branch, master has been updated
via a6df3915ee452f175650c86f0074169ad6756c02 (commit)
from 29ae53c1010c0afaa719fa2234ac0563368f05fe (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 | 26 +++++++++++++-------------
gschem/src/a_zoom.c | 2 +-
gschem/src/o_arc.c | 2 +-
gschem/src/o_box.c | 2 +-
gschem/src/o_bus.c | 2 +-
gschem/src/o_circle.c | 2 +-
gschem/src/o_grips.c | 12 ++++++------
gschem/src/o_line.c | 2 +-
gschem/src/o_move.c | 2 +-
gschem/src/o_net.c | 2 +-
gschem/src/o_path.c | 2 +-
gschem/src/o_picture.c | 2 +-
gschem/src/o_pin.c | 2 +-
gschem/src/o_place.c | 2 +-
gschem/src/o_select.c | 2 +-
gschem/src/x_event.c | 24 ++++++++++++------------
16 files changed, 44 insertions(+), 44 deletions(-)
=================
Commit Messages
=================
commit a6df3915ee452f175650c86f0074169ad6756c02
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon Dec 15 00:46:17 2008 +0000
gschem: Rename o_*_rubber*() o_*_motion()
This is consistent with the naming of the equivalent function for
grip manipulation. These functions are called from the motion event
handler, and the new names make that clearer.
:100644 100644 c93b3aa... a87d5d4... M gschem/include/prototype.h
:100644 100644 eed2be1... 1125ed2... M gschem/src/a_zoom.c
:100644 100644 d67f2c2... 890b8f9... M gschem/src/o_arc.c
:100644 100644 6e3f421... 949cec4... M gschem/src/o_box.c
:100644 100644 1a988c3... 7e9587b... M gschem/src/o_bus.c
:100644 100644 2b311aa... 31a5ff5... M gschem/src/o_circle.c
:100644 100644 1d3fa09... 3eaea0b... M gschem/src/o_grips.c
:100644 100644 1741116... 21f386e... M gschem/src/o_line.c
:100644 100644 bf7b56b... 90b976c... M gschem/src/o_move.c
:100644 100644 19780f6... 3546ad1... M gschem/src/o_net.c
:100644 100644 aed412d... f1421e7... M gschem/src/o_path.c
:100644 100644 674c438... 3deb8ac... M gschem/src/o_picture.c
:100644 100644 7372e71... 3af2e65... M gschem/src/o_pin.c
:100644 100644 d8ff369... 73f4f35... M gschem/src/o_place.c
:100644 100644 49db0bc... 327f0a3... M gschem/src/o_select.c
:100644 100644 3b74bd6... ea8f1b7... M gschem/src/x_event.c
=========
Changes
=========
commit a6df3915ee452f175650c86f0074169ad6756c02
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon Dec 15 00:46:17 2008 +0000
gschem: Rename o_*_rubber*() o_*_motion()
This is consistent with the naming of the equivalent function for
grip manipulation. These functions are called from the motion event
handler, and the new names make that clearer.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index c93b3aa..a87d5d4 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -13,7 +13,7 @@ void a_zoom_extents(GSCHEM_TOPLEVEL *w_current, GList *list, int pan_flags);
void a_zoom_box(GSCHEM_TOPLEVEL *w_current, int pan_flags);
void a_zoom_box_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void a_zoom_box_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void a_zoom_box_rubberband(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void a_zoom_box_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void a_zoom_box_rubberband_xor(GSCHEM_TOPLEVEL *w_current);
void correct_aspect(GSCHEM_TOPLEVEL *w_current);
/* g_funcs.c */
@@ -470,7 +470,7 @@ void o_arc_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
void o_arc_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_arc_end1(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_arc_end4(GSCHEM_TOPLEVEL *w_current, int radius, int start_angle, int end_angle);
-void o_arc_rubberarc(GSCHEM_TOPLEVEL *w_current, int x, int y, int whichone);
+void o_arc_motion(GSCHEM_TOPLEVEL *w_current, int x, int y, int whichone);
void o_arc_rubberarc_xor(GSCHEM_TOPLEVEL *w_current);
void o_arc_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_arc_erase_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
@@ -513,7 +513,7 @@ void o_box_eraserubber(GSCHEM_TOPLEVEL *w_current);
void o_box_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
void o_box_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_box_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_box_rubberbox(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_box_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_box_rubberbox_xor(GSCHEM_TOPLEVEL *w_current);
void o_box_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_box_erase_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
@@ -529,7 +529,7 @@ void o_bus_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
void o_bus_draw_xor_single(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int whichone, OBJECT *o_current);
void o_bus_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
int o_bus_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_bus_rubberbus(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_bus_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_bus_rubberbus_xor(GSCHEM_TOPLEVEL *w_current);
void o_bus_eraserubber(GSCHEM_TOPLEVEL *w_current);
/* o_circle.c */
@@ -542,7 +542,7 @@ void o_circle_eraserubber(GSCHEM_TOPLEVEL *w_current);
void o_circle_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
void o_circle_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_circle_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_circle_rubbercircle(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_circle_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_circle_rubbercircle_xor(GSCHEM_TOPLEVEL *w_current);
void o_circle_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_circle_erase_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
@@ -614,7 +614,7 @@ void o_line_eraserubber(GSCHEM_TOPLEVEL *w_current);
void o_line_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
void o_line_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_line_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_line_rubberline(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_line_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_line_rubberline_xor(GSCHEM_TOPLEVEL *w_current);
void o_line_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_line_erase_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
@@ -637,7 +637,7 @@ void o_move_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_move_end_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *object, int diff_x, int diff_y, GList **other_objects, GList **connected_objects);
void o_move_end(GSCHEM_TOPLEVEL *w_current);
void o_move_cancel(GSCHEM_TOPLEVEL *w_current);
-void o_move_rubbermove(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_move_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_move_rubbermove_xor(GSCHEM_TOPLEVEL *w_current, int drawing);
int o_move_return_whichone(OBJECT *object, int x, int y);
void o_move_check_endpoint(GSCHEM_TOPLEVEL *w_current, OBJECT *object);
@@ -656,17 +656,17 @@ void o_net_finishmagnetic(GSCHEM_TOPLEVEL *w_current);
void o_net_start_magnetic(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_net_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
int o_net_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_net_rubbernet(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_net_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_net_drawrubber(GSCHEM_TOPLEVEL *w_current);
void o_net_eraserubber(GSCHEM_TOPLEVEL *w_current);
int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj, GList *other_objects);
/* o_picture.c */
void o_picture_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_picture_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_picture_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void picture_selection_dialog (GSCHEM_TOPLEVEL *w_current);
void o_picture_eraserubber(GSCHEM_TOPLEVEL *w_current);
void o_picture_rubberbox_xor(GSCHEM_TOPLEVEL *w_current);
-void o_picture_rubberbox(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_picture_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_picture_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_picture_erase_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
@@ -681,7 +681,7 @@ void o_path_eraserubber(GSCHEM_TOPLEVEL *w_current);
void o_path_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
void o_path_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_path_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_path_rubberpath(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_path_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_path_rubberpath_xor(GSCHEM_TOPLEVEL *w_current);
void o_path_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_path_erase_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
@@ -691,13 +691,13 @@ void o_pin_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_pin_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
void o_pin_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_pin_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_pin_rubberpin(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_pin_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_pin_rubberpin_xor(GSCHEM_TOPLEVEL *w_current);
void o_pin_eraserubber(GSCHEM_TOPLEVEL *w_current);
/* o_place.c */
void o_place_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_place_end(GSCHEM_TOPLEVEL *w_current, int x, int y, int continue_placing, GList **ret_new_objects);
-void o_place_rubberplace(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_place_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_place_rubberplace_xor(GSCHEM_TOPLEVEL *w_current, int drawing);
void o_place_rotate(GSCHEM_TOPLEVEL *w_current);
/* o_select.c */
@@ -705,7 +705,7 @@ void o_select_run_hooks(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int flag)
void o_select_object(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int type, int count);
int o_select_box_start(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_select_box_end(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_select_box_rubberband(GSCHEM_TOPLEVEL *w_current, int x, int y);
+void o_select_box_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_select_box_rubberband_xor(GSCHEM_TOPLEVEL *w_current);
void o_select_box_search(GSCHEM_TOPLEVEL *w_current);
void o_select_connected_nets(GSCHEM_TOPLEVEL *w_current, OBJECT* o_current);
diff --git a/gschem/src/a_zoom.c b/gschem/src/a_zoom.c
index eed2be1..1125ed2 100644
--- a/gschem/src/a_zoom.c
+++ b/gschem/src/a_zoom.c
@@ -261,7 +261,7 @@ void a_zoom_box_end(GSCHEM_TOPLEVEL *w_current, int x, int y)
* \par Function Description
*
*/
-void a_zoom_box_rubberband(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void a_zoom_box_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
g_assert( w_current->inside_action != 0 );
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index d67f2c2..890b8f9 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -996,7 +996,7 @@ void o_arc_end4(GSCHEM_TOPLEVEL *w_current, int radius,
* ending angle of the arc.
* </DL>
*/
-void o_arc_rubberarc(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y, int whichone)
+void o_arc_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y, int whichone)
{
int diff_x, diff_y, angle_deg;
diff --git a/gschem/src/o_box.c b/gschem/src/o_box.c
index 6e3f421..949cec4 100644
--- a/gschem/src/o_box.c
+++ b/gschem/src/o_box.c
@@ -866,7 +866,7 @@ void o_box_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \param [in] w_x Current x coordinate of pointer in world units.
* \param [in] w_y Current y coordinate of pointer in world units.
*/
-void o_box_rubberbox(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_box_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
g_assert( w_current->inside_action != 0 );
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index 1a988c3..7e9587b 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -293,7 +293,7 @@ int o_bus_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \param [in] w_x current x position in world units
* \param [in] w_y current y position in world units
*/
-void o_bus_rubberbus(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_bus_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
int diff_x, diff_y;
diff --git a/gschem/src/o_circle.c b/gschem/src/o_circle.c
index 2b311aa..31a5ff5 100644
--- a/gschem/src/o_circle.c
+++ b/gschem/src/o_circle.c
@@ -618,7 +618,7 @@ void o_circle_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \param [in] w_x Current x coordinate of pointer in world units.
* \param [in] w_y Current y coordinate of pointer in world units.
*/
-void o_circle_rubbercircle(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_circle_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
int diff_x, diff_y;
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index 1d3fa09..3eaea0b 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -965,30 +965,30 @@ void o_grips_motion(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
switch(w_current->which_object->type) {
case OBJ_ARC:
- o_arc_rubberarc (w_current, w_x, w_y, grip);
+ o_arc_motion (w_current, w_x, w_y, grip);
break;
case OBJ_BOX:
- o_box_rubberbox (w_current, w_x, w_y);
+ o_box_motion (w_current, w_x, w_y);
break;
case OBJ_PATH:
- o_path_rubberpath (w_current, w_x, w_y);
+ o_path_motion (w_current, w_x, w_y);
break;
case OBJ_PICTURE:
- o_picture_rubberbox (w_current, w_x, w_y);
+ o_picture_motion (w_current, w_x, w_y);
break;
case OBJ_CIRCLE:
- o_circle_rubbercircle (w_current, w_x, w_y);
+ o_circle_motion (w_current, w_x, w_y);
break;
case OBJ_LINE:
case OBJ_NET:
case OBJ_PIN:
case OBJ_BUS:
- o_line_rubberline (w_current, w_x, w_y);
+ o_line_motion (w_current, w_x, w_y);
break;
default:
diff --git a/gschem/src/o_line.c b/gschem/src/o_line.c
index 1741116..21f386e 100644
--- a/gschem/src/o_line.c
+++ b/gschem/src/o_line.c
@@ -822,7 +822,7 @@ void o_line_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \param [in] w_x Current x coordinate of pointer in world units.
* \param [in] w_y Current y coordinate of pointer in world units.
*/
-void o_line_rubberline(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_line_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
int diff_x, diff_y;
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index bf7b56b..90b976c 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -298,7 +298,7 @@ void o_move_cancel (GSCHEM_TOPLEVEL *w_current)
* \par Function Description
*
*/
-void o_move_rubbermove(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_move_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
o_move_rubbermove_xor (w_current, FALSE);
w_current->second_wx = w_x;
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 19780f6..3546ad1 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -805,7 +805,7 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \par Function Description
* This function draws the rubbernet lines when drawing a net.
*/
-void o_net_rubbernet(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_net_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
int ortho, horizontal, quadrant;
diff --git a/gschem/src/o_path.c b/gschem/src/o_path.c
index aed412d..f1421e7 100644
--- a/gschem/src/o_path.c
+++ b/gschem/src/o_path.c
@@ -747,7 +747,7 @@ void o_path_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \param [in] w_x Current x coordinate of pointer in world units.
* \param [in] w_y Current y coordinate of pointer in world units.
*/
-void o_path_rubberpath(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_path_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
if (w_current->rubber_visible)
o_path_rubberpath_xor (w_current);
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index 674c438..3deb8ac 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -225,7 +225,7 @@ void o_picture_eraserubber(GSCHEM_TOPLEVEL *w_current)
* \param [in] w_x Current x coordinate of pointer in world units.
* \param [in] w_y Current y coordinate of pointer in world units.
*/
-void o_picture_rubberbox(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_picture_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
#if DEBUG
printf("o_picture_rubberbox called\n");
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index 7372e71..3af2e65 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -220,7 +220,7 @@ void o_pin_end(GSCHEM_TOPLEVEL *w_current, int x, int y)
* \par Function Description
*
*/
-void o_pin_rubberpin(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_pin_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
g_assert( w_current->inside_action != 0 );
diff --git a/gschem/src/o_place.c b/gschem/src/o_place.c
index d8ff369..73f4f35 100644
--- a/gschem/src/o_place.c
+++ b/gschem/src/o_place.c
@@ -127,7 +127,7 @@ void o_place_end (GSCHEM_TOPLEVEL *w_current,
* \par Function Description
*
*/
-void o_place_rubberplace (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_place_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
if (w_current->rubber_visible)
o_place_rubberplace_xor (w_current, FALSE);
diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index 49db0bc..327f0a3 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -277,7 +277,7 @@ void o_select_box_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \par Function Description
*
*/
-void o_select_box_rubberband(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
+void o_select_box_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
{
if (w_current->rubber_visible)
o_select_box_rubberband_xor(w_current);
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index 3b74bd6..ea8f1b7 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -810,32 +810,32 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
case(ENDMOVE):
case(MOVE):
if (w_current->inside_action)
- o_move_rubbermove(w_current, w_x, w_y);
+ o_move_motion (w_current, w_x, w_y);
break;
case(ENDLINE):
if (w_current->inside_action)
- o_line_rubberline(w_current, w_x, w_y);
+ o_line_motion (w_current, w_x, w_y);
break;
case(ENDBOX):
if (w_current->inside_action)
- o_box_rubberbox( w_current, w_x, w_y);
+ o_box_motion ( w_current, w_x, w_y);
break;
case(ENDPICTURE):
if (w_current->inside_action)
- o_picture_rubberbox( w_current, w_x, w_y);
+ o_picture_motion ( w_current, w_x, w_y);
break;
case(ENDCIRCLE):
if (w_current->inside_action)
- o_circle_rubbercircle(w_current, w_x, w_y);
+ o_circle_motion (w_current, w_x, w_y);
break;
case(ENDARC):
if (w_current->inside_action)
- o_arc_rubberarc(w_current, w_x, w_y, ARC_RADIUS);
+ o_arc_motion (w_current, w_x, w_y, ARC_RADIUS);
break;
@@ -848,18 +848,18 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
case(DRAWNET):
case(NETCONT):
if (w_current->inside_action)
- o_net_rubbernet(w_current, w_x, w_y);
+ o_net_motion (w_current, w_x, w_y);
break;
case(DRAWBUS):
case(BUSCONT):
if (w_current->inside_action)
- o_bus_rubberbus(w_current, w_x, w_y);
+ o_bus_motion (w_current, w_x, w_y);
break;
case(ENDPIN):
if (w_current->inside_action)
- o_pin_rubberpin(w_current, w_x, w_y);
+ o_pin_motion (w_current, w_x, w_y);
break;
case(COPY):
@@ -869,17 +869,17 @@ gint x_event_motion(GtkWidget *widget, GdkEventMotion *event,
case(ENDCOMP):
case(ENDPASTE):
case(ENDTEXT):
- o_place_rubberplace(w_current, w_x, w_y);
+ o_place_motion (w_current, w_x, w_y);
break;
case(SBOX):
if (w_current->inside_action)
- o_select_box_rubberband(w_current, unsnapped_wx, unsnapped_wy);
+ o_select_box_motion (w_current, unsnapped_wx, unsnapped_wy);
break;
case(ZOOMBOXEND):
if (w_current->inside_action)
- a_zoom_box_rubberband(w_current, unsnapped_wx, unsnapped_wy);
+ a_zoom_box_motion (w_current, unsnapped_wx, unsnapped_wy);
break;
}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs