Fixes and debug - #64

juliagoda · Apr 29, 2019 · de44bee · de44bee
1 parent 43e8c02
commit de44bee
Show file tree

Hide file tree

Showing 8 changed files with 215 additions and 50 deletions.
diff --git a/src/autoprofilewatcher.cpp b/src/autoprofilewatcher.cpp
@@ -92,10 +92,12 @@ void AutoProfileWatcher::stopTimer()
     checkWindowTimer.stop();
 }
 
+// TROP
 void AutoProfileWatcher::runAppCheck()
 {
     qInstallMessageHandler(MessageHandler::myMessageOutput);
 
+    // TROP
     #ifndef QT_DEBUG_NO_OUTPUT
         qDebug() << qApp->applicationFilePath();
     #endif
@@ -111,6 +113,7 @@ void AutoProfileWatcher::runAppCheck()
     if (!getAppProfileAssignments().isEmpty())
     {
         appLocation = findAppLocation();
+        qDebug() << "appLocation is " << appLocation << endl;
     }
 #else
     // In Windows, get program location no matter what.
@@ -124,6 +127,7 @@ void AutoProfileWatcher::runAppCheck()
     // More portable check for whether antimicro is the current application
     // with focus.
     QWidget *focusedWidget = qApp->activeWindow();
+    if (focusedWidget != nullptr) qDebug() << "get active window of app" << endl;
     QString nowWindow = QString();
     QString nowWindowClass = QString();
     QString nowWindowName = QString();
@@ -133,21 +137,23 @@ void AutoProfileWatcher::runAppCheck()
 #elif defined(Q_OS_UNIX)
 
     long currentWindow = X11Extras::getInstance()->getWindowInFocus();
+    qDebug() << "getWindowInFocus: " << currentWindow << endl;
 
     if (currentWindow > 0)
     {
         long tempWindow = X11Extras::getInstance()->findParentClient(currentWindow);
+        qDebug() << "findParentClient: " << tempWindow << endl;
 
         if (tempWindow > 0) currentWindow = tempWindow;
 
         nowWindow = QString::number(currentWindow);
+        qDebug() << "number of window now: " << nowWindow << endl;
+
         nowWindowClass = X11Extras::getInstance()->getWindowClass(static_cast<Window>(currentWindow));
-        nowWindowName = X11Extras::getInstance()->getWindowTitle(static_cast<Window>(currentWindow));
+        qDebug() << "class of window now: " << nowWindowClass << endl;
 
-        #ifndef QT_DEBUG_NO_OUTPUT
-            qDebug() << nowWindowClass;
-            qDebug() << nowWindowName;
-        #endif
+        nowWindowName = X11Extras::getInstance()->getWindowTitle(static_cast<Window>(currentWindow));
+        qDebug() << "title of window now: " << nowWindowName << endl;
     }
 #endif
 
@@ -157,6 +163,8 @@ void AutoProfileWatcher::runAppCheck()
 
     bool checkForTitleChange = getWindowNameProfileAssignments().size() > 0;
 
+    qDebug() << "window profile assignments size: " << getWindowNameProfileAssignments().size() << endl;
+
     qDebug() << "checkForTitleChange: " << checkForTitleChange;
 
 #ifdef Q_OS_WIN

diff --git a/src/inputdaemon.cpp b/src/inputdaemon.cpp
@@ -337,7 +337,8 @@ void InputDaemon::refresh()
 
     QEventLoop q;
     connect(eventWorker, &SDLEventReader::sdlStarted, &q, &QEventLoop::quit);
-    QMetaObject::invokeMethod(eventWorker, "refresh", Qt::BlockingQueuedConnection);
+    QTimer::singleShot(0, eventWorker, SLOT(refresh()));
+    //QMetaObject::invokeMethod(eventWorker, "refresh", Qt::BlockingQueuedConnection);
 
     if (eventWorker->isSDLOpen()) q.exec();
 
@@ -849,6 +850,8 @@ void InputDaemon::firstInputPass(QQueue<SDL_Event> *sdlEventQueue)
             }
             case SDL_JOYDEVICEREMOVED:
             case SDL_JOYDEVICEADDED:
+            case SDL_CONTROLLERDEVICEADDED:
+            case SDL_CONTROLLERDEVICEREMOVED:
             {
                 sdlEventQueue->append(event);
                 break;
@@ -987,6 +990,8 @@ void InputDaemon::modifyUnplugEvents(QQueue<SDL_Event> *sdlEventQueue)
                             }
                             case SDL_JOYDEVICEREMOVED:
                             case SDL_JOYDEVICEADDED:
+                            case SDL_CONTROLLERDEVICEREMOVED:
+                            case SDL_CONTROLLERDEVICEADDED:
                             {
                                 tempQueue.enqueue(event);
                                 break;
@@ -1163,6 +1168,7 @@ void InputDaemon::secondInputPass(QQueue<SDL_Event> *sdlEventQueue)
             }
 
             case SDL_JOYDEVICEREMOVED:
