From c89576f1700fecfba5e5c74333337d999fddc9b0 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 16 Mar 2019 21:06:09 +0000 Subject: [PATCH] memory blocks: fix new game (thanks Antonio) app_plus: fix typo appearance: fix current skin save in eskin.ini pixie player: restrict the length of folder name label (thanks Iuriy Olegov) fm/icons.ini: add icons for *.stl git-svn-id: svn://kolibrios.org@7613 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/File Managers/icons.ini | 4 +- data/rus/docs/guide/hardware_support.htm | 2 +- programs/cmm/app_plus/app_plus.c | 2 +- programs/cmm/appearance/appearance.c | 2 +- programs/cmm/mblocks/mblocks.c | 85 +++++++++++++----------- programs/cmm/pixie2/pixie.c | 9 ++- programs/system/docky/trunk/docky.asm | 2 +- 7 files changed, 58 insertions(+), 48 deletions(-) diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index 0d6644cfce..57cacda11e 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -142,6 +142,7 @@ lif=14 3ds=15 asc=15 vox=15 +tls=15 kex=16 skn=17 obj=18 @@ -223,4 +224,5 @@ mobi=85 djvu=85 csv=28 rft=85 -lif=13 \ No newline at end of file +lif=13 +tls=78 \ No newline at end of file diff --git a/data/rus/docs/guide/hardware_support.htm b/data/rus/docs/guide/hardware_support.htm index f600561b45..f168be411b 100644 --- a/data/rus/docs/guide/hardware_support.htm +++ b/data/rus/docs/guide/hardware_support.htm @@ -20,7 +20,7 @@ KolibriOS частично обеспечивает поддержку оборудования персонального компьютера. Часть оборудования поддерживается ядром ОС, часть динамически загружаемыми драйверами.

Графика

