more consistent display of player name

[multypo.git] / qt / multypo.cpp

diff --git a/qt/multypo.cpp b/qt/multypo.cpp
index e6befe2535fd113b0ecaceb798ea04d7befda7c6..fff1da762ff487233d996cf39f28c70df1df1a17 100644 (file)
--- a/qt/multypo.cpp
+++ b/qt/multypo.cpp
@@ -5,6 +5,7 @@
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QMap>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QMap>

+#include <QTextDocument>

 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>


@@ -12,15 +13,17 @@
 
 MultypoWindow::MultypoWindow(QWidget *parent) :
        QWidget(parent),
 
 MultypoWindow::MultypoWindow(QWidget *parent) :
        QWidget(parent),

+    state(Naming),

        xiInited(false)
 {
        /* Prepare colors */
        xiInited(false)
 {
        /* Prepare colors */

-       setStyleSheet("background-color: black; color: green; font-size: 30pt");
+       setStyleSheet("background-color: black; font-size: 45pt");

 
        /* Prepare conents */
        setLayout(new QVBoxLayout(this));
 
        /* Prepare conents */
        setLayout(new QVBoxLayout(this));

-
-       mainLabel = new QLabel("Hit <Esc> to quit", this);
+       mainLabel = new QLabel(this);
+    mainLabel->setTextFormat(Qt::RichText);
+    setLabel("Namen eingeben, dann Return", BASE_COLOR);

        layout()->addWidget(mainLabel);
 
        /* Fullscreen, no cursor */
        layout()->addWidget(mainLabel);
 
        /* Fullscreen, no cursor */


@@ -34,16 +37,45 @@ MultypoWindow::~MultypoWindow()
 {
 }
 
 {
 }
 

-void MultypoWindow::resetPlayerText() {
-       for (QMap<int, Player*>::Iterator it = players.begin(); it != players.end(); ++it) {
-               it.value()->resetText();
-       }
+void MultypoWindow::setLabel(QString text, QString color)
+{
+    mainLabel->setText(QString("<font color=%1>%2</span>").arg(color).arg(Qt::escape(text)));

 }
 
 void MultypoWindow::nextWord() {
 }
 
 void MultypoWindow::nextWord() {

-       QByteArray tmp = words.readLine();
-       QString word = QString::fromUtf8(tmp);
-       mainLabel->setText(word);
+       QByteArray tmp = words.readLine().trimmed();
+       currentWord = QString::fromUtf8(tmp);
+       qDebug() << "New word:" << currentWord;
+       if (currentWord.isEmpty()) { // game over
+               setLabel("GAME OVER", READY_COLOR);
+               for (QMap<int, Player*>::Iterator it = players.begin(); it != players.end(); ++it) {
+                       it.value()->showScore();
+               }
+               state = Scoring;
+       } else {
+               for (QMap<int, Player*>::Iterator it = players.begin(); it != players.end(); ++it) {
+            it.value()->nextWord();
+        }
+               setLabel(currentWord, BASE_COLOR);
+        state = Playing;
+       }
+}
+
+bool MultypoWindow::allPlayersWaiting()
+{
+    for (QMap<int, Player*>::Iterator it = players.begin(); it != players.end(); ++it) {
+        if (it.value()->getState() != Player::Waiting) return false;
+    }
+    return true;
+}
+
+int MultypoWindow::typingPlayers()
+{
+    int n = 0;
+    for (QMap<int, Player*>::Iterator it = players.begin(); it != players.end(); ++it) {
+        if (it.value()->getState() == Player::Typing) ++n;
+    }
+    return n;

 }
 
 void MultypoWindow::handleKeyPress(int device, QString string)
 }
 
 void MultypoWindow::handleKeyPress(int device, QString string)


@@ -56,24 +88,29 @@ void MultypoWindow::handleKeyPress(int device, QString string)
        }
 
        if (!players.contains(device)) {
        }
 
        if (!players.contains(device)) {

+               if (state > Naming)
+                       return;

                players[device] = new Player(this);
        }
                players[device] = new Player(this);
        }

-       players[device]->handleKey(string);
-
-       if (gameStarted) { // ingame
-
-       } else { // name entering phase
-               bool allHaveNames = true;
-               for (QMap<int, Player*>::Iterator it = players.begin(); it != players.end(); ++it) {
-                       if (! it.value()->hasName()) {
-                               allHaveNames = false;
-                               break;
+       Player *player = players[device];
+       player->handleKey(string);
+    
+    if (state == Naming) {
+        // someone's still naming (or nobody's there yet)
+        if (!players.empty() && allPlayersWaiting()) {
+            qDebug() << "Game starting";
+            nextWord();
+        }
+    }
+    else if (state == Playing) { // all players are waiting or typing
+               if (player->getState() == Player::Typing && player->getCurrentWord() == currentWord) {
+            int points = typingPlayers()+1;
+            player->wordComplete(points);
+                       QString readyString = QString("READY: %1 points").arg(points);
+                       if (allPlayersWaiting()) {
+                               nextWord();

                        }
                }
                        }
                }

-               if (!players.empty() && allHaveNames) {
-                       gameStarted = true;
-                       nextWord();
-               }

        }
 }
 
        }
 }
 


@@ -113,7 +150,7 @@ bool MultypoWindow::handleX11Event(XEvent *event)
                for (int i = 0; i < ndevices; ++i) {
                        if (devices[i].use != XIMasterKeyboard) continue;
                        qDebug() << "Found master keyboard with ID" << devices[i].deviceid;
                for (int i = 0; i < ndevices; ++i) {
                        if (devices[i].use != XIMasterKeyboard) continue;
                        qDebug() << "Found master keyboard with ID" << devices[i].deviceid;

-                       //XISetFocus(dpy, devices[i].deviceid, winId(), CurrentTime);
+                       XISetFocus(dpy, devices[i].deviceid, winId(), CurrentTime);

                }
                XIFreeDeviceInfo(devices);
 
                }
                XIFreeDeviceInfo(devices);