[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: i_callbacks.c
User: pcjc2
Date: 06/12/27 14:21:37
Modified: . Tag: noscreen i_callbacks.c o_complex.c o_misc.c
x_event.c
Log:
* include/prototype.h, src/o_misc.c, src/o_complex.c,
src/i_callbacks.c, src/x_event.c: Made o_complex_mirror()
into o_complex_mirror_world(), made o_mirror() into
o_mirror_world(), and converted usage as appropriate.
Revision Changes Path
No revision
No revision
1.70.2.2 +5 -3 eda/geda/gaf/gschem/src/i_callbacks.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: i_callbacks.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/i_callbacks.c,v
retrieving revision 1.70.2.1
retrieving revision 1.70.2.2
diff -u -b -r1.70.2.1 -r1.70.2.2
--- i_callbacks.c 27 Dec 2006 17:37:56 -0000 1.70.2.1
+++ i_callbacks.c 27 Dec 2006 19:21:36 -0000 1.70.2.2
@@ -928,6 +928,7 @@
{
TOPLEVEL *w_current = (TOPLEVEL *) data;
GList *object_list;
+ int w_x, w_y;
exit_if_null(w_current);
@@ -939,9 +940,10 @@
i_update_middle_button(w_current,
i_callback_edit_mirror_hotkey, _("Mirror"));
- o_mirror(w_current,
+ SCREENtoWORLD( w_current, mouse_x, mouse_y, &w_x, &w_y );
+ o_mirror_world(w_current,
object_list,
- mouse_x, mouse_y);
+ w_x, w_y);
}
w_current->event_state = SELECT;
1.28.6.2 +1 -8 eda/geda/gaf/gschem/src/o_complex.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_complex.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_complex.c,v
retrieving revision 1.28.6.1
retrieving revision 1.28.6.2
diff -u -b -r1.28.6.1 -r1.28.6.2
--- o_complex.c 27 Dec 2006 17:37:56 -0000 1.28.6.1
+++ o_complex.c 27 Dec 2006 19:21:37 -0000 1.28.6.2
@@ -750,21 +750,14 @@
* \par Function Description
*
*/
-int o_complex_mirror(TOPLEVEL *w_current, int centerx, int centery,
+int o_complex_mirror_world(TOPLEVEL *w_current, int world_centerx, int world_centery,
OBJECT *object)
{
int x, y;
int newx, newy;
int origx, origy;
- int world_centerx, world_centery;
int change = 0;
- SCREENtoWORLD(w_current,
- centerx,
- centery,
- &world_centerx,
- &world_centery);
-
origx = object->complex->x;
origy = object->complex->y;
1.36.2.2 +11 -11 eda/geda/gaf/gschem/src/o_misc.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_misc.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_misc.c,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.2
diff -u -b -r1.36.2.1 -r1.36.2.2
--- o_misc.c 27 Dec 2006 17:37:56 -0000 1.36.2.1
+++ o_misc.c 27 Dec 2006 19:21:37 -0000 1.36.2.2
@@ -633,7 +633,7 @@
* \par Function Description
*
*/
-void o_mirror(TOPLEVEL *w_current, GList *list, int centerx, int centery)
+void o_mirror_world(TOPLEVEL *w_current, GList *list, int centerx, int centery)
{
OBJECT *object;
GList *s_current;
@@ -674,7 +674,7 @@
other_objects = s_conn_return_others(other_objects, object);
s_conn_remove(w_current, object);
- o_net_mirror(w_current, centerx, centery, object);
+ o_net_mirror_world(w_current, centerx, centery, object);
s_conn_update_object(w_current, object);
o_net_draw(w_current, object);
@@ -699,7 +699,7 @@
other_objects = s_conn_return_others(other_objects, object);
s_conn_remove(w_current, object);
- o_pin_mirror(w_current, centerx, centery, object);
+ o_pin_mirror_world(w_current, centerx, centery, object);
s_conn_update_object(w_current, object);
o_pin_draw(w_current, object);
@@ -723,7 +723,7 @@
other_objects = s_conn_return_others(other_objects, object);
s_conn_remove(w_current, object);
- o_bus_mirror(w_current, centerx, centery, object);
+ o_bus_mirror_world(w_current, centerx, centery, object);
s_conn_update_object(w_current, object);
o_bus_draw(w_current, object);
@@ -754,7 +754,7 @@
o_current = o_current->next;
}
- o_complex_mirror(w_current, centerx, centery, object);
+ o_complex_mirror_world(w_current, centerx, centery, object);
s_conn_update_complex(w_current, object->complex->prim_objs);
o_complex_draw(w_current, object);
@@ -771,7 +771,7 @@
case(OBJ_LINE):
o_line_erase_grips(w_current, object);
o_line_erase(w_current, object);
- o_line_mirror(w_current,
+ o_line_mirror_world(w_current,
centerx, centery, object);
o_line_draw(w_current, object);
break;
@@ -779,7 +779,7 @@
case(OBJ_BOX):
o_box_erase_grips(w_current, object);
o_box_erase(w_current, object);
- o_box_mirror(w_current,
+ o_box_mirror_world(w_current,
centerx, centery, object);
o_box_draw(w_current, object);
break;
@@ -787,7 +787,7 @@
case(OBJ_PICTURE):
o_picture_erase_grips(w_current, object);
o_picture_erase(w_current, object);
- o_picture_mirror(w_current,
+ o_picture_mirror_world(w_current,
centerx, centery, object);
o_picture_draw(w_current, object);
break;
@@ -795,7 +795,7 @@
case(OBJ_CIRCLE):
o_circle_erase_grips(w_current, object);
o_circle_erase(w_current, object);
- o_circle_mirror(w_current,
+ o_circle_mirror_world(w_current,
centerx, centery, object);
o_circle_draw(w_current, object);
break;
@@ -806,13 +806,13 @@
SCREENtoWORLD(w_current, centerx, centery,
&world_centerx, &world_centery);
#endif
- o_arc_mirror(w_current, centerx, centery, object);
+ o_arc_mirror_world(w_current, centerx, centery, object);
o_arc_draw(w_current, object);
break;
case(OBJ_TEXT):
o_text_erase(w_current, object);
- o_text_mirror(w_current,
+ o_text_mirror_world(w_current,
centerx, centery, object);
o_text_draw(w_current, object);
break;
1.41.6.2 +7 -2 eda/geda/gaf/gschem/src/x_event.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_event.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_event.c,v
retrieving revision 1.41.6.1
retrieving revision 1.41.6.2
diff -u -b -r1.41.6.1 -r1.41.6.2
--- x_event.c 27 Dec 2006 17:37:56 -0000 1.41.6.1
+++ x_event.c 27 Dec 2006 19:21:37 -0000 1.41.6.2
@@ -151,6 +151,7 @@
TOPLEVEL *w_current)
{
int prev_state;
+ int w_x, w_y;
exit_if_null(w_current);
global_window_current = w_current;
@@ -442,9 +443,13 @@
break;
case(ENDMIRROR):
- o_mirror(w_current,
+ SCREENtoWORLD( w_current,
+ (int) event->x,
+ (int) event->y,
+ &w_x, &w_y );
+ o_mirror_world(w_current,
w_current->page_current->selection_list,
- (int) event->x, (int) event->y);
+ w_x, w_y);
w_current->inside_action = 0;
i_set_state(w_current, SELECT);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs