Index: /libcaca/trunk/caca-php/php_caca.c
===================================================================
--- /libcaca/trunk/caca-php/php_caca.c	(revision 3090)
+++ /libcaca/trunk/caca-php/php_caca.c	(revision 3091)
@@ -19,4 +19,5 @@
 
 static function_entry caca_functions[] = {
+	PHP_FE(caca_create_canvas, NULL)
 	PHP_FE(caca_manage_canvas, NULL)
 	PHP_FE(caca_unmanage_canvas, NULL)
@@ -24,5 +25,6 @@
 	PHP_FE(caca_get_canvas_width, NULL)
 	PHP_FE(caca_get_canvas_height, NULL)
-	PHP_FE(caca_free_canvas, NULL)
+	PHP_FE(caca_get_canvas_chars, NULL)
+	PHP_FE(caca_get_canvas_attrs, NULL)
 	PHP_FE(caca_rand, NULL)
 	PHP_FE(caca_get_version, NULL)
@@ -31,4 +33,5 @@
 	PHP_FE(caca_get_cursor_y, NULL)
 	PHP_FE(caca_put_char, NULL)
+	PHP_FE(caca_get_char, NULL)
 	PHP_FE(caca_put_str, NULL)
 	PHP_FE(caca_printf, NULL)
@@ -46,4 +49,5 @@
 	PHP_FE(caca_stretch_left, NULL)
 	PHP_FE(caca_stretch_right, NULL)
+	PHP_FE(caca_get_attr, NULL)
 	PHP_FE(caca_set_attr, NULL)
 	PHP_FE(caca_put_attr, NULL)
@@ -90,10 +94,8 @@
 	PHP_FE(caca_get_dither_algorithm, NULL)
 	PHP_FE(caca_dither_bitmap, NULL)
-	PHP_FE(caca_free_dither, NULL)
 	PHP_FE(caca_get_font_list, NULL)
 	PHP_FE(caca_get_font_width, NULL)
 	PHP_FE(caca_get_font_height, NULL)
 	PHP_FE(caca_render_canvas, NULL)
-	PHP_FE(caca_free_font, NULL)
 	PHP_FE(caca_canvas_set_figfont, NULL)
 	PHP_FE(caca_put_figchar, NULL)
@@ -108,5 +110,4 @@
 	PHP_FE(caca_get_display_driver, NULL)
 	PHP_FE(caca_set_display_driver, NULL)
-	PHP_FE(caca_free_display, NULL)
 	PHP_FE(caca_refresh_display, NULL)
 	PHP_FE(caca_set_display_time, NULL)
@@ -157,7 +158,39 @@
 	php_info_print_table_end();
 }
