glfw3 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c4fc82c45dd13e3c37d24bb3822a0b0ee252fb3
-  data.tar.gz: 1a797aad6127b1fc40ec537fbccfbcd70fd0fab3
+  metadata.gz: c71879992988bff0b3bd240651241e68c5f6315c
+  data.tar.gz: 6de12532188d628f437867a407d7dd0dd26d8921
 SHA512:
-  metadata.gz: 6a4feeed03264358cc93577697cdb13bd011de607f78a77650c40309615f740f95beb038c95f7548db3ec4698476d3e31ad366578ad807647fe72a55bc5f5d3d
-  data.tar.gz: 2c0f4f2095c0d6d15494641daa79fdc131960889256345428d4eb32dfdd365420f7b3537bbbea64bd3ca76796f7a562dd05149505fae6ed20b6e4f5f5409e22f
+  metadata.gz: aecf77997284f61fc094da9ae5aa7d89b75ad2f1a474e4ba3fb8e9004a9316298e3b9fa8059639e6c7f5492be5d7fac8e874d7afb08a75e5759dc2f0d6300f13
+  data.tar.gz: cec9e493ec9a01b0d45ebb5bb004aa3840340dbbd43edd85c013ddeb484a1f1b1240eedb295f92925818f71f8ca64067bb3f8ac09016158c51c6e1e86da28f50

data/COPYING

@@ -0,0 +1,26 @@
+Copyright (c) 2013, Noel Raymond Cower <ncower@gmail.com>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.

data/README.md

@@ -0,0 +1,86 @@
+ruby-glfw3
+==========
+
+[GLFW 3] bindings gem for Ruby 2.x.
+
+To install the gem, you'll need GLFW 3 built and installed where pkg-config can
+find it. You may also want to grab some [OpenGL bindings] as well.
+
+[OpenGL bindings]: https://github.com/nilium/ruby-opengl
+[GLFW 3]: https://github.com/glfw/glfw
+
+Once that's taken care of, you can install it simply by building and installing
+the gem, like so:
+
+    $ gem build glfw3.gemspec
+    $ gem install glfw3-0.0.1.gemspec
+
+After that, write a quick script to toy with it. For example:
+
+    require 'glfw3'
+    require 'opengl-core'
+
+    # Initialize GLFW 3
+    Glfw.init
+
+    # Create a window
+    window = Glfw::Window.new(800, 600, "Foobar")
+
+    # Set some callbacks
+    window.set_key_callback {
+      |window, key, code, action, mods|
+      window.should_close = true if key == Glfw::KEY_ESCAPE
+    }
+
+    window.set_close_callback {
+      |window|
+      window.should_close = true
+    }
+
+    # Make the window's context current
+    window.make_context_current
+    loop {
+      # And do stuff
+      Glfw.wait_events
+      Gl.glClear(Gl::GL_COLOR_BUFFER_BIT | Gl::GL_DEPTH_BUFFER_BIT)
+      window.swap_buffers
+      break if window.should_close?
+    }
+
+    # Explicitly destroy the window when done with it.
+    window.destroy
+
+
+License
+-------
+
+ruby-glw3 is licensed under a simplified BSD license because it seems the most
+reasonable. If there's a problem with that, let me know.
+
+    Copyright (c) 2013, Noel Raymond Cower <ncower@gmail.com>.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer. 
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution. 
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    The views and conclusions contained in the software and documentation are those
+    of the authors and should not be interpreted as representing official policies,
+    either expressed or implied, of the FreeBSD Project.
+

data/ext/glfw3/glfw3.c

@@ -51,8 +51,14 @@ static VALUE NAME (VALUE self, VALUE enabled)                                 \
 }
 
 
