From b4a6b076d8a07ee042bff40ab9661e2da3e69a35 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 15 Jan 2022 12:38:25 +0000 Subject: [PATCH] add KMatrix into Appearance app git-svn-id: svn://kolibrios.org@9640 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/settings/system.ini | 2 +- programs/cmm/appearance/appearance.c | 6 +++++- programs/cmm/lib/obj/box_lib.h | 2 +- programs/develop/libraries/libs-dev/libimg/libimg.asm | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/common/settings/system.ini b/data/common/settings/system.ini index 33deb5a5b1..b4fab28ec0 100644 --- a/data/common/settings/system.ini +++ b/data/common/settings/system.ini @@ -19,7 +19,7 @@ PCI=on [screensaver] timeout=10 program=/sys/demos/spiral -available=3d/crownscr|demos/web|demos/zeroline|demos/spiral +available=3d/crownscr|demos/web|demos/zeroline|demos/spiral|/kolibrios/demos/kmatrix [style] default_skin=/sys/default.skn diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 3b9028e452..09f8c2ee44 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -350,7 +350,11 @@ void EventTabScreensaverClick() strcpy(#ssmas, #ss_available); do { j = strrchr(#ssmas, '|'); - miniprintf(#param, "/sys/%s", #ssmas + j); + if (ssmas[j]=='/') { + strcpy(#param, #ssmas + j); + } else { + miniprintf(#param, "/sys/%s", #ssmas + j); + } list.add(#param); ESBYTE[#ssmas + j - 1] = '\0'; select_list.count++; diff --git a/programs/cmm/lib/obj/box_lib.h b/programs/cmm/lib/obj/box_lib.h index 56ea6ff35a..65990d6ab7 100644 --- a/programs/cmm/lib/obj/box_lib.h +++ b/programs/cmm/lib/obj/box_lib.h @@ -136,7 +136,7 @@ dword width, ESI.edit_box.size = strlen(ed_text); } -:dword EditBox_CreateStandart(dword width, left, top, maxlen, text, flags) +:dword EditBox_Create(dword left, top, width, maxlen, text, flags) { dword eb, i; eb = malloc(sizeof(edit_box)); diff --git a/programs/develop/libraries/libs-dev/libimg/libimg.asm b/programs/develop/libraries/libs-dev/libimg/libimg.asm index e958cdcd85..5fe930a2d4 100644 --- a/programs/develop/libraries/libs-dev/libimg/libimg.asm +++ b/programs/develop/libraries/libs-dev/libimg/libimg.asm @@ -2849,7 +2849,7 @@ export \ img.to_rgb , 'img_to_rgb' , \ img.to_rgb2 , 'img_to_rgb2' , \ img.decode , 'img_decode' , \ - img.encode , 'img_encode' , \ + img.encode , 'img_encode' , \ ;supported formats: PNG 24 32, BMP 24 32, PNM 1 8g 24 img.create , 'img_create' , \ img.destroy , 'img_destroy' , \ img.destroy.layer , 'img_destroy_layer' , \