initial commit of local server code

cockatrice/src/tab_server.h

@@ -5,7 +5,7 @@
 #include "tab.h"
 #include "protocol_datastructures.h"
 
-class Client;
+class AbstractClient;
 class QTreeView;
 class QTreeWidget;
 class QPushButton;
@@ -22,7 +22,7 @@ class Event_ServerMessage;
 class GameSelector : public QGroupBox {
 	Q_OBJECT
 public:
-	GameSelector(Client *_client, QWidget *parent = 0);
+	GameSelector(AbstractClient *_client, QWidget *parent = 0);
 	void retranslateUi();
 private slots:
 	void processListGamesEvent(Event_ListGames *event);
@@ -33,7 +33,7 @@ private slots:
 signals:
 	void gameJoined(int gameId);
 private:
-	Client *client;
+	AbstractClient *client;
 
 	QTreeView *gameListView;
 	GamesModel *gameListModel;
@@ -47,7 +47,7 @@ class ChatChannelSelector : public QGroupBox {
 private:
 	QTreeWidget *channelList;
 	QPushButton *joinButton;
-	Client *client;
+	AbstractClient *client;
 	
 	void joinChannel(const QString &channelName);
 private slots:
@@ -57,7 +57,7 @@ private slots:
 signals:
 	void channelJoined(const QString &channelName);
 public:
-	ChatChannelSelector(Client *_client, QWidget *parent = 0);
+	ChatChannelSelector(AbstractClient *_client, QWidget *parent = 0);
 	void retranslateUi();
 };
 
@@ -68,7 +68,7 @@ private:
 private slots:
 	void processServerMessageEvent(Event_ServerMessage *event);
 public:
-	ServerMessageLog(Client *_client, QWidget *parent = 0);
+	ServerMessageLog(AbstractClient *_client, QWidget *parent = 0);
 	void retranslateUi();
 };
 
@@ -78,12 +78,12 @@ signals:
 	void chatChannelJoined(const QString &channelName);
 	void gameJoined(int gameId);
 private:
-	Client *client;
+	AbstractClient *client;
 	GameSelector *gameSelector;
 	ChatChannelSelector *chatChannelSelector;
 	ServerMessageLog *serverMessageLog;
 public:
-	TabServer(Client *_client, QWidget *parent = 0);
+	TabServer(AbstractClient *_client, QWidget *parent = 0);
 	void retranslateUi();
 	QString getTabText() const { return tr("Server"); }
 };

cockatrice/src/tab_supervisor.cpp

 #include <QApplication>
 #include "tab_supervisor.h"
-#include "client.h"
+#include "abstractclient.h"
 #include "tab_server.h"
 #include "tab_chatchannel.h"
 #include "tab_game.h"
 #include "tab_deck_storage.h"
 #include "protocol_items.h"
 #include "pingpixmapgenerator.h"
+#include <QDebug>
 
 TabSupervisor::	TabSupervisor(QWidget *parent)
 	: QTabWidget(parent), client(0), tabServer(0), tabDeckStorage(0)
@@ -48,7 +49,7 @@ void TabSupervisor::myAddTab(Tab *tab)
 	addTab(tab, tab->getTabText());
 }
 
