[Stratagus-CVS] stratagus/src/ui icons.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/11/19 20:58:58

Modified files:
        src/ui         : icons.c 

Log message:
        Added DefineIcon, DefineIconAlias, and SetIconSize

Patches:
Index: stratagus/src/ui/icons.c
diff -u stratagus/src/ui/icons.c:1.55 stratagus/src/ui/icons.c:1.56
--- stratagus/src/ui/icons.c:1.55       Mon Nov 17 14:14:39 2003
+++ stratagus/src/ui/icons.c    Wed Nov 19 20:58:56 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: icons.c,v 1.55 2003/11/17 19:14:39 nehalmistry Exp $
+//     $Id: icons.c,v 1.56 2003/11/20 01:58:56 jsalmon3 Exp $
 
 //@{
 
@@ -172,7 +172,7 @@
     }
 
     //
-    //  Alliases: different names for the same thing
+    //  Aliases: different names for the same thing
     //
     for (i = 0; i < NumIconAliases; ++i) {
        Icon* id;
@@ -432,7 +432,7 @@
     int i;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: icons $Id: icons.c,v 1.55 2003/11/17 19:14:39 
nehalmistry Exp $\n\n");
+    CLprintf(file, ";;; MODULE: icons $Id: icons.c,v 1.56 2003/11/20 01:58:56 
jsalmon3 Exp $\n\n");
 
     //
     //  Mapping the original icon numbers in puds to our internal strings
@@ -532,6 +532,104 @@
 
     return SCM_UNSPECIFIED;
 }
+#elif defined(USE_LUA)
+local int CclDefineIcon(lua_State* l)
+{
+    const char* value;
+    const char* ident;
+    const char* tileset;
+    const char* filename;
+    int width;
+    int height;
+    int index;
+    int args;
+    int j;
+
+    args = lua_gettop(l);
+    j = 0;
+#ifdef DEBUG
+    index = width = height = 0;
+#endif
+    filename = NULL;
+    tileset = NULL;
+
+    //  Identifier
+
+    if (!lua_isstring(l, j + 1)) {
+       lua_pushstring(l, "incorrect argument");
+       lua_error(l);
+    }
+    ident = lua_tostring(l, j + 1);
+    ++j;
+
+    //
+    //  Parse the arguments, tagged format.
+    //
+    for (; j < args; ++j) {
+       if (!lua_isstring(l, j + 1)) {
+           lua_pushstring(l, "incorrect argument");
+           lua_error(l);
+       }
+       value = lua_tostring(l, j + 1);
+       ++j;
+
+       if (!strcmp(value, "tileset")) {
+           if (!lua_isstring(l, j + 1)) {
+               lua_pushstring(l, "incorrect argument");
+               lua_error(l);
+           }
+           tileset = lua_tostring(l, j + 1);
+       } else if (!strcmp(value, "size")) {
+           if (!lua_istable(l, j + 1) || luaL_getn(l, j + 1) != 2) {
+               lua_pushstring(l, "incorrect argument");
+               lua_error(l);
+           }
+           lua_rawgeti(l, j + 1, 1);
+           if (!lua_isnumber(l, -1)) {
+               lua_pushstring(l, "incorrect argument");
+               lua_error(l);
+           }
+           width = lua_tonumber(l, -1);
+           lua_pop(l, 1);
+           lua_rawgeti(l, j + 1, 2);
+           if (!lua_isnumber(l, -1)) {
+               lua_pushstring(l, "incorrect argument");
+               lua_error(l);
+           }
+           height = lua_tonumber(l, -1);
+           lua_pop(l, 1);
+       } else if (!strcmp(value, "normal")) {
+           if (!lua_istable(l, j + 1) || luaL_getn(l, j + 1) != 2) {
+               lua_pushstring(l, "incorrect argument");
+               lua_error(l);
+           }
+           lua_rawgeti(l, j + 1, 1);
+           if (!lua_isnumber(l, -1)) {
+               lua_pushstring(l, "incorrect argument");
+               lua_error(l);
+           }
+           index = lua_tonumber(l, -1);
+           lua_pop(l, 1);
+           lua_rawgeti(l, j + 1, 2);
+           if (!lua_isstring(l, -1)) {
+               lua_pushstring(l, "incorrect argument");
+               lua_error(l);
+           }
+           filename = lua_tostring(l, -1);
+           lua_pop(l, 1);
+       } else {
+           lua_pushfstring(l, "Unsupported tag: %s", value);
+           lua_error(l);
+       }
+    }
+
+    DebugCheck(!filename || !width || !height);
+
+    AddIcon(ident, tileset, index, width, height, filename);
+
+    return 0;
+}
+#endif
 
 /**
 **     @brief Parse icon alias definition.
@@ -542,6 +640,7 @@
 **     @param alias    Icon alias name.
 **     @param icon     Original icon.
 */
+#if defined(USE_GUILE) || defined(USE_SIOD)
 local SCM CclDefineIconAlias(SCM alias, SCM icon)
 {
     IconAliases = realloc(IconAliases, sizeof(char*) * 2 * (NumIconAliases + 
1));
@@ -552,6 +651,19 @@
     return SCM_UNSPECIFIED;
 }
 #elif defined(USE_LUA)
+local int CclDefineIconAlias(lua_State* l)
+{
+    if (lua_gettop(l) != 2 || !lua_isstring(l, 1) || !lua_isstring(l, 2)) {
+       lua_pushstring(l, "incorrect argument");
+       lua_error(l);
+    }
+    IconAliases = realloc(IconAliases, sizeof(char*) * 2 * (NumIconAliases + 
1));
+    IconAliases[NumIconAliases * 2 + 0] = strdup(lua_tostring(l, 1));
+    IconAliases[NumIconAliases * 2 + 1] = strdup(lua_tostring(l, 2));
+    ++NumIconAliases;
+
+    return 0;
+}
 #endif
 
 /**
@@ -637,6 +749,16 @@
     return SCM_UNSPECIFIED;
 }
 #elif defined(USE_LUA)
+local int CclSetIconSize(lua_State* l)
+{
+    if (lua_gettop(l) != 2 || !lua_isnumber(l, 1) || !lua_isnumber(l, 2)) {
+       lua_pushstring(l, "incorrect argument");
+       lua_error(l);
+    }
+    IconWidth = lua_tonumber(l, 1);
+    IconHeight = lua_tonumber(l, 2);
+    return 0;
+}
 #endif
 
 /**
@@ -656,13 +778,13 @@
     // FIXME: can be removed:
     gh_new_procedure2_0("set-icon-size!", CclSetIconSize);
 #elif defined(USE_LUA)
-//    lua_register(Lua, "DefineIcon", CclDefineIcon);
-//    lua_register(Lua, "DefineIconAlias", CclDefineIconAlias);
+    lua_register(Lua, "DefineIcon", CclDefineIcon);
+    lua_register(Lua, "DefineIconAlias", CclDefineIconAlias);
 
     lua_register(Lua, "DefineIconWcNames", CclDefineIconWcNames);
 
     // FIXME: can be removed:
-//    lua_register(Lua, "SetIconSize", CclSetIconSize);
+    lua_register(Lua, "SetIconSize", CclSetIconSize);
 #endif
 }