From fea75d22731d40e28060e7637da666b1bb889b2d Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Sat, 8 Nov 2008 15:15:30 +0100 Subject: [PATCH] changed gradient2.c to macro style --- src/lib/gradient2.c | 97 +++++------------------------------------------------ src/lib/macro.h | 6 ++-- 2 files changed, 11 insertions(+), 92 deletions(-) diff --git a/src/lib/gradient2.c b/src/lib/gradient2.c index 43532ff..12c38c1 100644 --- a/src/lib/gradient2.c +++ b/src/lib/gradient2.c @@ -2,6 +2,7 @@ #include "luaobj.h" #include "class.h" #include "object.h" +#include "macro.h" #include static int @@ -24,14 +25,6 @@ lgradient2_fn_color_np_stop_insert (lua_State *L) } static int -lgradient2_get_fill_spread (lua_State *L) -{ - luaobj_Object *obj = lua_touserdata (L, 1); - lua_pushnumber (L, evas_object_gradient2_fill_spread_get (obj->data)); - return 1; -} - -static int lgradient2_get_fill_transform (lua_State *L) { luaobj_Object *obj = lua_touserdata (L, 1); @@ -41,89 +34,15 @@ lgradient2_get_fill_transform (lua_State *L) lua_pushnil (L); return 1; } +GET_INTEGER (lgradient2_get_fill_spread, evas_object_gradient2_fill_spread_get); +SET_INTEGER (lgradient2_set_fill_spread, evas_object_gradient2_fill_spread_set); +SET_OBJ (lgradient2_set_fill_transform, evas_object_gradient2_fill_transform_set); -static int -lgradient2_set_fill_spread (lua_State *L) -{ - luaobj_Object *obj = lua_touserdata (L, 1); - evas_object_gradient2_fill_spread_set ( - obj->data, - luaL_checkint (L, 2)); - return 0; -} - -static int -lgradient2_set_fill_transform (lua_State *L) -{ - luaobj_Object *obj = lua_touserdata (L, 1); - luaobj_Object *trans = lua_touserdata (L, 2); - evas_object_gradient2_fill_transform_set ( - obj->data, - trans->data); - return 0; -} - -static int -lgradient2_linear_get_fill (lua_State *L) -{ - luaobj_Object *obj = lua_touserdata (L, 1); - float x0, y0, x1, y1; - evas_object_gradient2_linear_fill_get (obj->data, &x0, &y0, &x1, &y1); - lua_newtable (L); - lua_pushnumber (L, x0); lua_rawseti (L, -2, 1); - lua_pushnumber (L, y0); lua_rawseti (L, -2, 2); - lua_pushnumber (L, x1); lua_rawseti (L, -2, 3); - lua_pushnumber (L, y1); lua_rawseti (L, -2, 4); - return 1; -} - -static int -lgradient2_radial_get_fill (lua_State *L) -{ - luaobj_Object *obj = lua_touserdata (L, 1); - float cx, cy, rx, ry; - evas_object_gradient2_radial_fill_get (obj->data, &cx, &cy, &rx, &ry); - lua_newtable (L); - lua_pushnumber (L, cx); lua_rawseti (L, -2, 1); - lua_pushnumber (L, cy); lua_rawseti (L, -2, 2); - lua_pushnumber (L, rx); lua_rawseti (L, -2, 3); - lua_pushnumber (L, ry); lua_rawseti (L, -2, 4); - return 1; -} +GET_TAB4INTEGER (lgradient2_linear_get_fill, evas_object_gradient2_linear_fill_get); +GET_TAB4FLOAT (lgradient2_radial_get_fill, evas_object_gradient2_radial_fill_get); -static int -lgradient2_linear_set_fill (lua_State *L) -{ - luaobj_Object *obj = lua_touserdata (L, 1); - lua_rawgeti (L, 2, 1); // x0 - lua_rawgeti (L, 2, 2); // y0 - lua_rawgeti (L, 2, 3); // x1 - lua_rawgeti (L, 2, 4); // y1 - evas_object_gradient2_linear_fill_set ( - obj->data, - luaL_checknumber (L, -4), - luaL_checknumber (L, -3), - luaL_checknumber (L, -2), - luaL_checknumber (L, -1)); - return 0; -} - -static int -lgradient2_radial_set_fill (lua_State *L) -{ - luaobj_Object *obj = lua_touserdata (L, 1); - lua_rawgeti (L, 2, 1); // cx - lua_rawgeti (L, 2, 2); // cy - lua_rawgeti (L, 2, 3); // rx - lua_rawgeti (L, 2, 4); // ry - evas_object_gradient2_radial_fill_set ( - obj->data, - luaL_checknumber (L, -4), - luaL_checknumber (L, -3), - luaL_checknumber (L, -2), - luaL_checknumber (L, -1)); - return 0; -} +SET_TAB4INTEGER (lgradient2_linear_set_fill, evas_object_gradient2_linear_fill_set); +SET_TAB4FLOAT (lgradient2_radial_set_fill, evas_object_gradient2_radial_fill_set); const struct luaL_Reg lGradient2_fn[] = { {"color_np_stop_insert", lgradient2_fn_color_np_stop_insert}, diff --git a/src/lib/macro.h b/src/lib/macro.h index b57ad3a..8778e0c 100644 --- a/src/lib/macro.h +++ b/src/lib/macro.h @@ -247,7 +247,7 @@ static int \ EGO_FUNC (lua_State *L) \ { \ luaobj_Object *obj = lua_touserdata (L, 1); \ - Lua_Number p1, p2; \ + double p1, p2; \ E_FUNC (obj->data, &p1, &p2); \ lua_newtable (L); \ lua_pushnumber (L, p1); lua_rawseti (L, -2, 1); \ @@ -278,7 +278,7 @@ static int \ EGO_FUNC (lua_State *L) \ { \ luaobj_Object *obj = lua_touserdata (L, 1); \ - Lua_Number p1, p2; \ + double p1, p2; \ E_FUNC (obj->data, &p1, &p2); \ lua_newtable (L); \ lua_pushstring (L, p1); lua_rawseti (L, -2, 1); \ @@ -346,7 +346,7 @@ static int \ EGO_FUNC (lua_State *L) \ { \ luaobj_Object *obj = lua_touserdata (L, 1); \ - Lua_Number p1, p2, p3, p4; \ + double p1, p2, p3, p4; \ E_FUNC (obj->data, &p1, &p2, &p3, &p4); \ lua_newtable (L); \ lua_pushnumber (L, p1); lua_rawseti (L, -2, 1); \ -- 2.11.4.GIT