[UI][VM][Qt] Move AGAR_Logger and DrawThread from qt/common/ to qt/gui/ to integrate...

diff --git a/source/src/qt/common/CMakeLists.txt b/source/src/qt/common/CMakeLists.txt
index 5c62094..ae263cd 100644 (file)
--- a/source/src/qt/common/CMakeLists.txt
+++ b/source/src/qt/common/CMakeLists.txt
@@ -2,7 +2,7 @@ message("* qt/common")
 
 set(s_qt_common_headers
          emu_thread.h
-         draw_thread.h
+#        draw_thread.h
          menu_metaclass.h
          mainwidget.h
 )
@@ -18,11 +18,11 @@ set(QT_COMMON_BASE
          menu_flags.cpp
          menu_metaclass.cpp
          emu_thread.cpp
-         draw_thread.cpp
+#        draw_thread.cpp
          util_fd2.cpp
          util_bubble2.cpp
          util_main.cpp
-         agar_logger.cpp
+#        agar_logger.cpp
 )
 
 if(USE_QT_5)

diff --git a/source/src/qt/common/qt_main.cpp b/source/src/qt/common/qt_main.cpp
index 6b9458f..831ce7e 100644 (file)
--- a/source/src/qt/common/qt_main.cpp
+++ b/source/src/qt/common/qt_main.cpp
@@ -234,7 +234,7 @@ void Ui_MainWindow::LaunchEmuThread(void)
        objNameStr = QString("EmuThreadClass");
        hRunEmu->setObjectName(objNameStr);
        
-       hDrawEmu = new DrawThreadClass(emu, this);
+       hDrawEmu = new DrawThreadClass(emu, emu->get_osd(), this);
        emu->set_parent_handler(hRunEmu, hDrawEmu);
        
 #ifdef ONE_BOARD_MICRO_COMPUTER
@@ -615,7 +615,7 @@ int main(int argc, char *argv[])
 #endif
        bLogSYSLOG = (int)0;
        bLogSTDOUT = (int)1;
-       AGAR_OpenLog(bLogSYSLOG, bLogSTDOUT); // Write to syslog, console
+       AGAR_OpenLog(bLogSYSLOG, bLogSTDOUT, DEVICE_NAME); // Write to syslog, console
        
        archstr = "Generic";
 #if defined(__x86_64__)

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index b259e42..cdc8c4d 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -24,6 +24,8 @@ set(s_qt_gui_headers
          dropdown_jspage.h
          dialog_set_key.h
          dialog_set_key_combo.h
+         
+         draw_thread.h
          joy_thread.h
 )
 
@@ -67,8 +69,11 @@ set(s_qt_gui_srcs
          dialog_set_key.cpp
          dialog_set_key_combo.cpp
          
+         draw_thread.cpp
          joy_thread.cpp
+         agar_logger.cpp
 )
+
 if(USE_QT_5)
   QT5_WRAP_CPP(s_qt_gui_headers_MOC ${s_qt_gui_headers})
 else()

