gosu 0.9.2 → 0.10.0

data/src/Sockets/ListenerSocket.cpp

@@ -1,59 +0,0 @@
-#include <Gosu/Sockets.hpp>
-#include "Socket.hpp"
-#include <cassert>
-#include <cstring>
-
-struct Gosu::ListenerSocket::Impl
-{
-    Socket socket;
-};
-
-Gosu::ListenerSocket::ListenerSocket(SocketPort port)
-: pimpl(new Impl)
-{
-    pimpl->socket.setHandle(socketCheck(::socket(AF_INET, SOCK_STREAM, 0)));
-    pimpl->socket.setBlocking(false);
-
-    int enable = 1;
-    socketCheck(::setsockopt(pimpl->socket.handle(), SOL_SOCKET, SO_REUSEADDR,
-        reinterpret_cast<char*>(&enable), sizeof enable));
-
-    sockaddr_in addr;
-    std::memset(&addr, 0, sizeof addr);
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    addr.sin_port = htons(port);
-    socketCheck(::bind(pimpl->socket.handle(),
-        reinterpret_cast<sockaddr*>(&addr), sizeof addr));
-    socketCheck(::listen(pimpl->socket.handle(), 10));
-}
-
-Gosu::ListenerSocket::~ListenerSocket()
-{
-}
-
-Gosu::SocketAddress Gosu::ListenerSocket::address() const
-{
-    return pimpl->socket.address();
-}
-
-Gosu::SocketPort Gosu::ListenerSocket::port() const
-{
-    return pimpl->socket.port();
-}
-
-void Gosu::ListenerSocket::update()
-{
-    while (onConnection)
-    {
-        SocketHandle newHandle =
-            socketCheck(::accept(pimpl->socket.handle(), 0, 0));
-
-        if (newHandle == INVALID_SOCKET)
-            break;
-
-        Socket newSocket;
-        newSocket.setHandle(newHandle);
-        onConnection(newSocket);
-    }
-}

data/src/Sockets/MessageSocket.cpp

