gosu 0.7.22 → 0.7.23

data/GosuImpl/RubyGosu_wrap.h

@@ -33,6 +33,9 @@ public:
     virtual void update();
     virtual void draw();
     virtual bool needsRedraw() const;
+    virtual bool needsCursor() const;
+    virtual void loseFocus();
+    virtual void releaseMemory();
     virtual void buttonDown(Gosu::Button arg0);
     virtual void buttonUp(Gosu::Button arg0);
 };

data/GosuImpl/TextInputWin.cpp

@@ -5,7 +5,9 @@
 #include <wctype.h>
 
 // OPT-IN, have you heard of it?!
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 
 struct Gosu::TextInput::Impl

data/GosuImpl/Utility.cpp

@@ -53,7 +53,9 @@ namespace Gosu {
 
 #endif
 #else
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 wstring Gosu::utf8ToWstring(const string& utf8)
 {

data/GosuImpl/WindowMac.mm

@@ -370,8 +370,6 @@ void Gosu::Window::show()
  
     if (graphics().fullscreen())
     {
-        [NSCursor hide];
-
         // Set new mode
         cgCheck(CGDisplayCapture(kCGDirectMainDisplay), "capturing display");
         cgCheck(CGDisplaySwitchToMode(kCGDirectMainDisplay, pimpl->newMode), "switching mode");
@@ -389,8 +387,6 @@ void Gosu::Window::show()
     
     if (graphics().fullscreen())
     {
-        [NSCursor unhide];
-
         // Resetting the mode shouldn't be all too important according to the docs.
         // Let's leave it in until time for testing comes, though.
         CGDisplaySwitchToMode(kCGDirectMainDisplay, pimpl->savedMode);
@@ -487,22 +483,20 @@ void Gosu::Window::Impl::doTick(Window& window)
     GLint value = 1;
     [window.pimpl->context.obj() setValues: &value forParameter: NSOpenGLCPSwapInterval];
     
-    if (!window.graphics().fullscreen())
+    if ((window.graphics().fullscreen() ||
+        NSPointInRect([window.pimpl->window.obj() mouseLocationOutsideOfEventStream],
+                      [[window.pimpl->window.obj() contentView] frame])) &&
+        [NSApp isActive] && !window.needsCursor())
+    {
+        if (window.pimpl->mouseViz)
+            [NSCursor hide];
+        window.pimpl->mouseViz = false;
+    }
+    else
     {
-        if (NSPointInRect([window.pimpl->window.obj() mouseLocationOutsideOfEventStream],
-                          [[window.pimpl->window.obj() contentView] frame]) &&
-            [NSApp isActive])
-        {
-            if (window.pimpl->mouseViz)
-                [NSCursor hide];
-            window.pimpl->mouseViz = false;
-        }
-        else
-        {
-            if (not window.pimpl->mouseViz)
-                [NSCursor unhide];
-            window.pimpl->mouseViz = true;
-        }
+        if (not window.pimpl->mouseViz)
+            [NSCursor unhide];
+        window.pimpl->mouseViz = true;
     }
     
     Gosu::Song::update();

data/GosuImpl/WindowTouch.mm

@@ -1,9 +1,11 @@
-#import <Gosu/Window.hpp>
-#import <Gosu/Graphics.hpp>
-#import <Gosu/Audio.hpp>
-#import <Gosu/Input.hpp>
-#import <GosuImpl/MacUtility.hpp>   
-#import <GosuImpl/Graphics/GosuView.hpp>
+#include <Gosu/Window.hpp>
+#include <Gosu/Graphics.hpp>
+#include <Gosu/Audio.hpp>
+#include <Gosu/Input.hpp>
+#include <GosuImpl/MacUtility.hpp>   
+#include <GosuImpl/Graphics/GosuView.hpp>
+#include <boost/bind.hpp>
+
 #import <CoreGraphics/CoreGraphics.h>
 #import <UIKit/UIKit.h>
 #import <OpenGLES/EAGL.h>
@@ -23,16 +25,15 @@ namespace Gosu {
 }
 
 int main(int argc, char *argv[]) {
-    Gosu::ObjRef<NSAutoreleasePool> pool([[NSAutoreleasePool alloc] init]);
+    [[NSAutoreleasePool alloc] init];
 	return UIApplicationMain(argc, argv, nil, @"GosuAppDelegate");
 }
 
 class Gosu::Audio {};
 
 struct Gosu::Window::Impl {
-    ObjRef<NSAutoreleasePool> pool;
     ObjRef<UIWindow> window;
-    ObjRef<GosuView> view;
+    ObjRef<GosuViewController> controller;
     boost::scoped_ptr<Graphics> graphics;
     boost::scoped_ptr<Audio> audio;
     boost::scoped_ptr<Input> input;
@@ -45,17 +46,19 @@ Gosu::Window& windowInstance();
 }
 @end
 
-// Ugly monkey patching to bridge the C++ and ObjC sides.
 namespace
 {
+    // Ugly patching to bridge the C++ and ObjC sides.
     GosuView* gosuView = nil;
+    bool pausedSong = false;
+    bool paused = false;
 }
 
 @implementation GosuAppDelegate
 - (void)applicationDidFinishLaunching:(UIApplication *)application {
-    [[UIApplication sharedApplication] setStatusBarHidden:YES animated:NO];
-    [UIApplication sharedApplication].idleTimerDisabled = YES;
-    [UIApplication sharedApplication].statusBarOrientation = UIInterfaceOrientationLandscapeRight;
+    [UIDevice.currentDevice beginGeneratingDeviceOrientationNotifications];
+    UIApplication.sharedApplication.idleTimerDisabled = YES;
+    UIApplication.sharedApplication.statusBarOrientation = UIInterfaceOrientationLandscapeRight;
     
     windowInstance();
     
@@ -67,17 +70,31 @@ namespace
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application {
-	// TODO: stop updating; periodically draw
+	if (Gosu::Song::currentSong())
+    {
+        Gosu::Song::currentSong()->pause();
+        pausedSong = true;
+    }
+    paused = true;
+    windowInstance().loseFocus();
 }
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {
-	// TODO: start updating again
+	if (pausedSong)
+    {
+        if (Gosu::Song::currentSong())
+            Gosu::Song::currentSong()->play();
+        pausedSong = false;
+    }
+    paused = false;
 }
 
 - (void)doTick:(NSTimer*)timer {
-    windowInstance().update();
+    if (!paused)
+        windowInstance().update();
     [gosuView drawView];
-    [gosuView removeDeadTouches];
+    Gosu::Song::update();
+    windowInstance().input().update();
 }
 @end
 
@@ -85,17 +102,18 @@ Gosu::Window::Window(unsigned width, unsigned height,
     bool fullscreen, double updateInterval)
 : pimpl(new Impl)
 {
-    pimpl->pool.reset([[NSAutoreleasePool alloc] init]);
 	pimpl->window.reset([[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]);
-    pimpl->view.reset([[GosuView alloc] initWithFrame:[pimpl->window.obj() bounds]]);
-    gosuView = pimpl->view.obj();
-
-	[pimpl->window.obj() addSubview: pimpl->view.obj()];
+    pimpl->controller.reset([[GosuViewController alloc] init]);
+    gosuView = (GosuView*)pimpl->controller.obj().view;
+	[pimpl->window.obj() addSubview: gosuView];
     
-    pimpl->graphics.reset(new Graphics(320, 480, false));
-    pimpl->graphics->setResolution(480, 320);
+    pimpl->graphics.reset(new Graphics(screenWidth(), screenHeight(), false));
+    pimpl->graphics->setResolution(screenHeight(), screenWidth());
     pimpl->audio.reset(new Audio());
-    pimpl->input.reset(new Input());
+    pimpl->input.reset(new Input(gosuView, updateInterval));
+    pimpl->input->onTouchBegan = boost::bind(&Window::touchBegan, this, _1);
+    pimpl->input->onTouchMoved = boost::bind(&Window::touchMoved, this, _1);
+    pimpl->input->onTouchEnded = boost::bind(&Window::touchEnded, this, _1);
     pimpl->interval = updateInterval;
 
     [pimpl->window.obj() makeKeyAndVisible];
@@ -143,15 +161,9 @@ Gosu::Input& Gosu::Window::input() {
 
 void Gosu::Window::show()
 {
-    throw std::logic_error("Gosu::Window::show not available on iPhone");
 }
 
 void Gosu::Window::close()
 {
-    throw "NYI";
-}
-
-const Gosu::Touches& Gosu::Window::currentTouches() const
-{
-    return [pimpl->view.obj() currentTouches];
+    throw std::logic_error("Cannot close windows manually on iOS");
 }

data/GosuImpl/WindowWin.cpp

@@ -1,4 +1,6 @@
-#define NOMINMAX // RAGE >_<
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif // RAGE >_<
 
 #include <Gosu/Window.hpp>
 #include <Gosu/WinUtility.hpp>
@@ -156,7 +158,6 @@ namespace Gosu
             wc.hIconSm = (HICON)CopyImage(wc.hIcon, IMAGE_ICON,
                 GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
                 LR_COPYFROMRESOURCE | LR_COPYRETURNORG);
-
             
             name = reinterpret_cast<LPCTSTR>(RegisterClassEx(&wc));
             Win::check(name, "registering a window class");
@@ -197,7 +198,6 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     pimpl->originalWidth = width;
     pimpl->originalHeight = height;
     
-    // Select window styles depending on mode.fullscreen.
     DWORD style = WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
     DWORD styleEx = WS_EX_APPWINDOW;
     if (fullscreen)
@@ -257,7 +257,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
 			width *= factor, height *= factor;
 	}
 
-    // Determine the size the window needs to have.
+    // Determine the size the window needs to have including UI chrome.
     RECT rc = { 0, 0, width, height };
     AdjustWindowRectEx(&rc, style, FALSE, styleEx);
     unsigned windowW = rc.right - rc.left;
@@ -357,6 +357,10 @@ void Gosu::Window::show()
 			{
 				lastTick = ms;
 				input().update();
+				// TODO: Bad heuristic -- this causes flickering cursor on right and bottom border of the
+				// window.
+				if (input().mouseX() >= 0 && input().mouseY() >= 0)
+					SendMessage(handle(), WM_SETCURSOR, reinterpret_cast<WPARAM>(handle()), HTCLIENT);
 			    update();
                 if (needsRedraw())
       				::InvalidateRect(handle(), 0, FALSE);
@@ -412,6 +416,18 @@ HWND Gosu::Window::handle() const
 
 LRESULT Gosu::Window::handleMessage(UINT message, WPARAM wparam, LPARAM lparam)
 {
+	if (message == WM_SETCURSOR)
+    {
+		if (LOWORD(lparam) != HTCLIENT || GetForegroundWindow() != handle() || needsCursor())
+		{
+			static const HCURSOR arrowCursor = LoadCursor(0, IDC_ARROW);
+			SetCursor(arrowCursor);
+	    }
+		else
+			SetCursor(NULL);
+        return TRUE;
+    }
+
     if (message == WM_SETFOCUS && graphics().fullscreen() && IsWindowVisible(pimpl->handle))
     {
         if (pimpl->iconified)
@@ -461,12 +477,6 @@ LRESULT Gosu::Window::handleMessage(UINT message, WPARAM wparam, LPARAM lparam)
         return 0;
     }
 
-    if (message == WM_SETCURSOR && LOWORD(lparam) == HTCLIENT)
-    {
-        SetCursor(0);
-        return TRUE;
-    }
-
     if (message == WM_SYSCOMMAND)
     {
         switch(wparam)
@@ -483,9 +493,7 @@ LRESULT Gosu::Window::handleMessage(UINT message, WPARAM wparam, LPARAM lparam)
     }
 
     if (pimpl->input && input().textInput() && input().textInput()->feedMessage(message, wparam, lparam))
-    {
         return 0;
-    }
 
     return DefWindowProc(handle(), message, wparam, lparam);
 }

data/GosuImpl/WindowX.cpp

@@ -83,6 +83,9 @@ struct Gosu::Window::Impl
     
     bool mapped, showing, active;
     
+    Cursor emptyCursor;
+    bool showingCursor;
+    
     ::GLXContext context;
     ::Window window;
     ::XVisualInfo* visual;
@@ -150,6 +153,17 @@ struct Gosu::Window::Impl
             }
         }
         
+        if (showingCursor && !window->needsCursor())
+        {
+            XUndefineCursor(display, this->window);
+            showingCursor = false;
+        }
+        else if (!showingCursor && window->needsCursor())
+        {
+            XDefineCursor(display, this->window, emptyCursor);
+            showingCursor = true;
+        }
+        
         window->input().update();
         window->update();
 
@@ -237,10 +251,9 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     char emptyData[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
     Pixmap emptyBitmap =
         XCreateBitmapFromData(pimpl->display, pimpl->window, emptyData, 8, 8);
-    Cursor emptyCursor = XCreatePixmapCursor(pimpl->display, emptyBitmap,
+    pimpl->emptyCursor = XCreatePixmapCursor(pimpl->display, emptyBitmap,
         emptyBitmap, &black, &black, 0, 0);
-    XDefineCursor(pimpl->display, pimpl->window, emptyCursor);
-    XFreeCursor(pimpl->display, emptyCursor);
+    pimpl->showingCursor = true; // Empty cursor not yet installed
 
     // Must be current already so that Graphics' constructor can set up things
     glXMakeCurrent(pimpl->display, pimpl->window, pimpl->context);
@@ -262,6 +275,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
 
 Gosu::Window::~Window()
 {    
+    XFreeCursor(pimpl->display, pimpl->emptyCursor);
     XDestroyWindow(pimpl->display, pimpl->window);
     XSync(pimpl->display, false);
 }
@@ -282,10 +296,6 @@ void Gosu::Window::setCaption(const std::wstring& caption)
 
     pimpl->title = caption;
 
-    // TODO: Why?!
-    //if (!pimpl->showing)
-    //    return;
-
     std::string tmpString(pimpl->title.begin(), pimpl->title.end());
     std::vector<char> title(pimpl->title.size() + 1);
     std::copy(tmpString.begin(), tmpString.end(), title.begin());
@@ -394,20 +404,20 @@ Gosu::Window::SharedContext Gosu::Window::createSharedContext() {
     return SharedContext(
         new boost::function<void()>(boost::bind(makeCurrentContext, dpy2, pimpl->window, ctx)),
         boost::bind(releaseContext, dpy2, ctx));
-}
-
-// Deprecated.
-
-class Gosu::Audio {};
-namespace { Gosu::Audio dummyAudio; }
-
-const Gosu::Audio& Gosu::Window::audio() const
-{
-    return dummyAudio;
-}
- 
-Gosu::Audio& Gosu::Window::audio()
-{
-    return dummyAudio;
-}
+}
+
+// Deprecated.
+
+class Gosu::Audio {};
+namespace { Gosu::Audio dummyAudio; }
+
+const Gosu::Audio& Gosu::Window::audio() const
+{
+    return dummyAudio;
+}
+ 
+Gosu::Audio& Gosu::Window::audio()
+{
+    return dummyAudio;
+}
 

data/examples/CptnRuby.rb

@@ -25,15 +25,14 @@
 # ...Enemies, a more sophisticated object system, weapons, title and credits
 # screens...
 
-require '../lib/gosu'
-# begin
-#   # In case you use Gosu via rubygems.
-#   require 'rubygems'
-# rescue LoadError
-#   # In case you don't.
-# end
-# 
-# require 'gosu'
+begin
+  # In case you use Gosu via rubygems.
+  require 'rubygems'
+rescue LoadError
+  # In case you don't.
+end
+
+require 'gosu'
 include Gosu
 
 module Tiles

data/lib/gosu/swig_patches.rb

@@ -7,15 +7,3 @@ class Gosu::Image
     args.size == 4 ? from_text4(*args) : from_text7(*args)
   end
 end
-
-# Linux workaround: instead of declaring a constant, we declare a hidden function and
-# call it when we need to define the constant. Otherwise, we get a weird libGL.so segfault.
-module Gosu
-  def self.const_missing sym
-    if sym == :MAX_TEXTURE_SIZE then
-      const_set sym, __max_texture_size
-    else
-      super
-    end
-  end
-end

data/linux/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-if defined? RUBY_PLATFORM and (RUBY_PLATFORM['-win32'] or RUBY_PLATFORM['win32-'] or RUBY_PLATFORM['-mingw32']) then
+if defined? RUBY_PLATFORM and (RUBY_PLATFORM['-win32'] or RUBY_PLATFORM['win32-'] or RUBY_PLATFORM['mswin'] or RUBY_PLATFORM['mingw32']) then
   puts 'This gem is not meant to be installed on Windows. If you see this message, gem made a mistake.'
   puts 'On Windows, please use:'
   puts 'gem install gosu --platform=i386-mingw32'
@@ -17,7 +17,7 @@ SOURCE_FILES =
     %w(Math.cpp Utility.cpp IO.cpp FileUnix.cpp InputX.cpp TextInputX.cpp TimingUnix.cpp WindowX.cpp
 	     Graphics/Bitmap.cpp Graphics/BitmapUtils.cpp Graphics/Color.cpp
 	     Graphics/TexChunk.cpp Graphics/Graphics.cpp Graphics/Image.cpp
-	     Graphics/RotFlip.cpp Graphics/BlockAllocator.cpp
+	     Graphics/BlockAllocator.cpp
 	     Graphics/Texture.cpp Graphics/LargeImageData.cpp
 	     Graphics/BitmapPNG.cpp Graphics/Font.cpp Graphics/BitmapBMP.cpp
 	     Graphics/TextUnix.cpp Graphics/Text.cpp Graphics/Transform.cpp