gosu 0.12.1 → 0.13.0

data/src/TextApple.cpp

@@ -17,16 +17,18 @@ typedef UIFont AppleFont;
 typedef NSFont AppleFont;
 #endif
 
+using namespace std;
+
 // If a font is a filename, loads the font and returns its family name that can be used
 // like any system font. Otherwise, just returns the family name.
-static std::string normalize_font(const std::string& font_name)
+static string normalize_font(const string& font_name)
 {
 #ifdef GOSU_IS_IPHONE
     // On iOS, we have no support for loading font files yet. However, if you register your fonts
     // via your app's Info.plist, you should be able to reference them by name.
     return font_name;
 #else
-    static std::map<std::string, std::string> family_of_files;
+    static map<string, string> family_of_files;
     
     // Not a path name: It is already a family name.
     if (font_name.find("/") == font_name.npos) {
@@ -58,13 +60,13 @@ static std::string normalize_font(const std::string& font_name)
 #endif
 }
 
-static AppleFont* get_font(std::string font_name, unsigned font_flags, double height)
+static AppleFont* get_font(string font_name, unsigned font_flags, double height)
 {
     font_name = normalize_font(font_name);
 
-    static std::map<std::pair<std::string, std::pair<unsigned, double>>, AppleFont*> used_fonts;
+    static map<pair<string, pair<unsigned, double>>, AppleFont*> used_fonts;
     
-    auto key = std::make_pair(font_name, std::make_pair(font_flags, height));
+    auto key = make_pair(font_name, make_pair(font_flags, height));
     
     AppleFont* result = used_fonts[key];
     if (!result) {
@@ -89,7 +91,7 @@ static AppleFont* get_font(std::string font_name, unsigned font_flags, double he
                 result = get_font(Gosu::default_font_name(), 0, height);
             }
             else {
-                throw std::runtime_error("Cannot load default font");
+                throw runtime_error("Cannot load default font");
             }
         }
         used_fonts[key] = result;
@@ -97,9 +99,13 @@ static AppleFont* get_font(std::string font_name, unsigned font_flags, double he
     return result;
 }
 
-std::string Gosu::default_font_name()
+string Gosu::default_font_name()
 {
+#ifdef GOSU_IS_IPHONE
     return "Arial";
+#else
+    return "Arial Unicode MS";
+#endif
 }
 
 #ifndef GOSU_IS_IPHONE
@@ -115,11 +121,11 @@ static NSDictionary* attribute_dictionary(NSFont* font, unsigned font_flags)
 }
 #endif
 
-unsigned Gosu::text_width(const std::string& text, const std::string& font_name,
-    unsigned font_height, unsigned font_flags)
+unsigned Gosu::text_width(const string& text, const string& font_name,
+                          unsigned font_height, unsigned font_flags)
 {
     if (text.find_first_of("\r\n") != text.npos) {
-        throw std::invalid_argument("text_width cannot handle line breaks");
+        throw invalid_argument("text_width cannot handle line breaks");
     }
     
     AppleFont* font = get_font(font_name, font_flags, font_height);
@@ -138,11 +144,11 @@ unsigned Gosu::text_width(const std::string& text, const std::string& font_name,
     return ceil(size.width / size.height * font_height);
 }
 
-void Gosu::draw_text(Bitmap& bitmap, const std::string& text, int x, int y, Color c,
-    const std::string& font_name, unsigned font_height, unsigned font_flags)
+void Gosu::draw_text(Bitmap& bitmap, const string& text, int x, int y, Color c,
+                     const string& font_name, unsigned font_height, unsigned font_flags)
 {
     if (text.find_first_of("\r\n") != text.npos) {
-        throw std::invalid_argument("the argument to draw_text cannot contain line breaks");
+        throw invalid_argument("the argument to draw_text cannot contain line breaks");
     }
     
     AppleFont* font = get_font(font_name, font_flags, font_height);

data/src/TextInput.cpp

@@ -6,14 +6,15 @@
 #include <Gosu/Platform.hpp>
 #include <SDL.h>
 #include <cctype>
+using namespace std;
 
 struct Gosu::TextInput::Impl
 {
-    std::string text;
+    string text;
     
     // This is the current IME composition.
     // http://wiki.libsdl.org/Tutorials/TextInput#CandidateList
-    std::string composition;
+    string composition;
     
     // Indices into the UTF-8 encoded text.
     unsigned caret_pos = 0, selection_start = 0;
@@ -25,17 +26,17 @@ struct Gosu::TextInput::Impl
         return (static_cast<unsigned char>(ch) & 0xc0) == 0x80;
     }
     
-    void insert_text(const std::string& new_text)
+    void insert_text(const string& new_text)
     {
         // Stop IME composition.
         composition.clear();
 
         // Delete (overwrite) previous selection.
         if (caret_pos != selection_start) {
-            unsigned min = std::min(caret_pos, selection_start);
-            unsigned max = std::max(caret_pos, selection_start);
-            text.erase(text.begin() + min, text.begin() + max);
-            caret_pos = selection_start = min;
+            unsigned from = min(caret_pos, selection_start);
+            unsigned to = max(caret_pos, selection_start);
+            text.erase(text.begin() + from, text.begin() + to);
+            caret_pos = selection_start = from;
         }
         
         text.insert(text.begin() + caret_pos, new_text.begin(), new_text.end());
@@ -77,20 +78,20 @@ struct Gosu::TextInput::Impl
     
     void move_word_left(bool modify_selection)
     {
-        while (caret_pos > 0 && std::isspace(text[caret_pos - 1])) {
+        while (caret_pos > 0 && isspace(text[caret_pos - 1])) {
             move_left(modify_selection);
         }
-        while (caret_pos > 0 && !std::isspace(text[caret_pos - 1])) {
+        while (caret_pos > 0 && !isspace(text[caret_pos - 1])) {
             move_left(modify_selection);
         }
     }
 
     void move_word_right(bool modify_selection)
     {
-        while (caret_pos < text.length() && std::isspace(text.at(caret_pos))) {
+        while (caret_pos < text.length() && isspace(text.at(caret_pos))) {
             move_right(modify_selection);
         }
-        while (caret_pos < text.length() && !std::isspace(text.at(caret_pos))) {
+        while (caret_pos < text.length() && !isspace(text.at(caret_pos))) {
             move_right(modify_selection);
         }
     }
@@ -116,10 +117,10 @@ struct Gosu::TextInput::Impl
     void delete_backward()
     {
         if (selection_start != caret_pos) {
-            unsigned min = std::min(caret_pos, selection_start);
-            unsigned max = std::max(caret_pos, selection_start);
-            text.erase(text.begin() + min, text.begin() + max);
-            selection_start = caret_pos = min;
+            unsigned from = min(caret_pos, selection_start);
+            unsigned to = max(caret_pos, selection_start);
+            text.erase(text.begin() + from, text.begin() + to);
+            selection_start = caret_pos = from;
         }
         else if (caret_pos > 0) {
             move_left(false);
@@ -131,10 +132,10 @@ struct Gosu::TextInput::Impl
     void delete_forward()
     {
         if (selection_start != caret_pos) {
-            unsigned min = std::min(caret_pos, selection_start);
-            unsigned max = std::max(caret_pos, selection_start);
-            text.erase(text.begin() + min, text.begin() + max);
-            selection_start = caret_pos = min;
+            unsigned from = min(caret_pos, selection_start);
+            unsigned to = max(caret_pos, selection_start);
+            text.erase(text.begin() + from, text.begin() + to);
+            selection_start = caret_pos = from;
         }
         else if (caret_pos < text.length()) {
             move_right(false);
@@ -153,16 +154,16 @@ Gosu::TextInput::~TextInput()
 {
 }
 
-std::string Gosu::TextInput::text() const
+string Gosu::TextInput::text() const
 {
-    std::string composed_text = pimpl->text;
+    string composed_text = pimpl->text;
     if (!pimpl->composition.empty()) {
         composed_text.insert(pimpl->caret_pos, pimpl->composition);
     }
     return composed_text;
 }
 
-void Gosu::TextInput::set_text(const std::string& text)
+void Gosu::TextInput::set_text(const string& text)
 {
     pimpl->text = text;
     pimpl->composition.clear();

data/src/TextWin.cpp

@@ -13,16 +13,17 @@
 #include <algorithm>
 #include <map>
 #include <set>
-#include <stdexcept>
+#include <stdexcept>
+using namespace std;
 
-std::string Gosu::default_font_name()
+string Gosu::default_font_name()
 {
     return "Arial";
 }
 
 namespace Gosu
 {
-    std::string get_name_from_ttf_file(const std::string& filename);
+    string get_name_from_ttf_file(const string& filename);
 
     namespace
     {
@@ -79,7 +80,7 @@ namespace Gosu
                 return bitmap;
             }
 
-            void select_font(std::string font_name, unsigned font_height, unsigned font_flags) const
+            void select_font(string font_name, unsigned font_height, unsigned font_flags) const
             {
                 // TODO for ASYNC support:
                 // Use a lock on both maps.
@@ -89,7 +90,7 @@ namespace Gosu
                 // performance on my test system.
                 // In case of trouble, it can be taken out without worrying too much.
 
-                static std::map<std::string, std::string> custom_fonts;
+                static map<string, string> custom_fonts;
                 
                 if (font_name.find("/") != font_name.npos) {
                     if (custom_fonts.count(font_name) == 0) {
@@ -101,11 +102,10 @@ namespace Gosu
                     }
                 }
                 
-                static std::map<std::pair<std::string, unsigned>, HFONT> loaded_fonts;
+                static map<pair<string, unsigned>, HFONT> loaded_fonts;
                 
                 HFONT font;
-                std::pair<std::string, unsigned> key =
-                    std::make_pair(font_name, font_height | font_flags << 16);
+                pair<string, unsigned> key = make_pair(font_name, font_height | font_flags << 16);
                 
                 if (loaded_fonts.count(key) == 0) {
                     LOGFONT logfont = {
@@ -117,9 +117,7 @@ namespace Gosu
                         DEFAULT_PITCH | FF_DONTCARE
                     };
                     
-                    std::wstring wfont_name = utf8_to_wstring(font_name);
-                    // Don't rely on wcsncpy being in std::...
-                    using namespace std;
+                    wstring wfont_name = utf8_to_wstring(font_name);
                     wcsncpy(logfont.lfFaceName, wfont_name.c_str(), LF_FACESIZE);
                     logfont.lfFaceName[LF_FACESIZE - 1] = 0;
                     
@@ -136,17 +134,17 @@ namespace Gosu
     }
 };
 
-unsigned Gosu::text_width(const std::string& text, const std::string& font_name,
-    unsigned font_height, unsigned font_flags)
+unsigned Gosu::text_width(const string& text, const string& font_name,
+                          unsigned font_height, unsigned font_flags)
 {
     if (text.find_first_of("\r\n") != text.npos) {
-        throw std::invalid_argument("the argument to text_width cannot contain line breaks");
+        throw invalid_argument("the argument to text_width cannot contain line breaks");
     }
     
     WinBitmap helper(1, 1);
     helper.select_font(font_name, font_height, font_flags);
     
-    std::wstring wtext = utf8_to_wstring(text);
+    wstring wtext = utf8_to_wstring(text);
     SIZE size;
     winapi_check(GetTextExtentPoint32W(helper.context(), wtext.c_str(), wtext.length(), &size),
         "calculating the width of a text");
@@ -154,11 +152,11 @@ unsigned Gosu::text_width(const std::string& text, const std::string& font_name,
     return size.cx;
 }
 
-void Gosu::draw_text(Bitmap& bitmap, const std::string& text, int x, int y, Color c,
-    const std::string& font_name, unsigned font_height, unsigned font_flags)
+void Gosu::draw_text(Bitmap& bitmap, const string& text, int x, int y, Color c,
+                     const string& font_name, unsigned font_height, unsigned font_flags)
 {
     if (text.find_first_of("\r\n") != text.npos) {
-        throw std::invalid_argument("the argument to draw_text cannot contain line breaks");
+        throw invalid_argument("the argument to draw_text cannot contain line breaks");
     }
     
     unsigned width = text_width(text, font_name, font_height, font_flags);
@@ -172,7 +170,7 @@ void Gosu::draw_text(Bitmap& bitmap, const std::string& text, int x, int y, Colo
     winapi_check(SetBkMode(helper.context(), TRANSPARENT),
         "setting a bitmap's background mode to TRANSPARENT");
 
-    std::wstring wtext = utf8_to_wstring(text);
+    wstring wtext = utf8_to_wstring(text);
     ExtTextOutW(helper.context(), 0, 0, 0, 0, wtext.c_str(), wtext.length(), 0);
     
     for (unsigned rel_y = 0; rel_y < font_height; ++rel_y)

data/src/Texture.cpp

@@ -4,6 +4,7 @@
 #include <Gosu/Graphics.hpp>
 #include <Gosu/Platform.hpp>
 #include <stdexcept>
+using namespace std;
 
 namespace Gosu
 {
@@ -18,17 +19,17 @@ Gosu::Texture::Texture(unsigned size, bool retro)
     // Create texture name.
     glGenTextures(1, &tex_name_);
     if (tex_name_ == static_cast<GLuint>(-1)) {
-        throw std::runtime_error("Couldn't create OpenGL texture");
+        throw runtime_error("Couldn't create OpenGL texture");
     }
 
     // Create empty texture.
     glBindTexture(GL_TEXTURE_2D, tex_name_);
 #ifdef GOSU_IS_OPENGLES
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, allocator_.width(), allocator_.height(), 0, GL_RGBA,
-        GL_UNSIGNED_BYTE, nullptr);
+                 GL_UNSIGNED_BYTE, nullptr);
 #else
     glTexImage2D(GL_TEXTURE_2D, 0, 4, allocator_.width(), allocator_.height(), 0, GL_RGBA,
-        GL_UNSIGNED_BYTE, nullptr);
+                 GL_UNSIGNED_BYTE, nullptr);
 #endif
     
     if (retro || undocumented_retrofication) {
@@ -71,23 +72,27 @@ bool Gosu::Texture::retro() const
     return retro_;
 }
 
-std::unique_ptr<Gosu::TexChunk>
-    Gosu::Texture::try_alloc(std::shared_ptr<Texture> ptr, const Bitmap& bmp, unsigned padding)
+unique_ptr<Gosu::TexChunk> Gosu::Texture::try_alloc(shared_ptr<Texture> ptr, const Bitmap& bmp,
+                                                    unsigned padding)
 {
     BlockAllocator::Block block;
     
     if (!allocator_.alloc(bmp.width(), bmp.height(), block)) return nullptr;
     
-    std::unique_ptr<Gosu::TexChunk> result(new TexChunk(ptr, block.left + padding,
-        block.top + padding, block.width - 2 * padding, block.height - 2 * padding, padding));
+    unique_ptr<Gosu::TexChunk> result(new TexChunk(ptr,
+                                                   block.left + padding,
+                                                   block.top + padding,
+                                                   block.width - 2 * padding,
+                                                   block.height - 2 * padding,
+                                                   padding));
     
     ensure_current_context();
     
     glBindTexture(GL_TEXTURE_2D, tex_name_);
     glTexSubImage2D(GL_TEXTURE_2D, 0, block.left, block.top, block.width, block.height,
-        Color::GL_FORMAT, GL_UNSIGNED_BYTE, bmp.data());
+                    Color::GL_FORMAT, GL_UNSIGNED_BYTE, bmp.data());
 
-    return std::move(result);
+    return result;
 }
 
 void Gosu::Texture::block(unsigned x, unsigned y, unsigned width, unsigned height)
@@ -103,7 +108,7 @@ void Gosu::Texture::free(unsigned x, unsigned y, unsigned width, unsigned height
 Gosu::Bitmap Gosu::Texture::to_bitmap(unsigned x, unsigned y, unsigned width, unsigned height) const
 {
 #ifdef GOSU_IS_OPENGLES
-    throw std::logic_error("Texture::to_bitmap not supported on iOS");
+    throw logic_error("Texture::to_bitmap not supported on iOS");
 #else
     ensure_current_context();
     

data/src/Transform.cpp

@@ -5,13 +5,13 @@
 #include <Gosu/GraphicsBase.hpp>
 #include <Gosu/Math.hpp>
 #include <cmath>
+using namespace std;
 
-Gosu::Transform
-Gosu::rotate(double angle, double around_x, double around_y)
+Gosu::Transform Gosu::rotate(double angle, double around_x, double around_y)
 {
-    double c = std::cos(degrees_to_radians(angle));
-    double s = std::sin(degrees_to_radians(angle));
-    Gosu::Transform result = {
+    double c = cos(degrees_to_radians(angle));
+    double s = sin(degrees_to_radians(angle));
+    Transform result = {
         +c, +s, 0, 0,
         -s, +c, 0, 0,
         0,  0,  1, 0,
@@ -24,10 +24,9 @@ Gosu::rotate(double angle, double around_x, double around_y)
     return result;
 }
 
-Gosu::Transform
-Gosu::translate(double x, double y)
+Gosu::Transform Gosu::translate(double x, double y)
 {
-    Gosu::Transform result = {
+    Transform result = {
         1, 0, 0, 0,
         0, 1, 0, 0,
         0, 0, 1, 0,
@@ -36,10 +35,9 @@ Gosu::translate(double x, double y)
     return result;
 }
 
-Gosu::Transform
-Gosu::scale(double factor)
+Gosu::Transform Gosu::scale(double factor)
 {
-    Gosu::Transform result = {
+    Transform result = {
         factor, 0,      0, 0,
         0,      factor, 0, 0,
         0,      0,      1, 0,
@@ -48,10 +46,9 @@ Gosu::scale(double factor)
     return result;
 }
 
-Gosu::Transform
-Gosu::scale(double scale_x, double scale_y, double around_x, double around_y)
+Gosu::Transform Gosu::scale(double scale_x, double scale_y, double around_x, double around_y)
 {
-    Gosu::Transform result = {
+    Transform result = {
         scale_x, 0,       0, 0,
         0,       scale_y, 0, 0,
         0,       0,       1, 0,
@@ -64,10 +61,9 @@ Gosu::scale(double scale_x, double scale_y, double around_x, double around_y)
     return result;
 }
 
-Gosu::Transform
-Gosu::concat(const Transform& left, const Transform& right)
+Gosu::Transform Gosu::concat(const Transform& left, const Transform& right)
 {
-    Gosu::Transform result;
+    Transform result;
     for (int i = 0; i < 16; ++i) {
         result[i] = 0;
         for (int j = 0; j < 4; ++j) {