gosu 1.4.6 → 2.0.0.pre6

data/lib/gosu/swig_patches.rb

@@ -1,110 +0,0 @@
-# Exceptions in Window callbacks often get lost, this is especially annoying in draw/update.
-# It is not clear whether this is a SWIG issue or if some stack frame is not exception
-# compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
-# custom debugging help:
-class Gosu::Window
-  alias_method :initialize_with_bitmask, :initialize
-
-  def initialize(width, height, *args)
-    $gosu_gl_blocks = nil
-
-    if args.first.is_a? Hash
-      flags = 0
-      flags |= 1 if args.first[:fullscreen]
-      flags |= 2 if args.first[:resizable]
-      flags |= 4 if args.first[:borderless]
-      initialize_with_bitmask(width, height, flags, args.first[:update_interval] || 16.666666)
-    else
-      initialize_with_bitmask(width, height, args[0] ? 1 : 0, args[1] || 16.666666)
-    end
-  end
-
-  %w(update draw needs_redraw? needs_cursor?
-     gain_focus lose_focus button_down button_up
-     gamepad_connected gamepad_disconnected drop).each do |callback|
-    define_method "protected_#{callback}" do |*args|
-      begin
-        # If there has been an exception, don't do anything as to not make matters worse.
-        # Conveniently turn the return value into a boolean result (for needs_cursor? etc).
-        defined?(@_exception) ? false : !!send(callback, *args)
-      rescue Exception => e
-        # Exit the message loop naturally, then re-throw during the next tick.
-        @_exception = e
-        close!
-        false
-      end
-    end
-  end
-
-  def protected_draw_2
-    protected_draw
-    $gosu_gl_blocks_2 = $gosu_gl_blocks
-    $gosu_gl_blocks = nil
-  end
-
-  alias_method :show_internal, :show
-  def show
-    show_internal
-    # Try to format the message nicely, without any useless patching that we are
-    # doing here.
-    if defined? @_exception
-      if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen?
-        @_exception.backtrace.reject! { |line| line.include? "lib/gosu/swig_patches.rb" }
-      end
-      raise @_exception
-    end
-  end
-
-  alias_method :tick_internal, :tick
-  def tick
-    value = tick_internal
-    # Try to format the message nicely, without any useless patching that we are
-    # doing here.
-    if defined? @_exception
-      if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen?
-        @_exception.backtrace.reject! { |line| line.include? "lib/gosu/swig_patches.rb" }
-      end
-      raise @_exception
-    end
-
-    value
-  end
-end
-
-module Gosu
-  # Keep a reference to these blocks that is only cleared after Window#draw.
-  # Otherwise, the GC might free these blocks while Gosu is still rendering.
-  def self.gl(z = nil, &block)
-    $gosu_gl_blocks ||= []
-    $gosu_gl_blocks << block
-    if z.nil?
-      unsafe_gl(&block)
-    else
-      unsafe_gl(z, &block)
-    end
-  end
-end
-
-# SWIG somehow maps the instance method "argb" as an overload of the class
-# method of the same name.
-class Gosu::Color
-  alias_method :initialize_without_argb, :initialize
-
-  # The (a,r,g,b) constructor overload was dropped in C++ to reduce ambiguity,
-  # adding it via %extend in gosu.i does not work, so patch it here.
-  def initialize(*args)
-    if args.size == 4
-      initialize_without_argb(args[1], args[2], args[3])
-      self.alpha = args[0]
-    else
-      initialize_without_argb(*args)
-    end
-  end
-
-  alias_method :argb, :to_i
-end
-
-# SWIG will not let me rename my method to '[]=', so use alias_method here.
-class Gosu::Font
-  alias_method :[]=, :set_image
-end

data/src/BlockAllocator.cpp

@@ -1,131 +0,0 @@
-#include <Gosu/Utility.hpp>
-#include "BlockAllocator.hpp"
-#include <stdexcept>
-#include <vector>
-using namespace std;
-
-struct Gosu::BlockAllocator::Impl : private Gosu::Noncopyable
-{
-    unsigned width, height;
-
-    vector<Block> blocks;
-    unsigned first_x, first_y;
-    unsigned max_w, max_h;
-    
-    void mark_block_used(const Block& block, unsigned a_width, unsigned a_height)
-    {
-        first_x += a_width;
-        if (first_x + a_width >= width) {
-            first_x = 0;
-            first_y += a_height;
-        }
-        blocks.push_back(block);
-    }
-
-    bool is_block_free(const Block& block) const
-    {
-        // right and bottom are exclusive (not part of the block).
-        unsigned right = block.left + block.width;
-        unsigned bottom = block.top + block.height;
-
-        // Block isn't valid.
-        if (right > width || bottom > height) return false;
-
-        // Test if the block collides with any existing rects.
-        for (auto b : blocks) {
-            if (b.left < right && block.left < b.left + b.width &&
-                    b.top < bottom && block.top < b.top + b.height) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-};
-
-Gosu::BlockAllocator::BlockAllocator(unsigned width, unsigned height)
-: pimpl(new Impl)
-{
-    pimpl->width = width;
-    pimpl->height = height;
-
-    pimpl->first_x = 0;
-    pimpl->first_y = 0;
-
-    pimpl->max_w = width;
-    pimpl->max_h = height;
-}
-
-Gosu::BlockAllocator::~BlockAllocator()
-{
-}
-
-unsigned Gosu::BlockAllocator::width() const
-{
-    return pimpl->width;
-}
-
-unsigned Gosu::BlockAllocator::height() const
-{
-    return pimpl->height;
-}
-
-bool Gosu::BlockAllocator::alloc(unsigned a_width, unsigned a_height, Block& b)
-{
-    // The rect wouldn't even fit onto the texture!
-    if (a_width > width() || a_height > height()) return false;
-
-    // We know there's no space left.
-    if (a_width > pimpl->max_w && a_height > pimpl->max_h) return false;
-    
-    // Start to look for a place next to the last returned rect. Chances are
-    // good we'll find a place there.
-    b = Block(pimpl->first_x, pimpl->first_y, a_width, a_height);
-    if (pimpl->is_block_free(b)) {
-        pimpl->mark_block_used(b, a_width, a_height);
-        return true;
-    }
-
-    // Brute force: Look for a free place on this texture.
-    unsigned& x = b.left;
-    unsigned& y = b.top;
-    for (y = 0; y <= height() - a_height; y += 16) {
-        for (x = 0; x <= width() - a_width; x += 8) {
-            if (!pimpl->is_block_free(b)) continue;
-
-            // Found a nice place!
-
-            // Try to make up for the large for ()-stepping.
-            while (y > 0 && pimpl->is_block_free(Block(x, y - 1, a_width, a_height))) --y;
-            while (x > 0 && pimpl->is_block_free(Block(x - 1, y, a_width, a_height))) --x;
-            
-            pimpl->mark_block_used(b, a_width, a_height);
-            return true;
-        }
-    }
-
-    // So there was no space for the bitmap. Remember this for later.
-    pimpl->max_w = a_width - 1;
-    pimpl->max_h = a_height - 1;
-    return false;
-}
-
-void Gosu::BlockAllocator::block(unsigned left, unsigned top, unsigned width, unsigned height)
-{
-    pimpl->blocks.emplace_back(left, top, width, height);
-}
-
-void Gosu::BlockAllocator::free(unsigned left, unsigned top, unsigned width, unsigned height)
-{
-    for (auto it = pimpl->blocks.begin(), end = pimpl->blocks.end(); it != end; ++it) {
-        if (it->left == left && it->top == top && it->width == width && it->height == height) {
-            pimpl->blocks.erase(it);
-            // Be optimistic again, since we might have deleted the largest/only block.
-            pimpl->max_w = pimpl->width - 1;
-            pimpl->max_h = pimpl->height - 1;
-            return;
-        }
-    }
-
-    throw logic_error("Tried to free an invalid block");
-}

data/src/BlockAllocator.hpp

@@ -1,32 +0,0 @@
-#pragma once
-
-#include <Gosu/Platform.hpp>
-#include <memory>
-
-namespace Gosu
-{
-    class BlockAllocator
-    {
-        struct Impl;
-        const std::unique_ptr<Impl> pimpl;
-
-    public:
-        struct Block
-        {
-            unsigned left, top, width, height;
-            Block() {}
-            Block(unsigned left, unsigned top, unsigned width, unsigned height)
-            : left(left), top(top), width(width), height(height) {}
-        };
-
-        BlockAllocator(unsigned width, unsigned height);
-        ~BlockAllocator();
-
-        unsigned width() const;
-        unsigned height() const;
-
-        bool alloc(unsigned width, unsigned height, Block& block);
-        void block(unsigned left, unsigned top, unsigned width, unsigned height);
-        void free(unsigned left, unsigned top, unsigned width, unsigned height);
-    };
-}

data/src/DirectoriesApple.cpp

@@ -1,69 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_MAC)
-
-#import <Gosu/Directories.hpp>
-#import <Foundation/Foundation.h>
-#import <unistd.h>
-
-void Gosu::use_resource_directory()
-{
-    chdir(resource_prefix().c_str());
-}
-
-const std::string& Gosu::user_settings_prefix()
-{
-    static const std::string user_settings_prefix = [] {
-        @autoreleasepool {
-            NSString* library =
-                    NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES)
-                            .firstObject;
-            NSString* preferences = [library stringByAppendingPathComponent:@"Preferences"];
-
-            return std::string{preferences.UTF8String ?: "."} + "/";
-        }
-    }();
-    return user_settings_prefix;
-}
-
-const std::string& Gosu::user_documents_prefix()
-{
-    static const std::string user_documents_prefix = [] {
-        @autoreleasepool {
-            NSString* documents =
-                    NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)
-                            .firstObject;
-
-            return std::string{documents.UTF8String ?: "."} + "/";
-        }
-    }();
-    return user_documents_prefix;
-}
-
-const std::string& Gosu::resource_prefix()
-{
-    static const std::string resource_prefix = [] {
-        @autoreleasepool {
-            NSString* resources = [NSBundle mainBundle].resourcePath;
-            return std::string{resources.UTF8String ?: "."} + "/";
-        }
-    }();
-    return resource_prefix;
-}
-
-const std::string& Gosu::shared_resource_prefix()
-{
-#ifdef GOSU_IS_IPHONE
-    return resource_prefix();
-#else
-    static const std::string shared_resource_prefix = [] {
-        @autoreleasepool {
-            NSString* bundle_path = [NSBundle mainBundle].bundlePath;
-            NSString* containing_path = [bundle_path stringByDeletingLastPathComponent];
-            return std::string{containing_path.UTF8String ?: "."};
-        }
-    }();
-    return shared_resource_prefix;
-#endif
-}
-
-#endif

data/src/DirectoriesUnix.cpp

@@ -1,46 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_X)
-
-#include <Gosu/Directories.hpp>
-#include <Gosu/Utility.hpp>
-#include <cassert>
-#include <pwd.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-static std::string home_dir()
-{
-    passwd* pwd = getpwuid(geteuid());
-    return pwd && pwd->pw_dir ? pwd->pw_dir : ".";
-}
-
-void Gosu::use_resource_directory()
-{
-    // Do nothing, we expect the user to have the correct cwd on Linux.
-}
-
-const std::string& Gosu::resource_prefix()
-{
-    static const std::string empty;
-    return empty;
-}
-
-const std::string& Gosu::shared_resource_prefix()
-{
-    static const std::string empty;
-    return empty;
-}
-
-const std::string& Gosu::user_settings_prefix()
-{
-    static const std::string user_settings_prefix = home_dir() + "/.";
-    return user_settings_prefix;
-}
-
-const std::string& Gosu::user_documents_prefix()
-{
-    static const std::string user_documents_prefix = home_dir() + "/";
-    return user_documents_prefix;
-}
-
-#endif

data/src/DirectoriesWin.cpp

@@ -1,65 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_WIN)
-
-#include <Gosu/Directories.hpp>
-#include <Gosu/Utility.hpp>
-#include "WinUtility.hpp"
-#include <cwchar>
-#include <shlobj.h>
-#include <stdexcept>
-
-static std::string special_folder_path(int csidl)
-{
-    WCHAR buf[MAX_PATH + 2];
-    if (FAILED(SHGetFolderPathW(nullptr, csidl | CSIDL_FLAG_CREATE, nullptr, 0, buf)))
-        throw std::runtime_error{"Error getting special folder path"};
-    size_t len = std::wcslen(buf);
-    if (buf[len - 1] != L'\\') {
-        buf[len] = L'\\';
-        buf[len + 1] = 0;
-    }
-    return Gosu::utf16_to_utf8(buf);
-}
-
-std::string exe_filename()
-{
-    WCHAR buffer[MAX_PATH * 2];
-    Gosu::winapi_check(GetModuleFileNameW(nullptr, buffer, MAX_PATH * 2),
-                       "getting the module filename");
-    return Gosu::utf16_to_utf8(buffer);
-}
-
-void Gosu::use_resource_directory()
-{
-    SetCurrentDirectory(utf8_to_utf16(resource_prefix()).c_str());
-}
-
-const std::string& Gosu::resource_prefix()
-{
-    static const std::string resource_prefix = [] {
-        std::string result = exe_filename();
-        const auto last_delim = result.find_last_of("\\/");
-        result.resize(last_delim == std::string::npos ? 0 : last_delim + 1);
-        return result;
-    }();
-    return resource_prefix;
-}
-
-const std::string& Gosu::shared_resource_prefix()
-{
-    return resource_prefix();
-}
-
-const std::string& Gosu::user_settings_prefix()
-{
-    static const std::string user_settings_prefix = special_folder_path(CSIDL_APPDATA);
-    return user_settings_prefix;
-}
-
-const std::string& Gosu::user_documents_prefix()
-{
-    static const std::string user_documents_prefix = special_folder_path(CSIDL_PERSONAL);
-    return user_documents_prefix;
-}
-
-#endif

