Shell|Text: Password challenge response, game state in StatusWidget

skyjake · Feb 11, 2013 · 774461d · 774461d
1 parent 17eb7f6
commit 774461d
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 6 deletions.
diff --git a/doomsday/tools/shell/shell-gui/src/linkwindow.cpp b/doomsday/tools/shell/shell-gui/src/linkwindow.cpp
@@ -461,11 +461,7 @@ void LinkWindow::askForPassword()
     {
         if(d->link)
         {
-            Block response;
-            response.append("Shell");
-            response += QCryptographicHash::hash(dlg.textValue().toUtf8(),
-                                                 QCryptographicHash::Sha1);
-            *d->link << response;
+            *d->link << d->link->protocol().passwordResponse(dlg.textValue());
         }
         return;
     }

diff --git a/doomsday/tools/shell/shell-text/src/shellapp.cpp b/doomsday/tools/shell/shell-text/src/shellapp.cpp
@@ -32,6 +32,7 @@
 #include <de/shell/ServerFinder>
 #include <de/LogBuffer>
 #include <QStringList>
+#include <QTimer>
 
 using namespace de;
 using namespace shell;
@@ -195,6 +196,26 @@ void ShellApp::closeConnection()
     }
 }
 
+void ShellApp::askForPassword()
+{
+    InputDialog dlg;
+    dlg.setDescription(tr("The server requires a password."));
+    dlg.setPrompt("Password: ");
+    dlg.lineEdit().setEchoMode(LineEditWidget::PasswordEchoMode);
+    dlg.lineEdit().setSignalOnEnter(false);
+
+    if(dlg.exec(rootWidget()))
+    {
+        if(d->link) *d->link << d->link->protocol().passwordResponse(dlg.text());
+    }
+    else
+    {
+        QTimer::singleShot(1, this, SLOT(closeConnection()));
+    }
+
+    rootWidget().setFocus(d->cli);
+}
+
 void ShellApp::askToOpenConnection()
 {
     OpenConnectionDialog dlg;
@@ -285,11 +306,23 @@ void ShellApp::handleIncomingPackets()
         shell::Protocol &protocol = d->link->protocol();
         switch(protocol.recognize(packet.data()))
         {
+        case shell::Protocol::PasswordChallenge:
+            askForPassword();
+            break;
+
         case shell::Protocol::ConsoleLexicon:
             // Terms for auto-completion.
             d->cli->setLexicon(protocol.lexicon(*packet));
             break;
 
+        case shell::Protocol::GameState: {
+            Record &rec = static_cast<RecordPacket *>(packet.data())->record();
+            d->status->setGameState(
+                    rec["mode"].value().asText(),
+                    rec["rules"].value().asText(),
+                    rec["mapId"].value().asText());
+            break; }
+
         default:
             break;
         }

diff --git a/doomsday/tools/shell/shell-text/src/shellapp.h b/doomsday/tools/shell/shell-text/src/shellapp.h
@@ -40,6 +40,7 @@ public slots:
     void updateMenuWithFoundServers();
     void connectToFoundServer();
     void closeConnection();
+    void askForPassword();
     void sendCommandToServer(de::String command);
     void handleIncomingPackets();
     void disconnected();

diff --git a/doomsday/tools/shell/shell-text/src/statuswidget.cpp b/doomsday/tools/shell/shell-text/src/statuswidget.cpp
@@ -27,6 +27,9 @@ DENG2_PIMPL(StatusWidget)
 {
     Link *link;
     QTimer *updateTimer;
+    String gameMode;
+    String rules;
+    String mapId;
 
     Instance(Public &i) : Base(i), link(0)
     {
@@ -60,6 +63,15 @@ void StatusWidget::setShellLink(Link *link)
     root().requestDraw();
 }
 
+void StatusWidget::setGameState(String const &mode, String const &rules, String const &mapId)
+{
+    d->gameMode = mode;
+    d->rules = rules;
+    d->mapId = mapId;
+
+    redraw();
+}
+
 void StatusWidget::draw()
 {
     Rectanglei pos = rule().recti();
@@ -85,6 +97,11 @@ void StatusWidget::draw()
     }
     else if(d->link->status() == Link::Connected)
     {
+        String msg = d->gameMode;
+        if(!d->rules.isEmpty()) msg += " (" + d->rules + ")";
+        if(!d->mapId.isEmpty()) msg += " " + d->mapId;
+        buf.drawText(Vector2i(1, 0), msg);
+
         TimeDelta elapsed = d->link->connectedAt().since();
         String time = String("| %1:%2:%3")
                 .arg(int(elapsed.asHours()))

diff --git a/doomsday/tools/shell/shell-text/src/statuswidget.h b/doomsday/tools/shell/shell-text/src/statuswidget.h
@@ -28,7 +28,7 @@ class StatusWidget : public de::shell::TextWidget
 
 public:
     StatusWidget(de::String const &name = "");
-    virtual ~StatusWidget();
+    virtual ~StatusWidget();    
 
     /**
      * Sets the shell Link whose status is to be shown on screen.
@@ -37,6 +37,8 @@ class StatusWidget : public de::shell::TextWidget
      */
     void setShellLink(de::shell::Link *link);
 
+    void setGameState(de::String const &mode, de::String const &rules, de::String const &mapId);
+
     void draw();
 
 public slots: