[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-109-g11a2692)
The branch, master has been updated
via 11a2692a1ab8bcee14178286fd719d1ec39e6b9a (commit)
from 938cdb93795422fceb56ee3b88bffd1602f8cdf4 (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 | 12 ------------
gnetlist/src/globals.c | 15 ---------------
gschem/src/globals.c | 1 -
gsymcheck/src/globals.c | 12 ------------
libgeda/src/f_basic.c | 3 +++
libgeda/src/o_arc_basic.c | 3 +++
libgeda/src/o_basic.c | 3 +++
libgeda/src/o_box_basic.c | 3 +++
libgeda/src/o_bus_basic.c | 3 +++
libgeda/src/o_circle_basic.c | 3 +++
libgeda/src/o_complex_basic.c | 3 +++
libgeda/src/o_line_basic.c | 3 +++
libgeda/src/o_net_basic.c | 3 +++
libgeda/src/o_picture.c | 3 +++
libgeda/src/o_pin_basic.c | 3 +++
libgeda/src/o_text_basic.c | 3 +++
libgeda/src/s_log.c | 3 +++
utils/gschlas/globals.c | 12 ------------
18 files changed, 39 insertions(+), 52 deletions(-)
=================
Commit Messages
=================
commit 11a2692a1ab8bcee14178286fd719d1ec39e6b9a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Sat Aug 16 15:24:16 2008 +0100
Draw func cleanup.
Rather than having libgeda require other applications to provide the
*_draw_func symbols, libgeda should provide them itself. Other
applications should then override them as required near their call to
libgeda_init().
:100644 100644 6cf4bdb... 565ff66... M gattrib/src/globals.c
:100644 100644 36e270c... 97e3c35... M gnetlist/src/globals.c
:100644 100644 858468a... 1a489ef... M gschem/src/globals.c
:100644 100644 40819a4... 276dfd1... M gsymcheck/src/globals.c
:100644 100644 0127571... ac7f492... M libgeda/src/f_basic.c
:100644 100644 2da8ad5... fb34f8f... M libgeda/src/o_arc_basic.c
:100644 100644 d617165... f0d7fa5... M libgeda/src/o_basic.c
:100644 100644 b4ca8d8... b61fa8c... M libgeda/src/o_box_basic.c
:100644 100644 ece05e0... 3f92618... M libgeda/src/o_bus_basic.c
:100644 100644 43891b4... 7a6f31e... M libgeda/src/o_circle_basic.c
:100644 100644 1839742... 966a228... M libgeda/src/o_complex_basic.c
:100644 100644 dde4956... c97bf3b... M libgeda/src/o_line_basic.c
:100644 100644 6f62dce... caf49ac... M libgeda/src/o_net_basic.c
:100644 100644 a1b981b... faff205... M libgeda/src/o_picture.c
:100644 100644 f08584d... 65b47ea... M libgeda/src/o_pin_basic.c
:100644 100644 7ff723f... f0d1124... M libgeda/src/o_text_basic.c
:100644 100644 d28f3eb... 1ff475a... M libgeda/src/s_log.c
:100644 100644 d441517... 56f1756... M utils/gschlas/globals.c
=========
Changes
=========
commit 11a2692a1ab8bcee14178286fd719d1ec39e6b9a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Sat Aug 16 15:24:16 2008 +0100
Draw func cleanup.
Rather than having libgeda require other applications to provide the
*_draw_func symbols, libgeda should provide them itself. Other
applications should then override them as required near their call to
libgeda_init().
diff --git a/gattrib/src/globals.c b/gattrib/src/globals.c
index 6cf4bdb..565ff66 100644
--- a/gattrib/src/globals.c
+++ b/gattrib/src/globals.c
@@ -41,18 +41,6 @@ int quiet_mode=FALSE;
/* these are required by libgeda */
/* I have made most of these NULL because they aren't needed
* for gattrib -- no drawing is done. */
-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)() = s_toplevel_select_object;
-void (*x_log_update_func)() = NULL;
void (*variable_set_func)() = i_vars_set;
-int (*load_newer_backup_func)() = NULL;
diff --git a/gnetlist/src/globals.c b/gnetlist/src/globals.c
index 36e270c..97e3c35 100644
--- a/gnetlist/src/globals.c
+++ b/gnetlist/src/globals.c
@@ -45,21 +45,6 @@ int logfile_fd=-1;
int do_logging=TRUE;
int logging_dest=LOG_WINDOW;
-/* these are required by libgeda */
-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;
-
/* netlist specific variables */
NETLIST *netlist_head=NULL;
NETLIST *graphical_netlist_head=NULL; /* Special objects with
diff --git a/gschem/src/globals.c b/gschem/src/globals.c
index 858468a..1a489ef 100644
--- a/gschem/src/globals.c
+++ b/gschem/src/globals.c
@@ -66,7 +66,6 @@ void (*bus_draw_func)() = o_bus_draw;
void (*text_draw_func)() = o_text_draw;
void (*pin_draw_func)() = o_pin_draw;
void (*select_func)() = o_select_object; /* NEW SELECTION code */
-void (*x_log_update_func)() = NULL;
int (*load_newer_backup_func)() = x_fileselect_load_backup;
/* command line options */
diff --git a/gsymcheck/src/globals.c b/gsymcheck/src/globals.c
index 40819a4..276dfd1 100644
--- a/gsymcheck/src/globals.c
+++ b/gsymcheck/src/globals.c
@@ -44,19 +44,7 @@ int do_logging=TRUE;
int logging_dest=STDOUT_TTY;
/* these are required by libgeda */
-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;
/* command line arguments */
int verbose_mode=FALSE;
diff --git a/libgeda/src/f_basic.c b/libgeda/src/f_basic.c
index 0127571..ac7f492 100644
--- a/libgeda/src/f_basic.c
+++ b/libgeda/src/f_basic.c
@@ -45,6 +45,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for arc draw function. */
+int (*load_newer_backup_func)() = NULL;
+
/*! \brief Get the autosave filename for a file
* \par Function description
* Returns the expected autosave filename for the \a filename passed.
diff --git a/libgeda/src/o_arc_basic.c b/libgeda/src/o_arc_basic.c
index 2da8ad5..fb34f8f 100644
--- a/libgeda/src/o_arc_basic.c
+++ b/libgeda/src/o_arc_basic.c
@@ -28,6 +28,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for arc draw function. */
+void (*arc_draw_func)() = NULL;
+
/*! \brief
* \par Function Description
* The function creates a new object of type arc and links it
diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index d617165..f0d7fa5 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -33,6 +33,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for object selection function. */
+void (*select_func)() = NULL;
+
/* \todo
* Lots of Gross code... needs lots of cleanup
* mainly readability issues
diff --git a/libgeda/src/o_box_basic.c b/libgeda/src/o_box_basic.c
index b4ca8d8..b61fa8c 100644
--- a/libgeda/src/o_box_basic.c
+++ b/libgeda/src/o_box_basic.c
@@ -49,6 +49,9 @@
#define GET_BOX_TOP(w) \
min((w)->start_y, (w)->last_y);
+/*! Default setting for draw function. */
+void (*box_draw_func)() = NULL;
+
/*! \brief Create a BOX and add it to a list.
* \par Function Description
* This function creates a new object representing a box.
diff --git a/libgeda/src/o_bus_basic.c b/libgeda/src/o_bus_basic.c
index ece05e0..3f92618 100644
--- a/libgeda/src/o_bus_basic.c
+++ b/libgeda/src/o_bus_basic.c
@@ -31,6 +31,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for bus draw function. */
+void (*bus_draw_func)() = NULL;
+
/* \brief
* \par Function Description
*
diff --git a/libgeda/src/o_circle_basic.c b/libgeda/src/o_circle_basic.c
index 43891b4..7a6f31e 100644
--- a/libgeda/src/o_circle_basic.c
+++ b/libgeda/src/o_circle_basic.c
@@ -27,6 +27,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for circle draw function. */
+void (*circle_draw_func)() = NULL;
+
/*! \brief
* \par Function Description
*
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 1839742..966a228 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -34,6 +34,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for complex draw function. */
+void (*complex_draw_func)() = NULL;
+
/*! \brief Return the bounds of the given object.
* \par Given an object, calculate the bounds coordinates.
* \param [in] toplevel The toplevel structure.
diff --git a/libgeda/src/o_line_basic.c b/libgeda/src/o_line_basic.c
index dde4956..c97bf3b 100644
--- a/libgeda/src/o_line_basic.c
+++ b/libgeda/src/o_line_basic.c
@@ -28,6 +28,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for line draw function. */
+void (*line_draw_func)() = NULL;
+
/*! \brief Create and add line OBJECT to list.
* \par Function Description
* This function creates a new object representing a line.
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index 6f62dce..caf49ac 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -28,6 +28,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for net draw function. */
+void (*net_draw_func)() = NULL;
+
/*! \todo Finish function documentation!!!
* \brief
* \par Function Description
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index a1b981b..faff205 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -40,6 +40,9 @@
#include "libgeda_priv.h"
+/*! Default setting for picture draw function. */
+void (*picture_draw_func)() = NULL;
+
/*! \brief Create picture OBJECT from character string.
* \par Function Description
* This function will get the description of a picture from the
diff --git a/libgeda/src/o_pin_basic.c b/libgeda/src/o_pin_basic.c
index f08584d..65b47ea 100644
--- a/libgeda/src/o_pin_basic.c
+++ b/libgeda/src/o_pin_basic.c
@@ -28,6 +28,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for pin draw function. */
+void (*pin_draw_func)() = NULL;
+
/*! \todo Finish function documentation!!!
* \brief
* \par Function Description
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 7ff723f..f0d1124 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -35,6 +35,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for text draw function. */
+void (*text_draw_func)() = NULL;
+
#define WINONLY 1
#define BACKING 2
diff --git a/libgeda/src/s_log.c b/libgeda/src/s_log.c
index d28f3eb..1ff475a 100644
--- a/libgeda/src/s_log.c
+++ b/libgeda/src/s_log.c
@@ -46,6 +46,9 @@
#include <dmalloc.h>
#endif
+/*! Default setting for log update callback function. */
+void (*x_log_update_func)() = NULL;
+
#define CATCH_LOG_LEVELS (G_LOG_LEVEL_MASK ^ \
(G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO))
#define PRINT_LOG_LEVELS (CATCH_LOG_LEVELS ^ \
diff --git a/utils/gschlas/globals.c b/utils/gschlas/globals.c
index d441517..56f1756 100644
--- a/utils/gschlas/globals.c
+++ b/utils/gschlas/globals.c
@@ -48,19 +48,7 @@ int do_logging=TRUE;
int logging_dest=LOG_WINDOW;
/* these are required by libgeda */
-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;
/* this is just a dummy function, so that compoments are saved properly */
void
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs