From 03894813f0ff59fed99824988b83167ea30f0245 Mon Sep 17 00:00:00 2001 From: vatton Date: Wed, 15 Nov 2006 11:48:53 +0000 Subject: [PATCH] Clean up Irene --- Makefile.in | 2 +- Options.in | 1 - amaya-src.nsi | 6 +-- amaya/AHTBridge.c | 56 ++++++++++++---------------- amaya/Makefile.in | 6 +-- amaya/query.c | 32 ++++++++-------- annotlib/Makefile.in | 2 +- batch/Makefile.in | 2 +- configure | 34 +++++++---------- configure.in | 33 +++++++--------- doc/Amaya_open_bugs.html | 9 +++-- thotlib/Makefile.in | 2 +- thotlib/base/structlist.c | 11 +++--- thotlib/include/thot_gui_nogui.h | 64 -------------------------------- tools/cextract-1.7/Makefile.in | 4 +- tools/mkdep/Makefile.in | 2 +- 16 files changed, 87 insertions(+), 179 deletions(-) delete mode 100644 thotlib/include/thot_gui_nogui.h diff --git a/Makefile.in b/Makefile.in index 496bba2ed..5a86c2a0a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,7 +19,7 @@ LIBPNG = libpng #MKP: adding davlib SUBDIRS = @SUBDIRS@ tools thotlib batch drawlib indexlib annotlib amaya thot @DAVDIR@ -EXTRA_SUBDIRS= misc pluginlib $(LIBRAPTOR) $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR) +EXTRA_SUBDIRS= misc $(LIBRAPTOR) $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR) prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/Options.in b/Options.in index dbf594be8..26c7cb0fd 100644 --- a/Options.in +++ b/Options.in @@ -39,7 +39,6 @@ AMAYA_ANNOT_INCLUDES=@AMAYA_ANNOT_INCLUDES@ AMAYA_ANNOT_EXTRA_LIBS=@AMAYA_ANNOT_EXTRA_LIBS@ IMGLIBS=@IMGLIBS@ -EXTRA_LIBS=@EXTRA_LIBS@ EXTRA_INCLUDES=@EXTRA_INCLUDES@ EXPAT_INCLUDES= diff --git a/amaya-src.nsi b/amaya-src.nsi index 7ff0759c5..4074e6947 100644 --- a/amaya-src.nsi +++ b/amaya-src.nsi @@ -262,10 +262,6 @@ Section "Amaya" SecAmaya File /r templates\* SetOutPath "$INSTDIR\Amaya\resources" File /r resources\* - SetOutPath "$INSTDIR\Amaya\plugintest" - File /r plugintest\* - SetOutPath "$INSTDIR\Amaya\pluginlib" - File /r pluginlib\* SetOutPath "$INSTDIR\Amaya\libpng" File /r libpng\* SetOutPath "$INSTDIR\Amaya\libjpeg" @@ -420,4 +416,4 @@ Function un.onInit !insertmacro MUI_UNGETLANGUAGE -FunctionEnd \ No newline at end of file +FunctionEnd diff --git a/amaya/AHTBridge.c b/amaya/AHTBridge.c index 34960a9d6..8c55deff7 100644 --- a/amaya/AHTBridge.c +++ b/amaya/AHTBridge.c @@ -39,7 +39,7 @@ #define THD_TRACE 1 #endif -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) /* Private functions */ static void RequestRegisterReadXtevent (SOCKET); static void RequestKillReadXtevent (SOCKET); @@ -78,18 +78,11 @@ typedef struct sStatus { int except; } SocketStatus; #endif /* _WX */ -#if defined(_NOGUI) -typedef struct sStatus { - int read; - int write; - int except; -} SocketStatus; -#endif /* #ifdef _NOGUI */ -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) #define SOCK_TABLE_SIZE 67 #define HASH(s) ((s) % SOCK_TABLE_SIZE) static SocketStatus persSockets[SOCK_TABLE_SIZE]; -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ /*-------------------------------------------------------------------- AHTCallback_bridge @@ -419,7 +412,7 @@ int AHTEvent_unregister (SOCKET sock, HTEventType type) ----------------------------------------------------------------------*/ void RequestKillAllXtevents (AHTReqContext * me) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) int sock = INVSOC; return; @@ -441,7 +434,7 @@ void RequestKillAllXtevents (AHTReqContext * me) RequestKillReadXtevent (sock); RequestKillWriteXtevent (sock); RequestKillExceptXtevent (sock); -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -450,7 +443,7 @@ void RequestKillAllXtevents (AHTReqContext * me) ----------------------------------------------------------------------*/ static void RequestRegisterReadXtevent (SOCKET sock) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) int v; v = HASH (sock); @@ -474,7 +467,7 @@ static void RequestRegisterReadXtevent (SOCKET sock) persSockets[v].read, sock); #endif /* DEBUG_LIBWWW */ } -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -483,7 +476,7 @@ static void RequestRegisterReadXtevent (SOCKET sock) ----------------------------------------------------------------------*/ static void RequestKillReadXtevent (SOCKET sock) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) int v; v = HASH (sock); @@ -505,7 +498,7 @@ static void RequestKillReadXtevent (SOCKET sock) #endif /* _WX */ } -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -514,7 +507,7 @@ static void RequestKillReadXtevent (SOCKET sock) ----------------------------------------------------------------------*/ static void RequestRegisterWriteXtevent (SOCKET sock) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) int v; v = HASH (sock); @@ -539,7 +532,7 @@ static void RequestRegisterWriteXtevent (SOCKET sock) #endif /* DEBUG_LIBWWW */ } -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -549,7 +542,7 @@ static void RequestRegisterWriteXtevent (SOCKET sock) ----------------------------------------------------------------------*/ static void RequestKillWriteXtevent (SOCKET sock) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) int v; v = HASH (sock); @@ -572,7 +565,7 @@ static void RequestKillWriteXtevent (SOCKET sock) #endif /* _WX */ } -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -581,7 +574,7 @@ static void RequestKillWriteXtevent (SOCKET sock) ----------------------------------------------------------------------*/ static void RequestRegisterExceptXtevent (SOCKET sock) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) int v; v = HASH (sock); @@ -606,7 +599,7 @@ static void RequestRegisterExceptXtevent (SOCKET sock) persSockets[v].except, sock); #endif /* DEBUG_LIBWWW */ } -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -616,7 +609,7 @@ static void RequestRegisterExceptXtevent (SOCKET sock) ----------------------------------------------------------------------*/ static void RequestKillExceptXtevent (SOCKET sock) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) int v; v = HASH (sock); @@ -637,7 +630,7 @@ static void RequestKillExceptXtevent (SOCKET sock) persSockets[v].except = 0; #endif /* _WX */ } -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -661,9 +654,6 @@ struct _AmayaTimer { #ifdef _WX wxAmayaTimer * xt_timer; #endif /* _WX */ -#ifdef _NOGUI - unsigned int xt_timer; -#endif /* #ifdef _NOGUI */ }; typedef struct _AmayaTimer AmayaTimer; @@ -766,12 +756,12 @@ void TimerCallbackWX( void * p_context ) ----------------------------------------------------------------------*/ void KillAllTimers (void) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) /* @@@ maybe add something else to kill the Xt things */ if (Timers) HTList_delete (Timers); Timers = NULL; -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -779,7 +769,7 @@ void KillAllTimers (void) ----------------------------------------------------------------------*/ void AMAYA_SetTimer (HTTimer *libwww_timer) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) HTList *cur, *last; AmayaTimer *me; @@ -837,7 +827,7 @@ void AMAYA_SetTimer (HTTimer *libwww_timer) me->xt_timer->Start( me->libwww_timer->millis, TRUE ); #endif /* _WX */ -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } /*---------------------------------------------------------------------- @@ -845,7 +835,7 @@ void AMAYA_SetTimer (HTTimer *libwww_timer) ----------------------------------------------------------------------*/ void AMAYA_DeleteTimer (HTTimer *libwww_timer) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) HTList *cur, *last; AmayaTimer *me; @@ -876,6 +866,6 @@ void AMAYA_DeleteTimer (HTTimer *libwww_timer) HTList_removeObject (Timers, me); TtaFreeMemory (me); } -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } diff --git a/amaya/Makefile.in b/amaya/Makefile.in index d0a472b16..72c82edaf 100644 --- a/amaya/Makefile.in +++ b/amaya/Makefile.in @@ -21,7 +21,7 @@ LIBS = $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \ -L../thotlib -L.. -lThotEditor \ $(AMAYA_OPTION_EXTRA_LIBS) $(IMGLIBS) $(EXPAT_LIBRARIES) \ $(AMAYA_LIBWWW_LIBS) \ - @LIBS@ @EXTRA_LIBS@ $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \ + @LIBS@ $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(FREETYPE_LIBRARIES) $(XFT_LIBRARIES) \ $(GTK_LIBRARIES) $(WX_LIBRARIES) AMAYA = @top_srcdir@/amaya @@ -112,7 +112,7 @@ amaya_comp_redland: @MAKEREDLAND@ force #include the fragment "amaya/Makefile.math" for math if configured in @math_frag@ -#include the fragment "annotlib//Makefile.annot" for annotations if configured in +#include the fragment "annotlib/Makefile.annot" for annotations if configured in @annot_frag@ #include the fragment "davlib/Makefile.dav" for webdav if configured in @@ -132,7 +132,7 @@ amaya_comp_redland: @MAKEREDLAND@ force ALL_AMAYA_OPTIONS= $(AMAYA_OPTIONS) \ $(AMAYA_LIBWWW_OPTIONS) \ $(AMAYA_MATH_OPTIONS) $(AMAYA_SVG_OPTIONS) $(AMAYA_TEMPLATES_OPTIONS) \ - $(AMAYA_ANNOT_OPTIONS) $(AMAYA_DAV_OPTIONS) $(EXPAT_OPTIONS) \ + $(AMAYA_ANNOT_OPTIONS) $(AMAYA_DAV_OPTIONS) $(EXPAT_OPTIONS) AMAYA_OPTION_INCLUDES= \ $(AMAYA_LIBWWW_INCLUDES) $(AMAYA_MATH_INCLUDES) \ diff --git a/amaya/query.c b/amaya/query.c index 80fe24871..71c7d1c56 100644 --- a/amaya/query.c +++ b/amaya/query.c @@ -658,13 +658,13 @@ ThotBool AHTReqContext_delete (AHTReqContext * me) if (me->error_stream != (char *) NULL) HT_FREE (me->error_stream); -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) #ifdef WWW_XWINDOWS if (me->read_xtinput_id || me->write_xtinput_id || me->except_xtinput_id) RequestKillAllXtevents(me); #endif /* WWW_XWINDOWS */ -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ if (me->reqStatus == HT_ABORT) { @@ -744,11 +744,11 @@ static void Thread_deleteAll (void) { if (me->request) { -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) #ifdef WWW_XWINDOWS RequestKillAllXtevents (me); #endif /* WWW_XWINDOWS */ -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ if (!HTRequest_kill (me->request)) AHTReqContext_delete (me); } @@ -1884,9 +1884,9 @@ static void AHTNetInit (void) HTNet_addAfter (precondition_handler, NULL, NULL, HT_PRECONDITION_FAILED, HT_FILTER_MIDDLE); #endif /* AMAYA_LOST_UPDATE */ -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) HTNet_addAfter (AHTLoadTerminate_handler, NULL, NULL, HT_ALL, HT_FILTER_LAST); -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ /**** for later ?? ****/ /* HTNet_addAfter(HTInfoFilter,NULL, NULL, HT_ALL, HT_FILTER_LATE); */ @@ -2018,7 +2018,7 @@ static void RecCleanCache (char *dirname) wxRmdir(wx_dir_name); #endif /* _WX */ -#if defined(_GTK) || defined(_NOGUI) +#ifdef _GTK DIR *dp; struct stat st; #ifdef HAVE_DIRENT_H @@ -2069,7 +2069,7 @@ static void RecCleanCache (char *dirname) } } closedir (dp); -#endif /* #if defined(_GTK) || defined(_NOGUI) */ +#endif /* _GTK */ } #endif /* AMAYA_WWW_CACHE */ @@ -2569,12 +2569,12 @@ void QueryInit () wxAmayaSocketEventLoop::InitSocketLib(); #endif /* _WX */ -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) HTEvent_setRegisterCallback ( AHTEvent_register); HTEvent_setUnregisterCallback (AHTEvent_unregister); HTTimer_registerSetTimerCallback ((BOOL (*)(HTTimer*)) AMAYA_SetTimer); HTTimer_registerDeleteTimerCallback ((BOOL (*)(HTTimer*))AMAYA_DeleteTimer); -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ #ifdef HTDEBUG /* an undocumented option for being able to generate an HTTP protocol @@ -2804,11 +2804,11 @@ void QueryClose () a non-existent Amaya window */ HTEvent_setRegisterCallback ((HTEvent_registerCallback *) NULL); HTEvent_setUnregisterCallback ((HTEvent_unregisterCallback *) NULL); -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) /** need to erase all existing timers too **/ HTTimer_registerSetTimerCallback (NULL); HTTimer_registerDeleteTimerCallback (NULL); -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ HTHost_setActivateRequestCallback (NULL); Thread_deleteAll (); @@ -3824,14 +3824,14 @@ void StopAllRequests (int docid) } cur = Amaya->reqlist; } -#if defined(_GTK) || defined(_WX) || defined(_NOGUI) +#if defined(_GTK) || defined(_WX) #ifdef WWW_XWINDOWS /* to be on the safe side, remove all outstanding X events */ else RequestKillAllXtevents (me); #endif /* WWW_XWINDOWS */ -#endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */ +#endif /* defined(_GTK) || defined(_WX) */ } } /* Delete remaining channels */ @@ -3965,7 +3965,7 @@ ThotBool CheckSingleInstance (char *pid_dir) return TRUE; #endif /* _WX */ -#if defined(_GTK) || defined(_NOGUI) +#ifdef _GTK int instances; char *ptr; pid_t pid; @@ -4030,7 +4030,7 @@ ThotBool CheckSingleInstance (char *pid_dir) } closedir (dp); return (instances == 0); -#endif /* #if defined(_GTK) || defined(_NOGUI) */ +#endif /* _GTK */ } diff --git a/annotlib/Makefile.in b/annotlib/Makefile.in index 350b2185f..3844105c0 100644 --- a/annotlib/Makefile.in +++ b/annotlib/Makefile.in @@ -66,7 +66,7 @@ include .depends # C files # .c.o : - $(CXX) $(CXXFLAGS) $(AMAYA_ANNOT_OPTIONS) $(INCLUDES) $(OPTIONS) -c $< -o $@ + $(CXX) $(CXXFLAGS) $(INCLUDES) $(OPTIONS) -c $< -o $@ # # Structure schema compilation diff --git a/batch/Makefile.in b/batch/Makefile.in index d1528be69..e56cc34b8 100644 --- a/batch/Makefile.in +++ b/batch/Makefile.in @@ -11,7 +11,7 @@ THOTDIR = @top_srcdir@ include ../Options -LIBS = -L../thotlib/ -lThotKernel -lz @LIBS@ @EXTRA_LIBS@ $(WX_LIBRARIES) +LIBS = -L../thotlib/ -lThotKernel -lz @LIBS@ $(WX_LIBRARIES) INCLUDES= -DHAVE_CONFIG_H -I.. -I@srcdir@/f @THOTINCLUDES@ $(GUI_INCLUDES) prefix = @prefix@ diff --git a/configure b/configure index 65dfbed79..bfaad9001 100755 --- a/configure +++ b/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SET_MAKE YACC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX LEX LEXLIB LEX_OUTPUT_ROOT AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CP MV RM MKDIR ECHO CAT CHMOD SED AR DIFF EGREP ALLOCA LIBOBJS AMAYAOS AMAYAGUI GTKCONFIG_FOUND GTK_INCLUDES GTK_LIBRARIES GL_BUILDDIR GL_INCLUDES GL_LIBRARIES WXCONFIG WX_SRCDIR WX_BUILDDIR BUILDWXWIDGETS WX_INCLUDES WX_LIBRARIES WX_LINKDEPS LIBJPEG LIBPNG LIBZ MAKEJPEG MAKEPNG GTK_GL_INCLUDES GTK_GL_LIBRARIES FREETYPE_INCLUDES FREETYPE_LIBRARIES XFT_INCLUDES XFT_LIBRARIES REDLAND_CONFIG AMAYA_INSTALLDIR APP_MAJVER APP_MINVER APP_SUBVER APP_VER CEXTRACT_VER CEXTRACT_FLAGS THOTINCLUDES APIINCLUDES VPATHOPT GTK_OPTIONS THOT_OPTIONS AMAYA_OPTIONS AMAYA_ANNOT_OPTIONS AMAYA_ANNOT_INCLUDES AMAYA_ANNOT_EXTRA_LIBS IMGLIBS EXTRA_LIBS EXTRA_INCLUDES DAVDIR LIBDAV WITHDAV WWWDAV MAKERAPTOR MAKEREDLAND ANNOTLIB_COMPILE_BM AMAYA_RAPTOR_SRC AMAYA_RAPTOR_LIBS AMAYA_RAPTOR_INCLUDES MAKE_LIBWWW_RDF_PARSER LIBWWW_RDF_PARSER SUBDIRS EXTRA_MAKEFILE_IN LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SET_MAKE YACC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CXX CXXFLAGS ac_ct_CXX LEX LEXLIB LEX_OUTPUT_ROOT AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CP MV RM MKDIR ECHO CAT CHMOD SED AR DIFF EGREP ALLOCA LIBOBJS AMAYAOS AMAYAGUI GTKCONFIG_FOUND GTK_INCLUDES GTK_LIBRARIES GL_BUILDDIR GL_INCLUDES GL_LIBRARIES WXCONFIG WX_SRCDIR WX_BUILDDIR BUILDWXWIDGETS WX_INCLUDES WX_LIBRARIES WX_LINKDEPS LIBJPEG LIBPNG LIBZ MAKEJPEG MAKEPNG GTK_GL_INCLUDES GTK_GL_LIBRARIES FREETYPE_INCLUDES FREETYPE_LIBRARIES XFT_INCLUDES XFT_LIBRARIES REDLAND_CONFIG AMAYA_INSTALLDIR APP_MAJVER APP_MINVER APP_SUBVER APP_VER CEXTRACT_VER CEXTRACT_FLAGS THOTINCLUDES APIINCLUDES VPATHOPT GTK_OPTIONS THOT_OPTIONS AMAYA_OPTIONS AMAYA_ANNOT_OPTIONS AMAYA_ANNOT_INCLUDES AMAYA_ANNOT_EXTRA_LIBS IMGLIBS EXTRA_INCLUDES DAVDIR LIBDAV WITHDAV WWWDAV MAKERAPTOR MAKEREDLAND ANNOTLIB_COMPILE_BM AMAYA_RAPTOR_SRC AMAYA_RAPTOR_LIBS AMAYA_RAPTOR_INCLUDES MAKE_LIBWWW_RDF_PARSER LIBWWW_RDF_PARSER SUBDIRS EXTRA_MAKEFILE_IN LTLIBOBJS' ac_subst_files='www_frag math_frag svg_frag annot_frag dav_frag templates_frag' # Initialize some variables set by options. @@ -13376,7 +13376,7 @@ case $AMAYAOS in MACOSX) OS_OPTIONS="-D_UNIX -D_MACOS" ;; esac -+ + # Check whether --with-gl or --without-gl was given. if test "${with_gl+set}" = set; then withval="$with_gl" @@ -14884,13 +14884,13 @@ echo "$as_me: WARNING: Disabling WebDAV build !" >&2;} fi -THOT_OPTIONS="$OS_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS" +THOT_OPTIONS="$OS_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS" + +AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $TEMPLATES_OPTIONS" + if test "$with_debug" = "yes" ; then - AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS -DAMAYA_DEBUG" -else - AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS" + AMAYA_OPTIONS="$AMAYA_OPTIONS -DAMAYA_DEBUG" fi -AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS" if test "$with_wx" = "yes" ; then IMGLIBS="" @@ -14898,7 +14898,6 @@ else IMGLIBS="-ljpeg -lpng -lz" fi -EXTRA_LIBS= EXTRA_INCLUDES= # check for malloc.h @@ -14989,51 +14988,45 @@ AMAYA_INSTALLDIR="Amaya-${APP_VER}" +www_frag=$srcdir/amaya/Makefile.libwww - - www_frag=$srcdir/amaya/Makefile.libwww if test "$with_math" = "no" ; then - math_frag=/dev/null else - math_frag=$srcdir/amaya/Makefile.math fi -if test "$with_svg" = "no" ; then +if test "$with_svg" = "no" ; then svg_frag=/dev/null else - svg_frag=$srcdir/amaya/Makefile.svg fi -if test "$with_annot" = "yes" ; then +if test "$with_annot" = "yes" ; then annot_frag=$srcdir/annotlib/Makefile.annot else - annot_frag=/dev/null fi -if test "$with_dav" = "yes" ; then +if test "$with_dav" = "yes" ; then dav_frag=$srcdir/davlib/Makefile.dav else - dav_frag=/dev/null fi -if test "$with_templates" = "yes" ; then +if test "$with_templates" = "yes" ; then templates_frag=$srcdir/amaya/Makefile.templates else - templates_frag=/dev/null fi + EXTRA_MAKEFILE_IN= make_output="Makefile Options.orig:Options.in tools/Makefile \ libjpeg/Makefile libpng/Makefile libpng/zlib/Makefile \ @@ -15778,7 +15771,6 @@ s,@AMAYA_ANNOT_OPTIONS@,$AMAYA_ANNOT_OPTIONS,;t t s,@AMAYA_ANNOT_INCLUDES@,$AMAYA_ANNOT_INCLUDES,;t t s,@AMAYA_ANNOT_EXTRA_LIBS@,$AMAYA_ANNOT_EXTRA_LIBS,;t t s,@IMGLIBS@,$IMGLIBS,;t t -s,@EXTRA_LIBS@,$EXTRA_LIBS,;t t s,@EXTRA_INCLUDES@,$EXTRA_INCLUDES,;t t s,@DAVDIR@,$DAVDIR,;t t s,@LIBDAV@,$LIBDAV,;t t diff --git a/configure.in b/configure.in index 05eedae26..19ebf71be 100644 --- a/configure.in +++ b/configure.in @@ -212,7 +212,7 @@ dnl (tesselation is used for polygons with holes in it...) dnl gtkgl is for integration of opengl in GTK dnl freetype2 is for text drawing (fonts ...) dnl wxGLCanvas is for integration of opengl in wxWidgets (WX) -+AC_ARG_WITH([gl], +AC_ARG_WITH([gl], AC_HELP_STRING([--with-gl],[enable Opengl canvas (experimental)]), [case "${withval}" in yes) with_gl="yes" ;; @@ -1258,13 +1258,13 @@ dnl dnl The options for each library or binary dnl -THOT_OPTIONS="$OS_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS" +THOT_OPTIONS="$OS_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS" + +AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $TEMPLATES_OPTIONS" + if test "$with_debug" = "yes" ; then - AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS -DAMAYA_DEBUG" -else - AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS" + AMAYA_OPTIONS="$AMAYA_OPTIONS -DAMAYA_DEBUG" fi -AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS" if test "$with_wx" = "yes" ; then IMGLIBS="" @@ -1272,7 +1272,6 @@ else IMGLIBS="-ljpeg -lpng -lz" fi -EXTRA_LIBS= EXTRA_INCLUDES= # check for malloc.h @@ -1353,7 +1352,6 @@ AC_SUBST(AMAYA_ANNOT_OPTIONS) AC_SUBST(AMAYA_ANNOT_INCLUDES) AC_SUBST(AMAYA_ANNOT_EXTRA_LIBS) AC_SUBST(IMGLIBS) -AC_SUBST(EXTRA_LIBS) AC_SUBST(EXTRA_INCLUDES) AC_SUBST(DAVDIR) @@ -1376,48 +1374,43 @@ dnl dnl Include the option Makefile.xxx fragment according to the configure options dnl - AC_SUBST_FILE(www_frag) - www_frag=$srcdir/amaya/Makefile.libwww +www_frag=$srcdir/amaya/Makefile.libwww +AC_SUBST_FILE(www_frag) if test "$with_math" = "no" ; then - AC_SUBST_FILE(math_frag) math_frag=/dev/null else - AC_SUBST_FILE(math_frag) math_frag=$srcdir/amaya/Makefile.math fi +AC_SUBST_FILE(math_frag) if test "$with_svg" = "no" ; then - AC_SUBST_FILE(svg_frag) svg_frag=/dev/null else - AC_SUBST_FILE(svg_frag) svg_frag=$srcdir/amaya/Makefile.svg fi +AC_SUBST_FILE(svg_frag) if test "$with_annot" = "yes" ; then - AC_SUBST_FILE(annot_frag) annot_frag=$srcdir/annotlib/Makefile.annot else - AC_SUBST_FILE(annot_frag) annot_frag=/dev/null fi +AC_SUBST_FILE(annot_frag) if test "$with_dav" = "yes" ; then - AC_SUBST_FILE(dav_frag) dav_frag=$srcdir/davlib/Makefile.dav else - AC_SUBST_FILE(dav_frag) dav_frag=/dev/null fi +AC_SUBST_FILE(dav_frag) if test "$with_templates" = "yes" ; then - AC_SUBST_FILE(templates_frag) templates_frag=$srcdir/amaya/Makefile.templates else - AC_SUBST_FILE(templates_frag) templates_frag=/dev/null fi +AC_SUBST_FILE(templates_frag) dnl *************************************************************** dnl diff --git a/doc/Amaya_open_bugs.html b/doc/Amaya_open_bugs.html index ff6782ca8..a17aabea6 100644 --- a/doc/Amaya_open_bugs.html +++ b/doc/Amaya_open_bugs.html @@ -409,9 +409,10 @@

