add Window.

Author: wanabe

Makefile

@@ -5,7 +5,7 @@ LOADSO_DIR=LoadSo
 LDFLAGS=$(LIBDIRS) -shared
 EXT=ExtRgss.so
 CFLAGS=$(INCDIRS) -Wall -DDLL_NAME="\"$(EXT)\""
-OBJS=ext_rgss.o ext_rgss.def graphics.o bitmap.o sprite.o rect.o
+OBJS=ext_rgss.o ext_rgss.def graphics.o bitmap.o sprite.o rect.o window.o
 LIBS=d3dx9.lib -ld3d9 -lloadso
 GAME=./Game.exe
 HEADERS=ext_rgss.h

bitmap.c

@@ -1,6 +1,8 @@
 #include "ext_rgss.h"
 #include "bitmap.h"
 
+VALUE cBitmap;
+
 static void BitmapData__update(RgssBitmapData *bmpdata) {
   BitmapExtData *extdata;
 
@@ -35,7 +37,7 @@ static VALUE Bitmap_initialize(int argc, VALUE *argv, VALUE self) {
 }
 
 void Init_ExtBitmap() {
-  VALUE cBitmap = rb_const_get(rb_cObject, rb_intern("Bitmap"));
+  cBitmap = rb_const_get(rb_cObject, rb_intern("Bitmap"));
   rb_define_alias(cBitmap, "old_initialize", "initialize");
   rb_define_method(cBitmap, "initialize", Bitmap_initialize, -1);
 }

bitmap.h

@@ -6,5 +6,7 @@ typedef struct {
 } BitmapExtData;
 #define BITMAP_EXTDATA(bmpdata) ((BitmapExtData*)((bmpdata)->info->biClrImportant))
 
+extern VALUE cBitmap;
+
 extern void Bitmap__init_extdata(VALUE bmp);
 extern void Init_ExtBitmap();

ext_rgss.c

@@ -1,6 +1,8 @@
 #include "ext_rgss.h"
 #include "graphics.h"
 #include "bitmap.h"
+#include "rect.h"
+#include "window.h"
 
 VALUE mExtRgss;
 
@@ -14,4 +16,5 @@ void Init_ExtRgss() {
   Init_ExtBitmap();
   Init_ExtSprite();
   Init_ExtRect();
+  Init_ExtWindow();
 }

ext_rgss.rb

@@ -1,9 +1,10 @@
 # encoding: utf-8
+#__END__
 require_so "ExtRgss"
 Graphics.init
 
 # generate stub and show TODO
-[:Graphics, :Sprite].each do |name|
+[:Graphics, :Sprite, :Window].each do |name|
   old_name = "Old#{name}".intern
   method_list = Object.const_get(old_name).methods(false) - Object.const_get(name).methods(false)
   method_list.sort!

graphics.c

@@ -149,6 +149,8 @@ void Init_ExtGraphics() {
   mGraphics = rb_define_module_under(mExtRgss, "Graphics");
   VALUE sprites = rb_ary_new();
   rb_ivar_set(mGraphics, rb_intern("@sprites"), sprites);
+  VALUE windows = rb_ary_new();
+  rb_ivar_set(mGraphics, rb_intern("@windows"), windows);
   rb_const_set(rb_cObject, rb_intern("OldGraphics"), mOldGraphics);
   rb_const_set(rb_cObject, rb_intern("Graphics"), mGraphics);
   rb_define_singleton_method(mGraphics, "init", Graphics_s_init, 0);

window.c

@@ -0,0 +1,65 @@
+#include "ext_rgss.h"
+#include "graphics.h"
+#include "window.h"
+#include "rect.h"
+#include "bitmap.h"
+
+static void Window__mark(void *ptr) {
+}
+
+static void Window__free(void *ptr) {
+  if(ptr) free(ptr);
+}
+
+static size_t Window__memsize(const void *ptr) {
+  return ptr ? sizeof(Window) : 0;
+}
+
+const rb_data_type_t Window_data_type = {
+  "window", {Window__mark, Window__free, Window__memsize,},
+};
+
+static VALUE Window_s_alloc(VALUE klass) {
+  VALUE obj;
+  Window *window;
+
+  obj = TypedData_Make_Struct(klass, Window, &Window_data_type, window);
+
+  return obj;
+}
+
+static VALUE Window_initialize(int argc, VALUE *argv, VALUE self) {
+  VALUE windows = rb_ivar_get(mGraphics, rb_intern("@windows"));
+  VALUE bmp_argv[2] = {INT2FIX(1), INT2FIX(1)};
+  VALUE contents = rb_class_new_instance(2, bmp_argv, cBitmap);
+  VALUE cursor_rect = rb_class_new_instance(0, NULL, cRect);
+  Window *window = EXT_WINDOW(self);
+
+  rb_ary_push(windows, self);
+  old_call(self, rb_intern("initialize"), argc, argv);
+
+  contents = old_call(self, rb_intern("contents"), 0, NULL); /* TODO */
+  rb_ivar_set(self, rb_intern("@contents"), contents);
+
+  cursor_rect = old_call(self, rb_intern("cursor_rect"), 0, NULL); /* TODO */
+  rb_ivar_set(self, rb_intern("@cursor_rect"), cursor_rect);
+  Rect__add_ref(cursor_rect, self);
+  window->cursor_rect = cursor_rect;
+
+  window->x = window->y = 0;
+  window->ox = window->oy = 0;
+  window->disposed = 0;
+  window->visible = 1;
+
+  return self;
+}
+
+void Init_ExtWindow() {
+  VALUE cOldWindow = rb_const_get(rb_cObject, rb_intern("Window"));
+  VALUE cWindow = rb_define_class_under(mExtRgss, "Window", rb_cObject);
+  rb_const_set(rb_cObject, rb_intern("OldWindow"), cOldWindow);
+  rb_const_set(rb_cObject, rb_intern("Window"), cWindow);
+
+  rb_define_alloc_func(cWindow, Window_s_alloc);
+  rb_define_method(cWindow, "initialize", Window_initialize, -1);
+}

window.h

@@ -0,0 +1,13 @@
+typedef struct {
+  VALUE content;
+  VALUE cursor_rect;
+  VERTEX vertex_data[8];
+  int x, y, ox, oy;
+  int disposed, visible;
+} Window;
+#define EXT_WINDOW(val) ((Window*)(DATA_PTR(val)))
+
+extern const rb_data_type_t Window_data_type;
+
+void Init_ExtWindow();
+//void Window__update_rect(Window *window);