[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: o_attrib.c
User: pcjc2
Date: 06/12/21 15:11:11
Modified: . o_attrib.c o_buffer.c o_complex.c o_copy.c o_misc.c
o_select.c o_text.c
Log:
* src/o_attrib.c, src/o_buffer.c, src/o_complex.c, src/o_copy.c,
src/o_misc.c, src/o_select.c, src/o_text.c: Update interface of
o_selection_add() to match o_selection_remove(). Pass the GList by
reference so head can be updated.
Revision Changes Path
1.27 +9 -12 eda/geda/gaf/gschem/src/o_attrib.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_attrib.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_attrib.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- o_attrib.c 17 Dec 2006 04:14:03 -0000 1.26
+++ o_attrib.c 21 Dec 2006 20:11:11 -0000 1.27
@@ -55,9 +55,8 @@
OBJECT *selected)
{
ATTRIB *a_current;
- GList *selection_list = *selection_list_ptr;
- if (!selection_list) return;
+ if (!(*selection_list_ptr)) return;
/* deal with attributes here? */
if (selected->attribs != NULL) {
@@ -70,7 +69,7 @@
/* make sure object isn't selected already */
if (a_current->object->saved_color == -1) {
- *selection_list_ptr = o_selection_add(selection_list,
+ o_selection_add(selection_list_ptr,
/* w_current->page_current->
selection2_head,*/
a_current->object);
@@ -345,8 +344,7 @@
object);
}
- w_current->page_current->selection_list =
- o_selection_add(w_current->page_current->selection_list,
+ o_selection_add(&(w_current->page_current->selection_list),
w_current->page_current->object_tail);
o_undo_savestate(w_current, UNDO_ALL);
}
@@ -473,8 +471,7 @@
o_current);
}
- w_current->page_current->selection_list =
- o_selection_add(w_current->page_current->selection_list,
+ o_selection_add(&(w_current->page_current->selection_list),
w_current->page_current->object_tail);
o_text_erase(w_current, w_current->page_current->object_tail);
1.10 +1 -1 eda/geda/gaf/gschem/src/o_buffer.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_buffer.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_buffer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- o_buffer.c 17 Dec 2006 04:14:03 -0000 1.9
+++ o_buffer.c 21 Dec 2006 20:11:11 -0000 1.10
@@ -209,7 +209,7 @@
/* now add new objects to the selection list */
while (o_current != NULL) {
- temp_list = o_selection_add(temp_list, o_current);
+ o_selection_add(&temp_list, o_current);
s_conn_update_object(w_current, o_current);
if (o_current->type == OBJ_COMPLEX || o_current->type == OBJ_PLACEHOLDER) {
connected_objects = s_conn_return_complex_others(
1.30 +1 -2 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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- o_complex.c 17 Dec 2006 04:14:03 -0000 1.29
+++ o_complex.c 21 Dec 2006 20:11:11 -0000 1.30
@@ -436,8 +436,7 @@
o_selection_unselect_list(w_current,
&(w_current->page_current->selection_list));
- w_current->page_current->selection_list =
- o_selection_add(w_current->page_current->selection_list,
+ o_selection_add(&(w_current->page_current->selection_list),
w_current->page_current->object_tail);
/* the o_redraw_selected is in x_events.c after this call
* returns */
1.28 +10 -10 eda/geda/gaf/gschem/src/o_copy.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_copy.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_copy.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- o_copy.c 17 Dec 2006 04:14:03 -0000 1.27
+++ o_copy.c 21 Dec 2006 20:11:11 -0000 1.28
@@ -144,7 +144,7 @@
diff_x, diff_y,
new_object);
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = object->saved_color;
o_net_draw(w_current, new_object);
@@ -175,7 +175,7 @@
diff_x, diff_y,
new_object);
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = object->saved_color;
o_pin_draw(w_current, new_object);
@@ -205,7 +205,7 @@
diff_x, diff_y,
new_object);
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = object->saved_color;
o_bus_draw(w_current, new_object);
@@ -245,7 +245,7 @@
diff_y,
new_object);
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
/* NEWSEL: this needs to be fixed too */
/* this may not be needed anymore? */
@@ -276,7 +276,7 @@
new_object);
w_current->ADDING_SEL=0;
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = object->saved_color;
o_line_draw(w_current, new_object);
break;
@@ -298,7 +298,7 @@
new_object);
w_current->ADDING_SEL=0;
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = object->saved_color;
o_box_draw(w_current, new_object);
@@ -321,7 +321,7 @@
new_object);
w_current->ADDING_SEL=0;
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = object->saved_color;
o_picture_draw(w_current, new_object);
@@ -345,7 +345,7 @@
new_object);
w_current->ADDING_SEL=0;
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = object->saved_color;
o_circle_draw(w_current, new_object);
break;
@@ -368,7 +368,7 @@
new_object);
w_current->ADDING_SEL=0;
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = object->saved_color;
o_arc_draw(w_current, new_object);
break;
@@ -442,7 +442,7 @@
color = object->saved_color;
}
- temp_list = o_selection_add(temp_list, new_object);
+ o_selection_add(&temp_list, new_object);
new_object->saved_color = color;
/* signify that object is no longer an attribute */
1.38 +0 -6 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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- o_misc.c 17 Dec 2006 04:14:03 -0000 1.37
+++ o_misc.c 21 Dec 2006 20:11:11 -0000 1.38
@@ -1048,12 +1048,6 @@
if (o_current->type == OBJ_TEXT) {
/* replaced strcmp with strstr to simplify the search */
if (strstr(o_current->text->string,stext)) {
- /* printf(_("Found %s\n"), stext);
- if (!o_current->selected&&(!descend)) {
- w_current->page_current->selection_list =
- o_selection_add(w_current->page_current->selection_list,
- o_current);
- } */
if (!skiplast) {
#if 0 /* replaced by code below by avh, might not quite be right though */
1.7 +6 -9 eda/geda/gaf/gschem/src/o_select.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_select.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_select.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- o_select.c 17 Dec 2006 04:14:03 -0000 1.6
+++ o_select.c 21 Dec 2006 20:11:11 -0000 1.7
@@ -171,8 +171,7 @@
/* object not select, add it to the selection list */
o_select_run_hooks(w_current, o_current, 1);
- w_current->page_current->selection_list =
- o_selection_add(w_current->page_current->selection_list,
+ o_selection_add(&(w_current->page_current->selection_list),
o_current);
break;
@@ -207,8 +206,7 @@
&(w_current->page_current->selection_list));
o_select_run_hooks(w_current, o_current, 1);
- w_current->page_current->selection_list =
- o_selection_add(w_current->page_current->selection_list,
+ o_selection_add(&(w_current->page_current->selection_list),
o_current);
}
@@ -222,8 +220,7 @@
&(w_current->page_current->selection_list));
o_select_run_hooks (w_current, o_current, 1);
- w_current->page_current->selection_list =
- o_selection_add(w_current->page_current->selection_list,
+ o_selection_add(&(w_current->page_current->selection_list),
o_current);
}
1.27 +2 -3 eda/geda/gaf/gschem/src/o_text.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_text.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_text.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- o_text.c 17 Dec 2006 04:14:03 -0000 1.26
+++ o_text.c 21 Dec 2006 20:11:11 -0000 1.27
@@ -582,8 +582,7 @@
o_select_run_hooks(w_current, NULL, 2);
o_selection_unselect_list(w_current,
&(w_current->page_current->selection_list));
- w_current->page_current->selection_list =
- o_selection_add(w_current->page_current->selection_list,
+ o_selection_add(&(w_current->page_current->selection_list),
w_current->page_current->object_tail);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs