gosu 0.8.6-x86-mingw32 → 0.8.7-x86-mingw32

data/Gosu/TextInput.hpp

@@ -1,70 +1,70 @@
-//! \file TextInput.hpp
-//! Interface of the TextInput class.
-
-#ifndef GOSU_TEXTINPUT_HPP
-#define GOSU_TEXTINPUT_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/TR1.hpp>
-#include <string>
-
-namespace Gosu
-{
-    //! TextInput instances are invisible objects that build a text string from input,
-    //! using the current operating system's keyboard layout.
-    //! At its most basic form, you only need to create a new TextInput instance and
-    //! pass it to your window via setTextInput. Until you call this function again,
-    //! passing 0, the TextInput object will build a text that can be accessed via
-    //! TextInput::text().
-    //! A TextInput object is purely abstract, though; drawing the input field is left
-    //! to the user. As with most of Gosu, how this is handled is completely left open.
-    //! TextInput only aims to provide enough code for your own GUIs to build upon.
-    class TextInput
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-    #if defined(GOSU_CPP11_ENABLED)
-        TextInput(TextInput&&) = delete;
-        TextInput& operator=(TextInput&&) = delete;
-        TextInput(const TextInput&) = delete;
-        TextInput& operator=(const TextInput&) = delete;
-    #endif
-        
-    public:
-        TextInput();
-        virtual ~TextInput();
-
-        std::wstring text() const;
-
-        //! Replaces the current text by the given string and positions the cursor
-        //! at the end of the text, with an empty selection.
-        void setText(const std::wstring& text);
-
-        //! Position of the caret as the index of the character that it's left to.
-        unsigned caretPos() const;
-        //! Sets the caret position as returned by caretPos.
-        //! You usually also want to use setSelectionStart.
-        void setCaretPos(unsigned pos);
-
-        //! If there is a selection, the selectionStart() member yields its beginning,
-        //! using the same indexing scheme as caretPos. If there is no selection,
-        //! selectionStart() is equal to caretPos().
-        unsigned selectionStart() const;
-        //! Sets the start of the selection as returned by selectionStart.
-        void setSelectionStart(unsigned pos);
-        
-        // Platform-specific communication with Gosu::Input.
-        bool feedSDLEvent(void* event);
-
-        //! Overridable filter that is applied to all new text that is entered.
-        //! Allows for context-sensitive filtering/extending/... of the text.
-        //! The text will be inserted at caretPos afterwards.
-        virtual std::wstring filter(const std::wstring& text) const
-        {
-            return text;
-        }
-    };
-}
-
-#endif
+//! \file TextInput.hpp
+//! Interface of the TextInput class.
+
+#ifndef GOSU_TEXTINPUT_HPP
+#define GOSU_TEXTINPUT_HPP
+
+#include <Gosu/Fwd.hpp>
+#include <Gosu/Platform.hpp>
+#include <Gosu/TR1.hpp>
+#include <string>
+
+namespace Gosu
+{
+    //! TextInput instances are invisible objects that build a text string from input,
+    //! using the current operating system's keyboard layout.
+    //! At its most basic form, you only need to create a new TextInput instance and
+    //! pass it to your window via setTextInput. Until you call this function again,
+    //! passing 0, the TextInput object will build a text that can be accessed via
+    //! TextInput::text().
+    //! A TextInput object is purely abstract, though; drawing the input field is left
+    //! to the user. As with most of Gosu, how this is handled is completely left open.
+    //! TextInput only aims to provide enough code for your own GUIs to build upon.
+    class TextInput
+    {
+        struct Impl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+    #if defined(GOSU_CPP11_ENABLED)
+        TextInput(TextInput&&) = delete;
+        TextInput& operator=(TextInput&&) = delete;
+        TextInput(const TextInput&) = delete;
+        TextInput& operator=(const TextInput&) = delete;
+    #endif
+        
+    public:
+        TextInput();
+        virtual ~TextInput();
+
+        std::wstring text() const;
+
+        //! Replaces the current text by the given string and positions the cursor
+        //! at the end of the text, with an empty selection.
+        void setText(const std::wstring& text);
+
+        //! Position of the caret as the index of the character that it's left to.
+        unsigned caretPos() const;
+        //! Sets the caret position as returned by caretPos.
+        //! You usually also want to use setSelectionStart.
+        void setCaretPos(unsigned pos);
+
+        //! If there is a selection, the selectionStart() member yields its beginning,
+        //! using the same indexing scheme as caretPos. If there is no selection,
+        //! selectionStart() is equal to caretPos().
+        unsigned selectionStart() const;
+        //! Sets the start of the selection as returned by selectionStart.
+        void setSelectionStart(unsigned pos);
+        
+        // Platform-specific communication with Gosu::Input.
+        bool feedSDLEvent(void* event);
+
+        //! Overridable filter that is applied to all new text that is entered.
+        //! Allows for context-sensitive filtering/extending/... of the text.
+        //! The text will be inserted at caretPos afterwards.
+        virtual std::wstring filter(const std::wstring& text) const
+        {
+            return text;
+        }
+    };
+}
+
+#endif

