more consistent display of player name

[multypo.git] / qt / multypo.cpp

diff --git a/qt/multypo.cpp b/qt/multypo.cpp
index e7a188638008266ef5112d501bfd1d46024cdc27..fff1da762ff487233d996cf39f28c70df1df1a17 100644 (file)
--- a/qt/multypo.cpp
+++ b/qt/multypo.cpp
@@ -4,54 +4,114 @@
 #include <QDebug>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QDebug>
 #include <QVBoxLayout>
 #include <QLabel>

+#include <QMap>
+#include <QTextDocument>

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

-static QString colorToString(QColor col)
-{
-       return QString("#%1%2%3").arg(col.red(), 2, 16, QChar('0'))
-                       .arg(col.green(), 2, 16, QChar('0'))
-                       .arg(col.blue(), 2, 16, QChar('0'));
-}
-

 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 */
        setWindowState(Qt::WindowFullScreen);
        setCursor(QCursor(Qt::BlankCursor));
        layout()->addWidget(mainLabel);
 
        /* Fullscreen, no cursor */
        setWindowState(Qt::WindowFullScreen);
        setCursor(QCursor(Qt::BlankCursor));

+
+       words.open(stdin,QIODevice::ReadOnly);

 }
 
 MultypoWindow::~MultypoWindow()
 {
 }
 
 }
 
 MultypoWindow::~MultypoWindow()
 {
 }
 

+void MultypoWindow::setLabel(QString text, QString color)
+{
+    mainLabel->setText(QString("<font color=%1>%2</span>").arg(color).arg(Qt::escape(text)));
+}
+
+void MultypoWindow::nextWord() {
+       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)
 {
        qDebug() << "Device" << device << "String" << string;
 
 void MultypoWindow::handleKeyPress(int device, QString string)
 {
        qDebug() << "Device" << device << "String" << string;
 

-       if (string == "Escape")
+       if (string == "Escape") {

                close();
                close();

+               return;
+       }

 
        if (!players.contains(device)) {
 
        if (!players.contains(device)) {

-               QLabel *label = new QLabel(this);
-               layout()->addWidget(label);
-               players[device] = label;
+               if (state > Naming)
+                       return;
+               players[device] = new Player(this);
+       }
+       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();
+                       }
+               }

        }
        }

-       QColor textColor = QColor(Qt::blue);
-       players[device]->setText(players[device]->text() + "<span style='color:"+colorToString(textColor)+"'>"+string+"</span>");

 }
 
 bool MultypoWindow::handleX11Event(XEvent *event)
 }
 
 bool MultypoWindow::handleX11Event(XEvent *event)


@@ -66,7 +126,7 @@ bool MultypoWindow::handleX11Event(XEvent *event)
                }
 
                /* Which version of XI2? We support 2.0 */
                }
 
                /* Which version of XI2? We support 2.0 */

-               int major = 2, minor = 0;
+               int major = 2, minor = 1;

                if (XIQueryVersion(dpy, &major, &minor) == BadRequest) {
                        qCritical() << "XI2 not available. Server supports" << major << "." <<
                                                minor;
                if (XIQueryVersion(dpy, &major, &minor) == BadRequest) {
                        qCritical() << "XI2 not available. Server supports" << major << "." <<
                                                minor;


@@ -100,7 +160,13 @@ bool MultypoWindow::handleX11Event(XEvent *event)
        }
        else if (xiInited && event->type == GenericEvent
                && event->xcookie.type == GenericEvent && event->xcookie.extension == xiOpcode
        }
        else if (xiInited && event->type == GenericEvent
                && event->xcookie.type == GenericEvent && event->xcookie.extension == xiOpcode

-               && event->xcookie.evtype == XI_KeyPress && XGetEventData(dpy, &event->xcookie)) {
+               && event->xcookie.evtype == XI_KeyPress) { 
+               
+               if (XGetEventData(dpy, &event->xcookie) != True) {
+                       qCritical() << "Error getting event data";
+                       // FIXME return true;
+               }
+               

                /* Handle XI event */
                XIDeviceEvent *d_ev = (XIDeviceEvent*) event->xcookie.data;
            KeyCode keycode = d_ev->detail;
                /* Handle XI event */
                XIDeviceEvent *d_ev = (XIDeviceEvent*) event->xcookie.data;
            KeyCode keycode = d_ev->detail;