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

data/Gosu/Sockets.hpp

@@ -1,156 +1,156 @@
-//! \file Sockets.hpp
-//! Interface of the three socket classes, MessageSocket, CommSocket and ListenerSocket.
-
-#ifndef GOSU_SOCKETS_HPP
-#define GOSU_SOCKETS_HPP
-
-#include <Gosu/TR1.hpp>
-#include <cstddef>
-#include <string>
-#include <Gosu/Platform.hpp>
-
-namespace Gosu
-{
-    //! Addresses are returned from and given to Gosu functions in host byte order.
-    typedef std::tr1::uint32_t SocketAddress;
-
-    //! Ports are returned from and given to Gosu functions in host byte order.
-    typedef std::tr1::uint16_t SocketPort;
-    
-    //! Constant that can be used as a placeholder for an arbitrary port, e.g. when
-    //! starting to listen.
-    const SocketPort anyPort = 0;
-    
-    //! Tries to convert a dotted IP4 string into an address suitable for
-    //! socket functions. If the string supplied is not such a string, it
-    //! tries to look up the host via DNS. If both methods fail, zero is
-    //! returned.
-    SocketAddress stringToAddress(const std::string& s);
-    //! Converts an address into a dotted IP4 string.
-    std::string addressToString(SocketAddress address);
-
-    //! Wraps an UDP socket. Message sockets can send data to and receive
-    //! data from arbitrary addresses. Also, message sockets send messages
-    //! (packets) which are limited in size and can arrive in any order, or
-    //! not at all.
-    class MessageSocket
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
-        MessageSocket(const MessageSocket&) = delete;
-        MessageSocket& operator=(const MessageSocket&) = delete;
-        MessageSocket(MessageSocket&&) = delete;
-        MessageSocket& operator=(MessageSocket&&) = delete;
-#endif
-
-    public:
-        //! Opens a message socket for listening at the specified port.
-        //! Gosu::anyPort may be passed to have the message socket use
-        //! a random free port.
-        explicit MessageSocket(SocketPort port);
-        ~MessageSocket();
-
-        //! Returns the local address of the socket.
-        SocketAddress address() const;
-        //! Returns the local port of the socket.
-        SocketPort port() const;
-        //! Returns the maximum size, in bytes, of a packet that can be sent
-        //! from this socket.
-        std::size_t maxMessageSize() const;
-
-        //! Collects all the packets that were sent to this socket and
-        //! calls onReceive for each of them.
-        void update();
-
-        //! Sends something to the given port of the computer identified
-        //! by the address.
-        void send(SocketAddress address, SocketPort port,
-            const void* buffer, std::size_t size);
-        /*void broadcast(SocketPort port, const void* buffer,
-            std::size_t size);*/
-
-        //! If assigned, will be called by update for every packet received.
-        std::tr1::function<void (SocketAddress, SocketPort, const void*,
-            std::size_t)> onReceive;
-    };
-    
-    //! Defines the way in which data is collected until the onReceive event
-    //! is called for CommSockets.
-    enum CommMode
-    {
-        cmRaw,
-        //cmLines,
-        cmManaged
-    };
-    
-    class Socket;
-    
-    //! Wraps a TCP socket that is used for one part of bi-directional
-    //! communication.
-    class CommSocket
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
-        CommSocket(const CommSocket&) = delete;
-        CommSocket& operator=(const CommSocket&) = delete;
-        CommSocket(CommSocket&&) = delete;
-        CommSocket& operator=(CommSocket&&) = delete;
-#endif
-
-    public:
-        CommSocket(CommMode mode, SocketAddress targetAddress,
-            SocketPort targetPort);
-        CommSocket(CommMode mode, Socket& socket);
-        ~CommSocket();
-
-        SocketAddress address() const;
-        SocketPort port() const;
-        SocketAddress remoteAddress() const;
-        SocketPort remotePort() const;
-        CommMode mode() const;
-
-        bool connected() const;
-        void disconnect();
-        bool keepAlive() const;
-        void setKeepAlive(bool value);
-
-        void update();
-        void send(const void* buffer, std::size_t size);
-        void sendPendingData();
-        std::size_t pendingBytes() const;
-
-        std::tr1::function<void (const void*, std::size_t)> onReceive;
-        std::tr1::function<void ()> onDisconnection;
-    };
-    
-    //! Wraps a TCP socket that waits on a specific port and can create
-    //! CommSocket instances via its onConnection event.
-    class ListenerSocket
-    {
-        struct Impl;
-        const GOSU_UNIQUE_PTR<Impl> pimpl;
-#if defined(GOSU_CPP11_ENABLED)
-        ListenerSocket(const ListenerSocket&) = delete;
-        ListenerSocket& operator=(const ListenerSocket&) = delete;
-        ListenerSocket(ListenerSocket&&) = delete;
-        ListenerSocket& operator=(ListenerSocket&&) = delete;
-#endif
-
-    public:
-        ListenerSocket(SocketPort port);
-        ~ListenerSocket();
-
-        SocketAddress address() const;
-        SocketPort port() const;
-
-        void update();
-
-        //! This signal is fired by update() whenever someone connects
-        //! to the port which is currently listened on.
-        std::tr1::function<void (Socket&)> onConnection;
-    };
-}
-
-#endif
+//! \file Sockets.hpp
+//! Interface of the three socket classes, MessageSocket, CommSocket and ListenerSocket.
+
+#ifndef GOSU_SOCKETS_HPP
+#define GOSU_SOCKETS_HPP
+
+#include <Gosu/TR1.hpp>
+#include <cstddef>
+#include <string>
+#include <Gosu/Platform.hpp>
+
+namespace Gosu
+{
+    //! Addresses are returned from and given to Gosu functions in host byte order.
+    typedef std::tr1::uint32_t SocketAddress;
+
+    //! Ports are returned from and given to Gosu functions in host byte order.
+    typedef std::tr1::uint16_t SocketPort;
+    
+    //! Constant that can be used as a placeholder for an arbitrary port, e.g. when
+    //! starting to listen.
+    const SocketPort anyPort = 0;
+    
+    //! Tries to convert a dotted IP4 string into an address suitable for
+    //! socket functions. If the string supplied is not such a string, it
+    //! tries to look up the host via DNS. If both methods fail, zero is
+    //! returned.
+    SocketAddress stringToAddress(const std::string& s);
+    //! Converts an address into a dotted IP4 string.
+    std::string addressToString(SocketAddress address);
+
+    //! Wraps an UDP socket. Message sockets can send data to and receive
+    //! data from arbitrary addresses. Also, message sockets send messages
+    //! (packets) which are limited in size and can arrive in any order, or
+    //! not at all.
+    class MessageSocket
+    {
+        struct Impl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        MessageSocket(const MessageSocket&) = delete;
+        MessageSocket& operator=(const MessageSocket&) = delete;
+        MessageSocket(MessageSocket&&) = delete;
+        MessageSocket& operator=(MessageSocket&&) = delete;
+#endif
+
+    public:
+        //! Opens a message socket for listening at the specified port.
+        //! Gosu::anyPort may be passed to have the message socket use
+        //! a random free port.
+        explicit MessageSocket(SocketPort port);
+        ~MessageSocket();
+
+        //! Returns the local address of the socket.
+        SocketAddress address() const;
+        //! Returns the local port of the socket.
+        SocketPort port() const;
+        //! Returns the maximum size, in bytes, of a packet that can be sent
+        //! from this socket.
+        std::size_t maxMessageSize() const;
+
+        //! Collects all the packets that were sent to this socket and
+        //! calls onReceive for each of them.
+        void update();
+
+        //! Sends something to the given port of the computer identified
+        //! by the address.
+        void send(SocketAddress address, SocketPort port,
+            const void* buffer, std::size_t size);
+        /*void broadcast(SocketPort port, const void* buffer,
+            std::size_t size);*/
+
+        //! If assigned, will be called by update for every packet received.
+        std::tr1::function<void (SocketAddress, SocketPort, const void*,
+            std::size_t)> onReceive;
+    };
+    
+    //! Defines the way in which data is collected until the onReceive event
+    //! is called for CommSockets.
+    enum CommMode
+    {
+        cmRaw,
+        //cmLines,
+        cmManaged
+    };
+    
+    class Socket;
+    
+    //! Wraps a TCP socket that is used for one part of bi-directional
+    //! communication.
+    class CommSocket
+    {
+        struct Impl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        CommSocket(const CommSocket&) = delete;
+        CommSocket& operator=(const CommSocket&) = delete;
+        CommSocket(CommSocket&&) = delete;
+        CommSocket& operator=(CommSocket&&) = delete;
+#endif
+
+    public:
+        CommSocket(CommMode mode, SocketAddress targetAddress,
+            SocketPort targetPort);
+        CommSocket(CommMode mode, Socket& socket);
+        ~CommSocket();
+
+        SocketAddress address() const;
+        SocketPort port() const;
+        SocketAddress remoteAddress() const;
+        SocketPort remotePort() const;
+        CommMode mode() const;
+
+        bool connected() const;
+        void disconnect();
+        bool keepAlive() const;
+        void setKeepAlive(bool value);
+
+        void update();
+        void send(const void* buffer, std::size_t size);
+        void sendPendingData();
+        std::size_t pendingBytes() const;
+
+        std::tr1::function<void (const void*, std::size_t)> onReceive;
+        std::tr1::function<void ()> onDisconnection;
+    };
+    
+    //! Wraps a TCP socket that waits on a specific port and can create
+    //! CommSocket instances via its onConnection event.
+    class ListenerSocket
+    {
+        struct Impl;
+        const GOSU_UNIQUE_PTR<Impl> pimpl;
+#if defined(GOSU_CPP11_ENABLED)
+        ListenerSocket(const ListenerSocket&) = delete;
+        ListenerSocket& operator=(const ListenerSocket&) = delete;
+        ListenerSocket(ListenerSocket&&) = delete;
+        ListenerSocket& operator=(ListenerSocket&&) = delete;
+#endif
+
+    public:
+        ListenerSocket(SocketPort port);
+        ~ListenerSocket();
+
+        SocketAddress address() const;
+        SocketPort port() const;
+
+        void update();
+
+        //! This signal is fired by update() whenever someone connects
+        //! to the port which is currently listened on.
+        std::tr1::function<void (Socket&)> onConnection;
+    };
+}
+
+#endif

