From 444e038420c76f91fdd100b2aa6364ade2b0106c Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 22 Mar 2018 14:36:04 +0000 Subject: [PATCH] use fplay_run to run Fplay with parameter wrapped into '"' git-svn-id: svn://kolibrios.org@7203 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 1 + data/common/File Managers/kfar.ini | 22 +++++++++++----------- data/common/File Managers/kfm.ini | 22 +++++++++++----------- data/common/icons16.png | Bin 9926 -> 10154 bytes data/common/media/fplay_run | Bin 0 -> 392 bytes data/common/settings/assoc.ini | 2 +- programs/cmm/eolite/Eolite.c | 4 ++-- programs/cmm/lib/kolibri.h | 8 ++++---- 8 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 data/common/media/fplay_run diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 4e7ad3c041..6a4c12f1ed 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -250,6 +250,7 @@ extra_files = { {"kolibrios/lib/swresample-1.dll", "common/lib/swresample-1.dll"}, {"kolibrios/lib/i915_dri.drv", "common/lib/i915_dri.drv"}, {"kolibrios/media/fplay", "common/media/fplay"}, + {"kolibrios/media/fplay_run", "common/media/fplay_run"}, {"kolibrios/media/updf", "common/media/updf"}, {"kolibrios/media/vttf", "common/media/vttf"}, {"kolibrios/media/zsea/zsea.ini", PROGS .. "/media/zsea/zSea.ini"}, diff --git a/data/common/File Managers/kfar.ini b/data/common/File Managers/kfar.ini index a04493de39..92a2dbbff0 100644 --- a/data/common/File Managers/kfar.ini +++ b/data/common/File Managers/kfar.ini @@ -39,17 +39,17 @@ fb2=/sys/fb2read mht=/sys/network/WebView kla=/sys/games/klavisha pdf=/kolibrios/media/updf -avi=/kolibrios/media/fplay -mpg=/kolibrios/media/fplay -mov=/kolibrios/media/fplay -flv=/kolibrios/media/fplay -wmv=/kolibrios/media/fplay -vob=/kolibrios/media/fplay -mkv=/kolibrios/media/fplay -mp4=/kolibrios/media/fplay -mpeg=/kolibrios/media/fplay -3gp=/kolibrios/media/fplay -webm=/kolibrios/media/fplay +avi=/kolibrios/media/fplay_run +mpg=/kolibrios/media/fplay_run +mov=/kolibrios/media/fplay_run +flv=/kolibrios/media/fplay_run +wmv=/kolibrios/media/fplay_run +vob=/kolibrios/media/fplay_run +mkv=/kolibrios/media/fplay_run +mp4=/kolibrios/media/fplay_run +mpeg=/kolibrios/media/fplay_run +3gp=/kolibrios/media/fplay_run +webm=/kolibrios/media/fplay_run sh=/sys/shell smc=/kolibrios/emul/zsnes mcr=/kolibrios/emul/psx4all diff --git a/data/common/File Managers/kfm.ini b/data/common/File Managers/kfm.ini index 70ac45e870..49ac753df2 100644 --- a/data/common/File Managers/kfm.ini +++ b/data/common/File Managers/kfm.ini @@ -182,17 +182,17 @@ asc /sys/3d/view3ds lif /kolibrios/demos/life2 skn /sys/skincfg pdf /kolibrios/media/updf -avi /kolibrios/media/fplay -mpg /kolibrios/media/fplay -mov /kolibrios/media/fplay -flv /kolibrios/media/fplay -wmv /kolibrios/media/fplay -vob /kolibrios/media/fplay -mkv /kolibrios/media/fplay -mp4 /kolibrios/media/fplay -mpeg /kolibrios/media/fplay -3gp /kolibrios/media/fplay -webm /kolibrios/media/fplay +avi /kolibrios/media/fplay_run +mpg /kolibrios/media/fplay_run +mov /kolibrios/media/fplay_run +flv /kolibrios/media/fplay_run +wmv /kolibrios/media/fplay_run +vob /kolibrios/media/fplay_run +mkv /kolibrios/media/fplay_run +mp4 /kolibrios/media/fplay_run +mpeg /kolibrios/media/fplay_run +3gp /kolibrios/media/fplay_run +webm /kolibrios/media/fplay_run smc=/kolibrios/emul/zsnes mcr=/kolibrios/emul/psx4all nes=/kolibrios/emul/fceu/fceu diff --git a/data/common/icons16.png b/data/common/icons16.png index 8d5eefdb66b21c78cabe78db28aab57efc847440..5e78ba1d1ce95b47ee3e146bbe72a586aee9437d 100644 GIT binary patch literal 10154 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 YKifz~`YPT`IRF3v07*qoM6N<$g2HH6kpKVy delta 9925 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 Dud*y5 diff --git a/data/common/media/fplay_run b/data/common/media/fplay_run new file mode 100644 index 0000000000000000000000000000000000000000..8208aad54a8983024322fd5df0cf4221faba017e GIT binary patch literal 392 zcmV;30eAjOP(w@Y0RR9200001Mv*2LLXK;4&&M{gp_Ji&fTJ`h&7VO#Yo5H}P#?_9 zq*idJt=^^#>;SYonC?CsHZ%wG3eoOfH0+Gx0HP>V6I2YRE%58WYsM-Xt!(BN7t z;XaL2mMAQbR{v+Ww7{U(8#b=-SuG6unog9(6piPPfapA$HN+OCy*M;x8^s!;0MhaA zdaj(F9Si1#NTcw9khUY0vDWymoLWPX*n7xAU9Wi1`%GMPJ;o){TE>JoP#D1)2|84Dwz mz%l9b0~F*?+2%QI@1LUr*FcU16EWj1|9VXq&M3HhLA6$x60`CE literal 0 HcmV?d00001 diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index 2b9b97ff91..83cb23fc24 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -42,7 +42,7 @@ exec=/kolibrios/emul/dosbox/dosbox icon=11 [FPlay] -exec=/kolibrios/media/fplay +exec=/kolibrios/media/fplay_run icon=40 [AC97snd] diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 2caaade08c..5b7a2c42a3 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -156,8 +156,8 @@ void main() Libimg_LoadImage(#icons16_default, "/sys/icons16.png"); Libimg_LoadImage(#icons16_selected, "/sys/icons16.png"); - Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, 0xFF94AECE); - Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, 0xFF7692B5); + Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffFFFfff, col_selec); + Libimg_ReplaceColor(icons16_selected.image, icons16_selected.w, icons16_selected.h, 0xffCACBD6, MixColors(col_selec, 0, 200)); //Libimg_LoadImage(#icons32_default, "/sys/icons32.png"); //Libimg_LoadImage(#icons32_selected, "/sys/icons32.png"); diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index 3483afe2ba..1892e73897 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -513,13 +513,13 @@ inline fastcall void PutPixel( EBX,ECX,EDX) $int 0x40 } -void DefineButton(dword x,y,w,h,EDX,ESI) +:void DefineButton(dword x,y,w,h,id,color) { EAX = 8; - $push edx - EDX += BT_DEL; + EDX = id + BT_DEL; $int 0x40; - $pop edx + EDX = id; + ESI = color; EBX = x<<16+w; ECX = y<<16+h; $int 0x40