+
+//--------CACA'S RESSOURCES DESTRUCTORS-----------//
+
+static void php_caca_canvas_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
+	caca_free_canvas(rsrc->ptr);
+}
+
+static void php_caca_dither_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
+	caca_free_dither(rsrc->ptr);
+}
+
+static void php_caca_font_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
+	caca_free_font(rsrc->ptr);
+}
+
+static void php_caca_file_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
+}
+
+static void php_caca_display_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
+	caca_free_display(rsrc->ptr);
+}
+
+static void php_caca_event_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
+}
+
 //--------INITIALIZATION---------//
 
 PHP_MINIT_FUNCTION(caca) {
+
+	le_caca_canvas = zend_register_list_destructors_ex(php_caca_canvas_dtor, NULL, PHP_CACA_CANVAS_RES_NAME, module_number);
+	le_caca_dither = zend_register_list_destructors_ex(php_caca_dither_dtor, NULL, PHP_CACA_DITHER_RES_NAME, module_number);
+	le_caca_font = zend_register_list_destructors_ex(php_caca_font_dtor, NULL, PHP_CACA_FONT_RES_NAME, module_number);
+	le_caca_file = zend_register_list_destructors_ex(php_caca_file_dtor, NULL, PHP_CACA_FILE_RES_NAME, module_number);
+	le_caca_display = zend_register_list_destructors_ex(php_caca_display_dtor, NULL, PHP_CACA_DISPLAY_RES_NAME, module_number);
+	le_caca_event = zend_register_list_destructors_ex(php_caca_event_dtor, NULL, PHP_CACA_EVENT_RES_NAME, module_number);
 	
 	REGISTER_LONG_CONSTANT("CACA_BLACK", CACA_BLACK, CONST_CS | CONST_PERSISTENT);
@@ -184,9 +217,85 @@
 	REGISTER_LONG_CONSTANT("CACA_BLINK", CACA_BLINK, CONST_CS | CONST_PERSISTENT);
 
+	REGISTER_LONG_CONSTANT("CACA_EVENT_NONE", CACA_EVENT_NONE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_EVENT_KEY_PRESS", CACA_EVENT_KEY_PRESS, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_EVENT_KEY_RELEASE", CACA_EVENT_KEY_RELEASE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_EVENT_MOUSE_PRESS", CACA_EVENT_MOUSE_PRESS, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_EVENT_MOUSE_RELEASE", CACA_EVENT_MOUSE_RELEASE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_EVENT_MOUSE_MOTION", CACA_EVENT_MOUSE_MOTION, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_EVENT_RESIZE", CACA_EVENT_RESIZE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_EVENT_QUIT", CACA_EVENT_QUIT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_EVENT_ANY", CACA_EVENT_ANY, CONST_CS | CONST_PERSISTENT);
+
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_A", CACA_KEY_CTRL_A, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_B", CACA_KEY_CTRL_B, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_C", CACA_KEY_CTRL_C, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_D", CACA_KEY_CTRL_D, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_E", CACA_KEY_CTRL_E, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_F", CACA_KEY_CTRL_F, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_G", CACA_KEY_CTRL_G, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_BACKSPACE", CACA_KEY_BACKSPACE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_TAB", CACA_KEY_TAB, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_J", CACA_KEY_CTRL_J, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_K", CACA_KEY_CTRL_K, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_L", CACA_KEY_CTRL_L, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_RETURN", CACA_KEY_RETURN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_N", CACA_KEY_CTRL_N, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_O", CACA_KEY_CTRL_O, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_P", CACA_KEY_CTRL_P, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_Q", CACA_KEY_CTRL_Q, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_R", CACA_KEY_CTRL_R, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_PAUSE", CACA_KEY_PAUSE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_T", CACA_KEY_CTRL_T, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_U", CACA_KEY_CTRL_U, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_V", CACA_KEY_CTRL_V, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_W", CACA_KEY_CTRL_W, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_X", CACA_KEY_CTRL_X, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_Y", CACA_KEY_CTRL_Y, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_CTRL_Z", CACA_KEY_CTRL_Z, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_ESCAPE", CACA_KEY_ESCAPE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_DELETE", CACA_KEY_DELETE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_UP", CACA_KEY_UP, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_DOWN", CACA_KEY_DOWN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_LEFT", CACA_KEY_LEFT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_RIGHT", CACA_KEY_RIGHT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_INSERT", CACA_KEY_INSERT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_HOME", CACA_KEY_HOME, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_END", CACA_KEY_END, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_PAGEUP", CACA_KEY_PAGEUP, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_PAGEDOWN", CACA_KEY_PAGEDOWN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F1", CACA_KEY_F1, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F2", CACA_KEY_F2, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F3", CACA_KEY_F3, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F4", CACA_KEY_F4, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F5", CACA_KEY_F5, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F6", CACA_KEY_F6, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F7", CACA_KEY_F7, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F8", CACA_KEY_F8, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F9", CACA_KEY_F9, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F10", CACA_KEY_F10, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F11", CACA_KEY_F11, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F12", CACA_KEY_F12, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F13", CACA_KEY_F13, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F14", CACA_KEY_F14, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CACA_KEY_F15", CACA_KEY_F15, CONST_CS | CONST_PERSISTENT);
+
 	return SUCCESS;
 }
 
+//----------SOME USEFULL MACROS---------------//
+
+#define FETCH_CANVAS(canvas) \
+	zval *_zval; \
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &_zval) == FAILURE) { \
+		RETURN_FALSE; \
+	} \
+	ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas); 
+
+
 //-------CACA'S FUNCTIONS----------------//
 
+PHP_FUNCTION(caca_create_canvas) {
+}
+
 PHP_FUNCTION(caca_manage_canvas) {
 }
@@ -204,5 +313,8 @@
 }
 
-PHP_FUNCTION(caca_free_canvas) {
+PHP_FUNCTION(caca_get_canvas_chars) {
+}
+
+PHP_FUNCTION(caca_get_canvas_attrs) {
 }
 
@@ -218,7 +330,13 @@
 
 PHP_FUNCTION(caca_get_cursor_x) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_LONG(caca_get_cursor_x(canvas));
 }
 
 PHP_FUNCTION(caca_get_cursor_y) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_LONG(caca_get_cursor_y(canvas));
 }
 
@@ -226,4 +344,7 @@
 }
 
+PHP_FUNCTION(caca_get_char) {
+}
+
 PHP_FUNCTION(caca_put_str) {
 }
@@ -233,4 +354,7 @@
 
 PHP_FUNCTION(caca_clear_canvas) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_clear_canvas(canvas) == 0);
 }
 
@@ -239,7 +363,13 @@
 
 PHP_FUNCTION(caca_get_canvas_handle_x) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_LONG(caca_get_canvas_handle_x(canvas));
 }
 
 PHP_FUNCTION(caca_get_canvas_handle_y) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_LONG(caca_get_canvas_handle_y(canvas));
 }
 
