[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-102-g675738b)
The branch, master has been updated
via 675738b3b7a0c37e3511297040c3abc59619dd0c (commit)
via 723e8d1c735b27f2bfc39dec296464bb8d5b2020 (commit)
via 8f1a084c1e26cc08cdab08a1c44e7e802cbdbec8 (commit)
via 3c4ccd08c2f08e37cd7b3894a073e2ae4787420a (commit)
from 4c15bbcf06a1840b410f33645d658322c5a38253 (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
=========
gattrib/src/globals.c | 2 +-
gnetlist/src/globals.c | 20 ++++++++++----------
gschem/src/o_arc.c | 4 ++--
gschem/src/o_box.c | 4 ++--
gschem/src/o_circle.c | 4 ++--
gschem/src/o_misc.c | 8 ++++----
gschem/src/o_move.c | 4 ++--
gschem/src/o_net.c | 8 ++++----
gschem/src/o_picture.c | 4 ++--
gsymcheck/src/globals.c | 20 ++++++++++----------
libgeda/include/prototype.h | 20 --------------------
libgeda/include/prototype_priv.h | 20 ++++++++++++++++++++
libgeda/src/f_basic.c | 1 -
utils/gschlas/globals.c | 20 ++++++++++----------
14 files changed, 69 insertions(+), 70 deletions(-)
=================
Commit Messages
=================
commit 675738b3b7a0c37e3511297040c3abc59619dd0c
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Thu Aug 14 23:27:12 2008 +0100
libgeda: Hide o_*_recalc() from public API.
Applications which wish to force recalculation of an OBJECT's bounds
should use o_recalc_single_object().
:100644 100644 8bde0b9... 2e94add... M gschem/src/o_misc.c
:100644 100644 fe3038d... 8f7c7d2... M gschem/src/o_move.c
:100644 100644 d08cb54... 37e376a... M gschem/src/o_net.c
:100644 100644 6697fd4... 0bdaec9... M libgeda/include/prototype.h
:100644 100644 b6e68b2... 9e1de65... M libgeda/include/prototype_priv.h
commit 723e8d1c735b27f2bfc39dec296464bb8d5b2020
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Thu Aug 14 23:27:12 2008 +0100
Don't register recalc funcs as draw funcs.
Some applications which don't draw schematics set the draw funcs to be
the recalc funcs. This is silly.
:100644 100644 390a60f... 6cf4bdb... M gattrib/src/globals.c
:100644 100644 0f8782a... 36e270c... M gnetlist/src/globals.c
:100644 100644 1baeaf7... 40819a4... M gsymcheck/src/globals.c
:100644 100644 005a711... d441517... M utils/gschlas/globals.c
commit 8f1a084c1e26cc08cdab08a1c44e7e802cbdbec8
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Thu Aug 14 23:27:12 2008 +0100
libgeda: Hide world_get_*_bounds() from public API.
Applications which wish to retrieve an OBJECT's bounds should use
world_get_single_object_bounds().
:100644 100644 dc38c43... 580b1ad... M gschem/src/o_arc.c
:100644 100644 c6909cc... b2d95c4... M gschem/src/o_box.c
:100644 100644 798bd57... 9ad3735... M gschem/src/o_circle.c
:100644 100644 24b9653... 312724d... M gschem/src/o_picture.c
:100644 100644 74ba621... 6697fd4... M libgeda/include/prototype.h
:100644 100644 3563338... b6e68b2... M libgeda/include/prototype_priv.h
commit 3c4ccd08c2f08e37cd7b3894a073e2ae4787420a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Thu Aug 14 23:27:11 2008 +0100
libgeda: Fix unused variable warning.
Left over from 7fcd7db7e5b191a0d5024b129ee2c1cda64a82d7.
:100644 100644 0563f8c... 0127571... M libgeda/src/f_basic.c
=========
Changes
=========
commit 675738b3b7a0c37e3511297040c3abc59619dd0c
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Thu Aug 14 23:27:12 2008 +0100
libgeda: Hide o_*_recalc() from public API.
Applications which wish to force recalculation of an OBJECT's bounds
should use o_recalc_single_object().
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 8bde0b9..2e94add 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -460,13 +460,13 @@ void o_edit_show_hidden_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *o_list)
if (o_current->text->prim_objs == NULL) {
o_text_recreate(toplevel, o_current);
}
- o_text_recalc(toplevel, o_current);
+ o_recalc_single_object(toplevel, o_current);
o_text_draw(w_current, o_current);
} else {
/* object is hidden and we are now NOT drawing it, so */
/* get rid of the extra primitive data */
o_text_recreate(toplevel, o_current);
- o_text_recalc(toplevel, o_current);
+ o_recalc_single_object(toplevel, o_current);
/* unfortunately, you cannot erase the old visible text here */
/* because o_text_draw will just return */
}
@@ -474,7 +474,7 @@ void o_edit_show_hidden_lowlevel(GSCHEM_TOPLEVEL *w_current, OBJECT *o_list)
if (o_current->type == OBJ_COMPLEX || o_current->type == OBJ_PLACEHOLDER) {
o_edit_show_hidden_lowlevel(w_current, o_current->complex->prim_objs);
- o_complex_recalc(toplevel, o_current);
+ o_recalc_single_object(toplevel, o_current);
}
o_current = o_current->next;
@@ -836,7 +836,7 @@ void o_update_component(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
o_attrib_slot_update(toplevel, o_current);
/* Recalculate the bounds of the object */
- o_complex_recalc(toplevel, o_current);
+ o_recalc_single_object(toplevel, o_current);
/* reconnect, re-select and redraw */
s_conn_update_complex (toplevel, o_current->complex->prim_objs);
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index fe3038d..8f7c7d2 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -550,7 +550,7 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
if (o_move_zero_length(object)) {
o_delete(w_current, object);
} else {
- o_net_recalc(toplevel, object);
+ o_recalc_single_object(toplevel, object);
s_tile_update_object(toplevel, object);
s_conn_update_object(toplevel, object);
*connected_objects =
@@ -592,7 +592,7 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
if (o_move_zero_length(object)) {
o_delete(w_current, object);
} else {
- o_bus_recalc(toplevel, object);
+ o_recalc_single_object(toplevel, object);
s_tile_update_object(toplevel, object);
s_conn_update_object(toplevel, object);
*connected_objects =
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index d08cb54..37e376a 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -1204,7 +1204,7 @@ int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
}
net_obj->line->y[found_conn->whichone] -= ripper_size;
- o_net_recalc(toplevel, net_obj);
+ o_recalc_single_object(toplevel, net_obj);
rippers[ripper_count].x[0] =
net_obj->line->x[found_conn->whichone];
rippers[ripper_count].y[0] =
@@ -1241,7 +1241,7 @@ int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
}
net_obj->line->y[found_conn->whichone] += ripper_size;
- o_net_recalc(toplevel, net_obj);
+ o_recalc_single_object(toplevel, net_obj);
rippers[ripper_count].x[0] =
net_obj->line->x[found_conn->whichone];
rippers[ripper_count].y[0] =
@@ -1312,7 +1312,7 @@ int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
}
net_obj->line->x[found_conn->whichone] -= ripper_size;
- o_net_recalc(toplevel, net_obj);
+ o_recalc_single_object(toplevel, net_obj);
rippers[ripper_count].x[0] =
net_obj->line->x[found_conn->whichone];
rippers[ripper_count].y[0] =
@@ -1348,7 +1348,7 @@ int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
}
net_obj->line->x[found_conn->whichone] += ripper_size;
- o_net_recalc(toplevel, net_obj);
+ o_recalc_single_object(toplevel, net_obj);
rippers[ripper_count].x[0] =
net_obj->line->x[found_conn->whichone];
rippers[ripper_count].y[0] =
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 6697fd4..0bdaec9 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -95,7 +95,6 @@ void o_arc_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichone
void o_arc_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_arc_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_arc_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
-void o_arc_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_attrib.c */
ATTRIB *o_attrib_search(GList *list, OBJECT *item);
@@ -147,11 +146,9 @@ void o_box_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichone
void o_box_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_box_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_box_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
-void o_box_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_bus_basic.c */
OBJECT *o_bus_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2, int bus_ripper_direction);
-void o_bus_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_bus_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_bus_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_bus_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
@@ -170,7 +167,6 @@ void o_circle_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int which
void o_circle_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_circle_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_circle_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
-void o_circle_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_complex_basic.c */
int world_get_single_object_bounds(TOPLEVEL *toplevel, OBJECT *o_current,
@@ -190,7 +186,6 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
const CLibSymbol *clib_sym, const gchar *basename,
int selectable, int attribute_promotion);
OBJECT *o_complex_add_embedded(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x, int y, int angle, int mirror, const gchar *basename, int selectable);
-void o_complex_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_complex_set_filename(TOPLEVEL *toplevel, const char *basename);
void o_complex_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_complex_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
@@ -219,7 +214,6 @@ void o_line_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichon
void o_line_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_line_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_line_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
-void o_line_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_line_scale_world(TOPLEVEL *toplevel, int x_scale, int y_scale, OBJECT *object);
int o_line_visible(TOPLEVEL *toplevel, LINE *line, int *x1, int *y1, int *x2, int *y2);
double o_line_length(OBJECT *object);
@@ -240,7 +234,6 @@ void o_glist_mirror_world(TOPLEVEL *toplevel, int x, int y, GList *list);
/* o_net_basic.c */
OBJECT *o_net_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2);
-void o_net_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_net_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_net_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_net_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
@@ -258,7 +251,6 @@ OBJECT *o_picture_add(TOPLEVEL *toplevel, OBJECT *list_tail, GdkPixbuf *pixbuf,
double ratio, char type,
int x1, int y1, int x2, int y2, int angle, char mirrored,
char embedded);
-void o_picture_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_picture_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichone);
void o_picture_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle,OBJECT *object);
void o_picture_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
@@ -272,7 +264,6 @@ GdkPixbuf *o_picture_pixbuf_from_buffer (gchar *file_content, gsize file_length,
/* o_pin_basic.c */
OBJECT *o_pin_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2, int pin_type, int whichend);
-void o_pin_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_pin_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
OBJECT *o_pin_copy(TOPLEVEL *toplevel, OBJECT *list_tail, OBJECT *o_current);
void o_pin_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
@@ -298,7 +289,6 @@ int o_text_height(char *string, int size);
int o_text_width(TOPLEVEL *toplevel, char *string, int size);
OBJECT *o_text_create_string(TOPLEVEL *toplevel, OBJECT *object_list, char *string, int size, int color, int x, int y, int alignment, int angle);
OBJECT *o_text_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x, int y, int alignment, int angle, char *string, int size, int visibility, int show_name_value);
-void o_text_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_text_set_info_font(char buf[]);
void o_text_recreate(TOPLEVEL *toplevel, OBJECT *o_current);
void o_text_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *o_current);
diff --git a/libgeda/include/prototype_priv.h b/libgeda/include/prototype_priv.h
index b6e68b2..9e1de65 100644
--- a/libgeda/include/prototype_priv.h
+++ b/libgeda/include/prototype_priv.h
@@ -64,6 +64,7 @@ void o_arc_print_phantom(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius,
gdouble o_arc_shortest_distance(ARC *arc, gint x, gint y);
gboolean o_arc_within_sweep(ARC *arc, gint x, gint y);
void world_get_arc_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
+void o_arc_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_attrib.c */
OBJECT *o_read_attribs(TOPLEVEL *toplevel,
@@ -87,12 +88,14 @@ void o_box_print_mesh(TOPLEVEL *toplevel, FILE *fp, int x, int y, int width, int
void o_box_print_hatch(TOPLEVEL *toplevel, FILE *fp, int x, int y, int width, int height, int color, int fill_width, int angle1, int pitch1, int angle2, int pitch2, int origin_x, int origin_y);
gdouble o_box_shortest_distance(BOX *box, gint x, gint y);
void world_get_box_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
+void o_box_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_bus_basic.c */
OBJECT *o_bus_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
char *o_bus_save(OBJECT *object);
void o_bus_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
void world_get_bus_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
+void o_bus_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_circle_basic.c */
OBJECT *o_circle_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
@@ -108,12 +111,14 @@ void o_circle_print_mesh(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius,
void o_circle_print_hatch(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius, int color, int fill_width, int angle1, int pitch1, int angle2, int pitch2, int origin_x, int origin_y);
gdouble o_circle_shortest_distance(CIRCLE *circle, gint x, gint y);
void world_get_circle_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
+void o_circle_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_complex_basic.c */
OBJECT *o_complex_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
char *o_complex_save(OBJECT *object);
gdouble o_complex_shortest_distance(COMPLEX *complex, gint x, gint y);
void world_get_complex_bounds(TOPLEVEL *toplevel, OBJECT *complex, int *left, int *top, int *right, int *bottom);
+void o_complex_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_line_basic.c */
OBJECT *o_line_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
@@ -126,12 +131,14 @@ void o_line_print_center(TOPLEVEL *toplevel, FILE *fp, int x1, int y1, int x2, i
void o_line_print_phantom(TOPLEVEL *toplevel, FILE *fp, int x1, int y1, int x2, int y2, int color, int line_width, int length, int space, int origin_x, int origin_y);
gdouble o_line_shortest_distance(LINE *line, gint x, gint y);
void world_get_line_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
+void o_line_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_net_basic.c */
OBJECT *o_net_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
char *o_net_save(OBJECT *object);
void o_net_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
void world_get_net_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
+void o_net_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_picture.c */
OBJECT *o_picture_read(TOPLEVEL *toplevel, OBJECT *object_list,
@@ -144,12 +151,14 @@ void o_picture_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
int origin_x, int origin_y);
gdouble o_picture_shortest_distance(PICTURE *picture, gint x, gint y);
void world_get_picture_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
+void o_picture_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_pin_basic.c */
OBJECT *o_pin_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
char *o_pin_save(OBJECT *object);
void o_pin_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
void world_get_pin_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
+void o_pin_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* o_text_basic.c */
OBJECT *o_text_read(TOPLEVEL *toplevel,
@@ -166,6 +175,7 @@ void o_text_print_text_string(FILE *fp, char *string, int unicode_count, gunicha
void o_text_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current, int origin_x, int origin_y, int unicode_count, gunichar *unicode_table);
gdouble o_text_shortest_distance(TEXT *text, gint x, gint y);
int world_get_text_bounds(TOPLEVEL *toplevel, OBJECT *o_current, int *left, int *top, int *right, int *bottom);
+void o_text_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
/* s_clib.c */
void s_clib_init (void);
commit 723e8d1c735b27f2bfc39dec296464bb8d5b2020
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Thu Aug 14 23:27:12 2008 +0100
Don't register recalc funcs as draw funcs.
Some applications which don't draw schematics set the draw funcs to be
the recalc funcs. This is silly.
diff --git a/gattrib/src/globals.c b/gattrib/src/globals.c
index 390a60f..6cf4bdb 100644
--- a/gattrib/src/globals.c
+++ b/gattrib/src/globals.c
@@ -43,7 +43,7 @@ int quiet_mode=FALSE;
* for gattrib -- no drawing is done. */
void (*arc_draw_func)() = NULL;
void (*box_draw_func)() = NULL;
-void (*picture_draw_func)() = o_picture_recalc;
+void (*picture_draw_func)() = NULL;
void (*circle_draw_func)() = NULL;
void (*complex_draw_func)() = NULL;
void (*line_draw_func)() = NULL;
diff --git a/gnetlist/src/globals.c b/gnetlist/src/globals.c
index 0f8782a..36e270c 100644
--- a/gnetlist/src/globals.c
+++ b/gnetlist/src/globals.c
@@ -46,16 +46,16 @@ int do_logging=TRUE;
int logging_dest=LOG_WINDOW;
/* these are required by libgeda */
-void (*arc_draw_func)() = o_arc_recalc;
-void (*box_draw_func)() = o_box_recalc;
-void (*picture_draw_func)() = o_picture_recalc;
-void (*circle_draw_func)() = o_circle_recalc;
-void (*complex_draw_func)() = o_complex_recalc;
-void (*line_draw_func)() = o_line_recalc;
-void (*net_draw_func)() = o_net_recalc;
-void (*bus_draw_func)() = o_bus_recalc;
-void (*text_draw_func)() = o_text_recalc;
-void (*pin_draw_func)() = o_pin_recalc;
+void (*arc_draw_func)() = NULL;
+void (*box_draw_func)() = NULL;
+void (*picture_draw_func)() = NULL;
+void (*circle_draw_func)() = NULL;
+void (*complex_draw_func)() = NULL;
+void (*line_draw_func)() = NULL;
+void (*net_draw_func)() = NULL;
+void (*bus_draw_func)() = NULL;
+void (*text_draw_func)() = NULL;
+void (*pin_draw_func)() = NULL;
void (*select_func)() = NULL;
void (*x_log_update_func)() = NULL;
int (*load_newer_backup_func)() = NULL;
diff --git a/gsymcheck/src/globals.c b/gsymcheck/src/globals.c
index 1baeaf7..40819a4 100644
--- a/gsymcheck/src/globals.c
+++ b/gsymcheck/src/globals.c
@@ -44,16 +44,16 @@ int do_logging=TRUE;
int logging_dest=STDOUT_TTY;
/* these are required by libgeda */
-void (*arc_draw_func)() = o_arc_recalc;
-void (*box_draw_func)() = o_box_recalc;
-void (*picture_draw_func)() = o_picture_recalc;
-void (*circle_draw_func)() = o_circle_recalc;
-void (*complex_draw_func)() = o_complex_recalc;
-void (*line_draw_func)() = o_line_recalc;
-void (*net_draw_func)() = o_net_recalc;
-void (*text_draw_func)() = o_text_recalc;
-void (*bus_draw_func)() = o_bus_recalc;
-void (*pin_draw_func)() = o_pin_recalc;
+void (*arc_draw_func)() = NULL;
+void (*box_draw_func)() = NULL;
+void (*picture_draw_func)() = NULL;
+void (*circle_draw_func)() = NULL;
+void (*complex_draw_func)() = NULL;
+void (*line_draw_func)() = NULL;
+void (*net_draw_func)() = NULL;
+void (*text_draw_func)() = NULL;
+void (*bus_draw_func)() = NULL;
+void (*pin_draw_func)() = NULL;
void (*select_func)() = NULL;
void (*x_log_update_func)() = s_log_update;
int (*load_newer_backup_func)() = NULL;
diff --git a/utils/gschlas/globals.c b/utils/gschlas/globals.c
index 005a711..d441517 100644
--- a/utils/gschlas/globals.c
+++ b/utils/gschlas/globals.c
@@ -48,16 +48,16 @@ int do_logging=TRUE;
int logging_dest=LOG_WINDOW;
/* these are required by libgeda */
-void (*arc_draw_func)() = o_arc_recalc;
-void (*box_draw_func)() = o_box_recalc;
-void (*picture_draw_func)() = o_picture_recalc;
-void (*circle_draw_func)() = o_circle_recalc;
-void (*complex_draw_func)() = o_complex_recalc;
-void (*line_draw_func)() = o_line_recalc;
-void (*net_draw_func)() = o_net_recalc;
-void (*bus_draw_func)() = o_bus_recalc;
-void (*text_draw_func)() = o_text_recalc;
-void (*pin_draw_func)() = o_pin_recalc;
+void (*arc_draw_func)() = NULL;
+void (*box_draw_func)() = NULL;
+void (*picture_draw_func)() = NULL;
+void (*circle_draw_func)() = NULL;
+void (*complex_draw_func)() = NULL;
+void (*line_draw_func)() = NULL;
+void (*net_draw_func)() = NULL;
+void (*bus_draw_func)() = NULL;
+void (*text_draw_func)() = NULL;
+void (*pin_draw_func)() = NULL;
void (*select_func)() = o_select_dummy;
void (*x_log_update_func)() = NULL;
int (*load_newer_backup_func)() = NULL;
commit 8f1a084c1e26cc08cdab08a1c44e7e802cbdbec8
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Thu Aug 14 23:27:12 2008 +0100
libgeda: Hide world_get_*_bounds() from public API.
Applications which wish to retrieve an OBJECT's bounds should use
world_get_single_object_bounds().
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index dc38c43..580b1ad 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -65,8 +65,8 @@ void o_arc_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
return;
}
- world_get_arc_bounds(toplevel, o_current,
- &wleft, &wtop, &wright, &wbottom);
+ world_get_single_object_bounds(toplevel, o_current,
+ &wleft, &wtop, &wright, &wbottom);
if ( (toplevel->DONT_REDRAW == 1) ||
(!visible(toplevel, wleft, wtop, wright, wbottom)) ) {
diff --git a/gschem/src/o_box.c b/gschem/src/o_box.c
index c6909cc..b2d95c4 100644
--- a/gschem/src/o_box.c
+++ b/gschem/src/o_box.c
@@ -81,8 +81,8 @@ void o_box_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
/* Get read to check for visibility of this line by using it's
* bounding box */
- world_get_box_bounds(toplevel, o_current,
- &wleft, &wtop, &wright, &wbottom);
+ world_get_single_object_bounds(toplevel, o_current,
+ &wleft, &wtop, &wright, &wbottom);
if ( (toplevel->DONT_REDRAW == 1) ||
(!visible(toplevel, wleft, wtop, wright, wbottom)) ) {
diff --git a/gschem/src/o_circle.c b/gschem/src/o_circle.c
index 798bd57..9ad3735 100644
--- a/gschem/src/o_circle.c
+++ b/gschem/src/o_circle.c
@@ -76,8 +76,8 @@ void o_circle_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
* Get read to check for visibility of this line by using it's
* bounding box
*/
- world_get_circle_bounds(toplevel, o_current,
- &wleft, &wtop, &wright, &wbottom);
+ world_get_single_object_bounds(toplevel, o_current,
+ &wleft, &wtop, &wright, &wbottom);
if ( (toplevel->DONT_REDRAW == 1) ||
(!visible(toplevel, wleft, wtop, wright, wbottom)) ) {
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index 24b9653..312724d 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -330,8 +330,8 @@ void o_picture_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
/* Get read to check for visibility of this line by using it's
* bounding picture
*/
- world_get_picture_bounds(toplevel, o_current,
- &wleft, &wtop, &wright, &wbottom);
+ world_get_single_object_bounds(toplevel, o_current,
+ &wleft, &wtop, &wright, &wbottom);
if (!visible(toplevel, wleft, wtop, wright, wbottom)) {
return;
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 74ba621..6697fd4 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -96,7 +96,6 @@ void o_arc_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_arc_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_arc_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
void o_arc_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
-void world_get_arc_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_attrib.c */
ATTRIB *o_attrib_search(GList *list, OBJECT *item);
@@ -149,10 +148,8 @@ void o_box_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_box_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_box_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
void o_box_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
-void world_get_box_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_bus_basic.c */
-void world_get_bus_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_bus_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2, int bus_ripper_direction);
void o_bus_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_bus_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
@@ -174,7 +171,6 @@ void o_circle_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object
void o_circle_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_circle_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
void o_circle_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
-void world_get_circle_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_complex_basic.c */
int world_get_single_object_bounds(TOPLEVEL *toplevel, OBJECT *o_current,
@@ -185,7 +181,6 @@ int world_get_object_list_bounds(TOPLEVEL *toplevel, OBJECT *complex,
int world_get_object_glist_bounds(TOPLEVEL *toplevel, GList *o_list,
int *left, int *top,
int *right, int *bottom);
-void world_get_complex_bounds(TOPLEVEL *toplevel, OBJECT *complex, int *left, int *top, int *right, int *bottom);
OBJECT *add_head(void);
int o_complex_is_eligible_attribute(TOPLEVEL *toplevel, OBJECT *object, int promote_invisible);
int o_complex_is_embedded(OBJECT *o_current);
@@ -225,7 +220,6 @@ void o_line_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
void o_line_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle, OBJECT *object);
void o_line_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
void o_line_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
-void world_get_line_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
void o_line_scale_world(TOPLEVEL *toplevel, int x_scale, int y_scale, OBJECT *object);
int o_line_visible(TOPLEVEL *toplevel, LINE *line, int *x1, int *y1, int *x2, int *y2);
double o_line_length(OBJECT *object);
@@ -245,7 +239,6 @@ void o_list_mirror_world(TOPLEVEL *toplevel, int x, int y, OBJECT *list);
void o_glist_mirror_world(TOPLEVEL *toplevel, int x, int y, GList *list);
/* o_net_basic.c */
-void world_get_net_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_net_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2);
void o_net_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_net_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
@@ -266,7 +259,6 @@ OBJECT *o_picture_add(TOPLEVEL *toplevel, OBJECT *list_tail, GdkPixbuf *pixbuf,
int x1, int y1, int x2, int y2, int angle, char mirrored,
char embedded);
void o_picture_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
-void world_get_picture_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
void o_picture_modify(TOPLEVEL *toplevel, OBJECT *object, int x, int y, int whichone);
void o_picture_rotate_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, int angle,OBJECT *object);
void o_picture_mirror_world(TOPLEVEL *toplevel, int world_centerx, int world_centery, OBJECT *object);
@@ -279,7 +271,6 @@ void o_picture_unembed(TOPLEVEL *toplevel, OBJECT *object);
GdkPixbuf *o_picture_pixbuf_from_buffer (gchar *file_content, gsize file_length, GError **err);
/* o_pin_basic.c */
-void world_get_pin_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
OBJECT *o_pin_add(TOPLEVEL *toplevel, OBJECT *object_list, char type, int color, int x1, int y1, int x2, int y2, int pin_type, int whichend);
void o_pin_recalc(TOPLEVEL *toplevel, OBJECT *o_current);
void o_pin_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *object);
@@ -298,7 +289,6 @@ void o_selection_select(OBJECT *object, int color); /* DEPRECATED */
void o_selection_unselect(OBJECT *object); /* DEPRECATED */
/* o_text_basic.c */
-int world_get_text_bounds(TOPLEVEL *toplevel, OBJECT *o_current, int *left, int *top, int *right, int *bottom);
OBJECT *o_text_add_head(void);
void o_text_init(void);
void o_text_print_set(void);
diff --git a/libgeda/include/prototype_priv.h b/libgeda/include/prototype_priv.h
index 3563338..b6e68b2 100644
--- a/libgeda/include/prototype_priv.h
+++ b/libgeda/include/prototype_priv.h
@@ -63,6 +63,7 @@ void o_arc_print_center(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius,
void o_arc_print_phantom(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius, int angle1, int angle2, int color, int arc_width, int length, int space, int origin_x, int origin_y);
gdouble o_arc_shortest_distance(ARC *arc, gint x, gint y);
gboolean o_arc_within_sweep(ARC *arc, gint x, gint y);
+void world_get_arc_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_attrib.c */
OBJECT *o_read_attribs(TOPLEVEL *toplevel,
@@ -85,11 +86,13 @@ void o_box_print_filled(TOPLEVEL *toplevel, FILE *fp, int x, int y, int width, i
void o_box_print_mesh(TOPLEVEL *toplevel, FILE *fp, int x, int y, int width, int height, int color, int fill_width, int angle1, int pitch1, int angle2, int pitch2, int origin_x, int origin_y);
void o_box_print_hatch(TOPLEVEL *toplevel, FILE *fp, int x, int y, int width, int height, int color, int fill_width, int angle1, int pitch1, int angle2, int pitch2, int origin_x, int origin_y);
gdouble o_box_shortest_distance(BOX *box, gint x, gint y);
+void world_get_box_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_bus_basic.c */
OBJECT *o_bus_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
char *o_bus_save(OBJECT *object);
void o_bus_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
+void world_get_bus_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_circle_basic.c */
OBJECT *o_circle_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
@@ -104,11 +107,13 @@ void o_circle_print_filled(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radiu
void o_circle_print_mesh(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius, int color, int fill_width, int angle1, int pitch1, int angle2, int pitch2, int origin_x, int origin_y);
void o_circle_print_hatch(TOPLEVEL *toplevel, FILE *fp, int x, int y, int radius, int color, int fill_width, int angle1, int pitch1, int angle2, int pitch2, int origin_x, int origin_y);
gdouble o_circle_shortest_distance(CIRCLE *circle, gint x, gint y);
+void world_get_circle_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_complex_basic.c */
OBJECT *o_complex_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
char *o_complex_save(OBJECT *object);
gdouble o_complex_shortest_distance(COMPLEX *complex, gint x, gint y);
+void world_get_complex_bounds(TOPLEVEL *toplevel, OBJECT *complex, int *left, int *top, int *right, int *bottom);
/* o_line_basic.c */
OBJECT *o_line_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
@@ -120,11 +125,13 @@ void o_line_print_dashed(TOPLEVEL *toplevel, FILE *fp, int x1, int y1, int x2, i
void o_line_print_center(TOPLEVEL *toplevel, FILE *fp, int x1, int y1, int x2, int y2, int color, int line_width, int length, int space, int origin_x, int origin_y);
void o_line_print_phantom(TOPLEVEL *toplevel, FILE *fp, int x1, int y1, int x2, int y2, int color, int line_width, int length, int space, int origin_x, int origin_y);
gdouble o_line_shortest_distance(LINE *line, gint x, gint y);
+void world_get_line_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_net_basic.c */
OBJECT *o_net_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
char *o_net_save(OBJECT *object);
void o_net_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
+void world_get_net_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_picture.c */
OBJECT *o_picture_read(TOPLEVEL *toplevel, OBJECT *object_list,
@@ -136,11 +143,13 @@ char *o_picture_save(OBJECT *object);
void o_picture_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
int origin_x, int origin_y);
gdouble o_picture_shortest_distance(PICTURE *picture, gint x, gint y);
+void world_get_picture_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_pin_basic.c */
OBJECT *o_pin_read(TOPLEVEL *toplevel, OBJECT *object_list, char buf[], unsigned int release_ver, unsigned int fileformat_ver);
char *o_pin_save(OBJECT *object);
void o_pin_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current, int origin_x, int origin_y);
+void world_get_pin_bounds(TOPLEVEL *toplevel, OBJECT *object, int *left, int *top, int *right, int *bottom);
/* o_text_basic.c */
OBJECT *o_text_read(TOPLEVEL *toplevel,
@@ -156,6 +165,7 @@ void o_text_print_text_height_full(FILE *fp, char *string, int size);
void o_text_print_text_string(FILE *fp, char *string, int unicode_count, gunichar *unicode_table);
void o_text_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current, int origin_x, int origin_y, int unicode_count, gunichar *unicode_table);
gdouble o_text_shortest_distance(TEXT *text, gint x, gint y);
+int world_get_text_bounds(TOPLEVEL *toplevel, OBJECT *o_current, int *left, int *top, int *right, int *bottom);
/* s_clib.c */
void s_clib_init (void);
commit 3c4ccd08c2f08e37cd7b3894a073e2ae4787420a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Thu Aug 14 23:27:11 2008 +0100
libgeda: Fix unused variable warning.
Left over from 7fcd7db7e5b191a0d5024b129ee2c1cda64a82d7.
diff --git a/libgeda/src/f_basic.c b/libgeda/src/f_basic.c
index 0563f8c..0127571 100644
--- a/libgeda/src/f_basic.c
+++ b/libgeda/src/f_basic.c
@@ -647,7 +647,6 @@ char *follow_symlinks (const gchar *filename, GError **err)
*/
if (!g_path_is_absolute(linkname)) {
- gchar *slashpos = strrchr (followed_filename, G_DIR_SEPARATOR);
gchar *dirname = NULL;
gchar *tmp = NULL;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs