tagging ychat-0.7.9.4ychat-0.7.9.4

4 files changed, 45 insertions, 130 deletions

diff --git a/src/monitor/dump.cpp b/src/monitor/dump.cpp
index da220f4..0eb62c9 100644
--- a/src/monitor/dump.cpp
+++ b/src/monitor/dump.cpp
@@ -1,27 +1,3 @@
-/*:*
- *: File: ./src/monitor/dump.cpp
- *: 
- *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT
- *: 
- *: Copyright (C) 2003 Paul C. Buetow, Volker Richter
- *: Copyright (C) 2004 Paul C. Buetow
- *: Copyright (C) 2005 EXA Digital Solutions GbR
- *: 
- *: This program is free software; you can redistribute it and/or
- *: modify it under the terms of the GNU General Public License
- *: as published by the Free Software Foundation; either version 2
- *: of the License, or (at your option) any later version.
- *: 
- *: This program is distributed in the hope that it will be useful,
- *: but WITHOUT ANY WARRANTY; without even the implied warranty of
- *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *: GNU General Public License for more details.
- *: 
- *: You should have received a copy of the GNU General Public License
- *: along with this program; if not, write to the Free Software
- *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *:*/
-
 #ifndef DUMP_CPP
 #define DUMP_CPP
 
@@ -32,13 +8,13 @@ using namespace std;
 const string dumpable::s_sep = "->";
 const int dumpable::i_max_level = 100;
 
-dumpable::dumpable()
+dumpable::dumpable() 
 {
   initialize(0);
 }
 
 void
-dumpable::initialize(int i_level)
+dumpable::initialize(int i_level) 
 {
   this->i_level = i_level;
   this->i_lined = i_level;
@@ -48,13 +24,13 @@ dumpable::initialize(int i_level)
 }
 
 string
-dumpable::dump()
+dumpable::dump() 
 {
   return dump(0);
 }
 
 string
-dumpable::dump(int i_level)
+dumpable::dump(int i_level) 
 {
   initialize(i_level);
   dumpit();
@@ -62,37 +38,34 @@ dumpable::dump(int i_level)
 }
 
 void
