server code cleanup, changed in-game ping event to not use any bandwidth as long as nothing changes

cockatrice/src/messagelogwidget.cpp

@@ -762,7 +762,6 @@ void MessageLogWidget::containerProcessingDone()
 
 void MessageLogWidget::connectToPlayer(Player *player)
 {
-	connect(player, SIGNAL(logConnectionStateChanged(Player *, bool)), this, SLOT(logConnectionStateChanged(Player *, bool)));
 	connect(player, SIGNAL(logSay(Player *, QString)), this, SLOT(logSay(Player *, QString)));
 	connect(player, SIGNAL(logShuffle(Player *, CardZone *)), this, SLOT(logShuffle(Player *, CardZone *)));
 	connect(player, SIGNAL(logRollDie(Player *, int, int)), this, SLOT(logRollDie(Player *, int, int)));

cockatrice/src/player.cpp

@@ -41,7 +41,6 @@
 #include "pb/serverinfo_zone.pb.h"
 #include "pb/context_move_card.pb.h"
 #include "pb/context_undo_draw.pb.h"
-#include "pb/event_connection_state_changed.pb.h"
 #include "pb/event_game_say.pb.h"
 #include "pb/event_shuffle.pb.h"
 #include "pb/event_roll_die.pb.h"
@@ -814,11 +813,6 @@ void Player::setCardAttrHelper(const GameEventContext &context, CardItem *card,
 	}
 }
 
-void Player::eventConnectionStateChanged(const Event_ConnectionStateChanged &event)
-{
-	emit logConnectionStateChanged(this, event.connected());
-}
-
 void Player::eventGameSay(const Event_GameSay &event)
 {
 	emit logSay(this, QString::fromStdString(event.message()));
@@ -1159,7 +1153,6 @@ void Player::eventRevealCards(const Event_RevealCards &event)
 void Player::processGameEvent(GameEvent::GameEventType type, const GameEvent &event, const GameEventContext &context)
 {
 	switch (type) {
-		case GameEvent::CONNECTION_STATE_CHANGED: eventConnectionStateChanged(event.GetExtension(Event_ConnectionStateChanged::ext)); break;
 		case GameEvent::GAME_SAY: eventGameSay(event.GetExtension(Event_GameSay::ext)); break;
 		case GameEvent::SHUFFLE: eventShuffle(event.GetExtension(Event_Shuffle::ext)); break;
 		case GameEvent::ROLL_DIE: eventRollDie(event.GetExtension(Event_RollDie::ext)); break;

cockatrice/src/player.h

@@ -77,7 +77,6 @@ class Player : public QObject, public QGraphicsItem {
 signals:
 	void newCardAdded(AbstractCardItem *card);
 	// Log events
-	void logConnectionStateChanged(Player *player, bool connectionState);
 	void logSay(Player *player, QString message);
 	void logShuffle(Player *player, CardZone *zone);
 	void logRollDie(Player *player, int sides, int roll);

cockatrice/src/playerlistwidget.cpp

@@ -81,26 +81,40 @@ void PlayerListWidget::addPlayer(const ServerInfo_PlayerProperties &player)
 	sortItems(1, Qt::AscendingOrder);
 }
 
-void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties &prop)
+void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties &prop, int playerId)
 {
-	QTreeWidgetItem *player = players.value(prop.player_id(), 0);
+	if (playerId == -1)
+		playerId = prop.player_id();
+	
+	QTreeWidgetItem *player = players.value(playerId, 0);
 	if (!player)
 		return;
-
-	player->setIcon(1, prop.spectator() ? spectatorIcon : playerIcon);
-	player->setData(1, Qt::UserRole, !prop.spectator());
-	player->setData(2, Qt::UserRole, prop.conceded());
-	player->setData(2, Qt::UserRole + 1, prop.ready_start());
-	player->setIcon(2, gameStarted ? (prop.conceded() ? concededIcon : QIcon()) : (prop.ready_start() ? readyIcon : notReadyIcon));
-	player->setData(3, Qt::UserRole, prop.user_info().user_level());
-	player->setIcon(3, QIcon(UserLevelPixmapGenerator::generatePixmap(12, prop.user_info().user_level())));
-	player->setText(4, QString::fromStdString(prop.user_info().name()));
-	const QString country = QString::fromStdString(prop.user_info().country());
-	if (!country.isEmpty())
-		player->setIcon(4, QIcon(CountryPixmapGenerator::generatePixmap(12, country)));
-	player->setData(4, Qt::UserRole, QString::fromStdString(prop.user_info().name()));
-	player->setData(4, Qt::UserRole + 1, prop.player_id());
-	player->setText(5, QString::fromStdString(prop.deck_hash()));
+	
+	if (prop.has_spectator()) {
+		player->setIcon(1, prop.spectator() ? spectatorIcon : playerIcon);
+		player->setData(1, Qt::UserRole, !prop.spectator());
+	}
+	if (prop.has_conceded())
+		player->setData(2, Qt::UserRole, prop.conceded());
+	if (prop.has_ready_start())
+		player->setData(2, Qt::UserRole + 1, prop.ready_start());
+	if (prop.has_conceded() && prop.has_ready_start())
+		player->setIcon(2, gameStarted ? (prop.conceded() ? concededIcon : QIcon()) : (prop.ready_start() ? readyIcon : notReadyIcon));
+	if (prop.has_user_info()) {
+		player->setData(3, Qt::UserRole, prop.user_info().user_level());
+		player->setIcon(3, QIcon(UserLevelPixmapGenerator::generatePixmap(12, prop.user_info().user_level())));
+		player->setText(4, QString::fromStdString(prop.user_info().name()));
+		const QString country = QString::fromStdString(prop.user_info().country());
+		if (!country.isEmpty())
+			player->setIcon(4, QIcon(CountryPixmapGenerator::generatePixmap(12, country)));
+		player->setData(4, Qt::UserRole, QString::fromStdString(prop.user_info().name()));
+	}
+	if (prop.has_player_id())
+		player->setData(4, Qt::UserRole + 1, prop.player_id());
+	if (prop.has_deck_hash())
+		player->setText(5, QString::fromStdString(prop.deck_hash()));
+	if (prop.has_ping_seconds())
+		player->setIcon(0, QIcon(PingPixmapGenerator::generatePixmap(12, prop.ping_seconds(), 10)));
 }
 
 void PlayerListWidget::removePlayer(int playerId)
@@ -123,14 +137,6 @@ void PlayerListWidget::setActivePlayer(int playerId)
 	}
 }
 
