KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

dino: disable debug; move kf_view to /kolibrios/; remove mb example as it is not used
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 31s
Details
Build system / Build (pull_request) Successful in 8m17s
Details

Browse Source
This commit is contained in:
Kiril Lipatov
2025-03-10 16:02:54 +02:00
parent c791250520
commit bc1f7c1b82
9 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/Tupfile.lua
View File

@@ -484,7 +484,6 @@ tup.append_table(img_files, {
{"DEVELOP/EXAMPLES/CONGET", VAR_PROGS .. "/develop/libraries/console_coff/examples/test_gets"},
{"DEVELOP/EXAMPLES/CSLIDE", VAR_PROGS .. "/demos/cslide/trunk/cslide"},
{"DEVELOP/EXAMPLES/THREAD", VAR_PROGS .. "/develop/examples/thread/trunk/thread"},
{"DEVELOP/EXAMPLES/USE_MB", VAR_PROGS .. "/demos/use_mb/use_mb"},
{"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/trunk/kfar"},
{"File Managers/OPENDIAL", VAR_PROGS .. "/fs/opendial/opendial"},
{"LOD", VAR_PROGS .. "/fs/lod/lod"},
@@ -636,7 +635,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
{"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/klavisha"},
{"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"},
}) else tup.append_table(img_files, {
{"DEVELOP/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"},
{"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"},
}) end
if build_type == "ru_RU" then tup.append_table(extra_files, {
@@ -673,7 +672,6 @@ tup.append_table(img_files, {
{"DEVELOP/PIPET", VAR_PROGS .. "/cmm/misc/pipet.com"},
{"File Managers/EOLITE", VAR_PROGS .. "/cmm/eolite/Eolite.com"},
{"File Managers/KFM2", VAR_PROGS .. "/cmm/misc/kfm2.com"},
{"KF_VIEW", VAR_PROGS .. "/cmm/kf_font_viewer/font_viewer.com"},
{"DEVELOP/DIFF", VAR_PROGS .. "/cmm/diff/diff.com"},
{"GAMES/CLICKS", VAR_PROGS .. "/games/clicks/clicks.com"},
{"GAMES/MBLOCKS", VAR_PROGS .. "/cmm/misc/mblocks.com"},
@@ -696,6 +694,7 @@ tup.append_table(extra_files, {
{"kolibrios/utils/notes", VAR_PROGS .. "/cmm/notes/notes.com"},
{"kolibrios/utils/osupdate", VAR_PROGS .. "/cmm/misc/osupdate.com"},
{"kolibrios/utils/quark", VAR_PROGS .. "/cmm/quark/quark.com"},
{"kolibrios/utils/kf_view", VAR_PROGS .. "/cmm/kf_font_viewer/font_viewer.com"},
})
end -- tup.getconfig('NO_CMM') ~= 'full'

2
data/common/settings/assoc.ini
View File

@@ -79,7 +79,7 @@ next=$TextEditor
[Assoc]
/=/sys/file managers/eolite
kf=/sys/KF_VIEW
kf=/kolibrios/utils/kf_view
txt=$CodeEdit
log=$CodeEdit

BIN
programs/cmm/barscfg/bars_8b.raw Normal file
View File

Binary file not shown.

44
programs/cmm/barscfg/barscfg.c
View File

@@ -12,23 +12,23 @@
#include "..\lib\patterns\restart_process.h"
#ifdef LANG_RUS
?define WINDOW_TITLE "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ன<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>"
?define TASK_FRAME_T " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> "
?define DOCK_FRAME_T " <EFBFBD><EFBFBD><EFBFBD> "
?define MIN_LEFT_BUTTON "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᫥<><E1ABA5>"
?define MIN_RIGHT_BUTTON "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ࠢ<EFBFBD>"
?define SOFTEN_UP "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᢥ<><E1A2A5><EFBFBD>"
?define SOFTEN_DOWN "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᭨<><E1ADA8>"
?define CLOCK "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
?define CPU_USAGE "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>㧪<EFBFBD> <20><>"
?define CHANGE_LANG "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
?define MENU_BUTTON "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
?define PANEL_HEIGHT "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
?define SOFTEN_HEIGHT "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᣫ<><E1A3AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
?define BUTTON_OFFSET "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
?define FSIZE "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
?define ASHOW "<EFBFBD><EFBFBD> <20><><EFBFBD>뢠<EFBFBD><EBA2A0>"
?define CHANGE_POS "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20><><EFBFBD> ᬥ<><E1ACA5> <20><><EFBFBD><EFBFBD>樨"
?define WINDOW_TITLE "Ќ бва®©ЄЁ Ї ­Ґ«Ё § ¤ з Ё „®Є "
?define TASK_FRAME_T " Џ ­Ґ«м § ¤ з "
?define DOCK_FRAME_T " „®Є "
?define MIN_LEFT_BUTTON "Љ­®ЇЄ  бЄалвЁп б«Ґў "
?define MIN_RIGHT_BUTTON "Љ­®ЇЄ  бЄалвЁп бЇа ў "
?define SOFTEN_UP "‘Ј« ¦Ёў ­ЁҐ ᢥаег"
?define SOFTEN_DOWN "‘Ј« ¦Ёў ­ЁҐ б­Ё§г"
?define CLOCK "— бл"
?define CPU_USAGE "‡ Јаг§Є  –Џ"
?define CHANGE_LANG "џ§лЄ ўў®¤ "
?define MENU_BUTTON "Љ­®ЇЄ  ¬Ґ­о"
?define PANEL_HEIGHT "‚лб®в  Ї ­Ґ«Ё"
?define SOFTEN_HEIGHT "‚лб®в  бЈ« ¦Ёў ­Ёп"
?define BUTTON_OFFSET "Џ®«Ґ ў®ЄагЈ Є­®Ї®Є"
?define FSIZE "ђҐ¦Ё¬ Ї ­Ґ«Ё"
?define ASHOW "ЌҐ бЄалў вм"
?define CHANGE_POS "Ќ ¦¬ЁвҐ ­  Ё§®Ўа ¦Ґ­ЁҐ ¤«п ᬥ­л Ї®§ЁжЁЁ"
#else
?define WINDOW_TITLE "Taskbar and Docky configuration"
?define TASK_FRAME_T " Taskbar "
@@ -55,9 +55,15 @@ _ini taskbar_vars_ini = { #taskbar_ini_path, "Variables" };
_ini docky_ini = { "/sys/settings/docky.ini", "@" };
unsigned char panels_img_data[] = FROM "bars.raw";
#define PIMG_W 37
#define PIMG_H 27 //27*5
unsigned char panels_img_data[] = FROM "bars_8b.raw";
dword panels_img_pal[] = {
0x00405D74,0x0084FC84,0x00FAFAFA,0x0000B400,
0x00E4E4E4,0x008C9B9C,0x000212FD,0x00D8DEDF,
0x00585C5D,0x0085B7E0,0x009EC6E7,0x0094C0E5,
0x00CB8800,0x00CE3D9E,0x00D20404,0x00485966
};
proc_info Form;
@@ -137,7 +143,7 @@ void main()
void DrawPanelsImage(dword y, n)
{
PutImage(22, y, PIMG_W, PIMG_H, n * PIMG_W * PIMG_H * 3 + #panels_img_data);
PutPaletteImage(n * PIMG_W * PIMG_H + #panels_img_data, PIMG_W, PIMG_H, 22, y, 8, #panels_img_pal);
}
void SetDisabledMode()

4
programs/games/dino/graphics.c
View File

@@ -16,11 +16,11 @@ void graphicsInit() {
if (spriteAtlas->Type != IMAGE_BPP32) {
spriteAtlas = img_convert(spriteAtlas, NULL, IMAGE_BPP32, 0, 0);
if (!spriteAtlas) {
dbg_printf("spriteAtlas convert error\n");
//dbg_printf("spriteAtlas convert error\n");
exit(-1);
}
}
dbg_printf("spriteAtlas->Type = %d\n", spriteAtlas->Type);
//dbg_printf("spriteAtlas->Type = %d\n", spriteAtlas->Type);
screenImage = img_create(DEFAULT_WIDTH, DEFAULT_HEIGHT, IMAGE_BPP32);
}

4
programs/games/dino/main.c
View File

@@ -26,7 +26,7 @@ int main(int argc, char* args[]) {
win_pos.x -= DEFAULT_WIDTH/2;
win_pos.y /= 2;
win_pos.y -= DEFAULT_HEIGHT/2;
dbg_printf("wx = %d, wy = %d\n", win_pos.x, win_pos.y);
//dbg_printf("wx = %d, wy = %d\n", win_pos.x, win_pos.y);
ksys_colors_table_t sys_color_table;
_ksys_get_system_colors(&sys_color_table);
_ksys_set_event_mask(0xC0000027); // !
@@ -37,7 +37,7 @@ int main(int argc, char* args[]) {
runnerInit();
dbg_printf("dino started\n");
//dbg_printf("dino started\n");
int ext_code = 0;
uint8_t old_mode = 0;

2
programs/games/dino/misc.c
View File

@@ -6,7 +6,7 @@ int getRandomNumber(int _min, int _max) {
void intToStr(int num, int ndigits, char* result) {
char num_str[16]; // 16 more than enough for int
sprintf(num_str, "%d", num); // Convert num to a string
//sprintf(num_str, "%d", num); // Convert num to a string
if (strlen(num_str) > ndigits) {
// Copy only the last ndigits to result
strcpy(result, num_str + strlen(num_str) - ndigits);

2
programs/games/dino/ulist.c
View File

@@ -194,6 +194,7 @@ void ulist_print(Ulist* list) {
printf("\n");
}
/*
void ulist_test() {
// Create a new Ulist
Ulist* list = ulist_create();
@@ -239,3 +240,4 @@ void ulist_test() {
// Destroy the list
ulist_destroy(list);
}
*/

2
programs/games/dino/ulist.h
View File

@@ -26,6 +26,6 @@ void* ulist_get_front(Ulist* list);
void* ulist_get_back(Ulist* list);
int ulist_size(Ulist* list);
void ulist_print(Ulist* list);
void ulist_test();
//void ulist_test();
#endif /* ULIST_H_ */