+            case SDL_CONTROLLERDEVICEREMOVED:
             {
                 InputDevice *device = m_joysticks->value(event.jdevice.which);
 
@@ -1179,6 +1185,7 @@ void InputDaemon::secondInputPass(QQueue<SDL_Event> *sdlEventQueue)
             }
 
             case SDL_JOYDEVICEADDED:
+            case SDL_CONTROLLERDEVICEADDED:
             {
                 addInputDevice(event.jdevice.which);
                 break;

diff --git a/src/joytabwidget.cpp b/src/joytabwidget.cpp
@@ -925,8 +925,9 @@ void JoyTabWidget::changeJoyConfig(int index)
         removeCurrentButtons();
         emit forceTabUnflash(this);
 
-        QMetaObject::invokeMethod(&tabHelper, "readConfigFile", Qt::BlockingQueuedConnection,
-                                  Q_ARG(QString, filename));
+        tabHelper.readConfigFile(filename);
+      //  QMetaObject::invokeMethod(&tabHelper, "readConfigFile", Qt::BlockingQueuedConnection,
+      //                            Q_ARG(QString, filename));
 
         fillButtons();
         refreshSetButtons();
@@ -1539,9 +1540,9 @@ void JoyTabWidget::loadDeviceSettings()
 {
     qInstallMessageHandler(MessageHandler::myMessageOutput);
 
-    //settings.beginGroup("Controllers");
+    //m_settings->beginGroup("Controllers");
     loadSettings();
-    //settings.endGroup();
+    //m_settings->endGroup();
 }
 
 bool JoyTabWidget::isDisplayingNames()

diff --git a/src/localantimicroserver.cpp b/src/localantimicroserver.cpp
@@ -25,6 +25,7 @@
 #include <QLocalServer>
 #include <QDebug>
 
+
 LocalAntiMicroServer::LocalAntiMicroServer(QObject *parent) :
     QObject(parent)
 {
@@ -37,30 +38,56 @@ void LocalAntiMicroServer::startLocalServer()
 {
     qInstallMessageHandler(MessageHandler::myMessageOutput);
 
-    QLocalServer::removeServer(PadderCommon::localSocketKey);
-    localServer->setMaxPendingConnections(1);
-    if (!localServer->listen(PadderCommon::localSocketKey))
+    if (localServer != nullptr)
     {
-        QTextStream errorstream(stderr);
-        QString message("Could not start signal server. Profiles cannot be reloaded\n");
-        message.append("from command-line");
-        errorstream << trUtf8(message.toStdString().c_str()) << endl;
+        if (!localServer->hasPendingConnections()) QLocalServer::removeServer(PadderCommon::localSocketKey);
+
+        if (localServer->maxPendingConnections() != 1) localServer->setMaxPendingConnections(1);
+
+        if (!localServer->isListening())
+        {
+            if (!localServer->listen(PadderCommon::localSocketKey))
+            {
+                QTextStream errorstream(stderr);
+                QString message("Could not start signal server. Profiles cannot be reloaded\n");
+                message.append("from command-line");
+                errorstream << trUtf8(message.toStdString().c_str()) << endl;
+                qDebug() << "Could not start signal server. Profiles cannot be reloaded\n" << " \nfrom command-line\n " << trUtf8(message.toStdString().c_str()) << endl;
+            }
+            else
+            {
+                connect(localServer, &QLocalServer::newConnection, this, &LocalAntiMicroServer::handleOutsideConnection);
+            }
+        }
     }
     else
     {
-        connect(localServer, &QLocalServer::newConnection, this, &LocalAntiMicroServer::handleOutsideConnection);
+        qDebug() << "LocalAntiMicroServer::startLocalServer(): localServer is nullptr" << endl;
     }
 }
 
 void LocalAntiMicroServer::handleOutsideConnection()
 {
     qInstallMessageHandler(MessageHandler::myMessageOutput);
 
-    QLocalSocket *socket = localServer->nextPendingConnection();
-    if (socket != nullptr)
+    if (localServer != nullptr)
+    {
+        QLocalSocket *socket = localServer->nextPendingConnection();
+
+        if (socket != nullptr)
+        {
+            qDebug() << "There is next pending connection: " << socket->socketDescriptor() << endl;
+            connect(socket, &QLocalSocket::disconnected, this, &LocalAntiMicroServer::handleSocketDisconnect);
+            connect(socket, &QLocalSocket::disconnected, socket, &QLocalSocket::deleteLater);
+        }
+        else
+        {
+            qDebug() << "There isn't next pending connection: " << endl;
+        }
+    }
+    else
     {
-        connect(socket, &QLocalSocket::disconnected, this, &LocalAntiMicroServer::handleSocketDisconnect);
-        connect(socket, &QLocalSocket::disconnected, socket, &QLocalSocket::deleteLater);
+        qDebug() << "LocalAntiMicroServer::handleOutsideConnection(): localServer is nullptr" << endl;
     }
 }
 
@@ -78,7 +105,7 @@ void LocalAntiMicroServer::close()
     localServer->close();
 }
 
-QLocalServer* LocalAntiMicroServer::getLocalServer() const {
-
+QLocalServer* LocalAntiMicroServer::getLocalServer() const
+{
     return localServer;
 }