@@ -251,25 +381,52 @@
 
 PHP_FUNCTION(caca_invert) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_invert(canvas) == 0);
 }
 
 PHP_FUNCTION(caca_flip) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_flip(canvas) == 0);
 }
 
 PHP_FUNCTION(caca_flop) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_flop(canvas) == 0);
 }
 
 PHP_FUNCTION(caca_rotate_180) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_rotate_180(canvas) == 0);
 }
 
 PHP_FUNCTION(caca_rotate_left) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_rotate_left(canvas) == 0);
 }
 
 PHP_FUNCTION(caca_rotate_right) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_rotate_right(canvas) == 0);
 }
 
 PHP_FUNCTION(caca_stretch_left) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_stretch_left(canvas) == 0);
 }
 
 PHP_FUNCTION(caca_stretch_right) {
+	caca_canvas_t *canvas;
+	FETCH_CANVAS(canvas);
+	RETURN_BOOL(caca_stretch_right(canvas) == 0);
+}
+
+PHP_FUNCTION(caca_get_attr) {
 }
 
@@ -418,7 +575,4 @@
 }
 
-PHP_FUNCTION(caca_free_dither) {
-}
-
 PHP_FUNCTION(caca_get_font_list) {
 }
@@ -433,7 +587,4 @@
 }
 
-PHP_FUNCTION(caca_free_font) {
-}
-
 PHP_FUNCTION(caca_canvas_set_figfont) {
 }
@@ -472,7 +623,4 @@
 }
 
-PHP_FUNCTION(caca_free_display) {
-}
-
 PHP_FUNCTION(caca_refresh_display) {
 }
Index: /libcaca/trunk/caca-php/php_caca.h
===================================================================
--- /libcaca/trunk/caca-php/php_caca.h	(revision 3090)
+++ /libcaca/trunk/caca-php/php_caca.h	(revision 3091)
@@ -16,11 +16,25 @@
 #include <caca.h>
 
-
 #define PHP_CACA_VERSION "0.0"
 #define PHP_CACA_EXTNAME "caca"
+
+#define PHP_CACA_CANVAS_RES_NAME "caca_canvas"
+#define PHP_CACA_DITHER_RES_NAME "caca_dither"
+#define PHP_CACA_FONT_RES_NAME "caca_font"
+#define PHP_CACA_FILE_RES_NAME "caca_file"
+#define PHP_CACA_DISPLAY_RES_NAME "caca_display"
+#define PHP_CACA_EVENT_RES_NAME "caca_event"
+
+int le_caca_canvas;
+int le_caca_dither;
+int le_caca_font;
+int le_caca_file;
+int le_caca_display;
+int le_caca_event;
 
 PHP_MINIT_FUNCTION(caca);
 PHP_MINFO_FUNCTION(caca);
 
+PHP_FUNCTION(caca_create_canvas);
 PHP_FUNCTION(caca_manage_canvas);
 PHP_FUNCTION(caca_unmanage_canvas);
@@ -28,5 +42,6 @@
 PHP_FUNCTION(caca_get_canvas_width);
 PHP_FUNCTION(caca_get_canvas_height);
-PHP_FUNCTION(caca_free_canvas);
+PHP_FUNCTION(caca_get_canvas_chars);
+PHP_FUNCTION(caca_get_canvas_attrs);
 PHP_FUNCTION(caca_rand);
 PHP_FUNCTION(caca_get_version);
@@ -35,4 +50,5 @@
 PHP_FUNCTION(caca_get_cursor_y);
 PHP_FUNCTION(caca_put_char);
+PHP_FUNCTION(caca_get_char);
 PHP_FUNCTION(caca_put_str);
 PHP_FUNCTION(caca_printf);
@@ -51,4 +67,5 @@
 PHP_FUNCTION(caca_stretch_left);
 PHP_FUNCTION(caca_stretch_right);
+PHP_FUNCTION(caca_get_attr);
 PHP_FUNCTION(caca_set_attr);
 PHP_FUNCTION(caca_put_attr);
@@ -99,10 +116,8 @@
 PHP_FUNCTION(caca_get_dither_algorithm);
 PHP_FUNCTION(caca_dither_bitmap);
-PHP_FUNCTION(caca_free_dither);
 PHP_FUNCTION(caca_get_font_list);
 PHP_FUNCTION(caca_get_font_width);
 PHP_FUNCTION(caca_get_font_height);
 PHP_FUNCTION(caca_render_canvas);
-PHP_FUNCTION(caca_free_font);
 PHP_FUNCTION(caca_canvas_set_figfont);
 PHP_FUNCTION(caca_put_figchar);
@@ -117,5 +132,4 @@
 PHP_FUNCTION(caca_get_display_driver);
 PHP_FUNCTION(caca_set_display_driver);
-PHP_FUNCTION(caca_free_display);
 PHP_FUNCTION(caca_refresh_display);
 PHP_FUNCTION(caca_set_display_time);