data/src/EmptyImageData.hpp

@@ -1,52 +0,0 @@
-#pragma once
-
-#include <Gosu/ImageData.hpp>
-#include <memory>
-
-namespace Gosu
-{
-    class EmptyImageData : public ImageData
-    {
-    public:
-        int width() const override //
-        {
-            return 0;
-        }
-
-        int height() const override //
-        {
-            return 0;
-        }
-
-        void draw(double, double, Color, double, double, Color, //
-                  double, double, Color, double, double, Color, //
-                  ZPos, BlendMode) const override
-        {
-        }
-
-        GLTexInfo* gl_tex_info() const override //
-        {
-            return nullptr;
-        }
-
-        Bitmap to_bitmap() const override //
-        {
-            return Bitmap();
-        }
-
-        std::unique_ptr<ImageData> subimage(int, int, int, int) const override //
-        {
-            return nullptr;
-        }
-
-        void insert(const Bitmap&, int x, int y) override //
-        {
-        }
-
-        static const std::shared_ptr<EmptyImageData>& instance_ptr()
-        {
-            static std::shared_ptr<EmptyImageData> instance = std::make_shared<EmptyImageData>();
-            return instance;
-        }
-    };
-}

data/src/FileUnix.cpp

@@ -1,99 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if !defined(GOSU_IS_WIN)
-
-#include <Gosu/IO.hpp>
-#include <Gosu/Utility.hpp>
-#include <cstring>
-#include <fcntl.h>
-#include <stdexcept>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-using namespace std;
-
-struct Gosu::File::Impl : private Gosu::Noncopyable
-{
-    int fd = -1;
-    void* mapping = MAP_FAILED;
-    
-    ~Impl()
-    {
-        if (fd >= 0) {
-            close(fd);
-        }
-    }
-};
-
-Gosu::File::File(const string& filename, FileMode mode)
-: pimpl(new Impl)
-{
-    int flags;
-
-    switch (mode) {
-    case FM_READ:
-        flags = O_RDONLY;
-        break;
-    case FM_REPLACE:
-        flags = O_RDWR | O_TRUNC | O_CREAT;
-        break;
-    case FM_ALTER:
-        flags = O_RDWR | O_CREAT;
-        break;
-    default:
-        throw invalid_argument("Unknown file mode: " + to_string(mode));
-    }
-
-    // TODO: Locking flags?
-
-    pimpl->fd = open(filename.c_str(), flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
-    if (pimpl->fd < 0) throw runtime_error("Cannot open file " + filename);
-    
-    if (mode == FM_READ && size() > 0) {
-        pimpl->mapping = mmap(nullptr, size(), PROT_READ, 0, pimpl->fd, 0);
-    }
-}
-
-Gosu::File::~File()
-{
-    if (pimpl->mapping != MAP_FAILED) {
-        munmap(pimpl->mapping, size());
-    }
-}
-
-size_t Gosu::File::size() const
-{
-    // TODO: Error checking?
-    return static_cast<size_t>(lseek(pimpl->fd, 0, SEEK_END));
-}
-
-void Gosu::File::resize(size_t new_size)
-{
-    ftruncate(pimpl->fd, new_size);
-}
-
-void Gosu::File::read(size_t offset, size_t length, void* dest_buffer) const
-{
-    // TODO: Bounds checks?
-    if (pimpl->mapping != MAP_FAILED) {
-        memcpy(dest_buffer, static_cast<const char*>(pimpl->mapping) + offset, length);
-    }
-    else {
-        // TODO: Error checking?
-        lseek(pimpl->fd, offset, SEEK_SET);
-        ::read(pimpl->fd, dest_buffer, length);
-    }
-}
-
-void Gosu::File::write(size_t offset, size_t length, const void* source_buffer)
-{
-    // TODO: Error checking?
-    lseek(pimpl->fd, offset, SEEK_SET);
-    ::write(pimpl->fd, source_buffer, length);
-}
-
-#endif

data/src/FileWin.cpp

@@ -1,88 +0,0 @@
-#include <Gosu/Platform.hpp>
-#if defined(GOSU_IS_WIN)
-
-#include "WinUtility.hpp"
-#include <Gosu/IO.hpp>
-#include <Gosu/Utility.hpp>
-#include <windows.h>
-using namespace std;
-
-// TODO: Error checking
-
-struct Gosu::File::Impl : private Gosu::Noncopyable
-{
-    HANDLE handle = INVALID_HANDLE_VALUE;
-
-    ~Impl()
-    {
-        if (handle != INVALID_HANDLE_VALUE) {
-            CloseHandle(handle);
-        }
-    }
-};
-
-Gosu::File::File(const string& filename, FileMode mode)
-: pimpl(new Impl)
-{
-    DWORD access;
-    switch (mode) {
-    case FM_READ:
-        access = GENERIC_READ;
-        break;
-    case FM_REPLACE:
-        access = GENERIC_WRITE;
-        break;
-    case FM_ALTER:
-        access = GENERIC_READ | GENERIC_WRITE;
-        break;
-    }
-    DWORD share_mode = FILE_SHARE_READ;
-    DWORD creation_disp = (mode == FM_READ) ? OPEN_EXISTING : OPEN_ALWAYS;
-
-    wstring wfilename = utf8_to_utf16(filename);
-    pimpl->handle = CreateFileW(wfilename.c_str(), access, share_mode, 0, creation_disp,
-                                FILE_ATTRIBUTE_NORMAL, 0);
-    if (pimpl->handle == INVALID_HANDLE_VALUE) {
-        throw_last_winapi_error("opening " + filename);
-    }
-    if (mode == FM_REPLACE) {
-        resize(0);
-    }
-}
-
-Gosu::File::~File()
-{
-}
-
-size_t Gosu::File::size() const
-{
-    return GetFileSize(pimpl->handle, 0);
-}
-
-void Gosu::File::resize(size_t new_size)
-{
-    if (SetFilePointer(pimpl->handle, new_size, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER) {
-        throw_last_winapi_error("setting the file pointer");
-    }
-    winapi_check(SetEndOfFile(pimpl->handle), "resizing a file");
-}
-
-void Gosu::File::read(size_t offset, size_t length, void* dest_buffer) const
-{
-    if (SetFilePointer(pimpl->handle, offset, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER) {
-        throw_last_winapi_error("setting the file pointer");
-    }
-    DWORD dummy;
-    winapi_check(ReadFile(pimpl->handle, dest_buffer, length, &dummy, 0));
-}
-
-void Gosu::File::write(size_t offset, size_t length, const void* source_buffer)
-{
-    if (SetFilePointer(pimpl->handle, offset, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER) {
-        throw_last_winapi_error("setting the file pointer");
-    }
-    DWORD dummy;
-    winapi_check(WriteFile(pimpl->handle, source_buffer, length, &dummy, 0));
-}
-
-#endif