gosu 0.7.10.1

data/GosuImpl/Sockets/Socket.cpp

@@ -0,0 +1,145 @@
+#include <Gosu/Sockets.hpp>
+#include <GosuImpl/Sockets/Sockets.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)
+{
+    u_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/GosuImpl/Sockets/Sockets.hpp

@@ -0,0 +1,66 @@
+#ifndef GOSUIMPL_SOCKETS_HPP
+#define GOSUIMPL_SOCKETS_HPP
+
+#include <Gosu/Platform.hpp>
+#include <boost/utility.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 <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
+    // IMPR: Macros ok?
+    #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 : boost::noncopyable
+    {
+        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/GosuImpl/TextInputMac.mm

@@ -0,0 +1,207 @@
+#include <Gosu/TextInput.hpp>
+#include <Gosu/ButtonsMac.hpp>
+#include <GosuImpl/MacUtility.hpp>
+#include <algorithm>
+#include <vector>
+#include <wctype.h>
+
+#import <Cocoa/Cocoa.h>
+
+// Sometimes macro DSLs aren't evil.
+#define CARET_POS (*_caretPos)
+#define SEL_START (*_selectionStart)
+#define IMPL_WITH_SEL_RESET(selector)           \
+- (void)selector:(id)sender                     \
+{                                               \
+    [self selector##AndModifySelection:sender]; \
+    SEL_START = CARET_POS;                      \
+}
+
+@interface GosuTextInput : NSResponder
+{
+    std::wstring* _text;
+    unsigned* _caretPos;
+    unsigned* _selectionStart;
+}
+@end
+@implementation GosuTextInput
+- (void)insertText:(id)insertString
+{
+    // Delete (overwrite) previous selection.
+    if (CARET_POS != SEL_START)
+    {
+        unsigned min = std::min(CARET_POS, SEL_START);
+        unsigned max = std::max(CARET_POS, SEL_START);
+        _text->erase(_text->begin() + min, _text->begin() + max);
+        CARET_POS = SEL_START = min;
+    }
+    
+    NSString* str = (NSString*)insertString;
+    
+    if ([str length] == 0)
+        return;
+    
+    std::vector<unichar> unibuf([str length]);
+    [str getCharacters: &unibuf[0]];
+    
+    _text->insert(_text->begin() + CARET_POS, unibuf.begin(), unibuf.end());
+    (CARET_POS) += unibuf.size();
+    (SEL_START) = CARET_POS;
+}
+
+// Movement.
+
+- (void)moveLeftAndModifySelection:(id)sender
+{
+    if (CARET_POS > 0)
+        (CARET_POS) -= 1;
+}
+- (void)moveRightAndModifySelection:(id)sender
+{
+    if (CARET_POS < _text->length())
+        (CARET_POS) += 1;
+}
+- (void)moveUpAndModifySelection:(id)sender
+{
+    CARET_POS = 0;
+}
+- (void)moveDownAndModifySelection:(id)sender
+{
+    CARET_POS = _text->length();
+}
+- (void)moveToBeginningOfLineAndModifySelection:(id)sender
+{
+    [self moveUpAndModifySelection: sender];
+}
+- (void)moveToEndOfLineAndModifySelection:(id)sender
+{
+    [self moveDownAndModifySelection: sender];
+}
+- (void)moveToBeginningOfDocumentAndModifySelection:(id)sender
+{
+    [self moveUpAndModifySelection: sender];
+}
+- (void)moveToEndOfDocumentAndModifySelection:(id)sender
+{
+    [self moveDownAndModifySelection: sender];
+}
+- (void)moveWordLeftAndModifySelection:(id)sender
+{
+    if (CARET_POS == _text->length())
+        --CARET_POS;
+    
+    while (CARET_POS > 0 && iswspace(_text->at(CARET_POS - 1)))
+        --CARET_POS;
+
+    while (CARET_POS > 0 && !iswspace(_text->at(CARET_POS - 1)))
+        --CARET_POS;
+}
+- (void)moveWordRightAndModifySelection:(id)sender
+{
+    while (CARET_POS < _text->length() && iswspace(_text->at(CARET_POS)))
+        ++CARET_POS;
+
+    while (CARET_POS < _text->length() && !iswspace(_text->at(CARET_POS)))
+        ++CARET_POS;
+}
+
+IMPL_WITH_SEL_RESET(moveLeft)
+IMPL_WITH_SEL_RESET(moveRight)
+IMPL_WITH_SEL_RESET(moveUp)
+IMPL_WITH_SEL_RESET(moveDown)
+IMPL_WITH_SEL_RESET(moveWordLeft)
+IMPL_WITH_SEL_RESET(moveWordRight)
+IMPL_WITH_SEL_RESET(moveToBeginningOfLine)
+IMPL_WITH_SEL_RESET(moveToEndOfLine)
+IMPL_WITH_SEL_RESET(moveToBeginningOfDocument)
+IMPL_WITH_SEL_RESET(moveToEndOfDocument)
+
+// Deletion.
+
+- (void)deleteBackward:(id)sender
+{
+    if (CARET_POS == SEL_START && CARET_POS > 0)
+        --CARET_POS;
+    [self insertText: @""];
+}
+- (void)deleteForward:(id)sender
+{
+    if (CARET_POS == SEL_START && CARET_POS < _text->length())
+        ++CARET_POS;
+    [self insertText: @""];
+}
+
+// TODO: Advanced deletion (deleteWord...)
+
+// Selection.
+
+- (void)selectAll:(id)sender
+{
+    SEL_START = 0;
+    CARET_POS = _text->length();
+}
+
+// TODO: Cmd+A should really be hard-coded into selectAll.
+
+// Helper to set up this instance.
+
+- (void)setText:(std::wstring&)text andCaretPos:(unsigned&)caretPos andSelectionStart:(unsigned&)selectionStart
+{
+    _text = &text;
+    _caretPos = &caretPos;
+    _selectionStart = &selectionStart;
+}
+@end
+
+struct Gosu::TextInput::Impl
+{
+    ObjRef<GosuTextInput> responder;
+    std::wstring text;
+    unsigned caretPos, selectionStart;
+    Impl() : caretPos(0), selectionStart(0) {}
+};
+
+Gosu::TextInput::TextInput()
+: pimpl(new Impl)
+{
+    pimpl->responder.reset([[GosuTextInput alloc] init]);
+    [pimpl->responder.get() setText: pimpl->text andCaretPos: pimpl->caretPos andSelectionStart: pimpl->selectionStart];
+}
+
+Gosu::TextInput::~TextInput()
+{
+}
+
+std::wstring Gosu::TextInput::text() const
+{
+    return pimpl->text;
+}
+
+void Gosu::TextInput::setText(const std::wstring& text)
+{
+	pimpl->text = text;
+	pimpl->caretPos = pimpl->selectionStart = text.length();
+}
+
+unsigned Gosu::TextInput::caretPos() const
+{
+    return pimpl->caretPos;
+}
+
+unsigned Gosu::TextInput::selectionStart() const
+{
+    return pimpl->selectionStart;
+}
+
+bool Gosu::TextInput::feedNSEvent(void* event)
+{
+	NSEvent* nsEvent = (NSEvent*)event;
+	long keyCode = [nsEvent keyCode];
+	if (keyCode != kbEscape && keyCode != kbTab && keyCode != kbReturn && keyCode != kbEnter)
+	{
+		[pimpl->responder.get() interpretKeyEvents: [NSArray arrayWithObject: nsEvent]];
+		return true;
+	}
+	else
+		return false;
+}

data/GosuImpl/TextInputWin.cpp

@@ -0,0 +1,197 @@
+#include <Gosu/TextInput.hpp>
+#include <Gosu/ButtonsWin.hpp>
+#include <algorithm>
+#include <vector>
+#include <wctype.h>
+
+// OPT-IN, have you heard of it?!
+#define NOMINMAX
+#include <windows.h>
+
+struct Gosu::TextInput::Impl
+{
+    std::wstring text;
+    unsigned caretPos, selectionStart;
+    Impl() : caretPos(0), selectionStart(0) {}
+};
+
+Gosu::TextInput::TextInput()
+: pimpl(new Impl)
+{
+}
+
+Gosu::TextInput::~TextInput()
+{
+}
+
+std::wstring Gosu::TextInput::text() const
+{
+    return pimpl->text;
+}
+
+void Gosu::TextInput::setText(const std::wstring& text)
+{
+	pimpl->text = text;
+	pimpl->caretPos = pimpl->selectionStart = text.length();
+}
+
+unsigned Gosu::TextInput::caretPos() const
+{
+    return pimpl->caretPos;
+}
+
+unsigned Gosu::TextInput::selectionStart() const
+{
+    return pimpl->selectionStart;
+}
+
+#define CARET_POS (pimpl->caretPos)
+#define SEL_START (pimpl->selectionStart)
+
+bool Gosu::TextInput::feedMessage(unsigned long message, unsigned long wparam, unsigned long lparam)
+{
+    if (message == WM_CHAR && wparam >= 32 && wparam != 127)
+    {
+        // Delete (overwrite) previous selection.
+        if (CARET_POS != SEL_START)
+        {
+            unsigned min = std::min(CARET_POS, SEL_START);
+            unsigned max = std::max(CARET_POS, SEL_START);
+            pimpl->text.erase(pimpl->text.begin() + min, pimpl->text.begin() + max);
+            CARET_POS = SEL_START = min;
+        }
+        
+        pimpl->text.insert(pimpl->text.begin() + CARET_POS, static_cast<wchar_t>(wparam));
+        CARET_POS += 1;
+        SEL_START = CARET_POS;
+        return true;
+    }
+
+    bool ctrlDown	= (GetKeyState(VK_CONTROL) < 0);
+	bool shiftDown	= (GetKeyState(VK_SHIFT) < 0);
+
+    // Char left
+    if (message == WM_KEYDOWN && wparam == VK_LEFT && !ctrlDown)
+    {
+        if (CARET_POS > 0)
+            CARET_POS -= 1;
+
+        if (!shiftDown)
+            SEL_START = CARET_POS;
+        
+        return true;
+    }
+
+    // Char right
+    if (message == WM_KEYDOWN && wparam == VK_RIGHT && !ctrlDown)
+    {
+        if (CARET_POS < pimpl->text.length())
+            CARET_POS += 1;
+
+        if (!shiftDown)
+            SEL_START = CARET_POS;
+        
+        return true;
+    }
+    
+    // Home
+    if (message == WM_KEYDOWN && wparam == VK_HOME)
+    {
+        CARET_POS = 0;
+
+        if (!shiftDown)
+            SEL_START = CARET_POS;
+        
+        return true;
+    }
+
+    // End
+    if (message == WM_KEYDOWN && wparam == VK_END)
+    {
+        CARET_POS = pimpl->text.length();
+
+        if (!shiftDown)
+            SEL_START = CARET_POS;
+        
+        return true;
+    }
+
+    // Word left
+    if (message == WM_KEYDOWN && wparam == VK_LEFT && ctrlDown)
+    {
+        if (CARET_POS == pimpl->text.length())
+            --CARET_POS;
+        
+        while (CARET_POS > 0 && iswspace(pimpl->text.at(CARET_POS - 1)))
+            --CARET_POS;
+
+        while (CARET_POS > 0 && !iswspace(pimpl->text.at(CARET_POS - 1)))
+            --CARET_POS;
+
+        if (!shiftDown)
+            SEL_START = CARET_POS;
+        
+        return true;
+    }
+
+    // Word right
+    if (message == WM_KEYDOWN && wparam == VK_RIGHT && ctrlDown)
+    {
+        while (CARET_POS < pimpl->text.length() && iswspace(pimpl->text.at(CARET_POS)))
+            ++CARET_POS;
+
+        while (CARET_POS < pimpl->text.length() && !iswspace(pimpl->text.at(CARET_POS)))
+            ++CARET_POS;
+
+        if (!shiftDown)
+            SEL_START = CARET_POS;
+
+        return true;
+    }
+
+    // Delete existant selection
+    if (message == WM_KEYDOWN && wparam == VK_BACK)
+    {
+        if (SEL_START != CARET_POS)
+        {
+            unsigned min = std::min(CARET_POS, SEL_START);
+            unsigned max = std::max(CARET_POS, SEL_START);
+            pimpl->text.erase(pimpl->text.begin() + min, pimpl->text.begin() + max);
+            SEL_START = CARET_POS = min;
+        }
+        else
+        {
+            unsigned oldCaret = CARET_POS;
+            // Move left - either char or word
+            feedMessage(WM_KEYDOWN, VK_LEFT, lparam);
+            pimpl->text.erase(pimpl->text.begin() + CARET_POS, pimpl->text.begin() + oldCaret);
+            SEL_START = CARET_POS;
+        }
+
+        return true;
+    }
+
+    // Delete existant selection
+    if (message == WM_KEYDOWN && wparam == VK_DELETE)
+    {
+        if (SEL_START != CARET_POS)
+        {
+            unsigned min = std::min(CARET_POS, SEL_START);
+            unsigned max = std::max(CARET_POS, SEL_START);
+            pimpl->text.erase(pimpl->text.begin() + min, pimpl->text.begin() + max);
+            SEL_START = CARET_POS = min;
+        }
+        else
+        {
+            unsigned oldCaret = CARET_POS;
+            // Move right - either char or word
+            feedMessage(WM_KEYDOWN, VK_RIGHT, lparam);
+            pimpl->text.erase(pimpl->text.begin() + oldCaret, pimpl->text.begin() + CARET_POS);
+            SEL_START = CARET_POS = oldCaret;
+        }
+
+        return true;
+    }
+
+    return false;
+}