data/Gosu/Utility.hpp

@@ -1,28 +1,28 @@
-//! \file Utility.hpp
-//! General purpose utility functions.
-
-#ifndef GOSU_UTILITY_HPP
-#define GOSU_UTILITY_HPP
-
-#include <string>
-#include <vector>
-
-namespace Gosu
-{
-    //! Converts an std::string into an std::wstring.
-    std::wstring utf8ToWstring(const std::string& utf8);
-    //! Converts an std::wstring into an std::string.
-    std::string wstringToUTF8(const std::wstring& ws);
-    
-    //! Converts an std::string into an std::wstring using local encoding.
-    std::wstring widen(const std::string& s);
-    //! Converts an std::wstring into an std::string using local encoding.
-    std::string narrow(const std::wstring& ws);
-    
-    //! Returns the user's preferred language, at the moment of calling the function. Expect return
-    //! values such as 'en_US', 'de_DE.UTF-8', 'ja', 'zh-Hans'. You can rely only on the first two letters
-    //! being a common language abbreviation.
-    std::string language();
-}
-
-#endif
+//! \file Utility.hpp
+//! General purpose utility functions.
+
+#ifndef GOSU_UTILITY_HPP
+#define GOSU_UTILITY_HPP
+
+#include <string>
+#include <vector>
+
+namespace Gosu
+{
+    //! Converts an std::string into an std::wstring.
+    std::wstring utf8ToWstring(const std::string& utf8);
+    //! Converts an std::wstring into an std::string.
+    std::string wstringToUTF8(const std::wstring& ws);
+    
+    //! Converts an std::string into an std::wstring using local encoding.
+    std::wstring widen(const std::string& s);
+    //! Converts an std::wstring into an std::string using local encoding.
+    std::string narrow(const std::wstring& ws);
+    
+    //! Returns the user's preferred language, at the moment of calling the function. Expect return
+    //! values such as 'en_US', 'de_DE.UTF-8', 'ja', 'zh-Hans'. You can rely only on the first two letters
+    //! being a common language abbreviation.
+    std::string language();
+}
+
+#endif

data/Gosu/Version.hpp

@@ -1,19 +1,19 @@
-#ifndef GOSU_VERSION_HPP
-#define GOSU_VERSION_HPP
-
-#define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 8
-#define GOSU_POINT_VERSION 6
-#define GOSU_VERSION "0.8.6"
-
-#define GOSU_COPYRIGHT_NOTICE \
-    "This software uses the following third-party libraries:\n" \
-    "\n" \
-    "Gosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\n" \
-    "SDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\n" \
-    "FreeImage, http://freeimage.sourceforge.net, FreeImage Public License\n" \
-    "libogg & libvorbis, http://www.xiph.org, BSD License, 3-Clause Version, http://www.xiph.org/licenses/bsd\n" \
-    "libsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\n" \
-    "OpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"
-  
-#endif
+#ifndef GOSU_VERSION_HPP
+#define GOSU_VERSION_HPP
+
+#define GOSU_MAJOR_VERSION 0
+#define GOSU_MINOR_VERSION 8
+#define GOSU_POINT_VERSION 7
+#define GOSU_VERSION "0.8.7"
+
+#define GOSU_COPYRIGHT_NOTICE \
+    "This software uses the following third-party libraries:\n" \
+    "\n" \
+    "Gosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\n" \
+    "SDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\n" \
+    "FreeImage, http://freeimage.sourceforge.net, FreeImage Public License\n" \
+    "libogg & libvorbis, http://www.xiph.org, BSD License, 3-Clause Version, http://www.xiph.org/licenses/bsd\n" \
+    "libsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\n" \
+    "OpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"
+  
+#endif

data/Gosu/Window.hpp

