gpredict-svn Mailing List for Gpredict (Page 37)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn — Subversion commit archive for Gpredict.
You can subscribe to this list here.
| 2008 |
Jan
(24) |
Feb
|
Mar
(6) |
Apr
(14) |
May
(9) |
Jun
|
Jul
|
Aug
(25) |
Sep
(60) |
Oct
(26) |
Nov
|
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
(2) |
Mar
(22) |
Apr
(61) |
May
(57) |
Jun
|
Jul
(3) |
Aug
(83) |
Sep
(35) |
Oct
(50) |
Nov
(28) |
Dec
(34) |
| 2010 |
Jan
(29) |
Feb
(15) |
Mar
(2) |
Apr
|
May
(6) |
Jun
(2) |
Jul
(24) |
Aug
(2) |
Sep
(9) |
Oct
(43) |
Nov
(22) |
Dec
(6) |
| 2011 |
Jan
(24) |
Feb
(22) |
Mar
(31) |
Apr
(13) |
May
(10) |
Jun
(10) |
Jul
(43) |
Aug
(12) |
Sep
(18) |
Oct
(33) |
Nov
(18) |
Dec
(4) |
|
From: <cs...@us...> - 2008-08-22 08:46:03
|
Revision: 58
http://gpredict.svn.sourceforge.net/gpredict/?rev=58&view=rev
Author: csete
Date: 2008-08-22 08:46:10 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Removed unnecessary columns.
Modified Paths:
--------------
trunk/src/sat-pref-rig-data.h
trunk/src/sat-pref-rot-data.h
Modified: trunk/src/sat-pref-rig-data.h
===================================================================
--- trunk/src/sat-pref-rig-data.h 2008-08-20 14:36:00 UTC (rev 57)
+++ trunk/src/sat-pref-rig-data.h 2008-08-22 08:46:10 UTC (rev 58)
@@ -31,15 +31,7 @@
/** \brief Coumn definitions for radio list. */
typedef enum {
RIG_LIST_COL_NAME = 0, /*!< File name. */
- RIG_LIST_COL_MODEL, /*!< Model, e.g. FT-847. */
- RIG_LIST_COL_ID, /*!< Hamlib ID. */
- RIG_LIST_COL_TYPE, /*!< Radio type (RX, TX, TRX, FULL_DUP. */
- RIG_LIST_COL_PORT, /*!< Port / Device, e.g. /dev/ttyS0. */
- RIG_LIST_COL_SPEED, /*!< Serial speed. */
- RIG_LIST_COL_CIV, /*!< CI-V address for Icom rigs. */
- RIG_LIST_COL_EXT, /*!< Use built-in extensions. */
- RIG_LIST_COL_DTR, /*!< DTR line usage */
- RIG_LIST_COL_RTS, /*!< RTS line usage */
+ RIG_LIST_COL_HOST, /*!< Hostname, e.g. localhost:12000 */
RIG_LIST_COL_NUM /*!< The number of fields in the list. */
} rig_list_col_t;
Modified: trunk/src/sat-pref-rot-data.h
===================================================================
--- trunk/src/sat-pref-rot-data.h 2008-08-20 14:36:00 UTC (rev 57)
+++ trunk/src/sat-pref-rot-data.h 2008-08-22 08:46:10 UTC (rev 58)
@@ -31,15 +31,7 @@
/** \brief Coumn definitions for rotator list. */
typedef enum {
ROT_LIST_COL_NAME = 0, /*!< File name. */
- ROT_LIST_COL_MODEL, /*!< Model */
- ROT_LIST_COL_ID, /*!< Hamlib ID. */
- ROT_LIST_COL_TYPE, /*!< Rtator type. */
- ROT_LIST_COL_PORT, /*!< Port / Device, e.g. /dev/ttyS0. */
- ROT_LIST_COL_SPEED, /*!< Serial speed. */
- ROT_LIST_COL_MINAZ, /*!< Lower azimuth limit. */
- ROT_LIST_COL_MAXAZ, /*!< Upper azimuth limit. */
- ROT_LIST_COL_MINEL, /*!< Lower elevation limit. */
- ROT_LIST_COL_MAXEL, /*!< Upper elevation limit. */
+ ROT_LIST_COL_HOST, /*!< Hostname */
ROT_LIST_COL_NUM /*!< The number of fields in the list. */
} rotor_list_col_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-20 14:35:53
|
Revision: 57
http://gpredict.svn.sourceforge.net/gpredict/?rev=57&view=rev
Author: csete
Date: 2008-08-20 14:36:00 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Changed from hamlib C API to TCP interface.
Modified Paths:
--------------
trunk/ChangeLog
trunk/goocanv8/Makefile.in
trunk/goocanv8/aclocal.m4
trunk/goocanv8/config.guess
trunk/goocanv8/config.sub
trunk/goocanv8/configure
trunk/goocanv8/ltmain.sh
trunk/goocanv8/src/Makefile.in
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig-editor.h
trunk/src/sat-pref-rig.c
trunk/src/sat-pref-rig.h
trunk/src/sat-pref-rot-editor.c
trunk/src/sat-pref-rot-editor.h
trunk/src/sat-pref-rot.c
trunk/src/sat-pref-rot.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/ChangeLog 2008-08-20 14:36:00 UTC (rev 57)
@@ -1,3 +1,24 @@
+2008-08-20; Alexandru Csete <oz...@gm...>
+
+ * configure.ac:
+ Disabled Hamlib checks since we will be using the TCP interface
+ that does not have any build dependencies.
+
+ * src/sat-pref-rig.[ch]:
+ * src/sat-pref-rot.[ch]:
+ * src/sat-pref-rig-editor.[ch]:
+ * src/sat-pref-rot-editor.[ch]:
+ Removed Hamlib dependencies.
+
+ * src/radio-conf.[ch]:
+ * src/rotor-conf.[ch]:
+ * src/sat-pref-rig-c:
+ * src/sat-pref-rot.c:
+ * src/sat-pref-rig-editor.c:
+ * src/sat-pref-rot-editor.c:
+ Changed from hamlib C API to TCP based configuration.
+
+
2008-05-01; Alexandru Csete <oz...@gm...>
* src/gtk-rot-knob.[ch]:
Modified: trunk/goocanv8/Makefile.in
===================================================================
--- trunk/goocanv8/Makefile.in 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/Makefile.in 2008-08-20 14:36:00 UTC (rev 57)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -93,6 +93,7 @@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@@ -127,6 +128,7 @@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -352,8 +354,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -378,8 +380,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -389,13 +391,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -466,6 +467,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -492,6 +497,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -643,8 +650,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
Modified: trunk/goocanv8/aclocal.m4
===================================================================
--- trunk/goocanv8/aclocal.m4 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/aclocal.m4 2008-08-20 14:36:00 UTC (rev 57)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -119,8 +122,7 @@
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- USE_NLS=yes
+ [USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -452,7 +454,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -540,7 +542,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -642,6 +643,8 @@
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -721,10 +724,81 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
+
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
@@ -1048,7 +1122,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -1141,7 +1219,7 @@
$2=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -1412,7 +1490,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -1420,7 +1498,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
])
])
])
@@ -1737,7 +1815,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[[4-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2270,6 +2348,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2769,7 +2854,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3205,7 +3290,7 @@
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -3262,6 +3347,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -3371,7 +3457,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -3384,7 +3470,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -3530,52 +3616,24 @@
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -3825,7 +3883,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -4260,7 +4318,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
@@ -4385,6 +4444,11 @@
$rm -f confest.$objext
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -4441,7 +4505,6 @@
;;
esac
])
-
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
@@ -4526,7 +4589,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4* | aix5*)
+aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -4703,6 +4766,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4765,7 +4829,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -5002,6 +5066,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -5351,7 +5419,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -5408,7 +5476,8 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -5445,7 +5514,7 @@
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -5541,7 +5610,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- pgCC*)
+ pgCC* | pgcpp*)
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -5692,7 +5761,8 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
@@ -5762,7 +5832,8 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
hpux9* | hpux10* | hpux11*)
@@ -5899,7 +5970,7 @@
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
@@ -5923,7 +5994,7 @@
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5939,7 +6010,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5961,6 +6032,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5991,12 +6063,14 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
@@ -6046,7 +6120,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -6266,7 +6340,7 @@
fi
;;
- aix4* | aix5*)
+ aix[[4-9]]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -6286,7 +6360,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -6446,11 +6520,10 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
@@ -7189,7 +7262,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7204,7 +7277,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -7220,8 +7293,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -7493,7 +7568,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -7541,13 +7616,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -7652,16 +7727,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -7962,7 +8038,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
Modified: trunk/goocanv8/config.guess
===================================================================
--- trunk/goocanv8/config.guess 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/config.guess 2008-08-20 14:36:00 UTC (rev 57)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
Modified: trunk/goocanv8/config.sub
===================================================================
--- trunk/goocanv8/config.sub 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/config.sub 2008-08-20 14:36:00 UTC (rev 57)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
Modified: trunk/goocanv8/configure
===================================================================
--- trunk/goocanv8/configure 2008-08-20 14:03:35 UTC (rev 56)
+++ trunk/goocanv8/configure 2008-08-20 14:36:00 UTC (rev 57)
@@ -862,6 +862,8 @@
ECHO
AR
RANLIB
+DSYMUTIL
+NMEDIT
CXX
CXXFLAGS
ac_ct_CXX
@@ -5444,7 +5446,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5659,7 +5661,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5662 "configure"' > conftest.$ac_ext
+ echo '#line 5664 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5831,7 +5833,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -7023,7 +7029,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
@@ -7338,7 +7343,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -7898,6 +7903,318 @@
;;
esac
+
+ case $host_os in
+ rhapsody* | darwin*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_DSYMUTIL" = x; then
+ DSYMUTIL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ DSYMUTIL=$ac_ct_DSYMUTIL
+ fi
+else
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ NMEDIT=$ac_ct_NMEDIT
+ fi
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ lt_cv_ld_exported_symbols_list=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[0123])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[012]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+
+
enable_dlopen=no
enable_win32_dll=no
@@ -7963,7 +8280,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
@@ -7991,11 +8308,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7994: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8311: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7998: \$? = $ac_status" >&5
+ echo "$as_me:8315: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8265,10 +8582,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works=no
+ lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -8281,27 +8598,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8601: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8288: \$? = $ac_status" >&5
+ echo "$as_me:8605: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_pic_works=yes
+ lt_cv_prog_compiler_pic_works=yes
fi
fi
$rm conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8328,10 +8645,10 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_static_works=no
+ lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -8344,20 +8661,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
- lt_prog_compiler_static_works=yes
+ lt_cv_prog_compiler_static_works=yes
fi
else
- lt_prog_compiler_static_works=yes
+ lt_cv_prog_compiler_static_works=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
else
lt_prog_compiler_static=
@@ -8385,11 +8702,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8705: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8392: \$? = $ac_status" >&5
+ echo "$as_me:8709: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8469,12 +8786,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
@@ -8533,7 +8851,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
@@ -8753,7 +9071,7 @@
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -8773,7 +9091,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
@@ -9045,11 +9363,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
case $cc_basename in
xlc*)
@@ -9569,7 +9886,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -10103,6 +10420,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -10422,7 +10754,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -10698,7 +11030,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -10747,7 +11079,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10750 "configure"
+#line 11082 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10847,7 +11179,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10850 "configure"
+#line 11182 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10974,7 +11306,7 @@
fi
;;
-aix4* | aix5*)
+aix[4-9]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
@@ -11030,6 +11362,7 @@
predeps \
postdeps \
compiler_lib_search_path \
+ compiler_lib_search_dirs \
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
@@ -11090,7 +11423,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
@@ -11326,6 +11659,10 @@
# shared library.
postdeps=$lt_postdeps
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -11574,6 +11911,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
# Source file extension for C++ test sources.
ac_ext=cpp
@@ -11611,7 +11949,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
# Allow CC to be a program name with arguments.
@@ -11818,7 +12156,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -11831,7 +12169,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
@@ -12089,52 +12427,24 @@
fi
;;
darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[...
[truncated message content] |
|
From: <cs...@us...> - 2008-08-20 14:03:26
|
Revision: 56
http://gpredict.svn.sourceforge.net/gpredict/?rev=56&view=rev
Author: csete
Date: 2008-08-20 14:03:35 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Changed from hamlib C API to TCP based configuration.
Modified Paths:
--------------
trunk/src/radio-conf.c
trunk/src/radio-conf.h
trunk/src/rotor-conf.c
trunk/src/rotor-conf.h
Modified: trunk/src/radio-conf.c
===================================================================
--- trunk/src/radio-conf.c 2008-08-20 13:03:23 UTC (rev 55)
+++ trunk/src/radio-conf.c 2008-08-20 14:03:35 UTC (rev 56)
@@ -35,15 +35,7 @@
#include "radio-conf.h"
#define GROUP "Radio"
-#define KEY_MODEL "Model"
-#define KEY_ID "ID"
-#define KEY_TYPE "Type"
-#define KEY_PORT "Port"
-#define KEY_SPEED "Speed"
-#define KEY_CIV "CIV"
-#define KEY_EXT "EXT"
-#define KEY_DTR "DTR"
-#define KEY_RTS "RTS"
+#define KEY_HOST "Host"
/** \brief Read radio configuration.
@@ -86,15 +78,7 @@
g_free (fname);
/* read parameters */
- conf->model = g_key_file_get_string (cfg, GROUP, KEY_MODEL, NULL);
- conf->id = g_key_file_get_integer (cfg, GROUP, KEY_ID, NULL);
- conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, NULL);
- conf->port = g_key_file_get_string (cfg, GROUP, KEY_PORT, NULL);
- conf->speed = g_key_file_get_integer (cfg, GROUP, KEY_SPEED, NULL);
- conf->civ = g_key_file_get_integer (cfg, GROUP, KEY_CIV, NULL);
- conf->ext = g_key_file_get_boolean (cfg, GROUP, KEY_EXT, NULL);
- conf->dtr = g_key_file_get_integer (cfg, GROUP, KEY_DTR, NULL);
- conf->rts = g_key_file_get_integer (cfg, GROUP, KEY_RTS, NULL);
+ conf->host = g_key_file_get_string (cfg, GROUP, KEY_HOST, NULL);
g_key_file_free (cfg);
@@ -123,15 +107,7 @@
/* create a config structure */
cfg = g_key_file_new();
- g_key_file_set_string (cfg, GROUP, KEY_MODEL, conf->model);
- g_key_file_set_integer (cfg, GROUP, KEY_ID, conf->id);
- g_key_file_set_integer (cfg, GROUP, KEY_TYPE, conf->type);
- g_key_file_set_string (cfg, GROUP, KEY_PORT, conf->port);
- g_key_file_set_integer (cfg, GROUP, KEY_SPEED, conf->speed);
- g_key_file_set_integer (cfg, GROUP, KEY_CIV, conf->civ);
- g_key_file_set_boolean (cfg, GROUP, KEY_EXT, conf->ext);
- g_key_file_set_integer (cfg, GROUP, KEY_DTR, conf->dtr);
- g_key_file_set_integer (cfg, GROUP, KEY_RTS, conf->rts);
+ g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host);
/* convert to text sdata */
data = g_key_file_to_data (cfg, &len, NULL);
Modified: trunk/src/radio-conf.h
===================================================================
--- trunk/src/radio-conf.h 2008-08-20 13:03:23 UTC (rev 55)
+++ trunk/src/radio-conf.h 2008-08-20 14:03:35 UTC (rev 56)
@@ -34,40 +34,15 @@
-/** \brief RS232 control line usage definitions. */
-typedef enum {
- LINE_UNDEF = 0, /*!< Undefined. */
- LINE_OFF, /*!< Line should be permanently OFF. */
- LINE_ON, /*!< Line should be permanently ON. */
- LINE_PTT, /*!< Line used for PTT control. */
- LINE_CW /*!< Line used for CW keying. */
-} ctrl_stat_t;
-
-
-/** \brief Radio type definitions. */
-typedef enum {
- RADIO_TYPE_RX = 0, /*!< Radio used as receiver only. */
- RADIO_TYPE_TX, /*!< Radio used as TX only. */
- RADIO_TYPE_TRX, /*!< Radio use as both TX and RX. */
- RADIO_TYPE_FULL_DUP /*!< Full duplex radio. */
-} radio_type_t;
-
/** \brief Radio configuration. */
typedef struct {
- gchar *name; /*!< Configuration file name, less .rig. */
- gchar *model; /*!< Radio model, e.g. ICOM IC-910H. */
- guint id; /*!< Hamlib ID. */
- radio_type_t type; /*!< Radio type. */
- gchar *port; /*!< Device name, e.g. /dev/ttyS0. */
- guint speed; /*!< Serial speed. */
- guint civ; /*!< ICOM CI-V address. */
- gboolean ext; /*!< Use built in extensions if available. */
- ctrl_stat_t dtr; /*!< DTR line usage. */
- ctrl_stat_t rts; /*!< PTT line usage. */
+ gchar *name; /*!< Configuration file name, without .rig. */
+ gchar *host; /*!< hostname:port */
} radio_conf_t;
gboolean radio_conf_read (radio_conf_t *conf);
void radio_conf_save (radio_conf_t *conf);
+
#endif
Modified: trunk/src/rotor-conf.c
===================================================================
--- trunk/src/rotor-conf.c 2008-08-20 13:03:23 UTC (rev 55)
+++ trunk/src/rotor-conf.c 2008-08-20 14:03:35 UTC (rev 56)
@@ -35,11 +35,7 @@
#include "rotor-conf.h"
#define GROUP "Rotator"
-#define KEY_MODEL "Model"
-#define KEY_ID "ID"
-#define KEY_TYPE "Type"
-#define KEY_PORT "Port"
-#define KEY_SPEED "Speed"
+#define KEY_HOST "Host"
#define KEY_MINAZ "MinAz"
#define KEY_MAXAZ "MaxAz"
#define KEY_MINEL "MinEl"
@@ -86,15 +82,11 @@
g_free (fname);
/* read parameters */
- conf->model = g_key_file_get_string (cfg, GROUP, KEY_MODEL, NULL);
- conf->id = g_key_file_get_integer (cfg, GROUP, KEY_ID, NULL);
- conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, NULL);
- conf->port = g_key_file_get_string (cfg, GROUP, KEY_PORT, NULL);
- conf->speed = g_key_file_get_integer (cfg, GROUP, KEY_SPEED, NULL);
- conf->minaz = g_key_file_get_integer (cfg, GROUP, KEY_MINAZ, NULL);
- conf->maxaz = g_key_file_get_integer (cfg, GROUP, KEY_MAXAZ, NULL);
- conf->minel = g_key_file_get_integer (cfg, GROUP, KEY_MINEL, NULL);
- conf->maxel = g_key_file_get_integer (cfg, GROUP, KEY_MAXEL, NULL);
+ conf->host = g_key_file_get_string (cfg, GROUP, KEY_HOST, NULL);
+ conf->minaz = g_key_file_get_double (cfg, GROUP, KEY_MINAZ, NULL);
+ conf->maxaz = g_key_file_get_double (cfg, GROUP, KEY_MAXAZ, NULL);
+ conf->minel = g_key_file_get_double (cfg, GROUP, KEY_MINEL, NULL);
+ conf->maxel = g_key_file_get_double (cfg, GROUP, KEY_MAXEL, NULL);
g_key_file_free (cfg);
@@ -123,15 +115,11 @@
/* create a config structure */
cfg = g_key_file_new();
- g_key_file_set_string (cfg, GROUP, KEY_MODEL, conf->model);
- g_key_file_set_integer (cfg, GROUP, KEY_ID, conf->id);
- g_key_file_set_integer (cfg, GROUP, KEY_TYPE, conf->type);
- g_key_file_set_string (cfg, GROUP, KEY_PORT, conf->port);
- g_key_file_set_integer (cfg, GROUP, KEY_SPEED, conf->speed);
- g_key_file_set_integer (cfg, GROUP, KEY_MINAZ, conf->minaz);
- g_key_file_set_integer (cfg, GROUP, KEY_MAXAZ, conf->maxaz);
- g_key_file_set_integer (cfg, GROUP, KEY_MINEL, conf->minel);
- g_key_file_set_integer (cfg, GROUP, KEY_MAXEL, conf->maxel);
+ g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host);
+ g_key_file_set_double (cfg, GROUP, KEY_MINAZ, conf->minaz);
+ g_key_file_set_double (cfg, GROUP, KEY_MAXAZ, conf->maxaz);
+ g_key_file_set_double (cfg, GROUP, KEY_MINEL, conf->minel);
+ g_key_file_set_double (cfg, GROUP, KEY_MAXEL, conf->maxel);
/* convert to text sdata */
data = g_key_file_to_data (cfg, &len, NULL);
Modified: trunk/src/rotor-conf.h
===================================================================
--- trunk/src/rotor-conf.h 2008-08-20 13:03:23 UTC (rev 55)
+++ trunk/src/rotor-conf.h 2008-08-20 14:03:35 UTC (rev 56)
@@ -35,26 +35,14 @@
-/** \brief Rotator type definitions. */
-typedef enum {
- ROTOR_TYPE_AZ = 1, /*!< Azimuth rotator. */
- ROTOR_TYPE_EL = 2, /*!< Elevation rotator. */
- ROTOR_TYPE_AZEL = 3 /*!< Both azimuth and elevation rotator. */
-} rotor_type_t;
-
-
/** \brief Rotator configuration. */
typedef struct {
gchar *name; /*!< Configuration file name, less .rot */
- gchar *model; /*!< Rotator model. */
- guint id; /*!< Hamlib ID. */
- rotor_type_t type; /*!< Rotator type. */
- gchar *port; /*!< Device name, e.g. /dev/ttyS0. */
- guint speed; /*!< Serial speed. */
- gint minaz; /*!< Lower azimuth limit */
- gint maxaz; /*!< Upper azimuth limit */
- gint minel; /*!< Lower elevation limit */
- gint maxel; /*!< Upper elevation limit */
+ gchar *host; /*!< hostname:port */
+ gdouble minaz; /*!< Lower azimuth limit */
+ gdouble maxaz; /*!< Upper azimuth limit */
+ gdouble minel; /*!< Lower elevation limit */
+ gdouble maxel; /*!< Upper elevation limit */
} rotor_conf_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-20 13:03:16
|
Revision: 55
http://gpredict.svn.sourceforge.net/gpredict/?rev=55&view=rev
Author: csete
Date: 2008-08-20 13:03:23 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Disabled hamlib checks.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-05-02 23:35:22 UTC (rev 54)
+++ trunk/configure.ac 2008-08-20 13:03:23 UTC (rev 55)
@@ -39,17 +39,18 @@
])
+dnl Hamlib not needed if we go for the TCP based I/F
dnl check for hamlib
-PKG_CHECK_MODULES(HAMLIB, hamlib, [
- CFLAGS="$CFLAGS $HAMLIB_CFLAGS";
- LIBS="$LIBS $HAMLIB_LIBS";
- havehamlib=true;
- AC_DEFINE(HAVE_HAMLIB, 1, [Define if hamlib is available])
- ], [
- havehamlib=false;
- AC_DEFINE(HAVE_HAMLIB, 0, [Define if hamlib is unvailable])
+dnl PKG_CHECK_MODULES(HAMLIB, hamlib, [
+dnl CFLAGS="$CFLAGS $HAMLIB_CFLAGS";
+dnl LIBS="$LIBS $HAMLIB_LIBS";
+dnl havehamlib=true;
+dnl AC_DEFINE(HAVE_HAMLIB, 1, [Define if hamlib is available])
+dnl ], [
+dnl havehamlib=false;
+dnl AC_DEFINE(HAVE_HAMLIB, 0, [Define if hamlib is unvailable])
-])
+dnl])
dnl Add the languages which your application supports here.
dnl Note that other progs only have ALL_LINGUAS and AM_GLIB_GNU_GETTEXT
@@ -67,7 +68,7 @@
AC_ARG_ENABLE(coverage, [ --enable-coverage enable coverge reports],enable_coerage=yes,enable_coverage=no)
if test "$enable_coverage" = yes ; then
CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage";
- AC_DEFINE(ENABLE_COV, 1, [Define if hardware is disabled.])
+ AC_DEFINE(ENABLE_COV, 1, [Define if code coverage should be enabled.])
fi
@@ -79,9 +80,9 @@
if test "$havecurl" = true ; then
CURL_V=`pkg-config --modversion libcurl`
fi
-if test "$havehamlib" = true ; then
- HAML_V=`pkg-config --modversion hamlib`
-fi
+dnl if test "$havehamlib" = true ; then
+dnl HAML_V=`pkg-config --modversion hamlib`
+dnl fi
AC_SUBST(CFLAGS)
@@ -118,11 +119,11 @@
else
echo Curl version....... : none
fi
-if test "$havehamlib" = true ; then
-echo Hamlib version..... : $HAML_V
-else
-echo Hamlib version..... : none
-fi
-echo Enable coverage.... : $enable_coverage
-echo
+dnl if test "$havehamlib" = true ; then
+dnl echo Hamlib version..... : $HAML_V
+dnl else
+dnl echo Hamlib version..... : none
+dnl fi
+dnl echo Enable coverage.... : $enable_coverage
+dnl echo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-02 23:35:16
|
Revision: 54
http://gpredict.svn.sourceforge.net/gpredict/?rev=54&view=rev
Author: csete
Date: 2008-05-02 16:35:22 -0700 (Fri, 02 May 2008)
Log Message:
-----------
Done some work on the rotator control widget and its integration into GtkSatModule.
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
trunk/src/gtk-sat-module-popup.c
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-05-02 07:09:58 UTC (rev 53)
+++ trunk/src/gtk-rot-ctrl.c 2008-05-02 23:35:22 UTC (rev 54)
@@ -37,26 +37,44 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <math.h>
+#include "sat-log.h"
#include "gtk-rot-ctrl.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
+#define FMTSTR "%7.2f\302\260"
+
static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class);
static void gtk_rot_ctrl_init (GtkRotCtrl *list);
static void gtk_rot_ctrl_destroy (GtkObject *object);
-static GtkWidget *create_status_widgets (void);
-static GtkWidget *create_setup_widgets (void);
-static GtkWidget *create_control_widgets (void);
+static GtkWidget *create_az_widgets (GtkRotCtrl *ctrl);
+static GtkWidget *create_el_widgets (GtkRotCtrl *ctrl);
+static GtkWidget *create_target_widgets (GtkRotCtrl *ctrl);
+static GtkWidget *create_conf_widgets (GtkRotCtrl *ctrl);
+static GtkWidget *create_plot_widget (GtkRotCtrl *ctrl);
+static void store_sats (gpointer key, gpointer value, gpointer user_data);
+static void sat_selected_cb (GtkComboBox *satsel, gpointer data);
+static void track_toggle_cb (GtkToggleButton *button, gpointer data);
+static void delay_changed_cb (GtkSpinButton *spin, gpointer data);
+static void toler_changed_cb (GtkSpinButton *spin, gpointer data);
+static gboolean rot_ctrl_timeout_cb (gpointer data);
+
+
static GtkVBoxClass *parent_class = NULL;
+static GdkColor ColBlack = { 0, 0, 0, 0};
+static GdkColor ColWhite = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
+static GdkColor ColRed = { 0, 0xFFFF, 0, 0};
+static GdkColor ColGreen = {0, 0, 0xFFFF, 0};
+
GType
gtk_rot_ctrl_get_type ()
{
@@ -110,13 +128,27 @@
static void
gtk_rot_ctrl_init (GtkRotCtrl *ctrl)
{
-
+ ctrl->sats = NULL;
+ ctrl->target = NULL;
+ ctrl->tracking = FALSE;
+ ctrl->busy = FALSE;
+ ctrl->delay = 1000;
+ ctrl->timerid = 0;
+ ctrl->tolerance = 1.0;
}
static void
gtk_rot_ctrl_destroy (GtkObject *object)
{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (object);
+
+
+ /* stop timer */
+ if (ctrl->timerid > 0)
+ g_source_remove (ctrl->timerid);
+
+
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
@@ -127,89 +159,364 @@
*
*/
GtkWidget *
-gtk_rot_ctrl_new ()
+gtk_rot_ctrl_new (GtkSatModule *module)
{
GtkWidget *widget;
GtkWidget *table;
- guint i;
widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
+
+ /* store satellites */
+ g_hash_table_foreach (module->satellites, store_sats, widget);
+
+ GTK_ROT_CTRL (widget)->target = SAT (g_slist_nth_data (GTK_ROT_CTRL (widget)->sats, 0));
+
+ /* initialise custom colors */
+ gdk_rgb_find_color (gtk_widget_get_colormap (widget), &ColBlack);
+ gdk_rgb_find_color (gtk_widget_get_colormap (widget), &ColWhite);
+ gdk_rgb_find_color (gtk_widget_get_colormap (widget), &ColRed);
+ gdk_rgb_find_color (gtk_widget_get_colormap (widget), &ColGreen);
/* create contents */
- table = gtk_table_new (2, 2, FALSE);
- gtk_table_attach (GTK_TABLE (table), create_status_widgets (),
- 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
- gtk_table_attach (GTK_TABLE (table), create_setup_widgets (),
- 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
- gtk_table_attach (GTK_TABLE (table), create_control_widgets (),
- 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+ table = gtk_table_new (3, 2, TRUE);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+ gtk_table_attach (GTK_TABLE (table), create_az_widgets (GTK_ROT_CTRL (widget)),
+ 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), create_el_widgets (GTK_ROT_CTRL (widget)),
+ 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), create_target_widgets (GTK_ROT_CTRL (widget)),
+ 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), create_conf_widgets (GTK_ROT_CTRL (widget)),
+ 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach (GTK_TABLE (table), create_plot_widget (GTK_ROT_CTRL (widget)),
+ 1, 2, 1, 3, GTK_FILL, GTK_FILL, 0, 0);
gtk_container_add (GTK_CONTAINER (widget), table);
+ GTK_ROT_CTRL (widget)->timerid = g_timeout_add (GTK_ROT_CTRL (widget)->delay,
+ rot_ctrl_timeout_cb,
+ GTK_ROT_CTRL (widget));
+
return widget;
}
-/** \brief Create status widgets. */
-static GtkWidget *create_status_widgets ()
+/** \brief Update rotator control state.
+ * \param ctrl Pointer to the GtkRotCtrl.
+ *
+ * This function is called by the parent, i.e. GtkSatModule, indicating that
+ * the satellite data has been updated. The function updates the internal state
+ * of the controller and the rotator.
+ */
+void
+gtk_rot_ctrl_update (GtkRotCtrl *ctrl, gdouble t)
{
- GtkWidget *frame,*table,*label,*ctrbut;
+ gchar *buff;
- table = gtk_table_new (3,7, TRUE);
+ if (ctrl->target) {
+ /* update target displays */
+ buff = g_strdup_printf (FMTSTR, ctrl->target->az);
+ gtk_label_set_text (GTK_LABEL (ctrl->AzSat), buff);
+ g_free (buff);
+ buff = g_strdup_printf (FMTSTR, ctrl->target->el);
+ gtk_label_set_text (GTK_LABEL (ctrl->ElSat), buff);
+ g_free (buff);
+ }
+}
+
+
+/** \brief Create azimuth control widgets.
+ * \param ctrl Pointer to the GtkRotCtrl widget.
+ *
+ * This function creates and initialises the widgets for controlling the
+ * azimuth of the the rotator.
+ */
+static
+GtkWidget *create_az_widgets (GtkRotCtrl *ctrl)
+{
+ GtkWidget *frame;
- /* table header */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>SAT</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
+ frame = gtk_frame_new (_("Azimuth"));
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>\316\224</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
+ return frame;
+}
+
+
+/** \brief Create elevation control widgets.
+ * \param ctrl Pointer to the GtkRotCtrl widget.
+ *
+ * This function creates and initialises the widgets for controlling the
+ * elevation of the the rotator.
+ */
+static
+GtkWidget *create_el_widgets (GtkRotCtrl *ctrl)
+{
+ GtkWidget *frame;
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>SET</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
+ frame = gtk_frame_new (_("Elevation"));
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>READ</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 5, 6, 0, 1);
+ return frame;
+}
+
+/** \brief Create target widgets.
+ * \param ctrl Pointer to the GtkRotCtrl widget.
+ */
+static
+GtkWidget *create_target_widgets (GtkRotCtrl *ctrl)
+{
+ GtkWidget *frame,*table,*label,*satsel,*track;
+ gchar *buff;
+ guint i, n;
+ sat_t *sat = NULL;
- /* Azimuth widgets */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>AZ:</b>");
+
+ buff = g_strdup_printf (FMTSTR, 0.0);
+
+ table = gtk_table_new (4, 3, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+
+ /* sat selector */
+ satsel = gtk_combo_box_new_text ();
+ n = g_slist_length (ctrl->sats);
+ for (i = 0; i < n; i++) {
+ sat = SAT (g_slist_nth_data (ctrl->sats, i));
+ if (sat) {
+ gtk_combo_box_append_text (GTK_COMBO_BOX (satsel), sat->tle.sat_name);
+ }
+ }
+ gtk_combo_box_set_active (GTK_COMBO_BOX (satsel), 0);
+ gtk_widget_set_tooltip_text (satsel, _("Select target object"));
+ g_signal_connect (satsel, "changed", G_CALLBACK (sat_selected_cb), ctrl);
+ gtk_table_attach (GTK_TABLE (table), satsel, 0, 2, 0, 1,
+ GTK_FILL, GTK_FILL, 5, 5);
+
+ /* tracking button */
+ track = gtk_toggle_button_new_with_label (_("Track"));
+ gtk_widget_set_tooltip_text (track, _("Track the satellite when it is within range"));
+ gtk_table_attach (GTK_TABLE (table), track, 2, 3, 0, 1,
+ GTK_SHRINK, GTK_SHRINK, 5, 0);
+ g_signal_connect (track, "toggled", G_CALLBACK (track_toggle_cb), ctrl);
+
+ /* Azimuth */
+ label = gtk_label_new (_("Az:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
- /* Eevation widgets */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>EL:</b>");
+ ctrl->AzSat = gtk_label_new (buff);
+ gtk_misc_set_alignment (GTK_MISC (ctrl->AzSat), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->AzSat, 1, 2, 1, 2);
+
+
+ /* Elevation */
+ label = gtk_label_new (_("El:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
- frame = gtk_frame_new (_("STATUS"));
+ ctrl->ElSat = gtk_label_new (buff);
+ gtk_misc_set_alignment (GTK_MISC (ctrl->ElSat), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->ElSat, 1, 2, 2, 3);
+
+ /* count down */
+ label = gtk_label_new (_("Time:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+
+ frame = gtk_frame_new (_("Target"));
+ //gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
gtk_container_add (GTK_CONTAINER (frame), table);
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+ g_free (buff);
+
return frame;
}
-/** \brief Create setup widgets. */
-static GtkWidget *create_setup_widgets ()
+static GtkWidget *
+create_conf_widgets (GtkRotCtrl *ctrl)
{
- GtkWidget *frame;
+ GtkWidget *frame,*table,*label,*timer,*toler;
- frame = gtk_frame_new (_("SETUP"));
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+ table = gtk_table_new (2, 3, TRUE);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ /* Timeout */
+ label = gtk_label_new (_("Cycle:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+
+ timer = gtk_spin_button_new_with_range (100, 5000, 10);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (timer), 0);
+ gtk_widget_set_tooltip_text (timer,
+ _("This parameter controls the delay between "\
+ "commands sent to the rotator."));
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (timer), ctrl->delay);
+ g_signal_connect (timer, "value-changed", G_CALLBACK (delay_changed_cb), ctrl);
+ gtk_table_attach (GTK_TABLE (table), timer, 1, 2, 0, 1,
+ GTK_FILL, GTK_FILL, 0, 0);
+
+ label = gtk_label_new (_("msec"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
+
+ /* Tolerance */
+ label = gtk_label_new (_("Tolerance:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+
+ toler = gtk_spin_button_new_with_range (0.0, 10.0, 0.1);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (toler), 1);
+ gtk_widget_set_tooltip_text (toler,
+ _("This parameter controls the tolerance between "\
+ "the target and rotator values for the rotator.\n"\
+ "If the difference between the target and rotator values "\
+ "is smaller than the tolerance, no new commands are sent"));
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (toler), ctrl->tolerance);
+ g_signal_connect (toler, "value-changed", G_CALLBACK (toler_changed_cb), ctrl);
+ gtk_table_attach (GTK_TABLE (table), toler, 1, 2, 1, 2,
+ GTK_FILL, GTK_FILL, 0, 0);
+
+
+ label = gtk_label_new (_("deg"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 1, 2);
+
+
+ frame = gtk_frame_new (_("Settings"));
+ gtk_container_add (GTK_CONTAINER (frame), table);
+
return frame;
}
-/** \brief Create control buttons. */
-static GtkWidget *create_control_widgets ()
+
+/** \brief Create target widgets.
+ * \param ctrl Pointer to the GtkRotCtrl widget.
+ */
+static
+GtkWidget *create_plot_widget (GtkRotCtrl *ctrl)
{
GtkWidget *frame;
- frame = gtk_frame_new (_("CONTROL"));
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+ frame = gtk_frame_new (NULL);
return frame;
}
+
+
+/** \brief Copy satellite from hash table to singly linked list.
+ */
+static void
+store_sats (gpointer key, gpointer value, gpointer user_data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL( user_data);
+ sat_t *sat = SAT (value);
+
+ ctrl->sats = g_slist_append (ctrl->sats, sat);
+}
+
+
+/** \brief Manage satellite selections
+ * \param satsel Pointer to the GtkComboBox.
+ * \param data Pointer to the GtkRotCtrl widget.
+ *
+ * This function is called when the user selects a new satellite.
+ */
+static void
+sat_selected_cb (GtkComboBox *satsel, gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+ gint i;
+
+ i = gtk_combo_box_get_active (satsel);
+ if (i >= 0) {
+ ctrl->target = SAT (g_slist_nth_data (ctrl->sats, i));
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Invalid satellite selection: %d"),
+ __FILE__, __FUNCTION__, i);
+ }
+}
+
+
+/** \brief Manage toggle signals (tracking)
+ * \param button Pointer to the GtkToggle button.
+ * \param data Pointer to the GtkRotCtrl widget.
+ */
+static void
+track_toggle_cb (GtkToggleButton *button, gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+
+ ctrl->tracking = gtk_toggle_button_get_active (button);
+}
+
+
+/** \brief Manage cycle delay changes.
+ * \param spin Pointer to the spin button.
+ * \param data Pointer to the GtkRotCtrl widget.
+ *
+ * This function is called when the user changes the value of the
+ * cycle delay.
+ */
+static void
+delay_changed_cb (GtkSpinButton *spin, gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+
+
+ ctrl->delay = (guint) gtk_spin_button_get_value (spin);
+
+ if (ctrl->timerid > 0)
+ g_source_remove (ctrl->timerid);
+
+ ctrl->timerid = g_timeout_add (ctrl->delay, rot_ctrl_timeout_cb, ctrl);
+}
+
+
+
+/** \brief Manage tolerance changes.
+ * \param spin Pointer to the spin button.
+ * \param data Pointer to the GtkRotCtrl widget.
+ *
+ * This function is called when the user changes the value of the
+ * tolerance.
+ */
+static void
+toler_changed_cb (GtkSpinButton *spin, gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+
+ ctrl->tolerance = gtk_spin_button_get_value (spin);
+}
+
+
+
+
+/** \brief Rotator controller timeout function
+ * \param data Pointer to the GtkRotCtrl widget.
+ * \return Always TRUE to let the timer continue.
+ */
+static gboolean
+rot_ctrl_timeout_cb (gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+
+ if (ctrl->busy) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,_("%s missed the deadline"),__FUNCTION__);
+ return TRUE;
+ }
+
+ ctrl->busy = TRUE;
+
+ /* do something */
+
+ ctrl->busy = FALSE;
+
+ return TRUE;
+}
+
+
+
+
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-05-02 07:09:58 UTC (rev 53)
+++ trunk/src/gtk-rot-ctrl.h 2008-05-02 23:35:22 UTC (rev 54)
@@ -31,8 +31,9 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include "sgpsdp/sgp4sdp4.h"
+#include "gtk-sat-module.h"
-
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -66,7 +67,19 @@
/* Elevation labels */
GtkWidget *ElSat,*ElDelta,*ElLock,*ElSet,*ElRead;
+
+ /* other widgets */
+
+ /* satellites */
+ GSList *sats;
+ sat_t *target;
+ guint delay; /*!< Timeout delay. */
+ guint timerid; /*!< Timer ID */
+ gdouble tolerance; /*!< Error tolerance */
+
+ gboolean tracking;
+ gboolean busy;
};
struct _GtkRotCtrlClass
@@ -77,7 +90,8 @@
GtkType gtk_rot_ctrl_get_type (void);
-GtkWidget* gtk_rot_ctrl_new (void);
+GtkWidget* gtk_rot_ctrl_new (GtkSatModule *module);
+void gtk_rot_ctrl_update (GtkRotCtrl *ctrl, gdouble t);
#ifdef __cplusplus
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2008-05-02 07:09:58 UTC (rev 53)
+++ trunk/src/gtk-sat-module-popup.c 2008-05-02 23:35:22 UTC (rev 54)
@@ -59,6 +59,8 @@
static void delete_cb (GtkWidget *menuitem, gpointer data);
static void close_cb (GtkWidget *menuitem, gpointer data);
static void name_changed (GtkWidget *widget, gpointer data);
+static void destroy_rotctrl (GtkWidget *window, gpointer data);
+static void destroy_rigctrl (GtkWidget *window, gpointer data);
static gint window_delete (GtkWidget *widget, GdkEvent *event, gpointer data);
@@ -243,7 +245,24 @@
static void
config_cb (GtkWidget *menuitem, gpointer data)
{
- gtk_sat_module_config_cb (menuitem, data);
+ GtkSatModule *module = GTK_SAT_MODULE (data);
+
+ if (module->rigctrlwin || module->rotctrlwin) {
+ GtkWidget *dialog;
+ /* FIXME: should offer option to close controllers */
+ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("A module can not be configured while the "\
+ "radio or rotator controller is active.\n\n"\
+ "Please close the radio and rotator controllers "\
+ "and try again."));
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+ else {
+ gtk_sat_module_config_cb (menuitem, data);
+ }
}
@@ -848,30 +867,54 @@
rigctrl_cb (GtkWidget *menuitem, gpointer data)
{
GtkSatModule *module = GTK_SAT_MODULE (data);
- GtkWidget *window;
GtkWidget *rigctrl;
gchar *buff;
+ if (module->rigctrlwin != NULL) {
+ /* there is already a roto controller for this module */
+ gtk_window_present (GTK_WINDOW (module->rigctrlwin));
+ return;
+ }
- //rigctrl = gtk_rig_ctrl_new ();
+ //rigctrl = gtk_rot_ctrl_new ();
/* create a window */
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- buff = g_strdup_printf (_("Gpredict Radio Control (%s)"), module->name);
- gtk_window_set_title (GTK_WINDOW (window), buff);
+ module->rigctrlwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ buff = g_strdup_printf (_("Gpredict Radio Control: %s"), module->name);
+ gtk_window_set_title (GTK_WINDOW (module->rigctrlwin), buff);
g_free (buff);
- g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (window_delete), NULL);
+ g_signal_connect (G_OBJECT (module->rigctrlwin), "delete_event",
+ G_CALLBACK (window_delete), NULL);
+ g_signal_connect (G_OBJECT (module->rigctrlwin), "destroy",
+ G_CALLBACK (destroy_rigctrl), module);
/* window icon */
buff = icon_file_name ("gpredict-oscilloscope.png");
- gtk_window_set_icon_from_file (GTK_WINDOW (window), buff, NULL);
+ gtk_window_set_icon_from_file (GTK_WINDOW (module->rigctrlwin), buff, NULL);
g_free (buff);
- //gtk_container_add (GTK_CONTAINER (window), rigctrl);
+ //gtk_container_add (GTK_CONTAINER (module->rigctrlwin), rigctrl);
- gtk_widget_show_all (window);
+ gtk_widget_show_all (module->rigctrlwin);
+
}
+
+/** \brief Destroy radio control window.
+ * \param window Pointer to the radio control window.
+ * \param data Pointer to the GtkSatModule to which this controller is attached.
+ *
+ * This function is called automatically when the window is destroyed.
+ */
+static void
+destroy_rigctrl (GtkWidget *window, gpointer data)
+{
+ GtkSatModule *module = GTK_SAT_MODULE (data);
+
+ module->rigctrlwin = NULL;
+}
+
+
/** \brief Open antenna rotator control window.
* \param menuitem The menuitem that was selected.
* \param data Pointer the GtkSatModule.
@@ -880,34 +923,65 @@
rotctrl_cb (GtkWidget *menuitem, gpointer data)
{
GtkSatModule *module = GTK_SAT_MODULE (data);
- GtkWidget *window;
GtkWidget *rotctrl;
gchar *buff;
+ if (module->rotctrlwin != NULL) {
+ /* there is already a roto controller for this module */
+ gtk_window_present (GTK_WINDOW (module->rotctrlwin));
+ return;
+ }
- rotctrl = gtk_rot_ctrl_new ();
+ rotctrl = gtk_rot_ctrl_new (module);
+ module->rotctrl = rotctrl;
/* create a window */
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- buff = g_strdup_printf (_("Gpredict Rotator Control (%s)"), module->name);
- gtk_window_set_title (GTK_WINDOW (window), buff);
+ module->rotctrlwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ buff = g_strdup_printf (_("Gpredict Rotator Control: %s"), module->name);
+ gtk_window_set_title (GTK_WINDOW (module->rotctrlwin), buff);
g_free (buff);
- g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (window_delete), NULL);
+ g_signal_connect (G_OBJECT (module->rotctrlwin), "delete_event",
+ G_CALLBACK (window_delete), module);
+ g_signal_connect (G_OBJECT (module->rotctrlwin), "destroy",
+ G_CALLBACK (destroy_rotctrl), module);
/* window icon */
buff = icon_file_name ("gpredict-antenna.png");
- gtk_window_set_icon_from_file (GTK_WINDOW (window), buff, NULL);
+ gtk_window_set_icon_from_file (GTK_WINDOW (module->rotctrlwin), buff, NULL);
g_free (buff);
- gtk_container_add (GTK_CONTAINER (window), rotctrl);
+ gtk_container_add (GTK_CONTAINER (module->rotctrlwin), rotctrl);
- /* store pointer to window */
+ gtk_widget_show_all (module->rotctrlwin);
+}
+
+
+/** \brief Destroy rotator control window.
+ * \param window Pointer to the rotator control window.
+ * \param data Pointer to the GtkSatModule to which this controller is attached.
+ *
+ * This function is called automatically when the window is destroyed.
+ */
+static void
+destroy_rotctrl (GtkWidget *window, gpointer data)
+{
+ GtkSatModule *module = GTK_SAT_MODULE (data);
- gtk_widget_show_all (window);
+ module->rotctrlwin = NULL;
+ module->rotctrl = NULL;
}
+/* ensure that deleted top-level windows are destroyed */
+static gint
+window_delete (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer data)
+{
+ return FALSE;
+}
+
/** \brief Close module.
*
* This function is called when the user selects the close menu
@@ -1040,17 +1114,7 @@
-/* ensure that deleted top-level windows are destroyed */
-static gint
-window_delete (GtkWidget *widget,
- GdkEvent *event,
- gpointer data)
-{
- return FALSE;
-}
-
-
/** \brief Snoop window position and size when main window receives configure event.
* \param widget Pointer to the module window.
* \param event Pointer to the event structure.
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2008-05-02 07:09:58 UTC (rev 53)
+++ trunk/src/gtk-sat-module.c 2008-05-02 23:35:22 UTC (rev 54)
@@ -64,6 +64,7 @@
#include "gtk-polar-view.h"
#include "gtk-single-sat.h"
#include "gtk-met.h"
+#include "gtk-rot-ctrl.h"
//#ifdef G_OS_WIN32
//# include "libc_internal.h"
@@ -96,7 +97,6 @@
static void reload_sats_in_child (GtkWidget *widget, GtkSatModule *module);
-static void destroy_gtk_widget (gpointer data);
static GtkVBoxClass *parent_class = NULL;
@@ -168,17 +168,10 @@
g_free,
g_free);
- module->rotctrl = g_hash_table_new_full (g_int_hash,
- g_int_equal,
- g_free,
- destroy_gtk_widget);
-
- module->rigctrl = g_hash_table_new_full (g_int_hash,
- g_int_equal,
- g_free,
- destroy_gtk_widget);
+ module->rotctrlwin = NULL;
+ module->rotctrl = NULL;
+ module->rigctrlwin = NULL;
-
module->state = GTK_SAT_MOD_STATE_DOCKED;
module->busy = FALSE;
@@ -190,6 +183,8 @@
module->vpanedpos = -1;
module->hpanedpos = -1;
+ module->timerid = 0;
+
module->throttle = 1;
module->rtNow = 0.0;
module->rtPrev = 0.0;
@@ -208,7 +203,7 @@
/* stop timeout */
- if (module->timerid != -1)
+ if (module->timerid > 0)
g_source_remove (module->timerid);
/* destroy time controller */
@@ -216,19 +211,15 @@
gtk_widget_destroy (module->tmgWin);
module->tmgActive = FALSE;
}
-
- /* destroy radio controllers */
- if (module->rigctrl) {
- g_hash_table_destroy (module->rigctrl);
- module->rigctrl = NULL;
- }
- /* destroy rotator controllers */
- if (module->rotctrl) {
- g_hash_table_destroy (module->rotctrl);
- module->rotctrl = NULL;
+ /* destroy radio and rotator controllers */
+ if (module->rigctrlwin) {
+ gtk_widget_destroy (module->rigctrlwin);
}
-
+ if (module->rotctrlwin) {
+ gtk_widget_destroy (module->rotctrlwin);
+ }
+
/* clean up QTH */
if (module->qth) {
gtk_sat_data_free_qth (module->qth);
@@ -877,6 +868,10 @@
if (mod->child_3 != NULL)
update_child (mod->child_3, mod->tmgCdnum);
+ /* send notice to radio and rotator controller */
+ if (mod->rotctrl)
+ gtk_rot_ctrl_update (GTK_ROT_CTRL (mod->rotctrl), mod->tmgCdnum);
+
mod->event_count++;
@@ -1545,7 +1540,8 @@
if (GTK_SAT_MODULE (module)->child_3 != NULL)
reload_sats_in_child (GTK_SAT_MODULE (module)->child_3, GTK_SAT_MODULE (module));
-
+ /* FIXME: radio and rotator controller */
+
/* unlock module */
module->busy = FALSE;
@@ -1597,15 +1593,3 @@
{
}
-
-/** \brief Destroy a Gtk+ widget.
- * \param data Pointer to the widget to destroy.
- *
- * This function is a simple wrapper for gtk_widget_destroy. The difference is
- * in the parameter types; this wrapper can be used as a GDestroyNotify callback.
- */
-static void
-destroy_gtk_widget (gpointer data)
-{
- gtk_widget_destroy (GTK_WIDGET (data));
-}
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2008-05-02 07:09:58 UTC (rev 53)
+++ trunk/src/gtk-sat-module.h 2008-05-02 23:35:22 UTC (rev 54)
@@ -93,6 +93,10 @@
GtkWidget *win; /*!< Window when module is not docked */
+ GtkWidget *rotctrlwin; /*!< Rotator controller window */
+ GtkWidget *rotctrl;
+ GtkWidget *rigctrlwin; /*!< Radio controller window */
+
GtkWidget *header;
guint head_count;
guint head_timeout;
@@ -116,8 +120,6 @@
qth_t *qth; /*!< QTH information. */
GHashTable *satellites; /*!< Satellites. */
- GHashTable *rotctrl; /*!< Rotator controllers. */
- GHashTable *rigctrl; /*!< Radio controllers. */
guint32 timeout; /*!< Timeout value [msec] */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-02 07:09:52
|
Revision: 53
http://gpredict.svn.sourceforge.net/gpredict/?rev=53&view=rev
Author: csete
Date: 2008-05-02 00:09:58 -0700 (Fri, 02 May 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/src/gtk-sat-module-popup.c
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2008-05-01 18:54:49 UTC (rev 52)
+++ trunk/src/gtk-sat-module-popup.c 2008-05-02 07:09:58 UTC (rev 53)
@@ -41,6 +41,7 @@
#include "gtk-sat-module.h"
#include "gtk-sat-module-tmg.h"
#include "gtk-sat-module-popup.h"
+#include "gtk-rot-ctrl.h"
#include "config-keys.h"
@@ -839,22 +840,70 @@
tmg_create (module);
}
-/** \brief Open Radio control window. */
+/** \brief Open Radio control window.
+ * \param menuitem The menuitem that was selected.
+ * \param data Pointer the GtkSatModule.
+ */
static void
rigctrl_cb (GtkWidget *menuitem, gpointer data)
{
GtkSatModule *module = GTK_SAT_MODULE (data);
+ GtkWidget *window;
+ GtkWidget *rigctrl;
+ gchar *buff;
+
+ //rigctrl = gtk_rig_ctrl_new ();
+
+ /* create a window */
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ buff = g_strdup_printf (_("Gpredict Radio Control (%s)"), module->name);
+ gtk_window_set_title (GTK_WINDOW (window), buff);
+ g_free (buff);
+ g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (window_delete), NULL);
+ /* window icon */
+ buff = icon_file_name ("gpredict-oscilloscope.png");
+ gtk_window_set_icon_from_file (GTK_WINDOW (window), buff, NULL);
+ g_free (buff);
+
+ //gtk_container_add (GTK_CONTAINER (window), rigctrl);
+
+ gtk_widget_show_all (window);
}
-/** \brief Open antenna rotator control window. */
+/** \brief Open antenna rotator control window.
+ * \param menuitem The menuitem that was selected.
+ * \param data Pointer the GtkSatModule.
+ */
static void
rotctrl_cb (GtkWidget *menuitem, gpointer data)
{
GtkSatModule *module = GTK_SAT_MODULE (data);
+ GtkWidget *window;
+ GtkWidget *rotctrl;
+ gchar *buff;
+
+ rotctrl = gtk_rot_ctrl_new ();
+
+ /* create a window */
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ buff = g_strdup_printf (_("Gpredict Rotator Control (%s)"), module->name);
+ gtk_window_set_title (GTK_WINDOW (window), buff);
+ g_free (buff);
+ g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (window_delete), NULL);
+ /* window icon */
+ buff = icon_file_name ("gpredict-antenna.png");
+ gtk_window_set_icon_from_file (GTK_WINDOW (window), buff, NULL);
+ g_free (buff);
+
+ gtk_container_add (GTK_CONTAINER (window), rotctrl);
+
+ /* store pointer to window */
+
+ gtk_widget_show_all (window);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-01 19:02:16
|
Revision: 52
http://gpredict.svn.sourceforge.net/gpredict/?rev=52&view=rev
Author: csete
Date: 2008-05-01 11:54:49 -0700 (Thu, 01 May 2008)
Log Message:
-----------
Added hash tables for storing pointers to radio and rotator control windows.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-01 17:24:06 UTC (rev 51)
+++ trunk/ChangeLog 2008-05-01 18:54:49 UTC (rev 52)
@@ -5,6 +5,10 @@
* src/gtk-freq-knob.[ch]:
New files, previously gtk-freq-ctrl.
+
+ * src/gtk_sat_module.[ch]:
+ Added hash tables for storing pointers to radio and rotator control
+ windows.
2008-04-30; Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2008-05-01 17:24:06 UTC (rev 51)
+++ trunk/src/gtk-sat-module.c 2008-05-01 18:54:49 UTC (rev 52)
@@ -64,6 +64,7 @@
#include "gtk-polar-view.h"
#include "gtk-single-sat.h"
#include "gtk-met.h"
+
//#ifdef G_OS_WIN32
//# include "libc_internal.h"
//# include "libc_interface.h"
@@ -95,7 +96,9 @@
static void reload_sats_in_child (GtkWidget *widget, GtkSatModule *module);
+static void destroy_gtk_widget (gpointer data);
+
static GtkVBoxClass *parent_class = NULL;
@@ -165,7 +168,17 @@
g_free,
g_free);
+ module->rotctrl = g_hash_table_new_full (g_int_hash,
+ g_int_equal,
+ g_free,
+ destroy_gtk_widget);
+
+ module->rigctrl = g_hash_table_new_full (g_int_hash,
+ g_int_equal,
+ g_free,
+ destroy_gtk_widget);
+
module->state = GTK_SAT_MOD_STATE_DOCKED;
module->busy = FALSE;
@@ -184,6 +197,7 @@
module->tmgPdnum = 0.0;
module->tmgCdnum = 0.0;
module->tmgReset = FALSE;
+
}
@@ -203,11 +217,25 @@
module->tmgActive = FALSE;
}
+ /* destroy radio controllers */
+ if (module->rigctrl) {
+ g_hash_table_destroy (module->rigctrl);
+ module->rigctrl = NULL;
+ }
+
+ /* destroy rotator controllers */
+ if (module->rotctrl) {
+ g_hash_table_destroy (module->rotctrl);
+ module->rotctrl = NULL;
+ }
+
+ /* clean up QTH */
if (module->qth) {
gtk_sat_data_free_qth (module->qth);
module->qth = NULL;
}
+ /* clean up satellites */
if (module->satellites) {
g_hash_table_destroy (module->satellites);
module->satellites = NULL;
@@ -1569,3 +1597,15 @@
{
}
+
+/** \brief Destroy a Gtk+ widget.
+ * \param data Pointer to the widget to destroy.
+ *
+ * This function is a simple wrapper for gtk_widget_destroy. The difference is
+ * in the parameter types; this wrapper can be used as a GDestroyNotify callback.
+ */
+static void
+destroy_gtk_widget (gpointer data)
+{
+ gtk_widget_destroy (GTK_WIDGET (data));
+}
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2008-05-01 17:24:06 UTC (rev 51)
+++ trunk/src/gtk-sat-module.h 2008-05-01 18:54:49 UTC (rev 52)
@@ -116,6 +116,8 @@
qth_t *qth; /*!< QTH information. */
GHashTable *satellites; /*!< Satellites. */
+ GHashTable *rotctrl; /*!< Rotator controllers. */
+ GHashTable *rigctrl; /*!< Radio controllers. */
guint32 timeout; /*!< Timeout value [msec] */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-01 17:24:10
|
Revision: 51
http://gpredict.svn.sourceforge.net/gpredict/?rev=51&view=rev
Author: csete
Date: 2008-05-01 10:24:06 -0700 (Thu, 01 May 2008)
Log Message:
-----------
Change master rotor control to widget so that it can be instanciated several times from modules.
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
trunk/src/menubar.c
trunk/win32/Makefile
Removed Paths:
-------------
trunk/src/rot-ctrl-window.c
trunk/src/rot-ctrl-window.h
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/Makefile.am 2008-05-01 17:24:06 UTC (rev 51)
@@ -70,7 +70,6 @@
qth-editor.c qth-editor.h \
radio-conf.c radio-conf.h \
rig-io.c rig-io.h \
- rot-ctrl-window.c rot-ctrl-window.h \
rotor-conf.c rotor-conf.h \
rdv.c rdv.h \
sat-cfg.c sat-cfg.h \
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/gtk-rot-ctrl.c 2008-05-01 17:24:06 UTC (rev 51)
@@ -49,6 +49,11 @@
static void gtk_rot_ctrl_destroy (GtkObject *object);
+static GtkWidget *create_status_widgets (void);
+static GtkWidget *create_setup_widgets (void);
+static GtkWidget *create_control_widgets (void);
+
+
static GtkVBoxClass *parent_class = NULL;
@@ -130,7 +135,81 @@
widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
+ /* create contents */
+ table = gtk_table_new (2, 2, FALSE);
+ gtk_table_attach (GTK_TABLE (table), create_status_widgets (),
+ 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+ gtk_table_attach (GTK_TABLE (table), create_setup_widgets (),
+ 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+ gtk_table_attach (GTK_TABLE (table), create_control_widgets (),
+ 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+
+ gtk_container_add (GTK_CONTAINER (widget), table);
return widget;
}
+
+/** \brief Create status widgets. */
+static GtkWidget *create_status_widgets ()
+{
+ GtkWidget *frame,*table,*label,*ctrbut;
+
+ table = gtk_table_new (3,7, TRUE);
+
+ /* table header */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>SAT</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>\316\224</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>SET</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>READ</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 5, 6, 0, 1);
+
+ /* Azimuth widgets */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>AZ:</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+
+ /* Eevation widgets */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>EL:</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+
+ frame = gtk_frame_new (_("STATUS"));
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
+
+
+/** \brief Create setup widgets. */
+static GtkWidget *create_setup_widgets ()
+{
+ GtkWidget *frame;
+
+ frame = gtk_frame_new (_("SETUP"));
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
+
+/** \brief Create control buttons. */
+static GtkWidget *create_control_widgets ()
+{
+ GtkWidget *frame;
+
+ frame = gtk_frame_new (_("CONTROL"));
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/gtk-rot-ctrl.h 2008-05-01 17:24:06 UTC (rev 51)
@@ -61,6 +61,12 @@
{
GtkVBox vbox;
+ /* Azimuth labels */
+ GtkWidget *AzSat,*AzDelta,*AzLock,*AzSet,*AzRead;
+
+ /* Elevation labels */
+ GtkWidget *ElSat,*ElDelta,*ElLock,*ElSet,*ElRead;
+
};
struct _GtkRotCtrlClass
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/menubar.c 2008-05-01 17:24:06 UTC (rev 51)
@@ -57,9 +57,7 @@
# include <build-config.h>
#endif
-#include "rot-ctrl-window.h"
-
extern GtkWidget *app;
@@ -68,8 +66,6 @@
static void menubar_open_mod_cb (GtkWidget *widget, gpointer data);
static void menubar_message_log (GtkWidget *widget, gpointer data);
static void menubar_app_exit_cb (GtkWidget *widget, gpointer data);
-static void menubar_rig_cb (GtkWidget *widget, gpointer data);
-static void menubar_rot_cb (GtkWidget *widget, gpointer data);
static void menubar_rdv_cb (GtkWidget *widget, gpointer data);
static void menubar_freq_edit_cb (GtkWidget *widget, gpointer data);
static void menubar_pref_cb (GtkWidget *widget, gpointer data);
@@ -131,10 +127,6 @@
G_CALLBACK (menubar_window_cb)},
{ "Predict", GTK_STOCK_DND_MULTIPLE, N_("Advanced Predict"), NULL,
N_("Open advanced pass predictor"), G_CALLBACK (menubar_predict_cb)},
- { "Rig", NULL, N_("_Radio Control"), NULL,
- N_("Open the radio control window"), G_CALLBACK (menubar_rig_cb)},
- { "Rot", NULL, N_("_Antenna Control"), NULL,
- N_("Open the antenna rotator control window"), G_CALLBACK (menubar_rot_cb)},
{ "Rdv", NULL, N_("_Space Shuttle Tool"), NULL,
N_("Open the space shuttle tool window"), G_CALLBACK (menubar_rdv_cb)},
@@ -181,9 +173,6 @@
" <menuitem action='Window'/>"
" <menuitem action='Predict'/>"
" <separator/>"
-" <menuitem action='Rig'/>"
-" <menuitem action='Rot'/>"
-" <separator/>"
" <menuitem action='Rdv'/>"
/* " <separator/>" */
/* " <menuitem action='Lab'/>" */
@@ -242,18 +231,6 @@
}
/* load custom icons */
- icon = icon_file_name ("gpredict-oscilloscope-small.png");
- image = gtk_image_new_from_file (icon);
- g_free (icon);
- menuitem = gtk_ui_manager_get_widget (uimgr, "/GpredictMenu/ToolsMenu/Rig");
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-
- icon = icon_file_name ("gpredict-antenna-small.png");
- image = gtk_image_new_from_file (icon);
- g_free (icon);
- menuitem = gtk_ui_manager_get_widget (uimgr, "/GpredictMenu/ToolsMenu/Rot");
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-
icon = icon_file_name ("gpredict-shuttle-small.png");
image = gtk_image_new_from_file (icon);
g_free (icon);
@@ -764,51 +741,6 @@
static void
-menubar_rig_cb (GtkWidget *widget, gpointer data)
-{
- GtkWidget *dialog;
-
-
- dialog = gtk_message_dialog_new (GTK_WINDOW (app),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_OK,
- _("This function is still under development."));
-
- /* Destroy the dialog when the user responds to it (e.g. clicks a button) */
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
-
- gtk_widget_show_all (dialog);
-}
-
-
-static void
-menubar_rot_cb (GtkWidget *widget, gpointer data)
-{
- GtkWidget *dialog;
-
- rot_ctrl_window_open ();
-#if 0
- dialog = gtk_message_dialog_new (GTK_WINDOW (app),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
- GTK_BUTTONS_OK,
- _("This function is still under development."));
-
- /* Destroy the dialog when the user responds to it (e.g. clicks a button) */
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
-
-
- gtk_widget_show_all (dialog);
-#endif
-}
-
-
-static void
menubar_rdv_cb (GtkWidget *widget, gpointer data)
{
rdv_open ();
Deleted: trunk/src/rot-ctrl-window.c
===================================================================
--- trunk/src/rot-ctrl-window.c 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/rot-ctrl-window.c 2008-05-01 17:24:06 UTC (rev 51)
@@ -1,216 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
- More details can be found at the project home page:
-
- http://groundstation.sourceforge.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include "sat-log.h"
-#include "compat.h"
-
-#ifdef HAVE_CONFIG_H
-# include <build-config.h>
-#endif
-
-#include "rot-ctrl-window.h"
-
-
-/** \brief Flag indicating whether the window is open or not. */
-static gboolean window_is_open = FALSE;
-
-/** \brief The rotor control window widget. */
-static GtkWidget *win;
-
-
-static GtkWidget *AzSat,*AzDelta,*AzLock,*AzSet,*AzRead;
-static GtkWidget *ElSat,*ElDelta,*ElLock,*ElSet,*ElRead;
-
-
-static gint rot_win_delete (GtkWidget *, GdkEvent *, gpointer);
-static void rot_win_destroy (GtkWidget *, gpointer);
-static gboolean rot_win_config (GtkWidget *, GdkEventConfigure *, gpointer);
-
-static GtkWidget *create_status_widgets (void);
-static GtkWidget *create_setup_widgets (void);
-static GtkWidget *create_control_widgets (void);
-
-
-
-/** \brief Open rotator control window */
-void rot_ctrl_window_open ()
-{
- GtkWidget *table;
- gchar *icon; /* icon file name */
-
-
- if (window_is_open) {
- /* window may be hidden so bring it to front */
- gtk_window_present (GTK_WINDOW (win));
- return;
- }
-
- /* create the window */
- win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (win), _("GPREDICT Rotator Control"));
- icon = icon_file_name ("gpredict-antenna.png");
- if (g_file_test (icon, G_FILE_TEST_EXISTS)) {
- gtk_window_set_icon_from_file (GTK_WINDOW (win), icon, NULL);
- }
- g_free (icon);
-
- /* connect delete and destroy signals */
- g_signal_connect (G_OBJECT (win), "delete_event",
- G_CALLBACK (rot_win_delete), NULL);
- g_signal_connect (G_OBJECT (win), "configure_event",
- G_CALLBACK (rot_win_config), NULL);
- g_signal_connect (G_OBJECT (win), "destroy",
- G_CALLBACK (rot_win_destroy), NULL);
-
- /* create contents */
- table = gtk_table_new (2, 2, FALSE);
- gtk_table_attach (GTK_TABLE (table), create_status_widgets (),
- 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
- gtk_table_attach (GTK_TABLE (table), create_setup_widgets (),
- 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
- gtk_table_attach (GTK_TABLE (table), create_control_widgets (),
- 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
-
- gtk_container_add (GTK_CONTAINER (win), table);
- gtk_widget_show_all (win);
-
- window_is_open = TRUE;
-}
-
-
-
-/** \brief Close rotator control window */
-void rot_ctrl_window_close ()
-{
- if (window_is_open) {
- gtk_widget_destroy (win);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Rotor control window is not open!"),
- __FUNCTION__);
- }
-}
-
-
-
-
-/** \brief Manage window delete events. */
-static gint
-rot_win_delete (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
- return FALSE;
-}
-
-
-
-/** \brief Manage destroy signals. */
-static void
-rot_win_destroy (GtkWidget *widget, gpointer data)
-{
- /* cloase active hardware connections. */
-
- window_is_open = FALSE;
-}
-
-
-/** \brief Manage configure events. */
-static gboolean
-rot_win_config (GtkWidget *widget, GdkEventConfigure *event, gpointer data)
-{
- return FALSE;
-}
-
-
-/** \brief Create status widgets. */
-static GtkWidget *create_status_widgets ()
-{
- GtkWidget *frame,*table,*label,*ctrbut;
-
- table = gtk_table_new (3,7, TRUE);
-
- /* table header */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>SAT</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
-
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>\316\224</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
-
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>SET</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
-
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>READ</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 5, 6, 0, 1);
-
- /* Azimuth widgets */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>AZ:</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
-
- /* Eevation widgets */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), "<b>EL:</b>");
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
-
-
-
- frame = gtk_frame_new (_("STATUS"));
- gtk_container_add (GTK_CONTAINER (frame), table);
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
-
- return frame;
-}
-
-
-/** \brief Create setup widgets. */
-static GtkWidget *create_setup_widgets ()
-{
- GtkWidget *frame;
-
- frame = gtk_frame_new (_("SETUP"));
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
-
- return frame;
-}
-
-/** \brief Create control buttons. */
-static GtkWidget *create_control_widgets ()
-{
- GtkWidget *frame;
-
- frame = gtk_frame_new (_("CONTROL"));
- gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
-
- return frame;
-}
-
Deleted: trunk/src/rot-ctrl-window.h
===================================================================
--- trunk/src/rot-ctrl-window.h 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/src/rot-ctrl-window.h 2008-05-01 17:24:06 UTC (rev 51)
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
- More details can be found at the project home page:
-
- http://groundstation.sourceforge.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-#ifndef ROT_CTRL_WINDOW_H
-#define ROT_CTRL_WINDOW_H 1
-
-void rot_ctrl_window_open (void);
-void rot_ctrl_window_close (void);
-
-#endif
Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile 2008-05-01 14:52:48 UTC (rev 50)
+++ trunk/win32/Makefile 2008-05-01 17:24:06 UTC (rev 51)
@@ -120,7 +120,6 @@
qth-editor.c \
radio-conf.c \
rig-io.c \
- rot-ctrl-window.c \
rotor-conf.c \
rdv.c \
sat-cfg.c \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-01 14:53:11
|
Revision: 50
http://gpredict.svn.sourceforge.net/gpredict/?rev=50&view=rev
Author: csete
Date: 2008-05-01 07:52:48 -0700 (Thu, 01 May 2008)
Log Message:
-----------
Added master rotator control UI widget.
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/win32/Makefile
Added Paths:
-----------
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-05-01 14:10:48 UTC (rev 49)
+++ trunk/src/Makefile.am 2008-05-01 14:52:48 UTC (rev 50)
@@ -40,6 +40,7 @@
gtk-polar-plot.c gtk-polar-plot.h \
gtk-polar-view.c gtk-polar-view.h \
gtk-polar-view-popup.c gtk-polar-view-popup.h \
+ gtk-rot-ctrl.c gtk-rot-ctrl.h \
gtk-rot-knob.c gtk-rot-knob.h \
gtk-sat-data.c gtk-sat-data.h \
gtk-sat-list.c gtk-sat-list.h \
Added: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c (rev 0)
+++ trunk/src/gtk-rot-ctrl.c 2008-05-01 14:52:48 UTC (rev 50)
@@ -0,0 +1,136 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/groundstation/
+ More details can be found at the project home page:
+
+ http://groundstation.sourceforge.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+*/
+/** \brief ROTOR control window.
+ * \ingroup widgets
+ *
+ * The master rotator control UI is implemented as a Gtk+ Widget in order
+ * to allow multiple instances. The widget is created from the module
+ * popup menu and each module can have several rotator control windows
+ * attached to it.
+ *
+ */
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <math.h>
+#include "gtk-rot-ctrl.h"
+#ifdef HAVE_CONFIG_H
+# include <build-config.h>
+#endif
+
+
+
+static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class);
+static void gtk_rot_ctrl_init (GtkRotCtrl *list);
+static void gtk_rot_ctrl_destroy (GtkObject *object);
+
+
+static GtkVBoxClass *parent_class = NULL;
+
+
+GType
+gtk_rot_ctrl_get_type ()
+{
+ static GType gtk_rot_ctrl_type = 0;
+
+ if (!gtk_rot_ctrl_type) {
+
+ static const GTypeInfo gtk_rot_ctrl_info = {
+ sizeof (GtkRotCtrlClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_rot_ctrl_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkRotCtrl),
+ 5, /* n_preallocs */
+ (GInstanceInitFunc) gtk_rot_ctrl_init,
+ };
+
+ gtk_rot_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
+ "GtkRotCtrl",
+ >k_rot_ctrl_info,
+ 0);
+ }
+
+ return gtk_rot_ctrl_type;
+}
+
+
+static void
+gtk_rot_ctrl_class_init (GtkRotCtrlClass *class)
+{
+ GObjectClass *gobject_class;
+ GtkObjectClass *object_class;
+ GtkWidgetClass *widget_class;
+ GtkContainerClass *container_class;
+
+ gobject_class = G_OBJECT_CLASS (class);
+ object_class = (GtkObjectClass*) class;
+ widget_class = (GtkWidgetClass*) class;
+ container_class = (GtkContainerClass*) class;
+
+ parent_class = g_type_class_peek_parent (class);
+
+ object_class->destroy = gtk_rot_ctrl_destroy;
+
+}
+
+
+
+static void
+gtk_rot_ctrl_init (GtkRotCtrl *ctrl)
+{
+
+
+}
+
+static void
+gtk_rot_ctrl_destroy (GtkObject *object)
+{
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
+
+
+/** \brief Create a new rotor control widget.
+ * \return A new rotor control window.
+ *
+ */
+GtkWidget *
+gtk_rot_ctrl_new ()
+{
+ GtkWidget *widget;
+ GtkWidget *table;
+ guint i;
+
+ widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
+
+
+ return widget;
+}
+
Added: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h (rev 0)
+++ trunk/src/gtk-rot-ctrl.h 2008-05-01 14:52:48 UTC (rev 50)
@@ -0,0 +1,81 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/groundstation/
+ More details can be found at the project home page:
+
+ http://groundstation.sourceforge.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+*/
+#ifndef __GTK_ROT_CTRL_H__
+#define __GTK_ROT_CTRL_H__ 1
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+
+
+#define GTK_TYPE_ROT_CTRL (gtk_rot_ctrl_get_type ())
+#define GTK_ROT_CTRL(obj) GTK_CHECK_CAST (obj,\
+ gtk_rot_ctrl_get_type (),\
+ GtkRotCtrl)
+
+#define GTK_ROT_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+ gtk_rot_ctrl_get_type (),\
+ GtkRotCtrlClass)
+
+#define IS_GTK_ROT_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_rot_ctrl_get_type ())
+
+
+typedef struct _gtk_rot_ctrl GtkRotCtrl;
+typedef struct _GtkRotCtrlClass GtkRotCtrlClass;
+
+
+
+struct _gtk_rot_ctrl
+{
+ GtkVBox vbox;
+
+};
+
+struct _GtkRotCtrlClass
+{
+ GtkVBoxClass parent_class;
+};
+
+
+
+GtkType gtk_rot_ctrl_get_type (void);
+GtkWidget* gtk_rot_ctrl_new (void);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GTK_ROT_ctrl_H__ */
Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile 2008-05-01 14:10:48 UTC (rev 49)
+++ trunk/win32/Makefile 2008-05-01 14:52:48 UTC (rev 50)
@@ -90,6 +90,7 @@
gtk-polar-plot.c \
gtk-polar-view.c \
gtk-polar-view-popup.c \
+ gtk-rot-ctrl.c \
gtk-rot-knob.c \
gtk-sat-data.c \
gtk-sat-list.c \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-01 14:10:41
|
Revision: 49
http://gpredict.svn.sourceforge.net/gpredict/?rev=49&view=rev
Author: csete
Date: 2008-05-01 07:10:48 -0700 (Thu, 01 May 2008)
Log Message:
-----------
Change GtkFreqCtrl to GtkFreqKnob.
Modified Paths:
--------------
trunk/src/gtk-freq-knob.c
trunk/src/gtk-freq-knob.h
Modified: trunk/src/gtk-freq-knob.c
===================================================================
--- trunk/src/gtk-freq-knob.c 2008-05-01 14:04:46 UTC (rev 48)
+++ trunk/src/gtk-freq-knob.c 2008-05-01 14:10:48 UTC (rev 49)
@@ -34,54 +34,54 @@
*/
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "gtk-freq-ctrl.h"
+#include "gtk-freq-knob.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
-static void gtk_freq_ctrl_class_init (GtkFreqCtrlClass *class);
-static void gtk_freq_ctrl_init (GtkFreqCtrl *list);
-static void gtk_freq_ctrl_destroy (GtkObject *object);
+static void gtk_freq_knob_class_init (GtkFreqKnobClass *class);
+static void gtk_freq_knob_init (GtkFreqKnob *list);
+static void gtk_freq_knob_destroy (GtkObject *object);
-static void gtk_freq_ctrl_update (GtkFreqCtrl *ctrl);
+static void gtk_freq_knob_update (GtkFreqKnob *knob);
static GtkHBoxClass *parent_class = NULL;
GType
-gtk_freq_ctrl_get_type ()
+gtk_freq_knob_get_type ()
{
- static GType gtk_freq_ctrl_type = 0;
+ static GType gtk_freq_knob_type = 0;
- if (!gtk_freq_ctrl_type) {
+ if (!gtk_freq_knob_type) {
- static const GTypeInfo gtk_freq_ctrl_info = {
- sizeof (GtkFreqCtrlClass),
+ static const GTypeInfo gtk_freq_knob_info = {
+ sizeof (GtkFreqKnobClass),
NULL, /* base_init */
NULL, /* base_finalize */
- (GClassInitFunc) gtk_freq_ctrl_class_init,
+ (GClassInitFunc) gtk_freq_knob_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
- sizeof (GtkFreqCtrl),
+ sizeof (GtkFreqKnob),
5, /* n_preallocs */
- (GInstanceInitFunc) gtk_freq_ctrl_init,
+ (GInstanceInitFunc) gtk_freq_knob_init,
};
- gtk_freq_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
- "GtkFreqCtrl",
- >k_freq_ctrl_info,
+ gtk_freq_knob_type = g_type_register_static (GTK_TYPE_VBOX,
+ "GtkFreqKnob",
+ >k_freq_knob_info,
0);
}
- return gtk_freq_ctrl_type;
+ return gtk_freq_knob_type;
}
static void
-gtk_freq_ctrl_class_init (GtkFreqCtrlClass *class)
+gtk_freq_knob_class_init (GtkFreqKnobClass *class)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
@@ -95,21 +95,21 @@
parent_class = g_type_class_peek_parent (class);
- object_class->destroy = gtk_freq_ctrl_destroy;
+ object_class->destroy = gtk_freq_knob_destroy;
}
static void
-gtk_freq_ctrl_init (GtkFreqCtrl *ctrl)
+gtk_freq_knob_init (GtkFreqKnob *knob)
{
}
static void
-gtk_freq_ctrl_destroy (GtkObject *object)
+gtk_freq_knob_destroy (GtkObject *object)
{
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
@@ -122,16 +122,16 @@
*
*/
GtkWidget *
-gtk_freq_ctrl_new (gdouble val)
+gtk_freq_knob_new (gdouble val)
{
GtkWidget *widget;
GtkWidget *table;
- widget = g_object_new (GTK_TYPE_FREQ_CTRL, NULL);
+ widget = g_object_new (GTK_TYPE_FREQ_KNOB, NULL);
- GTK_FREQ_CTRL(widget)->value = val;
- gtk_freq_ctrl_update (GTK_FREQ_CTRL(widget));
+ GTK_FREQ_KNOB(widget)->value = val;
+ gtk_freq_knob_update (GTK_FREQ_KNOB(widget));
gtk_widget_show_all (widget);
@@ -140,42 +140,42 @@
/** \brief Set the value of the frequency control widget.
- * \param[in] ctrl THe frequency control widget.
+ * \param[in] knob THe frequency control widget.
* \param[in] val The new value.
*
*/
void
-gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val)
+gtk_freq_knob_set_value (GtkFreqKnob *knob, gdouble val)
{
/* set the new value */
- ctrl->value = val;
+ knob->value = val;
/* update the display */
- gtk_freq_ctrl_update (ctrl);
+ gtk_freq_knob_update (knob);
}
/** \brief Get the current value of the frequency control widget.
- * \param[in] ctrl The frequency control widget.
+ * \param[in] knob The frequency control widget.
* \return The current value.
*
- * Hint: For reading the value you can also access ctrl->value.
+ * Hint: For reading the value you can also access knob->value.
*
*/
gdouble
-gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl)
+gtk_freq_knob_get_value (GtkFreqKnob *knob)
{
- return ctrl->value;
+ return knob->value;
}
/** \brief Update frequency display widget.
- * \param[in] ctrl The frequency control widget.
+ * \param[in] knob The frequency control widget.
*
*/
static void
-gtk_freq_ctrl_update (GtkFreqCtrl *ctrl)
+gtk_freq_knob_update (GtkFreqKnob *knob)
{
}
Modified: trunk/src/gtk-freq-knob.h
===================================================================
--- trunk/src/gtk-freq-knob.h 2008-05-01 14:04:46 UTC (rev 48)
+++ trunk/src/gtk-freq-knob.h 2008-05-01 14:10:48 UTC (rev 49)
@@ -25,8 +25,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, visit http://www.fsf.org/
*/
-#ifndef __GTK_FREQ_CTRL_H__
-#define __GTK_FREQ_CTRL_H__ 1
+#ifndef __GTK_FREQ_KNOB_H__
+#define __GTK_FREQ_KNOB_H__ 1
#include <glib.h>
#include <glib/gi18n.h>
@@ -40,41 +40,41 @@
-#define GTK_TYPE_FREQ_CTRL (gtk_freq_ctrl_get_type ())
-#define GTK_FREQ_CTRL(obj) GTK_CHECK_CAST (obj,\
- gtk_freq_ctrl_get_type (),\
- GtkFreqCtrl)
+#define GTK_TYPE_FREQ_KNOB (gtk_freq_knob_get_type ())
+#define GTK_FREQ_KNOB(obj) GTK_CHECK_CAST (obj,\
+ gtk_freq_knob_get_type (),\
+ GtkFreqKnob)
-#define GTK_FREQ_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
- gtk_freq_ctrl_get_type (),\
- GtkFreqCtrlClass)
+#define GTK_FREQ_KNOB_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+ gtk_freq_knob_get_type (),\
+ GtkFreqKnobClass)
-#define IS_GTK_FREQ_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_freq_ctrl_get_type ())
+#define IS_GTK_FREQ_KNOB(obj) GTK_CHECK_TYPE (obj, gtk_freq_knob_get_type ())
-typedef struct _gtk_freq_ctrl GtkFreqCtrl;
-typedef struct _GtkFreqCtrlClass GtkFreqCtrlClass;
+typedef struct _gtk_freq_knob GtkFreqKnob;
+typedef struct _GtkFreqKnobClass GtkFreqKnobClass;
-struct _gtk_freq_ctrl
+struct _gtk_freq_knob
{
GtkVBox vbox;
gdouble value;
};
-struct _GtkFreqCtrlClass
+struct _GtkFreqKnobClass
{
GtkVBoxClass parent_class;
};
-GtkType gtk_freq_ctrl_get_type (void);
-GtkWidget* gtk_freq_ctrl_new (gdouble val);
-void gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val);
-gdouble gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl);
+GtkType gtk_freq_knob_get_type (void);
+GtkWidget* gtk_freq_knob_new (gdouble val);
+void gtk_freq_knob_set_value (GtkFreqKnob *knob, gdouble val);
+gdouble gtk_freq_knob_get_value (GtkFreqKnob *knob);
@@ -83,4 +83,4 @@
}
#endif /* __cplusplus */
-#endif /* __GTK_FREQ_CTRL_H__ */
+#endif /* __GTK_FREQ_KNOB_H__ */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-01 14:05:06
|
Revision: 48
http://gpredict.svn.sourceforge.net/gpredict/?rev=48&view=rev
Author: csete
Date: 2008-05-01 07:04:46 -0700 (Thu, 01 May 2008)
Log Message:
-----------
Renamed gtk-freq-ctrl to gtk-freq-knob.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
trunk/win32/Makefile
Added Paths:
-----------
trunk/src/gtk-freq-knob.c
trunk/src/gtk-freq-knob.h
Removed Paths:
-------------
trunk/src/gtk-freq-ctrl.c
trunk/src/gtk-freq-ctrl.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-01 14:01:17 UTC (rev 47)
+++ trunk/ChangeLog 2008-05-01 14:04:46 UTC (rev 48)
@@ -1,3 +1,12 @@
+2008-05-01; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-rot-knob.[ch]:
+ New files, previously gtk-rot-ctrl.
+
+ * src/gtk-freq-knob.[ch]:
+ New files, previously gtk-freq-ctrl.
+
+
2008-04-30; Alexandru Csete <oz...@gm...>
* src/predict-tools.c:
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-05-01 14:01:17 UTC (rev 47)
+++ trunk/src/Makefile.am 2008-05-01 14:04:46 UTC (rev 48)
@@ -35,7 +35,7 @@
gpredict-url-hook.c gpredict-url-hook.h \
gpredict-utils.c gpredict-utils.h \
gtk-azel-plot.c gtk-azel-plot.h \
- gtk-freq-ctrl.c gtk-freq-ctrl.h \
+ gtk-freq-knob.c gtk-freq-knob.h \
gtk-met.c gtk-met.h \
gtk-polar-plot.c gtk-polar-plot.h \
gtk-polar-view.c gtk-polar-view.h \
Deleted: trunk/src/gtk-freq-ctrl.c
===================================================================
--- trunk/src/gtk-freq-ctrl.c 2008-05-01 14:01:17 UTC (rev 47)
+++ trunk/src/gtk-freq-ctrl.c 2008-05-01 14:04:46 UTC (rev 48)
@@ -1,181 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
- More details can be found at the project home page:
-
- http://groundstation.sourceforge.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-/** \brief FREQ control.
- *
- * More info...
- *
- * \bug This should be a generic widget, not just frequency specific
- *
- */
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include "gtk-freq-ctrl.h"
-#ifdef HAVE_CONFIG_H
-# include <build-config.h>
-#endif
-
-
-
-static void gtk_freq_ctrl_class_init (GtkFreqCtrlClass *class);
-static void gtk_freq_ctrl_init (GtkFreqCtrl *list);
-static void gtk_freq_ctrl_destroy (GtkObject *object);
-
-static void gtk_freq_ctrl_update (GtkFreqCtrl *ctrl);
-
-
-static GtkHBoxClass *parent_class = NULL;
-
-
-GType
-gtk_freq_ctrl_get_type ()
-{
- static GType gtk_freq_ctrl_type = 0;
-
- if (!gtk_freq_ctrl_type) {
-
- static const GTypeInfo gtk_freq_ctrl_info = {
- sizeof (GtkFreqCtrlClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_freq_ctrl_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkFreqCtrl),
- 5, /* n_preallocs */
- (GInstanceInitFunc) gtk_freq_ctrl_init,
- };
-
- gtk_freq_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
- "GtkFreqCtrl",
- >k_freq_ctrl_info,
- 0);
- }
-
- return gtk_freq_ctrl_type;
-}
-
-
-static void
-gtk_freq_ctrl_class_init (GtkFreqCtrlClass *class)
-{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
-
- gobject_class = G_OBJECT_CLASS (class);
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
-
- parent_class = g_type_class_peek_parent (class);
-
- object_class->destroy = gtk_freq_ctrl_destroy;
-
-}
-
-
-
-static void
-gtk_freq_ctrl_init (GtkFreqCtrl *ctrl)
-{
-
-
-}
-
-static void
-gtk_freq_ctrl_destroy (GtkObject *object)
-{
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/** \brief Create a new Frequency control widget.
- * \param[in] val The initial value of the control.
- * \return A new frequency control widget.
- *
- */
-GtkWidget *
-gtk_freq_ctrl_new (gdouble val)
-{
- GtkWidget *widget;
- GtkWidget *table;
-
-
- widget = g_object_new (GTK_TYPE_FREQ_CTRL, NULL);
-
- GTK_FREQ_CTRL(widget)->value = val;
- gtk_freq_ctrl_update (GTK_FREQ_CTRL(widget));
-
- gtk_widget_show_all (widget);
-
- return widget;
-}
-
-
-/** \brief Set the value of the frequency control widget.
- * \param[in] ctrl THe frequency control widget.
- * \param[in] val The new value.
- *
- */
-void
-gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val)
-{
- /* set the new value */
- ctrl->value = val;
-
- /* update the display */
- gtk_freq_ctrl_update (ctrl);
-}
-
-
-/** \brief Get the current value of the frequency control widget.
- * \param[in] ctrl The frequency control widget.
- * \return The current value.
- *
- * Hint: For reading the value you can also access ctrl->value.
- *
- */
-gdouble
-gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl)
-{
- return ctrl->value;
-}
-
-
-
-/** \brief Update frequency display widget.
- * \param[in] ctrl The frequency control widget.
- *
- */
-static void
-gtk_freq_ctrl_update (GtkFreqCtrl *ctrl)
-{
-
-}
Deleted: trunk/src/gtk-freq-ctrl.h
===================================================================
--- trunk/src/gtk-freq-ctrl.h 2008-05-01 14:01:17 UTC (rev 47)
+++ trunk/src/gtk-freq-ctrl.h 2008-05-01 14:04:46 UTC (rev 48)
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
- More details can be found at the project home page:
-
- http://groundstation.sourceforge.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-#ifndef __GTK_FREQ_CTRL_H__
-#define __GTK_FREQ_CTRL_H__ 1
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-
-
-#define GTK_TYPE_FREQ_CTRL (gtk_freq_ctrl_get_type ())
-#define GTK_FREQ_CTRL(obj) GTK_CHECK_CAST (obj,\
- gtk_freq_ctrl_get_type (),\
- GtkFreqCtrl)
-
-#define GTK_FREQ_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
- gtk_freq_ctrl_get_type (),\
- GtkFreqCtrlClass)
-
-#define IS_GTK_FREQ_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_freq_ctrl_get_type ())
-
-
-typedef struct _gtk_freq_ctrl GtkFreqCtrl;
-typedef struct _GtkFreqCtrlClass GtkFreqCtrlClass;
-
-
-
-struct _gtk_freq_ctrl
-{
- GtkVBox vbox;
-
- gdouble value;
-};
-
-struct _GtkFreqCtrlClass
-{
- GtkVBoxClass parent_class;
-};
-
-
-
-GtkType gtk_freq_ctrl_get_type (void);
-GtkWidget* gtk_freq_ctrl_new (gdouble val);
-void gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val);
-gdouble gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl);
-
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __GTK_FREQ_CTRL_H__ */
Copied: trunk/src/gtk-freq-knob.c (from rev 40, trunk/src/gtk-freq-ctrl.c)
===================================================================
--- trunk/src/gtk-freq-knob.c (rev 0)
+++ trunk/src/gtk-freq-knob.c 2008-05-01 14:04:46 UTC (rev 48)
@@ -0,0 +1,181 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/groundstation/
+ More details can be found at the project home page:
+
+ http://groundstation.sourceforge.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+*/
+/** \brief FREQ control.
+ *
+ * More info...
+ *
+ * \bug This should be a generic widget, not just frequency specific
+ *
+ */
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include "gtk-freq-ctrl.h"
+#ifdef HAVE_CONFIG_H
+# include <build-config.h>
+#endif
+
+
+
+static void gtk_freq_ctrl_class_init (GtkFreqCtrlClass *class);
+static void gtk_freq_ctrl_init (GtkFreqCtrl *list);
+static void gtk_freq_ctrl_destroy (GtkObject *object);
+
+static void gtk_freq_ctrl_update (GtkFreqCtrl *ctrl);
+
+
+static GtkHBoxClass *parent_class = NULL;
+
+
+GType
+gtk_freq_ctrl_get_type ()
+{
+ static GType gtk_freq_ctrl_type = 0;
+
+ if (!gtk_freq_ctrl_type) {
+
+ static const GTypeInfo gtk_freq_ctrl_info = {
+ sizeof (GtkFreqCtrlClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_freq_ctrl_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkFreqCtrl),
+ 5, /* n_preallocs */
+ (GInstanceInitFunc) gtk_freq_ctrl_init,
+ };
+
+ gtk_freq_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
+ "GtkFreqCtrl",
+ >k_freq_ctrl_info,
+ 0);
+ }
+
+ return gtk_freq_ctrl_type;
+}
+
+
+static void
+gtk_freq_ctrl_class_init (GtkFreqCtrlClass *class)
+{
+ GObjectClass *gobject_class;
+ GtkObjectClass *object_class;
+ GtkWidgetClass *widget_class;
+ GtkContainerClass *container_class;
+
+ gobject_class = G_OBJECT_CLASS (class);
+ object_class = (GtkObjectClass*) class;
+ widget_class = (GtkWidgetClass*) class;
+ container_class = (GtkContainerClass*) class;
+
+ parent_class = g_type_class_peek_parent (class);
+
+ object_class->destroy = gtk_freq_ctrl_destroy;
+
+}
+
+
+
+static void
+gtk_freq_ctrl_init (GtkFreqCtrl *ctrl)
+{
+
+
+}
+
+static void
+gtk_freq_ctrl_destroy (GtkObject *object)
+{
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
+
+
+/** \brief Create a new Frequency control widget.
+ * \param[in] val The initial value of the control.
+ * \return A new frequency control widget.
+ *
+ */
+GtkWidget *
+gtk_freq_ctrl_new (gdouble val)
+{
+ GtkWidget *widget;
+ GtkWidget *table;
+
+
+ widget = g_object_new (GTK_TYPE_FREQ_CTRL, NULL);
+
+ GTK_FREQ_CTRL(widget)->value = val;
+ gtk_freq_ctrl_update (GTK_FREQ_CTRL(widget));
+
+ gtk_widget_show_all (widget);
+
+ return widget;
+}
+
+
+/** \brief Set the value of the frequency control widget.
+ * \param[in] ctrl THe frequency control widget.
+ * \param[in] val The new value.
+ *
+ */
+void
+gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val)
+{
+ /* set the new value */
+ ctrl->value = val;
+
+ /* update the display */
+ gtk_freq_ctrl_update (ctrl);
+}
+
+
+/** \brief Get the current value of the frequency control widget.
+ * \param[in] ctrl The frequency control widget.
+ * \return The current value.
+ *
+ * Hint: For reading the value you can also access ctrl->value.
+ *
+ */
+gdouble
+gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl)
+{
+ return ctrl->value;
+}
+
+
+
+/** \brief Update frequency display widget.
+ * \param[in] ctrl The frequency control widget.
+ *
+ */
+static void
+gtk_freq_ctrl_update (GtkFreqCtrl *ctrl)
+{
+
+}
Copied: trunk/src/gtk-freq-knob.h (from rev 40, trunk/src/gtk-freq-ctrl.h)
===================================================================
--- trunk/src/gtk-freq-knob.h (rev 0)
+++ trunk/src/gtk-freq-knob.h 2008-05-01 14:04:46 UTC (rev 48)
@@ -0,0 +1,86 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/groundstation/
+ More details can be found at the project home page:
+
+ http://groundstation.sourceforge.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+*/
+#ifndef __GTK_FREQ_CTRL_H__
+#define __GTK_FREQ_CTRL_H__ 1
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+
+
+#define GTK_TYPE_FREQ_CTRL (gtk_freq_ctrl_get_type ())
+#define GTK_FREQ_CTRL(obj) GTK_CHECK_CAST (obj,\
+ gtk_freq_ctrl_get_type (),\
+ GtkFreqCtrl)
+
+#define GTK_FREQ_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+ gtk_freq_ctrl_get_type (),\
+ GtkFreqCtrlClass)
+
+#define IS_GTK_FREQ_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_freq_ctrl_get_type ())
+
+
+typedef struct _gtk_freq_ctrl GtkFreqCtrl;
+typedef struct _GtkFreqCtrlClass GtkFreqCtrlClass;
+
+
+
+struct _gtk_freq_ctrl
+{
+ GtkVBox vbox;
+
+ gdouble value;
+};
+
+struct _GtkFreqCtrlClass
+{
+ GtkVBoxClass parent_class;
+};
+
+
+
+GtkType gtk_freq_ctrl_get_type (void);
+GtkWidget* gtk_freq_ctrl_new (gdouble val);
+void gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val);
+gdouble gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl);
+
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GTK_FREQ_CTRL_H__ */
Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile 2008-05-01 14:01:17 UTC (rev 47)
+++ trunk/win32/Makefile 2008-05-01 14:04:46 UTC (rev 48)
@@ -86,7 +86,7 @@
gpredict-url-hook.c \
gpredict-utils.c \
gtk-azel-plot.c \
- gtk-freq-ctrl.c \
+ gtk-freq-knob.c \
gtk-polar-plot.c \
gtk-polar-view.c \
gtk-polar-view-popup.c \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-01 14:01:12
|
Revision: 47
http://gpredict.svn.sourceforge.net/gpredict/?rev=47&view=rev
Author: csete
Date: 2008-05-01 07:01:17 -0700 (Thu, 01 May 2008)
Log Message:
-----------
Change GtkRotCtrl to GtkRotKnob.
Modified Paths:
--------------
trunk/src/gtk-rot-knob.c
trunk/src/gtk-rot-knob.h
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2008-05-01 13:52:15 UTC (rev 46)
+++ trunk/src/gtk-rot-knob.c 2008-05-01 14:01:17 UTC (rev 47)
@@ -36,7 +36,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <math.h>
-#include "gtk-rot-ctrl.h"
+#include "gtk-rot-knob.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
@@ -45,11 +45,11 @@
#define FMTSTR "<span size='xx-large'>%c</span>"
-static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class);
-static void gtk_rot_ctrl_init (GtkRotCtrl *list);
-static void gtk_rot_ctrl_destroy (GtkObject *object);
+static void gtk_rot_knob_class_init (GtkRotKnobClass *class);
+static void gtk_rot_knob_init (GtkRotKnob *list);
+static void gtk_rot_knob_destroy (GtkObject *object);
-static void gtk_rot_ctrl_update (GtkRotCtrl *ctrl);
+static void gtk_rot_knob_update (GtkRotKnob *knob);
static void button_clicked_cb (GtkWidget *button, gpointer data);
@@ -58,36 +58,36 @@
GType
-gtk_rot_ctrl_get_type ()
+gtk_rot_knob_get_type ()
{
- static GType gtk_rot_ctrl_type = 0;
+ static GType gtk_rot_knob_type = 0;
- if (!gtk_rot_ctrl_type) {
+ if (!gtk_rot_knob_type) {
- static const GTypeInfo gtk_rot_ctrl_info = {
- sizeof (GtkRotCtrlClass),
+ static const GTypeInfo gtk_rot_knob_info = {
+ sizeof (GtkRotKnobClass),
NULL, /* base_init */
NULL, /* base_finalize */
- (GClassInitFunc) gtk_rot_ctrl_class_init,
+ (GClassInitFunc) gtk_rot_knob_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
- sizeof (GtkRotCtrl),
+ sizeof (GtkRotKnob),
5, /* n_preallocs */
- (GInstanceInitFunc) gtk_rot_ctrl_init,
+ (GInstanceInitFunc) gtk_rot_knob_init,
};
- gtk_rot_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
- "GtkRotCtrl",
- >k_rot_ctrl_info,
+ gtk_rot_knob_type = g_type_register_static (GTK_TYPE_VBOX,
+ "GtkRotKnob",
+ >k_rot_knob_info,
0);
}
- return gtk_rot_ctrl_type;
+ return gtk_rot_knob_type;
}
static void
-gtk_rot_ctrl_class_init (GtkRotCtrlClass *class)
+gtk_rot_knob_class_init (GtkRotKnobClass *class)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
@@ -101,21 +101,21 @@
parent_class = g_type_class_peek_parent (class);
- object_class->destroy = gtk_rot_ctrl_destroy;
+ object_class->destroy = gtk_rot_knob_destroy;
}
static void
-gtk_rot_ctrl_init (GtkRotCtrl *ctrl)
+gtk_rot_knob_init (GtkRotKnob *knob)
{
}
static void
-gtk_rot_ctrl_destroy (GtkObject *object)
+gtk_rot_knob_destroy (GtkObject *object)
{
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
@@ -130,160 +130,160 @@
*
*/
GtkWidget *
-gtk_rot_ctrl_new (gfloat min, gfloat max, gfloat val)
+gtk_rot_knob_new (gfloat min, gfloat max, gfloat val)
{
GtkWidget *widget;
GtkWidget *table;
guint i;
- widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
+ widget = g_object_new (GTK_TYPE_ROT_KNOB, NULL);
- GTK_ROT_CTRL(widget)->min = min;
- GTK_ROT_CTRL(widget)->max = max;
- GTK_ROT_CTRL(widget)->value = val;
+ GTK_ROT_KNOB(widget)->min = min;
+ GTK_ROT_KNOB(widget)->max = max;
+ GTK_ROT_KNOB(widget)->value = val;
/* create table */
table = gtk_table_new (3, 7, FALSE);
/* create buttons */
/* +100 deg */
- GTK_ROT_CTRL(widget)->buttons[0] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[0]),
+ GTK_ROT_KNOB(widget)->buttons[0] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[0]),
gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[0]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[0]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[0]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[0]),
"delta", GINT_TO_POINTER(10000));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[0],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[0],
1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[0], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[0], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* +10 deg */
- GTK_ROT_CTRL(widget)->buttons[1] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[1]),
+ GTK_ROT_KNOB(widget)->buttons[1] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[1]),
gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[1]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[1]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[1]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[1]),
"delta", GINT_TO_POINTER(1000));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[1],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[1],
2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[1], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[1], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* +1 deg */
- GTK_ROT_CTRL(widget)->buttons[2] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[2]),
+ GTK_ROT_KNOB(widget)->buttons[2] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[2]),
gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[2]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[2]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[2]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[2]),
"delta", GINT_TO_POINTER(100));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[2],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[2],
3, 4, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[2], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[2], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* +0.1 deg */
- GTK_ROT_CTRL(widget)->buttons[3] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[3]),
+ GTK_ROT_KNOB(widget)->buttons[3] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[3]),
gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[3]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[3]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[3]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[3]),
"delta", GINT_TO_POINTER(10));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[3],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[3],
5, 6, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[3], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[3], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* +0.01 deg */
- GTK_ROT_CTRL(widget)->buttons[4] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[4]),
+ GTK_ROT_KNOB(widget)->buttons[4] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[4]),
gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[4]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[4]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[4]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[4]),
"delta", GINT_TO_POINTER(1));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[4],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[4],
6, 7, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[4], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[4], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* -100 deg */
- GTK_ROT_CTRL(widget)->buttons[5] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[5]),
+ GTK_ROT_KNOB(widget)->buttons[5] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[5]),
gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[5]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[5]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[5]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[5]),
"delta", GINT_TO_POINTER(-10000));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[5],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[5],
1, 2, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[5], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[5], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* -10 deg */
- GTK_ROT_CTRL(widget)->buttons[6] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[6]),
+ GTK_ROT_KNOB(widget)->buttons[6] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[6]),
gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[6]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[6]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[6]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[6]),
"delta", GINT_TO_POINTER(-1000));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[6],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[6],
2, 3, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[6], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[6], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* -1 deg */
- GTK_ROT_CTRL(widget)->buttons[7] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[7]),
+ GTK_ROT_KNOB(widget)->buttons[7] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[7]),
gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[7]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[7]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[7]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[7]),
"delta", GINT_TO_POINTER(-100));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[7],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[7],
3, 4, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[7], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[7], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* -0.1 deg */
- GTK_ROT_CTRL(widget)->buttons[8] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[8]),
+ GTK_ROT_KNOB(widget)->buttons[8] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[8]),
gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[8]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[8]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[8]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[8]),
"delta", GINT_TO_POINTER(-10));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[8],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[8],
5, 6, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[8], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[8], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* -0.01 deg */
- GTK_ROT_CTRL(widget)->buttons[9] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[9]),
+ GTK_ROT_KNOB(widget)->buttons[9] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[9]),
gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[9]),
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[9]),
GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[9]),
+ g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[9]),
"delta", GINT_TO_POINTER(-1));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[9],
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[9],
6, 7, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[9], "clicked",
+ g_signal_connect (GTK_ROT_KNOB(widget)->buttons[9], "clicked",
G_CALLBACK (button_clicked_cb), widget);
/* create labels */
for (i = 0; i < 7; i++) {
- GTK_ROT_CTRL(widget)->digits[i] = gtk_label_new (NULL);
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->digits[i],
+ GTK_ROT_KNOB(widget)->digits[i] = gtk_label_new (NULL);
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->digits[i],
i, i+1, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
}
- gtk_rot_ctrl_update (GTK_ROT_CTRL(widget));
+ gtk_rot_knob_update (GTK_ROT_KNOB(widget));
gtk_container_add (GTK_CONTAINER (widget), table);
@@ -295,86 +295,86 @@
/** \brief Set the value of the rotor control widget.
- * \param[in] ctrl The rotor control widget.
+ * \param[in] knob The rotor control widget.
* \param[in] val The new value.
*
*/
void
-gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val)
+gtk_rot_knob_set_value (GtkRotKnob *knob, gfloat val)
{
/* set the new value */
- if ((val >= ctrl->min) && (val <= ctrl->max))
- ctrl->value = val;
+ if ((val >= knob->min) && (val <= knob->max))
+ knob->value = val;
/* update the display */
- gtk_rot_ctrl_update (ctrl);
+ gtk_rot_knob_update (knob);
}
/** \brief Get the current value of the rotor control widget.
- * \param[in] ctrl The rotor control widget.
+ * \param[in] knob The rotor control widget.
* \return The current value.
*
- * Hint: For reading the value you can also access ctrl->value.
+ * Hint: For reading the value you can also access knob->value.
*
*/
gfloat
-gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl)
+gtk_rot_knob_get_value (GtkRotKnob *knob)
{
- return ctrl->value;
+ return knob->value;
}
/** \brief Update rotor display widget.
- * \param[in] ctrl The rotor control widget.
+ * \param[in] knob The rotor control widget.
*
*/
static void
-gtk_rot_ctrl_update (GtkRotCtrl *ctrl)
+gtk_rot_knob_update (GtkRotKnob *knob)
{
gchar b[7];
gchar *buff;
guint i;
- g_ascii_formatd (b, 8, "%6.2f", fabs(ctrl->value));
+ g_ascii_formatd (b, 8, "%6.2f", fabs(knob->value));
/* set label markups */
for (i = 0; i < 6; i++) {
buff = g_strdup_printf (FMTSTR, b[i]);
- gtk_label_set_markup (GTK_LABEL(ctrl->digits[i+1]), buff);
+ gtk_label_set_markup (GTK_LABEL(knob->digits[i+1]), buff);
g_free (buff);
}
- if (ctrl->value <= 0)
+ if (knob->value <= 0)
buff = g_strdup_printf (FMTSTR, '-');
else
buff = g_strdup_printf (FMTSTR, ' ');
- gtk_label_set_markup (GTK_LABEL(ctrl->digits[0]), buff);
+ gtk_label_set_markup (GTK_LABEL(knob->digits[0]), buff);
g_free (buff);
}
/** \brief Button clicked event.
* \param button The button that was clicked.
- * \param data Pointer to the GtkRotCtrl widget.
+ * \param data Pointer to the GtkRotKnob widget.
*
*/
static void
button_clicked_cb (GtkWidget *button, gpointer data)
{
- GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+ GtkRotKnob *knob = GTK_ROT_KNOB (data);
gfloat delta = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (button), "delta")) / 100.0;
- if ((delta > 0.0) && ((ctrl->value + delta) <= ctrl->max)) {
- ctrl->value += delta;
+ if ((delta > 0.0) && ((knob->value + delta) <= knob->max)) {
+ knob->value += delta;
}
- else if ((delta < 0.0) && ((ctrl->value + delta) >= ctrl->min)) {
- ctrl->value += delta;
+ else if ((delta < 0.0) && ((knob->value + delta) >= knob->min)) {
+ knob->value += delta;
}
- gtk_rot_ctrl_update (ctrl);
+ gtk_rot_knob_update (knob);
- g_print ("VAL: %.2f\n", ctrl->value);
+ g_print ("VAL: %.2f\n", knob->value);
}
Modified: trunk/src/gtk-rot-knob.h
===================================================================
--- trunk/src/gtk-rot-knob.h 2008-05-01 13:52:15 UTC (rev 46)
+++ trunk/src/gtk-rot-knob.h 2008-05-01 14:01:17 UTC (rev 47)
@@ -25,8 +25,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, visit http://www.fsf.org/
*/
-#ifndef __GTK_ROT_CTRL_H__
-#define __GTK_ROT_CTRL_H__ 1
+#ifndef __GTK_ROT_KNOB_H__
+#define __GTK_ROT_KNOB_H__ 1
#include <glib.h>
#include <glib/gi18n.h>
@@ -40,24 +40,24 @@
-#define GTK_TYPE_ROT_CTRL (gtk_rot_ctrl_get_type ())
-#define GTK_ROT_CTRL(obj) GTK_CHECK_CAST (obj,\
- gtk_rot_ctrl_get_type (),\
- GtkRotCtrl)
+#define GTK_TYPE_ROT_KNOB (gtk_rot_knob_get_type ())
+#define GTK_ROT_KNOB(obj) GTK_CHECK_CAST (obj,\
+ gtk_rot_knob_get_type (),\
+ GtkRotKnob)
-#define GTK_ROT_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
- gtk_rot_ctrl_get_type (),\
- GtkRotCtrlClass)
+#define GTK_ROT_KNOB_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+ gtk_rot_knob_get_type (),\
+ GtkRotKnobClass)
-#define IS_GTK_ROT_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_rot_ctrl_get_type ())
+#define IS_GTK_ROT_KNOB(obj) GTK_CHECK_TYPE (obj, gtk_rot_knob_get_type ())
-typedef struct _gtk_rot_ctrl GtkRotCtrl;
-typedef struct _GtkRotCtrlClass GtkRotCtrlClass;
+typedef struct _gtk_rot_knob GtkRotKnob;
+typedef struct _GtkRotKnobClass GtkRotKnobClass;
-struct _gtk_rot_ctrl
+struct _gtk_rot_knob
{
GtkVBox vbox;
@@ -69,17 +69,17 @@
gfloat value;
};
-struct _GtkRotCtrlClass
+struct _GtkRotKnobClass
{
GtkVBoxClass parent_class;
};
-GtkType gtk_rot_ctrl_get_type (void);
-GtkWidget* gtk_rot_ctrl_new (gfloat min, gfloat max, gfloat val);
-void gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val);
-gfloat gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl);
+GtkType gtk_rot_knob_get_type (void);
+GtkWidget* gtk_rot_knob_new (gfloat min, gfloat max, gfloat val);
+void gtk_rot_knob_set_value (GtkRotKnob *knob, gfloat val);
+gfloat gtk_rot_knob_get_value (GtkRotKnob *knob);
@@ -88,4 +88,4 @@
}
#endif /* __cplusplus */
-#endif /* __GTK_ROT_CTRL_H__ */
+#endif /* __GTK_ROT_knob_H__ */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-05-01 13:52:10
|
Revision: 46
http://gpredict.svn.sourceforge.net/gpredict/?rev=46&view=rev
Author: csete
Date: 2008-05-01 06:52:15 -0700 (Thu, 01 May 2008)
Log Message:
-----------
Renamed gtk-rot-ctrl to gtk-rot-knob.
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/win32/Makefile
Added Paths:
-----------
trunk/src/gtk-rot-knob.c
trunk/src/gtk-rot-knob.h
Removed Paths:
-------------
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-04-30 22:58:38 UTC (rev 45)
+++ trunk/src/Makefile.am 2008-05-01 13:52:15 UTC (rev 46)
@@ -40,7 +40,7 @@
gtk-polar-plot.c gtk-polar-plot.h \
gtk-polar-view.c gtk-polar-view.h \
gtk-polar-view-popup.c gtk-polar-view-popup.h \
- gtk-rot-ctrl.c gtk-rot-ctrl.h \
+ gtk-rot-knob.c gtk-rot-knob.h \
gtk-sat-data.c gtk-sat-data.h \
gtk-sat-list.c gtk-sat-list.h \
gtk-sat-list-col-sel.c gtk-sat-list-col-sel.h \
Deleted: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-04-30 22:58:38 UTC (rev 45)
+++ trunk/src/gtk-rot-ctrl.c 2008-05-01 13:52:15 UTC (rev 46)
@@ -1,380 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
- More details can be found at the project home page:
-
- http://groundstation.sourceforge.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-/** \brief ROTOR control.
- * \ingroup widgets
- *
- * More info...
- *
- * \bug This should be a generic widget, not just rotor specific
- *
- */
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <math.h>
-#include "gtk-rot-ctrl.h"
-#ifdef HAVE_CONFIG_H
-# include <build-config.h>
-#endif
-
-
-#define FMTSTR "<span size='xx-large'>%c</span>"
-
-
-static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class);
-static void gtk_rot_ctrl_init (GtkRotCtrl *list);
-static void gtk_rot_ctrl_destroy (GtkObject *object);
-
-static void gtk_rot_ctrl_update (GtkRotCtrl *ctrl);
-
-static void button_clicked_cb (GtkWidget *button, gpointer data);
-
-
-static GtkHBoxClass *parent_class = NULL;
-
-
-GType
-gtk_rot_ctrl_get_type ()
-{
- static GType gtk_rot_ctrl_type = 0;
-
- if (!gtk_rot_ctrl_type) {
-
- static const GTypeInfo gtk_rot_ctrl_info = {
- sizeof (GtkRotCtrlClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_rot_ctrl_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkRotCtrl),
- 5, /* n_preallocs */
- (GInstanceInitFunc) gtk_rot_ctrl_init,
- };
-
- gtk_rot_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
- "GtkRotCtrl",
- >k_rot_ctrl_info,
- 0);
- }
-
- return gtk_rot_ctrl_type;
-}
-
-
-static void
-gtk_rot_ctrl_class_init (GtkRotCtrlClass *class)
-{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
-
- gobject_class = G_OBJECT_CLASS (class);
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
-
- parent_class = g_type_class_peek_parent (class);
-
- object_class->destroy = gtk_rot_ctrl_destroy;
-
-}
-
-
-
-static void
-gtk_rot_ctrl_init (GtkRotCtrl *ctrl)
-{
-
-
-}
-
-static void
-gtk_rot_ctrl_destroy (GtkObject *object)
-{
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/** \brief Create a new rotor control widget.
- * \param[in] min The lower limit in decimal degrees.
- * \param[in] max The upper limit in decimal degrees.
- * \param[in] val The initial value of the control.
- * \return A new rotor control widget.
- *
- */
-GtkWidget *
-gtk_rot_ctrl_new (gfloat min, gfloat max, gfloat val)
-{
- GtkWidget *widget;
- GtkWidget *table;
- guint i;
-
- widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
-
- GTK_ROT_CTRL(widget)->min = min;
- GTK_ROT_CTRL(widget)->max = max;
- GTK_ROT_CTRL(widget)->value = val;
-
- /* create table */
- table = gtk_table_new (3, 7, FALSE);
-
- /* create buttons */
- /* +100 deg */
- GTK_ROT_CTRL(widget)->buttons[0] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[0]),
- gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[0]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[0]),
- "delta", GINT_TO_POINTER(10000));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[0],
- 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[0], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* +10 deg */
- GTK_ROT_CTRL(widget)->buttons[1] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[1]),
- gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[1]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[1]),
- "delta", GINT_TO_POINTER(1000));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[1],
- 2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[1], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* +1 deg */
- GTK_ROT_CTRL(widget)->buttons[2] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[2]),
- gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[2]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[2]),
- "delta", GINT_TO_POINTER(100));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[2],
- 3, 4, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[2], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* +0.1 deg */
- GTK_ROT_CTRL(widget)->buttons[3] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[3]),
- gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[3]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[3]),
- "delta", GINT_TO_POINTER(10));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[3],
- 5, 6, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[3], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* +0.01 deg */
- GTK_ROT_CTRL(widget)->buttons[4] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[4]),
- gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[4]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[4]),
- "delta", GINT_TO_POINTER(1));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[4],
- 6, 7, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[4], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* -100 deg */
- GTK_ROT_CTRL(widget)->buttons[5] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[5]),
- gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[5]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[5]),
- "delta", GINT_TO_POINTER(-10000));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[5],
- 1, 2, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[5], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* -10 deg */
- GTK_ROT_CTRL(widget)->buttons[6] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[6]),
- gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[6]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[6]),
- "delta", GINT_TO_POINTER(-1000));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[6],
- 2, 3, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[6], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* -1 deg */
- GTK_ROT_CTRL(widget)->buttons[7] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[7]),
- gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[7]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[7]),
- "delta", GINT_TO_POINTER(-100));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[7],
- 3, 4, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[7], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* -0.1 deg */
- GTK_ROT_CTRL(widget)->buttons[8] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[8]),
- gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[8]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[8]),
- "delta", GINT_TO_POINTER(-10));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[8],
- 5, 6, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[8], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* -0.01 deg */
- GTK_ROT_CTRL(widget)->buttons[9] = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[9]),
- gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
- gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[9]),
- GTK_RELIEF_NONE);
- g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[9]),
- "delta", GINT_TO_POINTER(-1));
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[9],
- 6, 7, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- g_signal_connect (GTK_ROT_CTRL(widget)->buttons[9], "clicked",
- G_CALLBACK (button_clicked_cb), widget);
-
- /* create labels */
- for (i = 0; i < 7; i++) {
- GTK_ROT_CTRL(widget)->digits[i] = gtk_label_new (NULL);
- gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->digits[i],
- i, i+1, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
- }
-
- gtk_rot_ctrl_update (GTK_ROT_CTRL(widget));
-
-
- gtk_container_add (GTK_CONTAINER (widget), table);
- gtk_widget_show_all (widget);
-
-
- return widget;
-}
-
-
-/** \brief Set the value of the rotor control widget.
- * \param[in] ctrl The rotor control widget.
- * \param[in] val The new value.
- *
- */
-void
-gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val)
-{
- /* set the new value */
- if ((val >= ctrl->min) && (val <= ctrl->max))
- ctrl->value = val;
-
- /* update the display */
- gtk_rot_ctrl_update (ctrl);
-}
-
-
-/** \brief Get the current value of the rotor control widget.
- * \param[in] ctrl The rotor control widget.
- * \return The current value.
- *
- * Hint: For reading the value you can also access ctrl->value.
- *
- */
-gfloat
-gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl)
-{
- return ctrl->value;
-}
-
-
-
-/** \brief Update rotor display widget.
- * \param[in] ctrl The rotor control widget.
- *
- */
-static void
-gtk_rot_ctrl_update (GtkRotCtrl *ctrl)
-{
- gchar b[7];
- gchar *buff;
- guint i;
-
- g_ascii_formatd (b, 8, "%6.2f", fabs(ctrl->value));
-
- /* set label markups */
- for (i = 0; i < 6; i++) {
- buff = g_strdup_printf (FMTSTR, b[i]);
- gtk_label_set_markup (GTK_LABEL(ctrl->digits[i+1]), buff);
- g_free (buff);
- }
-
- if (ctrl->value <= 0)
- buff = g_strdup_printf (FMTSTR, '-');
- else
- buff = g_strdup_printf (FMTSTR, ' ');
-
- gtk_label_set_markup (GTK_LABEL(ctrl->digits[0]), buff);
- g_free (buff);
-}
-
-
-/** \brief Button clicked event.
- * \param button The button that was clicked.
- * \param data Pointer to the GtkRotCtrl widget.
- *
- */
-static void
-button_clicked_cb (GtkWidget *button, gpointer data)
-{
- GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
- gfloat delta = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (button), "delta")) / 100.0;
-
- if ((delta > 0.0) && ((ctrl->value + delta) <= ctrl->max)) {
- ctrl->value += delta;
- }
- else if ((delta < 0.0) && ((ctrl->value + delta) >= ctrl->min)) {
- ctrl->value += delta;
- }
-
- gtk_rot_ctrl_update (ctrl);
-
- g_print ("VAL: %.2f\n", ctrl->value);
-}
Deleted: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-04-30 22:58:38 UTC (rev 45)
+++ trunk/src/gtk-rot-ctrl.h 2008-05-01 13:52:15 UTC (rev 46)
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/groundstation/
- More details can be found at the project home page:
-
- http://groundstation.sourceforge.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-#ifndef __GTK_ROT_CTRL_H__
-#define __GTK_ROT_CTRL_H__ 1
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-
-
-#define GTK_TYPE_ROT_CTRL (gtk_rot_ctrl_get_type ())
-#define GTK_ROT_CTRL(obj) GTK_CHECK_CAST (obj,\
- gtk_rot_ctrl_get_type (),\
- GtkRotCtrl)
-
-#define GTK_ROT_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
- gtk_rot_ctrl_get_type (),\
- GtkRotCtrlClass)
-
-#define IS_GTK_ROT_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_rot_ctrl_get_type ())
-
-
-typedef struct _gtk_rot_ctrl GtkRotCtrl;
-typedef struct _GtkRotCtrlClass GtkRotCtrlClass;
-
-
-
-struct _gtk_rot_ctrl
-{
- GtkVBox vbox;
-
- GtkWidget *digits[7]; /*!< Labels for the digits */
- GtkWidget *buttons[10]; /*!< Buttons; 0..4 up; 5..9 down */
-
- gfloat min;
- gfloat max;
- gfloat value;
-};
-
-struct _GtkRotCtrlClass
-{
- GtkVBoxClass parent_class;
-};
-
-
-
-GtkType gtk_rot_ctrl_get_type (void);
-GtkWidget* gtk_rot_ctrl_new (gfloat min, gfloat max, gfloat val);
-void gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val);
-gfloat gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl);
-
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __GTK_ROT_CTRL_H__ */
Copied: trunk/src/gtk-rot-knob.c (from rev 40, trunk/src/gtk-rot-ctrl.c)
===================================================================
--- trunk/src/gtk-rot-knob.c (rev 0)
+++ trunk/src/gtk-rot-knob.c 2008-05-01 13:52:15 UTC (rev 46)
@@ -0,0 +1,380 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/groundstation/
+ More details can be found at the project home page:
+
+ http://groundstation.sourceforge.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+*/
+/** \brief ROTOR control.
+ * \ingroup widgets
+ *
+ * More info...
+ *
+ * \bug This should be a generic widget, not just rotor specific
+ *
+ */
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <math.h>
+#include "gtk-rot-ctrl.h"
+#ifdef HAVE_CONFIG_H
+# include <build-config.h>
+#endif
+
+
+#define FMTSTR "<span size='xx-large'>%c</span>"
+
+
+static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class);
+static void gtk_rot_ctrl_init (GtkRotCtrl *list);
+static void gtk_rot_ctrl_destroy (GtkObject *object);
+
+static void gtk_rot_ctrl_update (GtkRotCtrl *ctrl);
+
+static void button_clicked_cb (GtkWidget *button, gpointer data);
+
+
+static GtkHBoxClass *parent_class = NULL;
+
+
+GType
+gtk_rot_ctrl_get_type ()
+{
+ static GType gtk_rot_ctrl_type = 0;
+
+ if (!gtk_rot_ctrl_type) {
+
+ static const GTypeInfo gtk_rot_ctrl_info = {
+ sizeof (GtkRotCtrlClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_rot_ctrl_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkRotCtrl),
+ 5, /* n_preallocs */
+ (GInstanceInitFunc) gtk_rot_ctrl_init,
+ };
+
+ gtk_rot_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
+ "GtkRotCtrl",
+ >k_rot_ctrl_info,
+ 0);
+ }
+
+ return gtk_rot_ctrl_type;
+}
+
+
+static void
+gtk_rot_ctrl_class_init (GtkRotCtrlClass *class)
+{
+ GObjectClass *gobject_class;
+ GtkObjectClass *object_class;
+ GtkWidgetClass *widget_class;
+ GtkContainerClass *container_class;
+
+ gobject_class = G_OBJECT_CLASS (class);
+ object_class = (GtkObjectClass*) class;
+ widget_class = (GtkWidgetClass*) class;
+ container_class = (GtkContainerClass*) class;
+
+ parent_class = g_type_class_peek_parent (class);
+
+ object_class->destroy = gtk_rot_ctrl_destroy;
+
+}
+
+
+
+static void
+gtk_rot_ctrl_init (GtkRotCtrl *ctrl)
+{
+
+
+}
+
+static void
+gtk_rot_ctrl_destroy (GtkObject *object)
+{
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
+
+
+/** \brief Create a new rotor control widget.
+ * \param[in] min The lower limit in decimal degrees.
+ * \param[in] max The upper limit in decimal degrees.
+ * \param[in] val The initial value of the control.
+ * \return A new rotor control widget.
+ *
+ */
+GtkWidget *
+gtk_rot_ctrl_new (gfloat min, gfloat max, gfloat val)
+{
+ GtkWidget *widget;
+ GtkWidget *table;
+ guint i;
+
+ widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
+
+ GTK_ROT_CTRL(widget)->min = min;
+ GTK_ROT_CTRL(widget)->max = max;
+ GTK_ROT_CTRL(widget)->value = val;
+
+ /* create table */
+ table = gtk_table_new (3, 7, FALSE);
+
+ /* create buttons */
+ /* +100 deg */
+ GTK_ROT_CTRL(widget)->buttons[0] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[0]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[0]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[0]),
+ "delta", GINT_TO_POINTER(10000));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[0],
+ 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[0], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* +10 deg */
+ GTK_ROT_CTRL(widget)->buttons[1] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[1]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[1]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[1]),
+ "delta", GINT_TO_POINTER(1000));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[1],
+ 2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[1], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* +1 deg */
+ GTK_ROT_CTRL(widget)->buttons[2] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[2]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[2]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[2]),
+ "delta", GINT_TO_POINTER(100));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[2],
+ 3, 4, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[2], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* +0.1 deg */
+ GTK_ROT_CTRL(widget)->buttons[3] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[3]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[3]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[3]),
+ "delta", GINT_TO_POINTER(10));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[3],
+ 5, 6, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[3], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* +0.01 deg */
+ GTK_ROT_CTRL(widget)->buttons[4] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[4]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[4]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[4]),
+ "delta", GINT_TO_POINTER(1));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[4],
+ 6, 7, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[4], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -100 deg */
+ GTK_ROT_CTRL(widget)->buttons[5] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[5]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[5]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[5]),
+ "delta", GINT_TO_POINTER(-10000));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[5],
+ 1, 2, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[5], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -10 deg */
+ GTK_ROT_CTRL(widget)->buttons[6] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[6]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[6]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[6]),
+ "delta", GINT_TO_POINTER(-1000));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[6],
+ 2, 3, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[6], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -1 deg */
+ GTK_ROT_CTRL(widget)->buttons[7] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[7]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[7]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[7]),
+ "delta", GINT_TO_POINTER(-100));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[7],
+ 3, 4, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[7], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -0.1 deg */
+ GTK_ROT_CTRL(widget)->buttons[8] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[8]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[8]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[8]),
+ "delta", GINT_TO_POINTER(-10));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[8],
+ 5, 6, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[8], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -0.01 deg */
+ GTK_ROT_CTRL(widget)->buttons[9] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[9]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[9]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[9]),
+ "delta", GINT_TO_POINTER(-1));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[9],
+ 6, 7, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[9], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* create labels */
+ for (i = 0; i < 7; i++) {
+ GTK_ROT_CTRL(widget)->digits[i] = gtk_label_new (NULL);
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->digits[i],
+ i, i+1, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ }
+
+ gtk_rot_ctrl_update (GTK_ROT_CTRL(widget));
+
+
+ gtk_container_add (GTK_CONTAINER (widget), table);
+ gtk_widget_show_all (widget);
+
+
+ return widget;
+}
+
+
+/** \brief Set the value of the rotor control widget.
+ * \param[in] ctrl The rotor control widget.
+ * \param[in] val The new value.
+ *
+ */
+void
+gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val)
+{
+ /* set the new value */
+ if ((val >= ctrl->min) && (val <= ctrl->max))
+ ctrl->value = val;
+
+ /* update the display */
+ gtk_rot_ctrl_update (ctrl);
+}
+
+
+/** \brief Get the current value of the rotor control widget.
+ * \param[in] ctrl The rotor control widget.
+ * \return The current value.
+ *
+ * Hint: For reading the value you can also access ctrl->value.
+ *
+ */
+gfloat
+gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl)
+{
+ return ctrl->value;
+}
+
+
+
+/** \brief Update rotor display widget.
+ * \param[in] ctrl The rotor control widget.
+ *
+ */
+static void
+gtk_rot_ctrl_update (GtkRotCtrl *ctrl)
+{
+ gchar b[7];
+ gchar *buff;
+ guint i;
+
+ g_ascii_formatd (b, 8, "%6.2f", fabs(ctrl->value));
+
+ /* set label markups */
+ for (i = 0; i < 6; i++) {
+ buff = g_strdup_printf (FMTSTR, b[i]);
+ gtk_label_set_markup (GTK_LABEL(ctrl->digits[i+1]), buff);
+ g_free (buff);
+ }
+
+ if (ctrl->value <= 0)
+ buff = g_strdup_printf (FMTSTR, '-');
+ else
+ buff = g_strdup_printf (FMTSTR, ' ');
+
+ gtk_label_set_markup (GTK_LABEL(ctrl->digits[0]), buff);
+ g_free (buff);
+}
+
+
+/** \brief Button clicked event.
+ * \param button The button that was clicked.
+ * \param data Pointer to the GtkRotCtrl widget.
+ *
+ */
+static void
+button_clicked_cb (GtkWidget *button, gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+ gfloat delta = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (button), "delta")) / 100.0;
+
+ if ((delta > 0.0) && ((ctrl->value + delta) <= ctrl->max)) {
+ ctrl->value += delta;
+ }
+ else if ((delta < 0.0) && ((ctrl->value + delta) >= ctrl->min)) {
+ ctrl->value += delta;
+ }
+
+ gtk_rot_ctrl_update (ctrl);
+
+ g_print ("VAL: %.2f\n", ctrl->value);
+}
Copied: trunk/src/gtk-rot-knob.h (from rev 40, trunk/src/gtk-rot-ctrl.h)
===================================================================
--- trunk/src/gtk-rot-knob.h (rev 0)
+++ trunk/src/gtk-rot-knob.h 2008-05-01 13:52:15 UTC (rev 46)
@@ -0,0 +1,91 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/groundstation/
+ More details can be found at the project home page:
+
+ http://groundstation.sourceforge.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+*/
+#ifndef __GTK_ROT_CTRL_H__
+#define __GTK_ROT_CTRL_H__ 1
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+
+
+#define GTK_TYPE_ROT_CTRL (gtk_rot_ctrl_get_type ())
+#define GTK_ROT_CTRL(obj) GTK_CHECK_CAST (obj,\
+ gtk_rot_ctrl_get_type (),\
+ GtkRotCtrl)
+
+#define GTK_ROT_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
+ gtk_rot_ctrl_get_type (),\
+ GtkRotCtrlClass)
+
+#define IS_GTK_ROT_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_rot_ctrl_get_type ())
+
+
+typedef struct _gtk_rot_ctrl GtkRotCtrl;
+typedef struct _GtkRotCtrlClass GtkRotCtrlClass;
+
+
+
+struct _gtk_rot_ctrl
+{
+ GtkVBox vbox;
+
+ GtkWidget *digits[7]; /*!< Labels for the digits */
+ GtkWidget *buttons[10]; /*!< Buttons; 0..4 up; 5..9 down */
+
+ gfloat min;
+ gfloat max;
+ gfloat value;
+};
+
+struct _GtkRotCtrlClass
+{
+ GtkVBoxClass parent_class;
+};
+
+
+
+GtkType gtk_rot_ctrl_get_type (void);
+GtkWidget* gtk_rot_ctrl_new (gfloat min, gfloat max, gfloat val);
+void gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val);
+gfloat gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl);
+
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GTK_ROT_CTRL_H__ */
Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile 2008-04-30 22:58:38 UTC (rev 45)
+++ trunk/win32/Makefile 2008-05-01 13:52:15 UTC (rev 46)
@@ -90,7 +90,7 @@
gtk-polar-plot.c \
gtk-polar-view.c \
gtk-polar-view-popup.c \
- gtk-rot-ctrl.c \
+ gtk-rot-knob.c \
gtk-sat-data.c \
gtk-sat-list.c \
gtk-sat-list-col-sel.c \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-30 22:58:31
|
Revision: 45
http://gpredict.svn.sourceforge.net/gpredict/?rev=45&view=rev
Author: csete
Date: 2008-04-30 15:58:38 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
Updated about box to include license reference in the Help menu.
Modified Paths:
--------------
trunk/src/about.c
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2008-04-30 22:53:00 UTC (rev 44)
+++ trunk/src/about.c 2008-04-30 22:58:38 UTC (rev 45)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
@@ -64,7 +64,8 @@
"warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "\
"See the GNU Library General Public License for more details.\n\n"\
"You should have received a copy of the GNU General Public License "\
- "along with this program; if not, you can find a copy on the FSF "\
+ "along with this program (see Help->License). Otherwise you can find "\
+ "a copy on the FSF "\
"website http://www.fsf.org/licensing/licenses/gpl.html or you can "\
"write to the\n\n"
"Free Software Foundation, Inc.\n"\
@@ -87,11 +88,11 @@
gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (dialog), _("GPREDICT"));
gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (dialog), VERSION);
gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (dialog),
- _("Copyright (C) 2001-2007 Alexandru Csete OZ9AEC\n\n"\
+ _("Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n\n"\
"Gpredict is available free of charge from:"));
gtk_about_dialog_set_url_hook (gpredict_url_hook_cb, NULL, NULL);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (dialog),
- "http://groundstation.sourceforge.net/gpredict/");
+ "http://gpredict.sourceforge.net/");
/* gtk_about_dialog_set_website_label (GTK_ABOUT_DIALOG (dialog), */
/* _("Gpredict Website")); */
gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (dialog), license);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-30 22:52:56
|
Revision: 44
http://gpredict.svn.sourceforge.net/gpredict/?rev=44&view=rev
Author: csete
Date: 2008-04-30 15:53:00 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-30 22:52:11 UTC (rev 43)
+++ trunk/ChangeLog 2008-04-30 22:53:00 UTC (rev 44)
@@ -2,6 +2,9 @@
* src/predict-tools.c:
Fixed bug 1954664: Wrong overpass prediction.
+
+ * src/gtk-single-sat.c:
+ Fixed bug 1880815: Null pointer dereference causes crash on startup.
2008-04-24; Alexandru Csete <oz...@gm...>
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-04-30 22:52:11 UTC (rev 43)
+++ trunk/NEWS 2008-04-30 22:53:00 UTC (rev 44)
@@ -22,6 +22,7 @@
- Fixed bug 1848837: Typo in preferences dialogue.
- Fixed bug 1704133: Blank lines in config file.
- Fixed bug 1954664: Wrong overpass prediction.
+- Fixed bug 1880815: Null pointer dereference causes crash on startup.
x Windows: New installer instead of ZIP distribution.
x Updated user manual as PDF and HTML (online).
x New TechNote: Algo ref.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-30 22:52:11
|
Revision: 43
http://gpredict.svn.sourceforge.net/gpredict/?rev=43&view=rev
Author: csete
Date: 2008-04-30 15:52:11 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
Fixed bug 1880815: Null pointer dereference causes crash on startup.
Modified Paths:
--------------
trunk/src/gtk-single-sat.c
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2008-04-30 22:38:07 UTC (rev 42)
+++ trunk/src/gtk-single-sat.c 2008-04-30 22:52:11 UTC (rev 43)
@@ -254,7 +254,7 @@
/* create header */
sat = SAT (g_slist_nth_data (GTK_SINGLE_SAT (widget)->sats, 0));
- title = g_strdup_printf ("<b>%s</b>", sat->tle.sat_name);
+ title = g_strdup_printf ("<b>%s</b>", sat ? sat->tle.sat_name : "noname");
GTK_SINGLE_SAT (widget)->header = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (GTK_SINGLE_SAT (widget)->header), title);
@@ -398,6 +398,13 @@
/* get selected satellite */
sat = SAT (g_slist_nth_data (ssat->sats, ssat->selected));
+
+ if G_UNLIKELY(!sat) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%d: Can not update non-existing sat"),
+ __FILE__, __LINE__);
+ return;
+ }
/* update requested field */
switch (i) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-30 22:38:04
|
Revision: 42
http://gpredict.svn.sourceforge.net/gpredict/?rev=42&view=rev
Author: csete
Date: 2008-04-30 15:38:07 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/goocanv8/Makefile.in
trunk/goocanv8/aclocal.m4
trunk/goocanv8/configure
trunk/goocanv8/src/Makefile.in
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-30 22:34:44 UTC (rev 41)
+++ trunk/ChangeLog 2008-04-30 22:38:07 UTC (rev 42)
@@ -1,3 +1,9 @@
+2008-04-30; Alexandru Csete <oz...@gm...>
+
+ * src/predict-tools.c:
+ Fixed bug 1954664: Wrong overpass prediction.
+
+
2008-04-24; Alexandru Csete <oz...@gm...>
* src/rot-ctrl-window.[ch]:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-04-30 22:34:44 UTC (rev 41)
+++ trunk/NEWS 2008-04-30 22:38:07 UTC (rev 42)
@@ -21,6 +21,7 @@
- Fixed bug 1839140: Sky at a glance axis incorrectly labelled.
- Fixed bug 1848837: Typo in preferences dialogue.
- Fixed bug 1704133: Blank lines in config file.
+- Fixed bug 1954664: Wrong overpass prediction.
x Windows: New installer instead of ZIP distribution.
x Updated user manual as PDF and HTML (online).
x New TechNote: Algo ref.
Modified: trunk/goocanv8/Makefile.in
===================================================================
--- trunk/goocanv8/Makefile.in 2008-04-30 22:34:44 UTC (rev 41)
+++ trunk/goocanv8/Makefile.in 2008-04-30 22:38:07 UTC (rev 42)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,18 +31,18 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/goocanvas.pc.in $(top_srcdir)/configure AUTHORS \
COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = goocanvas.pc
@@ -54,10 +50,13 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -73,8 +72,6 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -110,6 +107,7 @@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -124,9 +122,8 @@
LTLIBOBJS = @LTLIBOBJS@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -142,8 +139,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -157,13 +152,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -175,6 +170,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -202,8 +198,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = src po
# require automake 1.7
@@ -253,7 +252,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -277,7 +276,6 @@
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -310,8 +308,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -413,24 +410,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/po
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -444,7 +439,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -452,6 +447,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -459,7 +456,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -534,7 +531,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -604,12 +601,20 @@
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -630,24 +635,26 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: trunk/goocanv8/aclocal.m4
===================================================================
--- trunk/goocanv8/aclocal.m4 2008-04-30 22:34:44 UTC (rev 41)
+++ trunk/goocanv8/aclocal.m4 2008-04-30 22:38:07 UTC (rev 42)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,11 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
@@ -7184,7 +7189,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7194,14 +7199,29 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.10], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -7258,14 +7278,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 7
+# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -7274,8 +7294,10 @@
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -7289,15 +7311,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -7325,6 +7346,7 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -7390,6 +7412,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -7442,7 +7465,8 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -7467,8 +7491,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -7515,8 +7540,8 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7539,16 +7564,20 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
@@ -7568,6 +7597,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -7603,6 +7635,10 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@@ -7638,7 +7674,7 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -7745,14 +7781,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -7768,6 +7804,7 @@
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -7778,7 +7815,7 @@
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7786,60 +7823,23 @@
# AM_PROG_MKDIR_P
# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
# Helper functions for option handling. -*- Autoconf -*-
@@ -7951,9 +7951,21 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
Modified: trunk/goocanv8/configure
===================================================================
--- trunk/goocanv8/configure 2008-04-30 22:34:44 UTC (rev 41)
+++ trunk/goocanv8/configure 2008-04-30 22:38:07 UTC (rev 42)
@@ -807,6 +807,7 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -1971,7 +1972,8 @@
ac_config_headers="$ac_config_headers config.h"
-am__api_version="1.9"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2154,39 +2156,54 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2268,12 +2285,16 @@
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2316,7 +2337,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2420,7 +2441,7 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2457,9 +2478,7 @@
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+ if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
@@ -2524,9 +2543,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -2535,7 +2552,6 @@
fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3522,6 +3538,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3551,9 +3568,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -4391,6 +4406,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4420,9 +4436,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -5645,7 +5659,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5648 "configure"' > conftest.$ac_ext
+ echo '#line 5662 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6471,6 +6485,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -6500,9 +6515,7 @@
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -7978,11 +7991,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7981: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7994: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7985: \$? = $ac_status" >&5
+ echo "$as_me:7998: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8268,11 +8281,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8271: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8275: \$? = $ac_status" >&5
+ echo "$as_me:8288: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8372,11 +8385,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8375: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8379: \$? = $ac_status" >&5
+ echo "$as_me:8392: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10734,7 +10747,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10737 "configure"
+#line 10750 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10834,7 +10847,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10837 "configure"
+#line 10850 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13254,11 +13267,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13257: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13270: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13261: \$? = $ac_status" >&5
+ echo "$as_me:13274: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13358,11 +13371,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13361: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13374: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13365: \$? = $ac_status" >&5
+ echo "$as_me:13378: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14935,11 +14948,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14938: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14951: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14942: \$? = $ac_status" >&5
+ echo "$as_me:14955: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15039,11 +15052,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15042: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15055: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15046: \$? = $ac_status" >&5
+ echo "$as_me:15059: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17239,11 +17252,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17242: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17255: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17246: \$? = $ac_status" >&5
+ echo "$as_me:17259: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17529,11 +17542,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17532: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17545: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17536: \$? = $ac_status" >&5
+ echo "$as_me:17549: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17633,11 +17646,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17649: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17640: \$? = $ac_status" >&5
+ echo "$as_me:17653: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -22141,9 +22154,7 @@
esac
{ echo "$as_me:$LINENO: result: $platform_win32" >&5
echo "${ECHO_T}$platform_win32" >&6; }
-
-
-if test "$platform_win32" = "yes"; then
+ if test "$platform_win32" = "yes"; then
PLATFORM_WIN32_TRUE=
PLATFORM_WIN32_FALSE='#'
else
@@ -22658,6 +22669,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -22870,6 +22882,7 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -22926,7 +22939,6 @@
RANLIB!$RANLIB$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22968,6 +22980,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+ac_ct_CXX!$ac_ct_CXX$ac_delim
CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
@@ -23006,7 +23019,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -23233,6 +23246,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -23286,6 +23304,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@@ -23450,8 +23469,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
Modified: trunk/goocanv8/src/Makefile.in
===================================================================
--- trunk/goocanv8/src/Makefile.in 2008-04-30 22:34:44 UTC (rev 41)
+++ trunk/goocanv8/src/Makefile.in 2008-04-30 22:38:07 UTC (rev 42)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,15 +15,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -58,17 +54,21 @@
goocanvastext.lo goocanvasutils.lo goocanvaswidget.lo \
goocanvas.lo
libgoocanvas_la_OBJECTS = $(am_libgoocanvas_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+libgoocanvas_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libgoocanvas_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
SOURCES = $(libgoocanvas_la_SOURCES)
DIST_SOURCES = $(libgoocanvas_la_SOURCES)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -84,8 +84,6 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -121,6 +119,7 @@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -135,9 +134,8 @@
LTLIBOBJS = @LTLIBOBJS@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -153,8 +151,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -168,13 +164,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -186,6 +182,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -213,8 +210,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
INCLUDES = \
-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
@@ -341,7 +341,7 @@
rm -f "$${dir}/so_locations"; \
done
libgoocanvas.la: $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_DEPENDENCIES)
- $(LINK) $(libgoocanvas_la_LDFLAGS) $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_LIBADD) $(LIBS)
+ $(libgoocanvas_la_LINK) $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -369,22 +369,22 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvaswidget.Plo@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -394,13 +394,9 @@
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
install-libgoocanvasincludeHEADERS: $(libgoocanvasinclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libgoocanvasincludedir)" || $(mkdir_p) "$(DESTDIR)$(libgoocanvasincludedir)"
+ test -z "$(libgoocanvasincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgoocanvasincludedir)"
@list='$(libgoocanvasinclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -465,22 +461,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -497,7 +492,7 @@
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libgoocanvasincludedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -536,7 +531,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-tags
dvi: dvi-am
@@ -550,12 +545,20 @@
install-data-am: install-libgoocanvasincludeHEADERS
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -576,19 +579,23 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-libgoocanvasincludeHEADERS
+uninstall-am: uninstall-libgoocanvasincludeHEADERS
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-libgoocanvasincludeHEADERS install-man install-strip \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libgoocanvasincludeHEADERS install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
+ tags uninstall uninstall-am \
uninstall-libgoocanvasincludeHEADERS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-30 22:34:41
|
Revision: 41
http://gpredict.svn.sourceforge.net/gpredict/?rev=41&view=rev
Author: csete
Date: 2008-04-30 15:34:44 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
Reduced elevation thresholds in find_aos and find_los to get more accurate results and avoid false pass predictions (bug #1954664).
Modified Paths:
--------------
trunk/src/predict-tools.c
Modified: trunk/src/predict-tools.c
===================================================================
--- trunk/src/predict-tools.c 2008-04-28 20:45:52 UTC (rev 40)
+++ trunk/src/predict-tools.c 2008-04-30 22:34:44 UTC (rev 41)
@@ -167,11 +167,7 @@
/* fine steps */
while ((aostime == 0.0) && (t <= (start + maxdt))) {
- /* FIXME: should change to el < -0.3?
- accuracy seems to be less than +/- 1 sec
- except when the sat is around 0.0 EL
- */
- if (fabs (sat->el) < 0.03) {
+ if (fabs (sat->el) < 0.005) {
aostime = t;
}
else {
@@ -195,11 +191,7 @@
/* fine steps */
while (aostime == 0.0) {
- /* FIXME: should change to el < -0.3?
- accuracy seems to be less than +/- 1 sec
- except when the sat is around 0.0 EL
- */
- if (fabs (sat->el) < 0.03) {
+ if (fabs (sat->el) < 0.005) {
aostime = t;
}
else {
@@ -278,7 +270,7 @@
t += sat->el * sqrt(sat->alt)/502500.0;
predict_calc (sat, qth, t);
- if (fabs(sat->el) < 0.03)
+ if (fabs(sat->el) < 0.005)
lostime = t;
}
}
@@ -298,7 +290,7 @@
t += sat->el * sqrt(sat->alt)/502500.0;
predict_calc (sat, qth, t);
- if (fabs(sat->el) < 0.03)
+ if (fabs(sat->el) < 0.005)
lostime = t;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-28 20:45:58
|
Revision: 40
http://gpredict.svn.sourceforge.net/gpredict/?rev=40&view=rev
Author: csete
Date: 2008-04-28 13:45:52 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/src/rot-ctrl-window.c
Modified: trunk/src/rot-ctrl-window.c
===================================================================
--- trunk/src/rot-ctrl-window.c 2008-04-24 21:32:49 UTC (rev 39)
+++ trunk/src/rot-ctrl-window.c 2008-04-28 20:45:52 UTC (rev 40)
@@ -44,6 +44,10 @@
static GtkWidget *win;
+static GtkWidget *AzSat,*AzDelta,*AzLock,*AzSet,*AzRead;
+static GtkWidget *ElSat,*ElDelta,*ElLock,*ElSet,*ElRead;
+
+
static gint rot_win_delete (GtkWidget *, GdkEvent *, gpointer);
static void rot_win_destroy (GtkWidget *, gpointer);
static gboolean rot_win_config (GtkWidget *, GdkEventConfigure *, gpointer);
@@ -147,9 +151,41 @@
/** \brief Create status widgets. */
static GtkWidget *create_status_widgets ()
{
- GtkWidget *frame;
+ GtkWidget *frame,*table,*label,*ctrbut;
+ table = gtk_table_new (3,7, TRUE);
+
+ /* table header */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>SAT</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>\316\224</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>SET</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>READ</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 5, 6, 0, 1);
+
+ /* Azimuth widgets */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>AZ:</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+
+ /* Eevation widgets */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), "<b>EL:</b>");
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+
+
+
frame = gtk_frame_new (_("STATUS"));
+ gtk_container_add (GTK_CONTAINER (frame), table);
gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
return frame;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-24 21:41:30
|
Revision: 39
http://gpredict.svn.sourceforge.net/gpredict/?rev=39&view=rev
Author: csete
Date: 2008-04-24 14:32:49 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/goocanv8/Makefile.in
trunk/goocanv8/aclocal.m4
trunk/goocanv8/configure
trunk/goocanv8/src/Makefile.in
trunk/src/rot-ctrl-window.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-24 20:55:17 UTC (rev 38)
+++ trunk/ChangeLog 2008-04-24 21:32:49 UTC (rev 39)
@@ -1,3 +1,15 @@
+2008-04-24; Alexandru Csete <oz...@gm...>
+
+ * src/rot-ctrl-window.[ch]:
+ Added files.
+
+
+2008-04-22; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-rot-ctrl.[ch]:
+ First fully functional implementation.
+
+
2008-04-20; Alexandru Csete <oz...@gm...>
* src/rig-io.[ch]:
Modified: trunk/goocanv8/Makefile.in
===================================================================
--- trunk/goocanv8/Makefile.in 2008-04-24 20:55:17 UTC (rev 38)
+++ trunk/goocanv8/Makefile.in 2008-04-24 21:32:49 UTC (rev 39)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,11 +13,15 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -31,18 +35,18 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/goocanvas.pc.in $(top_srcdir)/configure AUTHORS \
COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
depcomp install-sh ltmain.sh missing mkinstalldirs
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
+ configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = goocanvas.pc
@@ -50,13 +54,10 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -72,6 +73,8 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -107,7 +110,6 @@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -122,8 +124,9 @@
LTLIBOBJS = @LTLIBOBJS@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -139,6 +142,8 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -152,13 +157,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -170,7 +175,6 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -198,11 +202,8 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
SUBDIRS = src po
# require automake 1.7
@@ -252,7 +253,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ $(MAKE) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -276,6 +277,7 @@
distclean-libtool:
-rm -f libtool
+uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -308,7 +310,8 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -410,22 +413,24 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ mkdir $(distdir)
+ $(mkdir_p) $(distdir)/. $(distdir)/po
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -439,7 +444,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -447,8 +452,6 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -456,7 +459,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -531,7 +534,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -601,20 +604,12 @@
install-data-am:
-install-dvi: install-dvi-recursive
-
install-exec-am:
-install-html: install-html-recursive
-
install-info: install-info-recursive
install-man:
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -635,26 +630,24 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-info-am
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am clean clean-generic clean-libtool clean-recursive \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
+ distclean-recursive distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: trunk/goocanv8/aclocal.m4
===================================================================
--- trunk/goocanv8/aclocal.m4 2008-04-24 20:55:17 UTC (rev 38)
+++ trunk/goocanv8/aclocal.m4 2008-04-24 21:32:49 UTC (rev 39)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,11 +11,6 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
-
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
@@ -7189,7 +7184,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7199,29 +7194,14 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+ [AM_AUTOMAKE_VERSION([1.9.6])])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -7278,14 +7258,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 7
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -7294,10 +7274,8 @@
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -7311,14 +7289,15 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
+# serial 8
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -7346,7 +7325,6 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -7412,7 +7390,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -7465,8 +7442,7 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([AMDEPBACKSLASH])
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -7491,9 +7467,8 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -7540,8 +7515,8 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7564,20 +7539,16 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.58])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
# test whether we have cygpath
@@ -7597,9 +7568,6 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -7635,10 +7603,6 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@@ -7674,7 +7638,7 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -7781,14 +7745,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 4
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -7804,7 +7768,6 @@
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -7815,7 +7778,7 @@
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7823,23 +7786,60 @@
# AM_PROG_MKDIR_P
# ---------------
-# Check for `mkdir -p'.
+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+#
+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+# created by `make install' are always world readable, even if the
+# installer happens to have an overly restrictive umask (e.g. 077).
+# This was a mistake. There are at least two reasons why we must not
+# use `-m 0755':
+# - it causes special bits like SGID to be ignored,
+# - it may be too restrictive (some setups expect 775 directories).
+#
+# Do not use -m 0755 and let people choose whatever they expect by
+# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out. Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
+else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
+ else
+ mkdir_p='$(install_sh) -d'
+ fi
+fi
+AC_SUBST([mkdir_p])])
# Helper functions for option handling. -*- Autoconf -*-
@@ -7951,21 +7951,9 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
Modified: trunk/goocanv8/configure
===================================================================
--- trunk/goocanv8/configure 2008-04-24 20:55:17 UTC (rev 38)
+++ trunk/goocanv8/configure 2008-04-24 21:32:49 UTC (rev 39)
@@ -807,7 +807,6 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
-am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -1972,8 +1971,7 @@
ac_config_headers="$ac_config_headers config.h"
-am__api_version='1.10'
-
+am__api_version="1.9"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2156,54 +2154,39 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
-done
-IFS=$as_save_IFS
-
-fi
-
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
+ mkdir_p='$(install_sh) -d'
fi
fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2285,16 +2268,12 @@
fi
rmdir .tst 2>/dev/null
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
- fi
fi
# test whether we have cygpath
@@ -2337,7 +2316,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2441,7 +2420,7 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2478,7 +2457,9 @@
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
+
+
+if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
@@ -2543,7 +2524,9 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
- if test "x$enable_dependency_tracking" != xno; then
+
+
+if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -2552,6 +2535,7 @@
fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3538,7 +3522,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3568,7 +3551,9 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
+
+
+if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -4406,7 +4391,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4436,7 +4420,9 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
+
+
+if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -5659,7 +5645,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5662 "configure"' > conftest.$ac_ext
+ echo '#line 5648 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6485,7 +6471,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -6515,7 +6500,9 @@
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- if
+
+
+if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -7991,11 +7978,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7994: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7981: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7998: \$? = $ac_status" >&5
+ echo "$as_me:7985: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8281,11 +8268,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8271: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8288: \$? = $ac_status" >&5
+ echo "$as_me:8275: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8385,11 +8372,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8375: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8392: \$? = $ac_status" >&5
+ echo "$as_me:8379: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10747,7 +10734,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10750 "configure"
+#line 10737 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10847,7 +10834,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10850 "configure"
+#line 10837 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13267,11 +13254,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13270: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13257: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13274: \$? = $ac_status" >&5
+ echo "$as_me:13261: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13371,11 +13358,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13374: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13361: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13378: \$? = $ac_status" >&5
+ echo "$as_me:13365: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14948,11 +14935,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14951: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14938: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14955: \$? = $ac_status" >&5
+ echo "$as_me:14942: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15052,11 +15039,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15055: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15042: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15059: \$? = $ac_status" >&5
+ echo "$as_me:15046: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17252,11 +17239,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17255: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17242: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17259: \$? = $ac_status" >&5
+ echo "$as_me:17246: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17542,11 +17529,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17545: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17532: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17549: \$? = $ac_status" >&5
+ echo "$as_me:17536: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17646,11 +17633,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17649: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17653: \$? = $ac_status" >&5
+ echo "$as_me:17640: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -22154,7 +22141,9 @@
esac
{ echo "$as_me:$LINENO: result: $platform_win32" >&5
echo "${ECHO_T}$platform_win32" >&6; }
- if test "$platform_win32" = "yes"; then
+
+
+if test "$platform_win32" = "yes"; then
PLATFORM_WIN32_TRUE=
PLATFORM_WIN32_FALSE='#'
else
@@ -22669,7 +22658,6 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -22882,7 +22870,6 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -22939,6 +22926,7 @@
RANLIB!$RANLIB$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22980,7 +22968,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-ac_ct_CXX!$ac_ct_CXX$ac_delim
CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
@@ -23019,7 +23006,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -23246,11 +23233,6 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
- ac_MKDIR_P=$MKDIR_P
- case $MKDIR_P in
- [\\/$]* | ?:[\\/]* ) ;;
- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
- esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -23304,7 +23286,6 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@@ -23469,9 +23450,8 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
Modified: trunk/goocanv8/src/Makefile.in
===================================================================
--- trunk/goocanv8/src/Makefile.in 2008-04-24 20:55:17 UTC (rev 38)
+++ trunk/goocanv8/src/Makefile.in 2008-04-24 21:32:49 UTC (rev 39)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,15 @@
@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -54,21 +58,17 @@
goocanvastext.lo goocanvasutils.lo goocanvaswidget.lo \
goocanvas.lo
libgoocanvas_la_OBJECTS = $(am_libgoocanvas_la_OBJECTS)
-libgoocanvas_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libgoocanvas_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libgoocanvas_la_SOURCES)
DIST_SOURCES = $(libgoocanvas_la_SOURCES)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -84,6 +84,8 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -119,7 +121,6 @@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -134,8 +135,9 @@
LTLIBOBJS = @LTLIBOBJS@
LT_VERSION_INFO = @LT_VERSION_INFO@
MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
@@ -151,6 +153,8 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -164,13 +168,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -182,7 +186,6 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -210,11 +213,8 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
INCLUDES = \
-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
@@ -341,7 +341,7 @@
rm -f "$${dir}/so_locations"; \
done
libgoocanvas.la: $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_DEPENDENCIES)
- $(libgoocanvas_la_LINK) $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_LIBADD) $(LIBS)
+ $(LINK) $(libgoocanvas_la_LDFLAGS) $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -369,22 +369,22 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvaswidget.Plo@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -394,9 +394,13 @@
clean-libtool:
-rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
install-libgoocanvasincludeHEADERS: $(libgoocanvasinclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libgoocanvasincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgoocanvasincludedir)"
+ test -z "$(libgoocanvasincludedir)" || $(mkdir_p) "$(DESTDIR)$(libgoocanvasincludedir)"
@list='$(libgoocanvasinclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -461,21 +465,22 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -492,7 +497,7 @@
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(libgoocanvasincludedir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -531,7 +536,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -545,20 +550,12 @@
install-data-am: install-libgoocanvasincludeHEADERS
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -579,23 +576,19 @@
ps-am:
-uninstall-am: uninstall-libgoocanvasincludeHEADERS
+uninstall-am: uninstall-info-am uninstall-libgoocanvasincludeHEADERS
-.MAKE: install-am install-strip
-
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libgoocanvasincludeHEADERS install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
+ install-libgoocanvasincludeHEADERS install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am \
+ tags uninstall uninstall-am uninstall-info-am \
uninstall-libgoocanvasincludeHEADERS
Modified: trunk/src/rot-ctrl-window.c
===================================================================
--- trunk/src/rot-ctrl-window.c 2008-04-24 20:55:17 UTC (rev 38)
+++ trunk/src/rot-ctrl-window.c 2008-04-24 21:32:49 UTC (rev 39)
@@ -28,6 +28,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "sat-log.h"
+#include "compat.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
@@ -36,26 +37,75 @@
#include "rot-ctrl-window.h"
+/** \brief Flag indicating whether the window is open or not. */
static gboolean window_is_open = FALSE;
+/** \brief The rotor control window widget. */
+static GtkWidget *win;
+
+
+static gint rot_win_delete (GtkWidget *, GdkEvent *, gpointer);
+static void rot_win_destroy (GtkWidget *, gpointer);
+static gboolean rot_win_config (GtkWidget *, GdkEventConfigure *, gpointer);
+
+static GtkWidget *create_status_widgets (void);
+static GtkWidget *create_setup_widgets (void);
+static GtkWidget *create_control_widgets (void);
+
+
+
/** \brief Open rotator control window */
void rot_ctrl_window_open ()
{
+ GtkWidget *table;
+ gchar *icon; /* icon file name */
+
+
if (window_is_open) {
/* window may be hidden so bring it to front */
-
+ gtk_window_present (GTK_WINDOW (win));
return;
}
/* create the window */
+ win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title (GTK_WINDOW (win), _("GPREDICT Rotator Control"));
+ icon = icon_file_name ("gpredict-antenna.png");
+ if (g_file_test (icon, G_FILE_TEST_EXISTS)) {
+ gtk_window_set_icon_from_file (GTK_WINDOW (win), icon, NULL);
+ }
+ g_free (icon);
+
+ /* connect delete and destroy signals */
+ g_signal_connect (G_OBJECT (win), "delete_event",
+ G_CALLBACK (rot_win_delete), NULL);
+ g_signal_connect (G_OBJECT (win), "configure_event",
+ G_CALLBACK (rot_win_config), NULL);
+ g_signal_connect (G_OBJECT (win), "destroy",
+ G_CALLBACK (rot_win_destroy), NULL);
+
+ /* create contents */
+ table = gtk_table_new (2, 2, FALSE);
+ gtk_table_attach (GTK_TABLE (table), create_status_widgets (),
+ 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+ gtk_table_attach (GTK_TABLE (table), create_setup_widgets (),
+ 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+ gtk_table_attach (GTK_TABLE (table), create_control_widgets (),
+ 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 5, 5);
+
+ gtk_container_add (GTK_CONTAINER (win), table);
+ gtk_widget_show_all (win);
+
window_is_open = TRUE;
}
+
+
/** \brief Close rotator control window */
void rot_ctrl_window_close ()
{
if (window_is_open) {
- window_is_open = FALSE;
+ gtk_widget_destroy (win);
}
else {
sat_log_log (SAT_LOG_LEVEL_BUG,
@@ -65,3 +115,66 @@
}
+
+
+/** \brief Manage window delete events. */
+static gint
+rot_win_delete (GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+ return FALSE;
+}
+
+
+
+/** \brief Manage destroy signals. */
+static void
+rot_win_destroy (GtkWidget *widget, gpointer data)
+{
+ /* cloase active hardware connections. */
+
+ window_is_open = FALSE;
+}
+
+
+/** \brief Manage configure events. */
+static gboolean
+rot_win_config (GtkWidget *widget, GdkEventConfigure *event, gpointer data)
+{
+ return FALSE;
+}
+
+
+/** \brief Create status widgets. */
+static GtkWidget *create_status_widgets ()
+{
+ GtkWidget *frame;
+
+ frame = gtk_frame_new (_("STATUS"));
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
+
+
+/** \brief Create setup widgets. */
+static GtkWidget *create_setup_widgets ()
+{
+ GtkWidget *frame;
+
+ frame = gtk_frame_new (_("SETUP"));
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
+
+/** \brief Create control buttons. */
+static GtkWidget *create_control_widgets ()
+{
+ GtkWidget *frame;
+
+ frame = gtk_frame_new (_("CONTROL"));
+ gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5);
+
+ return frame;
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-24 20:55:20
|
Revision: 38
http://gpredict.svn.sourceforge.net/gpredict/?rev=38&view=rev
Author: csete
Date: 2008-04-24 13:55:17 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Disable dummy popup message.
Modified Paths:
--------------
trunk/src/menubar.c
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2008-04-24 20:53:51 UTC (rev 37)
+++ trunk/src/menubar.c 2008-04-24 20:55:17 UTC (rev 38)
@@ -57,6 +57,9 @@
# include <build-config.h>
#endif
+#include "rot-ctrl-window.h"
+
+
extern GtkWidget *app;
@@ -786,7 +789,8 @@
{
GtkWidget *dialog;
-
+ rot_ctrl_window_open ();
+#if 0
dialog = gtk_message_dialog_new (GTK_WINDOW (app),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
@@ -797,8 +801,10 @@
g_signal_connect_swapped (dialog, "response",
G_CALLBACK (gtk_widget_destroy),
dialog);
-
- gtk_widget_show_all (dialog);
+
+
+ gtk_widget_show_all (dialog);
+#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-24 20:53:46
|
Revision: 37
http://gpredict.svn.sourceforge.net/gpredict/?rev=37&view=rev
Author: csete
Date: 2008-04-24 13:53:51 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Minor fixes to make new code compile.
Modified Paths:
--------------
trunk/src/rot-ctrl-window.c
Modified: trunk/src/rot-ctrl-window.c
===================================================================
--- trunk/src/rot-ctrl-window.c 2008-04-24 20:49:22 UTC (rev 36)
+++ trunk/src/rot-ctrl-window.c 2008-04-24 20:53:51 UTC (rev 37)
@@ -33,9 +33,11 @@
# include <build-config.h>
#endif
-#incude "rot-ctrl-window.h"
+#include "rot-ctrl-window.h"
+static gboolean window_is_open = FALSE;
+
/** \brief Open rotator control window */
void rot_ctrl_window_open ()
{
@@ -46,14 +48,14 @@
}
/* create the window */
-
+ window_is_open = TRUE;
}
/** \brief Close rotator control window */
-void rot_ctrl_window_close (void);
+void rot_ctrl_window_close ()
{
if (window_is_open) {
-
+ window_is_open = FALSE;
}
else {
sat_log_log (SAT_LOG_LEVEL_BUG,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-24 20:49:22
|
Revision: 36
http://gpredict.svn.sourceforge.net/gpredict/?rev=36&view=rev
Author: csete
Date: 2008-04-24 13:49:22 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Include new files.
Modified Paths:
--------------
trunk/po/POTFILES.in
trunk/src/Makefile.am
trunk/win32/Makefile
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2008-04-24 20:48:32 UTC (rev 35)
+++ trunk/po/POTFILES.in 2008-04-24 20:49:22 UTC (rev 36)
@@ -31,6 +31,7 @@
src/radio-conf.c
src/rdv.c
src/rig-io.c
+src/rot-ctrl-window.c
src/rotor-conf.c
src/sat-cfg.c
src/sat-log.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-04-24 20:48:32 UTC (rev 35)
+++ trunk/src/Makefile.am 2008-04-24 20:49:22 UTC (rev 36)
@@ -69,6 +69,7 @@
qth-editor.c qth-editor.h \
radio-conf.c radio-conf.h \
rig-io.c rig-io.h \
+ rot-ctrl-window.c rot-ctrl-window.h \
rotor-conf.c rotor-conf.h \
rdv.c rdv.h \
sat-cfg.c sat-cfg.h \
Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile 2008-04-24 20:48:32 UTC (rev 35)
+++ trunk/win32/Makefile 2008-04-24 20:49:22 UTC (rev 36)
@@ -119,6 +119,7 @@
qth-editor.c \
radio-conf.c \
rig-io.c \
+ rot-ctrl-window.c \
rotor-conf.c \
rdv.c \
sat-cfg.c \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-24 20:48:31
|
Revision: 35
http://gpredict.svn.sourceforge.net/gpredict/?rev=35&view=rev
Author: csete
Date: 2008-04-24 13:48:32 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Added files.
Added Paths:
-----------
trunk/src/rot-ctrl-window.c
trunk/src/rot-ctrl-window.h
Added: trunk/src/rot-ctrl-window.c
===================================================================
--- trunk/src/rot-ctrl-window.c (rev 0)
+++ trunk/src/rot-ctrl-window.c 2008-04-24 20:48:32 UTC (rev 35)
@@ -0,0 +1,65 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/groundstation/
+ More details can be found at the project home page:
+
+ http://groundstation.sourceforge.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+*/
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include "sat-log.h"
+
+#ifdef HAVE_CONFIG_H
+# include <build-config.h>
+#endif
+
+#incude "rot-ctrl-window.h"
+
+
+/** \brief Open rotator control window */
+void rot_ctrl_window_open ()
+{
+ if (window_is_open) {
+ /* window may be hidden so bring it to front */
+
+ return;
+ }
+
+ /* create the window */
+
+}
+
+/** \brief Close rotator control window */
+void rot_ctrl_window_close (void);
+{
+ if (window_is_open) {
+
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Rotor control window is not open!"),
+ __FUNCTION__);
+ }
+}
+
+
Added: trunk/src/rot-ctrl-window.h
===================================================================
--- trunk/src/rot-ctrl-window.h (rev 0)
+++ trunk/src/rot-ctrl-window.h 2008-04-24 20:48:32 UTC (rev 35)
@@ -0,0 +1,34 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ Gpredict: Real-time satellite tracking and orbit prediction program
+
+ Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC.
+
+ Authors: Alexandru Csete <oz...@gm...>
+
+ Comments, questions and bugreports should be submitted via
+ http://sourceforge.net/projects/groundstation/
+ More details can be found at the project home page:
+
+ http://groundstation.sourceforge.net/
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, visit http://www.fsf.org/
+*/
+#ifndef ROT_CTRL_WINDOW_H
+#define ROT_CTRL_WINDOW_H 1
+
+void rot_ctrl_window_open (void);
+void rot_ctrl_window_close (void);
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-04-22 20:15:36
|
Revision: 34
http://gpredict.svn.sourceforge.net/gpredict/?rev=34&view=rev
Author: csete
Date: 2008-04-22 13:15:34 -0700 (Tue, 22 Apr 2008)
Log Message:
-----------
First fully functional implementation.
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-04-20 13:28:01 UTC (rev 33)
+++ trunk/src/gtk-rot-ctrl.c 2008-04-22 20:15:34 UTC (rev 34)
@@ -26,6 +26,7 @@
along with this program; if not, visit http://www.fsf.org/
*/
/** \brief ROTOR control.
+ * \ingroup widgets
*
* More info...
*
@@ -34,20 +35,25 @@
*/
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <math.h>
#include "gtk-rot-ctrl.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
+#define FMTSTR "<span size='xx-large'>%c</span>"
+
static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class);
static void gtk_rot_ctrl_init (GtkRotCtrl *list);
static void gtk_rot_ctrl_destroy (GtkObject *object);
static void gtk_rot_ctrl_update (GtkRotCtrl *ctrl);
+static void button_clicked_cb (GtkWidget *button, gpointer data);
+
static GtkHBoxClass *parent_class = NULL;
@@ -128,20 +134,162 @@
{
GtkWidget *widget;
GtkWidget *table;
+ guint i;
-
widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
GTK_ROT_CTRL(widget)->min = min;
GTK_ROT_CTRL(widget)->max = max;
GTK_ROT_CTRL(widget)->value = val;
+ /* create table */
+ table = gtk_table_new (3, 7, FALSE);
+
+ /* create buttons */
+ /* +100 deg */
+ GTK_ROT_CTRL(widget)->buttons[0] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[0]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[0]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[0]),
+ "delta", GINT_TO_POINTER(10000));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[0],
+ 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[0], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* +10 deg */
+ GTK_ROT_CTRL(widget)->buttons[1] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[1]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[1]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[1]),
+ "delta", GINT_TO_POINTER(1000));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[1],
+ 2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[1], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* +1 deg */
+ GTK_ROT_CTRL(widget)->buttons[2] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[2]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[2]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[2]),
+ "delta", GINT_TO_POINTER(100));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[2],
+ 3, 4, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[2], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* +0.1 deg */
+ GTK_ROT_CTRL(widget)->buttons[3] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[3]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[3]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[3]),
+ "delta", GINT_TO_POINTER(10));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[3],
+ 5, 6, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[3], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* +0.01 deg */
+ GTK_ROT_CTRL(widget)->buttons[4] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[4]),
+ gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[4]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[4]),
+ "delta", GINT_TO_POINTER(1));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[4],
+ 6, 7, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[4], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -100 deg */
+ GTK_ROT_CTRL(widget)->buttons[5] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[5]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[5]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[5]),
+ "delta", GINT_TO_POINTER(-10000));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[5],
+ 1, 2, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[5], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -10 deg */
+ GTK_ROT_CTRL(widget)->buttons[6] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[6]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[6]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[6]),
+ "delta", GINT_TO_POINTER(-1000));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[6],
+ 2, 3, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[6], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -1 deg */
+ GTK_ROT_CTRL(widget)->buttons[7] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[7]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[7]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[7]),
+ "delta", GINT_TO_POINTER(-100));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[7],
+ 3, 4, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[7], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -0.1 deg */
+ GTK_ROT_CTRL(widget)->buttons[8] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[8]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[8]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[8]),
+ "delta", GINT_TO_POINTER(-10));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[8],
+ 5, 6, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[8], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* -0.01 deg */
+ GTK_ROT_CTRL(widget)->buttons[9] = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[9]),
+ gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
+ gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[9]),
+ GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[9]),
+ "delta", GINT_TO_POINTER(-1));
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[9],
+ 6, 7, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ g_signal_connect (GTK_ROT_CTRL(widget)->buttons[9], "clicked",
+ G_CALLBACK (button_clicked_cb), widget);
+
+ /* create labels */
+ for (i = 0; i < 7; i++) {
+ GTK_ROT_CTRL(widget)->digits[i] = gtk_label_new (NULL);
+ gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->digits[i],
+ i, i+1, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ }
+
gtk_rot_ctrl_update (GTK_ROT_CTRL(widget));
+
+ gtk_container_add (GTK_CONTAINER (widget), table);
gtk_widget_show_all (widget);
-
return widget;
}
@@ -179,11 +327,54 @@
/** \brief Update rotor display widget.
- * \param[in] ctrl The rottor control widget.
+ * \param[in] ctrl The rotor control widget.
*
*/
static void
gtk_rot_ctrl_update (GtkRotCtrl *ctrl)
{
+ gchar b[7];
+ gchar *buff;
+ guint i;
+ g_ascii_formatd (b, 8, "%6.2f", fabs(ctrl->value));
+
+ /* set label markups */
+ for (i = 0; i < 6; i++) {
+ buff = g_strdup_printf (FMTSTR, b[i]);
+ gtk_label_set_markup (GTK_LABEL(ctrl->digits[i+1]), buff);
+ g_free (buff);
+ }
+
+ if (ctrl->value <= 0)
+ buff = g_strdup_printf (FMTSTR, '-');
+ else
+ buff = g_strdup_printf (FMTSTR, ' ');
+
+ gtk_label_set_markup (GTK_LABEL(ctrl->digits[0]), buff);
+ g_free (buff);
}
+
+
+/** \brief Button clicked event.
+ * \param button The button that was clicked.
+ * \param data Pointer to the GtkRotCtrl widget.
+ *
+ */
+static void
+button_clicked_cb (GtkWidget *button, gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+ gfloat delta = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (button), "delta")) / 100.0;
+
+ if ((delta > 0.0) && ((ctrl->value + delta) <= ctrl->max)) {
+ ctrl->value += delta;
+ }
+ else if ((delta < 0.0) && ((ctrl->value + delta) >= ctrl->min)) {
+ ctrl->value += delta;
+ }
+
+ gtk_rot_ctrl_update (ctrl);
+
+ g_print ("VAL: %.2f\n", ctrl->value);
+}
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-04-20 13:28:01 UTC (rev 33)
+++ trunk/src/gtk-rot-ctrl.h 2008-04-22 20:15:34 UTC (rev 34)
@@ -60,6 +60,9 @@
struct _gtk_rot_ctrl
{
GtkVBox vbox;
+
+ GtkWidget *digits[7]; /*!< Labels for the digits */
+ GtkWidget *buttons[10]; /*!< Buttons; 0..4 up; 5..9 down */
gfloat min;
gfloat max;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