-void PlayerListWidget::updatePing(int playerId, int pingTime)
-{
-	QTreeWidgetItem *twi = players.value(playerId, 0);
-	if (!twi)
-		return;
-	twi->setIcon(0, QIcon(PingPixmapGenerator::generatePixmap(12, pingTime, 10)));
-}
-
 void PlayerListWidget::setGameStarted(bool _gameStarted, bool resuming)
 {
 	gameStarted = _gameStarted;

cockatrice/src/playerlistwidget.h

@@ -41,8 +41,7 @@ public:
 	void addPlayer(const ServerInfo_PlayerProperties &player);
 	void removePlayer(int playerId);
 	void setActivePlayer(int playerId);
-	void updatePing(int playerId, int pingTime);
-	void updatePlayerProperties(const ServerInfo_PlayerProperties &prop);
+	void updatePlayerProperties(const ServerInfo_PlayerProperties &prop, int playerId = -1);
 	void setGameStarted(bool _gameStarted, bool resuming);
 	void showContextMenu(const QPoint &pos, const QModelIndex &index);
 };

cockatrice/src/tab_game.cpp

@@ -5,6 +5,7 @@
 #include <QAction>
 #include <QMessageBox>
 #include <QFileDialog>
+#include <QTimer>
 #include "tab_game.h"
 #include "tab_supervisor.h"
 #include "cardinfowidget.h"
@@ -50,8 +51,9 @@
 #include "pb/event_game_closed.pb.h"
 #include "pb/event_set_active_player.pb.h"
 #include "pb/event_set_active_phase.pb.h"
-#include "pb/event_ping.pb.h"
 #include "pb/context_deck_select.pb.h"
+#include "pb/context_connection_state_changed.pb.h"
+#include "pb/context_ping_changed.pb.h"
 #include "get_pb_extension.h"
 
 ReadyStartButton::ReadyStartButton(QWidget *parent)
@@ -208,6 +210,11 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
 	resuming(event.resuming()),
 	currentPhase(-1)
 {
+	gameTimer = new QTimer(this);
+	gameTimer->setInterval(1000);
+	connect(gameTimer, SIGNAL(timeout()), this, SLOT(incrementGameTime()));
+	gameTimer->start();
+	
 	phasesToolbar = new PhasesToolbar;
 	phasesToolbar->hide();
 	connect(phasesToolbar, SIGNAL(sendGameCommand(const ::google::protobuf::Message &, int)), this, SLOT(sendGameCommand(const ::google::protobuf::Message &, int)));
@@ -361,6 +368,17 @@ void TabGame::closeRequest()
 	actLeaveGame();
 }
 