-void TabSupervisor::start(Client *_client)
+void TabSupervisor::start(AbstractClient *_client)
 {
 	client = _client;
 	connect(client, SIGNAL(chatEventReceived(ChatEvent *)), this, SLOT(processChatEvent(ChatEvent *)));

cockatrice/src/tab_supervisor.h

@@ -5,7 +5,7 @@
 #include <QMap>
 
 class QMenu;
-class Client;
+class AbstractClient;
 class Tab;
 class TabServer;
 class TabChatChannel;
@@ -19,7 +19,7 @@ class TabSupervisor : public QTabWidget {
 	Q_OBJECT
 private:
 	QIcon *tabChangedIcon;
-	Client *client;
+	AbstractClient *client;
 	TabServer *tabServer;
 	TabDeckStorage *tabDeckStorage;
 	QMap<QString, TabChatChannel *> chatChannelTabs;
@@ -29,7 +29,7 @@ public:
 	TabSupervisor(QWidget *parent = 0);
 	~TabSupervisor();
 	void retranslateUi();
-	void start(Client *_client);
+	void start(AbstractClient *_client);
 	void stop();
 	int getGameCount() const { return gameTabs.size(); }
 signals:

cockatrice/src/tablezone.cpp

 #include <QtGui>
 #include "tablezone.h"
 #include "player.h"
-#include "client.h"
 #include "protocol_items.h"
 #include "settingscache.h"
 #include "arrowitem.h"

cockatrice/src/window_main.cpp

@@ -24,6 +24,10 @@
 #include "dlg_settings.h"
 #include "window_deckeditor.h"
 #include "tab_supervisor.h"
+#include "remoteclient.h"
+#include "localserver.h"
+#include "localserverinterface.h"
+#include "localclient.h"
 
 const QString MainWindow::appName = "Cockatrice";
 
@@ -74,6 +78,15 @@ void MainWindow::actDisconnect()
 	client->disconnectFromServer();
 }
 
+void MainWindow::actSinglePlayer()
+{
+	LocalServer *ls = new LocalServer(this);
+	LocalServerInterface *mainLsi = ls->newConnection();
+	LocalClient *mainClient = new LocalClient(mainLsi, this);
+	tabSupervisor->start(mainClient);
+	
+}
+
 void MainWindow::actDeckEditor()
 {
 	WndDeckEditor *deckEditor = new WndDeckEditor(this);
@@ -138,6 +151,7 @@ void MainWindow::retranslateUi()
 	
 	aConnect->setText(tr("&Connect..."));
 	aDisconnect->setText(tr("&Disconnect"));
+	aSinglePlayer->setText(tr("Start &local game..."));
 	aDeckEditor->setText(tr("&Deck editor"));
 	aFullScreen->setText(tr("&Full screen"));
 	aFullScreen->setShortcut(tr("Ctrl+F"));
@@ -156,6 +170,8 @@ void MainWindow::createActions()
 	aDisconnect = new QAction(this);
 	aDisconnect->setEnabled(false);
 	connect(aDisconnect, SIGNAL(triggered()), this, SLOT(actDisconnect()));
+	aSinglePlayer = new QAction(this);
+	connect(aSinglePlayer, SIGNAL(triggered()), this, SLOT(actSinglePlayer()));
 	aDeckEditor = new QAction(this);
 	connect(aDeckEditor, SIGNAL(triggered()), this, SLOT(actDeckEditor()));
 	aFullScreen = new QAction(this);
@@ -172,6 +188,7 @@ void MainWindow::createMenus()
 	cockatriceMenu = menuBar()->addMenu(QString());
 	cockatriceMenu->addAction(aConnect);
 	cockatriceMenu->addAction(aDisconnect);
+	cockatriceMenu->addAction(aSinglePlayer);
 	cockatriceMenu->addSeparator();
 	cockatriceMenu->addAction(aDeckEditor);
 	cockatriceMenu->addSeparator();
@@ -187,7 +204,7 @@ MainWindow::MainWindow(QWidget *parent)
 {
 	QPixmapCache::setCacheLimit(200000);
 
-	client = new Client(this);
+	client = new RemoteClient(this);
 	connect(client, SIGNAL(serverError(ResponseCode)), this, SLOT(serverError(ResponseCode)));
 	connect(client, SIGNAL(socketError(const QString &)), this, SLOT(socketError(const QString &)));
 	connect(client, SIGNAL(serverTimeout()), this, SLOT(serverTimeout()));

cockatrice/src/window_main.h

@@ -21,10 +21,11 @@
 #define WINDOW_H
 
 #include <QMainWindow>
-#include "client.h"
+#include "abstractclient.h"
 #include "protocol_datastructures.h"
 
 class TabSupervisor;
+class RemoteClient;
 
 class MainWindow : public QMainWindow {
 	Q_OBJECT
@@ -38,6 +39,7 @@ private slots:
 
 	void actConnect();
 	void actDisconnect();
+	void actSinglePlayer();
 	void actDeckEditor();
 	void actFullScreen(bool checked);
 	void actSettings();
@@ -49,10 +51,10 @@ private:
 	void createActions();
 	void createMenus();
 	QMenu *cockatriceMenu, *tabMenu;
-	QAction *aConnect, *aDisconnect, *aDeckEditor, *aFullScreen, *aSettings, *aExit;
+	QAction *aConnect, *aDisconnect, *aSinglePlayer, *aDeckEditor, *aFullScreen, *aSettings, *aExit;
 	TabSupervisor *tabSupervisor;
 
-	Client *client;
+	RemoteClient *client;
 public:
 	MainWindow(QWidget *parent = 0);
 protected:

cockatrice/src/zoneviewwidget.cpp

@@ -3,7 +3,6 @@
 #include "carditem.h"
 #include "zoneviewzone.h"
 #include "player.h"
-#include "client.h"
 #include "gamescene.h"
 #include "protocol_items.h"
 #include "settingscache.h"

cockatrice/src/zoneviewzone.cpp

 #include <QtGui>
 #include "zoneviewzone.h"
 #include "player.h"
-#include "client.h"
 #include "protocol_items.h"
 
 ZoneViewZone::ZoneViewZone(Player *_p, CardZone *_origZone, int _numberCards, QGraphicsItem *parent)

common/server.cpp

@@ -92,9 +92,11 @@ void Server::broadcastGameListUpdate(Server_Game *game)
 		eventGameList.append(new ServerInfo_Game(game->getGameId(), QString(), false, 0, game->getMaxPlayers(), QString(), false, 0));
 	Event_ListGames *event = new Event_ListGames(eventGameList);
 	
+	bool mayDelete = true;
 	for (int i = 0; i < clients.size(); i++)
 		if (clients[i]->getAcceptsGameListChanges())
-			clients[i]->sendProtocolItem(event, false);
+			mayDelete = clients[i]->sendProtocolItem(event, false);
+	if (mayDelete)
 		delete event;
 }
 
@@ -105,9 +107,11 @@ void Server::broadcastChannelUpdate()
 	eventChannelList.append(new ServerInfo_ChatChannel(channel->getName(), channel->getDescription(), channel->size(), channel->getAutoJoin()));
 	Event_ListChatChannels *event = new Event_ListChatChannels(eventChannelList);
 
+	bool mayDelete = true;
 	for (int i = 0; i < clients.size(); ++i)
 	  	if (clients[i]->getAcceptsChatChannelListChanges())
-		  	clients[i]->sendProtocolItem(event, false);
+			mayDelete = clients[i]->sendProtocolItem(event, false);
+	if (mayDelete)
 		delete event;
 }
 

common/server_chatchannel.cpp

@@ -36,7 +36,9 @@ void Server_ChatChannel::say(Server_ProtocolHandler *client, const QString &s)
 
 void Server_ChatChannel::sendChatEvent(ChatEvent *event)
 {
+	bool mayDelete = true;
 	for (int i = 0; i < size(); ++i)
-		at(i)->sendProtocolItem(event, false);
+		mayDelete = at(i)->sendProtocolItem(event, false);
+	if (mayDelete)
 		delete event;
 }

common/server_game.cpp

@@ -24,7 +24,6 @@
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_counter.h"
-#include <QSqlQuery>
 #include <QTimer>
 
 Server_Game::Server_Game(Server_ProtocolHandler *_creator, int _gameId, const QString &_description, const QString &_password, int _maxPlayers, bool _spectatorsAllowed, bool _spectatorsNeedPassword, bool _spectatorsCanTalk, bool _spectatorsSeeEverything, QObject *parent)
@@ -345,27 +344,33 @@ void Server_Game::sendGameEvent(GameEvent *event, GameEventContext *context, Ser
 
 void Server_Game::sendGameEventContainer(GameEventContainer *cont, Server_Player *exclude, bool excludeOmniscient)
 {
+	bool mayDelete = true;
+	
 	cont->setGameId(gameId);
 	QMapIterator<int, Server_Player *> playerIterator(players);
 	while (playerIterator.hasNext()) {
 		Server_Player *p = playerIterator.next().value();
 		if ((p != exclude) && !(excludeOmniscient && p->getSpectator() && spectatorsSeeEverything))
-			p->sendProtocolItem(cont, false);
+			mayDelete = p->sendProtocolItem(cont, false);
 	}
 
+	if (mayDelete)
 		delete cont;
 }
 
 void Server_Game::sendGameEventContainerOmniscient(GameEventContainer *cont, Server_Player *exclude)
 {
+	bool mayDelete = true;
+	
 	cont->setGameId(gameId);
 	QMapIterator<int, Server_Player *> playerIterator(players);
 	while (playerIterator.hasNext()) {
 		Server_Player *p = playerIterator.next().value();
 		if ((p != exclude) && (p->getSpectator() && spectatorsSeeEverything))
-			p->sendProtocolItem(cont, false);
+			mayDelete = p->sendProtocolItem(cont, false);
 	}
 	
+	if (mayDelete)
 		delete cont;
 }
 

common/server_player.cpp

@@ -196,8 +196,10 @@ bool Server_Player::deleteCounter(int counterId)
 	return true;
 }
 
-void Server_Player::sendProtocolItem(ProtocolItem *item, bool deleteItem)
+bool Server_Player::sendProtocolItem(ProtocolItem *item, bool deleteItem)
 {
 	if (handler)
-		handler->sendProtocolItem(item, deleteItem);
+		return handler->sendProtocolItem(item, deleteItem);
+	else
+		return true;
 }

common/server_player.h

@@ -70,7 +70,7 @@ public:
 	void clearZones();
 	void setupZones();
 
-	void sendProtocolItem(ProtocolItem *item, bool deleteItem = true);
+	bool sendProtocolItem(ProtocolItem *item, bool deleteItem = true);
 };
 
 #endif

common/server_protocolhandler.h

@@ -94,7 +94,7 @@ public:
 	const QDateTime &getLastCommandTime() const { return lastCommandTime; }
 
 	void processCommandContainer(CommandContainer *cont);
-	virtual void sendProtocolItem(ProtocolItem *item, bool deleteItem = true) = 0;
+	virtual bool sendProtocolItem(ProtocolItem *item, bool deleteItem = true) = 0;
 	void enqueueProtocolItem(ProtocolItem *item);
 };
 

servatrice/src/serversocketinterface.cpp

@@ -96,6 +96,7 @@ void ServerSocketInterface::sendProtocolItem(ProtocolItem *item, bool deleteItem
 	item->write(xmlWriter);
 	if (deleteItem)
 		delete item;
+	return true;
 }
 
 int ServerSocketInterface::getDeckPathId(int basePathId, QStringList path)