Add Network module and make related changes

Author: oprypin

generate/generate.py

@@ -59,7 +59,9 @@ def rename_type(name, var=''):
         'size_t': 'SizeT',
         'sfBool': 'CSFML::Bool',
         'unsigned int': 'Int32',
+        'unsigned short': 'UInt16',
         'float': 'Float32',
+        'double': 'Float64',
         'sfVector2u': 'sfVector2i',
     }.get(name, name)
     if ptr and 'sf' in name:
@@ -117,6 +119,11 @@ def get_doc(indent=0):
     'SoundStatus': 'SoundSource',
     'PrimitiveType': '',
     'WindowStyle': '',
+    'FtpTransferMode': 'Ftp',
+    'FtpStatus': 'FtpResponse',
+    'HttpMethod': 'HttpRequest',
+    'HttpStatus': 'HttpResponse',
+    'SocketStatus': 'Socket',
 }
 def handle_enum(name, items):
     if name is None:
@@ -290,9 +297,16 @@ def handle_function(main, params):
     const = []
     sgn = main_sgn
 
-    for ptype, pname in params:
+    anon_index = 0
+    for i, (ptype, pname) in enumerate(params, 1):
+        if 'wchar_t' in ptype:
+            return
         rtype = rename_type(ptype, pname)
-        rname = rename_identifier(pname) or 'p{}'.format(i)
+        if pname:
+            rname = rename_identifier(pname)
+        else:
+            anon_index += 1
+            rname = 'p{}'.format(anon_index)
         if rtype=='UInt32*':
             rtype = 'Char*'
         elif rtype=='UInt32':
@@ -353,6 +367,9 @@ def handle_function(main, params):
         elif t == 'Int64':
             t = 'Int'
             conv.append('{0} = {0}.to_i64'.format(n))
+        elif t == 'UInt16':
+            t = 'Int'
+            conv.append('{0} = {0}.to_u16'.format(n))
         elif t in ['Vector2f', 'Vector2i']:
             conv.append('{0} = SF.{2}({0}) unless {0}.is_a? {1}'.format(n, t, t.lower()))
             t = None
@@ -384,7 +401,7 @@ def handle_function(main, params):
         obj(cls, '  '+line)
     if aparams:
         lparams = ', '.join(([] if not cut else ['@this' if cls in classes else ('pointerof(cself)' if p1.endswith('*') else 'self')]) + [n for n, t in oparams])
-        if cls not in classes and p1.endswith('*'):
+        if cls in structs and p1.endswith('*'):
             obj(cls, '  cself = self')
     else:
         lparams = ''
@@ -406,6 +423,8 @@ def handle_function(main, params):
         obj(cls, '    result += ptr[i]; i += 1')
         obj(cls, '  end')
         obj(cls, '  result')
+    elif nftype == 'UInt8*' and not nfname.endswith('_ptr'):
+        obj(cls, '  String.new({})'.format(call))
     elif ftype == 'sfBool':
         obj(cls, '  {} != 0'.format(call))
     elif 'Vector2' in ftype:
@@ -585,7 +604,7 @@ def obj(cls, *args):
 ast = parse_file('headers_gen.h')
 Visitor().visit(ast)
 
-deps = {'system': [], 'window': ['system'], 'graphics': ['system', 'window'], 'audio': ['system']}
+deps = {'system': [], 'window': ['system'], 'graphics': ['system', 'window'], 'audio': ['system'], 'network': ['system']}
 for mod, lines in libs.items():
     with open('{}_lib.cr'.format(mod), 'w') as f:
         f.write('\n'.join(lines[0]))

generate/headers.py

@@ -29,8 +29,9 @@
 
 
 src = ['''
-typedef unsigned long sfWindowHandle;
+typedef int sfWindowHandle;
 typedef int size_t;
+typedef int wchar_t;
 ''']
 doc = []
 
