doxygen index page, OnResume all modules from Context::Resume

doc/CMakeLists.txt

@@ -38,6 +38,7 @@ IF(DOXYGEN_FOUND)
   # the Doxyfile with a REGEX REPLACE (see below)
   SET( DOXYGEN_SOURCE_DIR
  #   "${CMAKE_SOURCE_DIR}/library"
+    "${CMAKE_SOURCE_DIR}/doc/index.dxgen"
     "${CMAKE_SOURCE_DIR}/library/include"
     "${CMAKE_SOURCE_DIR}/library/include/dfhack"
     "${CMAKE_SOURCE_DIR}/library/include/dfhack/modules"

doc/Doxyfile.in

@@ -8,7 +8,7 @@ PROJECT_NUMBER         = @DFHACK_VERSION@
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = YES
+USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = 
@@ -31,7 +31,7 @@ SUBGROUPING            = YES
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
+EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = NO
 EXTRACT_STATIC         = NO
 EXTRACT_LOCAL_CLASSES  = NO
@@ -69,7 +69,7 @@ WARN_LOGFILE           =
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = @CMAKE_DOXYGEN_INPUT_LIST@
-FILE_PATTERNS          = *.cpp *.h
+FILE_PATTERNS          = *.cpp *.h *.dxgen
 RECURSIVE              = NO
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
@@ -102,10 +102,6 @@ IGNORE_PREFIX          =
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
-# this code is needed if you want to build this doxygen docu for a static wep page as http://libnoise.sourceforge.net/
-#HTML_HEADER            = htmldata/templateheader.html
-#HTML_FOOTER            = htmldata/templatefooter.html
-#HTML_STYLESHEET        = htmldata/doxygen.css
 
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO

library/DFContext.cpp

@@ -173,6 +173,10 @@ bool Context::AsyncSuspend()
 
 bool Context::Resume()
 {
+    for(int i = 0 ; i < d->allModules.size(); i++)
+    {
+        d->allModules[i]->OnResume();
+    }
     return d->p->resume();
 }
 bool Context::ForceResume()

library/include/dfhack/DFModule.h

@@ -36,9 +36,18 @@ namespace DFHack
         ~Module(){};
         virtual bool Start(){return true;};// default start...
         virtual bool Finish() = 0;// everything should have a Finish()
-        virtual bool doFinishOnResume(){return true;}; // should Context call Finish when Resume is called?
+        // should Context call Finish when Resume is called?
-        virtual bool doFinishOnMapChange(){return false;}; // Finish when map change is detected?
+        virtual bool OnResume()
-        virtual bool doFinishOnDetach(){return false;}; // Finish in Context::Detach?
+        {
+            Finish();
+            return true;
+        };
+        // Finish when map change is detected?
+        // TODO: implement
+        virtual bool OnMapChange()
+        {
+            return false;
+        };
     };
 }
 #endif //MODULE_H_INCLUDED

library/modules/Position.cpp

@@ -66,7 +66,10 @@ Position::Position(DFContextShared * d_)
         d->cursor_xyz_offset = mem->getAddress ("cursor_xyz");
         d->window_dims_offset = mem->getAddress ("window_dims");
         d->Started = true;
-
+    }
+    catch(exception &){};
+    try
+    {
         d->hotkey_start = mem->getAddress("hotkey_start");
         d->hotkey_mode_offset = mem->getOffset ("hotkey_mode");
         d->hotkey_xyz_offset = mem->getOffset("hotkey_xyz");