gosu 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7232fe12b9c8879a9cfa88e30f9ce0cf61916c
-  data.tar.gz: 02b5c36e500dcd641fc70ee65d6d316dc16f3dba
+  metadata.gz: 9dd9d811276727fc5e26cbc71d0e9b2daa725e6c
+  data.tar.gz: 102374ca1712c842dfcee84a1ca1126f249bead9
 SHA512:
-  metadata.gz: ac51f4a214b0077dd7817ef0e5e741a1618019b3c7e552a0dc80cd3ae1897ea626d3be2e180b4a76b0603dc7fe5f057a57203d50550bde76e61a8f820bd50fe3
-  data.tar.gz: 09520284f76e8efad4dec94ffa584768f0c3c11882c845db9139dc6a7baa02ba4687efd463d43a86f253d44b92a81de61b8e2068b22b9c3f170bc673d63eed6e
+  metadata.gz: 54e65a75e825089dfc9a3facbec4e1cce0890e19ef3819ad1be9c85d211556eca716f6f85b0c75339bd234d2ef9cafbc41d3162d35370e34a06e7299fe7e129a
+  data.tar.gz: 1fc52fd3b82082cdbf6ec50575461f6579d0da13940931d02ebaf3e6fa1d82e05ed335e592bddddcd7cfb661ff28860e83c3240f7b04003a6e4523b2299f8743

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 10
-#define GOSU_POINT_VERSION 2
-#define GOSU_VERSION "0.10.2"
+#define GOSU_POINT_VERSION 3
+#define GOSU_VERSION "0.10.3"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/ext/gosu/gosu_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.6
+ * Version 3.0.7
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -2183,7 +2183,7 @@ static VALUE mGosu;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x030006 
+#define SWIGVERSION 0x030007 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2467,7 +2467,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.6/share/swig/3.0.6/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.7/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2509,7 +2509,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 #include <string>
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.6/share/swig/3.0.6/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.7/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2608,7 +2608,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.6/share/swig/3.0.6/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.7/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -11169,8 +11169,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(10)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(2)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.2"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(3)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.3"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("This software uses the following third-party libraries:\n\nGosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\nSDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\nlibsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\nOpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);

data/ext/gosu/gosu_wrap.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.6
+ * Version 3.0.7
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make

data/src/Input/TextInput.cpp

@@ -1,5 +1,6 @@
 #include <Gosu/TextInput.hpp>
 #include <Gosu/Input.hpp>
+#include <Gosu/Platform.hpp>
 #include <Gosu/Utility.hpp>
 #include <SDL.h>
 #include <cwctype>
@@ -199,26 +200,47 @@ bool Gosu::TextInput::feedSDLEvent(void* event)
                 return false;
             }
             
-            bool ctrlDown = (e->key.keysym.mod & (KMOD_LCTRL | KMOD_RCTRL));
+        #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:
-                    if (ctrlDown)
+                #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:
-                    if (ctrlDown)
+                #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;

data/src/Text/TextWin.cpp

@@ -119,7 +119,7 @@ namespace Gosu
                         DEFAULT_PITCH | FF_DONTCARE };
                     
                     // Don't rely on wcsncpy being in std::...
-                    using namepace std;
+                    using namespace std;
                     wcsncpy(logfont.lfFaceName, fontName.c_str(), LF_FACESIZE);
                     logfont.lfFaceName[LF_FACESIZE - 1] = 0;
                     

data/src/Window.cpp

@@ -119,8 +119,6 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
         }
     }
     
-    // TODO - it would be better/enough to only do this in show()
-    
     SDL_SetWindowTitle(sharedWindow(), "");
     SDL_SetWindowSize(sharedWindow(), actualWidth, actualHeight);
     SDL_SetWindowPosition(sharedWindow(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
@@ -128,8 +126,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     {
         SDL_SetWindowFullscreen(sharedWindow(), fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
     }
-    SDL_ShowWindow(sharedWindow());
-
+    
     #if SDL_VERSION_ATLEAST(2, 0, 1)
     SDL_GL_GetDrawableSize(sharedWindow(), &actualWidth, &actualHeight);
     #endif
@@ -183,12 +180,19 @@ void Gosu::Window::show()
 
 bool Gosu::Window::tick()
 {
+    if (SDL_GetWindowFlags(sharedWindow()) & SDL_WINDOW_HIDDEN) {
+        SDL_ShowWindow(sharedWindow());
+    }
+    
     SDL_Event e;
     while (SDL_PollEvent(&e)) {
-        if (e.type == SDL_QUIT)
+        if (e.type == SDL_QUIT) {
+            SDL_HideWindow(sharedWindow());
             return false;
-        else
+        }
+        else {
             input().feedSDLEvent(&e);
+        }
     }
     
     Song::update();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -100,7 +100,6 @@ files:
 - src/DirectoriesApple.mm
 - src/Graphics/ResolutionApple.mm
 - src/Input/InputUIKit.mm
-- src/Input/TextInputMac.mm
 - src/Text/TextApple.mm
 - src/UIKit/GosuAppDelegate.mm
 - src/UIKit/GosuGLView.mm

data/src/Input/TextInputMac.mm

@@ -1,222 +0,0 @@
-#include <Gosu/TextInput.hpp>
-#include <Gosu/Buttons.hpp>
-#include "MacUtility.hpp"
-#include <algorithm>
-#include <vector>
-#include <wctype.h>
-
-#import <Cocoa/Cocoa.h>
-
-#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
-{
-    Gosu::TextInput* _filter;
-    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]];
-    
-    std::wstring text = _filter->filter(std::wstring(unibuf.begin(), unibuf.end()));
-    
-    _text->insert(_text->begin() + CARET_POS, text.begin(), text.end());
-    (CARET_POS) += text.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)setFilter:(Gosu::TextInput&)filter andText:(std::wstring&)text
-    andCaretPos:(unsigned&)caretPos andSelectionStart:(unsigned&)selectionStart
-{
-    _filter = &filter;
-    _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() setFilter: *this andText: 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;
-}
-
-void Gosu::TextInput::setCaretPos(unsigned pos)
-{
-    pimpl->caretPos = pos;
-}
-
-unsigned Gosu::TextInput::selectionStart() const
-{
-    return pimpl->selectionStart;
-}
-
-void Gosu::TextInput::setSelectionStart(unsigned pos)
-{
-    pimpl->selectionStart = pos;
-}
-
-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;
-}