gosu 0.7.46 → 0.7.47.1

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: 46f962dcbee435df36c0b90f2c9a7f0eb0697affd20202a9b3f0b74438cef81715a549d4f40922ee0fc6f54472d80a43dbb220610092b17bb16b79674f93d657
+  data.tar.gz: 65c994b275f5c0c3cbb131f5c9071ffa51f62a63123efa78cc945b90c5a4305135e77776caf29a63e822909bff6048b2ec333db5c68ff5f032be69395e0cb9c8
+SHA1: 
+  metadata.gz: 5717d9bb26797d0752706336725a51bb7d1569a0
+  data.tar.gz: 1ace5dbeaf66ffa54ae91e4767edf113d84035a3

data/Gosu/Buttons.hpp

@@ -1,5 +1,19 @@
-#ifndef GOSU_BUTTONSWIN_HPP
-#define GOSU_BUTTONSWIN_HPP
+#ifndef GOSU_BUTTONS_HPP
+#define GOSU_BUTTONS_HPP
+
+#include <Gosu/Platform.hpp>
+
+#ifdef GOSU_IS_MAC
+    #define GOSU_SCANCODE(mac, windows_or_linux) mac
+    #define GOSU_SPECIAL_SCANCODE(mac, windows, linux) mac
+#else
+    #define GOSU_SCANCODE(mac, linux_or_windows) linux_or_windows
+    #ifdef GOSU_IS_WIN
+        #define GOSU_SPECIAL_SCANCODE(mac, windows, linux) windows
+    #else
+        #define GOSU_SPECIAL_SCANCODE(mac, windows, linux) linux
+    #endif
+#endif
 
 namespace Gosu
 {
@@ -8,93 +22,104 @@ namespace Gosu
     //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
     enum ButtonName
 	{
-        kbRangeBegin = 0x00,
-		kbEscape = 0x01,
-		kbF1 = 0x3b,
-		kbF2 = 0x3c,
-		kbF3 = 0x3d,
-		kbF4 = 0x3e,
-		kbF5 = 0x3f,
-		kbF6 = 0x40,
-		kbF7 = 0x41,
-		kbF8 = 0x42,
-		kbF9 = 0x43,
-		kbF10 = 0x44,
-		kbF11 = 0x57,
-		kbF12 = 0x58,
-		kb0 = 0x0b,
-		kb1 = 0x02,
-		kb2 = 0x03,
-		kb3 = 0x04,
-		kb4 = 0x05,
-		kb5 = 0x06,
-		kb6 = 0x07,
-		kb7 = 0x08,
-		kb8 = 0x09,
-		kb9 = 0x0a,
-		kbTab = 0x0f,
-		kbReturn = 0x1c,
-		kbSpace = 0x39,
-		kbLeftShift = 0x2a,
-		kbRightShift = 0x36,
-		kbLeftControl = 0x1d,
-		kbRightControl = 0x9d,
-		kbLeftAlt = 0x38,
-		kbRightAlt = 0xb8,
-		kbLeftMeta = 0xdb,
-		kbRightMeta = 0xdc,
-		kbBackspace = 0x0e,
-		kbLeft = 0xcb,
-		kbRight = 0xcd,
-		kbUp = 0xc8,
-		kbDown = 0xd0,
-		kbHome = 0xc7,
-		kbEnd = 0xcf,
-		kbInsert = 0xd2,
-		kbDelete = 0xd3,
-		kbPageUp = 0xc9,
-		kbPageDown = 0xd1,
-		kbEnter = 0x9c,
-		kbA = 0x1e,
-		kbB = 0x30,
-		kbC = 0x2e,
-		kbD = 0x20,
-		kbE = 0x12,
-		kbF = 0x21,
-		kbG = 0x22,
-		kbH = 0x23,
-		kbI = 0x17,
-		kbJ = 0x24,
-		kbK = 0x25,
-		kbL = 0x26,
-		kbM = 0x32,
-		kbN = 0x31,
-		kbO = 0x18,
-		kbP = 0x19,
-		kbQ = 0x10,
-		kbR = 0x13,
-		kbS = 0x1f,
-		kbT = 0x14,
-		kbU = 0x16,
-		kbV = 0x2f,
-		kbW = 0x11,
-		kbX = 0x2d,
-		kbY = 0x15,
-		kbZ = 0x2c,
-		kbNumpad0 = 0x52,
-		kbNumpad1 = 0x4f,
-		kbNumpad2 = 0x50,
-		kbNumpad3 = 0x51,
-		kbNumpad4 = 0x4b,
-		kbNumpad5 = 0x4c,
-		kbNumpad6 = 0x4d,
-		kbNumpad7 = 0x47,
-		kbNumpad8 = 0x48,
-		kbNumpad9 = 0x49,
-		kbNumpadAdd = 0x4e,
-		kbNumpadSubtract = 0x4a,
-		kbNumpadMultiply = 0x37,
-		kbNumpadDivide = 0xb5,
+        kbRangeBegin,
+		kbEscape = GOSU_SCANCODE(0x35, 0x01),
+		kbF1 = GOSU_SCANCODE(0x7a, 0x3b),
+		kbF2 = GOSU_SCANCODE(0x78, 0x3c),
+		kbF3 = GOSU_SCANCODE(0x63, 0x3d),
+		kbF4 = GOSU_SCANCODE(0x76, 0x3e),
+		kbF5 = GOSU_SCANCODE(0x60, 0x3f),
+		kbF6 = GOSU_SCANCODE(0x61, 0x40),
+		kbF7 = GOSU_SCANCODE(0x62, 0x41),
+		kbF8 = GOSU_SCANCODE(0x64, 0x42),
+		kbF9 = GOSU_SCANCODE(0x65, 0x43),
+		kbF10 = GOSU_SCANCODE(0x6d, 0x44),
+		kbF11 = GOSU_SCANCODE(0x67, 0x57),
+		kbF12 = GOSU_SCANCODE(0x6f, 0x58),
+		kb0 = GOSU_SCANCODE(0x1d, 0x0b),
+		kb1 = GOSU_SCANCODE(0x12, 0x02),
+		kb2 = GOSU_SCANCODE(0x13, 0x03),
+		kb3 = GOSU_SCANCODE(0x14, 0x04),
+		kb4 = GOSU_SCANCODE(0x15, 0x05),
+		kb5 = GOSU_SCANCODE(0x17, 0x06),
+		kb6 = GOSU_SCANCODE(0x16, 0x07),
+		kb7 = GOSU_SCANCODE(0x1a, 0x08),
+		kb8 = GOSU_SCANCODE(0x1c, 0x09),
+		kb9 = GOSU_SCANCODE(0x19, 0x0a),
+		kbTab = GOSU_SCANCODE(0x30, 0x0f),
+		kbReturn = GOSU_SCANCODE(0x24, 0x1c),
+		kbSpace = GOSU_SCANCODE(0x31, 0x39),
+		kbLeftShift = GOSU_SCANCODE(0x38, 0x2a),
+		kbRightShift = GOSU_SCANCODE(0x3c, 0x36),
+		kbLeftControl = GOSU_SCANCODE(0x3b, 0x1d),
+		kbRightControl = GOSU_SPECIAL_SCANCODE(0x3e, 0x9d, 0x61),
+		kbLeftAlt = GOSU_SCANCODE(0x3a, 0x38),
+		kbRightAlt = GOSU_SPECIAL_SCANCODE(0x3d, 0xb8, 0x64),
+		kbLeftMeta = GOSU_SPECIAL_SCANCODE(0x37, 0xdb, 0x7d),
+		kbRightMeta = GOSU_SPECIAL_SCANCODE(0x36, 0xdc, 0x7e),
+		kbBackspace = GOSU_SCANCODE(0x33, 0x0e),
+		kbLeft = GOSU_SPECIAL_SCANCODE(0x7b, 0xcb, 0x69),
+		kbRight = GOSU_SPECIAL_SCANCODE(0x7c, 0xcd, 0x6a),
+		kbUp = GOSU_SPECIAL_SCANCODE(0x7e, 0xc8, 0x67),
+		kbDown = GOSU_SPECIAL_SCANCODE(0x7d, 0xd0, 0x6c),
+		kbHome = GOSU_SPECIAL_SCANCODE(0x73, 0xc7, 0x66),
+		kbEnd = GOSU_SPECIAL_SCANCODE(0x77, 0xcf, 0x6b),
+		kbInsert = GOSU_SPECIAL_SCANCODE(0x72, 0xd2, 0x6e),
+		kbDelete = GOSU_SPECIAL_SCANCODE(0x75, 0xd3, 0x6f),
+		kbPageUp = GOSU_SPECIAL_SCANCODE(0x74, 0xc9, 0x68),
+		kbPageDown = GOSU_SPECIAL_SCANCODE(0x79, 0xd1, 0x6d),
+		kbEnter = GOSU_SPECIAL_SCANCODE(0x4c, 0x9c, 0x60),
+		kbBacktick = GOSU_SCANCODE(0x32, 0x29),
+		kbMinus = GOSU_SCANCODE(0x1b, 0x0c),
+		kbEqual = GOSU_SCANCODE(0x18, 0x0d),
+		kbBracketLeft = GOSU_SCANCODE(0x21, 0x1a),
+		kbBracketRight = GOSU_SCANCODE(0x1e, 0x1b),
+		kbBackslash = GOSU_SCANCODE(0x2a, 0x2b),
+		kbSemicolon = GOSU_SCANCODE(0x29, 0x27),
+		kbApostrophe = GOSU_SCANCODE(0x27, 0x28),
+		kbComma = GOSU_SCANCODE(0x2b, 0x33),
+		kbPeriod = GOSU_SCANCODE(0x2f, 0x34),
+		kbSlash = GOSU_SCANCODE(0x2c, 0x35),
+		kbA = GOSU_SCANCODE(0x00, 0x1e),
+		kbB = GOSU_SCANCODE(0x0b, 0x30),
+		kbC = GOSU_SCANCODE(0x08, 0x2e),
+		kbD = GOSU_SCANCODE(0x02, 0x20),
+		kbE = GOSU_SCANCODE(0x0e, 0x12),
+		kbF = GOSU_SCANCODE(0x03, 0x21),
+		kbG = GOSU_SCANCODE(0x05, 0x22),
+		kbH = GOSU_SCANCODE(0x04, 0x23),
+		kbI = GOSU_SCANCODE(0x22, 0x17),
+		kbJ = GOSU_SCANCODE(0x26, 0x24),
+		kbK = GOSU_SCANCODE(0x28, 0x25),
+		kbL = GOSU_SCANCODE(0x25, 0x26),
+		kbM = GOSU_SCANCODE(0x2e, 0x32),
+		kbN = GOSU_SCANCODE(0x2d, 0x31),
+		kbO = GOSU_SCANCODE(0x1f, 0x18),
+		kbP = GOSU_SCANCODE(0x23, 0x19),
+		kbQ = GOSU_SCANCODE(0x0c, 0x10),
+		kbR = GOSU_SCANCODE(0x0f, 0x13),
+		kbS = GOSU_SCANCODE(0x01, 0x1f),
+		kbT = GOSU_SCANCODE(0x11, 0x14),
+		kbU = GOSU_SCANCODE(0x20, 0x16),
+		kbV = GOSU_SCANCODE(0x09, 0x2f),
+		kbW = GOSU_SCANCODE(0x0d, 0x11),
+		kbX = GOSU_SCANCODE(0x07, 0x2d),
+		kbY = GOSU_SCANCODE(0x10, 0x15),
+		kbZ = GOSU_SCANCODE(0x06, 0x2c),
+		kbNumpad0 = GOSU_SCANCODE(0x52, 0x52),
+		kbNumpad1 = GOSU_SCANCODE(0x53, 0x4f),
+		kbNumpad2 = GOSU_SCANCODE(0x54, 0x50),
+		kbNumpad3 = GOSU_SCANCODE(0x55, 0x51),
+		kbNumpad4 = GOSU_SCANCODE(0x56, 0x4b),
+		kbNumpad5 = GOSU_SCANCODE(0x57, 0x4c),
+		kbNumpad6 = GOSU_SCANCODE(0x58, 0x4d),
+		kbNumpad7 = GOSU_SCANCODE(0x59, 0x47),
+		kbNumpad8 = GOSU_SCANCODE(0x5b, 0x48),
+		kbNumpad9 = GOSU_SCANCODE(0x5c, 0x49),
+		kbNumpadAdd = GOSU_SCANCODE(0x45, 0x4e),
+		kbNumpadSubtract = GOSU_SCANCODE(0x4e, 0x4a),
+		kbNumpadMultiply = GOSU_SCANCODE(0x43, 0x37),
+		kbNumpadDivide = GOSU_SCANCODE(0x4b, 0xb5),
 		kbRangeEnd = 0xff,
 
         msRangeBegin,
@@ -103,7 +128,15 @@ namespace Gosu
         msMiddle,
         msWheelUp,
         msWheelDown,
-        msRangeEnd,
+        msOther0,
+        msOther1,
+        msOther2,
+        msOther3,
+        msOther4,
+        msOther5,
+        msOther6,
+        msOther7,
+        msRangeEnd = 0x110,
         
         gpRangeBegin,
         gpLeft = gpRangeBegin,
@@ -224,4 +257,7 @@ namespace Gosu
 	};
 }
 
+#undef GOSU_SCANCODE
+#undef GOSU_SPECIAL_SCANCODE
+
 #endif

data/Gosu/Graphics.hpp

@@ -24,6 +24,10 @@ namespace Gosu
     unsigned const MAX_TEXTURE_SIZE = 1024;
     
     #ifdef GOSU_IS_MAC
+    // TODO: Without this gigantic hack, Gosu crashes in the "scale" function,
+    // but _only_ when used from Ruby 1.9. It is unclear what might cause this -
+    // maybe a compiler bug that tries to use SSE functions with the wrong
+    // alignment. Adding __attribute__((aligned(16))) does not help, though.
     struct Transform
     {
         double value[16];

data/Gosu/Input.hpp

@@ -6,28 +6,21 @@
 
 #include <Gosu/Fwd.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Buttons.hpp>
+#include <Gosu/TR1.hpp>
 
 #ifdef GOSU_IS_WIN
-#include <Gosu/Buttons.hpp>
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
 #include <windows.h>
 #endif
 
-#ifdef GOSU_IS_MAC
-#include <Gosu/ButtonsMac.hpp>
-#endif
-
 #ifdef GOSU_IS_X
-#include <Gosu/Buttons.hpp>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
 
-#include <Gosu/Platform.hpp>
-#include <Gosu/Fwd.hpp>
-#include <Gosu/TR1.hpp>
 #include <vector>
 
 namespace Gosu

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 46
-#define GOSU_VERSION "0.7.46"
+#define GOSU_POINT_VERSION 47
+#define GOSU_VERSION "0.7.47.1"
 
 #define GOSU_COPYRIGHT_NOTICE \
   " " \

data/GosuImpl/Audio/ALChannelManagement.hpp

@@ -74,7 +74,7 @@ namespace Gosu
             }
             ++currentToken;
             currentTokens[i] = currentToken;
-            return std::make_pair<int, int>(i, currentToken);
+            return std::make_pair(i, int(currentToken));
         }
         
         int sourceIfStillPlaying(int channel, int token) const

data/GosuImpl/Graphics/Text.cpp

@@ -379,7 +379,7 @@ void Gosu::registerEntity(const wstring& name, const Gosu::Bitmap& replacement)
 
 bool Gosu::isEntity(const wstring& name)
 {
-    return entities[name];
+    return entities[name].get();
 }
 
 const Gosu::Bitmap& Gosu::entityBitmap(const wstring& name)

data/GosuImpl/InputMac.mm

@@ -63,6 +63,7 @@ namespace {
         char buf[256];
         CFStringRef str = 
             (CFStringRef)CFDictionaryGetValue(dict, key);
+        // TODO - make sure that this uses UTF8!
         checkTrue(str && CFStringGetCString(str, buf, sizeof buf, CFStringGetSystemEncoding()),
             what);
         return buf;
@@ -114,9 +115,9 @@ namespace {
                 "a min value");
             SInt32 max = getDictSInt32(dict, CFSTR(kIOHIDElementMaxKey),
                 "a max value");
-            if ((max - min) == 3)
+            if ((max - min) + 1 == 4)
                 kind = fourWay;
-            else if ((max - min) == 7)
+            else if ((max - min) + 1 == 8)
                 kind = eightWay;
             else
                 kind = unknown;
@@ -160,10 +161,9 @@ namespace {
             for (unsigned i = 0; i < self.devices.size(); ++i)
                 if (self.devices[i].interface.get() == refcon)
                 {
-                    self.devices.erase(self.devices.begin() + i);
+                    self.devices[i] = Device();
                     return;
                 }
-            assert(false);
         }
         
         bool isDeviceInteresting(CFMutableDictionaryRef properties)
@@ -316,32 +316,27 @@ namespace {
             }
         }
         
-        unsigned countDevices() const
-        {
-            return devices.size();
-        }
-        
-        const Device& getDevice(unsigned i) const
-        {
-            return devices.at(i);
-        }
-
         std::tr1::array<bool, gpNum> poll()
         {
             std::tr1::array<bool, gpNum> result = { false };
             
             IOHIDEventStruct event;
-            for (int dev = 0; dev < devices.size(); ++dev)
+            for (int dev = 0; dev < devices.size() && dev < numGamepads; ++dev)
             {
-                int rangeOffset = (dev + 1) * gpNumPerGamepad - gpRangeBegin;
+                if (! devices[dev].interface)
+                    // Device has been disconnected.
+                    continue;
                 
+                int rangeOffset = (dev + 1) * gpNumPerGamepad - gpRangeBegin;
+            
                 // Axis
                 for (int ax = 0; ax < devices[dev].axis.size(); ++ax)
                 {
-                    checkIO((*devices[dev].interface)->getElementValue(
+                    if ((*devices[dev].interface)->getElementValue(
                         devices[dev].interface.get(),
-                        devices[dev].axis[ax].cookie, &event));
-                        
+                        devices[dev].axis[ax].cookie, &event) != kIOReturnSuccess)
+                        break;
+                    
                     Axis& a = devices[dev].axis[ax];
                     if (event.value < (3 * a.min + 1 * a.max) / 4.0)
                     {
@@ -360,20 +355,20 @@ namespace {
                 // Hats (merge into axis)
                 for (int hat = 0; hat < devices[dev].hats.size(); ++hat)
                 {
-                    checkIO((*devices[dev].interface)->getElementValue(
+                    if ((*devices[dev].interface)->getElementValue(
                         devices[dev].interface.get(),
-                        devices[dev].hats[hat].cookie, &event));
-                     
+                        devices[dev].hats[hat].cookie, &event) != kIOReturnSuccess)
+                        break;
+                 
                     // In case device does not start at 0 as expected.
                     event.value -= devices[dev].hats[hat].min;
-                     
+                 
                     // Treat all hats as being 8-way.
                     if (devices[dev].hats[hat].kind == Hat::fourWay)
                         event.value *= 2;
 
                     switch (event.value)
                     {
-                        // Must...resist...doing...crappy...fallthrough...magic... 
                         case 0:
                             result[gpUp + rangeOffset] = true;
                             break;
@@ -408,19 +403,18 @@ namespace {
                 // Buttons
                 for (int btn = 0; btn < devices[dev].buttons.size() && btn < 16; ++btn)
                 {
-                    checkIO((*devices[dev].interface)->getElementValue(
+                    if ((*devices[dev].interface)->getElementValue(
                         devices[dev].interface.get(),
-                        devices[dev].buttons[btn].cookie, &event));
-                    
+                        devices[dev].buttons[btn].cookie, &event) != kIOReturnSuccess)
+                        break;
+                
                     if (event.value >= 1)
                         result[gpButton0 + btn + rangeOffset] = true;
                 }
-            }
-            
-            for (int dev = 0; dev < numGamepads && dev < devices.size(); ++dev) {
-                for (int index = 0; index < gpNumPerGamepad; ++index) {
-                    result[index] = result[index] || result[index + dev * gpNumPerGamepad];
-                }
+                
+                // Merge these results into the area for "all gamepads OR'ed together"
+                for (int index = 0; index < gpNumPerGamepad; ++index)
+                    result[index] = (result[index] || result[index + (dev + 1) * gpNumPerGamepad]);
             }
             
             return result;
@@ -428,12 +422,6 @@ namespace {
     };
 }
 
-// Needed for char translation.
-namespace Gosu
-{
-	std::wstring macRomanToWstring(const std::string& s);
-}
-
 namespace {
     const unsigned numScancodes = 128;
     
@@ -590,6 +578,16 @@ bool Gosu::Input::feedNSEvent(void* event)
         case NSRightMouseUp:
             pimpl->enqueue(msRight, false);
             return true;
+        case NSOtherMouseDown:
+            if ([ev buttonNumber] >= 10)
+                return false;
+            pimpl->enqueue(msOther0 + [ev buttonNumber] - 2, true);
+            return true;
+        case NSOtherMouseUp:
+            if ([ev buttonNumber] >= 10)
+                return false;
+            pimpl->enqueue(msOther0 + [ev buttonNumber] - 2, false);
+            return true;
         case NSScrollWheel:
             if ([ev deltaY] > 0)
             {
@@ -607,7 +605,7 @@ bool Gosu::Input::feedNSEvent(void* event)
     }
 	
     // Handle other keys.
-    if (type == NSKeyDown || type == NSKeyUp)
+    if ((type == NSKeyDown || type == NSKeyUp) && [ev keyCode] <= kbRangeEnd)
     {
         pimpl->enqueue([ev keyCode], type == NSKeyDown);
         return true;
@@ -637,7 +635,7 @@ bool Gosu::Input::down(Gosu::Button btn) const
     if (btn == noButton || btn.id() >= numButtons)
         return false;
 
-    return buttonStates.at(btn.id());
+    return buttonStates[btn.id()];
 }
 
 double Gosu::Input::mouseX() const
@@ -700,7 +698,7 @@ void Gosu::Input::update()
     for (unsigned i = 0; i < pimpl->queue.size(); ++i)
     {
         Impl::WaitingButton& wb = pimpl->queue[i];
-        buttonStates.at(wb.btn.id()) = wb.down;
+        buttonStates[wb.btn.id()] = wb.down;
         if (wb.down && onButtonDown)
             onButtonDown(wb.btn);
         else if (!wb.down && onButtonUp)

data/GosuImpl/InputWin.cpp

@@ -201,15 +201,13 @@ struct Gosu::Input::Impl
             case DIERR_INPUTLOST:
             {
                 // Cannot fetch new events: Release all buttons.
-                for (unsigned id = msRangeBegin; id < msRangeEnd; ++id)
+                for (unsigned id = msRangeBegin; id <= msRangeEnd; ++id)
                     setButton(id, false, collectEvents);
                 mouse->Acquire();
                 break;
             }
         }
         
-        keyboard:
-
         inOut = inputBufferSize;
         hr = keyboard->GetDeviceData(sizeof data[0], data, &inOut, 0);
         switch (hr)
@@ -225,7 +223,7 @@ struct Gosu::Input::Impl
             case DIERR_NOTACQUIRED:
             case DIERR_INPUTLOST:
             {
-                for (unsigned id = kbRangeBegin; id < kbRangeEnd; ++id)
+                for (unsigned id = kbRangeBegin; id <= kbRangeEnd; ++id)
                     setButton(id, false, collectEvents);
                 keyboard->Acquire();
                 break;
@@ -233,10 +231,12 @@ struct Gosu::Input::Impl
         }
 
         std::tr1::array<bool, gpNum> gpBuffer = { false };
-        for (unsigned gp = 0; gp < gamepads.size(); ++gp)
+        for (unsigned gp = 0; gp < gamepads.size() && gp < numGamepads; ++gp)
         {
             gamepads[gp]->Poll();
             
+            int rangeOffset = (gp + 1) * gpNumPerGamepad - gpRangeBegin;
+
             DIJOYSTATE joy;
             hr = gamepads[gp]->GetDeviceState(sizeof joy, &joy);
             switch (hr)
@@ -244,18 +244,18 @@ struct Gosu::Input::Impl
                 case DI_OK:
                 {
                     if (joy.lX < -stickThreshold)
-                        gpBuffer[gpLeft - gpRangeBegin] = true;
+                        gpBuffer[gpLeft + rangeOffset] = true;
                     else if (joy.lX > stickThreshold)
-                        gpBuffer[gpRight - gpRangeBegin] = true;
+                        gpBuffer[gpRight + rangeOffset] = true;
 
                     if (joy.lY < -stickThreshold)
-                        gpBuffer[gpUp - gpRangeBegin] = true;
+                        gpBuffer[gpUp + rangeOffset] = true;
                     else if (joy.lY > stickThreshold)
-                        gpBuffer[gpDown - gpRangeBegin] = true;
+                        gpBuffer[gpDown + rangeOffset] = true;
 
-                    for (unsigned id = gpButton0; id < gpRangeEnd; ++id)
+                    for (unsigned id = gpButton0; id <= gpButton15; ++id)
                         if (joy.rgbButtons[id - gpButton0])
-                            gpBuffer[id - gpRangeBegin] = true;
+                            gpBuffer[id + rangeOffset] = true;
                     
                     break;
                 }
@@ -268,8 +268,13 @@ struct Gosu::Input::Impl
                     break;
                 }
             }
+
+            // Merge these results into the area for "all gamepads OR'ed together"
+            for (int index = 0; index < gpNumPerGamepad; ++index)
+                gpBuffer[index] = (gpBuffer[index] || gpBuffer[index + (gp + 1) * gpNumPerGamepad]);
         }
-        for (unsigned id = gpRangeBegin; id < gpRangeEnd; ++id)
+
+        for (unsigned id = gpRangeBegin; id <= gpRangeEnd; ++id)
             setButton(id, gpBuffer[id - gpRangeBegin], collectEvents);
     }
 };

data/GosuImpl/InputX.cpp

@@ -169,14 +169,19 @@ void Gosu::Input::update()
             case Button3: id = msRight; break;
             case Button4: id = msWheelUp; break;
             case Button5: id = msWheelDown; break;
+            case 6: id = msOther0; break;
+            case 7: id = msOther1; break;
+            case 8: id = msOther2; break;
+            case 9: id = msOther3; break;
+            case 10: id = msOther4; break;
+            case 11: id = msOther5; break;
+            case 12: id = msOther6; break;
+            case 13: id = msOther7; break;
             default: continue;
             }
             pimpl->keyMap[id] = true;
-            // TODO: Here, above, below, who came up with that cast? Uh :)
             if (onButtonDown)
                 onButtonDown(Button(id));
-            if (onButtonUp and id == msWheelUp or id == msWheelDown)
-                onButtonUp(Button(id));
         }
         else if (event.type == ButtonRelease)
         {
@@ -186,11 +191,21 @@ void Gosu::Input::update()
             case Button1: id = msLeft; break;
             case Button2: id = msMiddle; break;
             case Button3: id = msRight; break;
+            case Button4: id = msWheelUp; break;
+            case Button5: id = msWheelDown; break;
+            case 6: id = msOther0; break;
+            case 7: id = msOther1; break;
+            case 8: id = msOther2; break;
+            case 9: id = msOther3; break;
+            case 10: id = msOther4; break;
+            case 11: id = msOther5; break;
+            case 12: id = msOther6; break;
+            case 13: id = msOther7; break;
             default: continue;
             }
             pimpl->keyMap[id] = false;
             if (onButtonUp)
-                onButtonUp(*reinterpret_cast<Button*>(&id));
+                onButtonUp(Button(id));
         }
         else if (event.type == MotionNotify)
         {

data/GosuImpl/RubyGosu.swg

@@ -618,7 +618,6 @@ namespace Gosu {
 // Input and Window:
 
 // Button ID constants
-// Does not matter that it's the Mac file, %include only analyses symbols to export, not their values.
 %ignore Gosu::kbRangeBegin;
 %ignore Gosu::kbRangeEnd;
 %ignore Gosu::msRangeBegin;
@@ -628,9 +627,11 @@ namespace Gosu {
 %ignore Gosu::kbNum;
 %ignore Gosu::msNum;
 %ignore Gosu::gpNum;
+%ignore Gosu::gpNumPerGamepad;
 %ignore Gosu::numButtons;
+%ignore Gosu::numGamepads;
 %ignore Gosu::noButton;
-%include "../Gosu/ButtonsMac.hpp"
+%include "../Gosu/Buttons.hpp"
 %init %{
     GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
     // While we are at it, to some healthy srand() - otherwise unavailable to Ruby people

data/GosuImpl/RubyGosu_wrap.cxx

@@ -11245,8 +11245,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 >(7)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(45)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.45"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(47)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.47"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);
@@ -11430,6 +11430,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "KbF10", SWIG_From_int(static_cast< int >(Gosu::kbF10)));
   rb_define_const(mGosu, "KbF11", SWIG_From_int(static_cast< int >(Gosu::kbF11)));
   rb_define_const(mGosu, "KbF12", SWIG_From_int(static_cast< int >(Gosu::kbF12)));
+  rb_define_const(mGosu, "Kb0", SWIG_From_int(static_cast< int >(Gosu::kb0)));
   rb_define_const(mGosu, "Kb1", SWIG_From_int(static_cast< int >(Gosu::kb1)));
   rb_define_const(mGosu, "Kb2", SWIG_From_int(static_cast< int >(Gosu::kb2)));
   rb_define_const(mGosu, "Kb3", SWIG_From_int(static_cast< int >(Gosu::kb3)));
@@ -11439,7 +11440,40 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "Kb7", SWIG_From_int(static_cast< int >(Gosu::kb7)));
   rb_define_const(mGosu, "Kb8", SWIG_From_int(static_cast< int >(Gosu::kb8)));
   rb_define_const(mGosu, "Kb9", SWIG_From_int(static_cast< int >(Gosu::kb9)));
-  rb_define_const(mGosu, "Kb0", SWIG_From_int(static_cast< int >(Gosu::kb0)));
+  rb_define_const(mGosu, "KbTab", SWIG_From_int(static_cast< int >(Gosu::kbTab)));
+  rb_define_const(mGosu, "KbReturn", SWIG_From_int(static_cast< int >(Gosu::kbReturn)));
+  rb_define_const(mGosu, "KbSpace", SWIG_From_int(static_cast< int >(Gosu::kbSpace)));
+  rb_define_const(mGosu, "KbLeftShift", SWIG_From_int(static_cast< int >(Gosu::kbLeftShift)));
+  rb_define_const(mGosu, "KbRightShift", SWIG_From_int(static_cast< int >(Gosu::kbRightShift)));
+  rb_define_const(mGosu, "KbLeftControl", SWIG_From_int(static_cast< int >(Gosu::kbLeftControl)));
+  rb_define_const(mGosu, "KbRightControl", SWIG_From_int(static_cast< int >(Gosu::kbRightControl)));
+  rb_define_const(mGosu, "KbLeftAlt", SWIG_From_int(static_cast< int >(Gosu::kbLeftAlt)));
+  rb_define_const(mGosu, "KbRightAlt", SWIG_From_int(static_cast< int >(Gosu::kbRightAlt)));
+  rb_define_const(mGosu, "KbLeftMeta", SWIG_From_int(static_cast< int >(Gosu::kbLeftMeta)));
+  rb_define_const(mGosu, "KbRightMeta", SWIG_From_int(static_cast< int >(Gosu::kbRightMeta)));
+  rb_define_const(mGosu, "KbBackspace", SWIG_From_int(static_cast< int >(Gosu::kbBackspace)));
+  rb_define_const(mGosu, "KbLeft", SWIG_From_int(static_cast< int >(Gosu::kbLeft)));
+  rb_define_const(mGosu, "KbRight", SWIG_From_int(static_cast< int >(Gosu::kbRight)));
+  rb_define_const(mGosu, "KbUp", SWIG_From_int(static_cast< int >(Gosu::kbUp)));
+  rb_define_const(mGosu, "KbDown", SWIG_From_int(static_cast< int >(Gosu::kbDown)));
+  rb_define_const(mGosu, "KbHome", SWIG_From_int(static_cast< int >(Gosu::kbHome)));
+  rb_define_const(mGosu, "KbEnd", SWIG_From_int(static_cast< int >(Gosu::kbEnd)));
+  rb_define_const(mGosu, "KbInsert", SWIG_From_int(static_cast< int >(Gosu::kbInsert)));
+  rb_define_const(mGosu, "KbDelete", SWIG_From_int(static_cast< int >(Gosu::kbDelete)));
+  rb_define_const(mGosu, "KbPageUp", SWIG_From_int(static_cast< int >(Gosu::kbPageUp)));
+  rb_define_const(mGosu, "KbPageDown", SWIG_From_int(static_cast< int >(Gosu::kbPageDown)));
+  rb_define_const(mGosu, "KbEnter", SWIG_From_int(static_cast< int >(Gosu::kbEnter)));
+  rb_define_const(mGosu, "KbBacktick", SWIG_From_int(static_cast< int >(Gosu::kbBacktick)));
+  rb_define_const(mGosu, "KbMinus", SWIG_From_int(static_cast< int >(Gosu::kbMinus)));
+  rb_define_const(mGosu, "KbEqual", SWIG_From_int(static_cast< int >(Gosu::kbEqual)));
+  rb_define_const(mGosu, "KbBracketLeft", SWIG_From_int(static_cast< int >(Gosu::kbBracketLeft)));
+  rb_define_const(mGosu, "KbBracketRight", SWIG_From_int(static_cast< int >(Gosu::kbBracketRight)));
+  rb_define_const(mGosu, "KbBackslash", SWIG_From_int(static_cast< int >(Gosu::kbBackslash)));
+  rb_define_const(mGosu, "KbSemicolon", SWIG_From_int(static_cast< int >(Gosu::kbSemicolon)));
+  rb_define_const(mGosu, "KbApostrophe", SWIG_From_int(static_cast< int >(Gosu::kbApostrophe)));
+  rb_define_const(mGosu, "KbComma", SWIG_From_int(static_cast< int >(Gosu::kbComma)));
+  rb_define_const(mGosu, "KbPeriod", SWIG_From_int(static_cast< int >(Gosu::kbPeriod)));
+  rb_define_const(mGosu, "KbSlash", SWIG_From_int(static_cast< int >(Gosu::kbSlash)));
   rb_define_const(mGosu, "KbA", SWIG_From_int(static_cast< int >(Gosu::kbA)));
   rb_define_const(mGosu, "KbB", SWIG_From_int(static_cast< int >(Gosu::kbB)));
   rb_define_const(mGosu, "KbC", SWIG_From_int(static_cast< int >(Gosu::kbC)));
@@ -11466,29 +11500,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "KbX", SWIG_From_int(static_cast< int >(Gosu::kbX)));
   rb_define_const(mGosu, "KbY", SWIG_From_int(static_cast< int >(Gosu::kbY)));
   rb_define_const(mGosu, "KbZ", SWIG_From_int(static_cast< int >(Gosu::kbZ)));
