gosu 0.10.9.pre1 → 0.11.0

data/src/Input/InputUIKit.mm

@@ -1,190 +0,0 @@
-#include <Gosu/Input.hpp>
-#include <Gosu/TextInput.hpp>
-
-#include "AppleUtility.hpp"
-#import <UIKit/UIKit.h>
-
-struct Gosu::TextInput::Impl {};
-Gosu::TextInput::TextInput() {}
-Gosu::TextInput::~TextInput() {}
-std::wstring Gosu::TextInput::text() const { return L""; }
-void Gosu::TextInput::setText(const std::wstring& text) {}
-unsigned Gosu::TextInput::caretPos() const { return 0; }
-unsigned Gosu::TextInput::selectionStart() const { return 0; }
-
-struct Gosu::Input::Impl
-{
-    UIView *view;
-    float mouseX, mouseY;
-    float factorX, factorY;
-    float updateInterval;
-    
-    NSMutableSet *currentTouchesSet;
-    std::unique_ptr<Gosu::Touches> currentTouchesVector;
-    
-    Touch translateTouch(UITouch *uiTouch)
-    {
-        CGPoint point = [uiTouch locationInView:view];
-        
-        return (Touch) {
-            .id = (__bridge void *)uiTouch,
-            .x = (float) point.x * factorX,
-            .y = (float) point.y * factorY,
-        };
-    }
-};
-
-Gosu::Input::Input(void* view, float updateInterval)
-: pimpl(new Impl)
-{
-    pimpl->view = (__bridge UIView *)view;
-    pimpl->updateInterval = updateInterval;
-    pimpl->currentTouchesSet = [NSMutableSet new];
-    pimpl->mouseX = pimpl->mouseY = -1000;
-    setMouseFactors(1, 1);
-}
-
-Gosu::Input::~Input()
-{
-}
-
-void Gosu::Input::feedTouchEvent(int type, void *touches)
-{
-    NSSet *uiTouches = (__bridge NSSet *)touches;
-    
-    pimpl->currentTouchesVector.reset();
-    
-    std::tr1::function<void (Touch)>* callback = nullptr;
-    
-    if (type == 0) {
-        [pimpl->currentTouchesSet unionSet:uiTouches];
-        callback = &onTouchBegan;
-    }
-    else if (type == 1) {
-        callback = &onTouchMoved;
-    }
-    else if (type == 2) {
-        [pimpl->currentTouchesSet minusSet:uiTouches];
-        callback = &onTouchEnded;
-    }
-    else if (type == 3) {
-        [pimpl->currentTouchesSet minusSet:uiTouches];
-        callback = &onTouchCancelled;
-    }
-    
-    if (callback && *callback) {
-        for (UITouch *uiTouch in uiTouches) {
-            (*callback)(pimpl->translateTouch(uiTouch));
-        }
-    }
-}
-
-wchar_t Gosu::Input::idToChar(Button btn)
-{
-    return 0;
-}
-
-Gosu::Button Gosu::Input::charToId(wchar_t ch)
-{
-    return noButton;
-}
-        
-bool Gosu::Input::down(Button btn)
-{
-    return false;
-}
-
-double Gosu::Input::mouseX() const
-{
-    return pimpl->mouseX;
-}
-
-double Gosu::Input::mouseY() const
-{
-    return pimpl->mouseY;
-}
-
-void Gosu::Input::setMousePosition(double x, double y) {
-    pimpl->mouseX = x;
-    pimpl->mouseY = y;
-}
-
-void Gosu::Input::setMouseFactors(double factorX, double factorY, double offsetX, double offsetY) {
-    pimpl->factorX = factorX;
-    pimpl->factorY = factorY;
-    
-    // TODO - use offset
-}
-
-const Gosu::Touches& Gosu::Input::currentTouches() const
-{
-    if (!pimpl->currentTouchesVector.get()) {
-        pimpl->currentTouchesVector.reset(new Gosu::Touches);
-        for (UITouch* uiTouch in pimpl->currentTouchesSet) {
-            pimpl->currentTouchesVector->push_back(pimpl->translateTouch(uiTouch));
-        }
-    }
-    return *pimpl->currentTouchesVector;
-}
-
-double Gosu::Input::accelerometerX() const
-{
-    return 0;
-}
-
-double Gosu::Input::accelerometerY() const
-{
-    return 0;
-}
-
-double Gosu::Input::accelerometerZ() const
-{
-    return 0;
-}
-
-void Gosu::Input::update()
-{
-    // Check for dead touches and remove from vector if
-    // necessary
-
-    NSMutableSet *deadTouches = nil;
-
-    for (UITouch *touch in pimpl->currentTouchesSet)
-    {
-        UITouchPhase phase = [touch phase];
-        if (phase == UITouchPhaseBegan ||
-                phase == UITouchPhaseMoved ||
-                phase == UITouchPhaseStationary) {
-            continue;
-        }
-        
-        // Something was deleted, we will need the set.
-        if (!deadTouches) {
-            deadTouches = [NSMutableSet new];
-        }
-        [deadTouches addObject:touch];
-    }
-    
-    // Has something been deleted?
-    if (deadTouches)
-    {
-        pimpl->currentTouchesVector.reset();
-        [pimpl->currentTouchesSet minusSet: deadTouches];
-        
-        if (onTouchEnded) {
-            for (UITouch *uiTouch in deadTouches) {
-                onTouchEnded(pimpl->translateTouch(uiTouch));
-            }
-        }
-    }
-}
-
-Gosu::TextInput* Gosu::Input::textInput() const
-{
-    return 0;
-}
-
-void Gosu::Input::setTextInput(TextInput* input)
-{
-    throw "NYI";
-}