-Стандарт Поддержка в KolibriOS +Стандарт Поддержка в KolibriOS VESA Поддерживается ядром ОС VGA Поддерживается ядром ОС diff --git a/programs/cmm/app_plus/app_plus.c b/programs/cmm/app_plus/app_plus.c index c952c7179e..b84ac43195 100644 --- a/programs/cmm/app_plus/app_plus.c +++ b/programs/cmm/app_plus/app_plus.c @@ -43,7 +43,7 @@ dword scr_pal[] = {0xFFFFFF,0xBBDDFF,0x4166B5,0xE0E4E6,0xAFBEDD,0xC4D4E8,0x52ACD ?define WINDOW_TITLE_TEXT "! ." ?define CONTENT_HEADER_TEXT " /KOLIBRIOS/ " ?define DESCRIPTION_TEXT "஡ ᠬ⥫쭮. -ন +ন ᪮ ⨭ ࠢ. 砥 ୮ ࠭ ॡ 믮 १㧪 ஡ ᭮." diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 567416b7e3..c3fc0e27fc 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -436,7 +436,7 @@ void EventOpenFile() _ini ini = { "/sys/settings/eskin.ini", "main" }; void EventExit() { - ini.SetString("skin", #cur_skin_path, strlen(#cur_skin_path)); + if (cur_skin_path) ini.SetString("skin", #cur_skin_path, strlen(#cur_skin_path)); ExitProcess(); } diff --git a/programs/cmm/mblocks/mblocks.c b/programs/cmm/mblocks/mblocks.c index 3dbedb6672..894914de5e 100644 --- a/programs/cmm/mblocks/mblocks.c +++ b/programs/cmm/mblocks/mblocks.c @@ -1,7 +1,7 @@ /* - Memory Blocks for KolibriOS v1.1 + Memory Blocks for KolibriOS v1.11 Leency&Veliant Edition - 2008-2017 + 2008-2019 */ #define MEMSIZE 4096 * 15 @@ -35,7 +35,7 @@ proc_info Form; int bitstat[60], bitpict[60]; dword butonsx[60], butonsy[60]; dword firstbit, secondbit; -int i, count, lang; +int count; void main() @@ -57,51 +57,52 @@ void main() break; case evButton: - id = GetButtonID(); - if (id==1) ExitProcess(); - else if (id==5) NewGame(); - else { - if (bitstat[id-100] == 0) + id = GetButtonID(); + if (id==1) ExitProcess(); + else if (id==5) NewGame(); + else { + if (bitstat[id-100] == 0) + { + if (firstbit <> 0x0BAD) { - if (firstbit <> 0x0BAD) - { - if (secondbit <> 0x0BAD) - { - if (bitpict[firstbit-100] == bitpict[secondbit-100]) - bitstat[firstbit-100] = bitstat[secondbit-100] = 2; - else - bitstat[firstbit-100] = bitstat[secondbit-100] = 0; - ReDraw_Game_Button(firstbit - 100); - ReDraw_Game_Button(secondbit - 100); - secondbit = 0x0BAD; - firstbit = id; - bitstat[id-100] = 1; - ReDraw_Game_Button(id - 100); - count++; - } - else if (firstbit<>id) - { - secondbit = id; - bitstat[id-100] = 1; - ReDraw_Game_Button(id - 100); - count++; - } - } - else + if (secondbit <> 0x0BAD) { + if (bitpict[firstbit-100] == bitpict[secondbit-100]) + bitstat[firstbit-100] = bitstat[secondbit-100] = 2; + else + bitstat[firstbit-100] = bitstat[secondbit-100] = 0; + ReDraw_Game_Button(firstbit - 100); + ReDraw_Game_Button(secondbit - 100); + secondbit = 0x0BAD; firstbit = id; bitstat[id-100] = 1; ReDraw_Game_Button(id - 100); count++; } + else if (firstbit<>id) + { + secondbit = id; + bitstat[id-100] = 1; + ReDraw_Game_Button(id - 100); + count++; + } } - Draw_Count(); - } - break; + else + { + firstbit = id; + bitstat[id-100] = 1; + ReDraw_Game_Button(id - 100); + count++; + } + } + Draw_Count(); + } + break; case evReDraw: system.color.get(); - DefineAndDrawWindow(215,100,CELL_SIZE+4*10 + 4 + 9,PANEL_Y + 4 + PANEL_H +skin_height,0x34,0xC0C0C0,"Memory Blocks",0); + DefineAndDrawWindow(215,100,CELL_SIZE+4*10 + 4 + 9,PANEL_Y+4+PANEL_H+skin_height, + 0x34,0xC0C0C0,"Memory Blocks",0); GetProcessInfo(#Form, SelfInfo); Draw_Panel(); Draw_Game_Pole(); @@ -112,10 +113,11 @@ void main() void NewGame() { int off; + int i; FOR (i = 0; i < 60; i++) { - bitpict[i] = 0; + bitstat[i] = 0; bitpict[i] = 0; } @@ -128,6 +130,8 @@ void NewGame() do off = random(60); while (bitpict[off] != 0); bitpict[off] = i; } + Draw_Game_Pole(); + Draw_Panel(); } void ReDraw_Game_Button(int id) @@ -151,11 +155,12 @@ void ReDraw_Game_Button(int id) void Draw_Game_Pole() { + int i; byte j; for (j = 0; j < stolbcov; j++) for (i = 0; i < strok; i++) { - butonsx[j*strok+i] = CELL_SIZE+4 * j + 4; //save coordinates to avoid their recalculation after - butonsy[j*strok+i] = CELL_SIZE+4 * i + 4; + butonsx[j*strok+i] = CELL_SIZE+4 * j + 4; //save coordinates to avoid + butonsy[j*strok+i] = CELL_SIZE+4 * i + 4; //their recalculation after ReDraw_Game_Button(j*strok + i); } } diff --git a/programs/cmm/pixie2/pixie.c b/programs/cmm/pixie2/pixie.c index 2a6589be77..e515c0c2ce 100644 --- a/programs/cmm/pixie2/pixie.c +++ b/programs/cmm/pixie2/pixie.c @@ -30,7 +30,7 @@ char default_dir[] = "/rd/1"; od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" }; -#define ABOUT_MESSAGE "Pixie Player v2.92 Final +#define ABOUT_MESSAGE "Pixie Player v2.93 Final A tiny music folder player. Supports MP3, WAV, XM audio file formats. @@ -331,10 +331,13 @@ void DrawScroller() if (list.count > list.visible) scrollbar_v_draw(#scroll1); } -void DrawPixieTitle(dword _title) +void DrawPixieTitle(dword _t) { + char title[35]; + strlcpy(#title, _t, sizeof(title)); + if (strlen(#title)>30) strcpy(#title+30, "..."); kfont.WriteIntoWindow(8, 5, theme.color_top_panel_bg, - theme.color_top_panel_folder_name, list.font_type, _title); + theme.color_top_panel_folder_name, list.font_type, #title); } //===================================================// diff --git a/programs/system/docky/trunk/docky.asm b/programs/system/docky/trunk/docky.asm index 274275f809..caaa15fb59 100644 --- a/programs/system/docky/trunk/docky.asm +++ b/programs/system/docky/trunk/docky.asm @@ -24,7 +24,7 @@ main: mcall 18, 7 mov [win.psid], eax - mcall 40, 100101b + mcall 40, EVM_REDRAW+EVM_BUTTON+EVM_MOUSE ;+EVM_DEKSTOP to update colors on skin change ; ==== Load libs ==== load_libraries load_lib_start, load_lib_end