aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Chat works!

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-11-13 18:27:06 +01:00
parent 1baa188067
commit 64aa68cd26
28 changed files with 714 additions and 424 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/cockatrice.pro
View file

@ -8,7 +8,6 @@ RESOURCES = cockatrice.qrc
QT += network svg QT += network svg
HEADERS += src/counter.h \ HEADERS += src/counter.h \
src/gameselector.h \
src/dlg_creategame.h \ src/dlg_creategame.h \
src/dlg_connect.h \ src/dlg_connect.h \
src/gamesmodel.h \ src/gamesmodel.h \
@ -46,12 +45,12 @@ HEADERS += src/counter.h \
src/tab_server.h \ src/tab_server.h \
src/tab_chatchannel.h \ src/tab_chatchannel.h \
src/tab_game.h \ src/tab_game.h \
src/tab_supervisor.h \
../common/protocol.h \ ../common/protocol.h \
../common/protocol_items.h \ ../common/protocol_items.h \
../common/protocol_datastructures.h ../common/protocol_datastructures.h
SOURCES += src/counter.cpp \ SOURCES += src/counter.cpp \
src/gameselector.cpp \
src/dlg_creategame.cpp \ src/dlg_creategame.cpp \
src/dlg_connect.cpp \ src/dlg_connect.cpp \
src/client.cpp \ src/client.cpp \
@ -90,6 +89,7 @@ SOURCES += src/counter.cpp \
src/tab_server.cpp \ src/tab_server.cpp \
src/tab_chatchannel.cpp \ src/tab_chatchannel.cpp \
src/tab_game.cpp \ src/tab_game.cpp \
src/tab_supervisor.cpp \
../common/protocol.cpp \ ../common/protocol.cpp \
../common/protocol_items.cpp ../common/protocol_items.cpp

185
cockatrice/src/client.cpp
View file

@ -285,6 +285,9 @@ void Client::processProtocolItem(ProtocolItem *item)
GenericEvent *genericEvent = qobject_cast<GenericEvent *>(item); GenericEvent *genericEvent = qobject_cast<GenericEvent *>(item);
if (genericEvent) { if (genericEvent) {
switch (genericEvent->getItemId()) { switch (genericEvent->getItemId()) {
case ItemId_Event_ListGames: emit listGamesEventReceived(qobject_cast<Event_ListGames *>(item)); break;
case ItemId_Event_ServerMessage: emit serverMessageEventReceived(qobject_cast<Event_ServerMessage *>(item)); break;
case ItemId_Event_ListChatChannels: emit listChatChannelsEventReceived(qobject_cast<Event_ListChatChannels *>(item)); break;
} }
delete genericEvent; delete genericEvent;
return; return;
@ -362,188 +365,6 @@ void Client::ping()
sendCommand(new Command_Ping); sendCommand(new Command_Ping);
} }
/* /*
PendingCommand *Client::chatListChannels()
{
return cmd("chat_list_channels");
}
PendingCommand_ChatJoinChannel *Client::chatJoinChannel(const QString &name)
{
return static_cast<PendingCommand_ChatJoinChannel *>(cmd(QString("chat_join_channel|%1").arg(name), new PendingCommand_ChatJoinChannel(name)));
}
PendingCommand *Client::chatLeaveChannel(const QString &name)
{
return cmd(QString("chat_leave_channel|%1").arg(name));
}
PendingCommand *Client::chatSay(const QString &channel, const QString &s)
{
return cmd(QString("chat_say|%1|%2").arg(channel).arg(s));
}
PendingCommand *Client::listGames()
{
return cmd("list_games");
}
PendingCommand_ListPlayers *Client::listPlayers()
{
return static_cast<PendingCommand_ListPlayers *>(cmd("list_players", new PendingCommand_ListPlayers));
}
PendingCommand *Client::createGame(const QString &description, const QString &password, unsigned int maxPlayers, bool spectatorsAllowed)
{
PendingCommand *pc = cmd(QString("create_game|%1|%2|%3|%4").arg(description).arg(password).arg(maxPlayers).arg(spectatorsAllowed ? 1 : 0));
connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(enterGameResponse(ServerResponse)));
return pc;
}
PendingCommand *Client::joinGame(int gameId, const QString &password, bool spectator)
{
PendingCommand *pc = cmd(QString("join_game|%1|%2|%3").arg(gameId).arg(password).arg(spectator ? 1 : 0));
connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(enterGameResponse(ServerResponse)));
return pc;
}
PendingCommand *Client::leaveGame()
{
PendingCommand *pc = cmd("leave_game");
connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(leaveGameResponse(ServerResponse)));
return pc;
}
PendingCommand *Client::login(const QString &name, const QString &pass)
{
PendingCommand *pc = cmd(QString("login|%1|%2").arg(name).arg(pass));
connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(loginResponse(ServerResponse)));
return pc;
}
PendingCommand *Client::say(const QString &s)
{
return cmd(QString("say|%1").arg(s));
}
PendingCommand *Client::shuffle()
{
return cmd("shuffle");
}
PendingCommand *Client::rollDie(unsigned int sides)
{
return cmd(QString("roll_die|%1").arg(sides));
}
PendingCommand *Client::drawCards(unsigned int number)
{
return cmd(QString("draw_cards|%1").arg(number));
}
PendingCommand *Client::moveCard(int cardid, const QString &startzone, const QString &targetzone, int x, int y, bool faceDown)
{
// if startzone is public: cardid is the card's id
// else: cardid is the position of the card in the zone (e.g. deck)
return cmd(QString("move_card|%1|%2|%3|%4|%5|%6").arg(cardid).arg(startzone).arg(targetzone).arg(x).arg(y).arg(faceDown ? 1 : 0));
}
PendingCommand *Client::createToken(const QString &zone, const QString &name, const QString &powtough, int x, int y)
{
return cmd(QString("create_token|%1|%2|%3|%4|%5").arg(zone).arg(name).arg(powtough).arg(x).arg(y));
}
PendingCommand *Client::createArrow(int startPlayerId, const QString &startZone, int startCardId, int targetPlayerId, const QString &targetPlayerZone, int targetCardId, const QColor &color)
{
return cmd(QString("create_arrow|%1|%2|%3|%4|%5|%6|%7").arg(startPlayerId).arg(startZone).arg(startCardId).arg(targetPlayerId).arg(targetPlayerZone).arg(targetCardId).arg(colorToNumber(color)));
}
PendingCommand *Client::deleteArrow(int arrowId)
{
return cmd(QString("delete_arrow|%1").arg(arrowId));
}
PendingCommand *Client::setCardAttr(const QString &zone, int cardid, const QString &aname, const QString &avalue)
{
return cmd(QString("set_card_attr|%1|%2|%3|%4").arg(zone).arg(cardid).arg(aname).arg(avalue));
}
void Client::submitDeck(const QStringList &deck)
{
cmd("submit_deck");
QStringListIterator i(deck);
while (i.hasNext())
msg(i.next());
msg(".");
}
PendingCommand *Client::readyStart()
{
return cmd("ready_start");
}
PendingCommand *Client::incCounter(int counterId, int delta)
{
return cmd(QString("inc_counter|%1|%2").arg(counterId).arg(delta));
}
PendingCommand *Client::addCounter(const QString &counterName, QColor color, int radius, int value)
{
return cmd(QString("add_counter|%1|%2|%3|%4").arg(counterName).arg(colorToNumber(color)).arg(radius).arg(value));
}
PendingCommand *Client::setCounter(int counterId, int value)
{
return cmd(QString("set_counter|%1|%2").arg(counterId).arg(value));
}
PendingCommand *Client::delCounter(int counterId)
{
return cmd(QString("del_counter|%1").arg(counterId));
}
PendingCommand_ListCounters *Client::listCounters(int playerId)
{
PendingCommand_ListCounters *pc = new PendingCommand_ListCounters(playerId);
cmd(QString("list_counters|%1").arg(playerId), pc);
return pc;
}
PendingCommand *Client::nextTurn()
{
return cmd(QString("next_turn"));
}
PendingCommand *Client::setActivePhase(int phase)
{
return cmd(QString("set_active_phase|%1").arg(phase));
}
PendingCommand_ListZones *Client::listZones(int playerId)
{
PendingCommand_ListZones *pc = new PendingCommand_ListZones(playerId);
cmd(QString("list_zones|%1").arg(playerId), pc);
return pc;
}
PendingCommand_DumpZone *Client::dumpZone(int player, const QString &zone, int numberCards)
{
PendingCommand_DumpZone *pc = new PendingCommand_DumpZone(player, zone, numberCards);
cmd(QString("dump_zone|%1|%2|%3").arg(player).arg(zone).arg(numberCards), pc);
return pc;
}
PendingCommand *Client::stopDumpZone(int player, const QString &zone)
{
return cmd(QString("stop_dump_zone|%1|%2").arg(player).arg(zone));
}
PendingCommand_DumpAll *Client::dumpAll()
{
PendingCommand_DumpAll *pc = new PendingCommand_DumpAll;
cmd("dump_all", pc);
return pc;
}
QColor Client::numberToColor(int colorValue) const QColor Client::numberToColor(int colorValue) const
{ {
return QColor(colorValue / 65536, (colorValue % 65536) / 256, colorValue % 256); return QColor(colorValue / 65536, (colorValue % 65536) / 256, colorValue % 256);

13
cockatrice/src/client.h
View file

@ -14,6 +14,10 @@ class QXmlStreamWriter;
class ProtocolItem; class ProtocolItem;
class ChatEvent; class ChatEvent;
class GameEvent;
class Event_ListGames;
class Event_ServerMessage;
class Event_ListChatChannels;
enum ClientStatus { enum ClientStatus {
StatusDisconnected, StatusDisconnected,
@ -27,7 +31,6 @@ class Client : public QObject {
Q_OBJECT Q_OBJECT
signals: signals:
void statusChanged(ClientStatus _status); void statusChanged(ClientStatus _status);
// void gameListEvent(const ServerGame &game);
// void playerIdReceived(int id, QString name); // void playerIdReceived(int id, QString name);
// void gameEvent(const ServerEventData &msg); // void gameEvent(const ServerEventData &msg);
void maxPingTime(int seconds, int maxSeconds); void maxPingTime(int seconds, int maxSeconds);
@ -37,7 +40,15 @@ signals:
void protocolVersionMismatch(int clientVersion, int serverVersion); void protocolVersionMismatch(int clientVersion, int serverVersion);
void protocolError(); void protocolError();
// Chat events
void chatEventReceived(ChatEvent *event); void chatEventReceived(ChatEvent *event);
// Game events
void gameEventReceived(GameEvent *event);
// Generic events
void listGamesEventReceived(Event_ListGames *event);
void serverMessageEventReceived(Event_ServerMessage *event);
void listChatChannelsEventReceived(Event_ListChatChannels *event);
private slots: private slots:
void slotConnected(); void slotConnected();
void readData(); void readData();

119
cockatrice/src/gameselector.cpp
View file

@ -1,119 +0,0 @@
#include <QtGui>
#include "gameselector.h"
#include "dlg_creategame.h"
#include "gamesmodel.h"
GameSelector::GameSelector(Client *_client, QWidget *parent)
: QWidget(parent), client(_client)
{
gameListView = new QTreeView;
gameListModel = new GamesModel(this);
gameListProxyModel = new GamesProxyModel(this);
gameListProxyModel->setSourceModel(gameListModel);
gameListView->setModel(gameListProxyModel);
showFullGamesCheckBox = new QCheckBox;
createButton = new QPushButton;
joinButton = new QPushButton;
spectateButton = new QPushButton;
QHBoxLayout *buttonLayout = new QHBoxLayout;
buttonLayout->addWidget(showFullGamesCheckBox);
buttonLayout->addStretch();
buttonLayout->addWidget(createButton);
buttonLayout->addWidget(joinButton);
buttonLayout->addWidget(spectateButton);
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(gameListView);
mainLayout->addLayout(buttonLayout);
retranslateUi();
setLayout(mainLayout);
setMinimumWidth(gameListView->columnWidth(0) * gameListModel->columnCount());
setMinimumHeight(400);
connect(showFullGamesCheckBox, SIGNAL(stateChanged(int)), this, SLOT(showFullGamesChanged(int)));
connect(createButton, SIGNAL(clicked()), this, SLOT(actCreate()));
connect(joinButton, SIGNAL(clicked()), this, SLOT(actJoin()));
connect(spectateButton, SIGNAL(clicked()), this, SLOT(actJoin()));
}
void GameSelector::showFullGamesChanged(int state)
{
gameListProxyModel->setFullGamesVisible(state);
}
void GameSelector::actCreate()
{
DlgCreateGame dlg(client, this);
if (dlg.exec())
disableGameList();
}
/*void GameSelector::checkResponse(ServerResponse response)
{
createButton->setEnabled(true);
joinButton->setEnabled(true);
spectateButton->setEnabled(true);
switch (response) {
case RespOk: disableGameList(); break;
case RespPasswordWrong: QMessageBox::critical(this, tr("Error"), tr("Wrong password.")); break;
case RespSpectatorsNotAllowed: QMessageBox::critical(this, tr("Error"), tr("Spectators are not allowed in this game.")); break;
case RespContextError: QMessageBox::critical(this, tr("Error"), tr("The game is already full.")); break;
case RespNameNotFound: QMessageBox::critical(this, tr("Error"), tr("The game does not exist any more.")); break;
default: ;
}
}
*/
void GameSelector::actJoin()
{
bool spectator = sender() == spectateButton;
QModelIndex ind = gameListView->currentIndex();
if (!ind.isValid())
return;
const ServerGameInfo &game = gameListModel->getGame(ind.data(Qt::UserRole).toInt());
QString password;
if (game.getHasPassword()) {
bool ok;
password = QInputDialog::getText(this, tr("Join game"), tr("Password:"), QLineEdit::Password, QString(), &ok);
if (!ok)
return;
}
// PendingCommand *joinCommand = client->joinGame(game.getGameId(), password, spectator);
// connect(joinCommand, SIGNAL(finished(ServerResponse)), this, SLOT(checkResponse(ServerResponse)));
createButton->setEnabled(false);
joinButton->setEnabled(false);
spectateButton->setEnabled(false);
}
void GameSelector::enableGameList()
{
if (isVisible())
return;
connect(client, SIGNAL(gameListEvent(const ServerGameInfo &)), gameListModel, SLOT(updateGameList(const ServerGameInfo &)));
client->listGames();
show();
}
void GameSelector::disableGameList()
{
if (!isVisible())
return;
disconnect(client, 0, gameListModel, 0);
hide();
gameListModel->cleanList();
}
void GameSelector::retranslateUi()
{
showFullGamesCheckBox->setText(tr("&Show full games"));
createButton->setText(tr("C&reate"));
joinButton->setText(tr("&Join"));
spectateButton->setText(tr("J&oin as spectator"));
}