data/Gosu/TR1.hpp

@@ -1,56 +1,56 @@
-//! \file TR1.hpp
-//! Includes all parts of C++03 (TR1) that are relevant for Gosu. It makes available the following members of the std::tr1 namespace: array, bind, function, shared_ptr, uint*_t and int*_t.
-
-#ifndef GOSU_TR1_HPP
-#define GOSU_TR1_HPP
-
-#include <memory>
-
-#if defined(_MSC_VER) || defined(_LIBCPP_MEMORY)
-    #include <array>
-    #include <functional>
-    namespace std
-    {
-        namespace tr1
-        {
-            typedef unsigned char uint8_t;
-            typedef unsigned short uint16_t;
-            typedef unsigned int uint32_t;
-            typedef unsigned long long uint64_t;
-            typedef signed char int8_t;
-            typedef signed short int16_t;
-            typedef signed int int32_t;
-            typedef signed long long int64_t;
-            
-            #ifdef _LIBCPP_MEMORY
-            namespace placeholders
-            {
-                using namespace std::placeholders;
-            }
-            using std::array;
-            using std::bind;
-            using std::function;
-            using std::shared_ptr;
-            #endif
-        }        
-    }
-#else
-    #include <tr1/array>
-    #include <tr1/memory>
-    #include <tr1/functional>
-    #if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC_MINOR__ < 2)
-        #include <stdint.h>
-        namespace std
-        {
-            namespace tr1
-            {
-                using ::int8_t; using ::int16_t; using ::int32_t; using ::int64_t;
-                using ::uint8_t; using ::uint16_t; using ::uint32_t; using ::uint64_t;
-            }
-        }
-    #else
-        #include <tr1/cstdint>
-    #endif
-#endif
-
-#endif
+//! \file TR1.hpp
+//! Includes all parts of C++03 (TR1) that are relevant for Gosu. It makes available the following members of the std::tr1 namespace: array, bind, function, shared_ptr, uint*_t and int*_t.
+
+#ifndef GOSU_TR1_HPP
+#define GOSU_TR1_HPP
+
+#include <memory>
+
+#if defined(_MSC_VER) || defined(_LIBCPP_MEMORY)
+    #include <array>
+    #include <functional>
+    namespace std
+    {
+        namespace tr1
+        {
+            typedef unsigned char uint8_t;
+            typedef unsigned short uint16_t;
+            typedef unsigned int uint32_t;
+            typedef unsigned long long uint64_t;
+            typedef signed char int8_t;
+            typedef signed short int16_t;
+            typedef signed int int32_t;
+            typedef signed long long int64_t;
+            
+            #ifdef _LIBCPP_MEMORY
+            namespace placeholders
+            {
+                using namespace std::placeholders;
+            }
+            using std::array;
+            using std::bind;
+            using std::function;
+            using std::shared_ptr;
+            #endif
+        }        
+    }
+#else
+    #include <tr1/array>
+    #include <tr1/memory>
+    #include <tr1/functional>
+    #if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC_MINOR__ < 2)
+        #include <stdint.h>
+        namespace std
+        {
+            namespace tr1
+            {
+                using ::int8_t; using ::int16_t; using ::int32_t; using ::int64_t;
+                using ::uint8_t; using ::uint16_t; using ::uint32_t; using ::uint64_t;
+            }
+        }
+    #else
+        #include <tr1/cstdint>
+    #endif
+#endif
+
+#endif

data/Gosu/Text.hpp

@@ -1,71 +1,71 @@
-//! \file Text.hpp
-//! Functions to output text on bitmaps.
-
-#ifndef GOSU_TEXT_HPP
-#define GOSU_TEXT_HPP
-
-#include <Gosu/Fwd.hpp>
-#include <Gosu/Color.hpp>
-#include <Gosu/GraphicsBase.hpp>
-#include <string>
-
-namespace Gosu
-{
-    //! Returns the name of a neutral font that is available on the current
-    //! platform.
-    std::wstring defaultFontName();
-
-    //! Returns the width an unformatted line of text would span on a bitmap if it were drawn using
-    //! drawText with the same arguments. This is a very low-level function that does not understand
-    //! any of Gosu's HTML-like markup.
-    //! \param text Unformatted text.
-    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
-    unsigned textWidth(const std::wstring& text,
-        const std::wstring& fontName, unsigned fontHeight,
-        unsigned fontFlags = 0);
-
-    //! Draws a line of unformatted text on a bitmap. This is a very low-level function that does not understand
-    //! any of Gosu's HTML-like markup.
-    //! \param text Unformatted text.
-    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
-    //! \param fontHeight Height, in pixels, of the text.
-    //! \param fontFlags Binary combination of members of the FontFlags
-    //! enum.
-    void drawText(Bitmap& bitmap, const std::wstring& text, int x, int y,
-        Color c, const std::wstring& fontName, unsigned fontHeight,
-        unsigned fontFlags = 0);
-
-    //! Creates a bitmap that is filled with a line of formatted text given to the function.
-    //! The line can contain line breaks and HTML-like markup.
-    //! \param text Formatted text.
-    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
-    //! \param fontHeight Height of the font in pixels.
-    //! \param fontFlags Binary combination of members of the FontFlags
-    //! enum.
-    Bitmap createText(const std::wstring& text,
-        const std::wstring& fontName, unsigned fontHeight,
-        unsigned fontFlags = 0);
-
-    //! Creates a bitmap that is filled with the formatted text given to the function.
-    //! The line can contain line breaks and HTML-like markup.
-    //! \param text Formatted text.
-    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
-    //! \param fontHeight Height of the font in pixels.
-    //! \param lineSpacing Spacing between two lines of text in pixels. Can be negative to make
-    //! text stick together more closely.
-    //! \param width Width of the bitmap that will be returned. Text
-    //! will be split into multiple lines to avoid drawing over the right
-    //! border. When a single word is too long, it will be truncated.
-    //! \param fontFlags Binary combination of members of the FontFlags
-    //! enum.
-    Bitmap createText(const std::wstring& text,
-        const std::wstring& fontName, unsigned fontHeight, 
-        int lineSpacing, unsigned width, TextAlign align,
-        unsigned fontFlags = 0);
-    
-    //! Registers a new HTML-style entity that can subsequently be used
-    //! with Gosu::Font and Gosu::createText. The name is given without & and ;.
-    void registerEntity(const std::wstring& name, const Bitmap& replacement);
-}
-
-#endif
+//! \file Text.hpp
+//! Functions to output text on bitmaps.
+
+#ifndef GOSU_TEXT_HPP
+#define GOSU_TEXT_HPP
+
+#include <Gosu/Fwd.hpp>
+#include <Gosu/Color.hpp>
+#include <Gosu/GraphicsBase.hpp>
+#include <string>
+
+namespace Gosu
+{
+    //! Returns the name of a neutral font that is available on the current
+    //! platform.
+    std::wstring defaultFontName();
+
+    //! Returns the width an unformatted line of text would span on a bitmap if it were drawn using
+    //! drawText with the same arguments. This is a very low-level function that does not understand
+    //! any of Gosu's HTML-like markup.
+    //! \param text Unformatted text.
+    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
+    unsigned textWidth(const std::wstring& text,
+        const std::wstring& fontName, unsigned fontHeight,
+        unsigned fontFlags = 0);
+
+    //! Draws a line of unformatted text on a bitmap. This is a very low-level function that does not understand
+    //! any of Gosu's HTML-like markup.
+    //! \param text Unformatted text.
+    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
+    //! \param fontHeight Height, in pixels, of the text.
+    //! \param fontFlags Binary combination of members of the FontFlags
+    //! enum.
+    void drawText(Bitmap& bitmap, const std::wstring& text, int x, int y,
+        Color c, const std::wstring& fontName, unsigned fontHeight,
+        unsigned fontFlags = 0);
+
+    //! Creates a bitmap that is filled with a line of formatted text given to the function.
+    //! The line can contain line breaks and HTML-like markup.
+    //! \param text Formatted text.
+    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
+    //! \param fontHeight Height of the font in pixels.
+    //! \param fontFlags Binary combination of members of the FontFlags
+    //! enum.
+    Bitmap createText(const std::wstring& text,
+        const std::wstring& fontName, unsigned fontHeight,
+        unsigned fontFlags = 0);
+
+    //! Creates a bitmap that is filled with the formatted text given to the function.
+    //! The line can contain line breaks and HTML-like markup.
+    //! \param text Formatted text.
+    //! \param fontName Name of a system font, or a filename to a TTF file (must contain '/').
+    //! \param fontHeight Height of the font in pixels.
+    //! \param lineSpacing Spacing between two lines of text in pixels. Can be negative to make
+    //! text stick together more closely.
+    //! \param width Width of the bitmap that will be returned. Text
+    //! will be split into multiple lines to avoid drawing over the right
+    //! border. When a single word is too long, it will be truncated.
+    //! \param fontFlags Binary combination of members of the FontFlags
+    //! enum.
+    Bitmap createText(const std::wstring& text,
+        const std::wstring& fontName, unsigned fontHeight, 
+        int lineSpacing, unsigned width, TextAlign align,
+        unsigned fontFlags = 0);
+    
+    //! Registers a new HTML-style entity that can subsequently be used
+    //! with Gosu::Font and Gosu::createText. The name is given without & and ;.
+    void registerEntity(const std::wstring& name, const Bitmap& replacement);
+}
+
+#endif