[Agar][Debug] Using agar_logger.h to display debugging log, on some features.

diff --git a/source/src/agar/menu/agar_menu.cpp b/source/src/agar/menu/agar_menu.cpp
index eb7acde..7827c37 100644 (file)
--- a/source/src/agar/menu/agar_menu.cpp
+++ b/source/src/agar/menu/agar_menu.cpp
@@ -8,6 +8,7 @@
 */
 
 #include "menu_common.h"
+#include "agar_logger.h"
 
 // MayBE to class?
 AG_MenuItem *MenuNode_Control = NULL;
@@ -204,6 +205,7 @@ static void Floppy_DispD88(AG_Event *event)
        AG_MenuSetLabel(me, "　%s", str);
       }
     } else {
+      AG_MenuSetLabel(me, " ");
       me->state = 0;
     }
   }
@@ -215,7 +217,8 @@ void Floppy_SelectD88(AG_Event *event)
   AG_Menu *menu = (AG_Menu *)AG_SELF();
   int drive = AG_INT(1);
   int num = AG_INT(2);
-  printf("Selected D88 %d, %d\n", drive, num);
+  OnSelectD88Bank(event);
+  AGAR_DebugLog(AGAR_LOG_DEBUG, "Selected D88 %d, %d\n", drive, num);
 }
 
 static void Floppy_DispRecent(AG_Event *event)
@@ -240,8 +243,8 @@ static void Floppy_SelectRecent(AG_Event *event)
   int drive = AG_INT(1);
   int num = AG_INT(2);
 
-  // OnRecentFD(event);
-  printf("Selected Recent image Drive = %d, %d\n", drive, num);
+  OnRecentFD(event);
+  AGAR_DebugLog(AGAR_LOG_DEBUG, "Selected Recent image Drive = %d, %d\n", drive, num);
 }
 
 static void OpenDiskDlgSub(AG_Event *event)
@@ -279,10 +282,9 @@ void FloppyMenu(struct MenuNodes_FDx* node, int drive)
                                              "%i,%i", drive, i);
 
   }    
+  AG_MenuSeparator(node->Node);
 
   node->Node_Recent_Root = AG_MenuNode(node->Node, _N("Recent Selected Disks"), NULL); 