-  rb_define_const(mGosu, "KbTab", SWIG_From_int(static_cast< int >(Gosu::kbTab)));
-  rb_define_const(mGosu, "KbReturn", SWIG_From_int(static_cast< int >(Gosu::kbReturn)));
-  rb_define_const(mGosu, "KbSpace", SWIG_From_int(static_cast< int >(Gosu::kbSpace)));
-  rb_define_const(mGosu, "KbLeftShift", SWIG_From_int(static_cast< int >(Gosu::kbLeftShift)));
-  rb_define_const(mGosu, "KbRightShift", SWIG_From_int(static_cast< int >(Gosu::kbRightShift)));
-  rb_define_const(mGosu, "KbLeftControl", SWIG_From_int(static_cast< int >(Gosu::kbLeftControl)));
-  rb_define_const(mGosu, "KbRightControl", SWIG_From_int(static_cast< int >(Gosu::kbRightControl)));
-  rb_define_const(mGosu, "KbLeftAlt", SWIG_From_int(static_cast< int >(Gosu::kbLeftAlt)));
-  rb_define_const(mGosu, "KbRightAlt", SWIG_From_int(static_cast< int >(Gosu::kbRightAlt)));
-  rb_define_const(mGosu, "KbLeftMeta", SWIG_From_int(static_cast< int >(Gosu::kbLeftMeta)));
-  rb_define_const(mGosu, "KbRightMeta", SWIG_From_int(static_cast< int >(Gosu::kbRightMeta)));
-  rb_define_const(mGosu, "KbBackspace", SWIG_From_int(static_cast< int >(Gosu::kbBackspace)));
-  rb_define_const(mGosu, "KbLeft", SWIG_From_int(static_cast< int >(Gosu::kbLeft)));
-  rb_define_const(mGosu, "KbRight", SWIG_From_int(static_cast< int >(Gosu::kbRight)));
-  rb_define_const(mGosu, "KbUp", SWIG_From_int(static_cast< int >(Gosu::kbUp)));
-  rb_define_const(mGosu, "KbDown", SWIG_From_int(static_cast< int >(Gosu::kbDown)));
-  rb_define_const(mGosu, "KbHome", SWIG_From_int(static_cast< int >(Gosu::kbHome)));
-  rb_define_const(mGosu, "KbEnd", SWIG_From_int(static_cast< int >(Gosu::kbEnd)));
-  rb_define_const(mGosu, "KbInsert", SWIG_From_int(static_cast< int >(Gosu::kbInsert)));
-  rb_define_const(mGosu, "KbDelete", SWIG_From_int(static_cast< int >(Gosu::kbDelete)));
-  rb_define_const(mGosu, "KbPageUp", SWIG_From_int(static_cast< int >(Gosu::kbPageUp)));
-  rb_define_const(mGosu, "KbPageDown", SWIG_From_int(static_cast< int >(Gosu::kbPageDown)));
-  rb_define_const(mGosu, "KbEnter", SWIG_From_int(static_cast< int >(Gosu::kbEnter)));
+  rb_define_const(mGosu, "KbNumpad0", SWIG_From_int(static_cast< int >(Gosu::kbNumpad0)));
   rb_define_const(mGosu, "KbNumpad1", SWIG_From_int(static_cast< int >(Gosu::kbNumpad1)));
   rb_define_const(mGosu, "KbNumpad2", SWIG_From_int(static_cast< int >(Gosu::kbNumpad2)));
   rb_define_const(mGosu, "KbNumpad3", SWIG_From_int(static_cast< int >(Gosu::kbNumpad3)));