@@ -87,7 +88,7 @@ def visit_header(file_path):
     src.append('\n')
 
 
-for m in ['system', 'window', 'graphics', 'audio']:
+for m in ['system', 'window', 'graphics', 'audio', 'network']:
     visit_header('SFML/{}.h'.format(m.capitalize()))
 
 

src/audio_obj.cr

@@ -1190,7 +1190,7 @@ module SF
     # 
     # *Returns*: The name of the default audio capture device (null terminated)
     def self.get_default_device()
-      CSFML.sound_recorder_get_default_device()
+      String.new(CSFML.sound_recorder_get_default_device())
     end
 
     # Set the audio capture device
@@ -1218,7 +1218,7 @@ module SF
     # 
     # *Returns*: The name of the current audio capture device
     def device
-      CSFML.sound_recorder_get_device(@this)
+      String.new(CSFML.sound_recorder_get_device(@this))
     end
 
   end

src/common_obj.cr

@@ -40,7 +40,8 @@ module SF
       # Put the pointer into the wrapper object.
       # The pointer will **not** be freed on GC.
       def self.wrap_ptr(ptr)
-        ptr ? new(ptr, false) : nil
+        #ptr ? new(ptr, false) : nil
+        new(ptr, false)
       end
 
       # Transfer ownership of the pointer to the wrapper object.

src/network.cr

@@ -0,0 +1,87 @@
+# Copyright (C) 2015 Oleh Prypin <[email protected]>
+# 
+# This file is part of CrSFML.
+# 
+# This software is provided 'as-is', without any express or implied
+# warranty. In no event will the authors be held liable for any damages
+# arising from the use of this software.
+# 
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
+# freely, subject to the following restrictions:
+# 
+# 1. The origin of this software must not be misrepresented; you must not
+#    claim that you wrote the original software. If you use this software
+#    in a product, an acknowledgement in the product documentation would be
+#    appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must not be
+#    misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source distribution.
+
+require "./network_lib"
+require "./system"
+
+module SF
+  extend self
+  
+  class Http
+    def initialize(host: String, port=0)
+      initialize()
+      set_host(host, port)
+    end
+    def set_host(host: String)
+      set_host(host, 0)
+    end
+    
+    def send_request(request: SF::HttpRequest)
+      send_request(request, SF.milliseconds(0))
+    end
+  end
+  
+  class HttpRequest
+    def initialize(uri: String, method=HttpRequest::Get, body="")
+      initialize()
+      self.uri = uri
+      self.method = method
+      self.body = body
+    end
+  end
+  
+  class SocketSelector
+    def wait()
+      wait(SF::Time::Zero)
+    end
+  end
+  
+  class TcpSocket
+    def connect(host: IpAddress, port: Int)
+      connect(host, port, SF::Time::Zero)
+    end
+    
+    def send_partial(data: Void*, size: Int): {SocketStatus, Int}
+      r = CSFML.tcp_socket_send_partial(@this, data, CSFML::SizeT.cast(size), out sent)
+      {r, sent}
+    end
+    
+    def receive(data: Void*, max_size: Int): {SocketStatus, Int}
+      r = CSFML.tcp_socket_receive(@this, data, CSFML::SizeT.cast(max_size), out size_received)
+      {r, size_received}
+    end
+  end
+  
+  class TcpListener
+    def accept(): {SocketStatus, TcpSocket}
+      r = CSFML.tcp_listener_accept(@this, out connected)
+      {r, connected}
+    end
+  end
+  
+  class UdpSocket
+    def receive(data: Void*, max_size: Int, size_received: SizeT*, address: IpAddress*, port: UInt16*): {SocketStatus, Int, IpAddress, UInt16}
+      r = CSFML.udp_socket_receive(@this, data, CSFML::SizeT.cast(max_size), out size_received, out address, out port)
+      {r, size_received, address, port}
+    end
+  end
+end
+
+require "./network_obj"