Changeset 3129Tweet

Timestamp:

Oct 28, 2008, 2:45:39 PM (15 years ago)

Author:

nico

Message:

• Add php binding for caca_load_font, caca_get_font_blocks, caca_put_figchar
• Add a working sample file examples/figfont.php
• Rename sample programs:

examples1.php > cacapig.php
drivers.php > cacainfo.php

Location:

libcaca/trunk/caca-php

Files:

• examples/cacainfo.php (moved) (moved from libcaca/trunk/caca-php/examples/drivers.php)
• examples/cacapig.php (moved) (moved from libcaca/trunk/caca-php/examples/example1.php)
• examples/figfont.php (added)
• php_caca.c (modified) (4 diffs)
• php_caca.h (modified) (1 diff)

libcaca/trunk/caca-php/php_caca.c

@@ -112 +112 @@
         PHP_FE(caca_get_font_width, NULL)
         PHP_FE(caca_get_font_height, NULL)
-        PHP_FE(caca_get_font_bloc, NULL)
+        PHP_FE(caca_get_font_blocks, NULL)
         PHP_FE(caca_render_canvas, NULL)
         PHP_FE(caca_canvas_set_figfont, NULL)
@@ -1205 +1205 @@
 
 PHP_FUNCTION(caca_load_font) {
+        char *str;
+        long str_len;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_font_t *font = caca_load_font(str, str_len);
+        ZEND_REGISTER_RESOURCE(return_value, font, le_caca_font);
 }
 
@@ -1235 +1242 @@
 }
 
-PHP_FUNCTION(caca_get_font_bloc) {
+PHP_FUNCTION(caca_get_font_blocks) {
+        zval *_zval;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &_zval) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_font_t *font;
+        ZEND_FETCH_RESOURCE(font, caca_font_t*, &_zval, -1, PHP_CACA_FONT_RES_NAME, le_caca_font);
+
+        uint32_t const *list = caca_get_font_blocks(font);
+
+        int i;
+        array_init(return_value);       
+        for(i = 0; list[i]; i += 1)
+                add_next_index_long(return_value, list[i]);
 }
 
@@ -1254 +1274 @@
 
 PHP_FUNCTION(caca_put_figchar) {
+        zval *_zval;
+        long c;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &_zval, &c) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *canvas;
+        ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+
+        //TODO: get a string instead of a long
+        caca_put_figchar(canvas, c);
 }
 

libcaca/trunk/caca-php/php_caca.h

@@ -129 +129 @@
 PHP_FUNCTION(caca_get_font_width);
 PHP_FUNCTION(caca_get_font_height);
-PHP_FUNCTION(caca_get_font_bloc);
+PHP_FUNCTION(caca_get_font_blocks);
 PHP_FUNCTION(caca_render_canvas);
 PHP_FUNCTION(caca_canvas_set_figfont);