[Pingus-CVS] CVS: Games/Pingus/src Makefile.am, 1.153, 1.154 action_button.cxx, 1.32, 1.33 action_button.hxx, 1.17, 1.18 alpha_button.cxx, 1.4, 1.5 blitter_impl.hxx, 1.11, 1.12 client.cxx, 1.46, 1.47 console.cxx, 1.15, 1.16 console.hxx, 1.13, 1.14 credits.hxx, 1.13, 1.14 exit_menu.hxx, 1.11, 1.12 fps_counter.hxx, 1.7, 1.8 global_event.cxx, 1.10, 1.11 global_event.hxx, 1.7, 1.8 layer_manager.hxx, 1.10, 1.11 level_desc.cxx, 1.13, 1.14 pingus_main.cxx, 1.98, 1.99 pingus_main.hxx, 1.13, 1.14 pingus_resource.hxx, 1.14, 1.15 savegame.cxx, 1.3, 1.4 savegame.hxx, 1.3, 1.4 savegame_manager.hxx, 1.4, 1.5 sprite.hxx, 1.11, 1.12

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv20278/src

Modified Files:
        Makefile.am action_button.cxx action_button.hxx 
        alpha_button.cxx blitter_impl.hxx client.cxx console.cxx 
        console.hxx credits.hxx exit_menu.hxx fps_counter.hxx 
        global_event.cxx global_event.hxx layer_manager.hxx 
        level_desc.cxx pingus_main.cxx pingus_main.hxx 
        pingus_resource.hxx savegame.cxx savegame.hxx 
        savegame_manager.hxx sprite.hxx 
Log Message:
- fixed a few makefiles and configure.ac

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.am,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- Makefile.am 16 Aug 2003 20:51:28 -0000      1.153
+++ Makefile.am 18 Oct 2003 12:11:30 -0000      1.154
@@ -48,7 +48,10 @@
 
 bin_PROGRAMS = pingus
 
+pingus_CPPFLAGS = @PINGUS_CFLAGS@
+
 pingus_LDADD = \
+        @PINGUS_LIBS@ \
         @LIBINTL@ \
         @LIBS@     \
         \

Index: action_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- action_button.cxx   16 Aug 2003 20:51:28 -0000      1.32
+++ action_button.cxx   18 Oct 2003 12:11:30 -0000      1.33
@@ -17,9 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Font/font.h>
-#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/display.h>
 
 #include "globals.hxx"
 #include "cheat.hxx"

Index: action_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/action_button.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- action_button.hxx   19 Apr 2003 10:23:17 -0000      1.17
+++ action_button.hxx   18 Oct 2003 12:11:30 -0000      1.18
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_ACTION_BUTTON_HXX
 #define HEADER_PINGUS_ACTION_BUTTON_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include <string>
 #include "pingu_enums.hxx"
 #include "sprite.hxx"

Index: alpha_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/alpha_button.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- alpha_button.cxx    22 Apr 2003 16:40:41 -0000      1.4
+++ alpha_button.cxx    18 Oct 2003 12:11:30 -0000      1.5
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
 #include <ClanLib/Display/Input/mouse.h>
 #include "fonts.hxx"

Index: blitter_impl.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/blitter_impl.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- blitter_impl.hxx    4 Jun 2003 17:34:38 -0000       1.11
+++ blitter_impl.hxx    18 Oct 2003 12:11:30 -0000      1.12
@@ -22,7 +22,7 @@
 
 #include <iostream>
 #include <ClanLib/Display/SurfaceProviders/canvas.h>
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "indexed_canvas.hxx"
 #include "pingus.hxx"
 

Index: client.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/client.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- client.cxx  24 Apr 2003 15:18:19 -0000      1.46
+++ client.cxx  18 Oct 2003 12:11:30 -0000      1.47
@@ -18,8 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Display/mousecursor_provider.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/mousecursor_provider.h>
 #include "globals.hxx"
 #include "playfield.hxx"
 #include "timer.hxx"

Index: console.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/console.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- console.cxx 17 Jun 2003 14:09:20 -0000      1.15
+++ console.cxx 18 Oct 2003 12:11:30 -0000      1.16
@@ -27,6 +27,8 @@
 
 using std::ostream;
 
+namespace Pingus {
+
 // Globale console
 Console console;
 
@@ -241,4 +243,6 @@
   draw();
 }
 
+} // namespace Pingus
+
 /* EOF */

Index: console.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/console.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- console.hxx 19 Apr 2003 10:23:17 -0000      1.13
+++ console.hxx 18 Oct 2003 12:11:30 -0000      1.14
@@ -26,6 +26,8 @@
 
 class CL_Font;
 