@@ -11498,7 +11510,6 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "KbNumpad7", SWIG_From_int(static_cast< int >(Gosu::kbNumpad7)));
   rb_define_const(mGosu, "KbNumpad8", SWIG_From_int(static_cast< int >(Gosu::kbNumpad8)));
   rb_define_const(mGosu, "KbNumpad9", SWIG_From_int(static_cast< int >(Gosu::kbNumpad9)));
-  rb_define_const(mGosu, "KbNumpad0", SWIG_From_int(static_cast< int >(Gosu::kbNumpad0)));
   rb_define_const(mGosu, "KbNumpadAdd", SWIG_From_int(static_cast< int >(Gosu::kbNumpadAdd)));
   rb_define_const(mGosu, "KbNumpadSubtract", SWIG_From_int(static_cast< int >(Gosu::kbNumpadSubtract)));
   rb_define_const(mGosu, "KbNumpadMultiply", SWIG_From_int(static_cast< int >(Gosu::kbNumpadMultiply)));
@@ -11508,6 +11519,14 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "MsMiddle", SWIG_From_int(static_cast< int >(Gosu::msMiddle)));
   rb_define_const(mGosu, "MsWheelUp", SWIG_From_int(static_cast< int >(Gosu::msWheelUp)));
   rb_define_const(mGosu, "MsWheelDown", SWIG_From_int(static_cast< int >(Gosu::msWheelDown)));
+  rb_define_const(mGosu, "MsOther0", SWIG_From_int(static_cast< int >(Gosu::msOther0)));
+  rb_define_const(mGosu, "MsOther1", SWIG_From_int(static_cast< int >(Gosu::msOther1)));
+  rb_define_const(mGosu, "MsOther2", SWIG_From_int(static_cast< int >(Gosu::msOther2)));
+  rb_define_const(mGosu, "MsOther3", SWIG_From_int(static_cast< int >(Gosu::msOther3)));
+  rb_define_const(mGosu, "MsOther4", SWIG_From_int(static_cast< int >(Gosu::msOther4)));
+  rb_define_const(mGosu, "MsOther5", SWIG_From_int(static_cast< int >(Gosu::msOther5)));
+  rb_define_const(mGosu, "MsOther6", SWIG_From_int(static_cast< int >(Gosu::msOther6)));
+  rb_define_const(mGosu, "MsOther7", SWIG_From_int(static_cast< int >(Gosu::msOther7)));
   rb_define_const(mGosu, "GpLeft", SWIG_From_int(static_cast< int >(Gosu::gpLeft)));
   rb_define_const(mGosu, "GpRight", SWIG_From_int(static_cast< int >(Gosu::gpRight)));
   rb_define_const(mGosu, "GpUp", SWIG_From_int(static_cast< int >(Gosu::gpUp)));
@@ -11608,8 +11627,6 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "Gp3Button13", SWIG_From_int(static_cast< int >(Gosu::gp3Button13)));
   rb_define_const(mGosu, "Gp3Button14", SWIG_From_int(static_cast< int >(Gosu::gp3Button14)));
   rb_define_const(mGosu, "Gp3Button15", SWIG_From_int(static_cast< int >(Gosu::gp3Button15)));
-  rb_define_const(mGosu, "NumGamepads", SWIG_From_int(static_cast< int >(Gosu::numGamepads)));
-  rb_define_const(mGosu, "GpNumPerGamepad", SWIG_From_int(static_cast< int >(Gosu::gpNumPerGamepad)));
   
   GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
   // While we are at it, to some healthy srand() - otherwise unavailable to Ruby people

data/GosuImpl/TextInputMac.mm

@@ -1,5 +1,5 @@
 #include <Gosu/TextInput.hpp>
-#include <Gosu/ButtonsMac.hpp>
+#include <Gosu/Buttons.hpp>
 #include <GosuImpl/MacUtility.hpp>
 #include <algorithm>
 #include <vector>

data/GosuImpl/TextInputX.cpp

@@ -66,7 +66,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
 
     KeySym lower, upper;
     int keysyms_per_keycode_return;
