[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.1-20081221-62-ge167a18)
The branch, master has been updated
via e167a181f295b33ffd4771f93b779023eeae948b (commit)
via d061b8dd35db031e43f179e700d991f63c6d2eac (commit)
via 0840e3d74e6289083516190e973a1c05228c6145 (commit)
from 35ea568246a8df14f7f6fa4b6c375e72662638d6 (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 | 58 ++++++++++++++++++++++----------------------
gschem/src/a_zoom.c | 2 +-
gschem/src/o_arc.c | 4 +-
gschem/src/o_basic.c | 54 ++++++++++++++++++++--------------------
gschem/src/o_box.c | 4 +-
gschem/src/o_bus.c | 10 ++++----
gschem/src/o_circle.c | 4 +-
gschem/src/o_complex.c | 4 +-
gschem/src/o_grips.c | 14 +++++-----
gschem/src/o_line.c | 4 +-
gschem/src/o_move.c | 12 ++++----
gschem/src/o_net.c | 10 ++++----
gschem/src/o_path.c | 4 +-
gschem/src/o_picture.c | 8 +++---
gschem/src/o_pin.c | 4 +-
gschem/src/o_place.c | 6 ++--
gschem/src/o_select.c | 2 +-
gschem/src/o_text.c | 4 +-
18 files changed, 104 insertions(+), 104 deletions(-)
=================
Commit Messages
=================
commit e167a181f295b33ffd4771f93b779023eeae948b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 14:26:14 2008 +0000
gschem: Rename o_*_draw_xor_single() o_*_draw_stretch()
Since we're using the invalidate/expose model now, there is no
need that these functions must use XOR drawing to the screen.
These routines are used to draw lines being stretched during a
rubberbanded move operation, so name them something relevant.
:100644 100644 a923e19... 8356944... M gschem/include/prototype.h
:100644 100644 f9a7031... 07c3e54... M gschem/src/o_bus.c
:100644 100644 5ad6093... 290705d... M gschem/src/o_move.c
:100644 100644 55613f0... bdd7031... M gschem/src/o_net.c
commit d061b8dd35db031e43f179e700d991f63c6d2eac
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 14:26:14 2008 +0000
gschem: Rename o_*_draw_xor() functions to o_*_draw_place()
Since we're using the invalidate/expose model now, there is no
need that these functions must use XOR drawing to the screen.
These routines are just used to draw objects being moved or placed,
so lets call them something relevant to that.
:100644 100644 7515acb... a923e19... M gschem/include/prototype.h
:100644 100644 09db31a... 2edb35f... M gschem/src/o_arc.c
:100644 100644 c5db3dc... 472ae12... M gschem/src/o_basic.c
:100644 100644 43935c5... 2d8e542... M gschem/src/o_box.c
:100644 100644 80c7afb... f9a7031... M gschem/src/o_bus.c
:100644 100644 fea814a... f544ffe... M gschem/src/o_circle.c
:100644 100644 480368f... 59f3902... M gschem/src/o_complex.c
:100644 100644 6f513ad... de3faee... M gschem/src/o_line.c
:100644 100644 ba30234... 55613f0... M gschem/src/o_net.c
:100644 100644 672c8a2... 33557b6... M gschem/src/o_path.c
:100644 100644 eccbc0a... 54b4dff... M gschem/src/o_picture.c
:100644 100644 09c2cf0... a1183ce... M gschem/src/o_pin.c
:100644 100644 2dacadf... 76ba9f9... M gschem/src/o_place.c
:100644 100644 5946a1e... d507aba... M gschem/src/o_text.c
commit 0840e3d74e6289083516190e973a1c05228c6145
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 14:26:13 2008 +0000
gschem: Rename *_rubber*_xor() functions to *_draw_rubber()
Since we're using the invalidate/expose model now, there is no
need that these functions must use XOR drawing to the screen.
:100644 100644 f473db6... 7515acb... M gschem/include/prototype.h
:100644 100644 01a464f... 497910c... M gschem/src/a_zoom.c
:100644 100644 1d42f89... 09db31a... M gschem/src/o_arc.c
:100644 100644 7d179c6... c5db3dc... M gschem/src/o_basic.c
:100644 100644 bb22b86... 43935c5... M gschem/src/o_box.c
:100644 100644 5403209... 80c7afb... M gschem/src/o_bus.c
:100644 100644 f8d6b26... fea814a... M gschem/src/o_circle.c
:100644 100644 cafc42c... 23de0d9... M gschem/src/o_grips.c
:100644 100644 d5b75ae... 6f513ad... M gschem/src/o_line.c
:100644 100644 4fceb4e... 5ad6093... M gschem/src/o_move.c
:100644 100644 74d4cdc... ba30234... M gschem/src/o_net.c
:100644 100644 f9d0da9... 672c8a2... M gschem/src/o_path.c
:100644 100644 0b0ca49... eccbc0a... M gschem/src/o_picture.c
:100644 100644 121e550... 09c2cf0... M gschem/src/o_pin.c
:100644 100644 b095c4e... 2dacadf... M gschem/src/o_place.c
:100644 100644 f4b960a... fe43580... M gschem/src/o_select.c
=========
Changes
=========
commit e167a181f295b33ffd4771f93b779023eeae948b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 14:26:14 2008 +0000
gschem: Rename o_*_draw_xor_single() o_*_draw_stretch()
Since we're using the invalidate/expose model now, there is no
need that these functions must use XOR drawing to the screen.
These routines are used to draw lines being stretched during a
rubberbanded move operation, so name them something relevant.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index a923e19..8356944 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -498,7 +498,7 @@ void o_buffer_free(GSCHEM_TOPLEVEL *w_current);
/* o_bus.c */
void o_bus_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_bus_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
-void o_bus_draw_xor_single(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int whichone, OBJECT *o_current);
+void o_bus_draw_stretch(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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
@@ -611,7 +611,7 @@ void o_move_stretch_rubberband(GSCHEM_TOPLEVEL *w_current);
void o_net_reset(GSCHEM_TOPLEVEL *w_current);
void o_net_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_net_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
-void o_net_draw_xor_single(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int whichone, OBJECT *o_current);
+void o_net_draw_stretch(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int whichone, OBJECT *o_current);
void o_net_guess_direction(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_net_find_magnetic(GSCHEM_TOPLEVEL *w_current, int event_x, int event_y);
void o_net_finishmagnetic(GSCHEM_TOPLEVEL *w_current);
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index f9a7031..07c3e54 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -141,8 +141,8 @@ void o_bus_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_cur
* \par Function Description
*
*/
-void o_bus_draw_xor_single(GSCHEM_TOPLEVEL *w_current,
- int dx, int dy, int whichone, OBJECT *o_current)
+void o_bus_draw_stretch (GSCHEM_TOPLEVEL *w_current,
+ int dx, int dy, int whichone, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int color;
@@ -173,7 +173,7 @@ void o_bus_draw_xor_single(GSCHEM_TOPLEVEL *w_current,
dx1 = 0;
dy1 = 0;
} else {
- fprintf(stderr, _("Got an invalid which one in o_bus_draw_xor_single\n"));
+ fprintf(stderr, _("Got an invalid which one in o_bus_draw_stretch\n"));
}
WORLDtoSCREEN(toplevel, o_current->line->x[0] + dx1, o_current->line->y[0] + dy1, &sx[0], &sy[0]);
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 5ad6093..290705d 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -623,11 +623,11 @@ void o_move_stretch_rubberband(GSCHEM_TOPLEVEL *w_current)
switch (object->type) {
case (OBJ_NET):
- o_net_draw_xor_single(w_current, diff_x, diff_y, whichone, object);
+ o_net_draw_stretch (w_current, diff_x, diff_y, whichone, object);
break;
case (OBJ_BUS):
- o_bus_draw_xor_single(w_current, diff_x, diff_y, whichone, object);
+ o_bus_draw_stretch (w_current, diff_x, diff_y, whichone, object);
break;
}
}
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 55613f0..bdd7031 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -182,8 +182,8 @@ void o_net_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_cur
* \par Function Description
*
*/
-void o_net_draw_xor_single(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int whichone,
- OBJECT *o_current)
+void o_net_draw_stretch (GSCHEM_TOPLEVEL *w_current,
+ int dx, int dy, int whichone, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int color;
@@ -214,7 +214,7 @@ void o_net_draw_xor_single(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int which
dx1 = 0;
dy1 = 0;
} else {
- fprintf(stderr, _("Got an invalid which one in o_net_draw_xor_single\n"));
+ fprintf(stderr, _("Got an invalid which one in o_net_draw_stretch\n"));
}
WORLDtoSCREEN( toplevel, o_current->line->x[0] + dx1, o_current->line->y[0] + dy1, &sx[0], &sy[0] );
commit d061b8dd35db031e43f179e700d991f63c6d2eac
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 14:26:14 2008 +0000
gschem: Rename o_*_draw_xor() functions to o_*_draw_place()
Since we're using the invalidate/expose model now, there is no
need that these functions must use XOR drawing to the screen.
These routines are just used to draw objects being moved or placed,
so lets call them something relevant to that.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 7515acb..a923e19 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -452,7 +452,7 @@ void i_vars_freenames();
/* o_arc.c */
void o_arc_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_arc_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
-void o_arc_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_arc_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
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);
@@ -470,8 +470,8 @@ void o_redraw(GSCHEM_TOPLEVEL *w_current, GList *object_list, gboolean draw_sele
void o_redraw_single(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
int o_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
int o_redraw_cleanstates(GSCHEM_TOPLEVEL *w_current);
-void o_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *object);
-void o_glist_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, GList *list);
+void o_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *object);
+void o_glist_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, GList *list);
void o_invalidate_rect(GSCHEM_TOPLEVEL *w_current, int x1, int y1, int x2, int y2);
void o_invalidate_all(GSCHEM_TOPLEVEL *w_current);
void o_invalidate(GSCHEM_TOPLEVEL *w_current, OBJECT *object);
@@ -483,7 +483,7 @@ void o_box_fill_fill(GdkDrawable *w, GdkGC *gc, COLOR *color, GSCHEM_TOPLEVEL *w
void o_box_fill_hatch(GdkDrawable *w, GdkGC *gc, COLOR *color, GSCHEM_TOPLEVEL *w_current, BOX *box, gint fill_width, gint angle1, gint pitch1, gint angle2, gint pitch2);
void o_box_fill_mesh(GdkDrawable *w, GdkGC *gc, COLOR *color, GSCHEM_TOPLEVEL *w_current, BOX *box, gint fill_width, gint angle1, gint pitch1, gint angle2, gint pitch2);
void o_box_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
-void o_box_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_box_draw_place(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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
@@ -497,7 +497,7 @@ void o_buffer_init(void);
void o_buffer_free(GSCHEM_TOPLEVEL *w_current);
/* o_bus.c */
void o_bus_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
-void o_bus_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_bus_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
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);
@@ -511,7 +511,7 @@ void o_circle_fill_fill(GdkDrawable *w, GdkGC *gc, COLOR *color, GSCHEM_TOPLEVEL
void o_circle_fill_hatch(GdkDrawable *w, GdkGC *gc, COLOR *color, GSCHEM_TOPLEVEL *w_current, CIRCLE *circle, gint fill_width, gint angle1, gint pitch1, gint angle2, gint pitch2);
void o_circle_fill_mesh(GdkDrawable *w, GdkGC *gc, COLOR *color, GSCHEM_TOPLEVEL *w_current, CIRCLE *circle, gint fill_width, gint angle1, gint pitch1, gint angle2, gint pitch2);
void o_circle_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
-void o_circle_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_circle_draw_place(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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
@@ -519,7 +519,7 @@ void o_circle_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_circle_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
/* o_complex.c */
void o_complex_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
-void o_complex_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *complex);
+void o_complex_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *complex);
void o_complex_prepare_place(GSCHEM_TOPLEVEL *w_current, const char *sym_name);
void o_complex_place_changed_run_hook(GSCHEM_TOPLEVEL *w_current);
void o_complex_end(GSCHEM_TOPLEVEL *w_current, int x, int y, int continue_placing);
@@ -573,7 +573,7 @@ void o_grips_draw_rubber(GSCHEM_TOPLEVEL *w_current);
/* o_line.c */
void o_line_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_line_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
-void o_line_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_line_draw_place(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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
@@ -610,7 +610,7 @@ 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);
-void o_net_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_net_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
void o_net_draw_xor_single(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int whichone, OBJECT *o_current);
void o_net_guess_direction(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_net_find_magnetic(GSCHEM_TOPLEVEL *w_current, int event_x, int event_y);
@@ -631,7 +631,7 @@ void o_picture_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
void o_picture_draw_rubber(GSCHEM_TOPLEVEL *w_current);
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_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_picture_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
void o_picture_exchange(GSCHEM_TOPLEVEL *w_current, GdkPixbuf *pixbuf, const gchar *filename);
void picture_change_filename_dialog (GSCHEM_TOPLEVEL *w_current);
void o_picture_set_pixbuf(GSCHEM_TOPLEVEL *w_current, GdkPixbuf *pixbuf, char *filename);
@@ -639,7 +639,7 @@ void o_picture_set_pixbuf(GSCHEM_TOPLEVEL *w_current, GdkPixbuf *pixbuf, char *f
/* o_path.c */
void o_path_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_path_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
-void o_path_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_path_draw_place(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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
@@ -648,7 +648,7 @@ void o_path_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
/* o_pin.c */
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_draw_place(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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
@@ -683,7 +683,7 @@ void o_slot_end(GSCHEM_TOPLEVEL *w_current, const char *string, int len);
void o_text_draw_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_text_draw_rectangle(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_text_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
-void o_text_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
+void o_text_draw_place(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
void o_text_prepare_place(GSCHEM_TOPLEVEL *w_current, char *text);
void o_text_edit(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_text_edit_end(GSCHEM_TOPLEVEL *w_current, char *string, int len, int text_size, int text_alignment);
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index 09db31a..2edb35f 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -165,7 +165,7 @@ void o_arc_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
* \param [in] dy Delta y coordinate for arc.
* \param [in] o_current Arc OBJECT to draw.
*/
-void o_arc_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_arc_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int x, y, width, height, start_angle, end_angle;
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index c5db3dc..472ae12 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -414,23 +414,23 @@ int o_redraw_cleanstates(GSCHEM_TOPLEVEL *w_current)
* \par Function Description
*
*/
-void o_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
+void o_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
{
void (*func) (GSCHEM_TOPLEVEL *, int, int, OBJECT*) = NULL;
switch (object->type) {
- case OBJ_LINE: func = o_line_draw_xor; break;
- case OBJ_NET: func = o_net_draw_xor; break;
- case OBJ_BUS: func = o_bus_draw_xor; break;
- case OBJ_BOX: func = o_box_draw_xor; break;
- case OBJ_PICTURE: func = o_picture_draw_xor; break;
- case OBJ_CIRCLE: func = o_circle_draw_xor; break;
+ case OBJ_LINE: func = o_line_draw_place; break;
+ case OBJ_NET: func = o_net_draw_place; break;
+ case OBJ_BUS: func = o_bus_draw_place; break;
+ case OBJ_BOX: func = o_box_draw_place; break;
+ case OBJ_PICTURE: func = o_picture_draw_place; break;
+ case OBJ_CIRCLE: func = o_circle_draw_place; break;
case OBJ_PLACEHOLDER:
- case OBJ_COMPLEX: func = o_complex_draw_xor; break;
- case OBJ_TEXT: func = o_text_draw_xor; break;
- case OBJ_PATH: func = o_path_draw_xor; break;
- case OBJ_PIN: func = o_pin_draw_xor; break;
- case OBJ_ARC: func = o_arc_draw_xor; break;
+ case OBJ_COMPLEX: func = o_complex_draw_place; break;
+ case OBJ_TEXT: func = o_text_draw_place; break;
+ case OBJ_PATH: func = o_path_draw_place; break;
+ case OBJ_PIN: func = o_pin_draw_place; break;
+ case OBJ_ARC: func = o_arc_draw_place; break;
default:
g_assert_not_reached ();
}
@@ -446,12 +446,12 @@ void o_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
* \par Function Description
*
*/
-void o_glist_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, GList *list)
+void o_glist_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, GList *list)
{
GList *iter = list;
while (iter != NULL) {
- o_draw_xor(w_current, dx, dy, (OBJECT *)iter->data);
+ o_draw_place (w_current, dx, dy, (OBJECT *)iter->data);
iter = g_list_next(iter);
}
}
diff --git a/gschem/src/o_box.c b/gschem/src/o_box.c
index 43935c5..2d8e542 100644
--- a/gschem/src/o_box.c
+++ b/gschem/src/o_box.c
@@ -416,7 +416,7 @@ void o_box_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
* \param [in] dy Delta y coordinate for box.
* \param [in] o_current Box OBJECT to draw.
*/
-void o_box_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_box_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int screen_x1, screen_y1;
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index 80c7afb..f9a7031 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -92,7 +92,7 @@ void o_bus_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
* \par Function Description
*
*/
-void o_bus_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_bus_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int size;
diff --git a/gschem/src/o_circle.c b/gschem/src/o_circle.c
index fea814a..f544ffe 100644
--- a/gschem/src/o_circle.c
+++ b/gschem/src/o_circle.c
@@ -418,7 +418,7 @@ void o_circle_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
* \todo
* add in offsets, get rid of global diffs_x,y
*/
-void o_circle_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_circle_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int x, y, radius;
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index 480368f..59f3902 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -52,12 +52,12 @@ void o_complex_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
* \par Function Description
*
*/
-void o_complex_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
+void o_complex_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *object)
{
g_assert( (object->type == OBJ_COMPLEX ||
object->type == OBJ_PLACEHOLDER) );
- o_glist_draw_xor (w_current, dx, dy, object->complex->prim_objs);
+ o_glist_draw_place (w_current, dx, dy, object->complex->prim_objs);
}
diff --git a/gschem/src/o_line.c b/gschem/src/o_line.c
index 6f513ad..de3faee 100644
--- a/gschem/src/o_line.c
+++ b/gschem/src/o_line.c
@@ -144,7 +144,7 @@ void o_line_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
* \param [in] dy Delta y coordinate for line.
* \param [in] o_current Line OBJECT to draw.
*/
-void o_line_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_line_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int color;
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index ba30234..55613f0 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -135,7 +135,7 @@ void o_net_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
* \par Function Description
*
*/
-void o_net_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_net_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int size;
diff --git a/gschem/src/o_path.c b/gschem/src/o_path.c
index 672c8a2..33557b6 100644
--- a/gschem/src/o_path.c
+++ b/gschem/src/o_path.c
@@ -554,7 +554,7 @@ void o_path_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
* \param [in] dy Delta y coordinate for path.
* \param [in] o_current Line OBJECT to draw.
*/
-void o_path_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_path_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
PATH *path = o_current->path;
int color;
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index eccbc0a..54b4dff 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -474,7 +474,7 @@ void o_picture_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
* \param [in] dy Delta y coordinate for picture.
* \param [in] o_current Picture OBJECT to draw.
*/
-void o_picture_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_picture_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int screen_x1, screen_y1;
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index 09c2cf0..a1183ce 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -95,7 +95,7 @@ void o_pin_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
* \par Function Description
*
*/
-void o_pin_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_pin_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int size;
diff --git a/gschem/src/o_place.c b/gschem/src/o_place.c
index 2dacadf..76ba9f9 100644
--- a/gschem/src/o_place.c
+++ b/gschem/src/o_place.c
@@ -304,8 +304,8 @@ void o_place_draw_rubber (GSCHEM_TOPLEVEL *w_current, int drawing)
s_left, s_bottom,
s_right - s_left, s_top - s_bottom);
} else {
- o_glist_draw_xor (w_current, diff_x, diff_y,
- toplevel->page_current->place_list);
+ o_glist_draw_place (w_current, diff_x, diff_y,
+ toplevel->page_current->place_list);
}
/* Save movement constraints and drawing method for any
diff --git a/gschem/src/o_text.c b/gschem/src/o_text.c
index 5946a1e..d507aba 100644
--- a/gschem/src/o_text.c
+++ b/gschem/src/o_text.c
@@ -225,7 +225,7 @@ void o_text_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
* \par Function Description
*
*/
-void o_text_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
+void o_text_draw_place (GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int top, bottom, left, right;
@@ -240,7 +240,7 @@ void o_text_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curre
if ((factor < w_current->text_display_zoomfactor) ||
o_current->text->size >= 12 ||
w_current->text_feedback == ALWAYS) {
- o_glist_draw_xor (w_current, dx, dy, o_current->text->prim_objs);
+ o_glist_draw_place (w_current, dx, dy, o_current->text->prim_objs);
} else {
/* text is too small so go through and draw a line in
it's place */
commit 0840e3d74e6289083516190e973a1c05228c6145
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Dec 27 14:26:13 2008 +0000
gschem: Rename *_rubber*_xor() functions to *_draw_rubber()
Since we're using the invalidate/expose model now, there is no
need that these functions must use XOR drawing to the screen.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index f473db6..7515acb 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -15,7 +15,7 @@ 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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void a_zoom_box_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
-void a_zoom_box_rubberband_xor(GSCHEM_TOPLEVEL *w_current);
+void a_zoom_box_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void correct_aspect(GSCHEM_TOPLEVEL *w_current);
/* g_funcs.c */
SCM g_funcs_print(SCM filename);
@@ -457,7 +457,7 @@ 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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y, int whichone);
-void o_arc_rubberarc_xor(GSCHEM_TOPLEVEL *w_current);
+void o_arc_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_arc_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
/* o_attrib.c */
void o_attrib_add_selected(GSCHEM_TOPLEVEL *w_current, SELECTION *selection, OBJECT *selected);
@@ -487,7 +487,7 @@ void o_box_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_box_rubberbox_xor(GSCHEM_TOPLEVEL *w_current);
+void o_box_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_box_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
/* o_buffer.c */
void o_buffer_copy(GSCHEM_TOPLEVEL *w_current, int buf_num);
@@ -502,7 +502,7 @@ void o_bus_draw_xor_single(GSCHEM_TOPLEVEL *w_current, int dx, int dy, int which
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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_bus_rubberbus_xor(GSCHEM_TOPLEVEL *w_current);
+void o_bus_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_bus_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
/* o_circle.c */
void o_circle_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
@@ -515,7 +515,7 @@ void o_circle_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_cur
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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_circle_rubbercircle_xor(GSCHEM_TOPLEVEL *w_current);
+void o_circle_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_circle_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
/* o_complex.c */
void o_complex_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
@@ -569,7 +569,7 @@ void o_grips_end_pin(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
void o_grips_end_bus(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone);
int o_grips_size(GSCHEM_TOPLEVEL *w_current);
void o_grips_draw(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_grips_rubbergrip_xor(GSCHEM_TOPLEVEL *w_current);
+void o_grips_draw_rubber(GSCHEM_TOPLEVEL *w_current);
/* o_line.c */
void o_line_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
void o_line_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
@@ -577,7 +577,7 @@ void o_line_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curre
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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_line_rubberline_xor(GSCHEM_TOPLEVEL *w_current);
+void o_line_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_line_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
/* o_misc.c */
void o_edit(GSCHEM_TOPLEVEL *w_current, GList *list);
@@ -600,7 +600,7 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current);
void o_move_cancel(GSCHEM_TOPLEVEL *w_current);
void o_move_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_move_invalidate_rubber(GSCHEM_TOPLEVEL *w_current, int drawing);
-void o_move_rubbermove_xor(GSCHEM_TOPLEVEL *w_current, int drawing);
+void o_move_draw_rubber(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);
void o_move_prep_rubberband(GSCHEM_TOPLEVEL *w_current);
@@ -619,7 +619,7 @@ 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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_net_drawrubber(GSCHEM_TOPLEVEL *w_current);
+void o_net_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_net_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj, GList *other_objects);
/* o_picture.c */
@@ -628,7 +628,7 @@ 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_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
-void o_picture_rubberbox_xor(GSCHEM_TOPLEVEL *w_current);
+void o_picture_draw_rubber(GSCHEM_TOPLEVEL *w_current);
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_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_current);
@@ -643,7 +643,7 @@ void o_path_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curre
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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_path_rubberpath_xor(GSCHEM_TOPLEVEL *w_current);
+void o_path_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_path_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current);
/* o_pin.c */
@@ -652,14 +652,14 @@ void o_pin_draw_xor(GSCHEM_TOPLEVEL *w_current, int dx, int dy, OBJECT *o_curren
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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
-void o_pin_rubberpin_xor(GSCHEM_TOPLEVEL *w_current);
+void o_pin_draw_rubber(GSCHEM_TOPLEVEL *w_current);
void o_pin_invalidate_rubber(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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_place_invalidate_rubber(GSCHEM_TOPLEVEL *w_current, int drawing);
-void o_place_rubberplace_xor(GSCHEM_TOPLEVEL *w_current, int drawing);
+void o_place_draw_rubber(GSCHEM_TOPLEVEL *w_current, int drawing);
void o_place_rotate(GSCHEM_TOPLEVEL *w_current);
/* o_select.c */
void o_select_run_hooks(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int flag);
@@ -668,7 +668,7 @@ 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_motion(GSCHEM_TOPLEVEL *w_current, int x, int y);
void o_select_box_invalidate_rubber(GSCHEM_TOPLEVEL *w_current);
-void o_select_box_rubberband_xor(GSCHEM_TOPLEVEL *w_current);
+void o_select_box_draw_rubber(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);
OBJECT *o_select_return_first_object(GSCHEM_TOPLEVEL *w_current);
diff --git a/gschem/src/a_zoom.c b/gschem/src/a_zoom.c
index 01a464f..497910c 100644
--- a/gschem/src/a_zoom.c
+++ b/gschem/src/a_zoom.c
@@ -298,7 +298,7 @@ void a_zoom_box_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
* \par Function Description
*
*/
-void a_zoom_box_rubberband_xor(GSCHEM_TOPLEVEL *w_current)
+void a_zoom_box_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int x1, y1, x2, y2;
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index 1d42f89..09db31a 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -414,7 +414,7 @@ void o_arc_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y, int whichone)
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
*/
-void o_arc_rubberarc_xor(GSCHEM_TOPLEVEL *w_current)
+void o_arc_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 7d179c6..c5db3dc 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -112,7 +112,7 @@ void o_redraw_rects (GSCHEM_TOPLEVEL *w_current,
case MOVE:
case ENDMOVE:
if (w_current->last_drawb_mode != -1) {
- o_move_rubbermove_xor (w_current, TRUE);
+ o_move_draw_rubber (w_current, TRUE);
}
break;
@@ -122,66 +122,66 @@ void o_redraw_rects (GSCHEM_TOPLEVEL *w_current,
case ENDTEXT:
case ENDPASTE:
if (w_current->rubber_visible)
- o_place_rubberplace_xor (w_current, TRUE);
+ o_place_draw_rubber (w_current, TRUE);
break;
case STARTDRAWNET:
case DRAWNET:
case NETCONT:
if (w_current->rubber_visible)
- o_net_drawrubber (w_current);
+ o_net_draw_rubber (w_current);
break;
case STARTDRAWBUS:
case DRAWBUS:
case BUSCONT:
if (w_current->rubber_visible)
- o_bus_rubberbus_xor(w_current);
+ o_bus_draw_rubber(w_current);
break;
case GRIPS:
if (w_current->rubber_visible)
- o_grips_rubbergrip_xor (w_current);
+ o_grips_draw_rubber (w_current);
break;
case SBOX:
if (w_current->rubber_visible)
- o_select_box_rubberband_xor (w_current);
+ o_select_box_draw_rubber (w_current);
break;
case ZOOMBOXEND:
if (w_current->rubber_visible)
- a_zoom_box_rubberband_xor (w_current);
+ a_zoom_box_draw_rubber (w_current);
break;
case ENDLINE:
if (w_current->rubber_visible)
- o_line_rubberline_xor (w_current);
+ o_line_draw_rubber (w_current);
break;
case ENDBOX:
if (w_current->rubber_visible)
- o_box_rubberbox_xor (w_current);
+ o_box_draw_rubber (w_current);
break;
case ENDPICTURE:
if (w_current->rubber_visible)
- o_picture_rubberbox_xor (w_current);
+ o_picture_draw_rubber (w_current);
break;
case ENDCIRCLE:
if (w_current->rubber_visible)
- o_circle_rubbercircle_xor (w_current);
+ o_circle_draw_rubber (w_current);
break;
case ENDARC:
if (w_current->rubber_visible)
- o_arc_rubberarc_xor (w_current);
+ o_arc_draw_rubber (w_current);
break;
case ENDPIN:
if (w_current->rubber_visible)
- o_pin_rubberpin_xor (w_current);
+ o_pin_draw_rubber (w_current);
break;
}
}
diff --git a/gschem/src/o_box.c b/gschem/src/o_box.c
index bb22b86..43935c5 100644
--- a/gschem/src/o_box.c
+++ b/gschem/src/o_box.c
@@ -599,7 +599,7 @@ void o_box_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
*/
-void o_box_rubberbox_xor(GSCHEM_TOPLEVEL *w_current)
+void o_box_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int x1, y1, x2, y2;
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index 5403209..80c7afb 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -341,7 +341,7 @@ void o_bus_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
*
* \param [in] w_current The GSCHEM_TOPLEVEL object
*/
-void o_bus_rubberbus_xor(GSCHEM_TOPLEVEL *w_current)
+void o_bus_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int x1, y1, x2, y2, size=0;
diff --git a/gschem/src/o_circle.c b/gschem/src/o_circle.c
index f8d6b26..fea814a 100644
--- a/gschem/src/o_circle.c
+++ b/gschem/src/o_circle.c
@@ -591,7 +591,7 @@ void o_circle_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
*/
-void o_circle_rubbercircle_xor(GSCHEM_TOPLEVEL *w_current)
+void o_circle_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int cx, cy, radius;
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index cafc42c..23de0d9 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -1612,36 +1612,36 @@ void o_grips_draw(GSCHEM_TOPLEVEL *w_current, int x, int y)
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
*/
-void o_grips_rubbergrip_xor (GSCHEM_TOPLEVEL *w_current)
+void o_grips_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
g_return_if_fail (w_current->which_object != NULL);
switch(w_current->which_object->type) {
case OBJ_ARC:
- o_arc_rubberarc_xor (w_current);
+ o_arc_draw_rubber (w_current);
break;
case OBJ_BOX:
- o_box_rubberbox_xor (w_current);
+ o_box_draw_rubber (w_current);
break;
case OBJ_PATH:
- o_path_rubberpath_xor (w_current);
+ o_path_draw_rubber (w_current);
break;
case OBJ_PICTURE:
- o_picture_rubberbox_xor (w_current);
+ o_picture_draw_rubber (w_current);
break;
case OBJ_CIRCLE:
- o_circle_rubbercircle_xor (w_current);
+ o_circle_draw_rubber (w_current);
break;
case OBJ_LINE:
case OBJ_NET:
case OBJ_PIN:
case OBJ_BUS:
- o_line_rubberline_xor (w_current);
+ o_line_draw_rubber (w_current);
break;
default:
diff --git a/gschem/src/o_line.c b/gschem/src/o_line.c
index d5b75ae..6f513ad 100644
--- a/gschem/src/o_line.c
+++ b/gschem/src/o_line.c
@@ -311,7 +311,7 @@ void o_line_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
*/
-void o_line_rubberline_xor(GSCHEM_TOPLEVEL *w_current)
+void o_line_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int x1, y1, x2, y2;
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 4fceb4e..5ad6093 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_rubbermove_xor (w_current, TRUE);
+ o_move_draw_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_rubbermove_xor (w_current, FALSE);
+ o_move_draw_rubber (w_current, FALSE);
w_current->rubber_visible = 0;
if (w_current->netconn_rubberband) {
@@ -358,9 +358,9 @@ void o_move_invalidate_rubber (GSCHEM_TOPLEVEL *w_current, int drawing)
* \par Function Description
*
*/
-void o_move_rubbermove_xor (GSCHEM_TOPLEVEL *w_current, int drawing)
+void o_move_draw_rubber (GSCHEM_TOPLEVEL *w_current, int drawing)
{
- o_place_rubberplace_xor (w_current, drawing);
+ o_place_draw_rubber (w_current, drawing);
if (w_current->netconn_rubberband)
o_move_stretch_rubberband(w_current);
}
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 74d4cdc..ba30234 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -820,7 +820,7 @@ void o_net_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
* \par Function Description
* This function draws the rubbernets to the graphic context
*/
-void o_net_drawrubber(GSCHEM_TOPLEVEL *w_current)
+void o_net_draw_rubber(GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int size=0, magnetic_halfsize;
diff --git a/gschem/src/o_path.c b/gschem/src/o_path.c
index f9d0da9..672c8a2 100644
--- a/gschem/src/o_path.c
+++ b/gschem/src/o_path.c
@@ -667,7 +667,7 @@ void o_path_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
*/
-void o_path_rubberpath_xor(GSCHEM_TOPLEVEL *w_current)
+void o_path_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
PATH *path;
int num_points;
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index 0b0ca49..eccbc0a 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -88,7 +88,7 @@ void o_picture_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
g_assert( w_current->inside_action != 0 );
/* erase the temporary picture */
- /* o_picture_rubberbox_xor(w_current); */
+ /* o_picture_draw_rubber(w_current); */
w_current->rubber_visible = 0;
picture_width = GET_PICTURE_WIDTH (w_current);
@@ -273,7 +273,7 @@ void o_picture_motion (GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
*
* \param [in] w_current The GSCHEM_TOPLEVEL object.
*/
-void o_picture_rubberbox_xor(GSCHEM_TOPLEVEL *w_current)
+void o_picture_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int left, top, width, height;
@@ -286,7 +286,7 @@ void o_picture_rubberbox_xor(GSCHEM_TOPLEVEL *w_current)
height = SCREENabs(toplevel, GET_PICTURE_HEIGHT(w_current));
#if DEBUG
- printf("o_picture_rubberbox_xor called:\n");
+ printf("o_picture_draw_rubber called:\n");
printf("pixbuf wh ratio: %i\n", w_current->pixbuf_wh_ratio);
printf("first: %i, %i\n", w_current->first_wx, w_current->first_wy);
printf("second: %i, %i\n", w_current->second_wx, w_current->second_wy);
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index 121e550..09c2cf0 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -263,7 +263,7 @@ void o_pin_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
* \par Function Description
*
*/
-void o_pin_rubberpin_xor(GSCHEM_TOPLEVEL *w_current)
+void o_pin_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int x1, y1, x2, y2;
diff --git a/gschem/src/o_place.c b/gschem/src/o_place.c
index b095c4e..2dacadf 100644
--- a/gschem/src/o_place.c
+++ b/gschem/src/o_place.c
@@ -255,7 +255,7 @@ void o_place_invalidate_rubber (GSCHEM_TOPLEVEL *w_current, int drawing)
* \param [in] drawing Set to FALSE for undraw operations to ensure
* matching conditions to a previous draw operation.
*/
-void o_place_rubberplace_xor (GSCHEM_TOPLEVEL *w_current, int drawing)
+void o_place_draw_rubber (GSCHEM_TOPLEVEL *w_current, int drawing)
{
TOPLEVEL *toplevel = w_current->toplevel;
int diff_x, diff_y;
diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index f4b960a..fe43580 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -312,7 +312,7 @@ void o_select_box_invalidate_rubber (GSCHEM_TOPLEVEL *w_current)
* \par Function Description
*
*/
-void o_select_box_rubberband_xor(GSCHEM_TOPLEVEL *w_current)
+void o_select_box_draw_rubber (GSCHEM_TOPLEVEL *w_current)
{
TOPLEVEL *toplevel = w_current->toplevel;
int box_width, box_height, box_left, box_top;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs