Updated version number

Added sfRenderTexture_set/isRepeated

CMakeLists.txt

@@ -15,7 +15,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake)
 
 # setup version numbers
 set(VERSION_MAJOR 2)
-set(VERSION_MINOR 0)
+set(VERSION_MINOR 1)
 set(VERSION_PATCH 0)
 
 # add the CSFML header path
@@ -58,3 +58,4 @@ install(DIRECTORY include
         COMPONENT devel
         PATTERN ".svn" EXCLUDE)
 install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR})
+install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR})

doc/CMakeLists.txt

@@ -29,8 +29,6 @@ configure_file(${DOXYGEN_INPUT_DIR}/doc/doxyfile.in ${DOXYGEN_CONFIGURED_INPUT}
 
 # copy the files needed by the documentation
 configure_file(${DOXYGEN_INPUT_DIR}/doc/doxygen.css ${DOXYGEN_OUTPUT_DIR}/html/doxygen.css COPYONLY)
-configure_file(${DOXYGEN_INPUT_DIR}/doc/logo.jpg    ${DOXYGEN_OUTPUT_DIR}/html/logo.jpg    COPYONLY)
-configure_file(${DOXYGEN_INPUT_DIR}/doc/logo-bg.jpg ${DOXYGEN_OUTPUT_DIR}/html/logo-bg.jpg COPYONLY)
 
 # target setup
 add_custom_target(doc ALL

doc/footer.htm

@@ -1,8 +1,9 @@
-
-        <p id="footer">
-            &nbsp;::&nbsp; Copyright &copy; 2007 Laurent Gomila, all rights reserved &nbsp;::&nbsp;
-            Documentation generated by <a href="http://www.doxygen.org/" title="doxygen website">doxygen 1.5.2</a> &nbsp;::&nbsp;
-        </p>
-
+        </div>
+        <div id="footer-container">
+            <div id="footer">
+                Copyright © Laurent Gomila &nbsp;::&nbsp;
+                Documentation generated by <a href="http://www.doxygen.org/" title="doxygen website">doxygen</a> &nbsp;::&nbsp;
+            </div>
+        </div>
     </body>
 </html>

doc/header.htm

@@ -1,12 +1,15 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <title>SFML - Simple and Fast Multimedia Library</title>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-        <link href="doxygen.css" rel="stylesheet" type="text/css" />
-        <link href="tabs.css" rel="stylesheet" type="text/css" />
+        <title>CSFML - C binding of the Simple and Fast Multimedia Library</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+        <!--<link rel='stylesheet' type='text/css' href="http://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic"/>-->
+        <link rel="stylesheet" type="text/css" href="doxygen.css" title="default" media="screen,print" />
     </head>
     <body>
-        <div id="logo">
-            <img src="./logo.jpg" width="770" height="200" title="SFML home" alt="SFML logo" />
+        <div id="banner-container">
+            <div id="banner">
+                <span id="sfml">CSFML</span>
+            </div>
         </div>
+        <div id="content">

include/SFML/Config.h

@@ -30,7 +30,7 @@
 // Define the CSFML version
 ////////////////////////////////////////////////////////////
 #define CSFML_VERSION_MAJOR 2
-#define CSFML_VERSION_MINOR 0
+#define CSFML_VERSION_MINOR 1
 
 
 ////////////////////////////////////////////////////////////

include/SFML/Graphics/RenderTexture.h

@@ -296,5 +296,23 @@ CSFML_GRAPHICS_API void sfRenderTexture_setSmooth(sfRenderTexture* renderTexture
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfBool sfRenderTexture_isSmooth(const sfRenderTexture* renderTexture);
 
+////////////////////////////////////////////////////////////
+/// \brief Enable or disable texture repeating
+///
+/// \param renderTexture Render texture object
+/// \param repeated      sfTrue to enable repeating, sfFalse to disable it
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfRenderTexture_setRepeated(sfRenderTexture* renderTexture, sfBool repeated);
+
+////////////////////////////////////////////////////////////
+/// \brief Tell whether the texture is repeated or not
+///
+/// \param renderTexture Render texture object
+///
+/// \return sfTrue if repeat mode is enabled, sfFalse if it is disabled
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfRenderTexture_isRepeated(const sfRenderTexture* renderTexture);
 
 #endif // SFML_RENDERTEXTURE_H

include/SFML/Network/TcpListener.h

@@ -112,6 +112,10 @@ CSFML_NETWORK_API sfSocketStatus sfTcpListener_listen(sfTcpListener* listener, u
 /// If the socket is in blocking mode, this function will
 /// not return until a connection is actually received.
 ///
+/// The \a connected argument points to a valid sfTcpSocket pointer
+/// in case of success (the function returns sfSocketDone), it points
+/// to a NULL pointer otherwise.
+///
 /// \param listener  TCP listener object
 /// \param connected Socket that will hold the new connection
 ///

readme.txt

@@ -20,8 +20,8 @@ Learn
 -----
 
 There is no tutorial for CSFML, but since it's a binding you can use the C++ resources:
-* The official tutorials (http://www.sfml-dev.org/tutorials.php)
-* The online API documentation (http://www.sfml-dev.org/documentation.php)
+* The official tutorials (http://www.sfml-dev.org/resources.php#tutorials)
+* The online API documentation (http://www.sfml-dev.org/resources.php#documentation)
 * The community wiki (https://github.com/LaurentGomila/SFML/wiki/)
 * The community forum (http://en.sfml-dev.org/forums/) (or http://fr.sfml-dev.org/forums/ for french people)
 

src/SFML/Graphics/RenderTexture.cpp

@@ -268,3 +268,16 @@ sfBool sfRenderTexture_isSmooth(const sfRenderTexture* renderTexture)
 {
     CSFML_CALL_RETURN(renderTexture, isSmooth(), sfFalse);
 }
+
+////////////////////////////////////////////////////////////
+void sfRenderTexture_setRepeated(sfRenderTexture* renderTexture, sfBool repeated)
+{
+    CSFML_CALL(renderTexture, setRepeated(repeated == sfTrue));
+}
+
+
+////////////////////////////////////////////////////////////
+sfBool sfRenderTexture_isRepeated(const sfRenderTexture* renderTexture)
+{
+    CSFML_CALL_RETURN(renderTexture, isRepeated(), sfFalse);
+}

src/SFML/Network/TcpListener.cpp

@@ -82,5 +82,13 @@ sfSocketStatus sfTcpListener_accept(sfTcpListener* listener, sfTcpSocket** conne
     CSFML_CHECK_RETURN(connected, sfSocketError);
 
     *connected = new sfTcpSocket;
-    return static_cast<sfSocketStatus>(listener->This.accept((*connected)->This));
+    sfSocketStatus status = static_cast<sfSocketStatus>(listener->This.accept((*connected)->This));
+
+    if (status != sfSocketDone)
+    {
+        delete *connected;
+        *connected = NULL;
+    }
+
+    return status;
 }