-  AG_MenuSeparator(node->Node);
-  
   for(i = 0; i < 8; i++) {
     node->Node_Recent[i] = MakeDynamicElement(node->Node_Recent_Root, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", NULL,
                                              Floppy_DispRecent,
@@ -318,7 +320,7 @@ static void Tape_SelectRecent(AG_Event *event)
   int num = AG_INT(1);
 
   OnRecentTAPE(event);
-  printf("Selected Recent Tape %d\n", num);
+  AGAR_DebugLog(AGAR_LOG_DEBUG, "Selected Recent Tape %d\n", num);
 }
 
 static void OnOpenTapeDlgSub(AG_Event *event)

diff --git a/source/src/config.cpp b/source/src/config.cpp
index 79073cc..5c6f3bb 100644 (file)
--- a/source/src/config.cpp
+++ b/source/src/config.cpp
@@ -12,6 +12,7 @@
 #include <string>\r
 #include <vector>\r
 #include "fileio.h"\r
+#include "agar_logger.h"\r
 #else\r
 #include <windows.h>\r
 #endif\r
@@ -21,7 +22,9 @@
 #include "common.h"\r
 #include "config.h"\r
 #include "fileio.h"\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
 #include "agar_main.h"\r
+#endif\r
 \r
 config_t config;\r
 \r
@@ -73,7 +76,7 @@ std::string GetPrivateProfileStr(char *lpAppName, char *lpKeyName, FILEIO *lpFil
       std::string got_str;\r
   \r
       snprintf(key, 255, "%s.%s", lpAppName, lpKeyName);\r
-      printf("Try App: %s Key: %s\n", lpAppName, lpKeyName);\r
+      //AGAR_DebugLog(AGAR_LOG_DEBUG, "Try App: %s Key: %s\n", lpAppName, lpKeyName);\r
       key_str = key;\r
       ibuf[0] = '\0';\r
       i = 0;\r
@@ -92,7 +95,7 @@ std::string GetPrivateProfileStr(char *lpAppName, char *lpKeyName, FILEIO *lpFil
       pos = got_str.find(key_str);\r
       if(pos == std::string::npos) return "";\r
       got_str.erase(0, pos + key_str.length());\r
-      printf("Ok. Got %s = %s.\n", key, got_str.c_str());\r
+      //AGAR_DebugLog(AGAR_LOG_DEBUG, "Ok. Got %s = %s.\n", key, got_str.c_str());\r
    return got_str;\r
 }\r
 \r
@@ -197,8 +200,13 @@ void load_config()
         cpp_confdir.copy(app_path2, _MAX_PATH, 0);\r
    \r
         sprintf(cfgpath, _T("%s%s.ini"), app_path2, CONFIG_NAME);\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+        AGAR_DebugLog(AGAR_LOG_INFO, "Try to read config: %s", cfgpath);\r
+#else\r
         printf("Try to read config: %s\n", cfgpath);\r
+#endif\r
         if(!config_path->Fopen(cfgpath, FILEIO_READ_ASCII)) return;\r
+        AGAR_DebugLog(AGAR_LOG_INFO, "OK.");\r
 #else\r
        _TCHAR app_path[_MAX_PATH], config_path[_MAX_PATH], *ptr;\r
        GetModuleFileName(NULL, config_path, _MAX_PATH);\r
@@ -336,10 +344,15 @@ void save_config()
         \r
         strncat(app_path2, CONFIG_NAME, _MAX_PATH);\r
         strncat(app_path2, ".ini", _MAX_PATH);\r
-        printf("Try to write config: %s\n", app_path2);\r
+\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+        AGAR_DebugLog(AGAR_LOG_INFO, "Try to read config: %s", app_path2);\r
+#else\r
+        printf("Try to read config: %s\n", app_path2);\r
+#endif\r
 \r
         if(config_path->Fopen(app_path2, FILEIO_WRITE_ASCII) != true) return;\r
-        printf("OK.\n");\r
+        AGAR_DebugLog(AGAR_LOG_INFO, "OK.");\r
 \r
 #else\r
         _TCHAR app_path[_MAX_PATH], config_path[_MAX_PATH], *ptr;\r

diff --git a/source/src/emu.cpp b/source/src/emu.cpp
index e9c11de..efc9fe5 100644 (file)
--- a/source/src/emu.cpp
+++ b/source/src/emu.cpp
@@ -12,6 +12,7 @@
 #include "fileio.h"\r
 #if defined(_USE_AGAR) || (_USE_SDL)\r
 #include "agar_main.h"\r
+#include "agar_logger.h"\r
 #include <ctime>\r
 #endif\r
 \r
@@ -260,7 +261,9 @@ _TCHAR* EMU::bios_path(_TCHAR* file_name)
         static _TCHAR file_path[_MAX_PATH];\r
         strcpy(file_path, app_path);\r
         strcat(file_path, file_name);\r
-        printf("LOAD: %s\n", file_path);\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+        AGAR_DebugLog(AGAR_LOG_INFO, "LOAD BIOS: %s\n", file_path);\r
+#endif\r
 #else\r
         static _TCHAR file_path[_MAX_PATH];\r
        _stprintf(file_path, _T("%s%s"), app_path, file_name);\r

diff --git a/source/src/vm/disk.cpp b/source/src/vm/disk.cpp
index 2b77bdc..cbd55a1 100644 (file)
--- a/source/src/vm/disk.cpp
+++ b/source/src/vm/disk.cpp
@@ -9,6 +9,9 @@
 \r
 #include "disk.h"\r
 #include "../fileio.h"\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+#include "agar_logger.h"\r
+#endif\r
 \r
 // crc table\r
 static const uint16 crc_table[256] = {\r
@@ -116,8 +119,10 @@ void DISK::open(_TCHAR path[], int offset)
 {\r
        // check current disk image\r
        if(inserted) {\r
-          printf("Open disk: %s\n", path);\r
-               if(_tcsicmp(orig_path, path) == 0 && file_offset == offset) {\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+          AGAR_DebugLog(AGAR_LOG_INFO, "Open disk: %s", path);\r
+#endif\r
+          if(_tcsicmp(orig_path, path) == 0 && file_offset == offset) {\r
                        return;\r
                }\r
                close();\r
@@ -125,8 +130,9 @@ void DISK::open(_TCHAR path[], int offset)
        memset(buffer, 0, sizeof(buffer));\r
        media_type = MEDIA_TYPE_UNK;\r
        is_standard_image = is_fdi_image = false;\r
-       printf("Open disk: %s\n", path);\r
-       \r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+       AGAR_DebugLog(AGAR_LOG_INFO, "Open disk: %s", path);\r
+#endif \r
        // open disk image\r
        fi = new FILEIO();\r
        if(fi->Fopen(path, FILEIO_READ_BINARY)) {\r
@@ -218,7 +224,9 @@ void DISK::open(_TCHAR path[], int offset)
                        }\r
                        catch(...) {\r
                                // failed to convert the disk image\r
-                               printf("EE: disk.cpp : Failed to convert disk image.\n");\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+                               AGAR_DebugLog(AGAR_LOG_INFO, "EE: disk.cpp : Failed to convert disk image.");\r
+#endif\r
                        }\r
                }\r
 file_loaded:\r

diff --git a/source/src/vm/mb8877.cpp b/source/src/vm/mb8877.cpp
index 0f7cbd8..bcf93f8 100644 (file)
--- a/source/src/vm/mb8877.cpp
+++ b/source/src/vm/mb8877.cpp
@@ -11,6 +11,9 @@
 #include "mb8877.h"\r
 #include "disk.h"\r
 #include "../fileio.h"\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+#include "agar_logger.h"\r
+#endif\r
 \r
 #define FDC_ST_BUSY            0x01    // busy\r
 #define FDC_ST_INDEX           0x02    // index hole\r
@@ -652,7 +655,9 @@ void MB8877::cmd_restore()
        \r
        seektrk = 0;\r
        seekvct = true;\r
-       \r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+        AGAR_DebugLog(AGAR_LOG_DEBUG, "MB8877: SEEK0");\r
+#endif\r
        REGISTER_SEEK_EVENT();\r
        REGISTER_EVENT(EVENT_SEEKEND, 300);\r
 }\r
@@ -670,6 +675,9 @@ void MB8877::cmd_seek()
 #endif\r
        seektrk = (seektrk > 83) ? 83 : (seektrk < 0) ? 0 : seektrk;\r
        seekvct = !(datareg > trkreg);\r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+        AGAR_DebugLog(AGAR_LOG_DEBUG, "MB8877: SEEK Track = %d", seektrk);\r
+#endif\r
        \r
        REGISTER_SEEK_EVENT();\r
        REGISTER_EVENT(EVENT_SEEKEND, 300);\r
@@ -693,7 +701,10 @@ void MB8877::cmd_stepin()
        \r
        seektrk = (fdc[drvreg].track < 83) ? fdc[drvreg].track + 1 : 83;\r
        seekvct = false;\r
-       \r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+        AGAR_DebugLog(AGAR_LOG_DEBUG, "MB8877: STEPIN: Track = %d", seektrk);\r
+#endif\r
+   \r
        REGISTER_SEEK_EVENT();\r
        REGISTER_EVENT(EVENT_SEEKEND, 300);\r
 }\r
@@ -706,7 +717,10 @@ void MB8877::cmd_stepout()
        \r
        seektrk = (fdc[drvreg].track > 0) ? fdc[drvreg].track - 1 : 0;\r
        seekvct = true;\r
-       \r
+#if defined(_USE_AGAR) || defined(_USE_SDL)\r
+        AGAR_DebugLog(AGAR_LOG_DEBUG, "MB8877: STEPOUT: Track = %d", seektrk);\r
+#endif \r
+   \r
        REGISTER_SEEK_EVENT();\r
        REGISTER_EVENT(EVENT_SEEKEND, 300);\r
 }\r
@@ -721,7 +735,7 @@ void MB8877::cmd_readdata()
        now_search = true;\r
        \r
        double time;\r
-        printf("Disk: READDATA\n");\r
+        //AGAR_DebugLog(AGAR_LOG_DEBUG, "MB8877: READDATA");\r
        if(!(status_tmp & FDC_ST_RECNFND)) {\r
                time = get_usec_to_start_trans();\r
        } else {\r