36
cockatrice/src/gameselector.h
View file

@ -1,36 +0,0 @@
#ifndef GAMESELECTOR_H
#define GAMESELECTOR_H
#include <QWidget>
#include "client.h"
class QPushButton;
class QCheckBox;
class QTreeView;
class GamesModel;
class GamesProxyModel;
class GameSelector : public QWidget {
Q_OBJECT
public:
GameSelector(Client *_client, QWidget *parent = 0);
void enableGameList();
void disableGameList();
void retranslateUi();
private slots:
void showFullGamesChanged(int state);
void actCreate();
void actJoin();
// void checkResponse(ServerResponse response);
private:
Client *client;
QTreeView *gameListView;
GamesModel *gameListModel;
GamesProxyModel *gameListProxyModel;
QPushButton *createButton, *joinButton, *spectateButton;
QCheckBox *showFullGamesCheckBox;
};
#endif

17
cockatrice/src/gamesmodel.cpp
View file

@ -1,9 +1,12 @@
#include "gamesmodel.h" #include "gamesmodel.h"
#include "protocol_datastructures.h"
GamesModel::~GamesModel() GamesModel::~GamesModel()
{ {
cleanList(); if (!gameList.isEmpty()) {
beginRemoveRows(QModelIndex(), 0, gameList.size() - 1);
gameList.clear();
endRemoveRows();
}
} }
QVariant GamesModel::data(const QModelIndex &index, int role) const QVariant GamesModel::data(const QModelIndex &index, int role) const
@ -69,16 +72,6 @@ void GamesModel::updateGameList(const ServerGameInfo &game)
endInsertRows(); endInsertRows();
} }
void GamesModel::cleanList()
{
if (gameList.isEmpty())
return;
beginRemoveRows(QModelIndex(), 0, gameList.size() - 1);
gameList.clear();
endRemoveRows();
}
GamesProxyModel::GamesProxyModel(QObject *parent) GamesProxyModel::GamesProxyModel(QObject *parent)
: QSortFilterProxyModel(parent), fullGamesVisible(false) : QSortFilterProxyModel(parent), fullGamesVisible(false)
{ {

2
cockatrice/src/gamesmodel.h
View file

@ -17,8 +17,6 @@ public:
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
const ServerGameInfo &getGame(int row); const ServerGameInfo &getGame(int row);
void cleanList();
public slots:
void updateGameList(const ServerGameInfo &game); void updateGameList(const ServerGameInfo &game);
private: private:
QList<ServerGameInfo> gameList; QList<ServerGameInfo> gameList;

79
cockatrice/src/tab_chatchannel.cpp
View file

@ -1 +1,78 @@
#include <QtGui>
#include "tab_chatchannel.h"
#include "client.h"
#include "protocol_items.h"
TabChatChannel::TabChatChannel(Client *_client, const QString &_channelName)
: QWidget(), client(_client), channelName(_channelName)
{
playerList = new QListWidget;
playerList->setFixedWidth(150);
textEdit = new QTextEdit;
textEdit->setReadOnly(true);
sayEdit = new QLineEdit;
connect(sayEdit, SIGNAL(returnPressed()), this, SLOT(sendMessage()));
QVBoxLayout *vbox = new QVBoxLayout;
vbox->addWidget(textEdit);
vbox->addWidget(sayEdit);
QHBoxLayout *hbox = new QHBoxLayout;
hbox->addLayout(vbox);
hbox->addWidget(playerList);
setLayout(hbox);
}
void TabChatChannel::sendMessage()
{
if (sayEdit->text().isEmpty())
return;
client->sendCommand(new Command_ChatSay(channelName, sayEdit->text()));
sayEdit->clear();
}
void TabChatChannel::processChatEvent(ChatEvent *event)
{
switch (event->getItemId()) {
case ItemId_Event_ChatListPlayers: processListPlayersEvent(qobject_cast<Event_ChatListPlayers *>(event)); break;
case ItemId_Event_ChatJoinChannel: processJoinChannelEvent(qobject_cast<Event_ChatJoinChannel *>(event)); break;
case ItemId_Event_ChatLeaveChannel: processLeaveChannelEvent(qobject_cast<Event_ChatLeaveChannel *>(event)); break;
case ItemId_Event_ChatSay: processSayEvent(qobject_cast<Event_ChatSay *>(event)); break;
default: ;
}
}
void TabChatChannel::processListPlayersEvent(Event_ChatListPlayers *event)
{
const QList<ServerPlayerInfo> &players = event->getPlayerList();
for (int i = 0; i < players.size(); ++i)
playerList->addItem(players[i].getName());
}
void TabChatChannel::processJoinChannelEvent(Event_ChatJoinChannel *event)
{
textEdit->append(tr("%1 has joined the channel.").arg(event->getPlayerName()));
playerList->addItem(event->getPlayerName());
}
void TabChatChannel::processLeaveChannelEvent(Event_ChatLeaveChannel *event)
{
textEdit->append(tr("%1 has left the channel.").arg(event->getPlayerName()));
for (int i = 0; i < playerList->count(); ++i)
if (playerList->item(i)->text() == event->getPlayerName()) {
delete playerList->takeItem(i);
break;
}
}
void TabChatChannel::processSayEvent(Event_ChatSay *event)
{
if (event->getPlayerName().isEmpty())
textEdit->append(QString("<font color=\"blue\">%1</font").arg(event->getMessage()));
else
textEdit->append(QString("<font color=\"red\">%1:</font> %2").arg(event->getPlayerName()).arg(event->getMessage()));
QApplication::alert(this);
}

38
cockatrice/src/tab_chatchannel.h
View file

@ -1 +1,37 @@
#ifndef TAB_CHATCHANNEL_H
#define TAB_CHATCHANNEL_H
#include <QWidget>
class Client;
class QListWidget;
class QTextEdit;
class QLineEdit;
class ChatEvent;
class Event_ChatListPlayers;
class Event_ChatJoinChannel;
class Event_ChatLeaveChannel;
class Event_ChatSay;
class TabChatChannel : public QWidget {
Q_OBJECT
private:
Client *client;
QString channelName;
QListWidget *playerList;
QTextEdit *textEdit;
QLineEdit *sayEdit;
private slots:
void sendMessage();
void processListPlayersEvent(Event_ChatListPlayers *event);
void processJoinChannelEvent(Event_ChatJoinChannel *event);
void processLeaveChannelEvent(Event_ChatLeaveChannel *event);
void processSayEvent(Event_ChatSay *event);
public:
TabChatChannel(Client *_client, const QString &_channelName);
void processChatEvent(ChatEvent *event);
};
#endif

327
cockatrice/src/tab_server.cpp
View file

@ -1,6 +1,329 @@
#include <QtGui>
#include "tab_server.h" #include "tab_server.h"
#include "gamesmodel.h"
#include "dlg_creategame.h"
#include "client.h"
#include "protocol.h"
#include "protocol_items.h"
TabServer::TabServer(QWidget *parent) GameSelector::GameSelector(Client *_client, QWidget *parent)
: QWidget(parent) : QGroupBox(parent), client(_client)
{ {
gameListView = new QTreeView;
gameListModel = new GamesModel(this);
gameListProxyModel = new GamesProxyModel(this);
gameListProxyModel->setSourceModel(gameListModel);
gameListView->setModel(gameListProxyModel);
showFullGamesCheckBox = new QCheckBox;
createButton = new QPushButton;
joinButton = new QPushButton;
spectateButton = new QPushButton;
QHBoxLayout *buttonLayout = new QHBoxLayout;
buttonLayout->addWidget(showFullGamesCheckBox);
buttonLayout->addStretch();
buttonLayout->addWidget(createButton);
buttonLayout->addWidget(joinButton);
buttonLayout->addWidget(spectateButton);
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(gameListView);
mainLayout->addLayout(buttonLayout);
retranslateUi();
setLayout(mainLayout);
setMinimumWidth(gameListView->columnWidth(0) * gameListModel->columnCount());
setMinimumHeight(400);
connect(showFullGamesCheckBox, SIGNAL(stateChanged(int)), this, SLOT(showFullGamesChanged(int)));
connect(createButton, SIGNAL(clicked()), this, SLOT(actCreate()));
connect(joinButton, SIGNAL(clicked()), this, SLOT(actJoin()));
connect(spectateButton, SIGNAL(clicked()), this, SLOT(actJoin()));
connect(client, SIGNAL(listGamesEventReceived(Event_ListGames *)), this, SLOT(processListGamesEvent(Event_ListGames *)));
client->sendCommand(new Command_ListGames);
}
void GameSelector::showFullGamesChanged(int state)
{
gameListProxyModel->setFullGamesVisible(state);
}
void GameSelector::actCreate()
{
DlgCreateGame dlg(client, this);
dlg.exec();
}
void GameSelector::checkResponse(ResponseCode response)
{
createButton->setEnabled(true);
joinButton->setEnabled(true);
spectateButton->setEnabled(true);
switch (response) {
case RespOk: /* HIER CODE FÜR NEUEN GAME_TAB EINFÜGEN */ break;
case RespWrongPassword: QMessageBox::critical(this, tr("Error"), tr("Wrong password.")); break;
case RespSpectatorsNotAllowed: QMessageBox::critical(this, tr("Error"), tr("Spectators are not allowed in this game.")); break;
case RespContextError: QMessageBox::critical(this, tr("Error"), tr("The game is already full.")); break;
case RespNameNotFound: QMessageBox::critical(this, tr("Error"), tr("The game does not exist any more.")); break;
default: ;
}
}
void GameSelector::actJoin()
{
bool spectator = sender() == spectateButton;
QModelIndex ind = gameListView->currentIndex();
if (!ind.isValid())
return;
const ServerGameInfo &game = gameListModel->getGame(ind.data(Qt::UserRole).toInt());
QString password;
if (game.getHasPassword()) {
bool ok;
password = QInputDialog::getText(this, tr("Join game"), tr("Password:"), QLineEdit::Password, QString(), &ok);
if (!ok)
return;
}
Command_JoinGame *commandJoinGame = new Command_JoinGame(game.getGameId(), password, spectator);
connect(commandJoinGame, SIGNAL(finished(ResponseCode)), this, SLOT(checkResponse(ResponseCode)));
client->sendCommand(commandJoinGame);
createButton->setEnabled(false);
joinButton->setEnabled(false);
spectateButton->setEnabled(false);
}
void GameSelector::retranslateUi()
{
setTitle(tr("Games"));
showFullGamesCheckBox->setText(tr("&Show full games"));
createButton->setText(tr("C&reate"));
joinButton->setText(tr("&Join"));
spectateButton->setText(tr("J&oin as spectator"));
}
void GameSelector::processListGamesEvent(Event_ListGames *event)
{
const QList<ServerGameInfo> &gamesToUpdate = event->getGameList();
for (int i = 0; i < gamesToUpdate.size(); ++i)
gameListModel->updateGameList(gamesToUpdate[i]);
}
ChatChannelSelector::ChatChannelSelector(Client *_client, QWidget *parent)
: QGroupBox(parent), client(_client)
{
channelList = new QTreeWidget;
channelList->setRootIsDecorated(false);
joinButton = new QPushButton;
connect(joinButton, SIGNAL(clicked()), this, SLOT(joinClicked()));
QHBoxLayout *buttonLayout = new QHBoxLayout;
buttonLayout->addStretch();
buttonLayout->addWidget(joinButton);
QVBoxLayout *vbox = new QVBoxLayout;
vbox->addWidget(channelList);
vbox->addLayout(buttonLayout);
retranslateUi();
setLayout(vbox);
connect(client, SIGNAL(listChatChannelsEventReceived(Event_ListChatChannels *)), this, SLOT(processListChatChannelsEvent(Event_ListChatChannels *)));
client->sendCommand(new Command_ListChatChannels);
}
void ChatChannelSelector::retranslateUi()
{
setTitle(tr("Chat channels"));
joinButton->setText(tr("Joi&n"));
QTreeWidgetItem *header = channelList->headerItem();
header->setText(0, tr("Channel"));
header->setText(1, tr("Description"));
header->setText(2, tr("Players"));
header->setTextAlignment(2, Qt::AlignRight);
}
void ChatChannelSelector::processListChatChannelsEvent(Event_ListChatChannels *event)
{
const QList<ServerChatChannelInfo> &channelsToUpdate = event->getChannelList();
for (int i = 0; i < channelsToUpdate.size(); ++i) {
const ServerChatChannelInfo &channel = channelsToUpdate[i];
for (int j = 0; j < channelList->topLevelItemCount(); ++j) {
QTreeWidgetItem *twi = channelList->topLevelItem(j);
if (twi->text(0) == channel.getName()) {
twi->setText(1, channel.getDescription());
twi->setText(2, QString::number(channel.getPlayerCount()));
return;
}
}
QTreeWidgetItem *twi = new QTreeWidgetItem(QStringList() << channel.getName() << channel.getDescription() << QString::number(channel.getPlayerCount()));
twi->setTextAlignment(2, Qt::AlignRight);
channelList->addTopLevelItem(twi);
channelList->resizeColumnToContents(0);
channelList->resizeColumnToContents(1);
channelList->resizeColumnToContents(2);
if (channel.getAutoJoin())
joinChannel(channel.getName());
}
}
/*
void ChatWidget::chatEvent(const ChatEventData &data)
{
const QStringList &msg = data.getEventData();
switch (data.getEventType()) {
case eventListChatChannels: {
if (msg.size() != 4)
break;
for (int i = 0; i < channelList->topLevelItemCount(); ++i) {
QTreeWidgetItem *twi = channelList->topLevelItem(i);
if (twi->text(0) == msg[0]) {
twi->setToolTip(0, msg[1]);
twi->setText(1, msg[2]);
return;
}
}
QTreeWidgetItem *twi = new QTreeWidgetItem(QStringList() << msg[0] << msg[2]);
twi->setTextAlignment(1, Qt::AlignRight);
twi->setToolTip(0, msg[1]);
channelList->addTopLevelItem(twi);
channelList->resizeColumnToContents(0);
channelList->resizeColumnToContents(1);
if (msg[3] == "1")
joinChannel(msg[0]);
break;
}
case eventChatJoinChannel: {
if (msg.size() != 2)
break;
ChannelWidget *w = getChannel(msg[0]);
if (!w)
break;
w->joinEvent(msg[1]);
break;
}
case eventChatListPlayers: {
if (msg.size() != 2)
break;
ChannelWidget *w = getChannel(msg[0]);
if (!w)
break;
w->listPlayersEvent(msg[1]);
break;
}
case eventChatLeaveChannel: {
if (msg.size() != 2)
break;
ChannelWidget *w = getChannel(msg[0]);
if (!w)
break;
w->leaveEvent(msg[1]);
break;
}
case eventChatSay: {
if (msg.size() != 3)
break;
ChannelWidget *w = getChannel(msg[0]);
if (!w)
break;
w->sayEvent(msg[1], msg[2]);
break;
}
case eventChatServerMessage: {
if (msg.size() != 2)
break;
ChannelWidget *w;
if (msg[0].isEmpty()) {
w = getChannel("Server");
if (!w) {
w = new ChannelWidget(client, "Server", true, true);
tab->addTab(w, "Server");
}
} else
w = getChannel(msg[0]);
w->serverMessageEvent(msg[1]);
break;
}
default: {
}
}
}
*/
void ChatChannelSelector::joinChannel(const QString &channelName)
{
Command_ChatJoinChannel *command = new Command_ChatJoinChannel(channelName);
connect(command, SIGNAL(finished(ResponseCode)), this, SLOT(joinFinished(ResponseCode)));
client->sendCommand(command);
}
void ChatChannelSelector::joinClicked()
{
QTreeWidgetItem *twi = channelList->currentItem();
if (!twi)
return;
QString channelName = twi->text(0);
joinChannel(channelName);
}
void ChatChannelSelector::joinFinished(ResponseCode resp)
{
if (resp != RespOk)
return;
Command_ChatJoinChannel *command = qobject_cast<Command_ChatJoinChannel *>(sender());
QString channelName = command->getChannel();
emit channelJoined(channelName);
}
ServerMessageLog::ServerMessageLog(Client *_client, QWidget *parent)
: QGroupBox(parent)
{
textEdit = new QTextEdit;
textEdit->setReadOnly(true);
QVBoxLayout *vbox = new QVBoxLayout;
vbox->addWidget(textEdit);
setLayout(vbox);
retranslateUi();
connect(_client, SIGNAL(serverMessageEventReceived(Event_ServerMessage *)), this, SLOT(processServerMessageEvent(Event_ServerMessage *)));
}
void ServerMessageLog::retranslateUi()
{
setTitle(tr("Server messages"));
}
void ServerMessageLog::processServerMessageEvent(Event_ServerMessage *event)
{
textEdit->append(event->getMessage());
}
TabServer::TabServer(Client *_client, QWidget *parent)
: QWidget(parent), client(_client)
{
gameSelector = new GameSelector(client);
chatChannelSelector = new ChatChannelSelector(client);
serverMessageLog = new ServerMessageLog(client);
connect(gameSelector, SIGNAL(gameJoined(int)), this, SIGNAL(gameJoined(int)));
connect(chatChannelSelector, SIGNAL(channelJoined(const QString &)), this, SIGNAL(chatChannelJoined(const QString &)));
QHBoxLayout *hbox = new QHBoxLayout;
hbox->addWidget(chatChannelSelector);
hbox->addWidget(serverMessageLog);
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(gameSelector);
mainLayout->addLayout(hbox);
setLayout(mainLayout);
} }

79
cockatrice/src/tab_server.h
View file

@ -1,13 +1,88 @@
#ifndef TAB_SERVER_H #ifndef TAB_SERVER_H
#define TAB_SERVER_H #define TAB_SERVER_H
#include <QWidget> #include <QGroupBox>
#include "protocol_datastructures.h"
class Client;
class QTreeView;
class QTreeWidget;
class QPushButton;
class QCheckBox;
class QTextEdit;
class GamesModel;
class GamesProxyModel;
class Event_ListGames;
class Event_ListChatChannels;
class Event_ServerMessage;
class GameSelector : public QGroupBox {
Q_OBJECT
public:
GameSelector(Client *_client, QWidget *parent = 0);
void retranslateUi();
private slots:
void processListGamesEvent(Event_ListGames *event);
void showFullGamesChanged(int state);
void actCreate();
void actJoin();
void checkResponse(ResponseCode response);
signals:
void gameJoined(int gameId);
private:
Client *client;
QTreeView *gameListView;
GamesModel *gameListModel;
GamesProxyModel *gameListProxyModel;
QPushButton *createButton, *joinButton, *spectateButton;
QCheckBox *showFullGamesCheckBox;
};
class ChatChannelSelector : public QGroupBox {
Q_OBJECT
private:
QTreeWidget *channelList;
QPushButton *joinButton;
Client *client;
void joinChannel(const QString &channelName);
private slots:
void processListChatChannelsEvent(Event_ListChatChannels *event);
void joinClicked();
void joinFinished(ResponseCode resp);
signals:
void channelJoined(const QString &channelName);
public:
ChatChannelSelector(Client *_client, QWidget *parent = 0);
void retranslateUi();
};
class ServerMessageLog : public QGroupBox {
Q_OBJECT
private:
QTextEdit *textEdit;
private slots:
void processServerMessageEvent(Event_ServerMessage *event);
public:
ServerMessageLog(Client *_client, QWidget *parent = 0);
void retranslateUi();
};
class TabServer : public QWidget { class TabServer : public QWidget {
Q_OBJECT Q_OBJECT
signals:
void chatChannelJoined(const QString &channelName);
void gameJoined(int gameId);
private: private:
Client *client;
GameSelector *gameSelector;
ChatChannelSelector *chatChannelSelector;
ServerMessageLog *serverMessageLog;
public: public:
TabServer(QWidget *parent = 0); TabServer(Client *_client, QWidget *parent = 0);
}; };
#endif #endif

62
cockatrice/src/tab_supervisor.cpp Normal file
View file

@ -0,0 +1,62 @@
#include "tab_supervisor.h"
#include "client.h"
#include "tab_server.h"
#include "tab_chatchannel.h"
#include "tab_game.h"
#include "protocol_items.h"
TabSupervisor:: TabSupervisor(QWidget *parent)
: QTabWidget(parent), client(0), tabServer(0)
{
}
void TabSupervisor::retranslateUi()
{
if (tabServer)
setTabText(0, tr("Server"));
}
void TabSupervisor::start(Client *_client)
{
client = _client;
connect(client, SIGNAL(chatEventReceived(ChatEvent *)), this, SLOT(processChatEvent(ChatEvent *)));
connect(client, SIGNAL(gameEventReceived(GameEvent *)), this, SLOT(processGameEvent(GameEvent *)));
tabServer = new TabServer(client);
connect(tabServer, SIGNAL(gameJoined(int)), this, SLOT(addGameTab(int)));
connect(tabServer, SIGNAL(chatChannelJoined(const QString &)), this, SLOT(addChatChannelTab(const QString &)));
addTab(tabServer, QString());
retranslateUi();
}
void TabSupervisor::stop()
{
}
void TabSupervisor::addGameTab(int gameId)
{
}
void TabSupervisor::addChatChannelTab(const QString &channelName)
{
TabChatChannel *tab = new TabChatChannel(client, channelName);
addTab(tab, channelName);
chatChannelTabs.insert(channelName, tab);
}
void TabSupervisor::processChatEvent(ChatEvent *event)
{
TabChatChannel *tab = chatChannelTabs.value(event->getChannel(), 0);
if (tab)
tab->processChatEvent(event);
}
void TabSupervisor::processGameEvent(GameEvent *event)
{
}

33
cockatrice/src/tab_supervisor.h Normal file
View file

@ -0,0 +1,33 @@
#ifndef TAB_SUPERVISOR_H
#define TAB_SUPERVISOR_H
#include <QTabWidget>
#include <QMap>
class Client;
class TabServer;
class TabChatChannel;
class TabGame;
class ChatEvent;
class GameEvent;
class TabSupervisor : public QTabWidget {
Q_OBJECT
private:
Client *client;
TabServer *tabServer;
QMap<QString, TabChatChannel *> chatChannelTabs;
QMap<int, TabGame *> gameTabs;
public:
TabSupervisor(QWidget *parent = 0);
void retranslateUi();
void start(Client *_client);
void stop();
private slots:
void addGameTab(int gameId);
void addChatChannelTab(const QString &channelName);
void processChatEvent(ChatEvent *event);
void processGameEvent(GameEvent *event);
};
#endif

33
cockatrice/src/window_main.cpp
View file

@ -23,7 +23,6 @@
#include "window_main.h" #include "window_main.h"
#include "dlg_connect.h" #include "dlg_connect.h"
#include "dlg_settings.h" #include "dlg_settings.h"
#include "gameselector.h"
#include "window_deckeditor.h" #include "window_deckeditor.h"
#include "cardinfowidget.h" #include "cardinfowidget.h"
#include "messagelogwidget.h" #include "messagelogwidget.h"
@ -37,6 +36,7 @@
#include "zoneviewwidget.h" #include "zoneviewwidget.h"
#include "zoneviewlayout.h" #include "zoneviewlayout.h"
#include "chatwidget.h" #include "chatwidget.h"
#include "tab_supervisor.h"
PingWidget::PingWidget(QWidget *parent) PingWidget::PingWidget(QWidget *parent)
: QWidget(parent) : QWidget(parent)
@ -86,15 +86,13 @@ void MainWindow::statusChanged(ClientStatus _status)
delete game; delete game;
game = 0; game = 0;
} }
pingWidget->setPercentage(0, -1); // pingWidget->setPercentage(0, -1);
aConnect->setEnabled(true); aConnect->setEnabled(true);
aDisconnect->setEnabled(false); aDisconnect->setEnabled(false);
aRestartGame->setEnabled(false); aRestartGame->setEnabled(false);
aLeaveGame->setEnabled(false); aLeaveGame->setEnabled(false);
phasesToolbar->setActivePhase(-1); // phasesToolbar->setActivePhase(-1);
phasesToolbar->hide(); // phasesToolbar->hide();
gameSelector->disableGameList();
chatWidget->disableChat();
emit logDisconnected(); emit logDisconnected();
break; break;
case StatusLoggingIn: case StatusLoggingIn:
@ -103,6 +101,8 @@ void MainWindow::statusChanged(ClientStatus _status)
aDisconnect->setEnabled(true); aDisconnect->setEnabled(true);
break; break;
case StatusLoggedIn: { case StatusLoggedIn: {
tabSupervisor->start(client);
/* if (game) { /* if (game) {
zoneLayout->clear(); zoneLayout->clear();
delete game; delete game;
@ -210,7 +210,7 @@ void MainWindow::serverTimeout()
void MainWindow::retranslateUi() void MainWindow::retranslateUi()
{ {
setWindowTitle(tr("Cockatrice")); setWindowTitle(tr("Cockatrice"));
aConnect->setText(tr("&Connect...")); aConnect->setText(tr("&Connect..."));
aDisconnect->setText(tr("&Disconnect")); aDisconnect->setText(tr("&Disconnect"));
aRestartGame->setText(tr("&Restart game...")); aRestartGame->setText(tr("&Restart game..."));
@ -225,7 +225,7 @@ void MainWindow::retranslateUi()
aCloseMostRecentZoneView->setShortcut(tr("Esc")); aCloseMostRecentZoneView->setShortcut(tr("Esc"));
cockatriceMenu->setTitle(tr("&Cockatrice")); cockatriceMenu->setTitle(tr("&Cockatrice"));
/*
sayLabel->setText(tr("&Say:")); sayLabel->setText(tr("&Say:"));
cardInfo->retranslateUi(); cardInfo->retranslateUi();
@ -234,7 +234,7 @@ void MainWindow::retranslateUi()
if (game) if (game)
game->retranslateUi(); game->retranslateUi();
zoneLayout->retranslateUi(); zoneLayout->retranslateUi();
} */}
void MainWindow::createActions() void MainWindow::createActions()
{ {
@ -260,7 +260,7 @@ void MainWindow::createActions()
connect(aExit, SIGNAL(triggered()), this, SLOT(actExit())); connect(aExit, SIGNAL(triggered()), this, SLOT(actExit()));
aCloseMostRecentZoneView = new QAction(this); aCloseMostRecentZoneView = new QAction(this);
connect(aCloseMostRecentZoneView, SIGNAL(triggered()), zoneLayout, SLOT(closeMostRecentZoneView())); // connect(aCloseMostRecentZoneView, SIGNAL(triggered()), zoneLayout, SLOT(closeMostRecentZoneView()));
addAction(aCloseMostRecentZoneView); addAction(aCloseMostRecentZoneView);
} }
@ -288,6 +288,11 @@ MainWindow::MainWindow(QTranslator *_translator, QWidget *parent)
QPixmapCache::setCacheLimit(200000); QPixmapCache::setCacheLimit(200000);
db = new CardDatabase(this); db = new CardDatabase(this);
client = new Client(this);
tabSupervisor = new TabSupervisor;
setCentralWidget(tabSupervisor);
/*
zoneLayout = new ZoneViewLayout(db); zoneLayout = new ZoneViewLayout(db);
scene = new GameScene(zoneLayout, this); scene = new GameScene(zoneLayout, this);
@ -302,7 +307,6 @@ MainWindow::MainWindow(QTranslator *_translator, QWidget *parent)
sayLabel->setBuddy(sayEdit); sayLabel->setBuddy(sayEdit);
pingWidget = new PingWidget; pingWidget = new PingWidget;
client = new Client(this);
gameSelector = new GameSelector(client); gameSelector = new GameSelector(client);
gameSelector->hide(); gameSelector->hide();
chatWidget = new ChatWidget(client); chatWidget = new ChatWidget(client);
@ -338,8 +342,6 @@ MainWindow::MainWindow(QTranslator *_translator, QWidget *parent)
connect(sayEdit, SIGNAL(returnPressed()), this, SLOT(actSay())); connect(sayEdit, SIGNAL(returnPressed()), this, SLOT(actSay()));
connect(client, SIGNAL(maxPingTime(int, int)), pingWidget, SLOT(setPercentage(int, int))); connect(client, SIGNAL(maxPingTime(int, int)), pingWidget, SLOT(setPercentage(int, int)));
connect(client, SIGNAL(serverTimeout()), this, SLOT(serverTimeout()));
connect(client, SIGNAL(statusChanged(ClientStatus)), this, SLOT(statusChanged(ClientStatus)));
connect(this, SIGNAL(logConnecting(QString)), messageLog, SLOT(logConnecting(QString))); connect(this, SIGNAL(logConnecting(QString)), messageLog, SLOT(logConnecting(QString)));
connect(this, SIGNAL(logConnected()), messageLog, SLOT(logConnected())); connect(this, SIGNAL(logConnected()), messageLog, SLOT(logConnected()));
@ -350,6 +352,9 @@ MainWindow::MainWindow(QTranslator *_translator, QWidget *parent)
connect(client, SIGNAL(protocolError()), messageLog, SLOT(logProtocolError())); connect(client, SIGNAL(protocolError()), messageLog, SLOT(logProtocolError()));
connect(phasesToolbar, SIGNAL(signalSetPhase(int)), client, SLOT(setActivePhase(int))); connect(phasesToolbar, SIGNAL(signalSetPhase(int)), client, SLOT(setActivePhase(int)));
connect(phasesToolbar, SIGNAL(signalNextTurn()), client, SLOT(nextTurn())); connect(phasesToolbar, SIGNAL(signalNextTurn()), client, SLOT(nextTurn()));
*/
connect(client, SIGNAL(serverTimeout()), this, SLOT(serverTimeout()));
connect(client, SIGNAL(statusChanged(ClientStatus)), this, SLOT(statusChanged(ClientStatus)));
createActions(); createActions();
createMenus(); createMenus();
@ -362,8 +367,6 @@ MainWindow::MainWindow(QTranslator *_translator, QWidget *parent)
void MainWindow::closeEvent(QCloseEvent */*event*/) void MainWindow::closeEvent(QCloseEvent */*event*/)
{ {
delete game; delete game;
chatWidget->disableChat();
gameSelector->disableGameList();
} }
void MainWindow::changeEvent(QEvent *event) void MainWindow::changeEvent(QEvent *event)

3
cockatrice/src/window_main.h
View file

@ -36,12 +36,14 @@ class MessageLogWidget;
class QLabel; class QLabel;
class QLineEdit; class QLineEdit;
class QPushButton; class QPushButton;
class QTabWidget;
class ServerZoneCard; class ServerZoneCard;
class ZoneViewLayout; class ZoneViewLayout;
class ZoneViewWidget; class ZoneViewWidget;
class PhasesToolbar; class PhasesToolbar;
class GameSelector; class GameSelector;
class ChatWidget; class ChatWidget;
class TabSupervisor;
class PingWidget : public QWidget { class PingWidget : public QWidget {
Q_OBJECT Q_OBJECT
@ -84,6 +86,7 @@ private:
QMenu *cockatriceMenu; QMenu *cockatriceMenu;
QAction *aConnect, *aDisconnect, *aRestartGame, *aLeaveGame, *aDeckEditor, *aFullScreen, *aSettings, *aExit; QAction *aConnect, *aDisconnect, *aRestartGame, *aLeaveGame, *aDeckEditor, *aFullScreen, *aSettings, *aExit;
QAction *aCloseMostRecentZoneView; QAction *aCloseMostRecentZoneView;
TabSupervisor *tabSupervisor;
QVBoxLayout *viewLayout; QVBoxLayout *viewLayout;
PingWidget *pingWidget; PingWidget *pingWidget;

10
common/protocol.cpp
View file

@ -25,6 +25,7 @@ bool ProtocolItem::read(QXmlStreamReader *xml)
QString tagName = xml->name().toString(); QString tagName = xml->name().toString();
if (parameters.contains(tagName)) if (parameters.contains(tagName))
parameters[tagName] = currentElementText; parameters[tagName] = currentElementText;
currentElementText.clear();
} }
} else if (xml->isCharacters() && !xml->isWhitespace()) } else if (xml->isCharacters() && !xml->isWhitespace())
currentElementText = xml->text().toString(); currentElementText = xml->text().toString();
@ -62,8 +63,13 @@ void ProtocolItem::initializeHash()
return; return;
initializeHashAuto(); initializeHashAuto();
itemNameHash.insert("resp", ProtocolResponse::newItem); itemNameHash.insert("resp", ProtocolResponse::newItem);
ProtocolResponse::initializeHash(); ProtocolResponse::initializeHash();
itemNameHash.insert("generic_eventlist_games", Event_ListGames::newItem);
itemNameHash.insert("generic_eventlist_chat_channels", Event_ListChatChannels::newItem);
itemNameHash.insert("chat_eventchat_list_players", Event_ChatListPlayers::newItem);
} }
int Command::lastCmdId = 0; int Command::lastCmdId = 0;
@ -153,7 +159,7 @@ ChatEvent::ChatEvent(const QString &_eventName, const QString &_channel)
setParameter("channel", channel); setParameter("channel", channel);
} }
bool Event_ChatListChannels::readElement(QXmlStreamReader *xml) bool Event_ListChatChannels::readElement(QXmlStreamReader *xml)
{ {
if (xml->isStartElement() && (xml->name() == "channel")) { if (xml->isStartElement() && (xml->name() == "channel")) {
channelList.append(ServerChatChannelInfo( channelList.append(ServerChatChannelInfo(
@ -167,7 +173,7 @@ bool Event_ChatListChannels::readElement(QXmlStreamReader *xml)
return false; return false;
} }
void Event_ChatListChannels::writeElement(QXmlStreamWriter *xml) void Event_ListChatChannels::writeElement(QXmlStreamWriter *xml)
{ {
for (int i = 0; i < channelList.size(); ++i) { for (int i = 0; i < channelList.size(); ++i) {
xml->writeStartElement("channel"); xml->writeStartElement("channel");

14
common/protocol.h
View file

@ -16,7 +16,7 @@ class QXmlStreamAttributes;
class ProtocolResponse; class ProtocolResponse;
enum ItemId { enum ItemId {
ItemId_Event_ChatListChannels = ItemId_Other + 1, ItemId_Event_ListChatChannels = ItemId_Other + 1,
ItemId_Event_ChatListPlayers = ItemId_Other + 2, ItemId_Event_ChatListPlayers = ItemId_Other + 2,
ItemId_Event_ListGames = ItemId_Other + 3 ItemId_Event_ListGames = ItemId_Other + 3
}; };
@ -162,15 +162,17 @@ protected:
void extractParameters(); void extractParameters();
public: public:
ChatEvent(const QString &_eventName, const QString &_channel); ChatEvent(const QString &_eventName, const QString &_channel);
QString getChannel() const { return channel; }
}; };
class Event_ChatListChannels : public ChatEvent { class Event_ListChatChannels : public GenericEvent {
Q_OBJECT Q_OBJECT
private: private:
QList<ServerChatChannelInfo> channelList; QList<ServerChatChannelInfo> channelList;
public: public:
Event_ChatListChannels() : ChatEvent("chat_list_channels", QString()) { } Event_ListChatChannels() : GenericEvent("list_chat_channels") { }
int getItemId() const { return ItemId_Event_ChatListChannels; } int getItemId() const { return ItemId_Event_ListChatChannels; }
static ProtocolItem *newItem() { return new Event_ListChatChannels; }
void addChannel(const QString &_name, const QString &_description, int _playerCount, bool _autoJoin) void addChannel(const QString &_name, const QString &_description, int _playerCount, bool _autoJoin)
{ {
channelList.append(ServerChatChannelInfo(_name, _description, _playerCount, _autoJoin)); channelList.append(ServerChatChannelInfo(_name, _description, _playerCount, _autoJoin));
@ -186,8 +188,9 @@ class Event_ChatListPlayers : public ChatEvent {
private: private:
QList<ServerPlayerInfo> playerList; QList<ServerPlayerInfo> playerList;
public: public:
Event_ChatListPlayers(const QString &_channel) : ChatEvent("chat_list_players", _channel) { } Event_ChatListPlayers(const QString &_channel = QString()) : ChatEvent("chat_list_players", _channel) { }
int getItemId() const { return ItemId_Event_ChatListPlayers; } int getItemId() const { return ItemId_Event_ChatListPlayers; }
static ProtocolItem *newItem() { return new Event_ChatListPlayers; }
void addPlayer(const QString &_name) void addPlayer(const QString &_name)
{ {
playerList.append(ServerPlayerInfo(_name)); playerList.append(ServerPlayerInfo(_name));
@ -205,6 +208,7 @@ private:
public: public:
Event_ListGames() : GenericEvent("list_games") { } Event_ListGames() : GenericEvent("list_games") { }
int getItemId() const { return ItemId_Event_ListGames; } int getItemId() const { return ItemId_Event_ListGames; }
static ProtocolItem *newItem() { return new Event_ListGames; }
void addGame(int _gameId, const QString &_description, bool _hasPassword, int _playerCount, int _maxPlayers, const QString &_creatorName, bool _spectatorsAllowed, int _spectatorCount) void addGame(int _gameId, const QString &_description, bool _hasPassword, int _playerCount, int _maxPlayers, const QString &_creatorName, bool _spectatorsAllowed, int _spectatorCount)
{ {
gameList.append(ServerGameInfo(_gameId, _description, _hasPassword, _playerCount, _maxPlayers, _creatorName, _spectatorsAllowed, _spectatorCount)); gameList.append(ServerGameInfo(_gameId, _description, _hasPassword, _playerCount, _maxPlayers, _creatorName, _spectatorsAllowed, _spectatorCount));

4
common/protocol_item_ids.h
View file

@ -1,7 +1,7 @@
enum AutoItemId { enum AutoItemId {
ItemId_Command_Ping = 1001, ItemId_Command_Ping = 1001,
ItemId_Command_Login = 1002, ItemId_Command_Login = 1002,
ItemId_Command_ChatListChannels = 1003, ItemId_Command_ListChatChannels = 1003,
ItemId_Command_ChatJoinChannel = 1004, ItemId_Command_ChatJoinChannel = 1004,
ItemId_Command_ChatLeaveChannel = 1005, ItemId_Command_ChatLeaveChannel = 1005,
ItemId_Command_ChatSay = 1006, ItemId_Command_ChatSay = 1006,
@ -50,7 +50,7 @@ ItemId_Event_SetActivePlayer = 1048,
ItemId_Event_SetActivePhase = 1049, ItemId_Event_SetActivePhase = 1049,
ItemId_Event_DumpZone = 1050, ItemId_Event_DumpZone = 1050,
ItemId_Event_StopDumpZone = 1051, ItemId_Event_StopDumpZone = 1051,
ItemId_Event_ChatServerMessage = 1052, ItemId_Event_ServerMessage = 1052,
ItemId_Event_ChatJoinChannel = 1053, ItemId_Event_ChatJoinChannel = 1053,
ItemId_Event_ChatLeaveChannel = 1054, ItemId_Event_ChatLeaveChannel = 1054,
ItemId_Event_ChatSay = 1055, ItemId_Event_ChatSay = 1055,

16
common/protocol_items.cpp
View file

@ -17,8 +17,8 @@ void Command_Login::extractParameters()
username = parameters["username"]; username = parameters["username"];
password = parameters["password"]; password = parameters["password"];
} }
Command_ChatListChannels::Command_ChatListChannels() Command_ListChatChannels::Command_ListChatChannels()
: Command("chat_list_channels") : Command("list_chat_channels")
{ {
} }
Command_ChatJoinChannel::Command_ChatJoinChannel(const QString &_channel) Command_ChatJoinChannel::Command_ChatJoinChannel(const QString &_channel)
@ -551,14 +551,14 @@ void Event_StopDumpZone::extractParameters()
zoneOwnerId = parameters["zone_owner_id"].toInt(); zoneOwnerId = parameters["zone_owner_id"].toInt();
zone = parameters["zone"]; zone = parameters["zone"];
} }
Event_ChatServerMessage::Event_ChatServerMessage(const QString &_channel, const QString &_message) Event_ServerMessage::Event_ServerMessage(const QString &_message)
: ChatEvent("chat_server_message", _channel), message(_message) : GenericEvent("server_message"), message(_message)
{ {
setParameter("message", message); setParameter("message", message);
} }
void Event_ChatServerMessage::extractParameters() void Event_ServerMessage::extractParameters()
{ {
ChatEvent::extractParameters(); GenericEvent::extractParameters();
message = parameters["message"]; message = parameters["message"];
} }
Event_ChatJoinChannel::Event_ChatJoinChannel(const QString &_channel, const QString &_playerName) Event_ChatJoinChannel::Event_ChatJoinChannel(const QString &_channel, const QString &_playerName)
@ -597,7 +597,7 @@ void ProtocolItem::initializeHashAuto()
{ {
itemNameHash.insert("cmdping", Command_Ping::newItem); itemNameHash.insert("cmdping", Command_Ping::newItem);
itemNameHash.insert("cmdlogin", Command_Login::newItem); itemNameHash.insert("cmdlogin", Command_Login::newItem);
itemNameHash.insert("cmdchat_list_channels", Command_ChatListChannels::newItem); itemNameHash.insert("cmdlist_chat_channels", Command_ListChatChannels::newItem);
itemNameHash.insert("cmdchat_join_channel", Command_ChatJoinChannel::newItem); itemNameHash.insert("cmdchat_join_channel", Command_ChatJoinChannel::newItem);
itemNameHash.insert("cmdchat_leave_channel", Command_ChatLeaveChannel::newItem); itemNameHash.insert("cmdchat_leave_channel", Command_ChatLeaveChannel::newItem);
itemNameHash.insert("cmdchat_say", Command_ChatSay::newItem); itemNameHash.insert("cmdchat_say", Command_ChatSay::newItem);
@ -646,7 +646,7 @@ void ProtocolItem::initializeHashAuto()
itemNameHash.insert("game_eventset_active_phase", Event_SetActivePhase::newItem); itemNameHash.insert("game_eventset_active_phase", Event_SetActivePhase::newItem);
itemNameHash.insert("game_eventdump_zone", Event_DumpZone::newItem); itemNameHash.insert("game_eventdump_zone", Event_DumpZone::newItem);
itemNameHash.insert("game_eventstop_dump_zone", Event_StopDumpZone::newItem); itemNameHash.insert("game_eventstop_dump_zone", Event_StopDumpZone::newItem);
itemNameHash.insert("chat_eventchat_server_message", Event_ChatServerMessage::newItem); itemNameHash.insert("generic_eventserver_message", Event_ServerMessage::newItem);
itemNameHash.insert("chat_eventchat_join_channel", Event_ChatJoinChannel::newItem); itemNameHash.insert("chat_eventchat_join_channel", Event_ChatJoinChannel::newItem);
itemNameHash.insert("chat_eventchat_leave_channel", Event_ChatLeaveChannel::newItem); itemNameHash.insert("chat_eventchat_leave_channel", Event_ChatLeaveChannel::newItem);
itemNameHash.insert("chat_eventchat_say", Event_ChatSay::newItem); itemNameHash.insert("chat_eventchat_say", Event_ChatSay::newItem);

4
common/protocol_items.dat
View file

@ -1,6 +1,6 @@
0:ping 0:ping
0:login:s,username:s,password 0:login:s,username:s,password
0:chat_list_channels 0:list_chat_channels
0:chat_join_channel:s,channel 0:chat_join_channel:s,channel
1:chat_leave_channel 1:chat_leave_channel
1:chat_say:s,message 1:chat_say:s,message
@ -49,7 +49,7 @@
3:set_active_phase:i,phase 3:set_active_phase:i,phase
3:dump_zone:i,zone_owner_id:s,zone:i,number_cards 3:dump_zone:i,zone_owner_id:s,zone:i,number_cards
3:stop_dump_zone:i,zone_owner_id:s,zone 3:stop_dump_zone:i,zone_owner_id:s,zone
5:chat_server_message:s,message 4:server_message:s,message
5:chat_join_channel:s,player_name 5:chat_join_channel:s,player_name
5:chat_leave_channel:s,player_name 5:chat_leave_channel:s,player_name
5:chat_say:s,player_name:s,message 5:chat_say:s,player_name:s,message

16
common/protocol_items.h
View file

@ -25,13 +25,13 @@ public:
protected: protected:
void extractParameters(); void extractParameters();
}; };
class Command_ChatListChannels : public Command { class Command_ListChatChannels : public Command {
Q_OBJECT Q_OBJECT
private: private:
public: public:
Command_ChatListChannels(); Command_ListChatChannels();
static ProtocolItem *newItem() { return new Command_ChatListChannels; } static ProtocolItem *newItem() { return new Command_ListChatChannels; }
int getItemId() const { return ItemId_Command_ChatListChannels; } int getItemId() const { return ItemId_Command_ListChatChannels; }
}; };
class Command_ChatJoinChannel : public Command { class Command_ChatJoinChannel : public Command {
Q_OBJECT Q_OBJECT
@ -685,15 +685,15 @@ public:
protected: protected:
void extractParameters(); void extractParameters();
}; };
class Event_ChatServerMessage : public ChatEvent { class Event_ServerMessage : public GenericEvent {
Q_OBJECT Q_OBJECT
private: private:
QString message; QString message;
public: public:
Event_ChatServerMessage(const QString &_channel = QString(), const QString &_message = QString()); Event_ServerMessage(const QString &_message = QString());
QString getMessage() const { return message; } QString getMessage() const { return message; }
static ProtocolItem *newItem() { return new Event_ChatServerMessage; } static ProtocolItem *newItem() { return new Event_ServerMessage; }
int getItemId() const { return ItemId_Event_ChatServerMessage; } int getItemId() const { return ItemId_Event_ServerMessage; }
protected: protected:
void extractParameters(); void extractParameters();
}; };

2
common/server.cpp
View file

@ -87,7 +87,7 @@ void Server::broadcastGameListUpdate(Server_Game *game)
void Server::broadcastChannelUpdate() void Server::broadcastChannelUpdate()
{ {
Server_ChatChannel *channel = static_cast<Server_ChatChannel *>(sender()); Server_ChatChannel *channel = static_cast<Server_ChatChannel *>(sender());
Event_ChatListChannels *event = new Event_ChatListChannels; Event_ListChatChannels *event = new Event_ListChatChannels;
event->addChannel(channel->getName(), channel->getDescription(), channel->size(), channel->getAutoJoin()); event->addChannel(channel->getName(), channel->getDescription(), channel->size(), channel->getAutoJoin());
for (int i = 0; i < clients.size(); ++i) for (int i = 0; i < clients.size(); ++i)

2
common/server_chatchannel.cpp
View file

@ -16,7 +16,7 @@ void Server_ChatChannel::addClient(Server_ProtocolHandler *client)
eventCLP->addPlayer(at(i)->getPlayerName()); eventCLP->addPlayer(at(i)->getPlayerName());
client->enqueueProtocolItem(eventCLP); client->enqueueProtocolItem(eventCLP);
client->enqueueProtocolItem(new Event_ChatServerMessage(name, joinMessage)); client->enqueueProtocolItem(new Event_ChatSay(name, QString(), joinMessage));
emit channelInfoChanged(); emit channelInfoChanged();
} }

17
common/server_protocolhandler.cpp
View file

@ -18,6 +18,15 @@ Server_ProtocolHandler::Server_ProtocolHandler(Server *_server, QObject *parent)
Server_ProtocolHandler::~Server_ProtocolHandler() Server_ProtocolHandler::~Server_ProtocolHandler()
{ {
// The socket has to be removed from the server's list before it is removed from the game's list
// so it will not receive the game update event.
server->removeClient(this);
// if (game)
// game->removePlayer(this);
QMapIterator<QString, Server_ChatChannel *> chatChannelIterator(chatChannels);
while (chatChannelIterator.hasNext())
chatChannelIterator.next().value()->removeClient(this);
} }
void Server_ProtocolHandler::processCommand(Command *command) void Server_ProtocolHandler::processCommand(Command *command)
@ -75,7 +84,7 @@ void Server_ProtocolHandler::processCommand(Command *command)
switch (command->getItemId()) { switch (command->getItemId()) {
case ItemId_Command_Ping: response = cmdPing(qobject_cast<Command_Ping *>(command)); break; case ItemId_Command_Ping: response = cmdPing(qobject_cast<Command_Ping *>(command)); break;
case ItemId_Command_Login: response = cmdLogin(qobject_cast<Command_Login *>(command)); break; case ItemId_Command_Login: response = cmdLogin(qobject_cast<Command_Login *>(command)); break;
case ItemId_Command_ChatListChannels: response = cmdChatListChannels(qobject_cast<Command_ChatListChannels *>(command)); break; case ItemId_Command_ListChatChannels: response = cmdListChatChannels(qobject_cast<Command_ListChatChannels *>(command)); break;
case ItemId_Command_ChatJoinChannel: response = cmdChatJoinChannel(qobject_cast<Command_ChatJoinChannel *>(command)); break; case ItemId_Command_ChatJoinChannel: response = cmdChatJoinChannel(qobject_cast<Command_ChatJoinChannel *>(command)); break;
case ItemId_Command_ListGames: response = cmdListGames(qobject_cast<Command_ListGames *>(command)); break; case ItemId_Command_ListGames: response = cmdListGames(qobject_cast<Command_ListGames *>(command)); break;
case ItemId_Command_CreateGame: response = cmdCreateGame(qobject_cast<Command_CreateGame *>(command)); break; case ItemId_Command_CreateGame: response = cmdCreateGame(qobject_cast<Command_CreateGame *>(command)); break;
@ -115,13 +124,13 @@ ResponseCode Server_ProtocolHandler::cmdLogin(Command_Login *cmd)
return RespWrongPassword; return RespWrongPassword;
playerName = cmd->getUsername(); playerName = cmd->getUsername();
enqueueProtocolItem(new Event_ChatServerMessage(QString(), server->getLoginMessage())); enqueueProtocolItem(new Event_ServerMessage(server->getLoginMessage()));
return RespOk; return RespOk;
} }
ResponseCode Server_ProtocolHandler::cmdChatListChannels(Command_ChatListChannels * /*cmd*/) ResponseCode Server_ProtocolHandler::cmdListChatChannels(Command_ListChatChannels * /*cmd*/)
{ {
Event_ChatListChannels *event = new Event_ChatListChannels; Event_ListChatChannels *event = new Event_ListChatChannels;
QMapIterator<QString, Server_ChatChannel *> channelIterator(server->getChatChannels()); QMapIterator<QString, Server_ChatChannel *> channelIterator(server->getChatChannels());
while (channelIterator.hasNext()) { while (channelIterator.hasNext()) {
Server_ChatChannel *c = channelIterator.next().value(); Server_ChatChannel *c = channelIterator.next().value();

2
common/server_protocolhandler.h
View file

@ -28,7 +28,7 @@ private:
ResponseCode cmdPing(Command_Ping *cmd); ResponseCode cmdPing(Command_Ping *cmd);
ResponseCode cmdLogin(Command_Login *cmd); ResponseCode cmdLogin(Command_Login *cmd);
ResponseCode cmdChatListChannels(Command_ChatListChannels *cmd); ResponseCode cmdListChatChannels(Command_ListChatChannels *cmd);
ResponseCode cmdChatJoinChannel(Command_ChatJoinChannel *cmd); ResponseCode cmdChatJoinChannel(Command_ChatJoinChannel *cmd);
ResponseCode cmdChatLeaveChannel(Command_ChatLeaveChannel *cmd, Server_ChatChannel *channel); ResponseCode cmdChatLeaveChannel(Command_ChatLeaveChannel *cmd, Server_ChatChannel *channel);
ResponseCode cmdChatSay(Command_ChatSay *cmd, Server_ChatChannel *channel); ResponseCode cmdChatSay(Command_ChatSay *cmd, Server_ChatChannel *channel);

6
servatrice/servatrice.ini.example
View file

@ -2,19 +2,19 @@
method=none method=none
[database] [database]
type=mysql type=none
hostname=localhost hostname=localhost
database=servatrice database=servatrice
user=servatrice user=servatrice
password=foobar password=foobar
[messages] [messages]
login="Example line 1", "Example line 2" login="Example line"
[chatchannels] [chatchannels]
size=1 size=1
1\name="General Chat" 1\name="General Chat"
1\description="Discuss anything here." 1\description="Discuss anything here."
1\autojoin=true 1\autojoin=true
1\joinmessage="This is the general chat channel.", "This message is only here to show that channels can have a join message." 1\joinmessage="This is the general chat channel. This message is only here to show that channels can have a join message."

2
servatrice/src/servatrice.cpp
View file

@ -121,4 +121,4 @@ AuthenticationResult Servatrice::checkUserPassword(const QString &user, const QS
return UnknownUser; return UnknownUser;
} }
const QString Servatrice::versionString = "Servatrice 0.20091103"; const QString Servatrice::versionString = "Servatrice 0.20091113";

13
servatrice/src/serversocketinterface.cpp
View file

@ -42,7 +42,7 @@ ServerSocketInterface::ServerSocketInterface(Server *_server, QTcpSocket *_socke
xmlWriter->writeStartElement("cockatrice_server_stream"); xmlWriter->writeStartElement("cockatrice_server_stream");
xmlWriter->writeAttribute("version", QString::number(ProtocolItem::protocolVersion)); xmlWriter->writeAttribute("version", QString::number(ProtocolItem::protocolVersion));
sendProtocolItem(new Event_ChatServerMessage(QString(), Servatrice::versionString)); sendProtocolItem(new Event_ServerMessage(Servatrice::versionString));
} }
ServerSocketInterface::~ServerSocketInterface() ServerSocketInterface::~ServerSocketInterface()
@ -52,19 +52,10 @@ ServerSocketInterface::~ServerSocketInterface()
delete xmlWriter; delete xmlWriter;
delete xmlReader; delete xmlReader;
delete socket; delete socket;
/* clearZones(); }
// The socket has to be removed from the server's list before it is removed from the game's list
// so it will not receive the game update event.
server->removePlayer(this);
if (game)
game->removePlayer(this);
for (int i = 0; i < chatChannels.size(); ++i)
chatChannels[i]->removePlayer(this);
*/}
void ServerSocketInterface::readClient() void ServerSocketInterface::readClient()
{ {
qDebug() << "readClient";
xmlReader->addData(socket->readAll()); xmlReader->addData(socket->readAll());
if (currentItem) { if (currentItem) {