gosu 0.7.15 → 0.7.16

data/GosuImpl/RubyGosu_wrap.h

@@ -16,6 +16,15 @@ namespace Swig {
 }
 
 
+class SwigDirector_TextInput : public Gosu::TextInput, public Swig::Director {
+
+public:
+    SwigDirector_TextInput(VALUE self);
+    virtual ~SwigDirector_TextInput();
+    virtual std::wstring filter(std::wstring const &textIn) const;
+};
+
+
 class SwigDirector_Window : public Gosu::Window, public Swig::Director {
 
 public:

data/GosuImpl/TextInputMac.mm

@@ -19,6 +19,7 @@
 
 @interface GosuTextInput : NSResponder
 {
+    Gosu::TextInput* _filter;
     std::wstring* _text;
     unsigned* _caretPos;
     unsigned* _selectionStart;
@@ -44,8 +45,10 @@
     std::vector<unichar> unibuf([str length]);
     [str getCharacters: &unibuf[0]];
     
-    _text->insert(_text->begin() + CARET_POS, unibuf.begin(), unibuf.end());
-    (CARET_POS) += unibuf.size();
+    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;
 }
 
@@ -145,8 +148,10 @@ IMPL_WITH_SEL_RESET(moveToEndOfDocument)
 
 // Helper to set up this instance.
 
-- (void)setText:(std::wstring&)text andCaretPos:(unsigned&)caretPos andSelectionStart:(unsigned&)selectionStart
+- (void)setFilter:(Gosu::TextInput&)filter andText:(std::wstring&)text
+    andCaretPos:(unsigned&)caretPos andSelectionStart:(unsigned&)selectionStart
 {
+    _filter = &filter;
     _text = &text;
     _caretPos = &caretPos;
     _selectionStart = &selectionStart;
@@ -165,7 +170,8 @@ Gosu::TextInput::TextInput()
 : pimpl(new Impl)
 {
     pimpl->responder.reset([[GosuTextInput alloc] init]);
-    [pimpl->responder.get() setText: pimpl->text andCaretPos: pimpl->caretPos andSelectionStart: pimpl->selectionStart];
+    [pimpl->responder.get() setFilter: *this andText: pimpl->text
+        andCaretPos: pimpl->caretPos andSelectionStart: pimpl->selectionStart];
 }
 
 Gosu::TextInput::~TextInput()

data/GosuImpl/TextInputWin.cpp

@@ -61,8 +61,10 @@ bool Gosu::TextInput::feedMessage(unsigned long message, unsigned long wparam, u
             CARET_POS = SEL_START = min;
         }
         
-        pimpl->text.insert(pimpl->text.begin() + CARET_POS, static_cast<wchar_t>(wparam));
-        CARET_POS += 1;
+        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;
     }

data/GosuImpl/TextInputX.cpp

@@ -45,19 +45,19 @@ unsigned Gosu::TextInput::selectionStart() const
 #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;
-
+{
+    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;
-    XConvertCase(XKeycodeToKeysym((Display*)display, ev->xkey.keycode, 0), &lower, &upper);
-
-    wchar_t ch = static_cast<wchar_t>(shiftDown ? upper : lower);
+
+    KeySym lower, upper;
+    XConvertCase(XKeycodeToKeysym((Display*)display, ev->xkey.keycode, 0), &lower, &upper);
+
+    wchar_t ch = static_cast<wchar_t>(shiftDown ? upper : lower);
 
     if (ch >= 32 && ch != 127 && ch <= 255)
     {
@@ -70,8 +70,10 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
             CARET_POS = SEL_START = min;
         }
         
-        pimpl->text.insert(pimpl->text.begin() + CARET_POS, ch);
-        CARET_POS += 1;
+        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;
     }
@@ -167,7 +169,7 @@ bool Gosu::TextInput::feedXEvent(void* display, void* event)
         }
         else if (CARET_POS > 0)
         {
-            unsigned oldCaret = CARET_POS;
+            unsigned oldCaret = CARET_POS;
             CARET_POS -= 1;
             pimpl->text.erase(pimpl->text.begin() + CARET_POS, pimpl->text.begin() + oldCaret);
             SEL_START = CARET_POS;

data/GosuImpl/WindowMac.mm

@@ -185,7 +185,6 @@ struct Gosu::Window::Impl
     
     ObjRef<NSOpenGLContext> context;
     boost::scoped_ptr<Graphics> graphics;
-    boost::scoped_ptr<Audio> audio;
     boost::scoped_ptr<Input> input;
     double interval;
     bool mouseViz;
@@ -195,8 +194,8 @@ struct Gosu::Window::Impl
         NSRect rect = NSMakeRect(0, 0, width, height);
         unsigned style = NSTitledWindowMask | NSMiniaturizableWindowMask | NSClosableWindowMask;
         window.reset([[GosuWindow alloc] initWithContentRect: rect styleMask:style 
-                                         backing:NSBackingStoreBuffered defer:NO]);
-        [window.obj() retain]; // ...or is it autorelease?
+                                         backing:NSBackingStoreBuffered defer:YES]);
+        [window.obj() retain]; // TODO: Why?
         
         [window.obj() setContentView: [[GosuView alloc] init]];
         
@@ -208,6 +207,11 @@ struct Gosu::Window::Impl
     static void doTick(Window& window);
 };
 
+// Without this variable, the context seems to get eaten by the GC. Oh
+// wow, this sounds hacky and fragile. I am scared :(
+
+static NSOpenGLContext* context;
+
 Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
                      double updateInterval)
 : pimpl(new Impl)
@@ -246,13 +250,14 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     ObjRef<NSOpenGLPixelFormat> fmt([[NSOpenGLPixelFormat alloc] initWithAttributes:attrs]);
     if (not fmt.get())
         throw std::runtime_error("Could not find a suitable OpenGL pixel format");
-    pimpl->context.reset([[NSOpenGLContext alloc] initWithFormat: fmt.obj() shareContext:nil]);
+    ::context = [[NSOpenGLContext alloc] initWithFormat: fmt.obj() shareContext:nil];
+    pimpl->context.reset(context);
     if (not pimpl->context.get())
         throw std::runtime_error("Unable to create an OpenGL context with the supplied pixel format");
     
     if (fullscreen) {
         // Fullscreen: Create no window, instead change resolution.
-
+        
         // Save old mode and retrieve BPP
         pimpl->savedMode = CGDisplayCurrentMode(kCGDirectMainDisplay);
 		pimpl->savedFrame = [[NSScreen mainScreen] frame];
@@ -265,7 +270,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
                          kCFNumberIntType, &width);
         CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(pimpl->newMode, kCGDisplayHeight),
                          kCFNumberIntType, &height);
-
+        
         // Actual changing postponed until show().
     }
     else
@@ -275,6 +280,7 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
         pimpl->createWindow(width, height);
         
         // Tell context to draw on this window.
+        
         [pimpl->context.obj() setView:[pimpl->window.obj() contentView]];
     }
     
@@ -308,7 +314,9 @@ Gosu::Window::~Window()
     if (graphics().fullscreen())
     {
         CGDisplaySwitchToMode(kCGDirectMainDisplay, pimpl->savedMode);
+        #ifndef __LP64__
 		[[NSScreen mainScreen] setFrame:pimpl->savedFrame]; 
+        #endif
         CGReleaseAllDisplays();
     }
 }
@@ -372,7 +380,7 @@ void Gosu::Window::show()
     {
         [NSCursor unhide];
 
-        // Resetting the mod shouldn't be all too important according to the docs.
+        // 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);
         CGDisplayRelease(kCGDirectMainDisplay);
@@ -407,20 +415,6 @@ Gosu::Graphics& Gosu::Window::graphics()
     return *pimpl->graphics;
 }
 
-const Gosu::Audio& Gosu::Window::audio() const
-{
-    if (!pimpl->audio)
-        pimpl->audio.reset(new Gosu::Audio);
-    return *pimpl->audio;
-}
- 
-Gosu::Audio& Gosu::Window::audio()
-{
-    if (!pimpl->audio)
-        pimpl->audio.reset(new Gosu::Audio);
-    return *pimpl->audio;
-}
- 
 const Gosu::Input& Gosu::Window::input() const
 {
     return *pimpl->input;
@@ -500,7 +494,7 @@ void Gosu::Window::Impl::doTick(Window& window)
         }
     }
     
-    window.audio().update();
+    Gosu::Song::update();
     window.input().update();
     window.update();
 
@@ -510,7 +504,23 @@ void Gosu::Window::Impl::doTick(Window& window)
         window.draw();
         window.graphics().end();
         [window.pimpl->context.obj() flushBuffer];
-    }    
+    }
     
     if (GosusDarkSide::oncePerTick) GosusDarkSide::oncePerTick();
 }
+
+// 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/GosuImpl/WindowWin.cpp

@@ -2,7 +2,6 @@
 #include <Gosu/WinUtility.hpp>
 #include <Gosu/Timing.hpp>
 #include <Gosu/Graphics.hpp>
-#include <Gosu/Audio.hpp>
 #include <Gosu/Input.hpp>
 #include <Gosu/TextInput.hpp>
 #include <GosuImpl/Graphics/Common.hpp>
@@ -167,7 +166,6 @@ struct Gosu::Window::Impl
     HWND handle;
 	HDC hdc;
     boost::scoped_ptr<Graphics> graphics;