@@ -1,128 +0,0 @@
-#include <Gosu/Sockets.hpp>
-#include "Socket.hpp"
-#include <cassert>
-#include <cstring>
-#include <vector>
-
-struct Gosu::MessageSocket::Impl
-{
-    Socket socket;
-    std::size_t maxMessageSize;
-};
-
-Gosu::MessageSocket::MessageSocket(SocketPort port)
-: pimpl(new Impl)
-{
-    pimpl->socket.setHandle(socketCheck(::socket(AF_INET, SOCK_DGRAM, 0)));
-    pimpl->socket.setBlocking(false);
-    sockaddr_in addr;
-    std::memset(&addr, 0, sizeof addr);
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    addr.sin_port = htons(port);
-    socketCheck(::bind(pimpl->socket.handle(),
-        reinterpret_cast<sockaddr*>(&addr), sizeof addr));
-
-    unsigned maxMessageSize;
-    socklen_t size = sizeof maxMessageSize;
-    #ifdef GOSU_IS_WIN
-    socketCheck(::getsockopt(pimpl->socket.handle(), SOL_SOCKET, SO_MAX_MSG_SIZE,
-        reinterpret_cast<char*>(&maxMessageSize), &size));
-    #else
-    socketCheck(::getsockopt(pimpl->socket.handle(), SOL_SOCKET, SO_SNDBUF,
-        reinterpret_cast<char*>(&maxMessageSize), &size));
-    #endif
-    pimpl->maxMessageSize = maxMessageSize;
-}
-
-Gosu::MessageSocket::~MessageSocket()
-{
-}
-
-Gosu::SocketAddress Gosu::MessageSocket::address() const
-{
-    return pimpl->socket.address();
-}
-
-Gosu::SocketPort Gosu::MessageSocket::port() const
-{
-    return pimpl->socket.port();
-}
-
-std::size_t Gosu::MessageSocket::maxMessageSize() const
-{
-    return pimpl->maxMessageSize;
-}
-
-void Gosu::MessageSocket::update()
-{
-    std::vector<char> buffer(maxMessageSize());
-
-    sockaddr_in addr;
-    socklen_t size = sizeof addr;
-
-    for (;;)
-    {
-        int received = ::recvfrom(pimpl->socket.handle(), &buffer.front(),
-            buffer.size(), 0, reinterpret_cast<sockaddr*>(&addr),
-            &size);
-
-        if (received != SOCKET_ERROR && onReceive)
-        {
-            onReceive(ntohl(addr.sin_addr.s_addr),
-                ntohs(addr.sin_port), &buffer.front(), received);
-        }
-        else switch (lastSocketError())
-        {
-            // Ignore some of the errors.
-            case GOSU_SOCK_ERR(EWOULDBLOCK):
-            case GOSU_SOCK_ERR(ENETDOWN):
-            case GOSU_SOCK_ERR(ENETRESET):
-            case GOSU_SOCK_ERR(ETIMEDOUT):
-            case GOSU_SOCK_ERR(ECONNRESET):
-                return;
-
-            // Everything else is unexpected.
-            default:
-                throwLastSocketError();
-        }
-    }
-}
-
-void Gosu::MessageSocket::send(SocketAddress address, SocketPort port,
-    const void* buffer, std::size_t size)
-{
-    sockaddr_in addr;
-    std::memset(&addr, 0, sizeof addr);
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl(address);
-    addr.sin_port = htons(port);
-
-    int sent = ::sendto(pimpl->socket.handle(),
-        reinterpret_cast<const char*>(buffer), size, 0,
-        reinterpret_cast<sockaddr*>(&addr), sizeof addr);
-
-    if (sent == static_cast<int>(size))
-        return; // Yay, did it!
-
-    assert(sent == SOCKET_ERROR); // Don't expect partial sends.
-
-    switch (lastSocketError())
-    {
-        // Just ignore a lot of errors... this is UDP, right?
-        case GOSU_SOCK_ERR(ENETDOWN):
-        case GOSU_SOCK_ERR(ENETRESET):
-        case GOSU_SOCK_ERR(ENOBUFS):
-        case GOSU_SOCK_ERR(EWOULDBLOCK):
-        case GOSU_SOCK_ERR(EHOSTUNREACH):
-        case GOSU_SOCK_ERR(ECONNABORTED):
-        case GOSU_SOCK_ERR(ECONNRESET):
-        case GOSU_SOCK_ERR(ENETUNREACH):
-        case GOSU_SOCK_ERR(ETIMEDOUT):
-            break;
-
-        // Everything else means more than just another lost packet, though.
-        default:
-            throwLastSocketError();
-    }
-}

data/src/Sockets/Socket.cpp

@@ -1,145 +0,0 @@
-#include <Gosu/Sockets.hpp>
-#include "Socket.hpp"
-#ifdef GOSU_IS_WIN
-#include <Gosu/WinUtility.hpp>
-#endif
-#include <cstdlib>
-#include <cstring>
-#include <algorithm>
-#include <stdexcept>
-
-namespace Gosu
-{
-    namespace
-    {
-        void cleanup()
-        {
-#ifdef GOSU_IS_WIN
-            ::WSACleanup();
-#endif
-        }
-
-        void needsSockLib()
-        {
-#ifdef GOSU_IS_WIN
-            static bool initialized = false;
-            if (!initialized)
-            {
-                WSADATA data;
-                if (::WSAStartup(0x0202, &data) != 0)
-                    throw std::runtime_error("Could not initialize "
-                        "Windows sockets");
-
-                initialized = true;
-                std::atexit(cleanup);
-            }
-#endif
-        }
-    }
-}
-
-int Gosu::lastSocketError()
-{
-#ifdef GOSU_IS_WIN
-    needsSockLib();
-    return ::WSAGetLastError();
-#else
-    return errno;
-#endif
-}
-
-GOSU_NORETURN void Gosu::throwLastSocketError()
-{
-#ifdef GOSU_IS_WIN
-    Win::throwLastError();
-#else
-    throw std::runtime_error(strerror(errno));
-#endif
-}
-
-Gosu::SocketAddress Gosu::stringToAddress(const std::string& s)
-{
-    needsSockLib();
-
-    SocketAddress address;
-
-    // Try to interpret name as an IP number string.
-    address = ntohl(::inet_addr(s.c_str()));
-    if (address != INADDR_NONE)
-        return address;
-
-    // This didn't work: Resolve host name via DNS.
-    hostent* host = ::gethostbyname(s.c_str());
-    if (!host)
-        return 0;
-    in_addr addr = *reinterpret_cast<in_addr*>(host->h_addr_list[0]);
-    return ntohl(addr.s_addr);
-}
-
-std::string Gosu::addressToString(SocketAddress address)
-{
-    needsSockLib();
-
-    in_addr addr;
-    addr.s_addr = htonl(address);
-    return ::inet_ntoa(addr);
-}
-
-Gosu::Socket::Socket()
-: handle_(INVALID_SOCKET)
-{
-    needsSockLib();
-}
-
-Gosu::Socket::~Socket()
-{
-    setHandle(INVALID_SOCKET);
-}
-
-Gosu::SocketHandle Gosu::Socket::handle() const
-{
-    return handle_;
-}
-
-void Gosu::Socket::setHandle(SocketHandle value)
-{
-    if (handle() != INVALID_SOCKET)
-    {
-        ::closesocket(handle());
-    }
-
-    handle_ = value;
-}
-
-void Gosu::Socket::setBlocking(bool value)
-{
-    unsigned long enable = !value;
-    socketCheck(::ioctlsocket(handle(), FIONBIO, &enable));
-}
-
-Gosu::SocketAddress Gosu::Socket::address() const
-{
-    sockaddr_in addr;
-    int size = sizeof addr;
-    socketCheck(::getsockname(handle(),
-        reinterpret_cast<sockaddr*>(&addr),
-        reinterpret_cast<socklen_t*>(&size)));
-
-    return ntohl(addr.sin_addr.s_addr);
-}
-
-Gosu::SocketPort Gosu::Socket::port() const
-{
-    sockaddr_in addr;
-    int size = sizeof addr;
-    socketCheck(::getsockname(handle(),
-        reinterpret_cast<sockaddr*>(&addr),
-        reinterpret_cast<socklen_t*>(&size)));
-
-    return ntohs(addr.sin_port);
-}
-
-void Gosu::Socket::swap(Socket& other)
-{
-    std::swap(handle_, other.handle_);
-}

data/src/Sockets/Socket.hpp

@@ -1,66 +0,0 @@
-#ifndef GOSUIMPL_SOCKETS_HPP
-#define GOSUIMPL_SOCKETS_HPP
-
-#include <Gosu/Platform.hpp>
-
-#ifdef GOSU_IS_WIN
-    #include "winsock2.h"
-    #define GOSU_SOCK_ERR(code) WSA##code
-    namespace Gosu { typedef SOCKET SocketHandle; }
-    typedef int socklen_t;
-#else
-    #include <unistd.h>
-    #include <sys/errno.h>
-    #include <sys/socket.h>
-    #include <netinet/in.h>
-    #include <arpa/inet.h>
-    #include <netdb.h>
-    #include <sys/ioctl.h> 
-    #define GOSU_SOCK_ERR(code) code
-    #define INVALID_SOCKET -1
-    #define SOCKET_ERROR -1
-    #define closesocket close
-    #define ioctlsocket ioctl
-    namespace Gosu { typedef int SocketHandle; }
-#endif
-
-namespace Gosu
-{
-    // Owns a socket and manages library initialization.
-    class Socket    {
-        Socket(const Socket&);
-        Socket& operator=(const Socket&);
-        
-        SocketHandle handle_;
-    public:
-        Socket();
-        ~Socket();
-
-        SocketHandle handle() const;
-        void setHandle(SocketHandle value);
-        void setBlocking(bool value);
-
-        SocketAddress address() const;
-        SocketPort port() const;
-
-        void swap(Socket& other);
-    };
-
-    int lastSocketError();
-    
-    GOSU_NORETURN void throwLastSocketError();
-    
-    template<typename T>
-    T socketCheck(T retVal)
-    {
-        if (retVal == SOCKET_ERROR &&
-            lastSocketError() != GOSU_SOCK_ERR(EWOULDBLOCK))
-        {
-            throwLastSocketError();
-        }
-        
-        return retVal;
-    }
-}
-
-#endif

