Changeset 1995 for libcaca/trunk/rubyTweet

Timestamp:

Nov 16, 2007, 11:24:35 PM (12 years ago)

Author:

Pascal Terjan

Message:

• Add Cucul::Font

Location:

libcaca/trunk/ruby

Files:

• Makefile.am (modified) (1 diff)
• common.h (added)
• cucul-canvas.c (modified) (5 diffs)
• cucul-canvas.h (modified) (1 diff)
• cucul-font.c (added)
• cucul-font.h (added)
• cucul.c (modified) (2 diffs)
• t/tc_canvas.rb (modified) (1 diff)
• t/tc_font.rb (added)

libcaca/trunk/ruby/Makefile.am

@@ -8 +8 @@
 
 cucul_la_CPPFLAGS = -I$(top_srcdir)/cucul -I$(RUBY_ARCHDIR)
-cucul_la_SOURCES = cucul.c cucul-canvas.c
+cucul_la_SOURCES = cucul.c cucul-canvas.c cucul-font.c
 cucul_la_LDFLAGS = -module -avoid-version -shared -L$(RUBY_LIBDIR) -l$(RUBY_SO_NAME)
 cucul_la_LIBADD = ../cucul/libcucul.la
 
 EXTRA_DIST = cucul-canvas.h \
+             cucul-canvas.h \
+             common.h \
              test.rb \
              t/tc_frame.rb \

libcaca/trunk/ruby/cucul-canvas.c

@@ -13 +13 @@
 #include <cucul.h>
 #include <errno.h>
-#include "cucul-canvas.h"
-
-#define _SELF  (DATA_PTR(self))
+#include "cucul-font.h"
+#include "common.h"
+
+VALUE cCanvas;
 
 #define simple_func(x)                                  \
@@ -202 +203 @@
     Check_Type(x, T_FIXNUM);
     Check_Type(y, T_FIXNUM);
+    //FIXME rather check that class is cCanvas
     Check_Type(src, TYPE(self));
     Data_Get_Struct(src, cucul_canvas_t, csrc);
     if(!NIL_P(mask))
     {
+        //FIXME rather check that class is cCanvas
         Check_Type(mask, TYPE(self));
         Data_Get_Struct(mask, cucul_canvas_t, cmask);
@@ -485 +488 @@
 /****/
 
+static VALUE render_canvas(VALUE self, VALUE font, VALUE width, VALUE height, VALUE pitch)
+{
+    void *buf;
+    cucul_font_t *f;
+    VALUE b;
+
+    //FIXME rather check that class is cFont
+    Check_Type(font, TYPE(self));
+
+    buf = malloc(width*height*4);
+    if(buf == NULL)
+    {
+        rb_raise(rb_eNoMemError, "Out of memory");
+    }
+
+    f = DATA_PTR(font);
+    cucul_render_canvas(_SELF, f, buf, NUM2UINT(width), NUM2UINT(height), NUM2UINT(pitch));
+
+    b = rb_str_new(buf, width*height*4);
+    free(buf);
+    return b;
+}
+
 static VALUE import_memory(VALUE self, VALUE data, VALUE format)
 {
@@ -566 +592 @@
 void Init_cucul_canvas(VALUE mCucul)
 {
-    VALUE cCanvas = rb_define_class_under(mCucul, "Canvas", rb_cObject);
+    cCanvas = rb_define_class_under(mCucul, "Canvas", rb_cObject);
     rb_define_alloc_func(cCanvas, canvas_alloc);
 
@@ -635 +661 @@
     rb_define_method(cCanvas, "free_frame", free_frame, 1);
 
+    rb_define_method(cCanvas, "render", render_canvas, 4);
     rb_define_method(cCanvas, "import_memory", import_memory, 2);
     rb_define_method(cCanvas, "import_file", import_file, 2);

libcaca/trunk/ruby/cucul-canvas.h

@@ -2 +2 @@
 #define __CUCUL_CANVAS_H__
 
+#include <ruby.h>
+
+extern VALUE cCanvas;
 extern void Init_cucul_canvas(VALUE);
 

libcaca/trunk/ruby/cucul.c

@@ -14 +14 @@
 
 #include "cucul-canvas.h"
-
-static VALUE mCucul;
+#include "cucul-font.h"
 
 void Init_cucul()
 {
-    mCucul = rb_define_module("Cucul");
+    VALUE mCucul = rb_define_module("Cucul");
 
     rb_define_const(mCucul, "BLACK", INT2FIX(CUCUL_BLACK));
@@ -46 +45 @@
 
     Init_cucul_canvas(mCucul);
+    Init_cucul_font(mCucul);
 }

libcaca/trunk/ruby/t/tc_canvas.rb

@@ -45 +45 @@
         assert_equal(42, @c.get_char(1,1))
     end
+    def test_render
+        c = Cucul::Canvas.new(4,4)
+        c.put_str(0,0,"plop")
+        f = Cucul::Font.new(Cucul::Font.list[0])
+        assert_not_nil(c.render(f, c.width*f.width, c.height*f.height, c.width*f.width*4))
+    end
 end