Rework timer and ping logic

The timer's time as received by the server is clarified to be the actual
numerical time, in milliseconds, to be shown on the clock.

1 files changed, 17 insertions, 1 deletions

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index f4e31647..c2fcf9b8 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -8,7 +8,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
   qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch() / 1000));
 
   keepalive_timer = new QTimer(this);
-  keepalive_timer->start(1000);
+  keepalive_timer->start(45000);
 
   chat_tick_timer = new QTimer(this);
 
@@ -114,6 +114,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
 
   ui_clock = new AOClockLabel(this);
   ui_clock->setAttribute(Qt::WA_TransparentForMouseEvents);
+  ui_clock->hide();
 
   ui_ic_chat_name = new QLineEdit(this);
   ui_ic_chat_name->setFrame(false);
@@ -4672,10 +4673,20 @@ void Courtroom::on_switch_area_music_clicked()
 void Courtroom::ping_server()
 {
   ping_timer.start();
+  is_pinging = true;
   ao_app->send_server_packet(
       new AOPacket("CH#" + QString::number(m_cid) + "#%"));
 }
 
+qint64 Courtroom::pong()
+{
+  if (!is_pinging)
+    return -1;
+
+  is_pinging = false;
+  return ping_timer.elapsed();
+}
+
 void Courtroom::on_casing_clicked()
 {
   if (ao_app->casing_alerts_enabled) {
@@ -4740,6 +4751,11 @@ void Courtroom::stop_clock()
   ui_clock->stop();
 }
 
+void Courtroom::set_clock_visibility(bool visible)
+{
+  ui_clock->setVisible(visible);
+}
+
 Courtroom::~Courtroom()
 {
   delete music_player;