glfw3 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa3c81cf32a76569db80053ccc2422eac1d9f59
-  data.tar.gz: f6383866824dbdf589c7567f613d8427e3ec4e51
+  metadata.gz: af1da580f8de9e21f650115855184766da438c18
+  data.tar.gz: 2c1f559d4044a53985c76c373fa38dcf62aa03b1
 SHA512:
-  metadata.gz: cc3881835604728d4d632c0a443a443e5c2a599e8820c9c9bb01bcdb9fbdda5cde254d7740c3cb23e0e912839654df81c2a6646b2eb6f79b2ca007d17dba924e
-  data.tar.gz: fc0df1b75de611329f2ff585ff6885171a3d369bbe97cae8b8c558908438dd47bb92dadbec47c5f711590a1efd886cb6b3196d1908e9518d468e687b389df30d
+  metadata.gz: d784dbdccdef6a614369f6e87145687a1caacfc1b7a6500d23378032a3b329ef7f5e700d2afbf67ea1b6fb15faef3b762b0c194b101e6affdf34a7914522cd39
+  data.tar.gz: 8c04f83251a478714379caa99d78fe86f7354482941918540d2ab233703704eb9d0aed3d64868933bbc8176ac2ceade5187f85a557a04dd6e2bd962292bc866e

data/ext/glfw3/glfw3.c

@@ -9,23 +9,50 @@ typedef struct s_rb_glfw_error
 } rb_glfw_error_t;
 
 