+namespace Pingus {
+
 class ConsoleBuffer :
   public std::streambuf
 {
@@ -110,6 +112,8 @@
 /** The globale console object to which you can send messages */
 extern Console console;
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: credits.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/credits.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- credits.hxx 19 Apr 2003 10:23:17 -0000      1.13
+++ credits.hxx 18 Oct 2003 12:11:30 -0000      1.14
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <vector>
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "gui/gui_screen.hxx"
 
 class CL_Font;

Index: exit_menu.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/exit_menu.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- exit_menu.hxx       19 Apr 2003 10:23:17 -0000      1.11
+++ exit_menu.hxx       18 Oct 2003 12:11:30 -0000      1.12
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_EXIT_MENU_HXX
 #define HEADER_PINGUS_EXIT_MENU_HXX
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "pingus_sub_menu.hxx"
 
 class PingusMenuManager;

Index: fps_counter.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/fps_counter.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fps_counter.hxx     19 Apr 2003 10:23:17 -0000      1.7
+++ fps_counter.hxx     18 Oct 2003 12:11:30 -0000      1.8
@@ -24,6 +24,8 @@
 
 class CL_Font;
 
+namespace Pingus {
+
 ///
 class FPSCounter : public DisplayHook
 {
@@ -70,6 +72,8 @@
     it over and over again */
 extern FPSCounter fps_counter;
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: global_event.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/global_event.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- global_event.cxx    19 Apr 2003 10:23:17 -0000      1.10
+++ global_event.cxx    18 Oct 2003 12:11:30 -0000      1.11
@@ -35,7 +35,7 @@
 }
 
 void
-GlobalEvent::on_button_press(CL_InputDevice *device, const CL_Key &key)
+GlobalEvent::on_button_press(const CL_InputEvent& event)
 {
   if (device == CL_Input::keyboards[0])
     {
@@ -115,7 +115,7 @@
 }
 
 void
-GlobalEvent::on_button_release(CL_InputDevice *device, const CL_Key & /*key*/)
+GlobalEvent::on_button_release(const CL_InputEvent& event)
 {
   if (device == CL_Input::keyboards[0])
     {

Index: global_event.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/global_event.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- global_event.hxx    19 Apr 2003 10:23:17 -0000      1.7
+++ global_event.hxx    18 Oct 2003 12:11:30 -0000      1.8
@@ -30,8 +30,8 @@
 public:
   GlobalEvent ();
 
-  virtual void on_button_press(CL_InputDevice *device, const CL_Key &key);
-  virtual void on_button_release(CL_InputDevice *device, const CL_Key &key);
+  virtual void on_button_press(const CL_InputEvent& event);
+  virtual void on_button_release(const CL_InputEvent& event);
 
 private:
    GlobalEvent (const GlobalEvent&);

Index: layer_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/layer_manager.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- layer_manager.hxx   19 Apr 2003 10:23:17 -0000      1.10
+++ layer_manager.hxx   18 Oct 2003 12:11:30 -0000      1.11
@@ -22,7 +22,7 @@
 
 #include "pingus.hxx"
 #include <cmath>
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 #include "gui/graphic_context.hxx"
 
 class LayerManager

Index: level_desc.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/level_desc.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- level_desc.cxx      24 Apr 2003 15:18:19 -0000      1.13
+++ level_desc.cxx      18 Oct 2003 12:11:30 -0000      1.14
@@ -18,8 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/font.h>
 #include "gui/display.hxx"
 #include "pingus_resource.hxx"
 #include "level_desc.hxx"

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- pingus_main.cxx     19 Aug 2003 19:56:55 -0000      1.98
+++ pingus_main.cxx     18 Oct 2003 12:11:30 -0000      1.99
@@ -30,20 +30,19 @@
 #include <locale.h>
 #include <getopt.h>
 
-#include <ClanLib/Core/System/console_window.h>
-#include <ClanLib/Display/setupdisplay.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Input/input.h>
-
-#include <ClanLib/Core/System/setupcore.h>
-#include <ClanLib/jpeg.h>
-#include <ClanLib/png.h>
-#include <ClanLib/GUI/setupgui.h>
-
+//#include <ClanLib/Core/System/console_window.h>
+//#include <ClanLib/Display/setupdisplay.h>
+//#include <ClanLib/Display/Display/display.h>
+//#include <ClanLib/Display/Input/input.h>
+//#include <ClanLib/Core/System/setupcore.h>
+//#include <ClanLib/GUI/setupgui.h>
 
-#ifdef HAVE_LIBCLANGL
-# include <ClanLib/gl.h>
-#endif
+#include <ClanLib/display.h>
+#include <ClanLib/sound.h>
+#include <ClanLib/core.h>
+#include <ClanLib/sdl.h>
+#include <ClanLib/gl.h>
+#include <ClanLib/gui.h>
 
 #include "gettext.h"
 
@@ -86,6 +85,8 @@
 
 using EditorNS::Editor;
 
+namespace Pingus {
+
 void
 signal_handler(int signo)
 {
@@ -772,8 +773,8 @@
   if (!render_preview)
     {
       // Register the global event catcher
-      on_button_press_slot = CL_Input::sig_button_press ().connect 
(&global_event, &GlobalEvent::on_button_press);
-      on_button_release_slot = CL_Input::sig_button_release ().connect 
(&global_event, &GlobalEvent::on_button_release);
+      on_button_press_slot   = 
window->get_ic()->get_keyboard().sig_key_down().connect (&global_event, 
&GlobalEvent::on_button_press);
+      on_button_release_slot = 
window->get_ic()->get_keyboard().sig_key_up().connect (&global_event, 
&GlobalEvent::on_button_release);
     }
 
   // Set the root screen
@@ -858,8 +859,8 @@
         std::cout << "PingusMain::quit game and screen_manager" << std::endl;
 
       // unregister the global event catcher
-      CL_Input::sig_button_press ().disconnect (on_button_press_slot);
-      CL_Input::sig_button_release ().disconnect(on_button_release_slot);
+      
window->get_ic()->get_keyboard().sig_key_down().disconnect(on_button_press_slot);
+      
window->get_ic()->get_keyboard().sig_key_up().disconnect(on_button_release_slot);
     }
 }
 
@@ -904,8 +905,8 @@
       // Avoid uglyness on window opening
       if (!render_preview)
         {
-          CL_Display::clear_display();
-          CL_Display::flip_display();
+          CL_Display::clear();
+          CL_Display::flip();
         }
       start_game();
 
@@ -945,51 +946,37 @@
 void
 PingusMain::init_clanlib()
 {
-  CL_SetupCore::init ();
-  CL_SetupPNG::init ();
-  CL_SetupJPEG::init ();
-  CL_SetupGUI::init ();
 
   if (render_preview)
     {
+      CL_SetupCore::init ();
       // Register only the resource types
       CL_SetupDisplay::init(true);
     }
   else
     {
-
-#ifdef HAVE_LIBCLANGL
-      if (use_opengl) {
-        CL_SetupGL::init();
-        std::cout << "Using OpenGL" << std::endl;
-      }
-#endif
+      CL_SetupCore::init ();
+  
+      if (use_opengl) CL_SetupGL::init();
+      else            CL_SetupSDL::init();
 
       CL_SetupDisplay::init();
 
-      on_exit_press_slot = CL_System::sig_quit().connect(this, 
&PingusMain::on_exit_press);
+      if (verbose) {
+        std::cout << "Using resolution: "
+                  << screen_width << "x" << screen_height << std::endl;
+      }
 
-      if (verbose)
-        {
-          std::cout << "Using resolution: "
-                    << screen_width << "x" << screen_height << std::endl;
-        }
+      window = new CL_DisplayWindow(PACKAGE_STRING,
+                           screen_width, screen_height, fullscreen_enabled, 
false);
+      sound  = new CL_SoundOutput(44100);
 
-      // Initing the display
-      CL_Display::set_videomode(screen_width, screen_height, 16,
-                                fullscreen_enabled,
-                                false); // allow resize
-      CL_Display::clear_display();
-      CL_Display::flip_display();
-    
-#ifdef HAVE_LIBCLANGL
-      if (use_opengl)
-        {
-          CL_OpenGL::begin_2d ();
-          glEnable (GL_BLEND);
-        }
-#endif
+      CL_Display::clear();
+      CL_Display::flip();
     }
+  CL_SetupGUI::init ();
+  
+  on_exit_press_slot = window->sig_window_close().connect(this, 
&PingusMain::on_exit_press);
 }
 
 void
@@ -1002,14 +989,14 @@
 void
 PingusMain::deinit_clanlib()
 {
-  CL_SetupDisplay::deinit();
-#ifdef HAVE_LIBCLANGL
+  CL_SetupGUI::deinit ();
+
   if (use_opengl)
     CL_SetupGL::deinit();
-#endif
-  CL_SetupGUI::deinit ();
-  CL_SetupPNG::deinit();
-  CL_SetupJPEG::deinit();
+  else
+    CL_SetupSDL::deinit();
+
+  CL_SetupDisplay::deinit ();
   CL_SetupCore::deinit();
 }
 
@@ -1057,4 +1044,6 @@
   xmlCleanupParser();
 }
 
+} // namespace Pingus
+
 /* EOF */

Index: pingus_main.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pingus_main.hxx     16 Aug 2003 20:51:28 -0000      1.13
+++ pingus_main.hxx     18 Oct 2003 12:11:30 -0000      1.14
@@ -27,9 +27,14 @@
 
 void segfault_handler(int);
 
+namespace Pingus {
+
 class PingusMain : public CL_ClanApplication
 {
 private:
+  CL_DisplayWindow* window; 
+  CL_SoundOutput*   sound;
+
   bool    no_config_file;
   bool    show_credits;
   /// the name of the exe: argv[0]
@@ -79,6 +84,8 @@
 
 } app; // golbal class instance
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: pingus_resource.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_resource.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- pingus_resource.hxx 19 Apr 2003 10:23:17 -0000      1.14
+++ pingus_resource.hxx 18 Oct 2003 12:11:30 -0000      1.15
@@ -22,7 +22,7 @@
 
 #include <map>
 
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/display.h>
 #include "res_descriptor.hxx"
 
 class CL_Font;

Index: savegame.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- savegame.cxx        19 Apr 2003 10:23:17 -0000      1.3
+++ savegame.cxx        18 Oct 2003 12:11:30 -0000      1.4
@@ -58,7 +58,7 @@
 {
   status = ACCESSIBLE;
   saved_pingus = 0;
-  time = 0;
+  needed_time = 0;
 }
 
 Savegame::Savegame(xmlDocPtr doc, xmlNodePtr node)
@@ -81,7 +81,7 @@
   writer.begin_section("level");
   writer.write_string ("name", levelname);
   writer.write_enum   ("status", status, status_to_string);
-  writer.write_int    ("time", time);
+  writer.write_int    ("time", needed_time);
   writer.write_int    ("saved-pingus", saved_pingus);
   writer.end_section();
 }
@@ -92,7 +92,7 @@
   XMLFileReader reader(doc, node);
   reader.read_string ("name", levelname);
   reader.read_enum   ("status", status, string_to_status);
-  reader.read_int    ("time", time);
+  reader.read_int    ("time", needed_time);
   reader.read_int    ("saved-pingus", saved_pingus);
 
 }

Index: savegame.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- savegame.hxx        19 Apr 2003 10:23:17 -0000      1.3
+++ savegame.hxx        18 Oct 2003 12:11:30 -0000      1.4
@@ -23,15 +23,17 @@
 #include <string>
 #include "libxmlfwd.hxx"
 
+namespace Pingus {
+
 /** The Savegame class holds savegame informations for a single
     level */
 class Savegame
 {
 private:
 public:
-  enum Status { FINISHED,   // level is successfully finished
-                ACCESSIBLE, // level is accessible and can be played
-                NONE};      // level is not finished and cannot be accessed
+  enum SG_Status { FINISHED,   // level is successfully finished
+                   ACCESSIBLE, // level is accessible and can be played
+                   NONE };      // level is not finished and cannot be accessed
   static std::string status_to_string (Status s);
   static Status string_to_status (std::string s);
 
@@ -40,7 +42,7 @@
   Status status;
 
   /** Time needed to finish the level, only valid if status == FINISHED */
-  int time;
+  int needed_time;
 
   /** Number of Pingus that where saved while playing the level */
   int saved_pingus;
@@ -53,6 +55,8 @@
   void write_xml(std::ostream& xml);
 };
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: savegame_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame_manager.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- savegame_manager.hxx        4 Jun 2003 17:22:33 -0000       1.4
+++ savegame_manager.hxx        18 Oct 2003 12:11:30 -0000      1.5
@@ -23,6 +23,8 @@
 #include <map>
 #include "savegame.hxx"
 
+namespace Pingus {
+
 /** */
 class SavegameManager
 {
@@ -48,6 +50,8 @@
   SavegameManager& operator= (const SavegameManager&);
 };
 
+} // namespace Pingus
+
 #endif
 
 /* EOF */

Index: sprite.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sprite.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sprite.hxx  16 Aug 2003 20:51:28 -0000      1.11
+++ sprite.hxx  18 Oct 2003 12:11:30 -0000      1.12
@@ -21,7 +21,7 @@
 #define HEADER_PINGUS_SPRITE_HXX
 
 #include "pingus.hxx"
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
 
 class Vector;
 class ResDescriptor;