diff --git a/source/src/qt/common/agar_logger.cpp b/source/src/qt/gui/agar_logger.cpp
similarity index 95%
rename from source/src/qt/common/agar_logger.cpp
rename to source/src/qt/gui/agar_logger.cpp
index 018aa10..2dca6f5 100644 (file)
--- a/source/src/qt/common/agar_logger.cpp
+++ b/source/src/qt/gui/agar_logger.cpp
@@ -22,14 +22,16 @@ extern class USING_FLAGS *using_flags;
 extern "C" 
 {
    
-void AGAR_OpenLog(int syslog, int cons)
+void AGAR_OpenLog(int syslog, int cons, const char *devname)
 {
        int flags = 0;
        
        log_onoff = 1;
        memset(log_sysname, 0x00, sizeof(log_sysname));
        strncpy(log_sysname, "Common Source Project(", sizeof(log_sysname));
-       strncat(log_sysname, DEVICE_NAME, sizeof(log_sysname));
+       if(devname != NULL) {
+               strncat(log_sysname, devname, sizeof(log_sysname));
+       }
        strncat(log_sysname, ")", sizeof(log_sysname));
        
        if(syslog != 0) {
@@ -47,7 +49,6 @@ void AGAR_OpenLog(int syslog, int cons)
        log_opened = TRUE;
 }
    
-   
 void AGAR_DebugLog(int level, const char *fmt, ...)
 {
        va_list ap;

diff --git a/source/src/qt/common/agar_logger.h b/source/src/qt/gui/agar_logger.h
similarity index 92%
rename from source/src/qt/common/agar_logger.h
rename to source/src/qt/gui/agar_logger.h
index 39bc4f5..7aebece 100644 (file)
--- a/source/src/qt/common/agar_logger.h
+++ b/source/src/qt/gui/agar_logger.h
@@ -23,7 +23,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-   extern void AGAR_OpenLog(int syslog, int cons);
+   extern void AGAR_OpenLog(int syslog, int cons, const char *devname);
    extern void AGAR_DebugLog(int level, const char *fmt, ...);
    extern void AGAR_CloseLog(void);
    extern void AGAR_SetLogStatus(int sw);
@@ -50,4 +50,4 @@ extern "C" {
 }
 #endif
  
-#endif
\ No newline at end of file
+#endif

diff --git a/source/src/qt/common/draw_thread.cpp b/source/src/qt/gui/draw_thread.cpp
similarity index 86%
rename from source/src/qt/common/draw_thread.cpp
rename to source/src/qt/gui/draw_thread.cpp
index 330adb1..47c9334 100644 (file)
--- a/source/src/qt/common/draw_thread.cpp
+++ b/source/src/qt/gui/draw_thread.cpp
@@ -15,18 +15,19 @@
 
 #include <SDL.h>
 #include "emu.h"
+#include "osd.h"
 #include "vm/vm.h"
 
 #include "qt_main.h"
 #include "agar_logger.h"
-#include "mainwidget.h"
-
+#include "mainwidget_base.h"
 #include "draw_thread.h"
 
-DrawThreadClass::DrawThreadClass(EMU *p, QObject *parent) : QThread(parent) {
-       MainWindow = (Ui_MainWindow *)parent;
+DrawThreadClass::DrawThreadClass(EMU *p, OSD *o, QObject *parent) : QThread(parent) {
+       MainWindow = (Ui_MainWindowBase *)parent;
        glv = MainWindow->getGraphicsView();
        p_emu = emu;
+       p_osd = o;
        screen = QGuiApplication::primaryScreen();
        
        draw_screen_buffer = NULL;
@@ -41,12 +42,19 @@ DrawThreadClass::~DrawThreadClass()
 {
 }
 
+void DrawThreadClass::SetEmu(EMU *p)
+{
+               p_emu = p;
+               p_osd = p->get_osd();
+}
+
+
 void DrawThreadClass::doDraw(bool flag)
 {
        QImage *p;
        if(flag) {
                emit sig_draw_timing(true);
-               draw_frames = p_emu->draw_screen();
+               draw_frames = p_osd->draw_screen();
        } else {
                draw_frames = 1;
        }

diff --git a/source/src/qt/common/draw_thread.h b/source/src/qt/gui/draw_thread.h
similarity index 87%
rename from source/src/qt/common/draw_thread.h
rename to source/src/qt/gui/draw_thread.h
index afde4d3..c9823f0 100644 (file)
--- a/source/src/qt/common/draw_thread.h
+++ b/source/src/qt/gui/draw_thread.h
@@ -15,11 +15,11 @@
 
 #include <SDL.h>
 
-#include "osd.h"
 #include "qt_gldraw.h"
 
-class Ui_MainWindow;
+class Ui_MainWindowBase;
 class EMU;
+class OSD;
 
 QT_BEGIN_NAMESPACE
 
@@ -27,7 +27,8 @@ class DrawThreadClass : public QThread {
        Q_OBJECT
  private:
        EMU *p_emu;
-       Ui_MainWindow *MainWindow;
+       OSD *p_osd;
+       Ui_MainWindowBase *MainWindow;
        GLDrawClass *glv;
 
        qreal refresh_rate;
@@ -42,12 +43,10 @@ class DrawThreadClass : public QThread {
        bitmap_t *draw_screen_buffer;
        
  public:
-       DrawThreadClass(EMU *p, QObject *parent = 0);
+       DrawThreadClass(EMU *p, OSD *o, QObject *parent = 0);
        ~DrawThreadClass();
        void run() { doWork("");}
-       void SetEmu(EMU *p) {
-               p_emu = p;
-       }
+       void SetEmu(EMU *p);
 public slots:
        void doWork(const QString &);
        void doExit(void);