-    KeySym keysym = (KeySym)XGetKeyboardMapping((Display*)display, ev->xkey.keycode, 0, &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);
@@ -90,8 +90,10 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
         return true;
     }
 
+    Button btn(ev->xkey.keycode-8);
+
     // Char left
-    if (ch == kbLeft && !ctrlDown)
+    if (btn == kbLeft && !ctrlDown)
     {
         if (CARET_POS > 0)
             CARET_POS -= 1;
@@ -103,7 +105,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
     }
 
     // Char right
-    if (ch == kbRight && !ctrlDown)
+    if (btn == kbRight && !ctrlDown)
     {
         if (CARET_POS < pimpl->text.length())
             CARET_POS += 1;
@@ -115,7 +117,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
     }
     
     // Home
-    if (ch == kbHome)
+    if (btn == kbHome)
     {
         CARET_POS = 0;
 
@@ -126,7 +128,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
     }
 
     // End
-    if (ch == kbEnd)
+    if (btn == kbEnd)
     {
         CARET_POS = pimpl->text.length();
 
@@ -137,7 +139,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
     }
 
     // Word left
-    if (ch == kbLeft && ctrlDown)
+    if (btn == kbLeft && ctrlDown)
     {
         if (CARET_POS == pimpl->text.length())
             --CARET_POS;
@@ -155,7 +157,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
     }
 
     // Word right
-    if (ch == kbRight && ctrlDown)
+    if (btn == kbRight && ctrlDown)
     {
         while (CARET_POS < pimpl->text.length() && iswspace(pimpl->text.at(CARET_POS)))
             ++CARET_POS;
@@ -170,7 +172,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
     }
 
     // Delete existant selection