-static const char *kRB_IVAR_WINDOW_INTERNAL                   = "@__internal_window";
-static const char *kRB_IVAR_WINDOW_KEY_CALLBACK               = "@__key_callback";
-static const char *kRB_IVAR_WINDOW_CHAR_CALLBACK              = "@__char_callback";
-static const char *kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK      = "@__mouse_button_callback";
-static const char *kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK   = "@__cursor_position_callback";
-static const char *kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK      = "@__cursor_enter_callback";
-static const char *kRB_IVAR_WINDOW_SCROLL_CALLBACK            = "@__scroll_callback";
-static const char *kRB_IVAR_WINDOW_POSITION_CALLBACK          = "@__position_callback";
-static const char *kRB_IVAR_WINDOW_SIZE_CALLBACK              = "@__size_callback";
-static const char *kRB_IVAR_WINDOW_CLOSE_CALLBACK             = "@__close_callback";
-static const char *kRB_IVAR_WINDOW_REFRESH_CALLBACK           = "@__refresh_callback";
-static const char *kRB_IVAR_WINDOW_FOCUS_CALLBACK             = "@__focus_callback";
-static const char *kRB_IVAR_WINDOW_ICONIFY_CALLBACK           = "@__iconify_callback";
-static const char *kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK  = "@__framebuffer_size_callback";
-static const char *kRB_CVAR_WINDOW_WINDOWS                    = "@@__windows";
-static const char *kRB_CVAR_GLFW_ERROR_CALLBACK               = "@@__error_callback";
-static const char *kRB_CVAR_GLFW_MONITOR_CALLBACK             = "@@__monitor_callback";
+static const char *kRB_IVAR_WINDOW_INTERNAL_NAME                   = "@__internal_window";
+static const char *kRB_IVAR_WINDOW_KEY_CALLBACK_NAME               = "@__key_callback";
+static const char *kRB_IVAR_WINDOW_CHAR_CALLBACK_NAME              = "@__char_callback";
+static const char *kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK_NAME      = "@__mouse_button_callback";
+static const char *kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK_NAME   = "@__cursor_position_callback";
+static const char *kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK_NAME      = "@__cursor_enter_callback";
+static const char *kRB_IVAR_WINDOW_SCROLL_CALLBACK_NAME            = "@__scroll_callback";
+static const char *kRB_IVAR_WINDOW_POSITION_CALLBACK_NAME          = "@__position_callback";
+static const char *kRB_IVAR_WINDOW_SIZE_CALLBACK_NAME              = "@__size_callback";
+static const char *kRB_IVAR_WINDOW_CLOSE_CALLBACK_NAME             = "@__close_callback";
+static const char *kRB_IVAR_WINDOW_REFRESH_CALLBACK_NAME           = "@__refresh_callback";
+static const char *kRB_IVAR_WINDOW_FOCUS_CALLBACK_NAME             = "@__focus_callback";
+static const char *kRB_IVAR_WINDOW_ICONIFY_CALLBACK_NAME           = "@__iconify_callback";
+static const char *kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK_NAME  = "@__framebuffer_size_callback";
+static const char *kRB_CVAR_WINDOW_WINDOWS_NAME                    = "@@__windows";
+static const char *kRB_CVAR_GLFW_ERROR_CALLBACK_NAME               = "@@__error_callback";
+static const char *kRB_CVAR_GLFW_MONITOR_CALLBACK_NAME             = "@@__monitor_callback";
+static const char *kRB_CALL_NAME                                   = "call";
+static const char *kRB_RED_NAME                                    = "red";
+static const char *kRB_GREEN_NAME                                  = "green";
+static const char *kRB_BLUE_NAME                                   = "blue";
+
+
+static ID kRB_IVAR_WINDOW_INTERNAL;
+static ID kRB_IVAR_WINDOW_KEY_CALLBACK;
+static ID kRB_IVAR_WINDOW_CHAR_CALLBACK;
+static ID kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK;
+static ID kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK;
+static ID kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK;
+static ID kRB_IVAR_WINDOW_SCROLL_CALLBACK;
+static ID kRB_IVAR_WINDOW_POSITION_CALLBACK;
+static ID kRB_IVAR_WINDOW_SIZE_CALLBACK;
+static ID kRB_IVAR_WINDOW_CLOSE_CALLBACK;
+static ID kRB_IVAR_WINDOW_REFRESH_CALLBACK;
+static ID kRB_IVAR_WINDOW_FOCUS_CALLBACK;
+static ID kRB_IVAR_WINDOW_ICONIFY_CALLBACK;
+static ID kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK;
+static ID kRB_CVAR_WINDOW_WINDOWS;
+static ID kRB_CVAR_GLFW_ERROR_CALLBACK;
+static ID kRB_CVAR_GLFW_MONITOR_CALLBACK;
+static ID kRB_CALL;
+static ID kRB_RED;
+static ID kRB_GREEN;
+static ID kRB_BLUE;
 
 
 static VALUE s_glfw_module = Qundef;
@@ -106,14 +133,14 @@ static VALUE rb_glfw_version(VALUE self)
 
 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));
+  VALUE lambda = rb_cvar_get(s_glfw_module, kRB_CVAR_GLFW_ERROR_CALLBACK);
 
   if (RTEST(lambda)) {
     VALUE rb_description = rb_str_new2(description);
     VALUE rb_error_code = INT2FIX(error_code);
     OBJ_FREEZE(rb_description);
     OBJ_FREEZE(rb_error_code);
-    rb_funcall(lambda, rb_intern("call"), 2, rb_error_code, rb_description);
+    rb_funcall(lambda, kRB_CALL, 2, rb_error_code, rb_description);
   } else {
     rb_raise(rb_eRuntimeError, "GLFW Error 0x%X: %s", error_code, description);
   }
@@ -231,11 +258,11 @@ VALUE rb_monitor_name(VALUE self)
 
 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));
+  VALUE lambda = rb_cvar_get(s_glfw_module, kRB_CVAR_GLFW_MONITOR_CALLBACK);
   if (RTEST(lambda)) {
     VALUE rb_monitor = Data_Wrap_Struct(s_glfw_monitor_klass, 0, 0, monitor);
     rb_obj_call_init(rb_monitor, 0, 0);
-    rb_funcall(lambda, rb_intern("call"), 2, rb_monitor, INT2FIX(message));
+    rb_funcall(lambda, kRB_CALL, 2, rb_monitor, INT2FIX(message));
   }
 }
 