-dumpable::add
-  (string s_line)
+dumpable::add(string s_line) 
 {
   if ( i_lined > i_max_level )
     i_lined = i_max_level;
 
-  if (!b_lined)
+  if (!b_lined) 
     s_dump.append(s_sep);
 
-  else
-    for ( int i = 0; i < i_lined; ++i )
-      s_dump.append(" ");
+  else for ( int i = 0; i < i_lined; ++i ) 
+    s_dump.append(" ");
 
   s_dump.append(s_line);
 
-  if (b_next_no_nl)
+  if (b_next_no_nl) 
     b_next_no_nl = false;
 
   else
     s_dump.append("\n");
 
-  if (!b_lined)
-  {
+  if (!b_lined) {
     b_lined = true;
     i_lined = i_level + s_sep.length();
   }
 }
 
 int
-dumpable::get_level() const
-{
+dumpable::get_level() const 
+{ 
   return i_lined;
 }
 
diff --git a/src/monitor/dump.h b/src/monitor/dump.h
index e1915e7..8e84cb1 100644
--- a/src/monitor/dump.h
+++ b/src/monitor/dump.h
@@ -1,27 +1,3 @@
-/*:*
- *: File: ./src/monitor/dump.h
- *: 
- *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT
- *: 
- *: Copyright (C) 2003 Paul C. Buetow, Volker Richter
- *: Copyright (C) 2004 Paul C. Buetow
- *: Copyright (C) 2005 EXA Digital Solutions GbR
- *: 
- *: This program is free software; you can redistribute it and/or
- *: modify it under the terms of the GNU General Public License
- *: as published by the Free Software Foundation; either version 2
- *: of the License, or (at your option) any later version.
- *: 
- *: This program is distributed in the hope that it will be useful,
- *: but WITHOUT ANY WARRANTY; without even the implied warranty of
- *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *: GNU General Public License for more details.
- *: 
- *: You should have received a copy of the GNU General Public License
- *: along with this program; if not, write to the Free Software
- *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *:*/
-
 #include "../incl.h"
 
 #ifndef DUMP_H
@@ -39,35 +15,24 @@ private:
   string s_dump;
 
   static const string s_sep;
-  static const int i_max_level;
+  static const int i_max_level; 
 
   virtual void dumpit() = 0;
   void initialize(int i_level);
   void reset();
 
 protected:
-  void add
-    (unsigned i_num)
-  {
-    add
-      ("<unsigned>");
-  }
+  void add(unsigned i_num) 
+  { add("<unsigned>"); }
 
-  void add
-    (int i_num)
-  {
-    add
-      ("<int>");
-  }
+  void add(int i_num) 
+  { add("<int>"); }
 
-  void add
-    (string s_line);
+  void add(string s_line);
   dumpable();
 
-  void next_no_newline()
-  {
-    b_next_no_nl = true;
-  }
+  void next_no_newline() 
+  { b_next_no_nl = true; }
 
 public:
   string dump();
diff --git a/src/monitor/stats.cpp b/src/monitor/stats.cpp
index c8539ad..5d5cc39 100644
--- a/src/monitor/stats.cpp
+++ b/src/monitor/stats.cpp
@@ -1,27 +1,3 @@
-/*:*
- *: File: ./src/monitor/stats.cpp
- *: 
- *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT
- *: 
- *: Copyright (C) 2003 Paul C. Buetow, Volker Richter
- *: Copyright (C) 2004 Paul C. Buetow
- *: Copyright (C) 2005 EXA Digital Solutions GbR
- *: 
- *: This program is free software; you can redistribute it and/or
- *: modify it under the terms of the GNU General Public License
- *: as published by the Free Software Foundation; either version 2
- *: of the License, or (at your option) any later version.
- *: 
- *: This program is distributed in the hope that it will be useful,
- *: but WITHOUT ANY WARRANTY; without even the implied warranty of
- *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *: GNU General Public License for more details.
- *: 
- *: You should have received a copy of the GNU General Public License
- *: along with this program; if not, write to the Free Software
- *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *:*/
-
 #ifndef STATS_CPP
 #define STATS_CPP
 
@@ -141,6 +117,10 @@ stats::increment_num_rooms()
   pthread_mutex_lock  ( &mut_num_rooms );
   ++i_num_rooms;
   pthread_mutex_unlock( &mut_num_rooms );
+#ifdef NCURSES
+
+  print_num_rooms();
+#endif
 }
 void
 stats::decrement_num_rooms()
@@ -148,8 +128,23 @@ stats::decrement_num_rooms()
   pthread_mutex_lock  ( &mut_num_rooms );
   --i_num_rooms;
   pthread_mutex_unlock( &mut_num_rooms );
+#ifdef NCURSES
+
+  print_num_rooms();
+#endif
 }
 
+#ifdef NCURSES
+void
+stats::print_num_rooms()
+{
+  if ( !wrap::NCUR->is_ready() )
+    return;
+
+  mvprintw( NCUR_NUM_ROOMS_X, NCUR_NUM_ROOMS_Y, "Rooms: %d", get_num_rooms());
+  refresh();
+}
+#endif
 //*>>
 
 #endif
diff --git a/src/monitor/stats.h b/src/monitor/stats.h
index b4dd10a..231d876 100644
--- a/src/monitor/stats.h
+++ b/src/monitor/stats.h
@@ -1,27 +1,3 @@
-/*:*
- *: File: ./src/monitor/stats.h
- *: 
- *: yChat; Homepage: www.yChat.org; Version 0.8.3-CURRENT
- *: 
- *: Copyright (C) 2003 Paul C. Buetow, Volker Richter
- *: Copyright (C) 2004 Paul C. Buetow
- *: Copyright (C) 2005 EXA Digital Solutions GbR
- *: 
- *: This program is free software; you can redistribute it and/or
- *: modify it under the terms of the GNU General Public License
- *: as published by the Free Software Foundation; either version 2
- *: of the License, or (at your option) any later version.
- *: 
- *: This program is distributed in the hope that it will be useful,
- *: but WITHOUT ANY WARRANTY; without even the implied warranty of
- *: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *: GNU General Public License for more details.
- *: 
- *: You should have received a copy of the GNU General Public License
- *: along with this program; if not, write to the Free Software
- *: Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *:*/
-
 #include "../incl.h"
 
 #ifndef STATS_H
@@ -62,6 +38,12 @@ public:
   void update_rusage_history();
   string get_rusage_history( string s_type, string s_seperator );
   long get_ru_maxrss();
+  //<<*
+#ifdef NCURSES
+
+  void print_num_rooms();
+#endif
+  //*>>
 };
 
 #endif