gosu 0.8.0.pre3 → 0.8.0.pre4

data/GosuImpl/RubyGosu_SWIG_GC_PATCH.patch

@@ -1,126 +0,0 @@
-Index: GosuImpl/RubyGosu_wrap.cxx
-===================================================================
---- GosuImpl/RubyGosu_wrap.cxx	(Revision 993)
-+++ GosuImpl/RubyGosu_wrap.cxx	(Arbeitskopie)
-@@ -8,6 +8,10 @@
-  * interface file instead. 
-  * ----------------------------------------------------------------------------- */
- 
-+// This file was afterwards patched using the following instructions:
-+// http://sourceforge.net/tracker/index.php?func=detail&aid=2034216&group_id=1645&atid=101645
-+// (Many thanks to Kevin Burge for that.)
-+
- #define SWIGRUBY
- #define SWIG_DIRECTORS
- 
-@@ -855,6 +859,7 @@
- 
- 
- #include <ruby.h>
-+#include <map>
- 
- /* Remove global macros defined in Ruby's win32.h */
- #ifdef write
-@@ -1183,7 +1188,7 @@
- /* Global Ruby hash table to store Trackings from C/C++
-    structs to Ruby Objects. 
- */
--static VALUE swig_ruby_trackings = Qnil;
-+static std::map<void*, VALUE> swig_ruby_trackings;
- 
- /* Global variable that stores a reference to the ruby
-    hash table delete function. */
-@@ -1200,34 +1205,18 @@
-      This is done to allow multiple DSOs to share the same
-      tracking table.
-   */
--  ID trackings_id = rb_intern( "@__trackings__" );
-   VALUE verbose = rb_gv_get("VERBOSE");
-   rb_gv_set("VERBOSE", Qfalse);
--  swig_ruby_trackings = rb_ivar_get( _mSWIG, trackings_id );
-   rb_gv_set("VERBOSE", verbose);
- 
-   /* No, it hasn't.  Create one ourselves */ 
--  if ( swig_ruby_trackings == Qnil )
--    {
--      swig_ruby_trackings = rb_hash_new();
--      rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings );
--    }
-+  swig_ruby_trackings.clear();
- 
-   /* Now store a reference to the hash table delete function
-      so that we only have to look it up once.*/
-   swig_ruby_hash_delete = rb_intern("delete");
- }
- 
--/* Get a Ruby number to reference a pointer */
--SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) {
--  /* We cast the pointer to an unsigned long
--     and then store a reference to it using
--     a Ruby number object. */
--
--  /* Convert the pointer to a Ruby number */
--  return SWIG2NUM(ptr);
--}
--
- /* Get a Ruby number to reference an object */
- SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
-   /* We cast the object to an unsigned long
-@@ -1249,39 +1238,16 @@
- 
- /* Add a Tracking from a C/C++ struct to a Ruby object */
- SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
--  /* In a Ruby hash table we store the pointer and
--     the associated Ruby object.  The trick here is
--     that we cannot store the Ruby object directly - if
--     we do then it cannot be garbage collected.  So
--     instead we typecast it as a unsigned long and
--     convert it to a Ruby number object.*/
--
--  /* Get a reference to the pointer as a Ruby number */
--  VALUE key = SWIG_RubyPtrToReference(ptr);
--
--  /* Get a reference to the Ruby object as a Ruby number */
--  VALUE value = SWIG_RubyObjectToReference(object);
--
-   /* Store the mapping to the global hash table. */
--  rb_hash_aset(swig_ruby_trackings, key, value);
-+  swig_ruby_trackings[ptr] = object;
- }
- 
- /* Get the Ruby object that owns the specified C/C++ struct */
- SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
--  /* Get a reference to the pointer as a Ruby number */
--  VALUE key = SWIG_RubyPtrToReference(ptr);
--
--  /* Now lookup the value stored in the global hash table */
--  VALUE value = rb_hash_aref(swig_ruby_trackings, key);
--	
--  if (value == Qnil) {
--    /* No object exists - return nil. */
-+  if (swig_ruby_trackings.count(ptr) == 0)
-     return Qnil;
--  }
--  else {
--    /* Convert this value to Ruby object */
--    return SWIG_RubyReferenceToObject(value);
--  }
-+  else
-+    return swig_ruby_trackings[ptr];
- }
- 
- /* Remove a Tracking from a C/C++ struct to a Ruby object.  It
-@@ -1289,12 +1255,7 @@
-    since the same memory address may be reused later to create
-    a new object. */
- SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
--  /* Get a reference to the pointer as a Ruby number */
--  VALUE key = SWIG_RubyPtrToReference(ptr);
--
--  /* Delete the object from the hash table by calling Ruby's
--     do this we need to call the Hash.delete method.*/
--  rb_funcall(swig_ruby_trackings, swig_ruby_hash_delete, 1, key);
-+  swig_ruby_trackings.erase(ptr);
- }
- 
- /* This is a helper method that unlinks a Ruby object from its

data/GosuImpl/RubyGosu_SWIG_RENAME_PATCH.patch

@@ -1,62 +0,0 @@
---- GosuImpl/RubyGosu_wrap.cxx
-+++ GosuImpl/RubyGosu_wrap.cxx
-@@ -2912,14 +2912,14 @@ SwigDirector_Window::~SwigDirector_Window() {
- void SwigDirector_Window::update() {
-   VALUE result;
-   
--  result = rb_funcall(swig_get_self(), rb_intern("update"), 0, NULL);
-+  result = rb_funcall(swig_get_self(), rb_intern("protected_update"), 0, NULL);
- }
- 
- 
- void SwigDirector_Window::draw() {
-   VALUE result;
-   
--  result = rb_funcall(swig_get_self(), rb_intern("draw"), 0, NULL);
-+  result = rb_funcall(swig_get_self(), rb_intern("protected_draw_2"), 0, NULL);
- }
- 
- 
-@@ -2927,7 +2927,7 @@ bool SwigDirector_Window::needsRedraw() const {
-   bool c_result ;
-   VALUE result;
-   
--  result = rb_funcall(swig_get_self(), rb_intern("needs_redraw?"), 0, NULL);
-+  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_redraw?"), 0, NULL);
-   bool swig_val;
-   int swig_res = SWIG_AsVal_bool(result, &swig_val);
-   if (!SWIG_IsOK(swig_res)) {
-@@ -2942,7 +2942,7 @@ bool SwigDirector_Window::needsCursor() const {
-   bool c_result ;
-   VALUE result;
-   
--  result = rb_funcall(swig_get_self(), rb_intern("needs_cursor?"), 0, NULL);
-+  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_cursor?"), 0, NULL);
-   bool swig_val;
-   int swig_res = SWIG_AsVal_bool(result, &swig_val);
-   if (!SWIG_IsOK(swig_res)) {
-@@ -2956,7 +2956,7 @@ bool SwigDirector_Window::needsCursor() const {
- void SwigDirector_Window::loseFocus() {
-   VALUE result;
-   
--  result = rb_funcall(swig_get_self(), rb_intern("lose_focus"), 0, NULL);
-+  result = rb_funcall(swig_get_self(), rb_intern("protected_lose_focus"), 0, NULL);
- }
- 
- 
-@@ -2977,7 +2977,7 @@ void SwigDirector_Window::buttonDown(Gosu::Button arg0) {
-     else
-     obj0 = LONG2NUM((&arg0)->id());
-   }
--  result = rb_funcall(swig_get_self(), rb_intern("button_down"), 1,obj0);
-+  result = rb_funcall(swig_get_self(), rb_intern("protected_button_down"), 1,obj0);
- }
- 
- 
-@@ -2991,7 +2991,7 @@ void SwigDirector_Window::buttonUp(Gosu::Button arg0) {
-     else
-     obj0 = LONG2NUM((&arg0)->id());
-   }
--  result = rb_funcall(swig_get_self(), rb_intern("button_up"), 1,obj0);
-+  result = rb_funcall(swig_get_self(), rb_intern("protected_button_up"), 1,obj0);
- }

data/GosuImpl/TextInputWin.cpp

@@ -1,211 +0,0 @@
-#include <Gosu/TextInput.hpp>
-#include <Gosu/Buttons.hpp>
-#include <algorithm>
-#include <vector>
-#include <wctype.h>
-
-// OPT-IN, have you heard of it?!
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#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;
-}
-
-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;
-}
-
-#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;
-        }
-        
-        wchar_t text[] = { static_cast<wchar_t>(wparam), 0 };
-        std::wstring filteredText = filter(text);
-        pimpl->text.insert(pimpl->text.begin() + CARET_POS, filteredText.begin(), filteredText.end());
-        CARET_POS += filteredText.length();
-        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;
-}

data/GosuImpl/TextInputX.cpp

@@ -1,217 +0,0 @@
-#include <Gosu/TextInput.hpp>
-#include <Gosu/Input.hpp>
-#include <algorithm>
-#include <vector>
-#include <wctype.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;
-}
-
-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;
-}
-
-#define CARET_POS (pimpl->caretPos)
-#define SEL_START (pimpl->selectionStart)
-
-bool Gosu::TextInput::feedXEvent(void* display, void* event)
-{
-    XEvent* ev = static_cast<XEvent*>(event);
-
-    if (ev->type != KeyPress)
-        return false;
-
-    bool ctrlDown	= (ev->xkey.state & ControlMask);
-    bool shiftDown	= (ev->xkey.state & ShiftMask);
-
-    KeySym lower, upper;
-    int keysyms_per_keycode_return;
-    KeySym keysym = *XGetKeyboardMapping((Display*)display, ev->xkey.keycode, 1, &keysyms_per_keycode_return);
-    XConvertCase(keysym, &lower, &upper);
-
-    wchar_t ch = static_cast<wchar_t>(shiftDown ? upper : lower);
-
-    if (ch >= 32 && ch != 127 && ch <= 255)
-    {
-        // 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;
-        }
-        
-        wchar_t text[] = { ch, 0 };
-        std::wstring filteredText = filter(text);
-        pimpl->text.insert(pimpl->text.begin() + CARET_POS, filteredText.begin(), filteredText.end());
-        CARET_POS += filteredText.length();
-        SEL_START = CARET_POS;
-        return true;
-    }
-
-    Button btn(ev->xkey.keycode-8);
-
-    // Char left
-    if (btn == kbLeft && !ctrlDown)
-    {
-        if (CARET_POS > 0)
-            CARET_POS -= 1;
-
-        if (!shiftDown)
-            SEL_START = CARET_POS;
-        
-        return true;
-    }
-
-    // Char right
-    if (btn == kbRight && !ctrlDown)
-    {
-        if (CARET_POS < pimpl->text.length())
-            CARET_POS += 1;
-
-        if (!shiftDown)
-            SEL_START = CARET_POS;
-        
-        return true;
-    }
-    
-    // Home
-    if (btn == kbHome)
-    {
-        CARET_POS = 0;
-
-        if (!shiftDown)
-            SEL_START = CARET_POS;
-        
-        return true;
-    }
-
-    // End
-    if (btn == kbEnd)
-    {
-        CARET_POS = pimpl->text.length();
-
-        if (!shiftDown)
-            SEL_START = CARET_POS;
-        
-        return true;
-    }
-
-    // Word left
-    if (btn == kbLeft && 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 (btn == kbRight && 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 (btn == kbBackspace)
-    {
-        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 if (CARET_POS > 0)
-        {
-            unsigned oldCaret = CARET_POS;
-            CARET_POS -= 1;
-            pimpl->text.erase(pimpl->text.begin() + CARET_POS, pimpl->text.begin() + oldCaret);
-            SEL_START = CARET_POS;
-        }
-
-        return true;
-    }
-
-    // Delete existant selection
-    if (btn == kbDelete)
-    {
-        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 if (CARET_POS < pimpl->text.length())
-        {
-            unsigned oldCaret = CARET_POS;
-            CARET_POS += 1;
-            pimpl->text.erase(pimpl->text.begin() + oldCaret, pimpl->text.begin() + CARET_POS);
-            SEL_START = CARET_POS = oldCaret;
-        }
-
-        return true;
-    }
-
-    return false;
-}