@@ -435,9 +462,9 @@ static VALUE rb_monitor_get_gamma_ramp(VALUE self)
     rb_ary_push(rb_blue, INT2NUM(ramp->blue[ramp_index]));
   }
 
-  rb_hash_aset(rb_gamma_hash, ID2SYM(rb_intern("red")), rb_red);
-  rb_hash_aset(rb_gamma_hash, ID2SYM(rb_intern("green")), rb_green);
-  rb_hash_aset(rb_gamma_hash, ID2SYM(rb_intern("blue")), rb_blue);
+  rb_hash_aset(rb_gamma_hash, ID2SYM(kRB_RED), rb_red);
+  rb_hash_aset(rb_gamma_hash, ID2SYM(kRB_GREEN), rb_green);
+  rb_hash_aset(rb_gamma_hash, ID2SYM(kRB_BLUE), rb_blue);
 
   return rb_gamma_hash;
 }
@@ -475,9 +502,9 @@ static VALUE rb_monitor_set_gamma_ramp(VALUE self, VALUE ramp_hash)
 
   Data_Get_Struct(self, GLFWmonitor, monitor);
 
-  rb_red = rb_hash_aref(ramp_hash, ID2SYM(rb_intern("red")));
-  rb_green = rb_hash_aref(ramp_hash, ID2SYM(rb_intern("green")));
-  rb_blue = rb_hash_aref(ramp_hash, ID2SYM(rb_intern("blue")));
+  rb_red = rb_hash_aref(ramp_hash, ID2SYM(kRB_RED));
+  rb_green = rb_hash_aref(ramp_hash, ID2SYM(kRB_GREEN));
+  rb_blue = rb_hash_aref(ramp_hash, ID2SYM(kRB_BLUE));
 
   if (!(RTEST(rb_red) && RTEST(rb_green) && RTEST(rb_blue))) {
     rb_raise(rb_eArgError, "Ramp Hash must contain :red, :green, and :blue arrays");
@@ -555,7 +582,7 @@ static GLFWwindow *rb_get_window(VALUE rb_window)
 {
   GLFWwindow *window = NULL;
   if (RTEST(rb_window)) {
-    ID ivar_window = rb_intern(kRB_IVAR_WINDOW_INTERNAL);
+    ID ivar_window = kRB_IVAR_WINDOW_INTERNAL;
     VALUE rb_window_data = Qnil;
     if (RTEST((rb_window_data = rb_ivar_get(rb_window, ivar_window)))) {
       Data_Get_Struct(rb_window_data, GLFWwindow, window);
@@ -578,7 +605,7 @@ static GLFWwindow *rb_get_window(VALUE rb_window)
  */
 static VALUE rb_window_new(int argc, VALUE *argv, VALUE self)
 {
-  ID ivar_window = rb_intern(kRB_IVAR_WINDOW_INTERNAL);
+  ID ivar_window = kRB_IVAR_WINDOW_INTERNAL;
   VALUE rb_width, rb_height, rb_title, rb_monitor, rb_share;
   VALUE rb_window;
   VALUE rb_window_data;
@@ -625,25 +652,25 @@ static VALUE rb_window_new(int argc, VALUE *argv, VALUE self)
   rb_window = rb_obj_alloc(s_glfw_window_klass);
 
   rb_ivar_set(rb_window, ivar_window, rb_window_data);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_KEY_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_CHAR_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_SCROLL_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_POSITION_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_SIZE_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_CLOSE_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_REFRESH_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_FOCUS_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_ICONIFY_CALLBACK), Qnil);
-  rb_ivar_set(rb_window, rb_intern(kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK), Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_KEY_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_CHAR_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_SCROLL_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_POSITION_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_SIZE_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_CLOSE_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_REFRESH_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_FOCUS_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_ICONIFY_CALLBACK, Qnil);
+  rb_ivar_set(rb_window, kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK, Qnil);
 
   glfwSetWindowUserPointer(window, (void *)rb_window);
   rb_obj_call_init(rb_window, 0, 0);
 
   // Store the window so it can't go out of scope until explicitly destroyed.
-  rb_windows = rb_cvar_get(self, rb_intern(kRB_CVAR_WINDOW_WINDOWS));
+  rb_windows = rb_cvar_get(self, kRB_CVAR_WINDOW_WINDOWS);
   rb_hash_aset(rb_windows, INT2FIX((int)window), rb_window);
 
   return rb_window;
@@ -661,8 +688,8 @@ static VALUE rb_window_destroy(VALUE self)
   GLFWwindow *window = rb_get_window(self);
   if (window) {
     glfwDestroyWindow(window);
-    rb_ivar_set(self, rb_intern(kRB_IVAR_WINDOW_INTERNAL), Qnil);
-    VALUE rb_windows = rb_cvar_get(s_glfw_window_klass, rb_intern(kRB_CVAR_WINDOW_WINDOWS));
+    rb_ivar_set(self, kRB_IVAR_WINDOW_INTERNAL, Qnil);
+    VALUE rb_windows = rb_cvar_get(s_glfw_window_klass, kRB_CVAR_WINDOW_WINDOWS);
     rb_hash_delete(rb_windows, INT2FIX((int)window));
   }
   return self;
@@ -888,8 +915,8 @@ static VALUE rb_window_get_monitor(VALUE self)
 static void rb_window_window_position_callback(GLFWwindow *window, int x, int y)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_POSITION_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 3, rb_window, INT2FIX(x), INT2FIX(y));
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_POSITION_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 3, rb_window, INT2FIX(x), INT2FIX(y));
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_window_position_callback, rb_window_window_position_callback, glfwSetWindowPosCallback);
@@ -899,8 +926,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_window_position_callback, rb_window_window_
 static void rb_window_window_size_callback(GLFWwindow *window, int width, int height)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_SIZE_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 3, rb_window, INT2FIX(width), INT2FIX(height));
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_SIZE_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 3, rb_window, INT2FIX(width), INT2FIX(height));
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_window_size_callback, rb_window_window_size_callback, glfwSetWindowSizeCallback);
@@ -910,8 +937,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_window_size_callback, rb_window_window_size
 static void rb_window_close_callback(GLFWwindow *window)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_CLOSE_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 1, rb_window);
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_CLOSE_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 1, rb_window);
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_close_callback, rb_window_close_callback, glfwSetWindowCloseCallback);
@@ -921,8 +948,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_close_callback, rb_window_close_callback, g
 static void rb_window_refresh_callback(GLFWwindow *window)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_REFRESH_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 1, rb_window);
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_REFRESH_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 1, rb_window);
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_refresh_callback, rb_window_refresh_callback, glfwSetWindowRefreshCallback);
@@ -932,8 +959,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_refresh_callback, rb_window_refresh_callbac
 static void rb_window_focus_callback(GLFWwindow *window, int focused)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_FOCUS_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 2, rb_window, focused ? Qtrue : Qfalse);
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_FOCUS_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 2, rb_window, focused ? Qtrue : Qfalse);
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_focus_callback, rb_window_focus_callback, glfwSetWindowFocusCallback);
@@ -943,8 +970,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_focus_callback, rb_window_focus_callback, g
 static void rb_window_iconify_callback(GLFWwindow *window, int iconified)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_ICONIFY_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 2, rb_window, iconified ? Qtrue : Qfalse);
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_ICONIFY_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 2, rb_window, iconified ? Qtrue : Qfalse);
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_iconify_callback, rb_window_iconify_callback, glfwSetWindowIconifyCallback);
@@ -954,8 +981,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_iconify_callback, rb_window_iconify_callbac
 static void rb_window_fbsize_callback(GLFWwindow *window, int width, int height)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 3, rb_window, INT2FIX(width), INT2FIX(height));
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 3, rb_window, INT2FIX(width), INT2FIX(height));
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_fbsize_callback, rb_window_fbsize_callback, glfwSetFramebufferSizeCallback);
@@ -1104,8 +1131,8 @@ static VALUE rb_window_set_cursor_pos(VALUE self, VALUE x, VALUE y)
 static void rb_window_key_callback(GLFWwindow *window, int key, int scancode, int action, int mods)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_KEY_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 5, rb_window, INT2FIX(key), INT2FIX(scancode), INT2FIX(action), INT2FIX(mods));
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_KEY_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 5, rb_window, INT2FIX(key), INT2FIX(scancode), INT2FIX(action), INT2FIX(mods));
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_key_callback, rb_window_key_callback, glfwSetKeyCallback);
@@ -1115,8 +1142,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_key_callback, rb_window_key_callback, glfwS
 static void rb_window_char_callback(GLFWwindow *window, unsigned int code)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_CHAR_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 2, rb_window, UINT2NUM(code));
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_CHAR_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 2, rb_window, UINT2NUM(code));
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_char_callback, rb_window_char_callback, glfwSetCharCallback);
@@ -1127,8 +1154,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_char_callback, rb_window_char_callback, glf
 static void rb_window_mouse_button_callback(GLFWwindow *window, int button, int action, int mods)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 4, rb_window, INT2FIX(button), INT2FIX(action), INT2FIX(mods));
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 4, rb_window, INT2FIX(button), INT2FIX(action), INT2FIX(mods));
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_mouse_button_callback, rb_window_mouse_button_callback, glfwSetMouseButtonCallback);
@@ -1138,8 +1165,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_mouse_button_callback, rb_window_mouse_butt
 static void rb_window_cursor_position_callback(GLFWwindow *window, double x, double y)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 4, rb_window, rb_float_new(x), rb_float_new(y));
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 4, rb_window, rb_float_new(x), rb_float_new(y));
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_cursor_position_callback, rb_window_cursor_position_callback, glfwSetCursorPosCallback);
@@ -1149,8 +1176,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_cursor_position_callback, rb_window_cursor_
 static void rb_window_cursor_enter_callback(GLFWwindow *window, int entered)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 2, rb_window, entered ? Qtrue : Qfalse);
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 2, rb_window, entered ? Qtrue : Qfalse);
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_cursor_enter_callback, rb_window_cursor_enter_callback, glfwSetCursorEnterCallback);
@@ -1160,8 +1187,8 @@ RB_ENABLE_CALLBACK_DEF(rb_window_set_cursor_enter_callback, rb_window_cursor_ent
 static void rb_window_scroll_callback(GLFWwindow *window, double x, double y)
 {
   VALUE rb_window = rb_lookup_window(window);
-  VALUE rb_func = rb_ivar_get(rb_window, rb_intern(kRB_IVAR_WINDOW_SCROLL_CALLBACK));
-  rb_funcall(rb_func, rb_intern("call"), 4, rb_window, rb_float_new(x), rb_float_new(y));
+  VALUE rb_func = rb_ivar_get(rb_window, kRB_IVAR_WINDOW_SCROLL_CALLBACK);
+  rb_funcall(rb_func, kRB_CALL, 4, rb_window, rb_float_new(x), rb_float_new(y));
 }
 
 RB_ENABLE_CALLBACK_DEF(rb_window_set_scroll_callback, rb_window_scroll_callback, glfwSetScrollCallback);
@@ -1444,6 +1471,28 @@ static VALUE rb_glfw_extension_supported(VALUE self, VALUE extension)
 
 void Init_glfw3(void)
 {
+  kRB_IVAR_WINDOW_INTERNAL                  = rb_intern(kRB_IVAR_WINDOW_INTERNAL_NAME);
+  kRB_IVAR_WINDOW_KEY_CALLBACK              = rb_intern(kRB_IVAR_WINDOW_KEY_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_CHAR_CALLBACK             = rb_intern(kRB_IVAR_WINDOW_CHAR_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK     = rb_intern(kRB_IVAR_WINDOW_MOUSE_BUTTON_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK  = rb_intern(kRB_IVAR_WINDOW_CURSOR_POSITION_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK     = rb_intern(kRB_IVAR_WINDOW_CURSOR_ENTER_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_SCROLL_CALLBACK           = rb_intern(kRB_IVAR_WINDOW_SCROLL_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_POSITION_CALLBACK         = rb_intern(kRB_IVAR_WINDOW_POSITION_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_SIZE_CALLBACK             = rb_intern(kRB_IVAR_WINDOW_SIZE_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_CLOSE_CALLBACK            = rb_intern(kRB_IVAR_WINDOW_CLOSE_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_REFRESH_CALLBACK          = rb_intern(kRB_IVAR_WINDOW_REFRESH_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_FOCUS_CALLBACK            = rb_intern(kRB_IVAR_WINDOW_FOCUS_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_ICONIFY_CALLBACK          = rb_intern(kRB_IVAR_WINDOW_ICONIFY_CALLBACK_NAME);
+  kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK = rb_intern(kRB_IVAR_WINDOW_FRAMEBUFFER_SIZE_CALLBACK_NAME);
+  kRB_CVAR_WINDOW_WINDOWS                   = rb_intern(kRB_CVAR_WINDOW_WINDOWS_NAME);
+  kRB_CVAR_GLFW_ERROR_CALLBACK              = rb_intern(kRB_CVAR_GLFW_ERROR_CALLBACK_NAME);
+  kRB_CVAR_GLFW_MONITOR_CALLBACK            = rb_intern(kRB_CVAR_GLFW_MONITOR_CALLBACK_NAME);
+  kRB_CALL                                  = rb_intern(kRB_CALL_NAME);
+  kRB_RED                                   = rb_intern(kRB_RED_NAME);
+  kRB_GREEN                                 = rb_intern(kRB_GREEN_NAME);
+  kRB_BLUE                                  = rb_intern(kRB_BLUE_NAME);
+
   s_glfw_module = rb_define_module("Glfw");
   s_glfw_monitor_klass = rb_define_class_under(s_glfw_module, "Monitor", rb_cObject);
   s_glfw_window_klass = rb_define_class_under(s_glfw_module, "Window", rb_cObject);
@@ -1513,11 +1562,11 @@ void Init_glfw3(void)
   rb_define_method(s_glfw_window_klass, "set_scroll_callback__", rb_window_set_scroll_callback, 1);
   rb_define_method(s_glfw_window_klass, "clipboard_string=", rb_window_set_clipboard_string, 1);
   rb_define_method(s_glfw_window_klass, "clipboard_string", rb_window_get_clipboard_string, 0);
-  rb_cvar_set(s_glfw_window_klass, rb_intern(kRB_CVAR_WINDOW_WINDOWS), rb_hash_new());
+  rb_cvar_set(s_glfw_window_klass, kRB_CVAR_WINDOW_WINDOWS, rb_hash_new());
 
   /* Glfw */
-  rb_cvar_set(s_glfw_module, rb_intern(kRB_CVAR_GLFW_ERROR_CALLBACK), Qnil);
-  rb_cvar_set(s_glfw_module, rb_intern(kRB_CVAR_GLFW_MONITOR_CALLBACK), Qnil);
+  rb_cvar_set(s_glfw_module, kRB_CVAR_GLFW_ERROR_CALLBACK, Qnil);
+  rb_cvar_set(s_glfw_module, kRB_CVAR_GLFW_MONITOR_CALLBACK, Qnil);
   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);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glfw3
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Noel Raymond Cower