-    boost::scoped_ptr<Audio> audio;
     boost::scoped_ptr<Input> input;
 	double updateInterval;
     bool iconified;
@@ -192,6 +190,13 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     double updateInterval)
 : pimpl(new Impl)
 {
+    if (!fullscreen && (width >= screenWidth() | height >= screenHeight()))
+    {
+        MessageBox(0, L"Your desktop resolution is too small to open the requested window.",
+            L"Cannot open window", MB_OK | MB_ICONERROR);
+        throw std::invalid_argument("Desktop resolution is too small to open a window of this size");
+    }
+
     pimpl->originalWidth = width;
     pimpl->originalHeight = height;
     
@@ -377,20 +382,6 @@ Gosu::Graphics& Gosu::Window::graphics()
     return *pimpl->graphics;
 }
 
-const Gosu::Audio& Gosu::Window::audio() const
-{
-    if (!pimpl->audio)
-        pimpl->audio.reset(new Gosu::Audio(handle()));
-    return *pimpl->audio;
-}
-
-Gosu::Audio& Gosu::Window::audio()
-{
-    if (!pimpl->audio)
-        pimpl->audio.reset(new Gosu::Audio(handle()));
-    return *pimpl->audio;
-}
-
 const Gosu::Input& Gosu::Window::input() const
 {
     return *pimpl->input;
@@ -485,3 +476,18 @@ LRESULT Gosu::Window::handleMessage(UINT message, WPARAM wparam, LPARAM lparam)
 
     return DefWindowProc(handle(), message, wparam, lparam);
 }
+
+// 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/GosuImpl/WindowX.cpp

@@ -78,7 +78,6 @@ struct Gosu::Window::Impl
 {
     boost::scoped_ptr<Graphics> graphics;
     boost::scoped_ptr<Input> input;
-    boost::scoped_ptr<Audio> audio;
 
     ::Display* display;
     
@@ -360,20 +359,6 @@ Gosu::Graphics& Gosu::Window::graphics()
     return *pimpl->graphics;
 }
 
-const Gosu::Audio& Gosu::Window::audio() const
-{
-    if (!pimpl->audio)
-        pimpl->audio.reset(new Gosu::Audio());
-    return *pimpl->audio;
-}
-
-Gosu::Audio& Gosu::Window::audio()
-{
-    if (!pimpl->audio)
-        pimpl->audio.reset(new Gosu::Audio());
-    return *pimpl->audio;
-}
-
 const Gosu::Input& Gosu::Window::input() const
 {
     return *pimpl->input;
@@ -409,4 +394,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;
+}
+

data/Rakefile

