diff options
Diffstat (limited to 'iup/srclua5')
125 files changed, 2603 insertions, 2333 deletions
diff --git a/iup/srclua5/Makefile b/iup/srclua5/Makefile index 3942e79..1189d32 100755 --- a/iup/srclua5/Makefile +++ b/iup/srclua5/Makefile @@ -3,22 +3,22 @@ do_all: iuplua iupluacd iupluacontrols iuplua_pplot iupluagl iupluaim iupluaimglib iuplua: - @$(MAKE) --no-print-directory -f ../tecmake_compact.mak + @$(MAKE) --no-print-directory -f ../tecmake.mak iupluacd: - @$(MAKE) --no-print-directory -f ../tecmake_compact.mak MF=iupcd + @$(MAKE) --no-print-directory -f ../tecmake.mak MF=iupcd iupluacontrols: - @$(MAKE) --no-print-directory -f ../tecmake_compact.mak MF=iupcontrols + @$(MAKE) --no-print-directory -f ../tecmake.mak MF=iupcontrols iuplua_pplot: - @$(MAKE) --no-print-directory -f ../tecmake_compact.mak MF=iup_pplot + @$(MAKE) --no-print-directory -f ../tecmake.mak MF=iup_pplot iupluagl: - @$(MAKE) --no-print-directory -f ../tecmake_compact.mak MF=iupgl + @$(MAKE) --no-print-directory -f ../tecmake.mak MF=iupgl iupluaim: - @$(MAKE) --no-print-directory -f ../tecmake_compact.mak MF=iupim + @$(MAKE) --no-print-directory -f ../tecmake.mak MF=iupim iupluaimglib: - @$(MAKE) --no-print-directory -f ../tecmake_compact.mak MF=iupimglib + @$(MAKE) --no-print-directory -f ../tecmake.mak MF=iupimglib diff --git a/iup/srclua5/button.lua b/iup/srclua5/button.lua index 946a05e..fc57b1a 100755 --- a/iup/srclua5/button.lua +++ b/iup/srclua5/button.lua @@ -3,16 +3,16 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "button", - parent = WIDGET, + parent = iup.WIDGET, creation = "S-", callback = { action = "", } } -function ctrl.createElement(class, arg) - return Button(arg.title) +function ctrl.createElement(class, param) + return iup.Button(param.title) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/canvas.lua b/iup/srclua5/canvas.lua index 562d671..101c4f4 100755 --- a/iup/srclua5/canvas.lua +++ b/iup/srclua5/canvas.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "canvas", - parent = WIDGET, + parent = iup.WIDGET, creation = "-", callback = { action = "ff", @@ -21,9 +21,9 @@ local ctrl = { } } -function ctrl.createElement(class, arg) - return Canvas() +function ctrl.createElement(class, param) + return iup.Canvas() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/cbox.lua b/iup/srclua5/cbox.lua index 3533970..81ba9be 100755 --- a/iup/srclua5/cbox.lua +++ b/iup/srclua5/cbox.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "cbox", - parent = WIDGET, + parent = iup.WIDGET, creation = "v", callback = {}, funcname = "Cboxv", @@ -20,9 +20,9 @@ static int Cboxv(lua_State *L) ]], } -function ctrl.createElement(class, arg) - return Cboxv(arg) +function ctrl.createElement(class, param) + return iup.Cboxv(param) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/cells.lua b/iup/srclua5/cells.lua index 9c914f2..0355b17 100755 --- a/iup/srclua5/cells.lua +++ b/iup/srclua5/cells.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "cells", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = { mouseclick_cb = "nnnnnns", @@ -24,9 +24,9 @@ function ctrl.redraw(handle) handle.repaint = "YES" end -function ctrl.createElement(class, arg) - return Cells() +function ctrl.createElement(class, param) + return iup.Cells() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/clipboard.lua b/iup/srclua5/clipboard.lua index e60b8bd..663215b 100755 --- a/iup/srclua5/clipboard.lua +++ b/iup/srclua5/clipboard.lua @@ -3,15 +3,15 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "clipboard", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = { }, } -function ctrl.createElement(class, arg) - return Clipboard() +function ctrl.createElement(class, param) + return iup.Clipboard() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/clua/button.clua b/iup/srclua5/clua/button.clua index bd286bc..109f451 100644 --- a/iup/srclua5/clua/button.clua +++ b/iup/srclua5/clua/button.clua @@ -13,19 +13,20 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, - 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, - 0x20, 0x22, 0x53, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, - 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, - 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, - 0x20, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, - 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, - 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, - 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x53, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, + 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x7d, 0x0a, + 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, + 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, + 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, + 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, + 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, + 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "button.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/canvas.clua b/iup/srclua5/clua/canvas.clua index a8247cc..e328744 100644 --- a/iup/srclua5/clua/canvas.clua +++ b/iup/srclua5/clua/canvas.clua @@ -13,35 +13,35 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, - 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, - 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, - 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x3d, 0x20, 0x22, 0x66, 0x66, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x73, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, - 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x65, - 0x61, 0x76, 0x65, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, - 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, - 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, - 0x22, 0x6e, 0x66, 0x66, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6b, 0x65, 0x79, 0x70, 0x72, - 0x65, 0x73, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x77, 0x6f, 0x6d, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x65, 0x65, 0x6c, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, - 0x22, 0x66, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x64, 0x69, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, - 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, - 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x43, 0x61, - 0x6e, 0x76, 0x61, 0x73, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, - 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, - 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x29, 0x0a, + 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, + 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x66, 0x66, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, + 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x6c, 0x65, 0x61, 0x76, 0x65, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x63, 0x62, + 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, + 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x5f, 0x63, + 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x66, 0x66, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6b, + 0x65, 0x79, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x6f, 0x6d, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, + 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x65, 0x65, 0x6c, 0x5f, 0x63, + 0x62, 0x20, 0x3d, 0x20, 0x22, 0x66, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x6d, 0x64, 0x69, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x5f, 0x63, + 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, + 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x28, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, + 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, + 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "canvas.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/cbox.clua b/iup/srclua5/clua/cbox.clua index 8dc38dc..31f0a1d 100644 --- a/iup/srclua5/clua/cbox.clua +++ b/iup/srclua5/clua/cbox.clua @@ -13,33 +13,34 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x62, 0x6f, 0x78, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x76, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, - 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, - 0x22, 0x43, 0x62, 0x6f, 0x78, 0x76, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, - 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x43, 0x62, 0x6f, 0x78, 0x76, 0x28, 0x6c, 0x75, 0x61, 0x5f, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x49, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x2a, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x3d, 0x20, - 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x68, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, - 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x68, 0x20, 0x3d, 0x20, - 0x49, 0x75, 0x70, 0x43, 0x62, 0x6f, 0x78, 0x76, 0x28, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, - 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, - 0x61, 0x74, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, - 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, - 0x72, 0x61, 0x77, 0x28, 0x4c, 0x2c, 0x20, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x66, 0x72, 0x65, - 0x65, 0x28, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x31, 0x3b, 0x0a, 0x7d, 0x0a, 0x20, 0x20, 0x5d, 0x5d, 0x2c, 0x0a, 0x7d, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x20, 0x43, 0x62, 0x6f, 0x78, 0x76, 0x28, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x65, 0x6e, 0x64, - 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, - 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x76, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, + 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, + 0x65, 0x20, 0x3d, 0x20, 0x22, 0x43, 0x62, 0x6f, 0x78, 0x76, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x0a, 0x73, + 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x43, 0x62, 0x6f, 0x78, 0x76, 0x28, + 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, + 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x2a, 0x68, 0x6c, 0x69, 0x73, + 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, + 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, + 0x68, 0x20, 0x3d, 0x20, 0x49, 0x75, 0x70, 0x43, 0x62, 0x6f, 0x78, 0x76, 0x28, 0x68, 0x6c, 0x69, + 0x73, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, + 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x68, 0x29, 0x3b, 0x0a, 0x20, + 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x77, 0x28, 0x4c, 0x2c, 0x20, 0x68, 0x29, 0x3b, 0x0a, 0x20, + 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x3b, 0x0a, 0x7d, 0x0a, 0x20, 0x20, 0x5d, 0x5d, + 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, + 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, + 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x62, 0x6f, 0x78, + 0x76, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, + 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "cbox.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/cells.clua b/iup/srclua5/clua/cells.clua index 60afca4..e843234 100644 --- a/iup/srclua5/clua/cells.clua +++ b/iup/srclua5/clua/cells.clua @@ -13,40 +13,41 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x65, 0x6c, 0x6c, 0x73, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, - 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x63, 0x6c, 0x69, 0x63, 0x6b, - 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x73, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x2d, 0x2d, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, - 0x61, 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, - 0x22, 0x2c, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, - 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, - 0x65, 0x20, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x63, 0x6f, 0x6c, 0x73, 0x5f, - 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x73, 0x70, - 0x61, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x76, 0x73, 0x70, 0x61, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, - 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x72, 0x65, 0x64, 0x72, 0x61, 0x77, 0x28, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2e, - 0x72, 0x65, 0x70, 0x61, 0x69, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x22, 0x59, 0x45, 0x53, 0x22, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, - 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, - 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x28, 0x29, 0x0a, 0x65, - 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, - 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, - 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, + 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x63, + 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, + 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x6d, 0x6f, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x73, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x2d, 0x2d, 0x20, 0x20, + 0x20, 0x20, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, + 0x6e, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x72, 0x65, + 0x61, 0x64, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, + 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x73, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x63, + 0x6f, 0x6c, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x68, 0x73, 0x70, 0x61, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x73, 0x70, 0x61, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, + 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x72, 0x65, 0x64, 0x72, 0x61, + 0x77, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x2e, 0x72, 0x65, 0x70, 0x61, 0x69, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x22, 0x59, + 0x45, 0x53, 0x22, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, + 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "cells.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/clipboard.clua b/iup/srclua5/clua/clipboard.clua index 5941f1b..1de67fb 100644 --- a/iup/srclua5/clua/clipboard.clua +++ b/iup/srclua5/clua/clipboard.clua @@ -14,18 +14,19 @@ static const unsigned char B1[] = { 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x6c, 0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, - 0x65, 0x6e, 0x74, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, - 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, - 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x43, 0x6c, 0x69, 0x70, 0x62, 0x6f, - 0x61, 0x72, 0x64, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, - 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, - 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, - 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x65, 0x6e, 0x74, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, + 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x43, 0x6c, 0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x28, 0x29, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, + 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, + 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, + 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "clipboard.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/colorbar.clua b/iup/srclua5/clua/colorbar.clua index c789780..ddc4cd0 100644 --- a/iup/srclua5/clua/colorbar.clua +++ b/iup/srclua5/clua/colorbar.clua @@ -14,29 +14,31 @@ static const unsigned char B1[] = { 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x62, 0x61, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, - 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, 0x6c, 0x65, - 0x63, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x7b, 0x22, 0x6e, 0x22, - 0x2c, 0x20, 0x72, 0x65, 0x74, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, 0x7d, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, - 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, - 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x7d, 0x2c, - 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x43, - 0x6f, 0x6c, 0x6f, 0x72, 0x62, 0x61, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, - 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x50, 0x52, 0x49, 0x4d, 0x41, 0x52, - 0x59, 0x20, 0x3d, 0x20, 0x2d, 0x31, 0x0a, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x41, 0x52, 0x59, - 0x20, 0x3d, 0x20, 0x2d, 0x32, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, - 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x62, 0x61, - 0x72, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, 0x6e, - 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, - 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, - 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, + 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x65, 0x6c, 0x6c, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, + 0x7b, 0x22, 0x6e, 0x22, 0x2c, 0x20, 0x72, 0x65, 0x74, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, 0x7d, + 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x5f, 0x63, 0x62, 0x20, + 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x78, 0x74, 0x65, + 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, + 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, + 0x3d, 0x20, 0x22, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x62, 0x61, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x50, 0x52, 0x49, 0x4d, 0x41, 0x52, 0x59, 0x20, 0x3d, 0x20, 0x2d, 0x31, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x41, 0x52, 0x59, 0x20, 0x3d, 0x20, 0x2d, + 0x32, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, + 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, + 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x6f, 0x6c, 0x6f, 0x72, + 0x62, 0x61, 0x72, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, + 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, + 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, + 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "colorbar.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/colorbrowser.clua b/iup/srclua5/clua/colorbrowser.clua index 21216af..775f5fc 100644 --- a/iup/srclua5/clua/colorbrowser.clua +++ b/iup/srclua5/clua/colorbrowser.clua @@ -14,25 +14,26 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x61, 0x67, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x63, - 0x63, 0x63, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, - 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x63, 0x63, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, - 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x43, - 0x6f, 0x6c, 0x6f, 0x72, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, - 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, - 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, - 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, - 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x28, 0x61, 0x72, 0x67, - 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, - 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, - 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, - 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, + 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x61, 0x67, 0x5f, 0x63, 0x62, 0x20, + 0x3d, 0x20, 0x22, 0x63, 0x63, 0x63, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x68, 0x61, + 0x6e, 0x67, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x63, 0x63, 0x22, 0x2c, 0x0a, + 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, + 0x3d, 0x20, 0x22, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, + 0x75, 0x70, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x7d, + 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x42, + 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, + 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, + 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, + 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "colorbrowser.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/colordlg.clua b/iup/srclua5/clua/colordlg.clua index 7282120..4193ff2 100644 --- a/iup/srclua5/clua/colordlg.clua +++ b/iup/srclua5/clua/colordlg.clua @@ -14,26 +14,27 @@ static const unsigned char B1[] = { 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x64, 0x6c, 0x67, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, - 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, - 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x44, 0x6c, 0x67, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, - 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, - 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, - 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, - 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x43, - 0x6f, 0x6c, 0x6f, 0x72, 0x44, 0x6c, 0x67, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, - 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, - 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, + 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x43, 0x6f, 0x6c, 0x6f, 0x72, + 0x44, 0x6c, 0x67, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, + 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, + 0x2c, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, + 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x44, 0x6c, 0x67, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, + 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, + 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, + 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, + 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "colordlg.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/constants.clua b/iup/srclua5/clua/constants.clua index 1129521..92a9e7f 100644 --- a/iup/srclua5/clua/constants.clua +++ b/iup/srclua5/clua/constants.clua @@ -16,10 +16,11 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x45, 0x52, 0x52, 0x4f, 0x52, - 0x20, 0x20, 0x20, 0x3d, 0x20, 0x20, 0x31, 0x0a, 0x4e, 0x4f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x20, - 0x3d, 0x20, 0x20, 0x30, 0x0a, 0x4f, 0x50, 0x45, 0x4e, 0x45, 0x44, 0x20, 0x20, 0x3d, 0x20, 0x2d, - 0x31, 0x0a, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x20, 0x3d, 0x20, 0x2d, 0x31, 0x0a, 0x0a, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x45, + 0x52, 0x52, 0x4f, 0x52, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x20, 0x31, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x4e, 0x4f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x20, 0x3d, 0x20, 0x20, 0x30, 0x0a, 0x69, 0x75, 0x70, + 0x2e, 0x4f, 0x50, 0x45, 0x4e, 0x45, 0x44, 0x20, 0x20, 0x3d, 0x20, 0x2d, 0x31, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x20, 0x3d, 0x20, 0x2d, 0x31, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, @@ -32,9 +33,10 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x0a, 0x49, 0x47, 0x4e, 0x4f, 0x52, 0x45, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x2d, 0x31, - 0x0a, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x20, 0x20, 0x3d, 0x20, 0x2d, 0x32, 0x0a, 0x43, - 0x4c, 0x4f, 0x53, 0x45, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x2d, 0x33, 0x0a, 0x43, 0x4f, 0x4e, + 0x2d, 0x2d, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x49, 0x47, 0x4e, 0x4f, 0x52, 0x45, 0x20, 0x20, 0x20, + 0x3d, 0x20, 0x2d, 0x31, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, + 0x20, 0x20, 0x3d, 0x20, 0x2d, 0x32, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x4c, 0x4f, 0x53, 0x45, + 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x2d, 0x33, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x55, 0x45, 0x20, 0x3d, 0x20, 0x2d, 0x34, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, @@ -47,15 +49,17 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x35, 0x0a, 0x4c, 0x45, 0x46, 0x54, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x34, - 0x0a, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, - 0x36, 0x35, 0x35, 0x33, 0x33, 0x0a, 0x4d, 0x4f, 0x55, 0x53, 0x45, 0x50, 0x4f, 0x53, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x32, 0x0a, 0x43, 0x55, 0x52, 0x52, 0x45, - 0x4e, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x31, 0x0a, - 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x20, 0x3d, 0x20, 0x36, - 0x35, 0x35, 0x33, 0x30, 0x0a, 0x54, 0x4f, 0x50, 0x20, 0x3d, 0x20, 0x4c, 0x45, 0x46, 0x54, 0x0a, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x45, 0x4e, 0x54, 0x45, + 0x52, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x35, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x4c, 0x45, 0x46, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x34, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x49, 0x47, + 0x48, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, + 0x33, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x4f, 0x55, 0x53, 0x45, 0x50, 0x4f, 0x53, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x32, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x43, + 0x55, 0x52, 0x52, 0x45, 0x4e, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x36, 0x35, + 0x35, 0x33, 0x31, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x50, 0x41, + 0x52, 0x45, 0x4e, 0x54, 0x20, 0x3d, 0x20, 0x36, 0x35, 0x35, 0x33, 0x30, 0x0a, 0x69, 0x75, 0x70, + 0x2e, 0x54, 0x4f, 0x50, 0x20, 0x3d, 0x20, 0x4c, 0x45, 0x46, 0x54, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x54, 0x54, 0x4f, 0x4d, 0x20, 0x3d, 0x20, 0x52, 0x49, 0x47, 0x48, 0x54, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, @@ -67,18 +71,21 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x53, 0x42, 0x55, 0x50, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x44, 0x4e, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x31, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x50, 0x47, 0x55, 0x50, 0x20, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x32, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x50, 0x47, 0x44, 0x4e, 0x20, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x33, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x50, 0x4f, 0x53, 0x56, 0x20, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x34, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x44, 0x52, 0x41, 0x47, 0x56, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x35, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x4c, 0x45, 0x46, 0x54, 0x20, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x36, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x37, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x50, 0x47, 0x4c, 0x45, 0x46, 0x54, - 0x20, 0x20, 0x3d, 0x20, 0x38, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x50, 0x47, 0x52, 0x49, 0x47, 0x48, - 0x54, 0x20, 0x3d, 0x20, 0x39, 0x20, 0x20, 0x0a, 0x53, 0x42, 0x50, 0x4f, 0x53, 0x48, 0x20, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x20, 0x0a, 0x53, 0x42, 0x44, 0x52, 0x41, 0x47, 0x48, 0x20, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x55, 0x50, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x53, 0x42, 0x44, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x31, 0x20, 0x20, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x50, 0x47, 0x55, 0x50, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, + 0x32, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x50, 0x47, 0x44, 0x4e, 0x20, 0x20, + 0x20, 0x20, 0x3d, 0x20, 0x33, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x50, 0x4f, + 0x53, 0x56, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x34, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x53, 0x42, 0x44, 0x52, 0x41, 0x47, 0x56, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x35, 0x20, 0x20, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x4c, 0x45, 0x46, 0x54, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, + 0x36, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, + 0x20, 0x20, 0x3d, 0x20, 0x37, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x50, 0x47, + 0x4c, 0x45, 0x46, 0x54, 0x20, 0x20, 0x3d, 0x20, 0x38, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x53, 0x42, 0x50, 0x47, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x3d, 0x20, 0x39, 0x20, 0x20, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x50, 0x4f, 0x53, 0x48, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, + 0x31, 0x30, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x42, 0x44, 0x52, 0x41, 0x47, 0x48, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x31, 0x31, 0x20, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, @@ -91,53 +98,57 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x53, 0x48, 0x4f, 0x57, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, - 0x30, 0x0a, 0x52, 0x45, 0x53, 0x54, 0x4f, 0x52, 0x45, 0x20, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x4d, - 0x49, 0x4e, 0x49, 0x4d, 0x49, 0x5a, 0x45, 0x20, 0x3d, 0x20, 0x32, 0x0a, 0x4d, 0x41, 0x58, 0x49, - 0x4d, 0x49, 0x5a, 0x45, 0x20, 0x3d, 0x20, 0x33, 0x0a, 0x48, 0x49, 0x44, 0x45, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3d, 0x20, 0x34, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x48, 0x4f, 0x57, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x45, 0x53, 0x54, 0x4f, 0x52, + 0x45, 0x20, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x49, 0x4e, 0x49, 0x4d, + 0x49, 0x5a, 0x45, 0x20, 0x3d, 0x20, 0x32, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x41, 0x58, 0x49, + 0x4d, 0x49, 0x5a, 0x45, 0x20, 0x3d, 0x20, 0x33, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x48, 0x49, 0x44, + 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x34, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x20, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, 0x43, - 0x42, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x20, 0x42, 0x55, 0x54, 0x54, + 0x4f, 0x4e, 0x5f, 0x43, 0x42, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x31, 0x20, 0x3d, - 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65, 0x28, 0x27, 0x31, 0x27, - 0x29, 0x0a, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x32, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65, 0x28, 0x27, 0x32, 0x27, 0x29, 0x0a, 0x42, 0x55, 0x54, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x42, + 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x31, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, + 0x62, 0x79, 0x74, 0x65, 0x28, 0x27, 0x31, 0x27, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x55, + 0x54, 0x54, 0x4f, 0x4e, 0x32, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, + 0x79, 0x74, 0x65, 0x28, 0x27, 0x32, 0x27, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x33, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, - 0x74, 0x65, 0x28, 0x27, 0x33, 0x27, 0x29, 0x0a, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x34, 0x20, - 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65, 0x28, 0x27, 0x34, - 0x27, 0x29, 0x0a, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x35, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65, 0x28, 0x27, 0x35, 0x27, 0x29, 0x0a, 0x0a, 0x2d, + 0x74, 0x65, 0x28, 0x27, 0x33, 0x27, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x55, 0x54, 0x54, + 0x4f, 0x4e, 0x34, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, + 0x65, 0x28, 0x27, 0x34, 0x27, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x55, 0x54, 0x54, 0x4f, + 0x4e, 0x35, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65, + 0x28, 0x27, 0x35, 0x27, 0x29, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x20, - 0x50, 0x72, 0x65, 0x2d, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x20, 0x4d, 0x61, 0x73, 0x6b, - 0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x20, 0x50, 0x72, 0x65, 0x2d, 0x44, 0x65, 0x66, 0x69, + 0x6e, 0x65, 0x64, 0x20, 0x4d, 0x61, 0x73, 0x6b, 0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x41, 0x53, 0x4b, 0x5f, 0x46, 0x4c, 0x4f, 0x41, - 0x54, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x22, 0x5b, 0x2b, 0x2f, 0x2d, 0x5d, 0x3f, 0x28, 0x2f, 0x64, - 0x2b, 0x2f, 0x2e, 0x3f, 0x2f, 0x64, 0x2a, 0x7c, 0x2f, 0x2e, 0x2f, 0x64, 0x2b, 0x29, 0x22, 0x0a, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x4d, 0x41, 0x53, 0x4b, 0x5f, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x20, 0x20, 0x20, + 0x3d, 0x20, 0x22, 0x5b, 0x2b, 0x2f, 0x2d, 0x5d, 0x3f, 0x28, 0x2f, 0x64, 0x2b, 0x2f, 0x2e, 0x3f, + 0x2f, 0x64, 0x2a, 0x7c, 0x2f, 0x2e, 0x2f, 0x64, 0x2b, 0x29, 0x22, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x41, 0x53, 0x4b, 0x5f, 0x55, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x20, 0x20, 0x3d, 0x20, 0x22, 0x28, 0x2f, 0x64, 0x2b, 0x2f, 0x2e, 0x3f, 0x2f, 0x64, 0x2a, 0x7c, 0x2f, 0x2e, 0x2f, 0x64, 0x2b, - 0x29, 0x22, 0x0a, 0x4d, 0x41, 0x53, 0x4b, 0x5f, 0x45, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x20, 0x20, - 0x3d, 0x20, 0x22, 0x5b, 0x2b, 0x2f, 0x2d, 0x5d, 0x3f, 0x28, 0x2f, 0x64, 0x2b, 0x2f, 0x2e, 0x3f, - 0x2f, 0x64, 0x2a, 0x7c, 0x2f, 0x2e, 0x2f, 0x64, 0x2b, 0x29, 0x28, 0x5b, 0x65, 0x45, 0x5d, 0x5b, - 0x2b, 0x2f, 0x2d, 0x5d, 0x3f, 0x2f, 0x64, 0x2b, 0x29, 0x3f, 0x22, 0x0a, 0x4d, 0x41, 0x53, 0x4b, - 0x5f, 0x49, 0x4e, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x22, 0x5b, 0x2b, 0x2f, 0x2d, - 0x5d, 0x3f, 0x2f, 0x64, 0x2b, 0x22, 0x0a, 0x4d, 0x41, 0x53, 0x4b, 0x5f, 0x55, 0x49, 0x4e, 0x54, - 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x22, 0x2f, 0x64, 0x2b, 0x22, 0x0a, + 0x29, 0x22, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x41, 0x53, 0x4b, 0x5f, 0x45, 0x46, 0x4c, 0x4f, + 0x41, 0x54, 0x20, 0x20, 0x3d, 0x20, 0x22, 0x5b, 0x2b, 0x2f, 0x2d, 0x5d, 0x3f, 0x28, 0x2f, 0x64, + 0x2b, 0x2f, 0x2e, 0x3f, 0x2f, 0x64, 0x2a, 0x7c, 0x2f, 0x2e, 0x2f, 0x64, 0x2b, 0x29, 0x28, 0x5b, + 0x65, 0x45, 0x5d, 0x5b, 0x2b, 0x2f, 0x2d, 0x5d, 0x3f, 0x2f, 0x64, 0x2b, 0x29, 0x3f, 0x22, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x41, 0x53, 0x4b, 0x5f, 0x49, 0x4e, 0x54, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x3d, 0x20, 0x22, 0x5b, 0x2b, 0x2f, 0x2d, 0x5d, 0x3f, 0x2f, 0x64, 0x2b, 0x22, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x4d, 0x41, 0x53, 0x4b, 0x5f, 0x55, 0x49, 0x4e, 0x54, 0x20, 0x20, 0x20, 0x20, + 0x3d, 0x20, 0x22, 0x2f, 0x64, 0x2b, 0x22, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "constants.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/dial.clua b/iup/srclua5/clua/dial.clua index 71504f4..72d1c35 100644 --- a/iup/srclua5/clua/dial.clua +++ b/iup/srclua5/clua/dial.clua @@ -13,33 +13,34 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, - 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, - 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x61, 0x6c, - 0x2c, 0x20, 0x62, 0x75, 0x74, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x0a, 0x2d, 0x2d, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x62, - 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, - 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, - 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x61, 0x6c, 0x0a, 0x2d, 0x2d, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, - 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, - 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, - 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x61, 0x6c, 0x0a, 0x20, 0x20, - 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, - 0x69, 0x75, 0x70, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, - 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, - 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x20, 0x44, 0x69, 0x61, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, - 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, - 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, - 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x53, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, + 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x6d, + 0x6f, 0x76, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x72, + 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x76, 0x61, 0x6c, 0x2c, 0x20, 0x62, 0x75, 0x74, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63, 0x74, 0x0a, 0x2d, 0x2d, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x73, + 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x20, 0x20, 0x20, 0x20, 0x2d, + 0x2d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, + 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x61, 0x6c, 0x0a, + 0x2d, 0x2d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x72, 0x65, + 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x20, + 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, + 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x61, + 0x6c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, + 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, + 0x68, 0x22, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, + 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x44, + 0x69, 0x61, 0x6c, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, + 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "dial.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/dialog.clua b/iup/srclua5/clua/dialog.clua index 273a74b..1af9ef1 100644 --- a/iup/srclua5/clua/dialog.clua +++ b/iup/srclua5/clua/dialog.clua @@ -13,39 +13,42 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, - 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, - 0x20, 0x22, 0x49, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, - 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x61, 0x70, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x75, 0x6e, 0x6d, 0x61, 0x70, 0x5f, - 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6c, 0x6f, - 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x72, 0x61, 0x79, 0x63, 0x6c, 0x69, 0x63, 0x6b, - 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x64, 0x72, 0x6f, 0x70, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, - 0x22, 0x73, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, - 0x20, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, 0x29, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, - 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, - 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, - 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x73, 0x68, - 0x6f, 0x77, 0x78, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, - 0x79, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x53, 0x68, 0x6f, 0x77, - 0x58, 0x59, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, + 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x49, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, + 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x61, 0x70, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x75, 0x6e, + 0x6d, 0x61, 0x70, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x62, + 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x76, 0x65, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x74, 0x72, 0x61, 0x79, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, + 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x6f, 0x70, 0x66, 0x69, + 0x6c, 0x65, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, + 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x44, 0x65, 0x73, - 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, - 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, - 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, 0x6f, + 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, + 0x72, 0x6c, 0x2e, 0x73, 0x68, 0x6f, 0x77, 0x78, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x77, 0x58, 0x59, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, + 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, + 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "dialog.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/filedlg.clua b/iup/srclua5/clua/filedlg.clua index cc2b7c9..b145a80 100644 --- a/iup/srclua5/clua/filedlg.clua +++ b/iup/srclua5/clua/filedlg.clua @@ -13,28 +13,30 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x66, 0x69, 0x6c, 0x65, 0x64, 0x6c, 0x67, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, - 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, - 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x63, - 0x62, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, - 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x46, 0x69, 0x6c, - 0x65, 0x44, 0x6c, 0x67, 0x22, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x50, 0x6f, - 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, - 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, - 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x44, 0x65, 0x73, 0x74, - 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x6c, 0x67, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, - 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, - 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, - 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, - 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, + 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, + 0x6c, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, + 0x22, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x6c, 0x67, 0x22, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, + 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, + 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, + 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, + 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x6c, 0x67, 0x28, 0x29, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, + 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, + 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, + 0x0a, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "filedlg.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/fill.clua b/iup/srclua5/clua/fill.clua index 5941d4b..872b85a 100644 --- a/iup/srclua5/clua/fill.clua +++ b/iup/srclua5/clua/fill.clua @@ -13,17 +13,18 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, - 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, - 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, - 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x46, 0x69, 0x6c, 0x6c, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, - 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, - 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, + 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x46, 0x69, 0x6c, 0x6c, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, + 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "fill.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/fontdlg.clua b/iup/srclua5/clua/fontdlg.clua index f902d37..920ef10 100644 --- a/iup/srclua5/clua/fontdlg.clua +++ b/iup/srclua5/clua/fontdlg.clua @@ -13,27 +13,28 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x66, 0x6f, 0x6e, 0x74, 0x64, 0x6c, 0x67, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, - 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, - 0x65, 0x20, 0x3d, 0x20, 0x22, 0x46, 0x6f, 0x6e, 0x74, 0x44, 0x6c, 0x67, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, - 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, - 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, - 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, - 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, - 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x20, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, - 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x46, 0x6f, 0x6e, 0x74, - 0x44, 0x6c, 0x67, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, - 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, - 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, - 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, + 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x46, 0x6f, 0x6e, 0x74, 0x44, 0x6c, 0x67, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, + 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, + 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x46, 0x6f, + 0x6e, 0x74, 0x44, 0x6c, 0x67, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, + 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "fontdlg.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/frame.clua b/iup/srclua5/clua/frame.clua index 0ae9e52..7d238ab 100644 --- a/iup/srclua5/clua/frame.clua +++ b/iup/srclua5/clua/frame.clua @@ -13,18 +13,19 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x69, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, - 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, - 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x28, 0x61, - 0x72, 0x67, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, - 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, - 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x29, 0x0a, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x49, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, + 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, + 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, + 0x5d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, + 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, + 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, + 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "frame.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/gauge.clua b/iup/srclua5/clua/gauge.clua index 3f25c09..3821bf1 100644 --- a/iup/srclua5/clua/gauge.clua +++ b/iup/srclua5/clua/gauge.clua @@ -13,20 +13,21 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x67, 0x61, 0x75, 0x67, 0x65, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, - 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, - 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, - 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, - 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, - 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x47, 0x61, 0x75, 0x67, 0x65, 0x28, 0x61, 0x72, 0x67, 0x2e, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, - 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, - 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, - 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, + 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, + 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, + 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x47, 0x61, 0x75, 0x67, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, + 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, + 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, + 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "gauge.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/glcanvas.clua b/iup/srclua5/clua/glcanvas.clua index 3ed6b8c..cb86316 100644 --- a/iup/srclua5/clua/glcanvas.clua +++ b/iup/srclua5/clua/glcanvas.clua @@ -14,49 +14,48 @@ static const unsigned char B1[] = { 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x67, 0x6c, 0x63, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, - 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, - 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x47, 0x4c, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, - 0x69, 0x75, 0x70, 0x67, 0x6c, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, - 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, - 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, - 0x31, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x6f, 0x64, 0x65, 0x20, 0x3d, - 0x20, 0x5b, 0x5b, 0x20, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x75, 0x70, 0x67, 0x6c, 0x6c, 0x75, - 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x20, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x75, - 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x28, 0x4c, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x49, - 0x75, 0x70, 0x47, 0x4c, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x4f, 0x70, 0x65, 0x6e, 0x28, 0x29, - 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x45, 0x6e, 0x76, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x67, - 0x6c, 0x63, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, - 0x4c, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x72, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x45, 0x6e, 0x76, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x20, 0x30, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2f, 0x2a, 0x20, 0x6f, 0x62, 0x6c, - 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20, 0x72, - 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x67, 0x6c, 0x22, - 0x20, 0x2a, 0x2f, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x6c, 0x75, 0x61, 0x6f, 0x70, 0x65, 0x6e, 0x5f, - 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x67, 0x6c, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, - 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x20, 0x69, 0x75, 0x70, 0x67, 0x6c, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, - 0x4c, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2f, 0x2a, 0x20, 0x6f, 0x62, 0x6c, 0x69, 0x67, 0x61, - 0x74, 0x6f, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20, 0x72, 0x65, 0x71, 0x75, - 0x69, 0x72, 0x65, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x67, 0x6c, 0x35, 0x31, 0x22, 0x20, - 0x2a, 0x2f, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x6c, 0x75, 0x61, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x69, - 0x75, 0x70, 0x6c, 0x75, 0x61, 0x67, 0x6c, 0x35, 0x31, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x67, 0x6c, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, - 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, - 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, - 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, - 0x47, 0x4c, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, - 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x47, 0x4c, 0x43, 0x61, + 0x6e, 0x76, 0x61, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, + 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x67, 0x6c, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, + 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x66, 0x75, 0x6e, 0x63, + 0x73, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x6f, + 0x64, 0x65, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x20, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x75, 0x70, + 0x67, 0x6c, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x69, 0x66, + 0x20, 0x28, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x6c, + 0x6c, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x28, 0x4c, 0x29, 0x29, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x49, 0x75, 0x70, 0x47, 0x4c, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x4f, 0x70, + 0x65, 0x6e, 0x28, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, + 0x67, 0x65, 0x74, 0x5f, 0x65, 0x6e, 0x76, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, + 0x70, 0x67, 0x6c, 0x63, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, + 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x30, + 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2f, 0x2a, 0x20, 0x6f, 0x62, 0x6c, 0x69, 0x67, 0x61, 0x74, 0x6f, + 0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, + 0x65, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x67, 0x6c, 0x22, 0x20, 0x2a, 0x2f, 0x0a, 0x69, + 0x6e, 0x74, 0x20, 0x6c, 0x75, 0x61, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, + 0x61, 0x67, 0x6c, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, + 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x67, 0x6c, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, + 0x0a, 0x0a, 0x2f, 0x2a, 0x20, 0x6f, 0x62, 0x6c, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x20, + 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x22, 0x69, + 0x75, 0x70, 0x6c, 0x75, 0x61, 0x67, 0x6c, 0x35, 0x31, 0x22, 0x20, 0x2a, 0x2f, 0x0a, 0x69, 0x6e, + 0x74, 0x20, 0x6c, 0x75, 0x61, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, + 0x67, 0x6c, 0x35, 0x31, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, + 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x67, 0x6c, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, + 0x7d, 0x0a, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x47, 0x4c, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, + 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, + 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, + 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "glcanvas.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/hbox.clua b/iup/srclua5/clua/hbox.clua index e1bafd5..3a38586 100644 --- a/iup/srclua5/clua/hbox.clua +++ b/iup/srclua5/clua/hbox.clua @@ -13,19 +13,20 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x68, 0x62, 0x6f, 0x78, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x42, 0x4f, 0x58, 0x2c, 0x0a, 0x20, 0x20, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, - 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, - 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x48, 0x62, 0x6f, 0x78, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, - 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x58, 0x2c, + 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, + 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x41, + 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, + 0x65, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x48, 0x62, 0x6f, 0x78, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, + 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, + 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; diff --git a/iup/srclua5/clua/image.clua b/iup/srclua5/clua/image.clua index 899327a..c22bdb9 100644 --- a/iup/srclua5/clua/image.clua +++ b/iup/srclua5/clua/image.clua @@ -13,129 +13,131 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, - 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x20, 0x0a, 0x73, 0x74, 0x61, - 0x74, 0x69, 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x20, 0x28, 0x6c, - 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, - 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x77, 0x2c, 0x20, 0x68, 0x2c, 0x20, 0x63, 0x2c, 0x20, 0x6e, - 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x75, 0x6e, 0x73, - 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x2a, 0x70, 0x69, 0x78, 0x65, - 0x6c, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2a, 0x20, 0x69, - 0x68, 0x3b, 0x0a, 0x20, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x73, 0x74, 0x72, 0x5b, 0x32, 0x30, - 0x5d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x69, 0x73, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x2c, 0x20, 0x6a, 0x3b, 0x0a, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2a, 0x20, 0x67, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, - 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2a, - 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x67, - 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x20, 0x20, 0x0a, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x2f, 0x2a, 0x20, 0x67, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x75, 0x6d, - 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x20, 0x6f, - 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x6c, 0x69, 0x6e, 0x65, - 0x20, 0x2a, 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, - 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, - 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x20, 0x3d, 0x20, 0x6c, 0x75, - 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x2d, 0x31, 0x29, 0x3b, 0x20, - 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, - 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x69, - 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, 0x28, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, - 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x2a, 0x29, 0x20, 0x6d, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x20, - 0x28, 0x68, 0x2a, 0x77, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, - 0x28, 0x69, 0x3d, 0x31, 0x3b, 0x20, 0x69, 0x3c, 0x3d, 0x68, 0x3b, 0x20, 0x69, 0x2b, 0x2b, 0x29, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, - 0x5f, 0x70, 0x75, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x69, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x6a, 0x3d, 0x31, 0x3b, 0x20, 0x6a, 0x3c, 0x3d, - 0x77, 0x3b, 0x20, 0x6a, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x64, 0x78, 0x20, - 0x3d, 0x20, 0x28, 0x69, 0x2d, 0x31, 0x29, 0x2a, 0x77, 0x2b, 0x28, 0x6a, 0x2d, 0x31, 0x29, 0x3b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, - 0x68, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x6a, 0x29, 0x3b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x2d, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x5b, 0x69, 0x64, 0x78, 0x5d, 0x20, - 0x3d, 0x20, 0x28, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, - 0x29, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x4c, 0x2c, - 0x20, 0x2d, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, - 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, - 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x68, 0x20, 0x3d, 0x20, 0x49, 0x75, - 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x77, 0x2c, 0x68, 0x2c, 0x70, 0x69, 0x78, 0x65, 0x6c, - 0x73, 0x29, 0x3b, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, 0x70, - 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, - 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x67, - 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, - 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x6e, 0x75, 0x6d, 0x5f, - 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3e, 0x32, 0x35, 0x35, 0x3f, 0x20, 0x32, 0x35, 0x35, 0x3a, - 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x66, 0x6f, 0x72, 0x28, 0x63, 0x3d, 0x31, 0x3b, 0x20, 0x63, 0x3c, 0x3d, 0x6e, 0x75, 0x6d, - 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x20, 0x63, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x72, 0x61, - 0x77, 0x67, 0x65, 0x74, 0x69, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x2c, 0x20, 0x63, 0x29, 0x3b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x66, 0x28, 0x73, 0x74, - 0x72, 0x2c, 0x20, 0x22, 0x25, 0x64, 0x22, 0x2c, 0x20, 0x63, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x49, 0x75, 0x70, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x28, 0x69, 0x68, 0x2c, 0x20, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x6c, 0x75, - 0x61, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x4c, 0x2c, 0x2d, 0x31, 0x29, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, - 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, - 0x7d, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x77, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, - 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x20, - 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, - 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, - 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x75, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, 0x20, 0x33, - 0x2c, 0x20, 0x77, 0x2a, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x68, 0x20, 0x3d, - 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x77, 0x2c, 0x20, 0x68, 0x2c, 0x20, - 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x72, 0x65, - 0x65, 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, - 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x34, 0x29, 0x3b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x6e, - 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3e, 0x32, 0x35, 0x36, 0x3f, 0x20, 0x32, - 0x35, 0x36, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x28, 0x63, 0x3d, 0x31, 0x3b, 0x20, 0x63, 0x3c, 0x3d, - 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x20, 0x63, 0x2b, 0x2b, 0x29, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, - 0x5f, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x69, 0x28, 0x4c, 0x2c, 0x20, 0x34, 0x2c, 0x20, 0x63, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x66, - 0x28, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x22, 0x25, 0x64, 0x22, 0x2c, 0x20, 0x63, 0x2d, 0x31, 0x29, - 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x49, 0x75, 0x70, 0x53, 0x74, 0x6f, 0x72, 0x65, - 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x69, 0x68, 0x2c, 0x20, 0x73, 0x74, - 0x72, 0x2c, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, - 0x4c, 0x2c, 0x2d, 0x31, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, - 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, - 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x68, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, - 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x77, 0x28, 0x4c, 0x2c, 0x20, 0x69, - 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x3b, 0x0a, - 0x7d, 0x20, 0x0a, 0x20, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, - 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, - 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x72, 0x67, 0x2e, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x72, 0x67, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, - 0x73, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x20, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2c, - 0x20, 0x61, 0x72, 0x67, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, - 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x28, 0x61, 0x72, 0x67, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, + 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x20, 0x63, + 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x20, + 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x20, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, 0x20, 0x4c, + 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x77, 0x2c, 0x20, 0x68, 0x2c, 0x20, + 0x63, 0x2c, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x0a, 0x20, + 0x20, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x2a, + 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x2a, 0x20, 0x69, 0x68, 0x3b, 0x0a, 0x20, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x73, 0x74, + 0x72, 0x5b, 0x32, 0x30, 0x5d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6c, 0x75, + 0x61, 0x5f, 0x69, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x29, + 0x0a, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x2c, 0x20, + 0x6a, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2a, 0x20, 0x67, 0x65, 0x74, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x6c, 0x69, 0x6e, + 0x65, 0x73, 0x20, 0x2a, 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x6c, 0x75, + 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x20, 0x20, + 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2a, 0x20, 0x67, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, + 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x2a, 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, + 0x70, 0x75, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x20, + 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x2d, + 0x31, 0x29, 0x3b, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, + 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, 0x28, 0x75, 0x6e, 0x73, 0x69, + 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x2a, 0x29, 0x20, 0x6d, 0x61, 0x6c, + 0x6c, 0x6f, 0x63, 0x20, 0x28, 0x68, 0x2a, 0x77, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x28, 0x69, 0x3d, 0x31, 0x3b, 0x20, 0x69, 0x3c, 0x3d, 0x68, 0x3b, 0x20, + 0x69, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, + 0x4c, 0x2c, 0x20, 0x69, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, + 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x6a, 0x3d, 0x31, 0x3b, + 0x20, 0x6a, 0x3c, 0x3d, 0x77, 0x3b, 0x20, 0x6a, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, + 0x69, 0x64, 0x78, 0x20, 0x3d, 0x20, 0x28, 0x69, 0x2d, 0x31, 0x29, 0x2a, 0x77, 0x2b, 0x28, 0x6a, + 0x2d, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, + 0x5f, 0x70, 0x75, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x6a, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x67, + 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x2d, 0x32, 0x29, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x5b, 0x69, + 0x64, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x28, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, + 0x63, 0x68, 0x61, 0x72, 0x29, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x6e, 0x75, 0x6d, 0x62, 0x65, + 0x72, 0x28, 0x4c, 0x2c, 0x20, 0x2d, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, + 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x68, 0x20, + 0x3d, 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x77, 0x2c, 0x68, 0x2c, 0x70, + 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x72, + 0x65, 0x65, 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, + 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, 0x20, + 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3e, 0x32, 0x35, 0x35, 0x3f, 0x20, + 0x32, 0x35, 0x35, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x28, 0x63, 0x3d, 0x31, 0x3b, 0x20, 0x63, 0x3c, + 0x3d, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x20, 0x63, 0x2b, 0x2b, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, + 0x61, 0x5f, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x69, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x2c, 0x20, + 0x63, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x72, 0x69, 0x6e, 0x74, + 0x66, 0x28, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x22, 0x25, 0x64, 0x22, 0x2c, 0x20, 0x63, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x49, 0x75, 0x70, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x41, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x69, 0x68, 0x2c, 0x20, 0x73, 0x74, 0x72, + 0x2c, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x4c, + 0x2c, 0x2d, 0x31, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x75, 0x61, + 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x7b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, + 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, + 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x75, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, + 0x4c, 0x2c, 0x20, 0x33, 0x2c, 0x20, 0x77, 0x2a, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x69, 0x68, 0x20, 0x3d, 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x77, 0x2c, + 0x20, 0x68, 0x2c, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x20, 0x3d, + 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x67, 0x65, 0x74, 0x6e, 0x28, 0x4c, 0x2c, 0x20, 0x34, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, + 0x20, 0x3d, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3e, 0x32, 0x35, + 0x36, 0x3f, 0x20, 0x32, 0x35, 0x36, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x28, 0x63, 0x3d, 0x31, 0x3b, + 0x20, 0x63, 0x3c, 0x3d, 0x6e, 0x75, 0x6d, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x3b, 0x20, + 0x63, 0x2b, 0x2b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x69, 0x28, 0x4c, 0x2c, 0x20, + 0x34, 0x2c, 0x20, 0x63, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x66, 0x28, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x22, 0x25, 0x64, 0x22, 0x2c, 0x20, + 0x63, 0x2d, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x49, 0x75, 0x70, 0x53, + 0x74, 0x6f, 0x72, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x69, 0x68, + 0x2c, 0x20, 0x73, 0x74, 0x72, 0x2c, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, + 0x69, 0x6e, 0x67, 0x28, 0x4c, 0x2c, 0x2d, 0x31, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6f, 0x70, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x75, + 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, 0x65, 0x28, 0x4c, + 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, + 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x77, 0x28, + 0x4c, 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, + 0x20, 0x31, 0x3b, 0x0a, 0x7d, 0x20, 0x0a, 0x20, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x61, 0x6e, 0x64, 0x20, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x20, 0x74, + 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, + 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x29, + 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, + 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x28, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, - 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, + 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "image.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/imagergb.clua b/iup/srclua5/clua/imagergb.clua index 0bf1b63..cdf18b7 100644 --- a/iup/srclua5/clua/imagergb.clua +++ b/iup/srclua5/clua/imagergb.clua @@ -14,42 +14,43 @@ static const unsigned char B1[] = { 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x72, 0x67, 0x62, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, - 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x20, 0x2d, 0x2d, 0x20, 0x66, - 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, - 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x52, 0x47, 0x42, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x20, 0x0a, 0x73, 0x74, 0x61, - 0x74, 0x69, 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, - 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, 0x4c, 0x29, 0x0a, 0x7b, - 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x77, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, - 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, - 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, - 0x20, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x2a, - 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, - 0x63, 0x68, 0x65, 0x63, 0x6b, 0x75, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, - 0x28, 0x4c, 0x2c, 0x20, 0x33, 0x2c, 0x20, 0x77, 0x2a, 0x68, 0x2a, 0x33, 0x29, 0x3b, 0x0a, 0x20, - 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x69, 0x68, 0x20, 0x3d, 0x20, 0x49, - 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x28, 0x77, 0x2c, 0x20, 0x68, 0x2c, - 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, - 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, 0x65, 0x28, 0x4c, 0x2c, 0x20, - 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, - 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x77, 0x28, 0x4c, 0x2c, - 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, 0x70, 0x69, 0x78, - 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, - 0x3b, 0x0a, 0x7d, 0x0a, 0x20, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, - 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x2c, 0x20, 0x61, 0x72, 0x67, 0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2c, 0x20, 0x61, 0x72, - 0x67, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, - 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, - 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x20, + 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, + 0x22, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x63, + 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x20, + 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x52, 0x47, 0x42, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, + 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x77, 0x20, 0x3d, 0x20, 0x6c, + 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, + 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x6c, 0x75, + 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x32, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, + 0x61, 0x72, 0x20, 0x2a, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, + 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x75, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x61, + 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, 0x20, 0x33, 0x2c, 0x20, 0x77, 0x2a, 0x68, 0x2a, 0x33, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x69, 0x68, + 0x20, 0x3d, 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x28, 0x77, + 0x2c, 0x20, 0x68, 0x2c, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, + 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x72, 0x61, + 0x77, 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x66, 0x72, 0x65, 0x65, + 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, + 0x72, 0x6e, 0x20, 0x31, 0x3b, 0x0a, 0x7d, 0x0a, 0x20, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, + 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, + 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x20, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "imagergb.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/imagergba.clua b/iup/srclua5/clua/imagergba.clua index 5f84ea8..301a404 100644 --- a/iup/srclua5/clua/imagergba.clua +++ b/iup/srclua5/clua/imagergba.clua @@ -14,42 +14,43 @@ static const unsigned char B1[] = { 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x72, 0x67, 0x62, 0x61, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, - 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x20, 0x2d, 0x2d, - 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x41, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x63, 0x61, - 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x20, 0x0a, - 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x49, 0x6d, 0x61, 0x67, 0x65, - 0x52, 0x47, 0x42, 0x41, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, - 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x77, 0x20, 0x3d, 0x20, 0x6c, - 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, - 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x68, 0x20, 0x3d, 0x20, 0x6c, 0x75, - 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, 0x4c, 0x2c, 0x20, 0x32, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x20, 0x63, 0x68, - 0x61, 0x72, 0x20, 0x2a, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, - 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x75, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x61, - 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, 0x20, 0x33, 0x2c, 0x20, 0x77, 0x2a, 0x68, 0x2a, 0x34, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x69, 0x68, - 0x20, 0x3d, 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x41, 0x28, - 0x77, 0x2c, 0x20, 0x68, 0x2c, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, - 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, - 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, - 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x72, - 0x61, 0x77, 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x66, 0x72, 0x65, - 0x65, 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x20, 0x31, 0x3b, 0x0a, 0x7d, 0x0a, 0x20, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x41, 0x28, 0x61, 0x72, 0x67, - 0x2e, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x2e, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, - 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, - 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, - 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, + 0x2c, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, + 0x3d, 0x20, 0x22, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x41, 0x22, 0x2c, 0x20, 0x0a, + 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, + 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, + 0x5b, 0x5b, 0x20, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x49, + 0x6d, 0x61, 0x67, 0x65, 0x52, 0x47, 0x42, 0x41, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x20, 0x2a, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x77, + 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, + 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x68, 0x20, + 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x4c, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x74, 0x28, + 0x4c, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x75, 0x6e, 0x73, 0x69, 0x67, 0x6e, 0x65, + 0x64, 0x20, 0x63, 0x68, 0x61, 0x72, 0x20, 0x2a, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x20, 0x3d, + 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x75, 0x63, 0x68, + 0x61, 0x72, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, 0x20, 0x33, 0x2c, 0x20, 0x77, + 0x2a, 0x68, 0x2a, 0x34, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x20, 0x2a, 0x69, 0x68, 0x20, 0x3d, 0x20, 0x49, 0x75, 0x70, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, + 0x47, 0x42, 0x41, 0x28, 0x77, 0x2c, 0x20, 0x68, 0x2c, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, + 0x73, 0x74, 0x61, 0x74, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x77, 0x28, 0x4c, 0x2c, 0x20, 0x69, 0x68, 0x29, 0x3b, 0x0a, 0x20, + 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x3b, 0x0a, 0x20, + 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x3b, 0x0a, 0x7d, 0x0a, 0x20, 0x0a, 0x5d, + 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, + 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, + 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x52, 0x47, 0x42, 0x41, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x73, 0x29, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, + 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, + 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "imagergba.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/item.clua b/iup/srclua5/clua/item.clua index e1040b8..ac02b51 100644 --- a/iup/srclua5/clua/item.clua +++ b/iup/srclua5/clua/item.clua @@ -13,21 +13,22 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x53, 0x2d, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, - 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, - 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, - 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, - 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x20, 0x49, 0x74, 0x65, 0x6d, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, - 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, - 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, - 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x53, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, + 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x69, 0x67, 0x68, + 0x6c, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, + 0x20, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, + 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x49, + 0x74, 0x65, 0x6d, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, + 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, + 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, + 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "item.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/iuplua.clua b/iup/srclua5/clua/iuplua.clua index 7ed6181..90bf48f 100644 --- a/iup/srclua5/clua/iuplua.clua +++ b/iup/srclua5/clua/iuplua.clua @@ -15,21 +15,22 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x63, - 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x43, 0x61, 0x6c, 0x6c, 0x4d, - 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x2e, 0x2e, 0x2e, 0x29, - 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, - 0x3d, 0x20, 0x2e, 0x2e, 0x2e, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x5b, 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, - 0x20, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x0a, - 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20, - 0x3d, 0x3d, 0x20, 0x22, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x68, - 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, - 0x6e, 0x63, 0x28, 0x2e, 0x2e, 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x20, 0x3d, 0x20, 0x7b, + 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x43, 0x61, 0x6c, 0x6c, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, + 0x20, 0x2e, 0x2e, 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, 0x20, 0x2d, 0x2d, + 0x20, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x20, + 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x0a, 0x20, + 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20, 0x74, + 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x0a, 0x20, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, + 0x65, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x66, 0x75, 0x6e, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x28, 0x75, 0x6e, 0x70, 0x61, 0x63, + 0x6b, 0x28, 0x61, 0x72, 0x67, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x20, 0x3d, 0x20, @@ -41,14 +42,15 @@ static const unsigned char B1[] = { 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, - 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x28, - 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2c, 0x20, 0x74, 0x79, 0x70, 0x65, - 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x73, 0x5b, 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, - 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x5b, 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x20, - 0x3d, 0x20, 0x7b, 0x7d, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, - 0x20, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x5b, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x61, 0x6c, 0x6c, 0x62, + 0x61, 0x63, 0x6b, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2c, 0x20, + 0x74, 0x79, 0x70, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x5b, 0x6e, 0x61, 0x6d, + 0x65, 0x5d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x63, 0x61, 0x6c, 0x6c, + 0x62, 0x61, 0x63, 0x6b, 0x73, 0x5b, 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x20, 0x3d, 0x20, 0x7b, 0x7d, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x62, 0x20, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x5b, 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x62, 0x5b, 0x74, 0x79, 0x70, 0x65, 0x5d, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, @@ -78,63 +80,64 @@ static const unsigned char B1[] = { 0x72, 0x65, 0x6e, 0x74, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x70, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6e, 0x69, 0x6c, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x4e, 0x65, 0x77, 0x43, 0x6c, 0x61, 0x73, 0x73, - 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x69, - 0x75, 0x70, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, 0x69, 0x75, 0x70, - 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x22, 0x2c, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x5f, 0x67, 0x65, 0x74, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x29, 0x0a, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x20, 0x3d, - 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, - 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, - 0x75, 0x70, 0x70, 0x65, 0x72, 0x28, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29, 0x0a, 0x20, 0x20, 0x69, - 0x66, 0x20, 0x28, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x5b, 0x49, 0x4e, 0x44, - 0x45, 0x58, 0x5d, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x6c, 0x6f, - 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, - 0x47, 0x65, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x29, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x29, 0x7e, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x29, 0x20, 0x74, 0x68, - 0x65, 0x6e, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x28, 0x22, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, - 0x64, 0x20, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x20, 0x65, - 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, - 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x20, 0x3d, 0x20, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x29, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, - 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, - 0x47, 0x65, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x7e, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x29, - 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x28, 0x22, 0x69, 0x6e, 0x76, - 0x61, 0x6c, 0x69, 0x64, 0x20, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, - 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, - 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x3d, 0x3d, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, - 0x72, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, 0x20, 0x74, - 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, - 0x69, 0x68, 0x20, 0x3d, 0x20, 0x47, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x69, - 0x68, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x68, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, - 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x69, 0x20, - 0x3d, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29, 0x0a, 0x20, 0x20, - 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x76, 0x20, 0x3d, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x47, 0x65, 0x74, 0x57, 0x69, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x4e, 0x65, 0x77, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, 0x69, + 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, 0x69, + 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2c, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x5f, 0x67, 0x65, + 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x29, 0x0a, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, + 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, + 0x67, 0x2e, 0x75, 0x70, 0x70, 0x65, 0x72, 0x28, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29, 0x0a, 0x20, + 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x75, 0x70, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, + 0x6b, 0x73, 0x5b, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5d, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, + 0x0a, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, + 0x6e, 0x6f, 0x74, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x7e, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x22, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x28, + 0x22, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x20, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x22, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x5d, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, + 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x74, 0x68, + 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x57, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x29, 0x7e, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x29, 0x20, 0x74, 0x68, 0x65, + 0x6e, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x28, 0x22, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, + 0x20, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x20, 0x65, 0x6e, + 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x29, 0x3d, 0x3d, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x20, 0x6f, + 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x3d, 0x3d, + 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x68, 0x20, 0x3d, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x69, 0x68, + 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x68, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, + 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, + 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, + 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x69, 0x20, 0x3d, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29, 0x0a, 0x20, 0x20, 0x6c, + 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x76, 0x20, 0x3d, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x7e, 0x3d, 0x22, @@ -148,33 +151,34 @@ static const unsigned char B1[] = { 0x6d, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x75, 0x70, 0x70, 0x65, 0x72, 0x28, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, - 0x73, 0x5b, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, - 0x28, 0x63, 0x62, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x66, 0x20, - 0x61, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, - 0x20, 0x3d, 0x20, 0x63, 0x62, 0x5b, 0x31, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, - 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20, 0x74, 0x68, 0x65, - 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, - 0x20, 0x63, 0x62, 0x5b, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4e, 0x61, 0x6d, 0x65, - 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, - 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2c, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x29, 0x20, 0x2d, 0x2d, 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x72, 0x65, 0x2d, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, - 0x20, 0x43, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, - 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x2d, 0x2d, 0x20, 0x73, 0x74, 0x6f, 0x72, 0x65, - 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x69, 0x6e, 0x20, 0x4c, 0x75, 0x61, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x69, 0x75, 0x70, 0x47, 0x65, 0x74, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x69, - 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, - 0x2d, 0x2d, 0x20, 0x69, 0x66, 0x20, 0x61, 0x20, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x73, 0x65, - 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, + 0x61, 0x6c, 0x20, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x63, 0x61, 0x6c, 0x6c, + 0x62, 0x61, 0x63, 0x6b, 0x73, 0x5b, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5d, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x69, 0x66, 0x20, 0x28, 0x63, 0x62, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x2d, 0x2d, + 0x20, 0x69, 0x66, 0x20, 0x61, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, + 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x63, 0x62, 0x5b, 0x31, 0x5d, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x29, + 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x75, + 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x63, 0x62, 0x5b, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, + 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, + 0x6b, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x2c, + 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x2d, 0x2d, + 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x72, + 0x65, 0x2d, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x20, 0x43, 0x20, 0x63, 0x61, 0x6c, 0x6c, + 0x62, 0x61, 0x63, 0x6b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x20, 0x2d, 0x2d, 0x20, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x69, + 0x6e, 0x20, 0x4c, 0x75, 0x61, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x66, 0x20, + 0x61, 0x20, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, + 0x65, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x20, 0x2d, @@ -186,306 +190,324 @@ static const unsigned char B1[] = { 0x6d, 0x62, 0x65, 0x72, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x76, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x6e, 0x69, 0x6c, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x66, 0x20, 0x61, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x2c, - 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x6e, 0x69, - 0x6c, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x66, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, - 0x73, 0x20, 0x73, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x6e, 0x20, 0x4c, - 0x75, 0x61, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x69, 0x74, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x20, 0x2d, 0x2d, 0x20, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, - 0x69, 0x6e, 0x20, 0x4c, 0x75, 0x61, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, - 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, - 0x2d, 0x2d, 0x20, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x69, 0x6e, - 0x20, 0x4c, 0x75, 0x61, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, - 0x69, 0x75, 0x70, 0x4e, 0x65, 0x77, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x22, 0x69, 0x75, 0x70, - 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2c, 0x20, - 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x67, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, - 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, - 0x6e, 0x65, 0x77, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2c, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x29, 0x0a, 0x69, 0x75, 0x70, - 0x53, 0x65, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x22, 0x2c, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x74, 0x6f, - 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x4d, 0x65, - 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, 0x65, 0x71, 0x22, 0x2c, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x29, 0x20, 0x2d, 0x2d, 0x20, 0x69, - 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x43, 0x0a, - 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x0a, 0x2d, 0x2d, 0x20, 0x55, 0x74, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x20, 0x0a, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, - 0x73, 0x65, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x76, 0x29, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x75, - 0x73, 0x65, 0x64, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x62, 0x79, 0x20, 0x72, 0x61, 0x64, 0x69, - 0x6f, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x7a, 0x62, 0x6f, 0x78, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x47, 0x65, 0x74, 0x4e, 0x61, 0x6d, - 0x65, 0x28, 0x76, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, - 0x6c, 0x20, 0x61, 0x75, 0x74, 0x6f, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x5f, 0x49, 0x55, 0x50, - 0x4c, 0x55, 0x41, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x28, 0x25, 0x73, 0x29, 0x22, 0x2c, 0x20, 0x74, - 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x76, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x61, 0x75, 0x74, 0x6f, 0x6e, 0x61, - 0x6d, 0x65, 0x2c, 0x20, 0x76, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x20, 0x61, 0x75, 0x74, 0x6f, 0x6e, 0x61, 0x6d, 0x65, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, - 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x0a, 0x65, - 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x49, 0x4e, + 0x44, 0x45, 0x58, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, + 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x66, 0x20, 0x74, 0x68, 0x65, 0x72, + 0x65, 0x20, 0x77, 0x61, 0x73, 0x20, 0x73, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, + 0x69, 0x6e, 0x20, 0x4c, 0x75, 0x61, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x69, 0x74, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, 0x3d, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x2d, 0x2d, 0x20, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x20, 0x61, + 0x6c, 0x73, 0x6f, 0x20, 0x69, 0x6e, 0x20, 0x4c, 0x75, 0x61, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, + 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x20, 0x2d, 0x2d, 0x20, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x20, 0x61, 0x6c, 0x73, + 0x6f, 0x20, 0x69, 0x6e, 0x20, 0x4c, 0x75, 0x61, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x4e, 0x65, 0x77, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, 0x69, 0x75, + 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x22, 0x2c, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x67, 0x65, + 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x4d, + 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, 0x6e, 0x65, 0x77, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, + 0x2c, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, + 0x64, 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x2c, 0x20, + 0x22, 0x5f, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x2c, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, + 0x6e, 0x67, 0x29, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x43, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x4d, + 0x65, 0x74, 0x68, 0x6f, 0x64, 0x28, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x22, 0x2c, 0x20, 0x22, 0x5f, 0x5f, 0x65, 0x71, 0x22, 0x2c, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x29, + 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x20, + 0x69, 0x6e, 0x20, 0x43, 0x0a, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x55, 0x74, 0x69, 0x6c, 0x69, 0x74, 0x69, + 0x65, 0x73, 0x20, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x76, + 0x29, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, + 0x62, 0x79, 0x20, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x7a, 0x62, 0x6f, + 0x78, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x76, 0x29, 0x0a, + 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, + 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x61, 0x75, 0x74, + 0x6f, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x66, + 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x5f, 0x49, 0x55, 0x50, 0x4c, 0x55, 0x41, 0x5f, 0x4e, + 0x41, 0x4d, 0x45, 0x28, 0x25, 0x73, 0x29, 0x22, 0x2c, 0x20, 0x74, 0x6f, 0x73, 0x74, 0x72, 0x69, + 0x6e, 0x67, 0x28, 0x76, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, + 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x61, 0x75, 0x74, 0x6f, 0x6e, 0x61, 0x6d, + 0x65, 0x2c, 0x20, 0x76, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, + 0x20, 0x61, 0x75, 0x74, 0x6f, 0x6e, 0x61, 0x6d, 0x65, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x20, 0x2d, 0x2d, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x5b, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x6e, 0x69, 0x63, 0x6b, 0x5d, 0x20, 0x3d, 0x20, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x3a, 0x63, 0x6f, 0x6e, - 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6f, 0x72, 0x28, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, - 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, + 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6f, 0x72, 0x29, 0x20, 0x74, 0x68, 0x65, + 0x6e, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x6e, 0x69, 0x63, + 0x6b, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x3a, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, + 0x6f, 0x72, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x79, 0x70, 0x65, 0x6e, 0x61, 0x6d, - 0x65, 0x29, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, - 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x47, - 0x65, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, - 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x5b, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x2e, 0x75, 0x70, 0x70, 0x65, 0x72, 0x28, 0x74, 0x79, 0x70, 0x65, 0x6e, 0x61, - 0x6d, 0x65, 0x29, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x7b, 0x20, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x3d, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x57, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x72, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x0a, 0x65, 0x6e, 0x64, 0x0a, + 0x65, 0x29, 0x0a, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, + 0x73, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x6c, 0x6f, + 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x47, 0x65, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x5b, 0x73, + 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x75, 0x70, 0x70, 0x65, 0x72, 0x28, 0x74, 0x79, 0x70, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, + 0x54, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, + 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x7b, 0x20, + 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x3d, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x7d, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x0a, + 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x28, 0x74, 0x6f, 0x70, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x29, 0x20, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, - 0x2d, 0x2d, 0x20, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x28, 0x74, 0x6f, 0x70, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x29, 0x20, 0x0a, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x57, 0x49, 0x44, - 0x47, 0x45, 0x54, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, - 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2e, 0x73, 0x68, 0x6f, 0x77, 0x28, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x53, 0x68, 0x6f, 0x77, 0x28, 0x6f, + 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x20, 0x3d, 0x20, 0x7b, 0x0a, + 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, + 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2e, 0x73, 0x68, 0x6f, 0x77, 0x28, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x77, 0x28, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2e, 0x68, 0x69, 0x64, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x48, 0x69, 0x64, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, - 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x57, 0x49, 0x44, 0x47, - 0x45, 0x54, 0x2e, 0x68, 0x69, 0x64, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x0a, - 0x20, 0x20, 0x48, 0x69, 0x64, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2e, 0x6d, 0x61, 0x70, 0x28, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x4d, 0x61, 0x70, 0x28, 0x6f, 0x62, 0x6a, + 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2e, 0x6d, 0x61, 0x70, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x61, 0x70, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6f, 0x72, 0x28, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, - 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3a, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x61, 0x72, - 0x67, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x3d, 0x20, 0x7b, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, - 0x74, 0x20, 0x3d, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x0a, 0x20, - 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, - 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, - 0x6c, 0x61, 0x73, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x22, 0x69, 0x75, - 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, - 0x53, 0x65, 0x74, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3a, 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x28, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2e, 0x73, 0x65, 0x74, 0x41, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, - 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x2c, 0x76, 0x20, 0x69, - 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x28, 0x61, 0x72, 0x67, 0x29, 0x20, 0x64, 0x6f, 0x20, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x69, 0x29, 0x20, - 0x3d, 0x3d, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x20, 0x61, 0x6e, 0x64, 0x20, - 0x69, 0x75, 0x70, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x76, 0x29, 0x20, 0x3d, - 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, - 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x57, 0x65, 0x20, - 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, - 0x68, 0x69, 0x73, 0x20, 0x6f, 0x72, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, 0x65, 0x6c, 0x65, - 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x28, 0x73, 0x75, 0x63, 0x68, 0x20, 0x61, 0x73, 0x20, 0x69, - 0x75, 0x70, 0x74, 0x65, 0x78, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, - 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x6e, 0x65, 0x6f, 0x73, 0x6c, 0x79, - 0x20, 0x69, 0x6e, 0x68, 0x65, 0x72, 0x69, 0x74, 0x20, 0x69, 0x74, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x72, 0x61, 0x77, 0x73, 0x65, 0x74, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, - 0x20, 0x69, 0x2c, 0x20, 0x76, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x77, 0x69, - 0x6c, 0x6c, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x20, 0x73, 0x65, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x20, 0x6d, 0x65, 0x74, 0x61, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, - 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x68, 0x69, 0x65, - 0x72, 0x61, 0x72, 0x63, 0x68, 0x79, 0x20, 0x6d, 0x75, 0x73, 0x74, 0x20, 0x62, 0x65, 0x20, 0x22, - 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x0a, 0x2d, 0x2d, 0x20, 0x4d, - 0x75, 0x73, 0x74, 0x20, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, - 0x63, 0x61, 0x6c, 0x6c, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, 0x20, 0x6e, - 0x65, 0x77, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x20, 0x22, 0x69, - 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, 0x0a, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, - 0x42, 0x6f, 0x78, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x28, 0x69, 0x6e, 0x68, 0x65, 0x72, - 0x69, 0x74, 0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x29, - 0x20, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x0a, 0x0a, 0x42, 0x4f, 0x58, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, - 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x42, 0x4f, 0x58, 0x2e, 0x73, 0x65, 0x74, 0x41, + 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6f, 0x72, + 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, + 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x7b, 0x20, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x0a, + 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x57, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x73, 0x65, + 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2e, 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x28, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x22, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, - 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x72, - 0x67, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x20, 0x6e, - 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x69, 0x75, 0x70, 0x47, 0x65, - 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x29, 0x20, 0x3d, - 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, - 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x70, 0x70, 0x65, 0x6e, - 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, - 0x29, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, - 0x0a, 0x20, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2e, 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, - 0x61, 0x72, 0x67, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x42, 0x4f, 0x58, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x43, 0x6f, 0x6d, - 0x70, 0x61, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, - 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x65, 0x72, 0x72, 0x2c, 0x74, 0x72, 0x61, 0x63, - 0x65, 0x62, 0x61, 0x63, 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x72, 0x72, 0x20, 0x3d, 0x20, 0x65, - 0x72, 0x72, 0x2e, 0x2e, 0x28, 0x74, 0x72, 0x61, 0x63, 0x65, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x6f, - 0x72, 0x20, 0x22, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x65, 0x72, 0x72, 0x6f, - 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x29, - 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x2e, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x65, 0x72, 0x72, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, - 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x62, 0x74, 0x20, - 0x3d, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x7b, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x3d, 0x22, - 0x4f, 0x6b, 0x22, 0x2c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3d, 0x22, 0x36, 0x30, 0x22, 0x2c, 0x20, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x3d, 0x20, 0x6e, 0x69, - 0x6c, 0x3b, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x4c, - 0x4f, 0x53, 0x45, 0x22, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, - 0x6d, 0x6c, 0x20, 0x3d, 0x20, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6c, 0x69, 0x6e, 0x65, 0x7b, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x3d, 0x22, 0x59, 0x45, 0x53, 0x22, 0x2c, 0x20, 0x72, 0x65, 0x61, - 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x3d, 0x22, 0x59, 0x45, 0x53, 0x22, 0x2c, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x65, 0x72, 0x72, 0x2c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3d, 0x22, 0x33, 0x30, - 0x30, 0x78, 0x31, 0x35, 0x30, 0x22, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, - 0x6c, 0x20, 0x76, 0x62, 0x20, 0x3d, 0x20, 0x76, 0x62, 0x6f, 0x78, 0x7b, 0x6d, 0x6c, 0x2c, 0x20, - 0x62, 0x74, 0x3b, 0x20, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x3d, 0x22, 0x41, - 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x22, 0x2c, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x3d, - 0x22, 0x31, 0x30, 0x78, 0x31, 0x30, 0x22, 0x2c, 0x20, 0x67, 0x61, 0x70, 0x3d, 0x22, 0x31, 0x30, - 0x22, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x64, 0x67, 0x20, - 0x3d, 0x20, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x7b, 0x76, 0x62, 0x3b, 0x20, 0x74, 0x69, 0x74, - 0x6c, 0x65, 0x3d, 0x22, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x20, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x22, 0x2c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x65, 0x73, 0x63, 0x3d, 0x62, 0x74, - 0x2c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3d, 0x62, 0x74, - 0x2c, 0x73, 0x74, 0x61, 0x72, 0x74, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x3d, 0x62, 0x74, 0x7d, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x3d, 0x20, 0x6d, 0x6c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x64, 0x67, 0x3a, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, - 0x2c, 0x20, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x67, - 0x3a, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, + 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x2e, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x2c, + 0x76, 0x20, 0x69, 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x29, 0x20, 0x64, 0x6f, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, + 0x65, 0x28, 0x69, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, + 0x20, 0x61, 0x6e, 0x64, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x28, 0x76, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x2d, 0x2d, 0x20, 0x57, 0x65, 0x20, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x6e, 0x6f, 0x74, + 0x20, 0x73, 0x65, 0x74, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6f, 0x72, 0x20, 0x6f, 0x74, 0x68, + 0x65, 0x72, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x28, 0x73, 0x75, 0x63, + 0x68, 0x20, 0x61, 0x73, 0x20, 0x69, 0x75, 0x70, 0x74, 0x65, 0x78, 0x74, 0x29, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x65, 0x72, 0x72, 0x6f, + 0x6e, 0x65, 0x6f, 0x73, 0x6c, 0x79, 0x20, 0x69, 0x6e, 0x68, 0x65, 0x72, 0x69, 0x74, 0x20, 0x69, + 0x74, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x61, 0x77, 0x73, 0x65, 0x74, 0x28, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x69, 0x2c, 0x20, 0x76, 0x29, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x74, + 0x68, 0x69, 0x73, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x20, 0x73, 0x65, + 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x20, 0x6d, 0x65, 0x74, 0x61, 0x6d, 0x65, 0x74, 0x68, 0x6f, + 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x69, + 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, + 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x6c, 0x20, + 0x74, 0x68, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x79, 0x20, 0x6d, 0x75, 0x73, + 0x74, 0x20, 0x62, 0x65, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x0a, 0x2d, 0x2d, 0x20, 0x4d, 0x75, 0x73, 0x74, 0x20, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x65, + 0x76, 0x65, 0x72, 0x79, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x69, 0x75, 0x70, + 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x42, 0x6f, 0x78, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x28, 0x69, 0x6e, 0x68, 0x65, 0x72, 0x69, 0x74, 0x73, 0x20, 0x66, + 0x72, 0x6f, 0x6d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x29, 0x20, 0x0a, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x69, 0x75, 0x70, + 0x2e, 0x42, 0x4f, 0x58, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x0a, 0x7d, + 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, + 0x4f, 0x58, 0x2e, 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, + 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, + 0x20, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, + 0x22, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x20, 0x6e, 0x20, 0x3d, 0x20, 0x23, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x0a, 0x20, 0x20, 0x66, + 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x20, 0x6e, 0x20, 0x64, 0x6f, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, + 0x73, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, + 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, + 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x41, 0x70, 0x70, + 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x5b, 0x69, 0x5d, 0x29, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, + 0x54, 0x2e, 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x28, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x58, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, 0x2d, 0x20, 0x43, 0x6f, 0x6d, 0x70, + 0x61, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x2e, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x3d, 0x20, 0x6e, + 0x69, 0x6c, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x65, + 0x72, 0x72, 0x2c, 0x74, 0x72, 0x61, 0x63, 0x65, 0x62, 0x61, 0x63, 0x6b, 0x29, 0x0a, 0x20, 0x20, + 0x65, 0x72, 0x72, 0x20, 0x3d, 0x20, 0x65, 0x72, 0x72, 0x2e, 0x2e, 0x28, 0x74, 0x72, 0x61, 0x63, + 0x65, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x6f, 0x72, 0x20, 0x22, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x28, 0x69, 0x75, 0x70, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x2e, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x20, 0x3d, 0x20, 0x65, 0x72, 0x72, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, + 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x62, 0x74, 0x20, 0x3d, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x7b, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x3d, 0x22, 0x4f, 0x6b, 0x22, 0x2c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3d, 0x22, 0x36, 0x30, + 0x22, 0x2c, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x69, 0x75, 0x70, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, - 0x75, 0x70, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, - 0x6e, 0x64, 0x0a, 0x0a, 0x70, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x2e, 0x2e, 0x2e, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, - 0x20, 0x7b, 0x2e, 0x2e, 0x2e, 0x7d, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x61, - 0x6c, 0x6c, 0x5f, 0x28, 0x66, 0x2c, 0x20, 0x65, 0x72, 0x72, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, - 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x65, - 0x72, 0x72, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x0a, - 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x72, 0x65, - 0x74, 0x20, 0x3d, 0x20, 0x70, 0x61, 0x63, 0x6b, 0x28, 0x70, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x66, - 0x29, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x74, 0x5b, - 0x31, 0x5d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x45, 0x52, - 0x52, 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x72, 0x65, 0x74, 0x5b, 0x32, - 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x0a, 0x20, 0x20, - 0x65, 0x6c, 0x73, 0x65, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x28, 0x72, 0x65, 0x74, 0x2c, 0x20, 0x31, 0x29, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x75, 0x6e, 0x70, 0x61, 0x63, - 0x6b, 0x28, 0x72, 0x65, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x64, 0x6f, 0x73, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x28, 0x73, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x70, 0x72, - 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x28, 0x6c, 0x6f, 0x61, - 0x64, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x73, 0x29, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, - 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x64, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x28, - 0x66, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, - 0x74, 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x28, 0x6c, 0x6f, 0x61, 0x64, 0x66, 0x69, 0x6c, - 0x65, 0x28, 0x66, 0x29, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x52, 0x47, 0x42, 0x28, 0x72, 0x2c, 0x20, 0x67, 0x2c, 0x20, 0x62, 0x29, - 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, - 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x25, 0x64, 0x20, 0x25, 0x64, 0x20, 0x25, - 0x64, 0x22, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x72, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x67, - 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x62, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, - 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, - 0x20, 0x62, 0x6f, 0x74, 0x68, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, - 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, - 0x6d, 0x65, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x2d, - 0x2d, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x61, 0x6c, 0x6c, 0x6f, - 0x77, 0x20, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, - 0x20, 0x74, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x72, 0x65, - 0x71, 0x75, 0x69, 0x72, 0x65, 0x0a, 0x69, 0x66, 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, 0x6b, - 0x61, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x5f, 0x47, 0x2e, 0x70, - 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x5b, 0x22, 0x69, - 0x75, 0x70, 0x6c, 0x75, 0x61, 0x22, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, - 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, - 0x65, 0x64, 0x5b, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x35, 0x31, 0x22, 0x5d, 0x20, 0x3d, - 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x4d, 0x20, 0x3d, - 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x50, 0x41, 0x43, - 0x4b, 0x41, 0x47, 0x45, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x22, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, + 0x75, 0x70, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x3b, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x22, 0x7d, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6d, 0x6c, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6c, 0x69, 0x6e, 0x65, 0x7b, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x3d, 0x22, 0x59, 0x45, 0x53, 0x22, 0x2c, 0x20, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, + 0x3d, 0x22, 0x59, 0x45, 0x53, 0x22, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x65, 0x72, + 0x72, 0x2c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3d, 0x22, 0x33, 0x30, 0x30, 0x78, 0x31, 0x35, 0x30, + 0x22, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x76, 0x62, 0x20, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x76, 0x62, 0x6f, 0x78, 0x7b, 0x6d, 0x6c, 0x2c, 0x20, 0x62, + 0x74, 0x3b, 0x20, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x3d, 0x22, 0x41, 0x43, + 0x45, 0x4e, 0x54, 0x45, 0x52, 0x22, 0x2c, 0x20, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x3d, 0x22, + 0x31, 0x30, 0x78, 0x31, 0x30, 0x22, 0x2c, 0x20, 0x67, 0x61, 0x70, 0x3d, 0x22, 0x31, 0x30, 0x22, + 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x64, 0x67, 0x20, 0x3d, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x7b, 0x76, 0x62, 0x3b, 0x20, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x3d, 0x22, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x20, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x22, 0x2c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x65, 0x73, 0x63, + 0x3d, 0x62, 0x74, 0x2c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x3d, 0x62, 0x74, 0x2c, 0x73, 0x74, 0x61, 0x72, 0x74, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x3d, 0x62, + 0x74, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x3d, + 0x20, 0x6d, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x67, 0x3a, 0x70, 0x6f, 0x70, 0x75, 0x70, + 0x28, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x2c, 0x20, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x29, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x67, 0x3a, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x3d, 0x20, + 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x28, 0x2e, 0x2e, 0x2e, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, + 0x61, 0x72, 0x67, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, + 0x61, 0x6c, 0x6c, 0x5f, 0x28, 0x66, 0x2c, 0x20, 0x65, 0x72, 0x72, 0x29, 0x0a, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x4d, 0x45, 0x53, 0x53, + 0x41, 0x47, 0x45, 0x28, 0x65, 0x72, 0x72, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, + 0x75, 0x72, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x20, 0x72, 0x65, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x70, 0x61, 0x63, + 0x6b, 0x28, 0x70, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x66, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, + 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x74, 0x5b, 0x31, 0x5d, 0x20, 0x74, 0x68, 0x65, 0x6e, + 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, + 0x4d, 0x45, 0x53, 0x53, 0x41, 0x47, 0x45, 0x28, 0x72, 0x65, 0x74, 0x5b, 0x32, 0x5d, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x0a, 0x20, 0x20, 0x65, 0x6c, 0x73, + 0x65, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x72, 0x65, + 0x6d, 0x6f, 0x76, 0x65, 0x28, 0x72, 0x65, 0x74, 0x2c, 0x20, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x75, 0x6e, 0x70, 0x61, 0x63, 0x6b, 0x28, 0x72, + 0x65, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x64, 0x6f, 0x73, 0x74, + 0x72, 0x69, 0x6e, 0x67, 0x28, 0x73, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x61, 0x6c, 0x6c, + 0x5f, 0x28, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x73, 0x29, 0x29, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x64, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x28, 0x66, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, + 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, + 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x28, 0x6c, 0x6f, 0x61, 0x64, 0x66, 0x69, 0x6c, 0x65, 0x28, 0x66, + 0x29, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x47, 0x42, 0x28, 0x72, 0x2c, 0x20, 0x67, 0x2c, 0x20, 0x62, + 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, + 0x67, 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x25, 0x64, 0x20, 0x25, 0x64, 0x20, + 0x25, 0x64, 0x22, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x72, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, + 0x67, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2a, 0x62, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, + 0x2d, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x61, 0x6c, 0x6c, 0x6f, + 0x77, 0x20, 0x62, 0x6f, 0x74, 0x68, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, + 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, + 0x61, 0x6d, 0x65, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x0a, + 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x61, 0x6c, 0x6c, + 0x6f, 0x77, 0x20, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, + 0x67, 0x20, 0x74, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x72, + 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x0a, 0x69, 0x66, 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, + 0x6b, 0x61, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x5f, 0x47, 0x2e, + 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x5b, 0x22, + 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x22, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, + 0x20, 0x20, 0x5f, 0x47, 0x2e, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x6c, 0x6f, 0x61, + 0x64, 0x65, 0x64, 0x5b, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x35, 0x31, 0x22, 0x5d, 0x20, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x4d, 0x20, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x5f, 0x50, 0x41, + 0x43, 0x4b, 0x41, 0x47, 0x45, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x22, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "iuplua.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/label.clua b/iup/srclua5/clua/label.clua index a0a24d9..5528af9 100644 --- a/iup/srclua5/clua/label.clua +++ b/iup/srclua5/clua/label.clua @@ -13,18 +13,19 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x53, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, - 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, - 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x28, 0x61, - 0x72, 0x67, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, - 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, - 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x53, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, + 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, + 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, + 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, + 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "label.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/list.clua b/iup/srclua5/clua/list.clua index d064bf9..468d296 100644 --- a/iup/srclua5/clua/list.clua +++ b/iup/srclua5/clua/list.clua @@ -13,25 +13,26 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x73, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x75, 0x6c, 0x74, - 0x69, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x64, 0x69, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, - 0x20, 0x22, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x6f, 0x70, - 0x64, 0x6f, 0x77, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x64, 0x62, 0x6c, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x4c, 0x69, 0x73, 0x74, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, - 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, - 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, + 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x73, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x64, 0x69, 0x74, 0x5f, + 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x64, 0x72, 0x6f, 0x70, 0x64, 0x6f, 0x77, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x64, 0x62, 0x6c, 0x63, 0x6c, 0x69, 0x63, 0x6b, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x7d, + 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, + 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, + 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, + 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "list.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/matrix.clua b/iup/srclua5/clua/matrix.clua index 02b4643..955f76f 100644 --- a/iup/srclua5/clua/matrix.clua +++ b/iup/srclua5/clua/matrix.clua @@ -13,72 +13,73 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, - 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, - 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, - 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, - 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, - 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x6e, 0x6e, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x6f, 0x70, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x5f, 0x63, - 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, - 0x61, 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, 0x6e, + 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, + 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x73, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x6c, 0x65, + 0x61, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x69, + 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x6f, 0x70, 0x63, 0x68, 0x65, + 0x63, 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, + 0x6e, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, + 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, + 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x6d, 0x61, + 0x74, 0x72, 0x69, 0x78, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x72, 0x6f, 0x70, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, + 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x69, 0x73, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, + 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x65, 0x61, 0x76, 0x65, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x63, + 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, + 0x75, 0x73, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x74, 0x6f, 0x70, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x66, 0x67, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x64, 0x72, 0x6f, 0x70, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, - 0x20, 0x22, 0x6e, 0x6e, 0x69, 0x73, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, - 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x69, 0x74, 0x65, - 0x6d, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x6c, 0x65, 0x61, 0x76, 0x65, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, - 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x6d, - 0x6f, 0x76, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x74, 0x6f, 0x70, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x67, 0x63, 0x6f, - 0x6c, 0x6f, 0x72, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x20, - 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, - 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x66, 0x75, 0x6e, 0x63, - 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x67, 0x63, - 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x7b, 0x22, - 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x72, 0x65, 0x74, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, 0x7d, 0x2c, - 0x20, 0x2d, 0x2d, 0x20, 0x72, 0x65, 0x74, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x7b, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x72, 0x65, 0x74, - 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, 0x7d, 0x2c, 0x20, 0x2d, 0x2d, 0x20, 0x72, 0x65, 0x74, 0x20, - 0x69, 0x73, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x5f, 0x63, 0x62, - 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x61, - 0x72, 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x69, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, - 0x22, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, - 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, - 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, - 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, - 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, - 0x4d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x73, 0x65, 0x74, 0x63, 0x65, 0x6c, 0x6c, 0x28, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6c, 0x2c, 0x20, 0x63, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x29, - 0x0a, 0x20, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, + 0x20, 0x62, 0x67, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, + 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x20, + 0x3d, 0x20, 0x7b, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x72, 0x65, 0x74, 0x20, 0x3d, 0x20, 0x22, + 0x73, 0x22, 0x7d, 0x2c, 0x20, 0x2d, 0x2d, 0x20, 0x72, 0x65, 0x74, 0x20, 0x69, 0x73, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x7b, 0x22, 0x6e, 0x6e, 0x22, 0x2c, + 0x20, 0x72, 0x65, 0x74, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, 0x7d, 0x2c, 0x20, 0x2d, 0x2d, 0x20, + 0x72, 0x65, 0x74, 0x20, 0x69, 0x73, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x65, 0x64, 0x69, + 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x69, 0x74, 0x5f, 0x63, + 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, + 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x65, + 0x78, 0x74, 0x72, 0x61, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x0a, 0x7d, + 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x61, 0x74, 0x72, 0x69, 0x78, + 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, + 0x6c, 0x2e, 0x73, 0x65, 0x74, 0x63, 0x65, 0x6c, 0x6c, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x2c, 0x20, 0x6c, 0x2c, 0x20, 0x63, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x29, 0x0a, 0x20, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x6c, 0x2e, 0x2e, 0x22, 0x3a, 0x22, 0x2e, 0x2e, 0x63, 0x2c, 0x76, 0x61, 0x6c, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x67, 0x65, 0x74, 0x63, 0x65, 0x6c, 0x6c, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6c, 0x2c, 0x20, 0x63, 0x29, 0x0a, 0x20, - 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x6c, 0x2e, 0x2e, 0x22, - 0x3a, 0x22, 0x2e, 0x2e, 0x63, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, - 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, - 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x29, 0x0a, + 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x41, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, + 0x6c, 0x2e, 0x2e, 0x22, 0x3a, 0x22, 0x2e, 0x2e, 0x63, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, + 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "matrix.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/menu.clua b/iup/srclua5/clua/menu.clua index 9f82efa..6d579a8 100644 --- a/iup/srclua5/clua/menu.clua +++ b/iup/srclua5/clua/menu.clua @@ -13,74 +13,78 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x42, 0x4f, 0x58, 0x2c, 0x0a, 0x20, 0x20, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x62, - 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, - 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, - 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, - 0x20, 0x20, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, - 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, - 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, - 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, - 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x20, 0x3d, 0x20, 0x23, 0x61, - 0x72, 0x67, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x3d, 0x31, 0x2c, 0x6e, 0x20, 0x64, - 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x61, 0x72, - 0x67, 0x5b, 0x69, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, - 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, - 0x6d, 0x61, 0x72, 0x67, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x66, 0x6f, 0x72, 0x20, 0x75, 0x2c, 0x76, 0x20, 0x69, 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, - 0x28, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x29, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x75, 0x29, 0x20, 0x7e, - 0x3d, 0x20, 0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, - 0x67, 0x5b, 0x75, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x61, 0x72, 0x67, - 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, - 0x6e, 0x67, 0x22, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x28, 0x74, 0x79, 0x70, 0x65, 0x28, 0x61, 0x72, - 0x67, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x66, 0x75, 0x6e, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x61, - 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x58, 0x2c, + 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, + 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x63, 0x6c, 0x6f, 0x73, + 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, + 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, + 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, + 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, + 0x2e, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, + 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x41, 0x70, 0x70, 0x65, + 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, + 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x20, 0x3d, 0x20, 0x23, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x3d, 0x31, 0x2c, 0x6e, 0x20, 0x64, + 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, + 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x20, 0x3d, 0x20, 0x7b, + 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x75, 0x2c, 0x76, 0x20, + 0x69, 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, + 0x5d, 0x29, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x75, 0x29, 0x20, 0x7e, 0x3d, 0x20, 0x22, 0x6e, 0x75, 0x6d, + 0x62, 0x65, 0x72, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x5b, 0x75, 0x5d, 0x20, 0x3d, + 0x20, 0x76, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, + 0x31, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, + 0x61, 0x6e, 0x64, 0x20, 0x28, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, + 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x66, 0x75, 0x6e, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x20, - 0x3d, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x28, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x29, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, - 0x22, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, - 0x22, 0x75, 0x73, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x5b, - 0x31, 0x5d, 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x0a, 0x20, + 0x65, 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, + 0x5d, 0x5b, 0x32, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x69, 0x74, 0x65, 0x6d, + 0x28, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x73, 0x74, 0x72, + 0x69, 0x6e, 0x67, 0x22, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x75, + 0x73, 0x65, 0x72, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, + 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, 0x32, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x2e, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x20, - 0x3d, 0x20, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x28, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, - 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x20, 0x4d, 0x65, 0x6e, 0x75, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x73, - 0x68, 0x6f, 0x77, 0x78, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, - 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x53, 0x68, 0x6f, - 0x77, 0x58, 0x59, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, - 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x44, 0x65, - 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, - 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, - 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, - 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x69, 0x74, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x5b, + 0x31, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, + 0x75, 0x28, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, + 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x4d, 0x65, 0x6e, 0x75, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x73, 0x68, 0x6f, 0x77, 0x78, 0x79, + 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, + 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x68, 0x6f, 0x77, + 0x58, 0x59, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, + 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, + 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "menu.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/messagedlg.clua b/iup/srclua5/clua/messagedlg.clua index f51bcf9..15d6653 100644 --- a/iup/srclua5/clua/messagedlg.clua +++ b/iup/srclua5/clua/messagedlg.clua @@ -14,27 +14,28 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x64, 0x6c, 0x67, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, - 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, - 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, - 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x44, 0x6c, 0x67, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, - 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x28, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, 0x29, 0x0a, 0x20, 0x20, - 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, - 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x44, 0x65, - 0x73, 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, - 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, - 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x20, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x6c, 0x67, 0x28, - 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, - 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, - 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, - 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x29, 0x0a, 0x0a, + 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, + 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, + 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x6c, 0x67, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, + 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, + 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x70, 0x6f, + 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x78, 0x2c, 0x20, 0x79, + 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, 0x6f, 0x70, 0x75, 0x70, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x78, 0x2c, 0x79, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x64, 0x65, 0x73, + 0x74, 0x72, 0x6f, 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x44, 0x65, 0x73, 0x74, 0x72, 0x6f, + 0x79, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, + 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x44, 0x6c, + 0x67, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, + 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "messagedlg.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/multiline.clua b/iup/srclua5/clua/multiline.clua index efb174c..c682a49 100644 --- a/iup/srclua5/clua/multiline.clua +++ b/iup/srclua5/clua/multiline.clua @@ -14,20 +14,21 @@ static const unsigned char B1[] = { 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, - 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, - 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x73, 0x22, 0x2c, 0x20, 0x0a, 0x20, - 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, - 0x20, 0x22, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4c, 0x69, 0x6e, 0x65, 0x22, 0x2c, 0x0a, 0x7d, 0x20, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x20, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4c, 0x69, 0x6e, 0x65, 0x28, 0x29, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, - 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, - 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, - 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, + 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x73, 0x22, + 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, + 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4c, 0x69, 0x6e, 0x65, 0x22, + 0x2c, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4d, 0x75, + 0x6c, 0x74, 0x69, 0x4c, 0x69, 0x6e, 0x65, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, + 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, + 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, + 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "multiline.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/normalizer.clua b/iup/srclua5/clua/normalizer.clua index d506035..b1bb2f0 100644 --- a/iup/srclua5/clua/normalizer.clua +++ b/iup/srclua5/clua/normalizer.clua @@ -14,33 +14,35 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, - 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, - 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x72, 0x61, 0x77, 0x67, - 0x65, 0x74, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x22, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x20, 0x3d, - 0x20, 0x23, 0x61, 0x72, 0x67, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, - 0x31, 0x2c, 0x20, 0x6e, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x69, - 0x75, 0x70, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x69, - 0x5d, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, - 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x61, 0x64, 0x64, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x5b, 0x69, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, - 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2e, 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x72, 0x28, 0x29, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, - 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, - 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, - 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, + 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, + 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, + 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, + 0x3d, 0x20, 0x72, 0x61, 0x77, 0x67, 0x65, 0x74, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, + 0x20, 0x22, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x20, 0x6e, 0x20, 0x3d, 0x20, 0x23, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x0a, 0x20, 0x20, + 0x66, 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x20, 0x6e, 0x20, 0x64, 0x6f, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, + 0x61, 0x73, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x29, 0x20, 0x3d, 0x3d, + 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, + 0x65, 0x6e, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x2e, 0x61, 0x64, 0x64, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x20, 0x3d, 0x20, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x5b, 0x69, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, + 0x54, 0x2e, 0x73, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, + 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, + 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4e, 0x6f, 0x72, 0x6d, + 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x72, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, + 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "normalizer.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/olecontrol.clua b/iup/srclua5/clua/olecontrol.clua index aebe246..883b20b 100644 --- a/iup/srclua5/clua/olecontrol.clua +++ b/iup/srclua5/clua/olecontrol.clua @@ -14,66 +14,65 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x6f, 0x6c, 0x65, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, - 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, - 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, - 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x4f, 0x6c, 0x65, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, 0x6c, - 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x6f, 0x6c, 0x65, 0x2e, 0x68, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x6f, 0x64, 0x65, 0x20, 0x3d, 0x20, - 0x5b, 0x5b, 0x20, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x75, 0x70, 0x6f, 0x6c, 0x65, 0x6c, 0x75, - 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x75, 0x70, - 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x6c, 0x6c, 0x5f, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x28, 0x4c, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x49, 0x75, - 0x70, 0x4f, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4f, 0x70, 0x65, 0x6e, 0x28, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, - 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x76, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x20, - 0x20, 0x69, 0x75, 0x70, 0x6f, 0x6c, 0x65, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x75, - 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, - 0x6c, 0x75, 0x61, 0x5f, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x45, 0x6e, 0x76, 0x28, 0x4c, 0x29, - 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x30, 0x3b, 0x0a, 0x7d, 0x0a, - 0x0a, 0x2f, 0x2a, 0x20, 0x6f, 0x62, 0x6c, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x74, - 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x22, 0x69, 0x75, - 0x70, 0x6c, 0x75, 0x61, 0x6f, 0x6c, 0x65, 0x22, 0x20, 0x2a, 0x2f, 0x0a, 0x69, 0x6e, 0x74, 0x20, - 0x6c, 0x75, 0x61, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x6f, 0x6c, - 0x65, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, - 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x6f, 0x6c, - 0x65, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, - 0x0a, 0x2f, 0x2a, 0x20, 0x6f, 0x62, 0x6c, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x74, - 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x22, 0x69, 0x75, - 0x70, 0x6c, 0x75, 0x61, 0x6f, 0x6c, 0x65, 0x35, 0x31, 0x22, 0x20, 0x2a, 0x2f, 0x0a, 0x69, 0x6e, - 0x74, 0x20, 0x6c, 0x75, 0x61, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, - 0x6f, 0x6c, 0x65, 0x35, 0x31, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, - 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, - 0x75, 0x70, 0x6f, 0x6c, 0x65, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, - 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, - 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, - 0x67, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x4f, 0x6c, 0x65, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, - 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, - 0x6c, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x75, 0x61, 0x43, 0x4f, 0x4d, 0x28, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x69, 0x66, 0x20, 0x6c, - 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x20, 0x69, 0x73, 0x20, 0x6c, 0x6f, 0x61, 0x64, 0x65, 0x64, 0x2c, - 0x20, 0x75, 0x73, 0x65, 0x20, 0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x0a, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x6f, 0x66, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x0a, 0x20, 0x20, 0x69, - 0x66, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x70, 0x75, 0x6e, 0x6b, 0x20, 0x3d, 0x20, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x69, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x70, 0x75, 0x6e, 0x6b, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, - 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x4c, 0x75, 0x61, 0x43, 0x4f, 0x4d, 0x28, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x49, 0x6d, - 0x70, 0x6f, 0x72, 0x74, 0x49, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x28, 0x70, 0x75, 0x6e, - 0x6b, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, - 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, - 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x29, 0x0a, + 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, + 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, + 0x4f, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, + 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x2c, 0x0a, 0x20, 0x20, + 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x6f, 0x6c, + 0x65, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x63, 0x6f, 0x64, + 0x65, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x20, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x69, 0x75, 0x70, 0x6f, + 0x6c, 0x65, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, + 0x28, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x6c, 0x6c, + 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x28, 0x4c, 0x29, 0x29, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x49, 0x75, 0x70, 0x4f, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4f, + 0x70, 0x65, 0x6e, 0x28, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x69, 0x75, + 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x67, 0x65, 0x74, 0x5f, 0x65, 0x6e, 0x76, 0x28, 0x4c, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6f, 0x6c, 0x65, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x30, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2f, 0x2a, 0x20, 0x6f, + 0x62, 0x6c, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, + 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x6f, + 0x6c, 0x65, 0x22, 0x20, 0x2a, 0x2f, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x6c, 0x75, 0x61, 0x6f, 0x70, + 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x6f, 0x6c, 0x65, 0x28, 0x6c, 0x75, 0x61, + 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x6f, 0x6c, 0x65, 0x6c, 0x75, 0x61, 0x5f, + 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2f, 0x2a, 0x20, 0x6f, + 0x62, 0x6c, 0x69, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, + 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x22, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x6f, + 0x6c, 0x65, 0x35, 0x31, 0x22, 0x20, 0x2a, 0x2f, 0x0a, 0x69, 0x6e, 0x74, 0x20, 0x6c, 0x75, 0x61, + 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x6f, 0x6c, 0x65, 0x35, 0x31, + 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2a, 0x20, 0x4c, 0x29, 0x0a, 0x7b, + 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x6f, 0x6c, 0x65, + 0x6c, 0x75, 0x61, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x4c, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, + 0x5d, 0x5d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, + 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x4f, 0x6c, 0x65, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, + 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x75, 0x61, 0x43, 0x4f, + 0x4d, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x69, + 0x66, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x20, 0x69, 0x73, 0x20, 0x6c, 0x6f, 0x61, 0x64, + 0x65, 0x64, 0x2c, 0x20, 0x75, 0x73, 0x65, 0x20, 0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x0a, 0x20, 0x20, 0x2d, 0x2d, + 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x0a, + 0x20, 0x20, 0x69, 0x66, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x6e, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x70, 0x75, 0x6e, 0x6b, 0x20, + 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2e, 0x69, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, + 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x70, 0x75, 0x6e, 0x6b, 0x20, 0x74, 0x68, + 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2e, + 0x63, 0x6f, 0x6d, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x4c, 0x75, 0x61, 0x43, 0x4f, 0x4d, 0x28, 0x6c, 0x75, 0x61, 0x63, 0x6f, 0x6d, + 0x2e, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x28, + 0x70, 0x75, 0x6e, 0x6b, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "olecontrol.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/pplot.clua b/iup/srclua5/clua/pplot.clua index 54d807d..77208ad 100644 --- a/iup/srclua5/clua/pplot.clua +++ b/iup/srclua5/clua/pplot.clua @@ -13,49 +13,50 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x70, 0x70, 0x6c, 0x6f, 0x74, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, - 0x22, 0x50, 0x50, 0x6c, 0x6f, 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, 0x6c, 0x65, - 0x63, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x66, 0x66, 0x6e, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x65, 0x67, 0x69, 0x6e, - 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, - 0x6c, 0x65, 0x63, 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x72, 0x65, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, - 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, - 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x70, - 0x70, 0x6c, 0x6f, 0x74, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x6f, 0x73, 0x74, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x63, 0x62, - 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, - 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, - 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x70, - 0x70, 0x6c, 0x6f, 0x74, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x64, 0x69, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, - 0x6e, 0x6e, 0x66, 0x66, 0x66, 0x66, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, - 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, - 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, - 0x70, 0x70, 0x6c, 0x6f, 0x74, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, - 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x64, 0x69, 0x74, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x5f, - 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x64, 0x69, - 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, - 0x6e, 0x66, 0x66, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x62, 0x65, 0x67, 0x69, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x69, 0x6e, 0x63, - 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x5f, 0x70, 0x70, 0x6c, 0x6f, - 0x74, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x66, 0x75, 0x6e, - 0x63, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, - 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, - 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x50, 0x50, 0x6c, - 0x6f, 0x74, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, - 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, - 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, - 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, + 0x65, 0x20, 0x3d, 0x20, 0x22, 0x50, 0x50, 0x6c, 0x6f, 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, + 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x66, + 0x66, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, + 0x65, 0x67, 0x69, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x72, 0x65, 0x64, 0x72, 0x61, 0x77, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, + 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, + 0x62, 0x79, 0x20, 0x70, 0x70, 0x6c, 0x6f, 0x74, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, + 0x64, 0x75, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x6f, 0x73, 0x74, 0x64, 0x72, 0x61, + 0x77, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, + 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, + 0x62, 0x79, 0x20, 0x70, 0x70, 0x6c, 0x6f, 0x74, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, + 0x64, 0x75, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x64, 0x69, 0x74, 0x5f, 0x63, 0x62, + 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x66, 0x66, 0x66, 0x66, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, + 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, + 0x20, 0x62, 0x79, 0x20, 0x70, 0x70, 0x6c, 0x6f, 0x74, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, + 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x64, 0x69, 0x74, 0x62, 0x65, + 0x67, 0x69, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x65, 0x64, 0x69, 0x74, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x20, + 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x66, 0x66, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x65, 0x6e, 0x64, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, + 0x20, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x5f, + 0x70, 0x70, 0x6c, 0x6f, 0x74, 0x2e, 0x68, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, + 0x61, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, + 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, 0x50, 0x6c, 0x6f, 0x74, 0x28, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, + 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "pplot.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/progressbar.clua b/iup/srclua5/clua/progressbar.clua index ec3c3ff..2cbbd76 100644 --- a/iup/srclua5/clua/progressbar.clua +++ b/iup/srclua5/clua/progressbar.clua @@ -14,19 +14,20 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x62, 0x61, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, - 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x50, 0x72, 0x6f, - 0x67, 0x72, 0x65, 0x73, 0x73, 0x42, 0x61, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, - 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, - 0x20, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x42, 0x61, 0x72, 0x28, 0x29, 0x0a, 0x65, - 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, - 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, - 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, + 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, + 0x22, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x42, 0x61, 0x72, 0x22, 0x2c, 0x0a, 0x20, + 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, + 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, + 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, + 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x50, 0x72, 0x6f, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x42, 0x61, 0x72, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, + 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, + 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, + 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "progressbar.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/radio.clua b/iup/srclua5/clua/radio.clua index e0f0211..d781c3d 100644 --- a/iup/srclua5/clua/radio.clua +++ b/iup/srclua5/clua/radio.clua @@ -13,41 +13,42 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x69, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, - 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x68, 0x69, 0x6c, - 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x0a, 0x20, - 0x20, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x2e, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x42, 0x4f, 0x58, 0x20, 0x74, 0x68, 0x65, - 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x20, - 0x3d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, - 0x6f, 0x62, 0x6a, 0x5b, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x68, 0x69, - 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x5b, - 0x69, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x20, 0x3d, 0x20, - 0x69, 0x2b, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x70, 0x61, 0x72, - 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x49, 0x55, 0x50, 0x46, 0x52, 0x41, 0x4d, 0x45, 0x20, - 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x49, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, + 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, + 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x0a, + 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x2e, + 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, + 0x58, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x77, + 0x68, 0x69, 0x6c, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, + 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x28, 0x6f, 0x62, + 0x6a, 0x5b, 0x69, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x20, + 0x3d, 0x20, 0x69, 0x2b, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x70, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x46, 0x52, 0x41, + 0x4d, 0x45, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x74, + 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x68, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x29, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, - 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, - 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, - 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, 0x29, 0x0a, - 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x28, - 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, - 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x6f, 0x62, + 0x6a, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, + 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, + 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, + 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, + 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, + 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "radio.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/sbox.clua b/iup/srclua5/clua/sbox.clua index 85daca5..baba878 100644 --- a/iup/srclua5/clua/sbox.clua +++ b/iup/srclua5/clua/sbox.clua @@ -11,18 +11,19 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x09, 0x6e, 0x69, 0x63, - 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x62, 0x6f, 0x78, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x09, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x22, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, - 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, - 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, - 0x74, 0x75, 0x72, 0x6e, 0x20, 0x53, 0x62, 0x6f, 0x78, 0x28, 0x61, 0x72, 0x67, 0x5b, 0x31, 0x5d, - 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, - 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, + 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, + 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x62, 0x6f, 0x78, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x49, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, + 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x53, 0x62, 0x6f, 0x78, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, + 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; diff --git a/iup/srclua5/clua/separator.clua b/iup/srclua5/clua/separator.clua index d2b0e74..5b5ab83 100644 --- a/iup/srclua5/clua/separator.clua +++ b/iup/srclua5/clua/separator.clua @@ -14,17 +14,18 @@ static const unsigned char B1[] = { 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, - 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, - 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, - 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, - 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, - 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, - 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, + 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, + 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, + 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, + 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, + 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "separator.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/spin.clua b/iup/srclua5/clua/spin.clua index 95ba6ed..5df74ee 100644 --- a/iup/srclua5/clua/spin.clua +++ b/iup/srclua5/clua/spin.clua @@ -13,19 +13,20 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x70, 0x69, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x69, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, - 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, - 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x53, 0x70, 0x69, - 0x6e, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, 0x6e, - 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, - 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, - 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, + 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x69, 0x6e, 0x5f, 0x63, 0x62, 0x20, + 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, + 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, + 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x70, 0x69, 0x6e, 0x28, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "spin.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/spinbox.clua b/iup/srclua5/clua/spinbox.clua index cfe86dd..13f7a02 100644 --- a/iup/srclua5/clua/spinbox.clua +++ b/iup/srclua5/clua/spinbox.clua @@ -13,20 +13,20 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x70, 0x69, 0x6e, 0x62, 0x6f, 0x78, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, - 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x3d, 0x20, 0x22, 0x69, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, - 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x70, 0x69, 0x6e, 0x5f, - 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x7d, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x20, 0x53, 0x70, 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x28, 0x61, 0x72, 0x67, 0x5b, - 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, - 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, - 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, - 0x0a, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, + 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, + 0x70, 0x69, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x7d, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, + 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x70, + 0x69, 0x6e, 0x62, 0x6f, 0x78, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, + 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, + 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "spinbox.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/split.clua b/iup/srclua5/clua/split.clua new file mode 100644 index 0000000..76bd186 --- /dev/null +++ b/iup/srclua5/clua/split.clua @@ -0,0 +1,32 @@ +{ +static const unsigned char B1[] = { + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x2d, + 0x2d, 0x20, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x0a, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, + 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, + 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x22, 0x2c, 0x0a, 0x20, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, + 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x49, 0x49, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, + 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, + 0x31, 0x5d, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x32, 0x5d, 0x29, 0x0a, 0x65, 0x6e, + 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, + 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, + 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, +}; + + if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "split.lua") == 0) lua_call(L, 0, 0); +} diff --git a/iup/srclua5/clua/submenu.clua b/iup/srclua5/clua/submenu.clua index 975e4d7..11b4b2d 100644 --- a/iup/srclua5/clua/submenu.clua +++ b/iup/srclua5/clua/submenu.clua @@ -13,25 +13,26 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, - 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, - 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x3d, 0x20, 0x22, 0x53, 0x69, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x2d, 0x2d, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x70, - 0x65, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x53, 0x49, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, + 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x2d, 0x2d, 0x20, 0x20, + 0x20, 0x20, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, + 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x0a, 0x2d, 0x2d, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x65, + 0x6e, 0x75, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6d, - 0x65, 0x6e, 0x75, 0x0a, 0x2d, 0x2d, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x63, 0x6c, - 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, - 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, - 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x0a, - 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, - 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x53, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, - 0x28, 0x61, 0x72, 0x67, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x5b, - 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, - 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, + 0x65, 0x6e, 0x75, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, + 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, + 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, + 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; diff --git a/iup/srclua5/clua/tabs.clua b/iup/srclua5/clua/tabs.clua index e22e024..114ce8b 100644 --- a/iup/srclua5/clua/tabs.clua +++ b/iup/srclua5/clua/tabs.clua @@ -13,35 +13,36 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x74, 0x61, 0x62, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x76, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x61, 0x62, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x63, - 0x62, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x69, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, - 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x54, 0x61, 0x62, - 0x73, 0x76, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6e, - 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x69, 0x6e, - 0x74, 0x20, 0x54, 0x61, 0x62, 0x73, 0x76, 0x28, 0x6c, 0x75, 0x61, 0x5f, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x20, 0x2a, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, - 0x65, 0x20, 0x2a, 0x2a, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x6c, - 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, - 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x49, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x68, 0x20, 0x3d, 0x20, 0x49, 0x75, 0x70, 0x54, - 0x61, 0x62, 0x73, 0x76, 0x28, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, - 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, 0x61, 0x74, 0x65, 0x28, - 0x4c, 0x2c, 0x20, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, - 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x72, 0x61, 0x77, 0x28, - 0x4c, 0x2c, 0x20, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x66, 0x72, 0x65, 0x65, 0x28, 0x68, 0x6c, - 0x69, 0x73, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, - 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x5d, 0x5d, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, - 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x54, 0x61, 0x62, - 0x73, 0x76, 0x28, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, - 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, - 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, - 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x76, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, + 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x61, 0x62, 0x63, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x69, 0x69, 0x22, 0x2c, 0x0a, 0x20, 0x20, + 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, + 0x22, 0x54, 0x61, 0x62, 0x73, 0x76, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5b, 0x5b, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, + 0x63, 0x20, 0x69, 0x6e, 0x74, 0x20, 0x54, 0x61, 0x62, 0x73, 0x76, 0x28, 0x6c, 0x75, 0x61, 0x5f, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x20, 0x2a, 0x4c, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x49, 0x68, + 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x2a, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x3d, 0x20, + 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x72, 0x61, 0x79, 0x28, 0x4c, 0x2c, 0x20, 0x31, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x49, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x20, 0x2a, 0x68, 0x20, 0x3d, 0x20, + 0x49, 0x75, 0x70, 0x54, 0x61, 0x62, 0x73, 0x76, 0x28, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x73, 0x74, + 0x61, 0x74, 0x65, 0x28, 0x4c, 0x2c, 0x20, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, + 0x6c, 0x75, 0x61, 0x5f, 0x70, 0x75, 0x73, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, + 0x72, 0x61, 0x77, 0x28, 0x4c, 0x2c, 0x20, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x66, 0x72, 0x65, + 0x65, 0x28, 0x68, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, + 0x72, 0x6e, 0x20, 0x31, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x5d, 0x5d, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, + 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, + 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x61, 0x62, 0x73, 0x76, 0x28, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, + 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, + 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, + 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "tabs.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/text.clua b/iup/srclua5/clua/text.clua index cd7f932..f23f7fa 100644 --- a/iup/srclua5/clua/text.clua +++ b/iup/srclua5/clua/text.clua @@ -13,24 +13,24 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, - 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, - 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, - 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x72, 0x65, 0x74, 0x5f, 0x63, - 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x62, - 0x79, 0x20, 0x6d, 0x61, 0x6e, 0x79, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, 0x63, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, - 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x54, - 0x65, 0x78, 0x74, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, - 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, - 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, - 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, + 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x72, + 0x65, 0x74, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x75, 0x73, + 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x6d, 0x61, 0x6e, 0x79, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, + 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x0a, + 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, + 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x65, 0x78, 0x74, 0x28, 0x29, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, + 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, + 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "text.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/timer.clua b/iup/srclua5/clua/timer.clua index c1cdbd2..6842674 100644 --- a/iup/srclua5/clua/timer.clua +++ b/iup/srclua5/clua/timer.clua @@ -14,18 +14,19 @@ static const unsigned char B1[] = { 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x22, 0x74, 0x69, 0x6d, 0x65, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x20, 0x20, 0x3d, 0x20, - 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, - 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, 0x0a, 0x20, 0x20, 0x7d, - 0x2c, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, - 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, - 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x72, 0x28, 0x29, 0x0a, 0x65, - 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, - 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, - 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, + 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x20, + 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x72, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, + 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, + 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, + 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "timer.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/toggle.clua b/iup/srclua5/clua/toggle.clua index 4e0cf74..e9dcd4b 100644 --- a/iup/srclua5/clua/toggle.clua +++ b/iup/srclua5/clua/toggle.clua @@ -13,20 +13,21 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, - 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, - 0x20, 0x22, 0x53, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, - 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x7d, 0x20, 0x0a, 0x0a, - 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, - 0x20, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x28, 0x61, 0x72, 0x67, 0x2e, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, - 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, - 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, - 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x29, 0x0a, + 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x53, 0x2d, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, + 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x0a, + 0x7d, 0x20, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, + 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, + 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x6f, 0x67, 0x67, 0x6c, + 0x65, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, + 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, + 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, + 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "toggle.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/tree.clua b/iup/srclua5/clua/tree.clua index beafb16..42d4736 100644 --- a/iup/srclua5/clua/tree.clua +++ b/iup/srclua5/clua/tree.clua @@ -13,24 +13,28 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x74, 0x72, 0x65, 0x65, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, - 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x75, 0x6c, - 0x74, 0x69, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, - 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, - 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, - 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x72, 0x65, - 0x65, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x61, 0x6e, 0x63, - 0x68, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x6c, 0x65, 0x61, 0x66, - 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, - 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, - 0x6e, 0x73, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x72, 0x65, 0x6d, - 0x6f, 0x76, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x73, 0x22, 0x2c, 0x20, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, + 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, + 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, + 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, + 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, + 0x6f, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, + 0x20, 0x74, 0x72, 0x65, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, + 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x75, 0x6e, 0x73, 0x65, 0x6c, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x22, + 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, + 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x72, 0x65, 0x65, 0x66, 0x75, 0x6e, 0x63, + 0x73, 0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x61, + 0x6e, 0x63, 0x68, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, + 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x63, 0x6c, 0x6f, 0x73, + 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x6c, 0x65, 0x61, 0x66, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x72, 0x65, + 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, 0x2c, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x66, 0x61, 0x6b, 0x65, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x72, 0x65, 0x65, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, @@ -42,117 +46,186 @@ static const unsigned char B1[] = { 0x20, 0x20, 0x20, 0x64, 0x72, 0x61, 0x67, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x6e, 0x6e, 0x6e, 0x6e, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x20, 0x20, 0x65, 0x78, 0x74, 0x72, 0x61, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x0a, - 0x7d, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, - 0x20, 0x69, 0x66, 0x20, 0x69, 0x75, 0x70, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x20, 0x3d, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x6e, - 0x61, 0x6d, 0x65, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, - 0x20, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, - 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, - 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, - 0x22, 0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x6e, 0x6f, 0x64, - 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, - 0x66, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, - 0x6e, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x53, 0x54, 0x41, 0x54, 0x45, 0x22, 0x2e, 0x2e, - 0x69, 0x64, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x29, 0x20, - 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x66, 0x6f, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x53, 0x65, 0x74, + 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x64, + 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, + 0x74, 0x74, 0x72, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x20, 0x69, 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, + 0x73, 0x28, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x61, 0x74, 0x74, 0x72, 0x2e, 0x2e, 0x69, 0x64, 0x5d, + 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, + 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, + 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x6e, 0x63, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x73, 0x41, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x2c, 0x20, 0x69, 0x6e, 0x69, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, + 0x69, 0x6e, 0x69, 0x20, 0x3d, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x70, 0x61, + 0x72, 0x65, 0x6e, 0x74, 0x22, 0x2e, 0x2e, 0x69, 0x6e, 0x69, 0x5d, 0x0a, 0x20, 0x20, 0x6c, 0x6f, + 0x63, 0x61, 0x6c, 0x20, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x69, 0x6e, 0x69, 0x20, 0x64, 0x6f, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x73, 0x65, + 0x72, 0x74, 0x28, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2c, 0x20, 0x31, 0x2c, 0x20, 0x69, 0x6e, 0x69, + 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x69, 0x20, 0x3d, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x22, 0x2e, 0x2e, 0x69, + 0x6e, 0x69, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x66, 0x6f, + 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x20, 0x23, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x20, + 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, + 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5b, 0x69, + 0x5d, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x44, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x74, + 0x73, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x69, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, + 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x69, 0x6e, 0x69, + 0x0a, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x22, 0x2e, 0x2e, 0x69, 0x6e, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x64, 0x20, 0x3d, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, + 0x64, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, + 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5b, 0x22, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0x2e, 0x2e, + 0x69, 0x64, 0x5d, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x42, 0x52, 0x41, 0x4e, 0x43, 0x48, 0x22, 0x20, + 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x64, 0x20, 0x3d, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x44, 0x65, 0x73, 0x63, 0x65, + 0x6e, 0x74, 0x73, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x28, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, + 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, + 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, + 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x48, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, + 0x65, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x20, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x6d, 0x75, + 0x73, 0x74, 0x20, 0x62, 0x65, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x20, 0x68, 0x61, 0x73, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x73, + 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, + 0x65, 0x65, 0x53, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, + 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x74, + 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x53, 0x54, + 0x41, 0x54, 0x45, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, + 0x73, 0x74, 0x61, 0x74, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, + 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, + 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, + 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, + 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, + 0x20, 0x22, 0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, + 0x6f, 0x64, 0x65, 0x2e, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, + 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x66, + 0x6f, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x54, 0x49, 0x54, 0x4c, 0x45, 0x46, 0x4f, 0x4e, 0x54, 0x22, 0x2e, 0x2e, 0x69, - 0x64, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x66, 0x6f, 0x6e, - 0x74, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x64, 0x65, - 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x53, 0x65, 0x74, - 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x22, 0x4d, 0x41, 0x52, 0x4b, 0x45, 0x44, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, - 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, - 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, - 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x49, 0x4d, 0x41, 0x47, 0x45, 0x22, 0x2e, 0x2e, 0x69, 0x64, - 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x29, 0x20, 0x65, 0x6e, - 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x54, - 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x48, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x49, - 0x4d, 0x41, 0x47, 0x45, 0x45, 0x58, 0x50, 0x41, 0x4e, 0x44, 0x45, 0x44, 0x22, 0x2e, 0x2e, 0x69, - 0x64, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x65, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, - 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x69, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, - 0x20, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x28, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, - 0x75, 0x73, 0x65, 0x72, 0x69, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, - 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, - 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, - 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x20, - 0x3d, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, - 0x72, 0x6e, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, - 0x6f, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x23, 0x74, 0x0a, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, - 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x20, 0x3e, 0x3d, 0x20, 0x30, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x74, - 0x5b, 0x63, 0x6f, 0x6e, 0x74, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, - 0x70, 0x65, 0x28, 0x6e, 0x6f, 0x64, 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, - 0x66, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, - 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x53, - 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, 0x44, 0x42, 0x52, 0x41, 0x4e, 0x43, 0x48, 0x22, 0x2e, - 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, - 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x54, 0x72, - 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, - 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, - 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x54, 0x72, 0x65, 0x65, - 0x53, 0x65, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, - 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x64, - 0x65, 0x2e, 0x6c, 0x65, 0x61, 0x66, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, - 0x44, 0x4c, 0x45, 0x41, 0x46, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, - 0x2e, 0x6c, 0x65, 0x61, 0x66, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x6f, 0x64, - 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, - 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, 0x44, - 0x4c, 0x45, 0x41, 0x46, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x6e, 0x6f, 0x64, 0x65, 0x29, + 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x66, 0x6f, + 0x6e, 0x74, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, + 0x64, 0x65, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x4d, 0x41, 0x52, 0x4b, 0x45, 0x44, 0x22, + 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6d, 0x61, 0x72, 0x6b, + 0x65, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, + 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, + 0x20, 0x22, 0x49, 0x4d, 0x41, 0x47, 0x45, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, + 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, + 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, + 0x22, 0x49, 0x4d, 0x41, 0x47, 0x45, 0x45, 0x58, 0x50, 0x41, 0x4e, 0x44, 0x45, 0x44, 0x22, 0x2e, + 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, + 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x69, 0x64, 0x20, + 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, + 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x69, + 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x69, 0x64, 0x29, + 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, + 0x64, 0x65, 0x73, 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, + 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x20, 0x3d, 0x3d, 0x20, + 0x6e, 0x69, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, + 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x6f, 0x6e, 0x74, + 0x20, 0x3d, 0x20, 0x23, 0x74, 0x0a, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x63, 0x6f, + 0x6e, 0x74, 0x20, 0x3e, 0x3d, 0x20, 0x30, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, + 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x74, 0x5b, 0x63, + 0x6f, 0x6e, 0x74, 0x5d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x28, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x22, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, + 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, + 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, 0x44, 0x42, 0x52, 0x41, 0x4e, + 0x43, 0x48, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x62, + 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, + 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, + 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, + 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, + 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, + 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2e, + 0x6c, 0x65, 0x61, 0x66, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, + 0x41, 0x44, 0x44, 0x4c, 0x45, 0x41, 0x46, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, + 0x6f, 0x64, 0x65, 0x2e, 0x6c, 0x65, 0x61, 0x66, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, + 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x69, 0x64, 0x2b, 0x31, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, - 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x63, 0x6f, - 0x6e, 0x74, 0x20, 0x2d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, - 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x54, 0x72, 0x65, 0x65, - 0x53, 0x65, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, - 0x20, 0x74, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x6f, - 0x74, 0x20, 0x69, 0x64, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, - 0x64, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x6f, 0x6f, 0x74, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, - 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x54, 0x49, 0x54, - 0x4c, 0x45, 0x30, 0x22, 0x2c, 0x20, 0x74, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, - 0x6d, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x54, 0x72, 0x65, 0x65, - 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, - 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x30, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, - 0x64, 0x0a, 0x20, 0x20, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x52, 0x65, 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x69, - 0x64, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, - 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x54, 0x72, 0x65, 0x65, 0x28, 0x29, 0x0a, - 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, - 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, - 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, - 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x6e, 0x6f, + 0x64, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x22, 0x41, 0x44, 0x44, 0x4c, 0x45, 0x41, + 0x46, 0x22, 0x2e, 0x2e, 0x69, 0x64, 0x2c, 0x20, 0x74, 0x6e, 0x6f, 0x64, 0x65, 0x29, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x63, 0x6f, 0x6e, 0x74, + 0x20, 0x2d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, + 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, + 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x69, 0x64, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, + 0x6e, 0x6f, 0x74, 0x20, 0x69, 0x64, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x20, 0x2d, 0x2d, 0x20, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x6f, 0x6f, 0x74, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x2e, 0x62, 0x72, 0x61, 0x6e, 0x63, 0x68, 0x6e, + 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, + 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x2c, 0x20, 0x22, 0x54, 0x49, 0x54, 0x4c, 0x45, 0x30, 0x22, 0x2c, 0x20, 0x74, 0x2e, 0x62, 0x72, + 0x61, 0x6e, 0x63, 0x68, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, 0x4e, 0x6f, 0x64, + 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, + 0x74, 0x2c, 0x20, 0x30, 0x29, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x65, + 0x63, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, 0x20, 0x69, 0x64, 0x29, + 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x64, 0x20, 0x3d, 0x3d, 0x20, 0x30, 0x29, 0x20, + 0x74, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x74, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x74, 0x2c, + 0x20, 0x30, 0x29, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, + 0x62, 0x61, 0x63, 0x6b, 0x77, 0x61, 0x72, 0x64, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x53, + 0x65, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x54, 0x72, + 0x65, 0x65, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "tree.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/user.clua b/iup/srclua5/clua/user.clua index 3ffcab7..3629189 100644 --- a/iup/srclua5/clua/user.clua +++ b/iup/srclua5/clua/user.clua @@ -13,17 +13,18 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x75, 0x73, 0x65, 0x72, 0x22, 0x2c, 0x0a, 0x20, 0x20, - 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, - 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, - 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, - 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, - 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x55, 0x73, 0x65, 0x72, 0x28, 0x29, 0x0a, 0x65, 0x6e, - 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, - 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, - 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, + 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, + 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x3d, 0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, + 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, 0x70, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, + 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, + 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, + 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "user.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/val.clua b/iup/srclua5/clua/val.clua index c9109e5..4e896e2 100644 --- a/iup/srclua5/clua/val.clua +++ b/iup/srclua5/clua/val.clua @@ -13,23 +13,23 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x76, 0x61, 0x6c, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, 0x61, 0x72, - 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, 0x2c, 0x0a, 0x20, 0x20, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x73, 0x22, 0x2c, 0x0a, - 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x63, 0x62, 0x20, - 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, - 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x6c, - 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x7d, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, - 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x56, 0x61, 0x6c, 0x28, 0x61, 0x72, 0x67, - 0x5b, 0x31, 0x5d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, - 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, - 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, - 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x29, 0x0a, + 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x57, 0x49, 0x44, 0x47, 0x45, 0x54, + 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, + 0x53, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, + 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x62, 0x20, 0x3d, + 0x20, 0x22, 0x64, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x5f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x20, 0x3d, 0x20, 0x22, 0x64, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, + 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x56, 0x61, 0x6c, 0x28, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5b, 0x31, 0x5d, 0x29, + 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, + 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, + 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "val.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/clua/vbox.clua b/iup/srclua5/clua/vbox.clua index 4f93a86..fc50b71 100644 --- a/iup/srclua5/clua/vbox.clua +++ b/iup/srclua5/clua/vbox.clua @@ -13,19 +13,20 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x42, 0x4f, 0x58, 0x2c, 0x0a, 0x20, 0x20, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, - 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x20, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, - 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x20, 0x56, 0x62, 0x6f, 0x78, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, - 0x69, 0x75, 0x70, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x58, 0x2c, + 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, + 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x20, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, + 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x6c, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x75, + 0x70, 0x2e, 0x56, 0x62, 0x6f, 0x78, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, + 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; diff --git a/iup/srclua5/clua/zbox.clua b/iup/srclua5/clua/zbox.clua index d47e433..5a6a309 100644 --- a/iup/srclua5/clua/zbox.clua +++ b/iup/srclua5/clua/zbox.clua @@ -13,34 +13,35 @@ static const unsigned char B1[] = { 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x6e, 0x69, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x22, 0x7a, 0x62, 0x6f, 0x78, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x42, 0x4f, 0x58, 0x2c, 0x0a, 0x20, 0x20, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, 0x22, 0x2c, 0x0a, 0x20, - 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x0a, 0x7d, - 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, - 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x20, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, - 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, - 0x73, 0x65, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, - 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, - 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, - 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x0a, 0x20, 0x20, - 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x73, 0x65, - 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x69, 0x5d, 0x29, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x69, 0x2b, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, - 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x2c, 0x20, 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, - 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, - 0x61, 0x72, 0x67, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5a, - 0x62, 0x6f, 0x78, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x75, 0x70, 0x52, 0x65, - 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x28, 0x63, 0x74, 0x72, - 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x53, 0x65, 0x74, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, - 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x29, 0x0a, + 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x42, 0x4f, 0x58, 0x2c, + 0x0a, 0x20, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x22, 0x2d, + 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x3d, 0x20, + 0x7b, 0x7d, 0x0a, 0x7d, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, + 0x74, 0x72, 0x6c, 0x2e, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x20, 0x28, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, + 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x28, 0x65, 0x6c, + 0x65, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x75, 0x70, 0x2e, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, + 0x28, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x2c, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x29, 0x0a, 0x65, + 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, + 0x6c, 0x2e, 0x53, 0x65, 0x74, 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, + 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x62, 0x6a, + 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, + 0x69, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, + 0x6f, 0x62, 0x6a, 0x5b, 0x69, 0x5d, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x4e, 0x61, 0x6d, + 0x65, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x69, 0x5d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x69, 0x20, 0x3d, 0x20, 0x69, 0x2b, 0x31, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, + 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x66, 0x75, 0x6e, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, + 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x2c, 0x20, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x63, 0x74, 0x72, 0x6c, 0x2e, 0x53, 0x65, 0x74, + 0x43, 0x68, 0x69, 0x6c, 0x64, 0x72, 0x65, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x28, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, + 0x75, 0x70, 0x2e, 0x5a, 0x62, 0x6f, 0x78, 0x28, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, + 0x75, 0x70, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x57, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x29, 0x0a, 0x69, 0x75, 0x70, 0x2e, 0x53, 0x65, 0x74, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x28, 0x63, 0x74, 0x72, 0x6c, 0x2c, 0x20, 0x22, 0x69, 0x75, 0x70, 0x20, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x29, 0x0a, }; if (luaL_loadbuffer(L, (const char *)B1, sizeof(B1), "zbox.lua") == 0) lua_call(L, 0, 0); diff --git a/iup/srclua5/colorbar.lua b/iup/srclua5/colorbar.lua index 524d5f3..7cc07db 100755 --- a/iup/srclua5/colorbar.lua +++ b/iup/srclua5/colorbar.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "colorbar", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = { select_cb = "nn", @@ -15,12 +15,12 @@ local ctrl = { include = "iupcontrols.h", } -PRIMARY = -1 -SECONDARY = -2 +iup.PRIMARY = -1 +iup.SECONDARY = -2 -function ctrl.createElement(class, arg) - return Colorbar(arg.action) +function ctrl.createElement(class, param) + return iup.Colorbar(param.action) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/colorbrowser.lua b/iup/srclua5/colorbrowser.lua index 16ac58f..496ce21 100755 --- a/iup/srclua5/colorbrowser.lua +++ b/iup/srclua5/colorbrowser.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "colorbrowser", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = { drag_cb = "ccc", @@ -13,9 +13,9 @@ local ctrl = { include = "iupcontrols.h", } -function ctrl.createElement(class, arg) - return ColorBrowser(arg.action) +function ctrl.createElement(class, param) + return iup.ColorBrowser(param.action) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/colordlg.lua b/iup/srclua5/colordlg.lua index 6eea53b..d6a71a4 100755 --- a/iup/srclua5/colordlg.lua +++ b/iup/srclua5/colordlg.lua @@ -3,24 +3,24 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "colordlg", - parent = WIDGET, + parent = iup.WIDGET, creation = "", funcname = "ColorDlg", callback = {} } function ctrl.popup(handle, x, y) - Popup(handle,x,y) + iup.Popup(handle,x,y) end function ctrl.destroy(handle) - return Destroy(handle) + return iup.Destroy(handle) end -function ctrl.createElement(class, arg) - return ColorDlg() +function ctrl.createElement(class, param) + return iup.ColorDlg() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/config.mak b/iup/srclua5/config.mak index 7979f0e..921aa29 100755 --- a/iup/srclua5/config.mak +++ b/iup/srclua5/config.mak @@ -17,7 +17,7 @@ CTRLUA = button.lua canvas.lua dialog.lua colordlg.lua clipboard.lua \ item.lua image.lua imagergb.lua imagergba.lua label.lua \ menu.lua multiline.lua list.lua separator.lua user.lua \ submenu.lua text.lua toggle.lua vbox.lua zbox.lua timer.lua \ - sbox.lua spin.lua spinbox.lua cbox.lua messagedlg.lua \ + sbox.lua split.lua spin.lua spinbox.lua cbox.lua messagedlg.lua \ radio.lua val.lua tabs.lua fontdlg.lua tree.lua progressbar.lua GC := $(addsuffix .c, $(basename $(CTRLUA))) diff --git a/iup/srclua5/constants.lua b/iup/srclua5/constants.lua index 9a72f6a..2a1e76f 100755 --- a/iup/srclua5/constants.lua +++ b/iup/srclua5/constants.lua @@ -3,70 +3,70 @@ ---------------------------------------------------------------------------- -- Common return values ---------------------------------------------------------------------------- -ERROR = 1 -NOERROR = 0 -OPENED = -1 -INVALID = -1 +iup.ERROR = 1 +iup.NOERROR = 0 +iup.OPENED = -1 +iup.INVALID = -1 ---------------------------------------------------------------------------- -- Callback return values ---------------------------------------------------------------------------- -IGNORE = -1 -DEFAULT = -2 -CLOSE = -3 -CONTINUE = -4 +iup.IGNORE = -1 +iup.DEFAULT = -2 +iup.CLOSE = -3 +iup.CONTINUE = -4 ---------------------------------------------------------------------------- -- IupPopup e IupShowXY ---------------------------------------------------------------------------- -CENTER = 65535 -LEFT = 65534 -RIGHT = 65533 -MOUSEPOS = 65532 -CURRENT = 65531 -CENTERPARENT = 65530 -TOP = LEFT -BOTTOM = RIGHT +iup.CENTER = 65535 +iup.LEFT = 65534 +iup.RIGHT = 65533 +iup.MOUSEPOS = 65532 +iup.CURRENT = 65531 +iup.CENTERPARENT = 65530 +iup.TOP = LEFT +iup.BOTTOM = RIGHT ---------------------------------------------------------------------------- -- Scrollbar ---------------------------------------------------------------------------- -SBUP = 0 -SBDN = 1 -SBPGUP = 2 -SBPGDN = 3 -SBPOSV = 4 -SBDRAGV = 5 -SBLEFT = 6 -SBRIGHT = 7 -SBPGLEFT = 8 -SBPGRIGHT = 9 -SBPOSH = 10 -SBDRAGH = 11 +iup.SBUP = 0 +iup.SBDN = 1 +iup.SBPGUP = 2 +iup.SBPGDN = 3 +iup.SBPOSV = 4 +iup.SBDRAGV = 5 +iup.SBLEFT = 6 +iup.SBRIGHT = 7 +iup.SBPGLEFT = 8 +iup.SBPGRIGHT = 9 +iup.SBPOSH = 10 +iup.SBDRAGH = 11 ---------------------------------------------------------------------------- -- SHOW_CB ---------------------------------------------------------------------------- -SHOW = 0 -RESTORE = 1 -MINIMIZE = 2 -MAXIMIZE = 3 -HIDE = 4 +iup.SHOW = 0 +iup.RESTORE = 1 +iup.MINIMIZE = 2 +iup.MAXIMIZE = 3 +iup.HIDE = 4 ---------------------------------------------------------------------------- -- BUTTON_CB ---------------------------------------------------------------------------- -BUTTON1 = string.byte('1') -BUTTON2 = string.byte('2') -BUTTON3 = string.byte('3') -BUTTON4 = string.byte('4') -BUTTON5 = string.byte('5') +iup.BUTTON1 = string.byte('1') +iup.BUTTON2 = string.byte('2') +iup.BUTTON3 = string.byte('3') +iup.BUTTON4 = string.byte('4') +iup.BUTTON5 = string.byte('5') ---------------------------------------------------------------------------- -- Pre-Defined Masks ---------------------------------------------------------------------------- -MASK_FLOAT = "[+/-]?(/d+/.?/d*|/./d+)" -MASK_UFLOAT = "(/d+/.?/d*|/./d+)" -MASK_EFLOAT = "[+/-]?(/d+/.?/d*|/./d+)([eE][+/-]?/d+)?" -MASK_INT = "[+/-]?/d+" -MASK_UINT = "/d+" +iup.MASK_FLOAT = "[+/-]?(/d+/.?/d*|/./d+)" +iup.MASK_UFLOAT = "(/d+/.?/d*|/./d+)" +iup.MASK_EFLOAT = "[+/-]?(/d+/.?/d*|/./d+)([eE][+/-]?/d+)?" +iup.MASK_INT = "[+/-]?/d+" +iup.MASK_UINT = "/d+" diff --git a/iup/srclua5/ctrl_template.lua b/iup/srclua5/ctrl_template.lua index f314ac6..d7f509e 100755 --- a/iup/srclua5/ctrl_template.lua +++ b/iup/srclua5/ctrl_template.lua @@ -6,7 +6,7 @@ local ctrl = { nick = "mycontrol", -- name of the control, used in the control creation: iup.mycontrol{} -- also used for the generated C module - parent = WIDGET, -- used to define a few methods used fro creation and set attribute + parent = iup.WIDGET, -- used to define a few methods used fro creation and set attribute creation = "nn", -- the creation parameters in Lua -- "n" = int -- "d" = double @@ -81,14 +81,14 @@ int luaopen_iupluamycontrol51(lua_State* L) } -- must be defined so the WIDGET constructor can call it -function ctrl.createElement(class, arg) - return myControl() +function ctrl.createElement(class, param) + return iup.myControl() end -- here you can add some custom methods to the class function ctrl.popup(handle, x, y) - Popup(handle,x,y) + iup.Popup(handle,x,y) end -iupRegisterWidget(ctrl) -- will make iup.mycontrol available -iupSetClass(ctrl, "iup widget") -- register the class in the registry +iup.RegisterWidget(ctrl) -- will make iup.mycontrol available +iup.SetClass(ctrl, "iup widget") -- register the class in the registry diff --git a/iup/srclua5/dial.lua b/iup/srclua5/dial.lua index 0384b43..29f3fa1 100755 --- a/iup/srclua5/dial.lua +++ b/iup/srclua5/dial.lua @@ -3,8 +3,8 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "dial", - parent = WIDGET, - creation = "s", + parent = iup.WIDGET, + creation = "S", callback = { mousemove_cb = "d", -- already registered by the val, but has a name conflict -- button_press_cb = "d", -- already registered by the val @@ -13,9 +13,9 @@ local ctrl = { include = "iupcontrols.h", } -function ctrl.createElement(class, arg) - return Dial(arg[1]) +function ctrl.createElement(class, param) + return iup.Dial(param[1]) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/dialog.lua b/iup/srclua5/dialog.lua index a996ad7..ac9b786 100755 --- a/iup/srclua5/dialog.lua +++ b/iup/srclua5/dialog.lua @@ -3,11 +3,12 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "dialog", - parent = WIDGET, + parent = iup.WIDGET, creation = "I", callback = { map_cb = "", unmap_cb = "", + destroy_cb = "", close_cb = "", show_cb = "n", move_cb = "nn", @@ -16,21 +17,21 @@ local ctrl = { } } -function ctrl.createElement(class, arg) - return Dialog(arg[1]) +function ctrl.createElement(class, param) + return iup.Dialog(param[1]) end function ctrl.popup(handle, x, y) - Popup(handle,x,y) + iup.Popup(handle,x,y) end function ctrl.showxy(handle, x, y) - return ShowXY(handle, x, y) + return iup.ShowXY(handle, x, y) end function ctrl.destroy(handle) - return Destroy(handle) + return iup.Destroy(handle) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/filedlg.lua b/iup/srclua5/filedlg.lua index 71c4bb4..c0e6db5 100755 --- a/iup/srclua5/filedlg.lua +++ b/iup/srclua5/filedlg.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "filedlg", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = { file_cb = "ss", @@ -12,17 +12,17 @@ local ctrl = { } function ctrl.popup(handle, x, y) - Popup(handle,x,y) + iup.Popup(handle,x,y) end function ctrl.destroy(handle) - return Destroy(handle) + return iup.Destroy(handle) end -function ctrl.createElement(class, arg) - return FileDlg() +function ctrl.createElement(class, param) + return iup.FileDlg() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/fill.lua b/iup/srclua5/fill.lua index 4bf7803..62c1bf0 100755 --- a/iup/srclua5/fill.lua +++ b/iup/srclua5/fill.lua @@ -3,14 +3,14 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "fill", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = {} } -function ctrl.createElement(class, arg) - return Fill() +function ctrl.createElement(class, param) + return iup.Fill() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/fontdlg.lua b/iup/srclua5/fontdlg.lua index 2c88d26..45bc02f 100755 --- a/iup/srclua5/fontdlg.lua +++ b/iup/srclua5/fontdlg.lua @@ -3,24 +3,24 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "fontdlg", - parent = WIDGET, + parent = iup.WIDGET, creation = "", funcname = "FontDlg", callback = {} } function ctrl.popup(handle, x, y) - Popup(handle,x,y) + iup.Popup(handle,x,y) end function ctrl.destroy(handle) - return Destroy(handle) + return iup.Destroy(handle) end -function ctrl.createElement(class, arg) - return FontDlg() +function ctrl.createElement(class, param) + return iup.FontDlg() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/frame.lua b/iup/srclua5/frame.lua index 7a1c1cc..96bfbb1 100755 --- a/iup/srclua5/frame.lua +++ b/iup/srclua5/frame.lua @@ -3,14 +3,14 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "frame", - parent = WIDGET, - creation = "i", + parent = iup.WIDGET, + creation = "I", callback = {} } -function ctrl.createElement(class, arg) - return Frame(arg[1]) +function ctrl.createElement(class, param) + return iup.Frame(param[1]) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/gauge.lua b/iup/srclua5/gauge.lua index 45a72b3..e25756c 100755 --- a/iup/srclua5/gauge.lua +++ b/iup/srclua5/gauge.lua @@ -3,15 +3,15 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "gauge", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = {}, include = "iupcontrols.h", } -function ctrl.createElement(class, arg) - return Gauge(arg.action) +function ctrl.createElement(class, param) + return iup.Gauge(param.action) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/generator.lua b/iup/srclua5/generator.lua index 3732364..efbab5a 100755 --- a/iup/srclua5/generator.lua +++ b/iup/srclua5/generator.lua @@ -1,17 +1,18 @@ function dofile(f) - pcall(loadfile(f)) + pcall(loadfile(f)) end -- compatibility functions (with iuplua.lua) -function iupSetClass(ctrl, name) +iup = {} +function iup.SetClass(ctrl, name) element = ctrl end -- dummy functions -iupluaNewClass = function() end -iupSetMethod = iupluaNewClass -iupRegisterWidget = iupluaNewClass +iupDoNothing = function() end +iupSetMethod = iupDoNothing +iup.RegisterWidget = iupDoNothing c_types = { n = "int", diff --git a/iup/srclua5/glcanvas.lua b/iup/srclua5/glcanvas.lua index 782e974..6a3fe75 100755 --- a/iup/srclua5/glcanvas.lua +++ b/iup/srclua5/glcanvas.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "glcanvas", - parent = WIDGET, + parent = iup.WIDGET, creation = "-", funcname = "GLCanvas", include = "iupgl.h", @@ -17,9 +17,8 @@ int iupgllua_open(lua_State * L) if (iuplua_opencall_internal(L)) IupGLCanvasOpen(); - iuplua_changeEnv(L); + iuplua_get_env(L); iupglcanvaslua_open(L); - iuplua_returnEnv(L); return 0; } @@ -38,9 +37,9 @@ int luaopen_iupluagl51(lua_State* L) ]] } -function ctrl.createElement(class, arg) - return GLCanvas() +function ctrl.createElement(class, param) + return iup.GLCanvas() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/hbox.lua b/iup/srclua5/hbox.lua index 38213bb..5a1b844 100755 --- a/iup/srclua5/hbox.lua +++ b/iup/srclua5/hbox.lua @@ -3,18 +3,18 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "hbox", - parent = BOX, + parent = iup.BOX, creation = "-", callback = {} } function ctrl.append(handle, elem) - Append(handle, elem) + iup.Append(handle, elem) end -function ctrl.createElement(class, arg) - return Hbox() +function ctrl.createElement(class, param) + return iup.Hbox() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/il.h b/iup/srclua5/il.h index 81a0140..5ef6b86 100755 --- a/iup/srclua5/il.h +++ b/iup/srclua5/il.h @@ -36,6 +36,7 @@ int iupcboxlua_open (lua_State * L); int iupspinboxlua_open (lua_State * L); int iupspinlua_open (lua_State * L); int iupsboxlua_open (lua_State * L); +int iupsplitlua_open (lua_State * L); int iupgclua_open (lua_State * L); int iupvallua_open (lua_State * L); int iuptabslua_open (lua_State * L); @@ -53,20 +54,15 @@ int iupclipboardlua_open(lua_State * L); void iupgetparamlua_open (lua_State * L); int iupluaScanf(lua_State *L); -int iupluaapi_open(lua_State * L); +void iupluaapi_open(lua_State * L); /* Registration */ -/** Sets the global index as the table "iup". - * Used to simplify the registration of functions and constants in the "iup" namespace. +/** Gets the global enviroment "iup". + Used by secondary iuplua modules. */ -void iuplua_changeEnv(lua_State *L); - -/** Resets the global index. - * Must match a iuplua_changeEnv call. - */ -void iuplua_returnEnv(lua_State *L); +void iuplua_get_env(lua_State *L); /** Returns true if IupOpen was called from inside the IupLua initialization function (iuplua_open). * All the other C intialization functions are called from the respective IupLua initialization functions. diff --git a/iup/srclua5/il_dial.c b/iup/srclua5/il_dial.c index 35532cd..242e838 100755 --- a/iup/srclua5/il_dial.c +++ b/iup/srclua5/il_dial.c @@ -22,7 +22,7 @@ static int dial_mousemove_cb(Ihandle *self, double p0) static int Dial(lua_State *L) { - Ihandle *ih = IupDial((char *) luaL_checkstring(L, 1)); + Ihandle *ih = IupDial((char *) luaL_optstring(L, 1, NULL)); iuplua_plugstate(L, ih); iuplua_pushihandle_raw(L, ih); return 1; diff --git a/iup/srclua5/il_dialog.c b/iup/srclua5/il_dialog.c index cc130c9..d3e8c29 100755 --- a/iup/srclua5/il_dialog.c +++ b/iup/srclua5/il_dialog.c @@ -12,24 +12,18 @@ #include "il.h" -static int dialog_move_cb(Ihandle *self, int p0, int p1) -{ - lua_State *L = iuplua_call_start(self, "move_cb"); - lua_pushnumber(L, p0); - lua_pushnumber(L, p1); - return iuplua_call(L, 2); -} - static int dialog_map_cb(Ihandle *self) { lua_State *L = iuplua_call_start(self, "map_cb"); return iuplua_call(L, 0); } -static int dialog_unmap_cb(Ihandle *self) +static int dialog_move_cb(Ihandle *self, int p0, int p1) { - lua_State *L = iuplua_call_start(self, "unmap_cb"); - return iuplua_call(L, 0); + lua_State *L = iuplua_call_start(self, "move_cb"); + lua_pushnumber(L, p0); + lua_pushnumber(L, p1); + return iuplua_call(L, 2); } static int dialog_dropfiles_cb(Ihandle *self, char * p0, int p1, int p2, int p3) @@ -42,6 +36,12 @@ static int dialog_dropfiles_cb(Ihandle *self, char * p0, int p1, int p2, int p3) return iuplua_call(L, 4); } +static int dialog_unmap_cb(Ihandle *self) +{ + lua_State *L = iuplua_call_start(self, "unmap_cb"); + return iuplua_call(L, 0); +} + static int dialog_show_cb(Ihandle *self, int p0) { lua_State *L = iuplua_call_start(self, "show_cb"); @@ -58,6 +58,12 @@ static int dialog_trayclick_cb(Ihandle *self, int p0, int p1, int p2) return iuplua_call(L, 3); } +static int dialog_destroy_cb(Ihandle *self) +{ + lua_State *L = iuplua_call_start(self, "destroy_cb"); + return iuplua_call(L, 0); +} + static int dialog_close_cb(Ihandle *self) { lua_State *L = iuplua_call_start(self, "close_cb"); @@ -76,12 +82,13 @@ int iupdialoglua_open(lua_State * L) { iuplua_register(L, Dialog, "Dialog"); - iuplua_register_cb(L, "MOVE_CB", (lua_CFunction)dialog_move_cb, NULL); iuplua_register_cb(L, "MAP_CB", (lua_CFunction)dialog_map_cb, NULL); - iuplua_register_cb(L, "UNMAP_CB", (lua_CFunction)dialog_unmap_cb, NULL); + iuplua_register_cb(L, "MOVE_CB", (lua_CFunction)dialog_move_cb, NULL); iuplua_register_cb(L, "DROPFILES_CB", (lua_CFunction)dialog_dropfiles_cb, NULL); + iuplua_register_cb(L, "UNMAP_CB", (lua_CFunction)dialog_unmap_cb, NULL); iuplua_register_cb(L, "SHOW_CB", (lua_CFunction)dialog_show_cb, NULL); iuplua_register_cb(L, "TRAYCLICK_CB", (lua_CFunction)dialog_trayclick_cb, NULL); + iuplua_register_cb(L, "DESTROY_CB", (lua_CFunction)dialog_destroy_cb, NULL); iuplua_register_cb(L, "CLOSE_CB", (lua_CFunction)dialog_close_cb, NULL); #include "clua/dialog.clua" diff --git a/iup/srclua5/il_frame.c b/iup/srclua5/il_frame.c index 7bf41db..cfc5314 100755 --- a/iup/srclua5/il_frame.c +++ b/iup/srclua5/il_frame.c @@ -14,7 +14,7 @@ static int Frame(lua_State *L) { - Ihandle *ih = IupFrame(iuplua_checkihandle(L, 1)); + Ihandle *ih = IupFrame(iuplua_checkihandleornil(L, 1)); iuplua_plugstate(L, ih); iuplua_pushihandle_raw(L, ih); return 1; diff --git a/iup/srclua5/il_getcolor.c b/iup/srclua5/il_getcolor.c index d468d38..4d6cf71 100755 --- a/iup/srclua5/il_getcolor.c +++ b/iup/srclua5/il_getcolor.c @@ -37,10 +37,10 @@ static int GetColor(lua_State *L) return 1; } } + int iupgclua_open(lua_State * L) { - lua_pushcfunction(L, GetColor); - lua_setglobal(L, "GetColor"); + iuplua_register(L, GetColor, "GetColor"); return 0; } diff --git a/iup/srclua5/il_getparam.c b/iup/srclua5/il_getparam.c index c7f4936..72c4303 100755 --- a/iup/srclua5/il_getparam.c +++ b/iup/srclua5/il_getparam.c @@ -94,6 +94,8 @@ static int GetParam(lua_State *L) param_data[i] = malloc(sizeof(float)); *(float*)(param_data[i]) = (float)luaL_checknumber(L, lua_param_start); lua_param_start++; break; + case 'f': + case 'c': case 's': case 'm': s = luaL_checkstring(L, lua_param_start); lua_param_start++; @@ -136,6 +138,8 @@ static int GetParam(lua_State *L) case 'r': lua_pushnumber(L, *(float*)(param_data[i])); break; + case 'f': + case 'c': case 's': case 'm': lua_pushstring(L, (char*)(param_data[i])); diff --git a/iup/srclua5/il_glcanvas.c b/iup/srclua5/il_glcanvas.c index 2100dd3..27f7277 100755 --- a/iup/srclua5/il_glcanvas.c +++ b/iup/srclua5/il_glcanvas.c @@ -49,9 +49,8 @@ int iupgllua_open(lua_State * L) if (iuplua_opencall_internal(L)) IupGLCanvasOpen(); - iuplua_changeEnv(L); + iuplua_get_env(L); iupglcanvaslua_open(L); - iuplua_returnEnv(L); return 0; } diff --git a/iup/srclua5/il_olecontrol.c b/iup/srclua5/il_olecontrol.c index eeeae21..0878e96 100755 --- a/iup/srclua5/il_olecontrol.c +++ b/iup/srclua5/il_olecontrol.c @@ -36,9 +36,8 @@ int iupolelua_open(lua_State* L) if (iuplua_opencall_internal(L)) IupOleControlOpen(); - iuplua_changeEnv(L); + iuplua_get_env(L); iupolecontrollua_open(L); - iuplua_returnEnv(L); return 0; } diff --git a/iup/srclua5/il_radio.c b/iup/srclua5/il_radio.c index c1b0fb4..3eaf250 100755 --- a/iup/srclua5/il_radio.c +++ b/iup/srclua5/il_radio.c @@ -14,7 +14,7 @@ static int Radio(lua_State *L) { - Ihandle *ih = IupRadio(iuplua_checkihandle(L, 1)); + Ihandle *ih = IupRadio(iuplua_checkihandleornil(L, 1)); iuplua_plugstate(L, ih); iuplua_pushihandle_raw(L, ih); return 1; diff --git a/iup/srclua5/il_sbox.c b/iup/srclua5/il_sbox.c index a9b196e..a617ecb 100755 --- a/iup/srclua5/il_sbox.c +++ b/iup/srclua5/il_sbox.c @@ -14,7 +14,7 @@ static int Sbox(lua_State *L) { - Ihandle *ih = IupSbox(iuplua_checkihandle(L, 1)); + Ihandle *ih = IupSbox(iuplua_checkihandleornil(L, 1)); iuplua_plugstate(L, ih); iuplua_pushihandle_raw(L, ih); return 1; diff --git a/iup/srclua5/il_split.c b/iup/srclua5/il_split.c new file mode 100644 index 0000000..416cc6f --- /dev/null +++ b/iup/srclua5/il_split.c @@ -0,0 +1,31 @@ +/****************************************************************************** + * Automatically generated file (iuplua5). Please don't change anything. * + *****************************************************************************/ + +#include <stdlib.h> + +#include <lua.h> +#include <lauxlib.h> + +#include "iup.h" +#include "iuplua.h" +#include "il.h" + + +static int Split(lua_State *L) +{ + Ihandle *ih = IupSplit(iuplua_checkihandleornil(L, 1), iuplua_checkihandleornil(L, 2)); + iuplua_plugstate(L, ih); + iuplua_pushihandle_raw(L, ih); + return 1; +} + +int iupsplitlua_open(lua_State * L) +{ + iuplua_register(L, Split, "Split"); + +#include "clua/split.clua" + + return 0; +} + diff --git a/iup/srclua5/il_submenu.c b/iup/srclua5/il_submenu.c index 81fd741..3465b3e 100755 --- a/iup/srclua5/il_submenu.c +++ b/iup/srclua5/il_submenu.c @@ -14,7 +14,7 @@ static int Submenu(lua_State *L) { - Ihandle *ih = IupSubmenu((char *) luaL_optstring(L, 1, NULL), iuplua_checkihandle(L, 2)); + Ihandle *ih = IupSubmenu((char *) luaL_optstring(L, 1, NULL), iuplua_checkihandleornil(L, 2)); iuplua_plugstate(L, ih); iuplua_pushihandle_raw(L, ih); return 1; diff --git a/iup/srclua5/il_tree.c b/iup/srclua5/il_tree.c index 16168d3..4ddc1a4 100755 --- a/iup/srclua5/il_tree.c +++ b/iup/srclua5/il_tree.c @@ -45,17 +45,17 @@ static int tree_rename_cb(Ihandle *self, int p0, char * p1) return iuplua_call(L, 2); } -static int tree_renamenode_cb(Ihandle *self, int p0, char * p1) +static int tree_multiunselection_cb(Ihandle *self, int p0, int p1) { - lua_State *L = iuplua_call_start(self, "renamenode_cb"); + lua_State *L = iuplua_call_start(self, "multiunselection_cb"); lua_pushnumber(L, p0); - lua_pushstring(L, p1); + lua_pushnumber(L, p1); return iuplua_call(L, 2); } -static int tree_showrename_cb(Ihandle *self, int p0) +static int tree_rightclick_cb(Ihandle *self, int p0) { - lua_State *L = iuplua_call_start(self, "showrename_cb"); + lua_State *L = iuplua_call_start(self, "rightclick_cb"); lua_pushnumber(L, p0); return iuplua_call(L, 1); } @@ -82,19 +82,18 @@ static int tree_executeleaf_cb(Ihandle *self, int p0) return iuplua_call(L, 1); } -static int tree_rightclick_cb(Ihandle *self, int p0) +static int tree_showrename_cb(Ihandle *self, int p0) { - lua_State *L = iuplua_call_start(self, "rightclick_cb"); + lua_State *L = iuplua_call_start(self, "showrename_cb"); lua_pushnumber(L, p0); return iuplua_call(L, 1); } -static int tree_noderemoved_cb(Ihandle *self, int p0, char * p1) +static int tree_noderemoved_cb(Ihandle *self, char * p0) { lua_State *L = iuplua_call_start(self, "noderemoved_cb"); - lua_pushnumber(L, p0); - lua_pushstring(L, p1); - return iuplua_call(L, 2); + lua_pushstring(L, p0); + return iuplua_call(L, 1); } static int Tree(lua_State *L) @@ -115,12 +114,12 @@ int iuptreelua_open(lua_State * L) iuplua_register_cb(L, "SELECTION_CB", (lua_CFunction)tree_selection_cb, NULL); iuplua_register_cb(L, "DRAGDROP_CB", (lua_CFunction)tree_dragdrop_cb, NULL); iuplua_register_cb(L, "RENAME_CB", (lua_CFunction)tree_rename_cb, NULL); - iuplua_register_cb(L, "RENAMENODE_CB", (lua_CFunction)tree_renamenode_cb, NULL); - iuplua_register_cb(L, "SHOWRENAME_CB", (lua_CFunction)tree_showrename_cb, NULL); + iuplua_register_cb(L, "MULTIUNSELECTION_CB", (lua_CFunction)tree_multiunselection_cb, NULL); + iuplua_register_cb(L, "RIGHTCLICK_CB", (lua_CFunction)tree_rightclick_cb, NULL); iuplua_register_cb(L, "MULTISELECTION_CB", (lua_CFunction)tree_multiselection_cb, NULL); iuplua_register_cb(L, "BRANCHCLOSE_CB", (lua_CFunction)tree_branchclose_cb, NULL); iuplua_register_cb(L, "EXECUTELEAF_CB", (lua_CFunction)tree_executeleaf_cb, NULL); - iuplua_register_cb(L, "RIGHTCLICK_CB", (lua_CFunction)tree_rightclick_cb, NULL); + iuplua_register_cb(L, "SHOWRENAME_CB", (lua_CFunction)tree_showrename_cb, NULL); iuplua_register_cb(L, "NODEREMOVED_CB", (lua_CFunction)tree_noderemoved_cb, NULL); iuplua_treefuncs_open(L); diff --git a/iup/srclua5/il_tree_aux.c b/iup/srclua5/il_tree_aux.c index 99e721b..6ebaa09 100755 --- a/iup/srclua5/il_tree_aux.c +++ b/iup/srclua5/il_tree_aux.c @@ -151,12 +151,26 @@ static int tree_multiselection_cb(Ihandle *ih, int* ids, int p1) return iuplua_call(L, 2); } -static int tree_noderemoved_cb(Ihandle *ih, int id, void* p1) +static int tree_multiunselection_cb(Ihandle *ih, int* ids, int p1) +{ + int i; + lua_State *L = iuplua_call_start(ih, "multiunselection_cb"); + lua_newtable(L); + for (i = 0; i < p1; i++) + { + lua_pushnumber(L,i+1); + lua_pushnumber(L,ids[i]); + lua_settable(L,-3); + } + lua_pushnumber(L, p1); + return iuplua_call(L, 2); +} + +static int tree_noderemoved_cb(Ihandle *ih, void* p1) { lua_State *L = iuplua_call_start(ih, "noderemoved_cb"); - lua_pushnumber(L, id); tree_push_userid(L, p1); - return iuplua_call(L, 2); + return iuplua_call(L, 1); } void iuplua_treefuncs_open (lua_State *L) @@ -164,6 +178,7 @@ void iuplua_treefuncs_open (lua_State *L) iuplua_dostring(L, "IUPTREEREFTABLE={}", ""); iuplua_register_cb(L, "MULTISELECTION_CB", (lua_CFunction)tree_multiselection_cb, NULL); + iuplua_register_cb(L, "MULTIUNSELECTION_CB", (lua_CFunction)tree_multiunselection_cb, NULL); iuplua_register_cb(L, "NODEREMOVED_CB", (lua_CFunction)tree_noderemoved_cb, NULL); /* In Lua 5: diff --git a/iup/srclua5/il_val.c b/iup/srclua5/il_val.c index eb6d731..f0420de 100755 --- a/iup/srclua5/il_val.c +++ b/iup/srclua5/il_val.c @@ -35,7 +35,7 @@ static int val_button_release_cb(Ihandle *self, double p0) static int Val(lua_State *L) { - Ihandle *ih = IupVal((char *) luaL_checkstring(L, 1)); + Ihandle *ih = IupVal((char *) luaL_optstring(L, 1, NULL)); iuplua_plugstate(L, ih); iuplua_pushihandle_raw(L, ih); return 1; diff --git a/iup/srclua5/image.lua b/iup/srclua5/image.lua index 38ef556..3a82063 100755 --- a/iup/srclua5/image.lua +++ b/iup/srclua5/image.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "image", - parent = WIDGET, + parent = iup.WIDGET, creation = "nns", -- fake definition callback = {}, createfunc = [[ @@ -84,13 +84,13 @@ static int Image (lua_State * L) ]] } -function ctrl.createElement(class, arg) - if (arg.width and arg.height and arg.pixels) then - return Image(arg.width, arg.height, arg.pixels, arg.colors) +function ctrl.createElement(class, param) + if (param.width and param.height and param.pixels) then + return iup.Image(param.width, param.height, param.pixels, param.colors) else - return Image(arg, arg.colors) + return iup.Image(param, param.colors) end end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/imagergb.lua b/iup/srclua5/imagergb.lua index caab772..e05a4bc 100755 --- a/iup/srclua5/imagergb.lua +++ b/iup/srclua5/imagergb.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "imagergb", - parent = WIDGET, + parent = iup.WIDGET, creation = "nns", -- fake definition funcname = "ImageRGB", callback = {}, @@ -23,9 +23,9 @@ static int ImageRGB(lua_State *L) ]] } -function ctrl.createElement(class, arg) - return ImageRGB(arg.width, arg.height, arg.pixels) +function ctrl.createElement(class, param) + return iup.ImageRGB(param.width, param.height, param.pixels) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/imagergba.lua b/iup/srclua5/imagergba.lua index 87eb967..0d77cb5 100755 --- a/iup/srclua5/imagergba.lua +++ b/iup/srclua5/imagergba.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "imagergba", - parent = WIDGET, + parent = iup.WIDGET, creation = "nns", -- fake definition funcname = "ImageRGBA", callback = {}, @@ -23,9 +23,9 @@ static int ImageRGBA(lua_State *L) ]] } -function ctrl.createElement(class, arg) - return ImageRGBA(arg.width, arg.height, arg.pixels) +function ctrl.createElement(class, param) + return iup.ImageRGBA(param.width, param.height, param.pixels) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/item.lua b/iup/srclua5/item.lua index cbd0c1e..d0ef38f 100755 --- a/iup/srclua5/item.lua +++ b/iup/srclua5/item.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "item", - parent = WIDGET, + parent = iup.WIDGET, creation = "S-", callback = { action = "", @@ -11,9 +11,9 @@ local ctrl = { } } -function ctrl.createElement(class, arg) - return Item(arg.title) +function ctrl.createElement(class, param) + return iup.Item(param.title) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/iuplua.c b/iup/srclua5/iuplua.c index c10d95e..4158990 100755 --- a/iup/srclua5/iuplua.c +++ b/iup/srclua5/iuplua.c @@ -91,10 +91,12 @@ static int traceback (lua_State *L) { lua_pushliteral(L, ""); lua_pushinteger(L, 2); /* skip this function */ lua_call(L, 2, 1); /* call debug.traceback */ + lua_getglobal(L, "iup"); /* store traceback in iup._LASTTRACEBACK */ lua_pushstring(L, "_LASTTRACEBACK"); lua_pushvalue(L, -3); lua_settable(L, -3); + lua_pop(L, 2); return 1; } @@ -107,7 +109,8 @@ static int docall (lua_State *L, int narg, int nret) lua_insert(L, base); /* put it under chunk and args */ status = lua_pcall(L, narg, nret, base); lua_remove(L, base); /* remove traceback function */ - if (status != 0) { + if (status != 0) + { /* force a complete garbage collection in case of errors */ lua_gc(L, LUA_GCCOLLECT, 0); /* put _LASTTRACEBACK at stack position 2 */ @@ -115,14 +118,17 @@ static int docall (lua_State *L, int narg, int nret) lua_pushliteral(L, "_LASTTRACEBACK"); lua_gettable(L, -2); lua_remove(L, -2); - if (!lua_isstring(L, -1)) { + if (!lua_isstring(L, -1)) + { lua_pop(L, 1); lua_pushliteral(L, ""); + /* set _LASTTRACEBACK as nil */ lua_getglobal(L, "iup"); lua_pushliteral(L, "_LASTTRACEBACK"); lua_pushnil(L); lua_settable(L, -3); + lua_pop(L, 1); } } @@ -330,9 +336,9 @@ lua_State* iuplua_call_start(Ihandle *ih, const char* name) { lua_State *L = iuplua_getstate(ih); - /* prepare to call iupCallMethod(name, handle, ...) */ + /* prepare to call iup.CallMethod(name, handle, ...) */ lua_getglobal(L,"iup"); - lua_pushstring(L,"iupCallMethod"); + lua_pushstring(L,"CallMethod"); lua_gettable(L, -2); lua_remove(L, -2); @@ -380,14 +386,16 @@ int iuplua_call_raw(lua_State* L, int nargs, int nresults) void iuplua_register_cb(lua_State *L, const char* name, lua_CFunction func, const char* type) { - lua_getglobal(L, "RegisterCallback"); + lua_getglobal(L,"iup"); + lua_pushstring(L,"RegisterCallback"); + lua_gettable(L, -2); lua_pushstring(L, name); lua_pushcfunction(L, func); lua_pushstring(L, type); lua_call(L, 3, 0); } -/* iupSetCallback(handle, name, func, value) */ +/* iup.SetCallback(handle, name, func, value) */ static int SetCallback(lua_State *L) { Icallback func; @@ -415,10 +423,10 @@ static int SetCallback(lua_State *L) /*************************************/ /* metatable */ -/* iupNewClass(class_name) +/* iup.NewClass(class_name) Calls: - iupNewClass("iup handle") - iupNewClass("iup widget") + iup.NewClass("iup handle") + iup.NewClass("iup widget") */ static int NewClass(lua_State *L) { @@ -430,10 +438,10 @@ static int NewClass(lua_State *L) return 0; } -/* iupSetClass(t, class_name) +/* iup.SetClass(t, class_name) Calls: - iupSetClass(handle, "iup handle") --Used only in RegisterHandle and WIDGET.constructor - iupSetClass(object, "iup widget") --Used whenever a new control class is created. + iup.SetClass(handle, "iup handle") --Used only in iup.RegisterHandle and WIDGET.constructor + iup.SetClass(object, "iup widget") --Used whenever a new control class is created. */ static int SetClass(lua_State *L) { @@ -447,7 +455,7 @@ static int SetClass(lua_State *L) return 0; } -/* class_name = iupGetClass(t) */ +/* class_name = iup.GetClass(t) */ static int GetClass(lua_State *L) { if (lua_istable(L, 1) || lua_isuserdata(L, 1)) @@ -464,9 +472,9 @@ static int GetClass(lua_State *L) return 1; } -/* iupSetMethod(class_name, method, function) +/* iup.SetMethod(class_name, method, function) For ex: - iupSetMethod("iup handle", "__index", ihandle_gettable) + iup.SetMethod("iup handle", "__index", ihandle_gettable) */ static int SetMethod(lua_State *L) { @@ -507,7 +515,7 @@ static int ihandle_compare(lua_State *L) /*************************************/ /* table <-> ihandle */ -/* local object = iupGetWidget(handle) */ +/* local object = iup.GetWidget(handle) */ static int GetWidget(lua_State *L) { /* Pushes a table that is associanted with an ihandle */ @@ -521,7 +529,7 @@ static int GetWidget(lua_State *L) return 1; } -/* iupSetWidget(handle, object) */ +/* iup.SetWidget(handle, object) */ static int SetWidget(lua_State *L) { /* Saves the object table reference as an attribute, @@ -540,18 +548,9 @@ static int SetWidget(lua_State *L) /*************************************/ /* registration */ -void iuplua_changeEnv(lua_State *L) +void iuplua_get_env(lua_State *L) { - /* Replaces global environment */ - lua_pushvalue(L, LUA_GLOBALSINDEX); lua_getglobal(L, "iup"); - lua_replace(L, LUA_GLOBALSINDEX); -} - -void iuplua_returnEnv(lua_State *L) -{ - /* reestablishes global environment */ - lua_replace(L, LUA_GLOBALSINDEX); } int iuplua_opencall_internal(lua_State * L) @@ -568,16 +567,18 @@ int iuplua_opencall_internal(lua_State * L) return ret; } +/* iup[name] = func */ void iuplua_register(lua_State *L, lua_CFunction func, const char* name) { lua_pushcfunction(L, func); - lua_setglobal(L, name); + lua_setfield(L, -2, name); } +/* iup[name] = s */ void iuplua_regstring(lua_State *L, const char* s, const char* name) { lua_pushstring(L, s); - lua_setglobal(L, name); + lua_setfield(L, -2, name); } /***************************************************************************** @@ -675,7 +676,8 @@ static int GetFromC(lua_State *L) static void register_key(char *name, int code, void* user_data) { lua_State *L = (lua_State*)user_data; - lua_pushnumber(L, code); lua_setglobal(L, name); + lua_pushnumber(L, code); + lua_setfield(L, -2, name); } /* from iupkey.c */ @@ -740,29 +742,23 @@ static void setinfo (lua_State *L) { /* table "iup" is at the stack */ - lua_pushliteral (L, "_COPYRIGHT"); lua_pushliteral (L, IUP_COPYRIGHT); - lua_settable (L, -3); + lua_setfield(L, -2, "_COPYRIGHT"); - lua_pushliteral (L, "_DESCRIPTION"); lua_pushliteral (L, IUP_DESCRIPTION); - lua_settable (L, -3); + lua_setfield(L, -2, "_DESCRIPTION"); - lua_pushliteral (L, "_NAME"); lua_pushliteral (L, IUP_NAME); - lua_settable (L, -3); + lua_setfield(L, -2, "_NAME"); - lua_pushliteral (L, "_VERSION"); lua_pushstring (L, IupVersion()); - lua_settable (L, -3); + lua_setfield(L, -2, "_VERSION"); - lua_pushliteral (L, "_VERSION_DATE"); lua_pushliteral (L, IUP_VERSION_DATE); - lua_settable (L, -3); + lua_setfield(L, -2, "_VERSION_DATE"); - lua_pushliteral (L, "_VERSION_NUMBER"); lua_pushinteger (L, IupVersionNumber()); - lua_settable (L, -3); + lua_setfield(L, -2, "_VERSION_NUMBER"); } int iuplua_open(lua_State * L) @@ -775,13 +771,13 @@ int iuplua_open(lua_State * L) {"Close", iuplua_close}, {"SetIdle", SetIdle}, {"GetFromC", GetFromC}, - {"iupGetWidget", GetWidget}, - {"iupSetWidget", SetWidget}, - {"iupNewClass", NewClass}, - {"iupSetClass", SetClass}, - {"iupGetClass", GetClass}, - {"iupSetMethod", SetMethod}, - {"iupSetCallback", SetCallback}, + {"GetWidget", GetWidget}, + {"SetWidget", SetWidget}, + {"NewClass", NewClass}, + {"SetClass", SetClass}, + {"GetClass", GetClass}, + {"SetMethod", SetMethod}, + {"SetCallback", SetCallback}, {"ihandle_compare", ihandle_compare}, {"ihandle_tostring", ihandle_tostring}, {NULL, NULL}, @@ -793,35 +789,22 @@ int iuplua_open(lua_State * L) ret = lua_tointeger(L, -1); /* retrieve IupOpen return value */ lua_pop(L, -1); - /* Creating global namespace iup */ - lua_newtable(L); - lua_setglobal(L, "iup"); - /* Registers functions in iup namespace */ - luaL_openlib(L, "iup", funcs, 0); + luaL_register(L, "iup", funcs); /* leave "iup" table at the top of the stack */ iupluaapi_open(L); /* set version info */ setinfo(L); /* register if IupOpen was called here or from outside IupLua */ - lua_pushliteral (L, "_IUPOPEN_CALL"); + /* iup._IUPOPEN_CALL = EXTERNAL|INTERNAL */ if (ret == IUP_OPENED) lua_pushliteral (L, "EXTERNAL"); else lua_pushliteral (L, "INTERNAL"); - lua_settable (L, -3); + lua_setfield(L, -2, "_IUPOPEN_CALL"); - /* used by Idle */ + /* used by Idle in Lua */ IupSetGlobal("_IUP_LUA_DEFAULT_STATE", (char *) L); - /* Creating new environment with metamethod __index - * (so that normal Lua functions will be found while GLOBALSINDEX is the "iup" environment) */ - iuplua_dostring(L, "iup._G = _G\ - setmetatable(iup, {__index = iup._G})", "iuplua_setmetatable_global"); - - /* Changing environment to iup - * (all created variables and functions from now on will be put in "iup" environment) */ - iuplua_changeEnv(L); - #include "clua/iuplua.clua" #include "clua/constants.clua" @@ -857,6 +840,7 @@ int iuplua_open(lua_State * L) iupzboxlua_open(L); iuptimerlua_open(L); iupsboxlua_open(L); + iupsplitlua_open(L); iupspinlua_open(L); iupspinboxlua_open(L); iupcboxlua_open(L); @@ -875,8 +859,6 @@ int iuplua_open(lua_State * L) iuptreelua_open(L); iupclipboardlua_open(L); - iuplua_returnEnv(L); - return 0; /* nothing in stack */ } diff --git a/iup/srclua5/iuplua.lua b/iup/srclua5/iuplua.lua index a88bf5d..6cd64b4 100755 --- a/iup/srclua5/iuplua.lua +++ b/iup/srclua5/iuplua.lua @@ -4,17 +4,17 @@ -- Callback handler ------------------------------------------------------------------------------ -callbacks = {} +iup.callbacks = {} -function iupCallMethod(name, ...) - local handle = ... -- always the handle +function iup.CallMethod(name, ...) + local handle = arg[1] -- always the handle local func = handle[name] if (not func) then return end if type(func) == "function" then - return func(...) + return func(unpack(arg)) elseif type(func) == "string" then local temp = self self = handle @@ -26,9 +26,9 @@ function iupCallMethod(name, ...) end end -function RegisterCallback(name, func, type) - if not callbacks[name] then callbacks[name] = {} end - local cb = callbacks[name] +function iup.RegisterCallback(name, func, type) + if not iup.callbacks[name] then iup.callbacks[name] = {} end + local cb = iup.callbacks[name] if type then cb[type] = func else @@ -52,24 +52,24 @@ local widget_gettable = function(object, index) end end -iupNewClass("iup widget") -iupSetMethod("iup widget", "__index", widget_gettable) +iup.NewClass("iup widget") +iup.SetMethod("iup widget", "__index", widget_gettable) local ihandle_gettable = function(handle, index) local INDEX = string.upper(index) - if (callbacks[INDEX]) then - local object = iupGetWidget(handle) + if (iup.callbacks[INDEX]) then + local object = iup.GetWidget(handle) if (not object or type(object)~="table") then error("invalid iup handle") end return object[index] else - local value = GetAttribute(handle, INDEX) + local value = iup.GetAttribute(handle, INDEX) if (not value) then - local object = iupGetWidget(handle) + local object = iup.GetWidget(handle) if (not object or type(object)~="table") then error("invalid iup handle") end return object[index] - elseif type(value)== "number" or type(value) == "string" then - local ih = GetHandle(value) + elseif type(value)== "number" or type(value) == "string" then + local ih = iup.GetHandle(value) if ih then return ih else return value end else @@ -81,24 +81,24 @@ end local ihandle_settable = function(handle, index, value) local ti = type(index) local tv = type(value) - local object = iupGetWidget(handle) + local object = iup.GetWidget(handle) if (not object or type(object)~="table") then error("invalid iup handle") end if ti == "number" or ti == "string" then -- check if a valid C name local INDEX = string.upper(index) - local cb = callbacks[INDEX] + local cb = iup.callbacks[INDEX] if (cb) then -- if a callback name local func = cb[1] if (not func) then - func = cb[GetClassName(handle)] + func = cb[iup.GetClassName(handle)] end - iupSetCallback(handle, INDEX, func, value) -- register the pre-defined C callback + iup.SetCallback(handle, INDEX, func, value) -- register the pre-defined C callback object[index] = value -- store also in Lua - elseif iupGetClass(value) == "iup handle" then -- if a iup handle - local name = ihandle_setname(value) - SetAttribute(handle, INDEX, name) + elseif iup.GetClass(value) == "iup handle" then -- if a iup handle + local name = iup.SetHandleName(value) + iup.SetAttribute(handle, INDEX, name) object[index] = nil -- if there was something in Lua remove it elseif tv == "string" or tv == "number" or tv == "nil" then -- if a common value - SetAttribute(handle, INDEX, value) + iup.SetAttribute(handle, INDEX, value) object[index] = nil -- if there was something in Lua remove it else object[index] = value -- store also in Lua @@ -108,38 +108,39 @@ local ihandle_settable = function(handle, index, value) end end -iupNewClass("iup handle") -iupSetMethod("iup handle", "__index", ihandle_gettable) -iupSetMethod("iup handle", "__newindex", ihandle_settable) -iupSetMethod("iup handle", "__tostring", ihandle_tostring) -iupSetMethod("iup handle", "__eq", ihandle_compare) -- implemented in C +iup.NewClass("iup handle") +iup.SetMethod("iup handle", "__index", ihandle_gettable) +iup.SetMethod("iup handle", "__newindex", ihandle_settable) +iup.SetMethod("iup handle", "__tostring", iup.ihandle_tostring) -- implemented in C +iup.SetMethod("iup handle", "__eq", iup.ihandle_compare) -- implemented in C ------------------------------------------------------------------------------ -- Utilities ------------------------------------------------------------------------------ -function ihandle_setname(v) -- used also by radio and zbox - local name = GetName(v) +function iup.SetHandleName(v) -- used also by radio and zbox + local name = iup.GetName(v) if not name then local autoname = string.format("_IUPLUA_NAME(%s)", tostring(v)) - SetHandle(autoname, v) + iup.SetHandle(autoname, v) return autoname end return name end -function iupRegisterWidget(ctrl) -- called by all the controls initialization functions - iup[ctrl.nick] = function(arg) - return ctrl:constructor(arg) +function iup.RegisterWidget(ctrl) -- called by all the controls initialization functions + iup[ctrl.nick] = function(param) + if (not ctrl.constructor) then print(ctrl.nick) end + return ctrl:constructor(param) end end -function RegisterHandle(handle, typename) +function iup.RegisterHandle(handle, typename) - iupSetClass(handle, "iup handle") + iup.SetClass(handle, "iup handle") - local object = iupGetWidget(handle) + local object = iup.GetWidget(handle) if not object then local class = iup[string.upper(typename)] @@ -148,8 +149,8 @@ function RegisterHandle(handle, typename) end local object = { parent=class, handle=handle } - iupSetClass(object, "iup widget") - iupSetWidget(handle, object) + iup.SetClass(object, "iup widget") + iup.SetWidget(handle, object) end return handle @@ -159,39 +160,39 @@ end -- Widget class (top class) ------------------------------------------------------------------------------ -WIDGET = { +iup.WIDGET = { callback = {} } -function WIDGET.show(object) - Show(object.handle) +function iup.WIDGET.show(object) + iup.Show(object.handle) end -function WIDGET.hide(object) - Hide(object.handle) +function iup.WIDGET.hide(object) + iup.Hide(object.handle) end -function WIDGET.map(object) - Map(object.handle) +function iup.WIDGET.map(object) + iup.Map(object.handle) end -function WIDGET.constructor(class, arg) - local handle = class:createElement(arg) +function iup.WIDGET.constructor(class, param) + local handle = class:createElement(param) local object = { parent = class, handle = handle } - iupSetClass(handle, "iup handle") - iupSetClass(object, "iup widget") - iupSetWidget(handle, object) - object:setAttributes(arg) + iup.SetClass(handle, "iup handle") + iup.SetClass(object, "iup widget") + iup.SetWidget(handle, object) + object:setAttributes(param) return handle end -function WIDGET.setAttributes(object, arg) +function iup.WIDGET.setAttributes(object, param) local handle = object.handle - for i,v in pairs(arg) do - if type(i) == "number" and iupGetClass(v) == "iup handle" then + for i,v in pairs(param) do + if type(i) == "number" and iup.GetClass(v) == "iup handle" then -- We should not set this or other elements (such as iuptext) -- will erroneosly inherit it rawset(object, i, v) @@ -204,63 +205,63 @@ end -- all the objects in the hierarchy must be "iup widget" -- Must repeat this call for every new widget -iupSetClass(WIDGET, "iup widget") +iup.SetClass(iup.WIDGET, "iup widget") ------------------------------------------------------------------------------ -- Box class (inherits from WIDGET) ------------------------------------------------------------------------------ -BOX = { - parent = WIDGET +iup.BOX = { + parent = iup.WIDGET } -function BOX.setAttributes(object, arg) +function iup.BOX.setAttributes(object, param) local handle = rawget(object, "handle") - local n = #arg + local n = #param for i = 1, n do - if iupGetClass(arg[i]) == "iup handle" then - Append(handle, arg[i]) + if iup.GetClass(param[i]) == "iup handle" then + iup.Append(handle, param[i]) end end - WIDGET.setAttributes(object, arg) + iup.WIDGET.setAttributes(object, param) end -iupSetClass(BOX, "iup widget") +iup.SetClass(iup.BOX, "iup widget") ------------------------------------------------------------------------------ -- Compatibility functions. ------------------------------------------------------------------------------ -error_message_popup = nil +iup.error_message_popup = nil -function _ERRORMESSAGE(err,traceback) +function iup._ERRORMESSAGE(err,traceback) err = err..(traceback or "") - if (error_message_popup) then - error_message_popup.value = err + if (iup.error_message_popup) then + iup.error_message_popup.value = err else - local bt = button{title="Ok", size="60", action="error_message_popup = nil; return iup.CLOSE"} - local ml = multiline{expand="YES", readonly="YES", value=err, size="300x150"} - local vb = vbox{ml, bt; alignment="ACENTER", margin="10x10", gap="10"} - local dg = dialog{vb; title="Error Message",defaultesc=bt,defaultenter=bt,startfocus=bt} - error_message_popup = ml + local bt = iup.button{title="Ok", size="60", action="iup.error_message_popup = nil; return iup.CLOSE"} + local ml = iup.multiline{expand="YES", readonly="YES", value=err, size="300x150"} + local vb = iup.vbox{ml, bt; alignment="ACENTER", margin="10x10", gap="10"} + local dg = iup.dialog{vb; title="Error Message",defaultesc=bt,defaultenter=bt,startfocus=bt} + iup.error_message_popup = ml dg:popup(CENTER, CENTER) dg:destroy() - error_message_popup = nil + iup.error_message_popup = nil end end -pack = function (...) return {...} end +iup.pack = function (...) return arg end -function protectedcall_(f, err) +function iup.protectedcall_(f, err) if not f then - _ERRORMESSAGE(err) + iup._ERRORMESSAGE(err) return end - local ret = pack(pcall(f)) + local ret = iup.pack(pcall(f)) if not ret[1] then - _ERRORMESSAGE(ret[2]) + iup._ERRORMESSAGE(ret[2]) return else table.remove(ret, 1) @@ -268,10 +269,10 @@ function protectedcall_(f, err) end end -function dostring(s) return protectedcall_(loadstring(s)) end -function dofile(f) return protectedcall_(loadfile(f)) end +function iup.dostring(s) return iup.protectedcall_(loadstring(s)) end +function iup.dofile(f) return iup.protectedcall_(loadfile(f)) end -function RGB(r, g, b) +function iup.RGB(r, g, b) return string.format("%d %d %d", 255*r, 255*g, 255*b) end diff --git a/iup/srclua5/iuplua5.def b/iup/srclua5/iuplua5.def index 78b2a6f..667f81d 100755 --- a/iup/srclua5/iuplua5.def +++ b/iup/srclua5/iuplua5.def @@ -8,13 +8,12 @@ EXPORTS iuplua_call iuplua_call_rs iuplua_call_raw + iuplua_get_env iuplua_pushihandle iuplua_pushihandle_raw iuplua_dofile iuplua_dostring iupkey_open - iuplua_returnEnv - iuplua_changeEnv iuplua_opencall_internal luaopen_iuplua luaopen_iuplua51 diff --git a/iup/srclua5/iuplua_api.c b/iup/srclua5/iuplua_api.c index 8673442..adf5383 100755 --- a/iup/srclua5/iuplua_api.c +++ b/iup/srclua5/iuplua_api.c @@ -99,7 +99,7 @@ static int GetAttribute (lua_State *L) Ihandle *ih = iuplua_checkihandle(L,1); const char *name = luaL_checkstring(L,2); const char *value = IupGetAttribute(ih, name); - if (!value || iupAttribIsInternal(name)) + if (!value || iupATTRIB_ISINTERNAL(name)) lua_pushnil(L); else { @@ -313,6 +313,12 @@ static int LoopStep(lua_State *L) return 1; } +static int LoopStepWait(lua_State *L) +{ + lua_pushnumber(L,IupLoopStepWait()); + return 1; +} + static int ExitLoop(lua_State *L) { (void)L; @@ -774,7 +780,7 @@ static int UnMapFont (lua_State *L) ****************************************************************************/ -int iupluaapi_open(lua_State * L) +void iupluaapi_open(lua_State * L) { struct luaL_reg funcs[] = { {"Append", Append}, @@ -806,6 +812,7 @@ int iupluaapi_open(lua_State * L) {"Load", Load}, {"LoadBuffer", LoadBuffer}, {"LoopStep", LoopStep}, + {"LoopStepWait", LoopStepWait}, {"ExitLoop", ExitLoop}, {"MainLoop", MainLoop}, {"MainLoopLevel", MainLoopLevel}, @@ -867,8 +874,6 @@ int iupluaapi_open(lua_State * L) {NULL, NULL}, }; - /* Registers functions in iup namespace */ - luaL_openlib(L, NULL, funcs, 0); - - return 0; /* nothing in stack */ + /* "iup" table is at the top of the stack */ + luaL_register(L, NULL, funcs); } diff --git a/iup/srclua5/iuplua_controls.c b/iup/srclua5/iuplua_controls.c index bd961bf..22992f4 100755 --- a/iup/srclua5/iuplua_controls.c +++ b/iup/srclua5/iuplua_controls.c @@ -20,7 +20,7 @@ int iupcontrolslua_open(lua_State * L) if (iuplua_opencall_internal(L)) IupControlsOpen(); - iuplua_changeEnv(L); + iuplua_get_env(L); iupgaugelua_open(L); iupmatrixlua_open(L); @@ -30,8 +30,6 @@ int iupcontrolslua_open(lua_State * L) iupcellslua_open(L); iupcolorbarlua_open(L); - iuplua_returnEnv(L); - return 0; } diff --git a/iup/srclua5/iuplua_glcanvas.c b/iup/srclua5/iuplua_glcanvas.c index c50ba8f..8a13616 100755 --- a/iup/srclua5/iuplua_glcanvas.c +++ b/iup/srclua5/iuplua_glcanvas.c @@ -29,11 +29,10 @@ static int GLMakeCurrent(lua_State *L) { IupGLMakeCurrent(iuplua_checkihandle(L,1)); - iuplua_changeEnv(L); + iuplua_get_env(L); iuplua_regstring(L, (const char*)glGetString(GL_VENDOR), "GL_VENDOR"); iuplua_regstring(L, (const char*)glGetString(GL_RENDERER), "GL_RENDERER"); iuplua_regstring(L, (const char*)glGetString(GL_VERSION), "GL_VERSION"); - iuplua_returnEnv(L); return 0; } diff --git a/iup/srclua5/iuplua_im.c b/iup/srclua5/iuplua_im.c index b700e1a..0d9005d 100755 --- a/iup/srclua5/iuplua_im.c +++ b/iup/srclua5/iuplua_im.c @@ -34,10 +34,9 @@ static int LoadImage(lua_State *L) int iupimlua_open(lua_State *L) { - iuplua_changeEnv(L); + iuplua_get_env(L); iuplua_register(L, LoadImage, "LoadImage"); iuplua_register(L, SaveImage, "SaveImage"); - iuplua_returnEnv(L); return 0; /* nothing in stack */ } diff --git a/iup/srclua5/iuplua_imglib.c b/iup/srclua5/iuplua_imglib.c index bece6d5..9eb1123 100755 --- a/iup/srclua5/iuplua_imglib.c +++ b/iup/srclua5/iuplua_imglib.c @@ -27,9 +27,8 @@ static int iupluaimglib_open (lua_State *L) { IupImageLibOpen(); - iuplua_changeEnv(L); + iuplua_get_env(L); iuplua_register(L, imagelibopen, "ImageLibOpen"); - iuplua_returnEnv(L); return 0; /* nothing in stack */ } diff --git a/iup/srclua5/iuplua_pplot.c b/iup/srclua5/iuplua_pplot.c index 08b04bd..21b5090 100755 --- a/iup/srclua5/iuplua_pplot.c +++ b/iup/srclua5/iuplua_pplot.c @@ -140,9 +140,8 @@ int iup_pplotlua_open(lua_State * L) if (iuplua_opencall_internal(L)) IupPPlotOpen(); - iuplua_changeEnv(L); + iuplua_get_env(L); iuppplotlua_open(L); - iuplua_returnEnv(L); return 0; } diff --git a/iup/srclua5/label.lua b/iup/srclua5/label.lua index 11894a6..a62165c 100755 --- a/iup/srclua5/label.lua +++ b/iup/srclua5/label.lua @@ -3,14 +3,14 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "label", - parent = WIDGET, + parent = iup.WIDGET, creation = "S", callback = {} } -function ctrl.createElement(class, arg) - return Label(arg.title) +function ctrl.createElement(class, param) + return iup.Label(param.title) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/list.lua b/iup/srclua5/list.lua index 5c927f2..f0dcc2a 100755 --- a/iup/srclua5/list.lua +++ b/iup/srclua5/list.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "list", - parent = WIDGET, + parent = iup.WIDGET, creation = "-", callback = { action = "snn", @@ -14,9 +14,9 @@ local ctrl = { } } -function ctrl.createElement(class, arg) - return List() +function ctrl.createElement(class, param) + return iup.List() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/matrix.lua b/iup/srclua5/matrix.lua index 81aa732..ca52048 100755 --- a/iup/srclua5/matrix.lua +++ b/iup/srclua5/matrix.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "matrix", - parent = WIDGET, + parent = iup.WIDGET, creation = "-", callback = { action_cb = "nnnns", @@ -30,17 +30,17 @@ local ctrl = { extrafuncs = 1, } -function ctrl.createElement(class, arg) - return Matrix(arg.action) +function ctrl.createElement(class, param) + return iup.Matrix(param.action) end function ctrl.setcell(handle, l, c, val) - SetAttribute(handle,l..":"..c,val) + iup.SetAttribute(handle,l..":"..c,val) end function ctrl.getcell(handle, l, c) - return GetAttribute(handle,l..":"..c) + return iup.GetAttribute(handle,l..":"..c) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/menu.lua b/iup/srclua5/menu.lua index 89cd241..70be236 100755 --- a/iup/srclua5/menu.lua +++ b/iup/srclua5/menu.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "menu", - parent = BOX, + parent = iup.BOX, creation = "-", callback = { open_cb = "", @@ -12,44 +12,44 @@ local ctrl = { } function ctrl.popup(handle, x, y) - Popup(handle, x, y) + iup.Popup(handle, x, y) end function ctrl.append(handle, elem) - Append(handle, elem) + iup.Append(handle, elem) end -function ctrl.createElement(class, arg) - local n = #arg +function ctrl.createElement(class, param) + local n = #param for i=1,n do - if type(arg[i]) == "table" then - itemarg = {} - for u,v in pairs(arg[i]) do + if type(param[i]) == "table" then + local itemarg = {} + for u,v in pairs(param[i]) do if type(u) ~= "number" then itemarg[u] = v end end - if type(arg[i][1]) == "string" and (type(arg[i][2]) == "function" or type(arg[i][2]) == "string") then - itemarg.title = arg[i][1] - itemarg.action = arg[i][2] - arg[i] = item(itemarg) - elseif type(arg[i][1]) == "string" and type(arg[i][2]) == "userdata" then - itemarg[1] = arg[i][2] - itemarg.title = arg[i][1] - arg[i] = submenu(itemarg) + if type(param[i][1]) == "string" and (type(param[i][2]) == "function" or type(param[i][2]) == "string") then + itemarg.title = param[i][1] + itemarg.action = param[i][2] + param[i] = iup.item(itemarg) + elseif type(param[i][1]) == "string" and type(param[i][2]) == "userdata" then + itemarg[1] = param[i][2] + itemarg.title = param[i][1] + param[i] = iup.submenu(itemarg) end end end - return Menu() + return iup.Menu() end function ctrl.showxy(handle, x, y) - return ShowXY(handle, x, y) + return iup.ShowXY(handle, x, y) end function ctrl.destroy(handle) - return Destroy(handle) + return iup.Destroy(handle) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/messagedlg.lua b/iup/srclua5/messagedlg.lua index e81eede..2dcb73d 100755 --- a/iup/srclua5/messagedlg.lua +++ b/iup/srclua5/messagedlg.lua @@ -3,24 +3,24 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "messagedlg", - parent = WIDGET, + parent = iup.WIDGET, creation = "", funcname = "MessageDlg", callback = {} } function ctrl.popup(handle, x, y) - Popup(handle,x,y) + iup.Popup(handle,x,y) end function ctrl.destroy(handle) - return Destroy(handle) + return iup.Destroy(handle) end -function ctrl.createElement(class, arg) - return MessageDlg() +function ctrl.createElement(class, param) + return iup.MessageDlg() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/multiline.lua b/iup/srclua5/multiline.lua index 9ae766e..a20ba83 100755 --- a/iup/srclua5/multiline.lua +++ b/iup/srclua5/multiline.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "multiline", - parent = WIDGET, + parent = iup.WIDGET, creation = "-", callback = { action = "ns", @@ -11,9 +11,9 @@ local ctrl = { funcname = "MultiLine", } -function ctrl.createElement(class, arg) - return MultiLine() +function ctrl.createElement(class, param) + return iup.MultiLine() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/normalizer.lua b/iup/srclua5/normalizer.lua index 201aab0..293e460 100755 --- a/iup/srclua5/normalizer.lua +++ b/iup/srclua5/normalizer.lua @@ -4,25 +4,25 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "normalizer", - parent = WIDGET, + parent = iup.WIDGET, creation = "-", callback = {} } -function ctrl.setAttributes(object, arg) +function ctrl.setAttributes(object, param) local handle = rawget(object, "handle") - local n = #arg + local n = #param for i = 1, n do - if iupGetClass(arg[i]) == "iup handle" then - object.addcontrol = arg[i] + if iup.GetClass(param[i]) == "iup handle" then + object.addcontrol = param[i] end end - WIDGET.setAttributes(object, arg) + iup.WIDGET.setAttributes(object, param) end -function ctrl.createElement(class, arg) - return Normalizer() +function ctrl.createElement(class, param) + return iup.Normalizer() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/olecontrol.lua b/iup/srclua5/olecontrol.lua index 902977b..ab7afd5 100755 --- a/iup/srclua5/olecontrol.lua +++ b/iup/srclua5/olecontrol.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "olecontrol", - parent = WIDGET, + parent = iup.WIDGET, creation = "s", funcname = "OleControl", callback = {}, @@ -14,9 +14,8 @@ int iupolelua_open(lua_State* L) if (iuplua_opencall_internal(L)) IupOleControlOpen(); - iuplua_changeEnv(L); + iuplua_get_env(L); iupolecontrollua_open(L); - iuplua_returnEnv(L); return 0; } @@ -35,8 +34,8 @@ int luaopen_iupluaole51(lua_State* L) ]] } -function ctrl.createElement(class, arg) - return OleControl(arg[1]) +function ctrl.createElement(class, param) + return iup.OleControl(param[1]) end function ctrl.CreateLuaCOM(handle) @@ -50,5 +49,5 @@ function ctrl.CreateLuaCOM(handle) end end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/pplot.lua b/iup/srclua5/pplot.lua index 5d6a2f4..eb79876 100755 --- a/iup/srclua5/pplot.lua +++ b/iup/srclua5/pplot.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "pplot", - parent = WIDGET, + parent = iup.WIDGET, creation = "", funcname = "PPlot", callback = { @@ -23,9 +23,9 @@ local ctrl = { extrafuncs = 1, } -function ctrl.createElement(class, arg) - return PPlot(arg.action) +function ctrl.createElement(class, param) + return iup.PPlot(param.action) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/progressbar.lua b/iup/srclua5/progressbar.lua index 16b4a09..e591e49 100755 --- a/iup/srclua5/progressbar.lua +++ b/iup/srclua5/progressbar.lua @@ -3,15 +3,15 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "progressbar", - parent = WIDGET, + parent = iup.WIDGET, creation = "", funcname = "ProgressBar", callback = {} } -function ctrl.createElement(class, arg) - return ProgressBar() +function ctrl.createElement(class, param) + return iup.ProgressBar() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/radio.lua b/iup/srclua5/radio.lua index 1cdd3a6..7af6540 100755 --- a/iup/srclua5/radio.lua +++ b/iup/srclua5/radio.lua @@ -3,31 +3,31 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "radio", - parent = WIDGET, - creation = "i", + parent = iup.WIDGET, + creation = "I", callback = {} } -function ctrl.CreateChildrenNames(obj) +function ctrl.SetChildrenNames(obj) if obj then - if obj.parent.parent == BOX then + if obj.parent.parent == iup.BOX then local i = 1 while obj[i] do - ctrl.CreateChildrenNames (obj[i]) + ctrl.SetChildrenNames (obj[i]) i = i+1 end - elseif obj.parent == IUPFRAME then - ctrl.CreateChildrenNames (obj[1]) + elseif obj.parent == iup.FRAME then + ctrl.SetChildrenNames (obj[1]) else - ihandle_setname(obj) + iup.SetHandleName(obj) end end end -function ctrl.createElement(class, arg) - ctrl.CreateChildrenNames(arg[1]) - return Radio(arg[1]) +function ctrl.createElement(class, param) + ctrl.SetChildrenNames(param[1]) + return iup.Radio(param[1]) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/sbox.lua b/iup/srclua5/sbox.lua index 9ee63ba..7bc7bb1 100755 --- a/iup/srclua5/sbox.lua +++ b/iup/srclua5/sbox.lua @@ -2,15 +2,15 @@ -- Sbox class ------------------------------------------------------------------------------ local ctrl = { - nick = "sbox", - parent = WIDGET, - creation = "i", + nick = "sbox", + parent = iup.WIDGET, + creation = "I", callback = {} } -function ctrl.createElement(class, arg) - return Sbox(arg[1]) +function ctrl.createElement(class, param) + return iup.Sbox(param[1]) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/separator.lua b/iup/srclua5/separator.lua index 1841d6a..bc86422 100755 --- a/iup/srclua5/separator.lua +++ b/iup/srclua5/separator.lua @@ -3,14 +3,14 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "separator", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = {} } -function ctrl.createElement(class, arg) - return Separator() +function ctrl.createElement(class, param) + return iup.Separator() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/spin.lua b/iup/srclua5/spin.lua index b6e2044..5118a0e 100755 --- a/iup/srclua5/spin.lua +++ b/iup/srclua5/spin.lua @@ -3,16 +3,16 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "spin", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = { spin_cb = "n", }, } -function ctrl.createElement(class, arg) - return Spin(arg.action) +function ctrl.createElement(class, param) + return iup.Spin(param.action) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/spinbox.lua b/iup/srclua5/spinbox.lua index c671e6a..3b6c7f1 100755 --- a/iup/srclua5/spinbox.lua +++ b/iup/srclua5/spinbox.lua @@ -3,16 +3,16 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "spinbox", - parent = WIDGET, + parent = iup.WIDGET, creation = "i", callback = { spin_cb = "n", }, } -function ctrl.createElement(class, arg) - return Spinbox(arg[1]) +function ctrl.createElement(class, param) + return iup.Spinbox(param[1]) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/split.lua b/iup/srclua5/split.lua new file mode 100644 index 0000000..7b1bc2b --- /dev/null +++ b/iup/srclua5/split.lua @@ -0,0 +1,16 @@ +------------------------------------------------------------------------------ +-- Split class +------------------------------------------------------------------------------ +local ctrl = { + nick = "split", + parent = iup.WIDGET, + creation = "II", + callback = {} +} + +function ctrl.createElement(class, param) + return iup.Split(param[1], param[2]) +end + +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/submenu.lua b/iup/srclua5/submenu.lua index 5dc76d4..faba80e 100755 --- a/iup/srclua5/submenu.lua +++ b/iup/srclua5/submenu.lua @@ -3,17 +3,17 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "submenu", - parent = WIDGET, - creation = "Si", + parent = iup.WIDGET, + creation = "SI", callback = { -- open_cb = "", -- already registered by the menu -- menuclose_cb = "", -- already registered by the menu } } -function ctrl.createElement(class, arg) - return Submenu(arg.title, arg[1]) +function ctrl.createElement(class, param) + return iup.Submenu(param.title, param[1]) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/tabs.lua b/iup/srclua5/tabs.lua index 3dc69bb..249caa9 100755 --- a/iup/srclua5/tabs.lua +++ b/iup/srclua5/tabs.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "tabs", - parent = WIDGET, + parent = iup.WIDGET, creation = "v", callback = { tabchange_cb = "ii", @@ -23,9 +23,9 @@ static int Tabsv(lua_State *L) ]], } -function ctrl.createElement(class, arg) - return Tabsv(arg) +function ctrl.createElement(class, param) + return iup.Tabsv(param) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/text.lua b/iup/srclua5/text.lua index e01dab5..5064e07 100755 --- a/iup/srclua5/text.lua +++ b/iup/srclua5/text.lua @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "text", - parent = WIDGET, + parent = iup.WIDGET, creation = "-", callback = { action = "ns", @@ -12,9 +12,9 @@ local ctrl = { } } -function ctrl.createElement(class, arg) - return Text() +function ctrl.createElement(class, param) + return iup.Text() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/timer.lua b/iup/srclua5/timer.lua index 53cda70..d9e3914 100755 --- a/iup/srclua5/timer.lua +++ b/iup/srclua5/timer.lua @@ -3,16 +3,16 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "timer", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = { action_cb = "", }, } -function ctrl.createElement(class, arg) - return Timer() +function ctrl.createElement(class, param) + return iup.Timer() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/toggle.lua b/iup/srclua5/toggle.lua index da9380b..7f65c74 100755 --- a/iup/srclua5/toggle.lua +++ b/iup/srclua5/toggle.lua @@ -3,16 +3,16 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "toggle", - parent = WIDGET, + parent = iup.WIDGET, creation = "S-", callback = { action = "n", } } -function ctrl.createElement(class, arg) - return Toggle(arg.title) +function ctrl.createElement(class, param) + return iup.Toggle(param.title) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/tree.lua b/iup/srclua5/tree.lua index bd8daf7..5bd21c4 100755 --- a/iup/srclua5/tree.lua +++ b/iup/srclua5/tree.lua @@ -3,16 +3,16 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "tree", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = { selection_cb = "nn", multiselection_cb = "nn", -- fake definition to be replaced by treefuncs module + multiunselection_cb = "nn", -- fake definition to be replaced by treefuncs module branchopen_cb = "n", branchclose_cb = "n", executeleaf_cb = "n", - renamenode_cb = "ns", - noderemoved_cb = "ns", -- fake definition to be replaced by treefuncs module + noderemoved_cb = "s", -- fake definition to be replaced by treefuncs module rename_cb = "ns", showrename_cb = "n", rightclick_cb = "n", @@ -21,56 +21,95 @@ local ctrl = { extrafuncs = 1, } -local function TreeSetAttributeHandle(handle, name, value) - if iupGetClass(value) == "iup handle" then value = ihandle_setname(value) end - SetAttribute(handle, name, value) +function iup.TreeSetNodeAttributes(handle, id, attrs) + for attr, val in pairs(attrs) do + handle[attr..id] = val + end +end + +function iup.TreeSetAncestorsAttributes(handle, ini, attrs) + ini = handle["parent"..ini] + local stack = {} + while ini do + table.insert(stack, 1, ini) + ini = handle["parent"..ini] + end + for i = 1, #stack do + iup.TreeSetNodeAttributes(handle, stack[i], attrs) + end +end + +function iup.TreeSetDescentsAttributes(handle, ini, attrs) + local id = ini + for i = 1, handle["childcount"..ini] do + id = id+1 + iup.TreeSetNodeAttributes(handle, id, attrs) + if handle["kind"..id] == "BRANCH" then + id = iup.TreeSetDescentsAttributes(handle, id, attrs) + end + end + return id +end + +function iup.TreeSetAttributeHandle(handle, name, value) + if iup.GetClass(value) == "iup handle" then value = iup.SetHandleName(value) end + iup.SetAttribute(handle, name, value) end -function TreeSetNodeAttrib(handle, node, id) - if node.color then SetAttribute(handle, "COLOR"..id, node.color) end - if node.state then SetAttribute(handle, "STATE"..id, node.state) end - if node.titlefont then SetAttribute(handle, "TITLEFONT"..id, node.titlefont) end - if node.marked then SetAttribute(handle, "MARKED"..id, node.marked) end - if node.image then TreeSetAttributeHandle(handle, "IMAGE"..id, node.image) end - if node.imageexpanded then TreeSetAttributeHandle(handle, "IMAGEEXPANDED"..id, node.imageexpanded) end - if node.userid then TreeSetUserId(handle, id, node.userid) end +-- must be after the branch has nodes +function iup.TreeSetState(handle, tnode, id) + if tnode.state then iup.SetAttribute(handle, "STATE"..id, tnode.state) end end -function TreeSetValueRec(handle, t, id) +function iup.TreeSetNodeAttrib(handle, tnode, id) + if tnode.color then iup.SetAttribute(handle, "COLOR"..id, tnode.color) end + if tnode.titlefont then iup.SetAttribute(handle, "TITLEFONT"..id, tnode.titlefont) end + if tnode.marked then iup.SetAttribute(handle, "MARKED"..id, tnode.marked) end + if tnode.image then iup.TreeSetAttributeHandle(handle, "IMAGE"..id, tnode.image) end + if tnode.imageexpanded then iup.TreeSetAttributeHandle(handle, "IMAGEEXPANDED"..id, tnode.imageexpanded) end + if tnode.userid then iup.TreeSetUserId(handle, id, tnode.userid) end +end + +function iup.TreeAddNodesRec(handle, t, id) if t == nil then return end local cont = #t while cont >= 0 do - local node = t[cont] - if type(node) == "table" then - if node.branchname then - SetAttribute(handle, "ADDBRANCH"..id, node.branchname) - TreeSetNodeAttrib(handle, node, id+1) - TreeSetValueRec(handle, node, id+1) - elseif node.leafname then - SetAttribute(handle, "ADDLEAF"..id, node.leafname) - TreeSetNodeAttrib(handle, node, id+1) + local tnode = t[cont] + if type(tnode) == "table" then + if tnode.branchname then + iup.SetAttribute(handle, "ADDBRANCH"..id, tnode.branchname) + iup.TreeSetNodeAttrib(handle, tnode, id+1) + iup.TreeAddNodesRec(handle, tnode, id+1) + iup.TreeSetState(handle, tnode, id+1) + elseif tnode.leafname then + iup.SetAttribute(handle, "ADDLEAF"..id, tnode.leafname) + iup.TreeSetNodeAttrib(handle, tnode, id+1) end else - if node then - SetAttribute(handle, "ADDLEAF"..id, node) + if tnode then + iup.SetAttribute(handle, "ADDLEAF"..id, tnode) end end cont = cont - 1 end end -function TreeSetValue(handle, t, id) +function iup.TreeAddNodes(handle, t, id) if (not id) then id = 0 -- default is the root - if t.branchname then SetAttribute(handle, "TITLE0", t.branchname) end - TreeSetNodeAttrib(handle, t, 0) + if t.branchname then iup.SetAttribute(handle, "TITLE0", t.branchname) end + iup.TreeSetNodeAttrib(handle, t, 0) end - TreeSetValueRec(handle, t, id) + iup.TreeAddNodesRec(handle, t, id) + if (id == 0) then iup.TreeSetState(handle, t, 0) end end -function ctrl.createElement(class, arg) - return Tree() +-- backward compatibility +iup.TreeSetValue = iup.TreeAddNodes + +function ctrl.createElement(class, param) + return iup.Tree() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/user.lua b/iup/srclua5/user.lua index c202be3..18ed950 100755 --- a/iup/srclua5/user.lua +++ b/iup/srclua5/user.lua @@ -4,14 +4,14 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "user", - parent = WIDGET, + parent = iup.WIDGET, creation = "", callback = {} } -function ctrl.createElement(class, arg) - return User() +function ctrl.createElement(class, param) + return iup.User() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/val.lua b/iup/srclua5/val.lua index ba94255..cd22c6d 100755 --- a/iup/srclua5/val.lua +++ b/iup/srclua5/val.lua @@ -3,8 +3,8 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "val", - parent = WIDGET, - creation = "s", + parent = iup.WIDGET, + creation = "S", callback = { mousemove_cb = "d", button_press_cb = "d", @@ -12,9 +12,9 @@ local ctrl = { }, } -function ctrl.createElement(class, arg) - return Val(arg[1]) +function ctrl.createElement(class, param) + return iup.Val(param[1]) end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/vbox.lua b/iup/srclua5/vbox.lua index b98984c..da578d9 100755 --- a/iup/srclua5/vbox.lua +++ b/iup/srclua5/vbox.lua @@ -3,18 +3,18 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "vbox", - parent = BOX, + parent = iup.BOX, creation = "-", callback = {} } function ctrl.append (handle, elem) - Append(handle, elem) + iup.Append(handle, elem) end -function ctrl.createElement(class, arg) - return Vbox() +function ctrl.createElement(class, param) + return iup.Vbox() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") diff --git a/iup/srclua5/zbox.lua b/iup/srclua5/zbox.lua index 579c00b..7b0a348 100755 --- a/iup/srclua5/zbox.lua +++ b/iup/srclua5/zbox.lua @@ -3,30 +3,30 @@ ------------------------------------------------------------------------------ local ctrl = { nick = "zbox", - parent = BOX, + parent = iup.BOX, creation = "-", callback = {} } function ctrl.append (handle, elem) - ihandle_setname(elem) - Append(handle, elem) + iup.SetHandleName(elem) + iup.Append(handle, elem) end function ctrl.SetChildrenNames(obj) if obj then local i = 1 while obj[i] do - ihandle_setname(obj[i]) + iup.SetHandleName(obj[i]) i = i+1 end end end -function ctrl.createElement(class, arg) - ctrl.SetChildrenNames(arg) - return Zbox() +function ctrl.createElement(class, param) + ctrl.SetChildrenNames(param) + return iup.Zbox() end -iupRegisterWidget(ctrl) -iupSetClass(ctrl, "iup widget") +iup.RegisterWidget(ctrl) +iup.SetClass(ctrl, "iup widget") |