- the big mergecheit

main.cpp

@@ -15,6 +15,9 @@
 #include "z80mem.h"
 #include "zx_48mem.h"
 #include "zx_128mem.h"
+#include "z80viewer.h"
+#include "zx_128bankviewer.h"
+#include "zx_128pageviewer.h"
 
 uint8_t memory[65536];
 uint32_t time = 0;
@@ -87,8 +90,16 @@ int main(int argc, char *argv[])
 
     SDL_Init(SDL_INIT_EVERYTHING);
     z80debug::init();
-    zxscreen::init(SCREEN_MODE_128K);
-    //zxscreen::init(SCREEN_MODE_48K);
+    zxscreen::init(SCREEN_MODE_48K);
+    //zxscreen::init(SCREEN_MODE_128K);
+
+    //z80viewer *v = new zx_128bankviewer();
+    //v->show();
+    //z80viewer::registerViewer("128BANK", v);
+
+    //v = new zx_128pageviewer();
+    //v->show();
+    //z80viewer::registerViewer("128PAGE", v);
 
     ui::menu::init();
     ui::menu::setexitcallback(actions::exitMenu);
@@ -121,6 +132,7 @@ int main(int argc, char *argv[])
 
     if (argc==3) { z80debug::loadngo(argv[1], argv[2]); }
     z80debug::stop();
+    z80debug::stop();
 
     bool should_exit = false;
     SDL_Event e;
@@ -156,6 +168,7 @@ int main(int argc, char *argv[])
                     } else {
                         z80debug::show();
                     }
+                    z80viewer::refreshAll();
                 } else if (e.key.keysym.scancode==SDL_SCANCODE_F10) {
                     if (z80debug::debugging()) {
                         z80debug::show();
@@ -165,6 +178,7 @@ int main(int argc, char *argv[])
                         zxscreen::fullrefresh();
                         zxscreen::redraw();
                         z80analyze::refresh();
+                        z80viewer::refreshAll();
                     }
                 } else if (e.key.keysym.scancode==SDL_SCANCODE_F11) {
                     if (z80debug::debugging()) {
@@ -175,6 +189,7 @@ int main(int argc, char *argv[])
                         zxscreen::refresh(dt);
                         zxscreen::redraw();
                         z80analyze::refresh();
+                        z80viewer::refreshAll();
                     }
                 } else if (e.key.keysym.scancode==SDL_SCANCODE_F12) {
                     if (z80debug::debugging()) {
@@ -185,6 +200,7 @@ int main(int argc, char *argv[])
                         zxscreen::refresh(dt);
                         zxscreen::redraw();
                         z80analyze::refresh();
+                        z80viewer::refreshAll();
                     }
                 }
                 result = ui::window::sendEvent(e.key.windowID, &e);
@@ -243,6 +259,7 @@ int main(int argc, char *argv[])
                 t_states -= update_freq;
                 time = SDL_GetTicks();
                 z80analyze::refresh();
+                z80viewer::refreshAll();
             }
             z80analyze::refresh(true);