@@ -17,6 +17,7 @@ COMMON_CPP_FILES = COMMON_FILES + FileList[
 ]
 
 COMMON_RUBY_FILES = COMMON_FILES + FileList[
+  'lib/gosu/patches.rb',
   'examples/*.rb',
   'examples/media/*',
   'reference/rdoc/**/*'
@@ -30,7 +31,7 @@ SOURCE_FILES = COMMON_CPP_FILES + COMMON_RUBY_FILES + FileList[
   'mac/Gosu-Info.plist', 'mac/RubyGosu App-Info.plist',
   'mac/Gosu.icns',
   'windows/Gosu.sln', 'windows/Gosu.vcproj', 'windows/RubyGosu.vcproj',
-  'windows/zlib, libpng/**/*'
+  'dependencies/**/*'
 ]
 SOURCE_FILES.uniq!
 
@@ -85,7 +86,7 @@ task :todo do
     doc = Appscript.app("OmniFocus").default_document
     my_projects = doc.folders["Einzelprojekte"].projects.get
     gosu_projects = my_projects.select { |p| p.name.get =~ /^Gosu/ }
-
+    
     wiki_page.puts "#summary List of upcoming To Do items, refreshed daily."
     wiki_page.puts "#labels Featured"
     wiki_page.puts
@@ -94,9 +95,9 @@ task :todo do
     wiki_page.puts "This list of tasks is exported automatically from my OmniFocus projects."
     wiki_page.puts "(Last update: #{Date.today})"
     wiki_page.puts
-
+    
     $shown_tasks = []
-
+    
     def wiki_page.list_tasks_in root, indent = 2
       root.tasks.get.each do |task|
         next if $shown_tasks.include? task or task.completed.get
@@ -112,7 +113,15 @@ task :todo do
     end
   end
   
-  sh "svn ci wiki -m 'To Do list refresh'"
+  `svn update wiki` # Just for cleanliness' sake.
+  
+  diff = `svn diff wiki`
+  if diff.count("\n") == 13 and diff =~ /Last update/ then
+    # We have only changed the date, just revert.
+    sh "svn revert wiki/ToDo.wiki"
+  else
+    sh "svn commit wiki -m 'To Do list refresh'"
+  end
 end
 
 desc "Clean rdoc directory so all HTML will definitely be refreshed"
@@ -159,13 +168,16 @@ namespace :mac do
     sh "cd mac && xcodebuild -project Gosu.xcodeproj -target 'RubyGosu Core' -configuration 'Release'"
     sh "cd mac && xcodebuild -project Gosu.xcodeproj -target 'RubyGosu Core' -configuration 'Release with 1.9'"
     sh "cd mac && xcodebuild -project Gosu.xcodeproj -target 'RubyGosu App' -configuration 'Release with 1.9'"
+    # TODO: MacRuby
   end
 
   MAC_ARCHIVE_FILENAME = "public/gosu-mac-#{GOSU_VERSION}.tar.gz"
 
   desc "Build the archive #{MAC_ARCHIVE_FILENAME}"
   task :archive => [:cpp, :ruby, :version] do
-    files = COMMON_CPP_FILES + COMMON_RUBY_FILES + FileList['lib/gosu.rb', 'lib/gosu.*.bundle', 'Gosu.framework/**/*']
+    files = COMMON_CPP_FILES + COMMON_RUBY_FILES +
+      FileList['lib/gosu.rb', 'lib/gosu.*.bundle', 'Gosu.framework/**/*']
+      # TODO: 'lib/hotgosu.rb', 'lib/hotgosu/**/*', 
     sh "tar -czf #{MAC_ARCHIVE_FILENAME} #{files.map { |filename| "'#{filename}'" }.join(' ')}"
   end
   
@@ -190,9 +202,14 @@ namespace :mac do
   MAC_SPEC = Gem::Specification.new do |s|
     apply_gemspec_defaults s
     s.platform = 'universal-darwin'
-    s.files = COMMON_RUBY_FILES + ['lib/gosu.rb', 'lib/gosu.for_1_8.bundle', 'lib/gosu.for_1_9.bundle']
+    s.files = COMMON_RUBY_FILES +
+      FileList['lib/gosu.rb', 'lib/gosu.*.bundle', 'lib/hotgosu.rb', 'lib/hotgosu/**/*']
   end
   Rake::GemPackageTask.new(MAC_SPEC) { |t| t.package_dir = 'public/mac_gem' }
+  
+  task :release_gem => :gem do
+    sh "gem push public/mac_gem/gosu-#{GOSU_VERSION}-universal-darwin.gem"
+  end
 end
 
 namespace :win do
@@ -235,6 +252,10 @@ namespace :win do
     s.files = COMMON_RUBY_FILES + ['lib/gosu.rb', 'lib/gosu.for_1_8.so', 'lib/gosu.for_1_9.so', 'lib/fmod.dll']
   end
   Rake::GemPackageTask.new(WINDOWS_SPEC) { |t| t.package_dir = 'public/windows_gem' }
+  
+  task :release_gem => :gem do
+    sh "gem push public/windows_gem/gosu-#{GOSU_VERSION}-x86-mswin32-60.gem"
+  end
 end
 
 namespace :linux do
@@ -265,7 +286,7 @@ namespace :linux do
                       'libgl',
                       'X11 includes and libraries',
                       'pangoft2',
-                      'fmod or SDL_mixer',
+                      'SDL_mixer',
  
                       "(Packages for Debian/Ubuntu:\n" +
                       ' g++ pkg-config ruby-dev xorg-dev' +
@@ -275,6 +296,10 @@ namespace :linux do
   end
   
   Rake::GemPackageTask.new(LINUX_SPEC) { |t| t.package_dir = 'public/linux_gem' }
+
+  task :release_gem => :gem do
+    sh "gem push public/linux_gem/gosu-#{GOSU_VERSION}.gem"
+  end
 end
 
 GIT_PREFIX="PATH=/usr/local/git/bin:$PATH"
@@ -284,10 +309,11 @@ task :push_to_github do
   Dir.chdir '../gosu.git'
   fetch_output = `#{GIT_PREFIX} git svn fetch`
   puts fetch_output
-  return if fetch_output.empty?
-  last_commit_id = fetch_output.reverse[/ [a-f0-9]{40} /].reverse
-  sh "#{GIT_PREFIX} git rebase #{last_commit_id}"
-  sh "#{GIT_PREFIX} git push origin master"
+  if not fetch_output.empty? then
+    last_commit_id = fetch_output.reverse[/ [a-f0-9]{40} /].reverse
+    sh "#{GIT_PREFIX} git rebase #{last_commit_id}"
+    sh "#{GIT_PREFIX} git push origin master"
+  end
 end
 
 # TODO? Gem upload to RubyForge: http://nubyonrails.com/articles/tutorial-publishing-rubygems-with-hoe