data/src/Input/TextInput.cpp

@@ -1,261 +0,0 @@
-#include <Gosu/TextInput.hpp>
-#include <Gosu/Input.hpp>
-#include <Gosu/Platform.hpp>
-#include <Gosu/Utility.hpp>
-#include <SDL.h>
-#include <cwctype>
-
-struct Gosu::TextInput::Impl
-{
-    // These two strings contain UTF-8 data.
-    // See this Wiki page for an overview of what is going on here:
-    // http://wiki.libsdl.org/Tutorials/TextInput#CandidateList
-    std::wstring text, composition;
-    unsigned caretPos, selectionStart;
-    
-    Impl()
-    : caretPos(0), selectionStart(0)
-    {
-    }
-    
-    void insertText(const std::wstring& newText)
-    {
-        // Stop IME composition.
-        composition.clear();
-
-        // Delete (overwrite) previous selection.
-        if (caretPos != selectionStart) {
-            unsigned min = std::min(caretPos, selectionStart);
-            unsigned max = std::max(caretPos, selectionStart);
-            text.erase(text.begin() + min, text.begin() + max);
-            caretPos = selectionStart = min;
-        }
-        
-        text.insert(text.begin() + caretPos, newText.begin(), newText.end());
-        caretPos += newText.size();
-        selectionStart = caretPos;
-    }
-    
-    void moveLeft(bool modifySelection)
-    {
-        if (caretPos > 0)
-            caretPos -= 1;
-        
-        if (modifySelection)
-            selectionStart = caretPos;
-    }
-    
-    void moveRight(bool modifySelection)
-    {
-        if (caretPos < text.length())
-            caretPos += 1;
-        
-        if (modifySelection)
-            selectionStart = caretPos;
-    }
-    
-    void moveWordLeft(bool modifySelection)
-    {
-        if (caretPos == text.length())
-            --caretPos;
-        
-        while (caretPos > 0 && std::iswspace(text.at(caretPos - 1)))
-            --caretPos;
-        
-        while (caretPos > 0 && !std::iswspace(text.at(caretPos - 1)))
-            --caretPos;
-        
-        if (modifySelection)
-            selectionStart = caretPos;
-    }
-
-    void moveWordRight(bool modifySelection)
-    {
-        while (caretPos < text.length() && std::iswspace(text.at(caretPos)))
-            ++caretPos;
-        
-        while (caretPos < text.length() && !std::iswspace(text.at(caretPos)))
-            ++caretPos;
-        
-        if (modifySelection)
-            selectionStart = caretPos;
-    }
-    
-    void moveToBeginningOfLine(bool modifySelection)
-    {
-        caretPos = 0;
-        
-        if (modifySelection)
-            selectionStart = caretPos;
-    }
-    
-    void moveToEndOfLine(bool modifySelection)
-    {
-        caretPos = static_cast<unsigned>(text.length());
-        
-        if (modifySelection)
-            selectionStart = caretPos;
-    }
-    
-    void deleteBackward()
-    {
-        if (selectionStart != caretPos) {
-            unsigned min = std::min(caretPos, selectionStart);
-            unsigned max = std::max(caretPos, selectionStart);
-            text.erase(text.begin() + min, text.begin() + max);
-            selectionStart = caretPos = min;
-        }
-        else if (caretPos > 0) {
-            unsigned oldCaret = caretPos;
-            caretPos -= 1;
-            text.erase(text.begin() + caretPos, text.begin() + oldCaret);
-            selectionStart = caretPos;
-        }
-    }
-    
-    void deleteForward()
-    {
-        if (selectionStart != caretPos) {
-            unsigned min = std::min(caretPos, selectionStart);
-            unsigned max = std::max(caretPos, selectionStart);
-            text.erase(text.begin() + min, text.begin() + max);
-            selectionStart = caretPos = min;
-        }
-        else if (caretPos < text.length()) {
-            unsigned oldCaret = caretPos;
-            caretPos += 1;
-            text.erase(text.begin() + oldCaret, text.begin() + caretPos);
-            selectionStart = caretPos = oldCaret;
-        }
-        
-    }
-};
-
-Gosu::TextInput::TextInput()
-: pimpl(new Impl)
-{
-}
-
-Gosu::TextInput::~TextInput()
-{
-}
-
-std::wstring Gosu::TextInput::text() const
-{
-    std::wstring composedText = pimpl->text;
-    if (! pimpl->composition.empty()) {
-        composedText.insert(pimpl->caretPos, pimpl->composition);
-    }
-    return composedText;
-}
-
-void Gosu::TextInput::setText(const std::wstring& text)
-{
-	pimpl->text = text;
-    pimpl->composition.clear();
-	pimpl->caretPos = pimpl->selectionStart = static_cast<unsigned>(text.length());
-}
-
-unsigned Gosu::TextInput::caretPos() const
-{
-    return static_cast<unsigned>(pimpl->caretPos);
-}
-
-void Gosu::TextInput::setCaretPos(unsigned pos)
-{
-    pimpl->caretPos = pos;
-}
-
-unsigned Gosu::TextInput::selectionStart() const
-{
-    return static_cast<unsigned>(pimpl->selectionStart);
-}
-
-void Gosu::TextInput::setSelectionStart(unsigned pos)
-{
-    pimpl->selectionStart = pos;
-}
-
-bool Gosu::TextInput::feedSDLEvent(void* event)
-{
-    const SDL_Event* e = static_cast<SDL_Event*>(event);
-    
-    switch (e->type) {
-        // Direct text input, and sent after IME composition completes.
-        case SDL_TEXTINPUT: {
-            std::wstring textToInsert = utf8ToWstring(e->text.text);
-            textToInsert = filter(textToInsert);
-            pimpl->insertText(textToInsert);
-            return true;
-        }
-        // IME composition in progress.
-        case SDL_TEXTEDITING: {
-            pimpl->composition = utf8ToWstring(e->edit.text);
-            return true;
-        }
-        // Emulate "standard" Windows/X11 keyboard behavior.
-        case SDL_KEYDOWN: {
-            // ...but not if the IME is currently compositing.
-            if (! pimpl->composition.empty()) {
-                return false;
-            }
-            
-        #ifdef GOSU_IS_MAC
-            bool words = (e->key.keysym.mod & (KMOD_LALT | KMOD_RALT));
-            bool commandDown = (e->key.keysym.mod & (KMOD_LGUI | KMOD_RGUI));
-        #else
-            bool words = (e->key.keysym.mod & (KMOD_LCTRL | KMOD_RCTRL));
-        #endif
-            bool shiftDown = (e->key.keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT));
-            SDL_Keycode key = e->key.keysym.sym;
-            
-            switch (key) {
-                case SDLK_LEFT:
-                #ifdef GOSU_IS_MAC
-                    if (commandDown)
-                        pimpl->moveToBeginningOfLine(! shiftDown);
-                    else
-                #endif
-                    if (words)
-                        pimpl->moveWordLeft(! shiftDown);
-                    else
-                        pimpl->moveLeft(! shiftDown);
-                    return true;
-                case SDLK_RIGHT:
-                #ifdef GOSU_IS_MAC
-                    if (commandDown)
-                        pimpl->moveToEndOfLine(! shiftDown);
-                    else
-                #endif
-                    if (words)
-                        pimpl->moveWordRight(! shiftDown);
-                    else
-                        pimpl->moveRight(! shiftDown);
-                    return true;
-            #ifdef GOSU_IS_MAC
-                case SDLK_UP:
-            #endif
-                case SDLK_HOME:
-                    pimpl->moveToBeginningOfLine(! shiftDown);
-                    return true;
-            #ifdef GOSU_IS_MAC
-                case SDLK_DOWN:
-            #endif
-                case SDLK_END:
-                    pimpl->moveToEndOfLine(! shiftDown);
-                    return true;
-                case SDLK_BACKSPACE:
-                    pimpl->deleteBackward();
-                    return true;
-                case SDLK_DELETE:
-                    pimpl->deleteForward();
-                    return true;
-            }
-            break;
-        }
-            
-        // TODO: Handle copy & paste.
-    }
-    
-    return false;
-}