List of open bugs in Amaya

ML004 - - - + When you cut a <math> element and paste it, the attribut + "xmlns" is > lost. + 2006-11-12 + F. Wang @@ -591,6 +592,6 @@

List of open bugs in Amaya


-Date: 2006-11-10 +Date: 2006-11-14 diff --git a/thotlib/Makefile.in b/thotlib/Makefile.in index 916cd9e8e..fee234a9e 100644 --- a/thotlib/Makefile.in +++ b/thotlib/Makefile.in @@ -13,7 +13,7 @@ THOTINCLUDES=@THOTINCLUDES@ include ../Options INCLUDES= -DHAVE_CONFIG_H -I.. -I@top_srcdir@/amaya/xpm ${THOTINCLUDES} $(GUI_INCLUDES) $(GL_INCLUDES) $(GTK_GL_INCLUDES) $(XFT_INCLUDES) $(FREETYPE_INCLUDES) ${EXTRA_INCLUDES} -LIBS = -L. -L.. @LIBS@ $(IMGLIBS) $(EXTRA_LIBS) $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(XFT_LIBRARIES) $(FREETYPE_LIBRARIES) $(GTK_LIBRARIES) $(WX_LIBRARIES) +LIBS = -L. -L.. @LIBS@ $(IMGLIBS) $(GL_LIBRARIES) $(GTK_GL_LIBRARIES) $(XFT_LIBRARIES) $(FREETYPE_LIBRARIES) $(GTK_LIBRARIES) $(WX_LIBRARIES) prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/thotlib/base/structlist.c b/thotlib/base/structlist.c index 7529c5065..54c35510b 100644 --- a/thotlib/base/structlist.c +++ b/thotlib/base/structlist.c @@ -1123,16 +1123,16 @@ void ListAbsBoxes (PtrAbstractBox pAb, int Indent, FILE *fileDescriptor) fprintf (fileDescriptor, " "); fprintf (fileDescriptor, "BorderColor Top:%d", pAb->AbTopBColor); if (pAb->AbTopBColor == -2) - fprintf (fileDescriptor, "(transp.)"); + fprintf (fileDescriptor, "(transparent)"); fprintf (fileDescriptor, ", Right:%d", pAb->AbRightBColor); if (pAb->AbRightBColor == -2) - fprintf (fileDescriptor, "(transp.)"); + fprintf (fileDescriptor, "(transparent)"); fprintf (fileDescriptor, ", Bottom:%d", pAb->AbBottomBColor); if (pAb->AbBottomBColor == -2) - fprintf (fileDescriptor, "(transp.)"); + fprintf (fileDescriptor, "(transparent)"); fprintf (fileDescriptor, ", Left:%d", pAb->AbLeftBColor); if (pAb->AbLeftBColor == -2) - fprintf (fileDescriptor, "(transp.)"); + fprintf (fileDescriptor, "(transparent)"); fprintf (fileDescriptor, "\n"); for (j = 1; j <= Indent + 6; j++) @@ -4289,7 +4289,8 @@ int TtaListStyleOfCurrentElement (Document document, FILE *fileDescriptor) pEl->ElLeafType == LtGraphics || pEl->ElLeafType == LtPath || pEl->ElLeafType == LtPolyLine || - pEl->ElLeafType == LtSymbol)) + pEl->ElLeafType == LtSymbol || + pEl->ElLeafType == LtPicture)) pEl = pEl->ElParent; while (pEl && TypeHasException (ExcHidden, pEl->ElTypeNumber, diff --git a/thotlib/include/thot_gui_nogui.h b/thotlib/include/thot_gui_nogui.h deleted file mode 100644 index e7d803494..000000000 --- a/thotlib/include/thot_gui_nogui.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * NOGUI types - */ -#ifdef _NOGUI -typedef void * ThotWidget; -typedef void * ThotWindow; -typedef ThotWidget ThotScrollBar; -typedef ThotWidget ThotFrame; -typedef ThotWidget ThotStatusBar; -typedef ThotWidget ThotButton; -typedef ThotWidget ThotMenuBar; -typedef ThotWidget ThotMenu; -typedef ThotWidget ThotToolBar; -typedef int ThotBitmap; -typedef int ThotGC; -typedef unsigned long ThotColor; -typedef int * ThotFont; -typedef void * ThotCursor; -#ifndef _GL -//typedef XPoint ThotPoint; -#endif /* #ifndef _GL */ -typedef void * ThotEvent; -typedef void * ThotKeyEvent; -typedef void * ThotComposeStatus; -typedef void * ThotAppContext; -typedef void * ThotTranslations; -typedef int ThotIcon; -typedef void * ThotPixmap; - - // TODO : remove this X dependancy used in AHTBridge (ask jose) - typedef unsigned long XtInputId; - typedef unsigned long XtIntervalId; - typedef void* XtPointer; - -typedef struct { - unsigned long pixel; - unsigned short red, green, blue; - char flags; /* do_red, do_green, do_blue */ - char pad; -} ThotColorStruct; - -#ifndef _GL -typedef struct { - short x, y; -} ThotPoint; /* replace XPoint */ -#endif /* #ifndef _GL */ - -typedef struct { - short x1, y1, x2, y2; -} ThotSegment; /* replace XSegment */ - -typedef struct { - short x, y; - unsigned short width, height; - short angle1, angle2; -} ThotArc; /* replace XArc */ - -typedef unsigned long ThotPixel; /* replace Pixel */ -typedef unsigned long ThotKeySym; /* replace KeySym */ -typedef unsigned long ThotDisplay; /* replace Display */ -typedef unsigned long ThotDrawable; /* replace Drawable */ -typedef unsigned long ThotVisual; /* replace Visual */ - -#endif /* #ifdef _NOGUI */ diff --git a/tools/cextract-1.7/Makefile.in b/tools/cextract-1.7/Makefile.in index 755f9318b..bc497ab24 100644 --- a/tools/cextract-1.7/Makefile.in +++ b/tools/cextract-1.7/Makefile.in @@ -8,14 +8,14 @@ THOTDIR = @top_srcdir@ include ../../Options -LIBS = @LIBS@ @EXTRA_LIBS@ -lm +LIBS = @LIBS@ -lm prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ OBJS = \ - parse.o \ + parse.o \ main.o \ io.o diff --git a/tools/mkdep/Makefile.in b/tools/mkdep/Makefile.in index 10a473c71..11a34c634 100644 --- a/tools/mkdep/Makefile.in +++ b/tools/mkdep/Makefile.in @@ -6,7 +6,7 @@ include ../../Options -LIBS = @LIBS@ @EXTRA_LIBS@ +LIBS = @LIBS@ prefix = @prefix@ exec_prefix = @exec_prefix@