-    if (ch == kbBackspace)
+    if (btn == kbBackspace)
     {
         if (SEL_START != CARET_POS)
         {
@@ -191,7 +193,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
     }
 
     // Delete existant selection
-    if (ch == kbDelete)
+    if (btn == kbDelete)
     {
         if (SEL_START != CARET_POS)
         {

data/GosuImpl/Utility.cpp

@@ -40,15 +40,10 @@ string Gosu::wstringToUTF8(const std::wstring& ws)
 // from this file.
 
 namespace {
-    extern const char MACROMAN[] = "MacRoman";
     extern const char UCS_2_INTERNAL[] = "UCS-2-INTERNAL";
 }
 
 namespace Gosu {
-    wstring macRomanToWstring(const string& s)
-    {
-        return iconvert<wstring, UCS_4_INTERNAL, MACROMAN>(s);
-    }
     vector<unsigned short> wstringToUniChars(const wstring& ws)
     {
         return iconvert<vector<unsigned short>, UCS_2_INTERNAL, UCS_4_INTERNAL>(ws);

data/GosuImpl/WindowMac.mm

@@ -81,6 +81,8 @@ namespace Gosu
         case NSLeftMouseUp:
         case NSRightMouseDown:
         case NSRightMouseUp:
+        case NSOtherMouseDown:
+        case NSOtherMouseUp:
         case NSScrollWheel:
         case NSKeyUp:
         case NSKeyDown:
@@ -108,7 +110,10 @@ namespace
 
 typedef void (*WindowProc)(Gosu::Window&);
 
-@interface GosuForwarder : NSObject<NSWindowDelegate>
+@interface GosuForwarder : NSObject
+#ifdef __LP64__
+                                    <NSWindowDelegate>
+#endif
 {
     Gosu::Window* win;
     WindowProc pr;
@@ -164,6 +169,8 @@ OVERRIDE_METHOD(mouseDown);
 OVERRIDE_METHOD(mouseUp);
 OVERRIDE_METHOD(rightMouseDown);
 OVERRIDE_METHOD(rightMouseUp);
+OVERRIDE_METHOD(otherMouseDown);
+OVERRIDE_METHOD(otherMouseUp);
 OVERRIDE_METHOD(scrollWheel);
 @end
 

data/lib/gosu/patches.rb

@@ -75,4 +75,7 @@ class Gosu::Window
 end
 
 # Release OpenAL resources during Ruby's shutdown, not Gosu's.
-at_exit { Gosu::_release_all_openal_resources }
+at_exit do
+  Gosu::Song.current_song.stop if Gosu::Song.current_song
+  Gosu::_release_all_openal_resources
+end

data/linux/extconf.rb

@@ -82,7 +82,13 @@ if `uname`.chomp == 'Darwin' then
   $INCFLAGS  << " -I../dependencies/libvorbis/lib"
   # To make everything work with the Objective C runtime
   $CFLAGS    << " -x objective-c -fobjc-gc -DNDEBUG"
-  CONFIG['CXXFLAGS'] =  "#{CONFIG['CXXFLAGS']} -x objective-c++" # cheat a little here
+  # Compile all C++ files as Objective C++ on OS X since mkmf does not support .mm
+  # files.
+  # Also undefine two debug flags that cause exceptions to randomly crash
+  # otherwise; see:
+  # https://trac.macports.org/ticket/27237#comment:21
+  # http://newartisans.com/2009/10/a-c-gotcha-on-snow-leopard/#comment-893
+  CONFIG['CXXFLAGS'] =  "#{CONFIG['CXXFLAGS']} -x objective-c++ -U_GLIBCXX_DEBUG -U_GLIBCXX_DEBUG_PEDANTIC"
   $LDFLAGS   << " -L/usr/X11/lib -liconv"
   %w(AudioToolbox IOKit OpenAL OpenGL AppKit ApplicationServices Foundation Carbon).each do |f|
     $LDFLAGS << " -framework #{f}"

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 95
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 46
-  version: 0.7.46
+  version: 0.7.47.1
 platform: ruby
 authors: 
 - Julian Raschke
@@ -15,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-31 00:00:00 Z
+date: 2013-04-01 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"
@@ -35,7 +29,6 @@ files:
 - Gosu/AutoLink.hpp
 - Gosu/Bitmap.hpp
 - Gosu/Buttons.hpp
-- Gosu/ButtonsMac.hpp
 - Gosu/Color.hpp
 - Gosu/Directories.hpp
 - Gosu/Font.hpp
@@ -160,7 +153,6 @@ files:
 - GosuImpl/RubyGosuStub.mm
 - GosuImpl/RubyGosu_SWIG_GC_PATCH.patch
 - GosuImpl/RubyGosu_SWIG_RENAME_PATCH.patch
-- GosuImpl/RubyGosu_SWIG_TYPE_PATCH.patch
 - GosuImpl/RubyGosu_wrap.cxx
 - GosuImpl/RubyGosu_wrap.h
 - GosuImpl/Sockets/CommSocket.cpp
@@ -269,6 +261,8 @@ files:
 homepage: http://www.libgosu.org/
 licenses: []
 
+metadata: {}
+
 post_install_message: 
 rdoc_options: 
 - README.txt
@@ -285,31 +279,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 51
-      segments: 
-      - 1
-      - 8
-      - 2
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: 
 - See https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: 2D game development library.
 test_files: []
 

data/Gosu/ButtonsMac.hpp

@@ -1,227 +0,0 @@
-#ifndef GOSU_BUTTONSMAC_HPP
-#define GOSU_BUTTONSMAC_HPP
-
-namespace Gosu
-{
-    //! List of button ids that can be used with Gosu::Input.
-    //! This enumeration contains ids for keyboard keys (kb*),
-    //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
-    enum ButtonName
-    {
-        kbRangeBegin = 0x00,
-        kbEscape = 0x35,
-        kbF1 = 0x7a,
-        kbF2 = 0x78,
-        kbF3 = 0x63,
-        kbF4 = 0x76,
-        kbF5 = 0x60,
-        kbF6 = 0x61,
-        kbF7 = 0x62,
-        kbF8 = 0x64,
-        kbF9 = 0x65,
-        kbF10 = 0x6d,
-        kbF11 = 0x67,
-        kbF12 = 0x6f,
-        kb1 = 0x12,
-        kb2 = 0x13,
-        kb3 = 0x14,
-        kb4 = 0x15,
-        kb5 = 0x17,
-        kb6 = 0x16,
-        kb7 = 0x1a,
-        kb8 = 0x1c,
-        kb9 = 0x19,
-        kb0 = 0x1d,
-        kbA	= 0x00,
-        kbB	= 0x0b,
-        kbC	= 0x08,
-        kbD	= 0x02,
-        kbE	= 0x0e,
-        kbF	= 0x03,
-        kbG	= 0x05,
-        kbH	= 0x04,
-        kbI	= 0x22,
-        kbJ	= 0x26,
-        kbK	= 0x28,
-        kbL	= 0x25,
-        kbM	= 0x2e,
-        kbN	= 0x2d,
-        kbO	= 0x1f,
-        kbP	= 0x23,
-        kbQ	= 0x0c,
-        kbR	= 0x0f,
-        kbS	= 0x01,
-        kbT	= 0x11,
-        kbU	= 0x20,
-        kbV	= 0x09,
-        kbW	= 0x0d,
-        kbX	= 0x07,
-        kbY	= 0x10,
-        kbZ	= 0x06,
-        kbTab = 0x30,
-        kbReturn = 0x24,
-        kbSpace = 0x31,
-        kbLeftShift = 0x38,
-        kbRightShift = 0x3c,
-        kbLeftControl = 0x3b,
-        kbRightControl = 0x3e,
-        kbLeftAlt = 0x3a,
-        kbRightAlt = 0x3d,
-        kbLeftMeta = 0x37,
-        kbRightMeta = 0x36,
-        kbBackspace = 0x33,
-        kbLeft = 0x7b,
-        kbRight = 0x7c,
-        kbUp = 0x7e,
-        kbDown = 0x7d,
-        kbHome = 0x73,
-        kbEnd = 0x77,
-        kbInsert = 0x72,
-        kbDelete = 0x75,
-        kbPageUp = 0x74,
-        kbPageDown = 0x79,
-        kbEnter = 0x4c,
-        kbNumpad1 = 0x53,
-        kbNumpad2 = 0x54,
-        kbNumpad3 = 0x55,
-        kbNumpad4 = 0x56,
-        kbNumpad5 = 0x57,
-        kbNumpad6 = 0x58,
-        kbNumpad7 = 0x59,
-        kbNumpad8 = 0x5b,
-        kbNumpad9 = 0x5c,
-        kbNumpad0 = 0x52,
-        kbNumpadAdd = 0x45,
-        kbNumpadSubtract = 0x4e,
-        kbNumpadMultiply = 0x43,
-        kbNumpadDivide = 0x4b,
-        kbRangeEnd = 0xffff,
-        
-        msRangeBegin,
-        msLeft = msRangeBegin,
-        msRight,
-        msMiddle,
-        msWheelUp,
-        msWheelDown,
-        msRangeEnd,
-        
-        gpRangeBegin,
-        gpLeft = gpRangeBegin,
-        gpRight,
-        gpUp,
-        gpDown,
-        gpButton0,
-        gpButton1,
-        gpButton2,
-        gpButton3,
-        gpButton4,
-        gpButton5,
-        gpButton6,
-        gpButton7,
-        gpButton8,
-        gpButton9,
-        gpButton10,
-        gpButton11,
-        gpButton12,
-        gpButton13,
-        gpButton14,
-        gpButton15,
-
-        gp0Left,
-        gp0Right,
-        gp0Up,
-        gp0Down,
-        gp0Button0,
-        gp0Button1,
-        gp0Button2,
-        gp0Button3,
-        gp0Button4,
-        gp0Button5,
-        gp0Button6,
-        gp0Button7,
-        gp0Button8,
-        gp0Button9,
-        gp0Button10,
-        gp0Button11,
-        gp0Button12,
-        gp0Button13,
-        gp0Button14,
-        gp0Button15,
-        
-        gp1Left,
-        gp1Right,
-        gp1Up,
-        gp1Down,
-        gp1Button0,
-        gp1Button1,
-        gp1Button2,
-        gp1Button3,
-        gp1Button4,
-        gp1Button5,
-        gp1Button6,
-        gp1Button7,
-        gp1Button8,
-        gp1Button9,
-        gp1Button10,
-        gp1Button11,
-        gp1Button12,
-        gp1Button13,
-        gp1Button14,
-        gp1Button15,
-        
-        gp2Left,
-        gp2Right,
-        gp2Up,
-        gp2Down,
-        gp2Button0,
-        gp2Button1,
-        gp2Button2,
-        gp2Button3,
-        gp2Button4,
-        gp2Button5,
-        gp2Button6,
-        gp2Button7,
-        gp2Button8,
-        gp2Button9,
-        gp2Button10,
-        gp2Button11,
-        gp2Button12,
-        gp2Button13,
-        gp2Button14,
-        gp2Button15,
-        
-        gp3Left,
-        gp3Right,
-        gp3Up,
-        gp3Down,
-        gp3Button0,
-        gp3Button1,
-        gp3Button2,
-        gp3Button3,
-        gp3Button4,
-        gp3Button5,
-        gp3Button6,
-        gp3Button7,
-        gp3Button8,
-        gp3Button9,
-        gp3Button10,
-        gp3Button11,
-        gp3Button12,
-        gp3Button13,
-        gp3Button14,
-        gp3Button15,
-        
-        gpRangeEnd = gp3Button15,
-        
-        numButtons = gpRangeEnd + 1,
-        numGamepads = 4,
-        noButton = 0xffffffff,
-        
-        kbNum = kbRangeEnd - kbRangeBegin + 1,
-        msNum = msRangeEnd - msRangeBegin + 1,
-        gpNum = gpRangeEnd - gpRangeBegin + 1,
-        gpNumPerGamepad = gpNum / (numGamepads + 1),
-    };
-}
-    
-#endif

data/GosuImpl/RubyGosu_SWIG_TYPE_PATCH.patch

@@ -1,11 +0,0 @@
---- GosuImpl/RubyGosu_wrap.cxx	2011-04-06 14:42:00.000000000 +0800
-+++ GosuImpl/RubyGosu_wrap_.cxx	2011-04-06 14:49:55.000000000 +0800
-@@ -1514,7 +1514,7 @@
-         downcast methods. */
-       if (obj != Qnil) {
-         VALUE value = rb_iv_get(obj, "@__swigtype__");
--        char* type_name = RSTRING_PTR(value);
-+        const char* type_name = RSTRING_PTR(value);
- 				
-         if (strcmp(type->name, type_name) == 0) {
-           return obj;