+void TabGame::incrementGameTime()
+{
+	int seconds = ++secondsElapsed;
+	int minutes = seconds / 60;
+	seconds -= minutes * 60;
+	int hours = minutes / 60;
+	minutes -= hours * 60;
+	
+	timeElapsedLabel->setText(QString::number(hours).rightJustified(2, '0') + ":" + QString::number(minutes).rightJustified(2, '0') + ":" + QString::number(seconds).rightJustified(2, '0'));
+}
+
 void TabGame::adminLockChanged(bool lock)
 {
 	bool v = !(spectator && !spectatorsCanTalk && lock);
@@ -496,7 +514,6 @@ void TabGame::processGameEventContainer(const GameEventContainer &cont, Abstract
 				case GameEvent::GAME_CLOSED: eventGameClosed(event.GetExtension(Event_GameClosed::ext), playerId, context); break;
 				case GameEvent::SET_ACTIVE_PLAYER: eventSetActivePlayer(event.GetExtension(Event_SetActivePlayer::ext), playerId, context); break;
 				case GameEvent::SET_ACTIVE_PHASE: eventSetActivePhase(event.GetExtension(Event_SetActivePhase::ext), playerId, context); break;
-				case GameEvent::PING: eventPing(event.GetExtension(Event_Ping::ext), playerId, context); break;
 		
 				default: {
 					Player *player = players.value(playerId, 0);
@@ -650,6 +667,9 @@ void TabGame::eventGameStateChanged(const Event_GameStateChanged &event, int /*e
 			player->processCardAttachment(playerInfo);
 		}
 	}
+	
+	secondsElapsed = event.seconds_elapsed();
+	
 	if (event.game_started() && !started) {
 		startGame(!gameStateKnown);
 		if (gameStateKnown)
@@ -669,7 +689,7 @@ void TabGame::eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &
 	Player *player = players.value(eventPlayerId, 0);
 	if (!player)
 		return;
-	playerListWidget->updatePlayerProperties(event.player_properties());
+	playerListWidget->updatePlayerProperties(event.player_properties(), eventPlayerId);
 	
 	const GameEventContext::ContextType contextType = static_cast<const GameEventContext::ContextType>(getPbExtension(context));
 	switch (contextType) {
@@ -697,6 +717,10 @@ void TabGame::eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &
 			messageLog->logDeckSelect(player, QString::fromStdString(context.GetExtension(Context_DeckSelect::ext).deck_hash()));
 			break;
 		}
+		case GameEventContext::CONNECTION_STATE_CHANGED: {
+			messageLog->logConnectionStateChanged(player, event.player_properties().ping_seconds() != -1);
+			break;
+		}
 		default: ;
 	}
 }
@@ -809,20 +833,6 @@ void TabGame::eventSetActivePhase(const Event_SetActivePhase &event, int /*event
 	emit userEvent();
 }
 
-void TabGame::eventPing(const Event_Ping &event, int /*eventPlayerId*/, const GameEventContext & /*context*/)
-{
-	const int pingListSize = event.ping_list_size();
-	for (int i = 0; i < pingListSize; ++i)
-		playerListWidget->updatePing(event.ping_list(i).player_id(), event.ping_list(i).ping_time());
-	
-	int seconds = event.seconds_elapsed();
-	int minutes = seconds / 60;
-	seconds -= minutes * 60;
-	int hours = minutes / 60;
-	minutes -= hours * 60;
-	timeElapsedLabel->setText(QString::number(hours).rightJustified(2, '0') + ":" + QString::number(minutes).rightJustified(2, '0') + ":" + QString::number(seconds).rightJustified(2, '0'));
-}
-
 void TabGame::newCardAdded(AbstractCardItem *card)
 {
 	connect(card, SIGNAL(hovered(AbstractCardItem *)), cardInfo, SLOT(setCard(AbstractCardItem *)));

cockatrice/src/tab_game.h

@@ -13,6 +13,7 @@ class DeckView;
 class GameScene;
 class CardInfoWidget;
 class MessageLogWidget;
+class QTimer;
 class QSplitter;
 class QLabel;
 class QLineEdit;
@@ -89,6 +90,8 @@ public:
 class TabGame : public Tab {
 	Q_OBJECT
 private:
+	QTimer *gameTimer;
+	int secondsElapsed;
 	QList<AbstractClient *> clients;
 	int gameId;
 	QString gameDescription;
@@ -152,6 +155,7 @@ signals:
 	void containerProcessingDone();
 	void openMessageDialog(const QString &userName, bool focus);
 private slots:
+	void incrementGameTime();
 	void adminLockChanged(bool lock);
 	void newCardAdded(AbstractCardItem *card);