@@ -1,145 +1,145 @@
-//! \file Window.hpp
-//! Interface of the Window class.
-
-#ifndef GOSU_WINDOW_HPP
-#define GOSU_WINDOW_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/Input.hpp>
-#include <Gosu/TR1.hpp>
-#include <memory>
-#include <string>
-
-#ifdef GOSU_IS_WIN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-#endif
-
-namespace Gosu
-{
-    //! Returns the width (in pixels) of the user's primary screen.
-    unsigned screenWidth();
-    
-    //! Returns the height (in pixels) of the user's primary screen.
-    unsigned screenHeight();
-    
-    //! Returns the maximum width (in 'points') that is available for a non-fullscreen Window.
-    //! All windows larger than this size will automatically be shrunk to fit.
-    unsigned availableWidth();
-    
-    //! Returns the maximum height (in 'points') that is available for a non-fullscreen Window.
-    //! All windows larger than this size will automatically be shrunk to fit.
-    unsigned availableHeight();
-    
-    //! Convenient all-in-one class that serves as the foundation of a standard
-    //! Gosu application. Manages initialization of all of Gosu's core components
-    //! and provides timing functionality.
-    //! Note that you should really only use one instance of this class at the same time.
-    //! This may or may not change later.
-    class Window
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
-        Window(Window&&) = delete;
-        Window& operator=(Window&&) = delete;
-        Window(const Window&) = delete;
-        Window& operator=(const Window&) = delete;
-#endif
-	
-    public:
-        //! Constructs a Window.
-        //! \param width Width of the window in points; that is, pixels on a normal display, and 'virtual pixels' on a
-        //! high-resolution display.
-        //! \param height See width.
-        //! \param updateInterval Interval in milliseconds between two calls
-        //! to the update member function.
-        Window(unsigned width, unsigned height, bool fullscreen,
-            double updateInterval = 16.666666);
-        virtual ~Window();
-
-        std::wstring caption() const;
-        void setCaption(const std::wstring& caption);
-        
-        double updateInterval() const;
-
-        //! Enters a modal loop where the Window is visible on screen and
-        //! receives calls to draw, update etc.
-        void show();
-        //! Closes the window if it is currently shown.
-        void close();
-
-        //! Called every updateInterval milliseconds while the window is being
-        //! shown. Your application's main game logic goes here.
-        virtual void update() {}
-        //! Called after every update and when the OS wants the window to
-        //! repaint itself. Your application's rendering code goes here.
-        virtual void draw() {}
-        
-        //! Gives the game a chance to say no to being redrawn.
-        //! This is not a definitive answer. The operating system can still force
-        //! the window to redraw itself.
-        //! By default, the window is redrawn all the time.
-        virtual bool needsRedraw() const { return true; }
-
-        //! If this function returns true, the system arrow cursor is drawn while
-        //! over the window.
-        virtual bool needsCursor() const { return false; }
-        
-        //! This function is called when the window loses focus on some platforms.
-        //! Most importantly, it is called on the iPhone or iPad when the user
-        //! locks the screen.
-        virtual void loseFocus() {}
-        
-        //! This function is called when the operating system's memory is low.
-        //! So far, it is only called in iOS applications.
-        virtual void releaseMemory() {}
-
-        //! Called before update when the user pressed a button while the
-        //! window had the focus.
-        virtual void buttonDown(Gosu::Button) {}
-        //! Same as buttonDown. Called then the user released a button.
-        virtual void buttonUp(Gosu::Button) {}
-        
-        // Ignore when SWIG is wrapping this class for Ruby/Gosu.
-        #ifndef SWIG
-        
-        const Graphics& graphics() const;
-        Graphics& graphics();
-        
-        const Input& input() const;
-        Input& input();
-        
-        #ifdef GOSU_IS_UNIX
-        // Context for creating shared contexts.
-        // Only on Unices (so far).
-        typedef std::tr1::shared_ptr<std::tr1::function<void()> > SharedContext;
-        SharedContext createSharedContext();
-        #endif
-        
-        #ifdef GOSU_IS_IPHONE
-        void* rootViewController() const;
-        // iPhone-only callbacks for touch events.
-        // Note that it does not hurt to override them even if you compile
-        // for another platform; if you don't specify "virtual" the code
-        // should even be stripped away cleanly.
-        virtual void touchBegan(Touch touch) {}
-        virtual void touchMoved(Touch touch) {}
-        virtual void touchEnded(Touch touch) {}
-        #endif        
-        
-        const Audio& audio() const;
-        Audio& audio();
-
-        #endif
-    };
-}
-
-#ifdef GOSU_IS_IPHONE
-Gosu::Window& windowInstance();
-#endif
-
-#endif
+//! \file Window.hpp
+//! Interface of the Window class.
+
+#ifndef GOSU_WINDOW_HPP
+#define GOSU_WINDOW_HPP
+
+#include <Gosu/Fwd.hpp>
+#include <Gosu/Platform.hpp>
+#include <Gosu/Input.hpp>
+#include <Gosu/TR1.hpp>
+#include <memory>
+#include <string>
+
+#ifdef GOSU_IS_WIN
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#endif
+
+namespace Gosu
+{
+    //! Returns the width (in pixels) of the user's primary screen.
+    unsigned screenWidth();
+    
+    //! Returns the height (in pixels) of the user's primary screen.
+    unsigned screenHeight();
+    
+    //! Returns the maximum width (in 'points') that is available for a non-fullscreen Window.
+    //! All windows larger than this size will automatically be shrunk to fit.
+    unsigned availableWidth();
+    
+    //! Returns the maximum height (in 'points') that is available for a non-fullscreen Window.
+    //! All windows larger than this size will automatically be shrunk to fit.
+    unsigned availableHeight();
+    
+    //! Convenient all-in-one class that serves as the foundation of a standard
+    //! Gosu application. Manages initialization of all of Gosu's core components
+    //! and provides timing functionality.
+    //! Note that you should really only use one instance of this class at the same time.
+    //! This may or may not change later.
+    class Window
+    {
+        struct Impl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        Window(Window&&) = delete;
+        Window& operator=(Window&&) = delete;
+        Window(const Window&) = delete;
+        Window& operator=(const Window&) = delete;
+#endif
+	
+    public:
+        //! Constructs a Window.
+        //! \param width Width of the window in points; that is, pixels on a normal display, and 'virtual pixels' on a
+        //! high-resolution display.
+        //! \param height See width.
+        //! \param updateInterval Interval in milliseconds between two calls
+        //! to the update member function.
+        Window(unsigned width, unsigned height, bool fullscreen,
+            double updateInterval = 16.666666);
+        virtual ~Window();
+
+        std::wstring caption() const;
+        void setCaption(const std::wstring& caption);
+        
+        double updateInterval() const;
+
+        //! Enters a modal loop where the Window is visible on screen and
+        //! receives calls to draw, update etc.
+        void show();
+        //! Closes the window if it is currently shown.
+        void close();
+
+        //! Called every updateInterval milliseconds while the window is being
+        //! shown. Your application's main game logic goes here.
+        virtual void update() {}
+        //! Called after every update and when the OS wants the window to
+        //! repaint itself. Your application's rendering code goes here.
+        virtual void draw() {}
+        
+        //! Gives the game a chance to say no to being redrawn.
+        //! This is not a definitive answer. The operating system can still force
+        //! the window to redraw itself.
+        //! By default, the window is redrawn all the time.
+        virtual bool needsRedraw() const { return true; }
+
+        //! If this function returns true, the system arrow cursor is drawn while
+        //! over the window.
+        virtual bool needsCursor() const { return false; }
+        
+        //! This function is called when the window loses focus on some platforms.
+        //! Most importantly, it is called on the iPhone or iPad when the user
+        //! locks the screen.
+        virtual void loseFocus() {}
+        
+        //! This function is called when the operating system's memory is low.
+        //! So far, it is only called in iOS applications.
+        virtual void releaseMemory() {}
+
+        //! Called before update when the user pressed a button while the
+        //! window had the focus.
+        virtual void buttonDown(Gosu::Button) {}
+        //! Same as buttonDown. Called then the user released a button.
+        virtual void buttonUp(Gosu::Button) {}
+        
+        // Ignore when SWIG is wrapping this class for Ruby/Gosu.
+        #ifndef SWIG
+        
+        const Graphics& graphics() const;
+        Graphics& graphics();
+        
+        const Input& input() const;
+        Input& input();
+        
+        #ifdef GOSU_IS_UNIX
+        // Context for creating shared contexts.
+        // Only on Unices (so far).
+        typedef std::tr1::shared_ptr<std::tr1::function<void()> > SharedContext;
+        SharedContext createSharedContext();
+        #endif
+        
+        #ifdef GOSU_IS_IPHONE
+        void* rootViewController() const;
+        // iPhone-only callbacks for touch events.
+        // Note that it does not hurt to override them even if you compile
+        // for another platform; if you don't specify "virtual" the code
+        // should even be stripped away cleanly.
+        virtual void touchBegan(Touch touch) {}
+        virtual void touchMoved(Touch touch) {}
+        virtual void touchEnded(Touch touch) {}
+        #endif        
+        
+        GOSU_DEPRECATED const Audio& audio() const;
+        GOSU_DEPRECATED Audio& audio();
+
+        #endif
+    };
+}
+
+#ifdef GOSU_IS_IPHONE
+Gosu::Window& windowInstance();
+#endif
+
+#endif