-/* GLFWAPI int glfwInit(void); */
-
+/*
+ * Initializes GLFW. Returns true on success, false on failure.
+ *
+ * call-seq:
+ *    init -> true or false
+ *
+ * Wraps glfwInit.
+ */
 static VALUE rb_glfw_init(VALUE self)
 {
   (void)self;
@@ -66,8 +72,11 @@ static VALUE rb_glfw_init(VALUE self)
 
 
 
-/* GLFWAPI void glfwTerminate(void); */
-
+/*
+ * Terminates GLFW.
+ *
+ * Wraps glfwTerminate.
+ */
 static VALUE rb_glfw_terminate(VALUE self)
 {
   glfwTerminate();
@@ -76,8 +85,14 @@ static VALUE rb_glfw_terminate(VALUE self)
 
 
 
-/* GLFWAPI void glfwGetVersion(int* major, int* minor, int* rev); */
-
+/*
+ * Returns GLFW's version in an array.
+ *
+ * call-seq:
+ *    version -> [major, minor, revision]
+ *
+ * Wraps glfwGetVersion.
+ */
 static VALUE rb_glfw_version(VALUE self)
 {
   int major = 0;
@@ -89,14 +104,10 @@ static VALUE rb_glfw_version(VALUE self)
 
 
 
-/* GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun cbfun); */
-
 static void rb_glfw_error_callback(int error_code, const char *description)
 {
   VALUE lambda = rb_cvar_get(s_glfw_module, rb_intern(kRB_CVAR_GLFW_ERROR_CALLBACK));
 
-
-
   if (RTEST(lambda)) {
     VALUE rb_description = rb_str_new2(description);
     VALUE rb_error_code = INT2FIX(error_code);
@@ -110,8 +121,14 @@ static void rb_glfw_error_callback(int error_code, const char *description)
 
 
 
-/* GLFWAPI GLFWmonitor** glfwGetMonitors(int* count); */
-
+/*
+ * Gets an array of all currently connected monitors.
+ *
+ * call-seq:
+ *    monitors -> [Glfw::Monitor, ...]
+ *
+ * Wraps glfwGetMonitors.
+ */
 VALUE rb_glfw_get_monitors(VALUE self)
 {
   long monitor_index = 0;
@@ -128,8 +145,14 @@ VALUE rb_glfw_get_monitors(VALUE self)
 
 
 
-/* GLFWAPI GLFWmonitor* glfwGetPrimaryMonitor(void); */
-
+/*
+ * Gets the primary monitor.
+ *
+ * call-seq:
+ *    primary_monitor -> Glfw::Monitor
+ *
+ * Wraps glfwGetPrimaryMonitor.
+ */
 VALUE rb_glfw_get_primary_monitor(VALUE self)
 {
   VALUE monitor = Data_Wrap_Struct(s_glfw_monitor_klass, 0, 0, glfwGetPrimaryMonitor());
@@ -139,8 +162,14 @@ VALUE rb_glfw_get_primary_monitor(VALUE self)
 
 
 
-/* GLFWAPI void glfwGetMonitorPos(GLFWmonitor* monitor, int* xpos, int* ypos); */
-
+/*
+ * Gets the monitor's position in screen-space.
+ *
+ * call-seq:
+ *    position -> [x, y]
+ *
+ * Wraps glfwGetMonitorPos.
+ */
 VALUE rb_monitor_position(VALUE self)
 {
   GLFWmonitor *monitor;
@@ -153,8 +182,14 @@ VALUE rb_monitor_position(VALUE self)
 
 
 
-/* GLFWAPI void glfwGetMonitorPhysicalSize(GLFWmonitor* monitor, int* width, int* height); */
-
+/*
+ * Gets the physical size of the monitor.
+ *
+ * call-seq:
+ *    physical_size -> [width, height]
+ *
+ * Wraps glfwGetMonitorPhysicalSize.
+ */
 VALUE rb_monitor_physical_size(VALUE self)
 {
   GLFWmonitor *monitor;
@@ -167,9 +202,14 @@ VALUE rb_monitor_physical_size(VALUE self)
 
 
 
-/* GLFWAPI const char* glfwGetMonitorName(GLFWmonitor* monitor); */
-
-
+/*
+ * Gets the name of the monitor.
+ *
+ * call-seq:
+ *    name -> String
+ *
+ * Wraps glfwGetMonitorName.
+ */
 VALUE rb_monitor_name(VALUE self)
 {
   GLFWmonitor *monitor;
@@ -179,8 +219,6 @@ VALUE rb_monitor_name(VALUE self)
 
 
 
-/* GLFWAPI GLFWmonitorfun glfwSetMonitorCallback(GLFWmonitorfun cbfun); */
-
 static void rb_glfw_monitor_callback(GLFWmonitor *monitor, int message)
 {
   VALUE lambda = rb_cvar_get(s_glfw_module, rb_intern(kRB_CVAR_GLFW_MONITOR_CALLBACK));
@@ -193,8 +231,14 @@ static void rb_glfw_monitor_callback(GLFWmonitor *monitor, int message)
 
 
 
-/* GLFWAPI const GLFWvidmode* glfwGetVideoModes(GLFWmonitor* monitor, int* count); */
-
+/*
+ * The width of the video mode.
+ *
+ * call-seq:
+ *    width -> Fixed
+ *
+ * Wraps GLFWvidmode.width.
+ */
 static VALUE rb_videomode_width(VALUE self)
 {
   GLFWvidmode *mode;
@@ -202,6 +246,14 @@ static VALUE rb_videomode_width(VALUE self)
   return INT2FIX(mode->width);
 }
 
+/*
+ * The height of the video mode.
+ *
+ * call-seq:
+ *    height -> Fixed
+ *
+ * Wraps GLFWvidmode.height.
+ */
 static VALUE rb_videomode_height(VALUE self)
 {
   GLFWvidmode *mode;
@@ -209,6 +261,14 @@ static VALUE rb_videomode_height(VALUE self)
   return INT2FIX(mode->height);
 }
 
+/*
+ * The number of red bits in the video mode.
+ *
+ * call-seq:
+ *    red_bits -> Fixed
+ *
+ * Wraps GLFWvidmode.redBits.
+ */
 static VALUE rb_videomode_red_bits(VALUE self)
 {
   GLFWvidmode *mode;
@@ -216,6 +276,14 @@ static VALUE rb_videomode_red_bits(VALUE self)
   return INT2FIX(mode->redBits);
 }
 
+/*
+ * The number of green bits in the video mode.
+ *
+ * call-seq:
+ *    green_bits -> Fixed
+ *
+ * Wraps GLFWvidmode.greenBits.
+ */
 static VALUE rb_videomode_green_bits(VALUE self)
 {
   GLFWvidmode *mode;
@@ -223,6 +291,14 @@ static VALUE rb_videomode_green_bits(VALUE self)
   return INT2FIX(mode->greenBits);
 }
 
+/*
+ * The number of blue bits in the video mode.
+ *
+ * call-seq:
+ *    blue_bits -> Fixed
+ *
+ * Wraps GLFWvidmode.blueBits.
+ */
 static VALUE rb_videomode_blue_bits(VALUE self)
 {
   GLFWvidmode *mode;
@@ -230,6 +306,14 @@ static VALUE rb_videomode_blue_bits(VALUE self)
   return INT2FIX(mode->blueBits);
 }
 
+/*
+ * The video mode's refresh rate.
+ *
+ * call-seq:
+ *    refresh_rate -> Fixed
+ *
+ * Wraps GLFWvidmode.refreshRate.
+ */
 static VALUE rb_videomode_refresh_rate(VALUE self)
 {
   GLFWvidmode *mode;
@@ -237,6 +321,16 @@ static VALUE rb_videomode_refresh_rate(VALUE self)
   return INT2FIX(mode->refreshRate);
 }
 
+/*
+ * Gets an array of all video modes associated with the monitor, sorted
+ * ascending first by color depth and then the video mode's area
+ * (width x height).
+ *
+ * call-seq:
+ *    video_mode -> [Glfw::VideoMode, ...]
+ *
+ * Wraps glfwGetVideoModes.
+ */
 static VALUE rb_monitor_video_modes(VALUE self)
 {
   GLFWmonitor *monitor;
@@ -257,8 +351,14 @@ static VALUE rb_monitor_video_modes(VALUE self)
 
 
 
-/* GLFWAPI const GLFWvidmode* glfwGetVideoMode(GLFWmonitor* monitor); */
-
+/*
+ * Gets the monitor's current video mode.
+ *
+ * call-seq:
+ *    video_mode -> Glfw::VideoMode
+ *
+ * Wraps glfwGetVideoMode.
+ */
 static VALUE rb_monitor_video_mode(VALUE self)
 {
   GLFWmonitor *monitor;
@@ -272,8 +372,15 @@ static VALUE rb_monitor_video_mode(VALUE self)
 
 
 
-/* GLFWAPI void glfwSetGamma(GLFWmonitor* monitor, float gamma); */
-
+/*
+ * Sets the monitor's gamma ramp to a 256-element ramp generated by the given
+ * exponent.
+ *
+ * call-seq:
+ *    set_gamma(gamma) -> self
+ *
+ * Wraps glfwSetGamma.
+ */
 static VALUE rb_monitor_set_gamma(VALUE self, VALUE gamma)
 {
   GLFWmonitor *monitor;
@@ -284,20 +391,20 @@ static VALUE rb_monitor_set_gamma(VALUE self, VALUE gamma)
 
 
 
-/* GLFWAPI const GLFWgammaramp* glfwGetGammaRamp(GLFWmonitor* monitor); */
-
 #warning "No implementation for glfwGetGammaRamp bindings"
-
-
-
-/* GLFWAPI void glfwSetGammaRamp(GLFWmonitor* monitor, const GLFWgammaramp* ramp); */
-
 #warning "No implementation for glfwSetGammaRamp bindings"
 
 
 
-/* GLFWAPI void glfwDefaultWindowHints(void); */
-
+/*
+ * Sets the window hints to their default values. See GLFW 3 documentation for
+ * details on what those values are.
+ *
+ * call-seq:
+ *    default_window_hints() -> self
+ *
+ * Wraps glfwDefaultWindowHints.
+ */
 static VALUE rb_window_default_window_hints(VALUE self)
 {
   glfwDefaultWindowHints();
@@ -306,8 +413,14 @@ static VALUE rb_window_default_window_hints(VALUE self)
 
 
 
-/* GLFWAPI void glfwWindowHint(int target, int hint); */
-
+/*
+ * Sets a window hint to the given value.
+ *
+ * call-seq:
+ *    window_hint(target, hint) -> self
+ *
+ * Wraps glfwWindowHint.
+ */
 static VALUE rb_window_window_hint(VALUE self, VALUE target, VALUE hint)
 {
   glfwWindowHint(NUM2INT(target), NUM2INT(hint));
@@ -315,14 +428,13 @@ static VALUE rb_window_window_hint(VALUE self, VALUE target, VALUE hint)
 }
 
 
-
-/* GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height, const char* title, GLFWmonitor* monitor,  */
-
+// Auxiliary function for extracting a Glfw::Window object from a GLFWwindow.
 static VALUE rb_lookup_window(GLFWwindow *window)
 {
   return (VALUE)glfwGetWindowUserPointer(window);
 }
 
+// And the opposite of rb_lookup_window
 static GLFWwindow *rb_get_window(VALUE rb_window)
 {
   GLFWwindow *window = NULL;
@@ -336,11 +448,15 @@ static GLFWwindow *rb_get_window(VALUE rb_window)
   return window;
 }
 
-// static VALUE rb_window_init(int argc, VALUE *argv, VALUE self)
-// {
-//   return self;
-// }
-
+/*
+ * Creates a new window with the given parameters. If a shared window is
+ * provided, the new window will use the context of the shared window.
+ *
+ * call-seq:
+ *    new(width, height, title='', monitor=nil, shared_window=nil) -> Glfw::Window
+ *
+ * Wraps glfwCreateWindow.
+ */
 static VALUE rb_window_new(int argc, VALUE *argv, VALUE self)
 {
   ID ivar_window = rb_intern(kRB_IVAR_WINDOW_INTERNAL);
@@ -413,8 +529,11 @@ static VALUE rb_window_new(int argc, VALUE *argv, VALUE self)
 
 
 
-/* GLFWAPI void glfwDestroyWindow(GLFWwindow* window); */
-
+/*
+ * Destroys the window.
+ *
+ * Wraps glfwDestroyWindow.
+ */
 static VALUE rb_window_destroy(VALUE self)
 {
   GLFWwindow *window = rb_get_window(self);
@@ -429,8 +548,14 @@ static VALUE rb_window_destroy(VALUE self)
 
 
 
-/* GLFWAPI int glfwWindowShouldClose(GLFWwindow* window); */
-
+/*
+ * Gets the window's should-close flag.
+ *
+ * call-seq:
+ *    should_close? -> true or false
+ *
+ * Wraps glfwWindowShouldClose.
+ */
 static VALUE rb_window_should_close(VALUE self)
 {
   GLFWwindow *window = rb_get_window(self);
@@ -439,29 +564,51 @@ static VALUE rb_window_should_close(VALUE self)
 
 
 
-/* GLFWAPI void glfwSetWindowShouldClose(GLFWwindow* window, int value); */
-
+/*
+ * Sets the window's should-close flag. Ideally, the value provided should be
+ * a boolean, though it is only tested for non-nil and -false status, so it can
+ * be anything that would yield true for !!value.
+ *
+ * call-seq:
+ *    should_close=(value) -> value
+ *    should_close = value -> value
+ *
+ * Wraps glfwSetWindowShouldClose.
+ */
 static VALUE rb_window_set_should_close(VALUE self, VALUE value)
 {
   GLFWwindow *window = rb_get_window(self);
   glfwSetWindowShouldClose(window, RTEST(value) ? GL_TRUE : GL_FALSE);
-  return self;
+  return value;
 }
 
 
 
-/* GLFWAPI void glfwSetWindowTitle(GLFWwindow* window, const char* title); */
-
-static VALUE rb_window_set_title(VALUE self, VALUE title)
+/*
+ * Sets the window's title.
+ *
+ * call-seq:
+ *    title=(new_title) -> new_title
+ *    title = new_title -> new_title
+ *
+ * Wraps glfwSetWindowTitle.
+ */
+static VALUE rb_window_set_title(VALUE self, VALUE new_title)
 {
-  glfwSetWindowTitle(rb_get_window(self), StringValueCStr(title));
-  return title;
+  glfwSetWindowTitle(rb_get_window(self), StringValueCStr(new_title));
+  return new_title;
 }
 
 
 
-/* GLFWAPI void glfwGetWindowPos(GLFWwindow* window, int* xpos, int* ypos); */
-
+/*
+ * Gets the windows position.
+ *
+ * call-seq:
+ *    position -> [x, y]
+ *
+ * Wraps glfwGetWindowPos.
+ */
 static VALUE rb_window_get_position(VALUE self)
 {
   int xpos = 0;
@@ -472,8 +619,15 @@ static VALUE rb_window_get_position(VALUE self)
 
 
 
-/* GLFWAPI void glfwSetWindowPos(GLFWwindow* window, int xpos, int ypos); */
-
+/*
+ * Moves the window to a new location (sets its position).
+ *
+ * call-seq:
+ *    set_position(x, y) -> self
+ *    move(x, y) -> self
+ *
+ * Wraps glfwSetWindowPos.
+ */
 static VALUE rb_window_set_position(VALUE self, VALUE x, VALUE y)
 {
   glfwSetWindowPos(rb_get_window(self), NUM2INT(x), NUM2INT(y));
@@ -482,8 +636,14 @@ static VALUE rb_window_set_position(VALUE self, VALUE x, VALUE y)
 
 
 
-/* GLFWAPI void glfwGetWindowSize(GLFWwindow* window, int* width, int* height); */
-
+/*
+ * Gets the window's size.
+ *
+ * call-seq:
+ *    size -> [width, height]
+ *
+ * Wraps glfwGetWindowSize.
+ */
 static VALUE rb_window_get_size(VALUE self)
 {
   int width = 0;
@@ -494,8 +654,15 @@ static VALUE rb_window_get_size(VALUE self)
 
 
 
-/* GLFWAPI void glfwSetWindowSize(GLFWwindow* window, int width, int height); */
-
+/*
+ * Sets the window's size.
+ *
+ * call-seq:
+ *    set_size(width, height) -> self
+ *    resize(width, height) -> self
+ *
+ * Wraps glfwSetWindowSize.
+ */
 static VALUE rb_window_set_size(VALUE self, VALUE width, VALUE height)
 {
   glfwSetWindowSize(rb_get_window(self), NUM2INT(width), NUM2INT(height));
@@ -504,8 +671,14 @@ static VALUE rb_window_set_size(VALUE self, VALUE width, VALUE height)
 
 
 
-/* GLFWAPI void glfwGetFramebufferSize(GLFWwindow* window, int* width, int* height); */
-
+/*
+ * Gets the window context's framebuffer size.
+ *
+ * call-seq:
+ *    framebuffer_size -> [width, height]
+ *
+ * Wraps glfwGetFramebufferSize.
+ */
 static VALUE rb_window_get_framebuffer_size(VALUE self)
 {
   int width = 0;
@@ -516,8 +689,11 @@ static VALUE rb_window_get_framebuffer_size(VALUE self)
 
 
 
-/* GLFWAPI void glfwIconifyWindow(GLFWwindow* window); */
-
+/*
+ * Iconifies the window.
+ *
+ * Wraps glfwIconifyWindow.
+ */
 static VALUE rb_window_iconify(VALUE self)
 {
   glfwIconifyWindow(rb_get_window(self));
@@ -526,8 +702,11 @@ static VALUE rb_window_iconify(VALUE self)
 
 
 
-/* GLFWAPI void glfwRestoreWindow(GLFWwindow* window); */
-
+/*
+ * Restores the window.
+ *
+ * Wraps glfwRestoreWindow.
+ */
 static VALUE rb_window_restore(VALUE self)
 {
   glfwRestoreWindow(rb_get_window(self));
@@ -536,8 +715,11 @@ static VALUE rb_window_restore(VALUE self)
 
 
 
-/* GLFWAPI void glfwShowWindow(GLFWwindow* window); */
-
+/*
+ * Shows the window.
+ *
+ * Wraps glfwShowWindow.
+ */
 static VALUE rb_window_show(VALUE self)
 {
   glfwShowWindow(rb_get_window(self));
@@ -546,8 +728,11 @@ static VALUE rb_window_show(VALUE self)
 
 
 
-/* GLFWAPI void glfwHideWindow(GLFWwindow* window); */
-
+/*
+ * Hides the window.
+ *
+ * Wraps glfwHideWindow.
+ */
 static VALUE rb_window_hide(VALUE self)
 {
   glfwHideWindow(rb_get_window(self));
@@ -556,8 +741,14 @@ static VALUE rb_window_hide(VALUE self)
 
 
 
-/* GLFWAPI GLFWmonitor* glfwGetWindowMonitor(GLFWwindow* window); */
-
+/*
+ * Gets the window's monitor.
+ *
+ * call-seq:
+ *    monitor -> Glfw::Monitor
+ *
+ * Wraps glfwGetWindowMonitor.
+ */
 static VALUE rb_window_get_monitor(VALUE self)
 {
   GLFWmonitor *monitor = glfwGetWindowMonitor(rb_get_window(self));
@@ -568,14 +759,6 @@ static VALUE rb_window_get_monitor(VALUE self)
 
 
 
-/* GLFWAPI int glfwGetWindowAttrib(GLFWwindow* window, int attrib); */
-
-
-
-
-
-/* GLFWAPI GLFWwindowposfun glfwSetWindowPosCallback(GLFWwindow* window, GLFWwindowposfun cbfun); */
-
 static void rb_window_window_position_callback(GLFWwindow *window, int x, int y)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -587,9 +770,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_window_position_callback, rb_window_window_
 
 
 
-
-/* GLFWAPI GLFWwindowsizefun glfwSetWindowSizeCallback(GLFWwindow* window, GLFWwindowsizefun cbfun); */
-
 static void rb_window_window_size_callback(GLFWwindow *window, int width, int height)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -601,8 +781,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_window_size_callback, rb_window_window_size
 
 
 
-/* GLFWAPI GLFWwindowclosefun glfwSetWindowCloseCallback(GLFWwindow* window, GLFWwindowclosefun cbfun); */
-
 static void rb_window_close_callback(GLFWwindow *window)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -614,9 +792,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_close_callback, rb_window_close_callback, g
 
 
 
-
-/* GLFWAPI GLFWwindowrefreshfun glfwSetWindowRefreshCallback(GLFWwindow* window, GLFWwindowrefreshfun cbfun); */
-
 static void rb_window_refresh_callback(GLFWwindow *window)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -628,8 +803,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_refresh_callback, rb_window_refresh_callbac
 
 
 
-/* GLFWAPI GLFWwindowfocusfun glfwSetWindowFocusCallback(GLFWwindow* window, GLFWwindowfocusfun cbfun); */
-
 static void rb_window_focus_callback(GLFWwindow *window, int focused)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -641,8 +814,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_focus_callback, rb_window_focus_callback, g
 
 
 
-/* GLFWAPI GLFWwindowiconifyfun glfwSetWindowIconifyCallback(GLFWwindow* window, GLFWwindowiconifyfun cbfun); */
-
 static void rb_window_iconify_callback(GLFWwindow *window, int iconified)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -654,9 +825,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_iconify_callback, rb_window_iconify_callbac
 
 
 
-/* GLFWAPI GLFWframebuffersizefun glfwSetFramebufferSizeCallback(GLFWwindow* window, GLFWframebuffersizefun cbfun) */
-
-
 static void rb_window_fbsize_callback(GLFWwindow *window, int width, int height)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -668,8 +836,19 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_fbsize_callback, rb_window_fbsize_callback,
 
 
 
-/* GLFWAPI void glfwPollEvents(void); */
-
+/*
+ * Polls for events without blocking until an event occurs.
+ *
+ * Wraps glfwPollEvents.
+ *
+ * This would likely be called at the beginning of your main loop, like so:
+ *
+ *    loop {
+ *      Glfw.poll_events()
+ *
+ *      # ...
+ *    }
+ */
 static VALUE rb_glfw_poll_events(VALUE self)
 {
   glfwPollEvents();
@@ -678,8 +857,19 @@ static VALUE rb_glfw_poll_events(VALUE self)
 
 
 
-/* GLFWAPI void glfwWaitEvents(void); */
-
+/*
+ * Polls for events. Blocks until an event occurs.
+ *
+ * Wraps glfwWaitEvents.
+ *
+ * This would likely be called at the beginning of your main loop, like so:
+ *
+ *    loop {
+ *      Glfw.wait_events()
+ *
+ *      # ...
+ *    }
+ */
 static VALUE rb_glfw_wait_events(VALUE self)
 {
   glfwWaitEvents();
@@ -688,8 +878,14 @@ static VALUE rb_glfw_wait_events(VALUE self)
 
 
 
-/* GLFWAPI int glfwGetInputMode(GLFWwindow* window, int mode); */
-
+/*
+ * Gets the current value for the given input mode.
+ *
+ * call-seq:
+ *    get_input_mode(mode) -> Fixed
+ *
+ * Wraps glfwGetInputMode.
+ */
 static VALUE rb_window_get_input_mode(VALUE self, VALUE mode)
 {
   return INT2FIX(glfwGetInputMode(rb_get_window(self), NUM2INT(mode)));
@@ -697,8 +893,14 @@ static VALUE rb_window_get_input_mode(VALUE self, VALUE mode)
 
 
 
-/* GLFWAPI void glfwSetInputMode(GLFWwindow* window, int mode, int value); */
-
+/*
+ * Sets the value of the given input mode.
+ *
+ * call-seq:
+ *    set_input_mode(mode, value) -> self
+ *
+ * Wraps glfwSetInputMode.
+ */
 static VALUE rb_window_set_input_mode(VALUE self, VALUE mode, VALUE value)
 {
   glfwSetInputMode(rb_get_window(self), NUM2INT(mode), NUM2INT(value));
@@ -707,8 +909,14 @@ static VALUE rb_window_set_input_mode(VALUE self, VALUE mode, VALUE value)
 
 
 
-/* GLFWAPI int glfwGetKey(GLFWwindow* window, int key); */
-
+/*
+ * Gets the last-reported state of the given keyboard key for the window.
+ *
+ * call-seq:
+ *    key(key) -> Fixed
+ *
+ * Wraps glfwGetKey.
+ */
 static VALUE rb_window_get_key(VALUE self, VALUE key)
 {
   return INT2FIX(glfwGetKey(rb_get_window(self), NUM2INT(key)));
@@ -716,8 +924,14 @@ static VALUE rb_window_get_key(VALUE self, VALUE key)
 
 
 
-/* GLFWAPI int glfwGetMouseButton(GLFWwindow* window, int button); */
-
+/*
+ * Gets the last-reported state of the given mouse button for the window.
+ *
+ * call-seq:
+ *    mouse_button(key) -> Fixed
+ *
+ * Wraps glfwGetMouseButton.
+ */
 static VALUE rb_window_get_mouse_button(VALUE self, VALUE button)
 {
   return INT2FIX(glfwGetMouseButton(rb_get_window(self), NUM2INT(button)));
@@ -725,8 +939,14 @@ static VALUE rb_window_get_mouse_button(VALUE self, VALUE button)
 
 
 
-/* GLFWAPI void glfwGetCursorPos(GLFWwindow* window, double* xpos, double* ypos); */
-
+/*
+ * Gets the last-reported cursor position in the window.
+ *
+ * call-seq:
+ *    cursor_pos -> [x, y]
+ *
+ * Wraps glfwGetCursorPos.
+ */
 static VALUE rb_window_get_cursor_pos(VALUE self)
 {
   double xpos = 0;
@@ -737,8 +957,16 @@ static VALUE rb_window_get_cursor_pos(VALUE self)
 
 
 
-/* GLFWAPI void glfwSetCursorPos(GLFWwindow* window, double xpos, double ypos); */
-
+/*
+ * Sets the position of the mouse cursor relative to the client area of the
+ * window. If the window isn't focused at the time of the call, this silently
+ * fails.
+ *
+ * call-seq:
+ *    set_cursor_pos(x, y) -> self
+ *
+ * Wraps glfwSetCursorPos.
+ */
 static VALUE rb_window_set_cursor_pos(VALUE self, VALUE x, VALUE y)
 {
   glfwSetCursorPos(rb_get_window(self), NUM2DBL(x), NUM2DBL(y));
@@ -747,8 +975,6 @@ static VALUE rb_window_set_cursor_pos(VALUE self, VALUE x, VALUE y)
 
 
 
-/* GLFWAPI GLFWkeyfun glfwSetKeyCallback(GLFWwindow* window, GLFWkeyfun cbfun); */
-
 static void rb_window_key_callback(GLFWwindow *window, int key, int scancode, int action, int mods)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -760,8 +986,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_key_callback, rb_window_key_callback, glfwS
 
 
 
-/* GLFWAPI GLFWcharfun glfwSetCharCallback(GLFWwindow* window, GLFWcharfun cbfun); */
-
 static void rb_window_char_callback(GLFWwindow *window, unsigned int code)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -774,8 +998,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_char_callback, rb_window_char_callback, glf
 
 
 
-/* GLFWAPI GLFWmousebuttonfun glfwSetMouseButtonCallback(GLFWwindow* window, GLFWmousebuttonfun cbfun); */
-
 static void rb_window_mouse_button_callback(GLFWwindow *window, int button, int action, int mods)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -787,8 +1009,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_mouse_button_callback, rb_window_mouse_butt
 
 
 
-/* GLFWAPI GLFWcursorposfun glfwSetCursorPosCallback(GLFWwindow* window, GLFWcursorposfun cbfun); */
-
 static void rb_window_cursor_position_callback(GLFWwindow *window, double x, double y)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -800,8 +1020,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_cursor_position_callback, rb_window_cursor_
 
 
 
-/* GLFWAPI GLFWcursorenterfun glfwSetCursorEnterCallback(GLFWwindow* window, GLFWcursorenterfun cbfun); */
-
 static void rb_window_cursor_enter_callback(GLFWwindow *window, int entered)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -813,8 +1031,6 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_cursor_enter_callback, rb_window_cursor_ent
 
 
 
-/* GLFWAPI GLFWscrollfun glfwSetScrollCallback(GLFWwindow* window, GLFWscrollfun cbfun); */
-
 static void rb_window_scroll_callback(GLFWwindow *window, double x, double y)
 {
   VALUE rb_window = rb_lookup_window(window);
@@ -827,17 +1043,30 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_scroll_callback, rb_window_scroll_callback,
 
 
 
-/* GLFWAPI int glfwJoystickPresent(int joy); */
-
-static VALUE rb_glfw_joysitck_present(VALUE self, VALUE joystick)
+/*
+ * Returns whether the given joystick is present.
+ *
+ * call-seq:
+ *    joystick_present?(joystick) -> true or false
+ *
+ * Wraps glfwJoystickPresent.
+ */
+static VALUE rb_glfw_joystick_present(VALUE self, VALUE joystick)
 {
   return glfwJoystickPresent(NUM2INT(joystick)) ? Qtrue : Qfalse;
 }
 
 
 
-/* GLFWAPI const float* glfwGetJoystickAxes(int joy, int* count); */
-
+/*
+ * Gets the values of all axes of the given joystick. Returns nil if the
+ * joystick isn't present. See #joystick_present?.
+ *
+ * call-seq:
+ *    joystick_axes(joystick) -> [Float, ...] or nil
+ *
+ * Wraps glfwGetJoystickAxes.
+ */
 static VALUE rb_glfw_get_joystick_axes(VALUE self, VALUE joystick)
 {
   VALUE rb_axes = Qnil;
@@ -854,8 +1083,15 @@ static VALUE rb_glfw_get_joystick_axes(VALUE self, VALUE joystick)
 
 
 
-/* GLFWAPI const unsigned char* glfwGetJoystickButtons(int joy, int* count); */
-
+/*
+ * Gets the button values of the given joystick. Returns nil if the joystick
+ * isn't present. See #joystick_present?.
+ *
+ * call-seq:
+ *    joystick_buttons(joystick) -> [Fixed, ...] or nil
+ *
+ * Wraps glfwGetJoystickButtons.
+ */
 static VALUE rb_glfw_get_joystick_buttons(VALUE self, VALUE joystick)
 {
   VALUE rb_buttons = Qnil;
@@ -872,8 +1108,14 @@ static VALUE rb_glfw_get_joystick_buttons(VALUE self, VALUE joystick)
 
 
 
-/* GLFWAPI const char* glfwGetJoystickName(int joy); */
-
+/*
+ * Returns the name of the given joystick.
+ *
+ * call-seq:
+ *    joystick_name(joystick) -> String
+ *
+ * Wraps glfwGetJoystickName.
+ */
 static VALUE rb_glfw_get_joystick_name(VALUE self, VALUE joystick)
 {
   const char *joy_name = glfwGetJoystickName(NUM2INT(joystick));
@@ -886,8 +1128,16 @@ static VALUE rb_glfw_get_joystick_name(VALUE self, VALUE joystick)
 
 
 
-/* GLFWAPI void glfwSetClipboardString(GLFWwindow* window, const char* string); */
-
+/*
+ * Sets the system clipboard string. The window this is set for will own the
+ * given string.
+ *
+ * call-seq:
+ *    clipboard_string=(string) -> String
+ *    clipboard_string = string -> String
+ *
+ * Wraps glfwSetClipboardString.
+ */
 static VALUE rb_window_set_clipboard_string(VALUE self, VALUE string)
 {
   glfwSetClipboardString(rb_get_window(self), StringValueCStr(string));
@@ -896,8 +1146,15 @@ static VALUE rb_window_set_clipboard_string(VALUE self, VALUE string)
 
 
 
-/* GLFWAPI const char* glfwGetClipboardString(GLFWwindow* window); */
-
+/*
+ * Gets the system clipboard's contents as a string. The window this is called
+ * from will request the clipboard contents.
+ *
+ * call-seq:
+ *    clipboard_string() -> String
+ *
+ * Wraps glfwGetClipboardString.
+ */
 static VALUE rb_window_get_clipboard_string(VALUE self)
 {
   return rb_str_new2(glfwGetClipboardString(rb_get_window(self)));
@@ -905,8 +1162,15 @@ static VALUE rb_window_get_clipboard_string(VALUE self)
 
 
 
-/* GLFWAPI double glfwGetTime(void); */
-
+/*
+ * Gets the current time in seconds. The returned time is relative to the time
+ * since GLFW was initialized unless the time has been set using #timer=.
+ *
+ * call-seq:
+ *    time -> Float
+ *
+ * Wraps glfwGetTime.
+ */
 static VALUE rb_glfw_get_time(VALUE self)
 {
   return rb_float_new(glfwGetTime());
@@ -914,8 +1178,17 @@ static VALUE rb_glfw_get_time(VALUE self)
 
 
 
-/* GLFWAPI void glfwSetTime(double time); */
-
+/*
+ * Sets the current time in seconds. If set, GLFW will continue measuring time
+ * elapsed from that time forward.
+ *
+ * In most cases, you will not need to use this.
+ *
+ * call-seq:
+ *    time = Float
+ *
+ * Wraps glfwSetTime.
+ */
 static VALUE rb_glfw_set_time(VALUE self, VALUE time_)
 {
   glfwSetTime(NUM2DBL(time_));
@@ -924,8 +1197,23 @@ static VALUE rb_glfw_set_time(VALUE self, VALUE time_)
 
 
 
-/* GLFWAPI void glfwMakeContextCurrent(GLFWwindow* window); */
-
+/*
+ * Makes the window's GL context current. You will need to call this before
+ * calling any OpenGL functions. See also ::unset_context to unset a context.
+ *
+ * Wraps glfwMakeContextCurrent(window).
+ *
+ *    # Good
+ *    window.make_context_current()
+ *    Gl.glClear(Gl::GL_COLOR_BUFFER_BIT)
+ *
+ *    # Bad
+ *    Gl.glClear(Gl::GL_COLOR_BUFFER_BIT)
+ *    window.make_context_current()
+ *
+ * Remember to make a window's context current before calling any OpenGL
+ * functions. A window's GL context may only be current in one thread at a time.
+ */
 static VALUE rb_window_make_context_current(VALUE self)
 {
   glfwMakeContextCurrent(rb_get_window(self));
@@ -934,8 +1222,27 @@ static VALUE rb_window_make_context_current(VALUE self)
 
 
 
-/* GLFWAPI GLFWwindow* glfwGetCurrentContext(void); */
+/*
+ * Unsets the current GL context.
+ *
+ * Wraps glfwMakeContextCurrent(NULL).
+ */
+static VALUE rb_window_unset_context(VALUE self)
+{
+  glfwMakeContextCurrent(NULL);
+  return self;
+}
+
 
+
+/*
+ * Gets the window for the current GL context in this thread.
+ *
+ * call-seq:
+ *    current_context() -> Glfw::Window
+ *
+ * Wraps glfwGetCurrentContext.
+ */
 static VALUE rb_window_get_current_context(VALUE self)
 {
   GLFWwindow *window = glfwGetCurrentContext();
@@ -948,8 +1255,20 @@ static VALUE rb_window_get_current_context(VALUE self)
 
 
 
-/* GLFWAPI void glfwSwapBuffers(GLFWwindow* window); */
-
+/*
+ * Swaps the front and back buffers for the window. You will typically call this
+ * at the end of your drawing routines.
+ *
+ * Wraps glfwSwapBuffers.
+ *
+ *    loop {
+ *      Glfw.poll_events()
+ *
+ *      # ...
+ *
+ *      window.swap_buffers()
+ *    }
+ */
 static VALUE rb_window_swap_buffers(VALUE self)
 {
   glfwSwapBuffers(rb_get_window(self));
@@ -958,20 +1277,41 @@ static VALUE rb_window_swap_buffers(VALUE self)
 
 
 
-/* GLFWAPI void glfwSwapInterval(int interval); */
-
-static VALUE rb_glfw_swap_interval(VALUE self)
+/*
+ * Sets the swap interval for the current context.
+ * (See Glfw::Window#make_context_current)
+ *
+ * call-seq:
+ *    swap_interval=(interval) -> self
+ *    swap_interval = interval -> self
+ *
+ * Wraps glfwSwapInterval.
+ */
+static VALUE rb_glfw_swap_interval(VALUE self, VALUE interval)
 {
+  glfwSwapInterval(NUM2INT(interval));
   return self;
 }
 
 
 
-/* GLFWAPI int glfwExtensionSupported(const char* extension); */
-
-static VALUE rb_glfw_extension_supported(VALUE self)
+/*
+ * Retursn whether a given OpenGL or context creation API extension is supported
+ * by the current context.
+ * (See Glfw::Window#make_context_current)
+ *
+ * Bear in mind that this function does not cache its results, so calls may be
+ * expensive. If you find yourself using it, consider caching the results
+ * yourself.
+ *
+ * call-seq:
+ *    extension_supported?(extension) -> true or false
+ *
+ * Wraps glfwExtensionSupported.
+ */
+static VALUE rb_glfw_extension_supported(VALUE self, VALUE extension)
 {
-  return self;
+  return glfwExtensionSupported(StringValueCStr(extension)) ? Qtrue : Qfalse;
 }
 
 
@@ -985,6 +1325,8 @@ void Init_glfw3(void)
   s_glfw_videomode_klass = rb_define_class_under(s_glfw_module, "VideoMode", rb_cObject);
 
   /* Glfw::Monitor */
+  rb_define_singleton_method(s_glfw_monitor_klass, "monitors", rb_glfw_get_monitors, 0);
+  rb_define_singleton_method(s_glfw_monitor_klass, "primary_monitor", rb_glfw_get_primary_monitor, 0);
   rb_define_method(s_glfw_monitor_klass, "name", rb_monitor_name, 0);
   rb_define_method(s_glfw_monitor_klass, "position", rb_monitor_position, 0);
   rb_define_method(s_glfw_monitor_klass, "physical_size", rb_monitor_physical_size, 0);
@@ -1004,6 +1346,7 @@ void Init_glfw3(void)
   rb_define_singleton_method(s_glfw_window_klass, "new", rb_window_new, -1);
   rb_define_singleton_method(s_glfw_window_klass, "window_hint", rb_window_window_hint, 2);
   rb_define_singleton_method(s_glfw_window_klass, "default_window_hints", rb_window_default_window_hints, 0);
+  rb_define_singleton_method(s_glfw_window_klass, "unset_context", rb_window_unset_context, 0);
   // rb_define_method(s_glfw_window_klass, "initialize", rb_window_init, -1);
   rb_define_method(s_glfw_window_klass, "destroy", rb_window_destroy, 0);
   rb_define_method(s_glfw_window_klass, "should_close?", rb_window_should_close, 0);
@@ -1014,8 +1357,10 @@ void Init_glfw3(void)
   rb_define_method(s_glfw_window_klass, "swap_buffers", rb_window_swap_buffers, 0);
   rb_define_method(s_glfw_window_klass, "title=", rb_window_set_title, 1);
   rb_define_method(s_glfw_window_klass, "position", rb_window_get_position, 0);
+  rb_define_method(s_glfw_window_klass, "set_position", rb_window_set_position, 2);
   rb_define_method(s_glfw_window_klass, "move", rb_window_set_position, 2);
   rb_define_method(s_glfw_window_klass, "size", rb_window_get_size, 0);
+  rb_define_method(s_glfw_window_klass, "set_size", rb_window_set_size, 2);
   rb_define_method(s_glfw_window_klass, "resize", rb_window_set_size, 2);
   rb_define_method(s_glfw_window_klass, "framebuffer_size", rb_window_get_framebuffer_size, 0);
   rb_define_method(s_glfw_window_klass, "iconify", rb_window_iconify, 0);
@@ -1052,11 +1397,9 @@ void Init_glfw3(void)
   rb_define_singleton_method(s_glfw_module, "version", rb_glfw_version, 0);
   rb_define_singleton_method(s_glfw_module, "terminate", rb_glfw_terminate, 0);
   rb_define_singleton_method(s_glfw_module, "init", rb_glfw_init, 0);
-  rb_define_singleton_method(s_glfw_module, "monitors", rb_glfw_get_monitors, 0);
-  rb_define_singleton_method(s_glfw_module, "primary_monitor", rb_glfw_get_primary_monitor, 0);
   rb_define_singleton_method(s_glfw_module, "poll_events", rb_glfw_poll_events, 0);
   rb_define_singleton_method(s_glfw_module, "wait_events", rb_glfw_wait_events, 0);
-  rb_define_singleton_method(s_glfw_module, "joysitck_present", rb_glfw_joysitck_present, 1);
+  rb_define_singleton_method(s_glfw_module, "joystick_present?", rb_glfw_joystick_present, 1);
   rb_define_singleton_method(s_glfw_module, "joystick_axes", rb_glfw_get_joystick_axes, 1);
   rb_define_singleton_method(s_glfw_module, "joystick_buttons", rb_glfw_get_joystick_buttons, 1);
   rb_define_singleton_method(s_glfw_module, "joystick_name", rb_glfw_get_joystick_name, 1);