data/src/WindowTouch.mm

@@ -1,243 +0,0 @@
-#include <Gosu/Window.hpp>
-#include <Gosu/Graphics.hpp>
-#include <Gosu/Audio.hpp>
-#include <Gosu/Input.hpp>
-#include "MacUtility.hpp"
-#include "GosuView.hpp"
-
-#import <CoreGraphics/CoreGraphics.h>
-#import <UIKit/UIKit.h>
-#import <OpenGLES/EAGL.h>
-#import <QuartzCore/QuartzCore.h>
-
-#include <OpenAL/alc.h>
-#include <AudioToolbox/AudioSession.h>
-
-using namespace std::tr1::placeholders;
-
-namespace Gosu
-{
-    static CGRect &screenRect()
-    {
-        static CGRect screenRect = [[UIScreen mainScreen] nativeBounds];
-        return screenRect;
-    }
-    
-    unsigned screenWidth()
-    {
-        return screenRect().size.width;
-    }
-    
-    unsigned screenHeight()
-    {
-        return screenRect().size.height;
-    }
-    
-    ALCcontext *sharedContext();
-}
-
-static void handleAudioInterruption(void *unused, UInt32 inInterruptionState)
-{
-    if (inInterruptionState == kAudioSessionBeginInterruption) {
-        alcMakeContextCurrent(NULL);
-    } else if (inInterruptionState == kAudioSessionEndInterruption) {
-        alcMakeContextCurrent(Gosu::sharedContext());
-    }
-}
-
-int main(int argc, char *argv[])
-{
-    try
-    {
-        [[NSAutoreleasePool alloc] init];
-        return UIApplicationMain(argc, argv, nil, @"GosuAppDelegate");
-    }
-    catch (const std::exception& e)
-    {
-        NSLog(@"Terminating due to C++ exception: %s", e.what());
-        throw;
-    }
-}
-
-class Gosu::Audio {};
-
-struct Gosu::Window::Impl
-{
-    ObjRef<UIWindow> window;
-    ObjRef<GosuViewController> controller;
-    std::auto_ptr<Graphics> graphics;
-    std::auto_ptr<Input> input;
-    double interval;
-};
-
-Gosu::Window& windowInstance();
-
-@interface GosuAppDelegate : NSObject <UIApplicationDelegate>
-@end
-
-namespace
-{
-    // Ugly patching to bridge the C++ and ObjC sides.
-    GosuView* gosuView = nil;
-    bool pausedSong = false;
-    bool paused = false;
-
-    id timerOrDisplayLink = nil;
-}
-
-@implementation GosuAppDelegate
-- (void)setupTimerOrDisplayLink
-{
-    if (timerOrDisplayLink)
-        return;
-    
-    NSInteger targetFPS = round(1000.0 / windowInstance().updateInterval());
-        
-    if (60 % targetFPS != 0) {
-        NSTimer *timer = [NSTimer scheduledTimerWithTimeInterval:windowInstance().updateInterval() / 1000.0 target:self selector:@selector(doTick:) userInfo:nil repeats:YES];
-        
-        timerOrDisplayLink = [timer retain];
-    }
-    else {
-        CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(doTick:)];
-        displayLink.frameInterval = 60 / targetFPS;
-        [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
-        
-        timerOrDisplayLink = [displayLink retain];
-    }
-}
-
-- (void)applicationDidFinishLaunching:(UIApplication *)application
-{
-    [UIApplication sharedApplication].statusBarHidden = YES;
-    [self setupTimerOrDisplayLink];
-    
-    AudioSessionInitialize(NULL, NULL, handleAudioInterruption, NULL);
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application
-{
-	if (Gosu::Song::currentSong()) {
-        Gosu::Song::currentSong()->pause();
-        pausedSong = true;
-    }
-    paused = true;
-    windowInstance().loseFocus();
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-	if (pausedSong) {
-        if (Gosu::Song::currentSong())
-            Gosu::Song::currentSong()->play();
-        pausedSong = false;
-    }
-    paused = false;
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-    [timerOrDisplayLink invalidate];
-    [timerOrDisplayLink release];
-    timerOrDisplayLink = nil;
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-    [self setupTimerOrDisplayLink];
-}
-
-- (void)doTick:(id)sender
-{
-    if (!paused)
-        windowInstance().update();
-    [gosuView drawView];
-    Gosu::Song::update();
-    windowInstance().input().update();
-}
-@end
-
-Gosu::Window::Window(unsigned width, unsigned height,
-    bool fullscreen, double updateInterval)
-: pimpl(new Impl)
-{
-	pimpl->window.reset([[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]);
-    pimpl->controller.reset([[GosuViewController alloc] init]);
-    gosuView = (GosuView*)pimpl->controller.obj().view;
-    pimpl->window.obj().rootViewController = pimpl->controller.obj();
-    
-    pimpl->graphics.reset(new Graphics(screenHeight(), screenWidth(), false));
-    pimpl->graphics->setResolution(width, height);
-    pimpl->input.reset(new Input(gosuView, updateInterval));
-    pimpl->input->onTouchBegan = std::tr1::bind(&Window::touchBegan, this, _1);
-    pimpl->input->onTouchMoved = std::tr1::bind(&Window::touchMoved, this, _1);
-    pimpl->input->onTouchEnded = std::tr1::bind(&Window::touchEnded, this, _1);
-    pimpl->interval = updateInterval;
-
-    // TODO: Get rid of performSelector:withObject:afterDelay:, without causing a C++ static initialization error
-    [pimpl->window.obj() performSelector:@selector(makeKeyAndVisible) withObject:nil afterDelay:0];
-}
-
-Gosu::Window::~Window()
-{
-}
-
-std::wstring Gosu::Window::caption() const
-{
-    return L"";
-}
-
-void Gosu::Window::setCaption(const std::wstring& caption)
-{
-}
-
-double Gosu::Window::updateInterval() const
-{
-    return pimpl->interval;
-}
-
-const Gosu::Graphics& Gosu::Window::graphics() const
-{
-    return *pimpl->graphics;
-}
-
-Gosu::Graphics& Gosu::Window::graphics()
-{
-    return *pimpl->graphics;
-}
-
-const Gosu::Audio& Gosu::Window::audio() const
-{
-    static Gosu::Audio audio;
-    return audio;
-}
-
-Gosu::Audio& Gosu::Window::audio()
-{
-    static Gosu::Audio audio;
-    return audio;
-}
-
-const Gosu::Input& Gosu::Window::input() const
-{
-    return *pimpl->input;
-}
-
-Gosu::Input& Gosu::Window::input()
-{
-    return *pimpl->input;
-}
-
-void Gosu::Window::show()
-{
-}
-
-void Gosu::Window::close()
-{
-    throw std::logic_error("Cannot close windows manually on iOS");
-}
-
-void* Gosu::Window::rootViewController() const
-{
-    return pimpl->controller.get();
-}