Merge branch 'master' of ssh+git://git.grumpycoder.net/pub/repo.git/lua-interface

5 files changed, 76 insertions, 0 deletions

diff --git a/src/lua-interface.cpp b/src/lua-interface.cpp
index e85eab1..b697e9c 100644
--- a/src/lua-interface.cpp
+++ b/src/lua-interface.cpp
@@ -77,6 +77,8 @@ extern void luatask_init(Lua * L) WEAK;
 extern void luaxml_init(Lua * L) WEAK;
 extern void luaosmesa_init(Lua * L) WEAK;
 extern void luacd_init(Lua * L) WEAK;
+extern void luapsx_init(Lua * L) WEAK;
+extern void luaiup_init(Lua * L) WEAK;
 
 }
 
@@ -417,7 +419,11 @@ int sLua_baselua_interface::baselua_interface_proceed_statics(Lua * L, int n, in
 #endif
         } else if ((filename == "luacd") && (luacd_init != NULL)) {
             luacd_init(L);
+        } else if ((filename == "luapsx") && (luapsx_init != NULL)) {
+            luapsx_init(L);
 #endif
+        } else if ((filename == "luaiup") && (luaiup_init != NULL)) {
+            luaiup_init(L);
 #endif
         } else {
     	    LuaLoadPlugin(filename, L);
@@ -803,7 +809,11 @@ void autoload_exports(Lua * L) {
 #endif
     if (luacd_init)
         luacd_init(L);
+    if (luapsx_init)
+        luapsx_init(L);
 #endif
+    if (luaiup_init)
+        luaiup_init(L);
 #endif
 }
 
diff --git a/src/lua-interface.manifest b/src/lua-interface.manifest
new file mode 100644
index 0000000..af39578
--- /dev/null
+++ b/src/lua-interface.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="0.7.0.0"
+    processorArchitecture="x86"
+    name="lua-interface"
+    type="win32"
+/>
+<description>Iup Application</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/src/lua-interface.rc b/src/lua-interface.rc
new file mode 100644
index 0000000..5a8c1a3
--- /dev/null
+++ b/src/lua-interface.rc
@@ -0,0 +1,44 @@
+LUA_ICON ICON "lua.ico"
+
+1 VERSIONINFO
+ FILEVERSION 0,7,0,0
+ PRODUCTVERSION 0,7,0,0
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "http://www.nobis-crew.org/lua-interface\0"
+            VALUE "CompanyName", "Nobis\0"
+            VALUE "FileDescription", "lua-interface\0"
+            VALUE "FileVersion", "0.7.0\0"
+            VALUE "LegalCopyright", "Copyright © 2003-2009 Nicolas ""Pixel"" Noble\0"
+            VALUE "OriginalFilename", "lua-interface.dll\0"
+            VALUE "ProductName", "lua-interface\0"
+            VALUE "ProductVersion", "0.7.0\0"
+        END
+    END
+END
+
+CURSOR_PEN CURSOR "pen.cur"
+
+/* To avoid the inclusion of <winuser.h> */
+#define WS_CHILD            0x40000000L
+#define WS_VISIBLE          0x10000000L
+#define WS_CLIPSIBLINGS     0x04000000L
+#define DS_3DLOOK           0x0004L
+#define DS_CONTROL          0x0400L
+#define SS_OWNERDRAW        0x0000000DL
+#define WS_EX_STATICEDGE    0x00020000L
+
+#define IUP_PREVIEWCANVAS 3000
+
+iupPreviewDlg DIALOG DISCARDABLE  0, 0, 250, 95
+STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL  "", IUP_PREVIEWCANVAS, "STATIC", SS_OWNERDRAW, 70, 0, 120, 90, WS_EX_STATICEDGE
+END
+
+/* The following line will enable Windows XP Visual Styles */
+1 24 "lua-interface.manifest"
diff --git a/src/lua.ico b/src/lua.ico
new file mode 100644
index 0000000..ccbabc4
--- /dev/null
+++ b/src/lua.ico
diff --git a/src/pen.cur b/src/pen.cur
new file mode 100644
index 0000000..5912b15
--- /dev/null
+++ b/src/pen.cur