From 011d6f7a415142d31edb840f1dfe906ca7c04828 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 21 Dec 2021 00:08:27 +0000 Subject: [PATCH] rename old screenserver into 'zeroline' and move it to demos folder, update the code so it can be used as a screensaver with a new @ss upload a new wallpapper brickhouseislands3c.png git-svn-id: svn://kolibrios.org@9450 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 1 + data/common/wallpapers/copyright.txt | 2 +- .../wallpapers/t__brickhouseislands3c.png | Bin 0 -> 10128 bytes programs/demos/crownscr/trunk/crownscr.asm | 4 +- programs/demos/spiral/spiral.asm | 4 +- programs/demos/zeroline/trunk/Tupfile.lua | 2 + programs/demos/zeroline/trunk/build.bat | 3 + .../ss => demos/zeroline}/trunk/build.sh | 7 +- .../zeroline/trunk/zeroline.asm} | 269 +----------------- programs/system/ss/trunk/Tupfile.lua | 3 - programs/system/ss/trunk/build_en.bat | 6 - programs/system/ss/trunk/build_ru.bat | 6 - 12 files changed, 28 insertions(+), 279 deletions(-) create mode 100644 data/common/wallpapers/t__brickhouseislands3c.png create mode 100644 programs/demos/zeroline/trunk/Tupfile.lua create mode 100644 programs/demos/zeroline/trunk/build.bat rename programs/{system/ss => demos/zeroline}/trunk/build.sh (55%) rename programs/{system/ss/trunk/@ss.asm => demos/zeroline/trunk/zeroline.asm} (55%) delete mode 100644 programs/system/ss/trunk/Tupfile.lua delete mode 100644 programs/system/ss/trunk/build_en.bat delete mode 100644 programs/system/ss/trunk/build_ru.bat diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 63826db913..4e763ec3e9 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -453,6 +453,7 @@ tup.append_table(img_files, { {"DEMOS/TUBE", PROGS .. "/demos/tube/trunk/tube"}, {"DEMOS/UNVWATER", PROGS .. "/demos/unvwater/trunk/unvwater"}, {"DEMOS/WEB", PROGS .. "/demos/web/trunk/web"}, + {"DEMOS/ZEROLINE", PROGS .. "/demos/zeroline/trunk/zeroline"}, {"DEVELOP/ASCIIVJU", PROGS .. "/develop/asciivju/trunk/asciivju"}, {"DEVELOP/BOARD", PROGS .. "/system/board/trunk/board"}, {"DEVELOP/CEDIT", PROGS .. "/develop/cedit/CEDIT"}, diff --git a/data/common/wallpapers/copyright.txt b/data/common/wallpapers/copyright.txt index 02b82edfe6..b6ebed3fe8 100644 --- a/data/common/wallpapers/copyright.txt +++ b/data/common/wallpapers/copyright.txt @@ -6,11 +6,11 @@ Home Rand and Robyn Miller Based on the game "Cosmic Free Yourself Jonathan Besler https://interfacelift.com/user/86064/jonathan_besler.html Unsplash Alexander Popov https://unsplash.com/@5tep5 KolibriOS Tan Viktorya Sidorova +brickhouseislands3c Mrmo Tarius https://pixeljoint.com/pixelart/85317.htm =====Icons==== HEX-editor Sublyme http://www.pixeljoint.com/p/34532.htm -Browser Plutogeezer http://www.pixeljoint.com/p/12237.htm Snake real Troll http://realtroll.npage.de Flood-it iMoose http://benjamus.deviantart.com Dicty Susumu Yoshida http://www.mcdodesign.com diff --git a/data/common/wallpapers/t__brickhouseislands3c.png b/data/common/wallpapers/t__brickhouseislands3c.png new file mode 100644 index 0000000000000000000000000000000000000000..8a2e3573c81f16416762e058764e2bb4f80f1d45 GIT binary patch literal 10128 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 Sw=hMx%D&x}y9&RjpZ_mDT9UW` literal 0 HcmV?d00001 diff --git a/programs/demos/crownscr/trunk/crownscr.asm b/programs/demos/crownscr/trunk/crownscr.asm index 6e42d5d195..b939ee0b91 100644 --- a/programs/demos/crownscr/trunk/crownscr.asm +++ b/programs/demos/crownscr/trunk/crownscr.asm @@ -38,8 +38,8 @@ include "..\..\..\macros.inc" start: cmp dword[params], '@ss' setz [screensaver] - mov ebx, EVM_REDRAW + EVM_KEY - cmovz ebx, EVM_REDRAW + EVM_KEY + EVM_MOUSE + mov ebx, EVM_REDRAW + EVM_KEY + EVM_BUTTON + cmovz ebx, EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE mcall 40 cmp [flscr],0 diff --git a/programs/demos/spiral/spiral.asm b/programs/demos/spiral/spiral.asm index eef734d025..b9d50acf9d 100644 --- a/programs/demos/spiral/spiral.asm +++ b/programs/demos/spiral/spiral.asm @@ -353,8 +353,8 @@ endp start: cmp dword[params], '@ss' setz [screensaver] - mov ebx, EVM_REDRAW + EVM_KEY - cmovz ebx, EVM_REDRAW + EVM_KEY + EVM_MOUSE + mov ebx, EVM_REDRAW + EVM_KEY + EVM_BUTTON + cmovz ebx, EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE mcall 40 mov edi, transparent_cursor diff --git a/programs/demos/zeroline/trunk/Tupfile.lua b/programs/demos/zeroline/trunk/Tupfile.lua new file mode 100644 index 0000000000..869faf74c1 --- /dev/null +++ b/programs/demos/zeroline/trunk/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("zeroline.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "zeroline") \ No newline at end of file diff --git a/programs/demos/zeroline/trunk/build.bat b/programs/demos/zeroline/trunk/build.bat new file mode 100644 index 0000000000..d563ad8fea --- /dev/null +++ b/programs/demos/zeroline/trunk/build.bat @@ -0,0 +1,3 @@ +@fasm -m 16384 zeroline.asm zeroline +@kpack @ss +@pause \ No newline at end of file diff --git a/programs/system/ss/trunk/build.sh b/programs/demos/zeroline/trunk/build.sh similarity index 55% rename from programs/system/ss/trunk/build.sh rename to programs/demos/zeroline/trunk/build.sh index 095d986f6f..0d8a38d1d9 100755 --- a/programs/system/ss/trunk/build.sh +++ b/programs/demos/zeroline/trunk/build.sh @@ -2,11 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc - fasm -m 16384 @ss.asm @ss - kpack @ss - rm -f lang.inc + fasm -m 16384 zeroline.asm zeroline + kpack zeroline exit 0 diff --git a/programs/system/ss/trunk/@ss.asm b/programs/demos/zeroline/trunk/zeroline.asm similarity index 55% rename from programs/system/ss/trunk/@ss.asm rename to programs/demos/zeroline/trunk/zeroline.asm index f5a237ff42..60fdce49c2 100644 --- a/programs/system/ss/trunk/@ss.asm +++ b/programs/demos/zeroline/trunk/zeroline.asm @@ -24,15 +24,16 @@ dd I_Param ; boot parameters dd 0x0 ; path ;------------------------------------------------------------------------------ -include 'lang.inc' include '..\..\..\macros.inc' ;include 'debug.inc' ;------------------------------------------------------------------------------ align 4 START: mcall 68,11 - mcall 40,110010b + mcall 40, EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE ; boot parameters + cmp [I_Param], dword '@ss' + setz [screensaver] cmp [I_Param],dword 'ZERO' jne @f mov [type],dword 0 @@ -52,15 +53,11 @@ bgr_changed: mov [x_max],ax shl eax,16 mov [top_right_corner],eax + + call create_ss ;------------------------------------------------------------------------------ align 4 still: - movzx ebx,[time] - imul ebx,60*100 - mcall 23 ; ждём события в течение [time] минут - test eax,eax - jz create_ss_thread - cmp al,2 ; key in buffer? jz key @@ -77,33 +74,12 @@ still: jnz still ;------------------------------------------------------------------------------ align 4 -create_setup: - test [params],2 - jnz still ; окно настроек уже создано - mcall 51,1,sthread,sthread_stack_top - or [params],2 - jmp still -;------------------------------------------------------------------------------ -align 4 key: mcall ; eax = 2 jmp still ;------------------------------------------------------------------------------ align 4 -create_ss_thread: - test [params],3 - jnz still - call create_ss - jmp still -;------------------------------------------------------------------------------ -align 4 create_ss: - mcall 51,1,thread,thread_stack_top - or [params],1 - ret -;------------------------------------------------------------------------------ -align 4 -thread: mcall 40,100010b ;set_new_cursor_skin - transparent cursor mcall 68,12,32*32*4 ; get memory for own cursor area @@ -203,11 +179,13 @@ tstill: ;-------------------------------------- align 4 thr_end: + cmp [screensaver], 0 + jz @f + mcall 70, f70 +@@: cmp [type],dword 24 jne @f mcall 68,13,[fileinfo.point] -;-------------------------------------- -align 4 @@: and [params], not 1 or eax,-1 @@ -348,218 +326,6 @@ dnol: add [lcolor],0x010201 ret ;------------------------------------------------------------------------------ -align 4 -sthread: ; start of execution - call sdraw_window -;-------------------------------------- -align 4 -sstill: - mcall 10 ; wait here for event - dec eax ; redraw request ? - je sthread - - dec eax ; key in buffer ? - jne sbutton - - mcall 2 - jmp snoclose ;sstill -;------------------------------------------------------------------------------ -align 4 -sbutton: ; button - mcall 17 ; get id - - cmp ah,1 ; button id=1 ? - jne snoclose - - and [params],not 2 - mov eax,-1 ; close this program - mcall -;-------------------------------------- -align 4 -snoclose: - cmp ah,7 - jne nosetfl - - xor [params],1 - call drawflag - call drawtype - call drawtime - jmp sstill -;-------------------------------------- -align 4 -nosetfl: - test [params],1 - jnz sstill - - cmp ah,2 - jne notypedown - - mov eax,[type] - test eax,eax - je sstill - - sub eax,12 - jmp typeupdn -;-------------------------------------- -align 4 -notypedown: - cmp ah,3 - jne notypeup - - mov eax,[type] - cmp eax,24 - jae sstill - - add eax,12 - jmp typeupdn -;-------------------------------------- -align 4 -notypeup: - cmp ah,4 - jne notimedown - - mov al,[time] - cmp al,1 - jbe sstill - - dec eax -; das - jmp timeupdn -;-------------------------------------- -align 4 -notimedown: - cmp ah,5 - jne notimeup - - mov al,[time] - cmp al,59 ; 0x59 - jae sstill - - inc eax -; daa - jmp timeupdn -;-------------------------------------- -align 4 -notimeup: - cmp ah,6 - jne noshow - - mcall 5,10 - call create_ss -;-------------------------------------- -align 4 -noshow: - jmp sstill -;-------------------------------------- -align 4 -timeupdn: - mov [time],al - call drawtime - jmp sstill -;-------------------------------------- -align 4 -typeupdn: - mov [type],eax - call drawtype - jmp sstill -;------------------------------------------------------------------------------ -; ********************************************* -; ******* WINDOW DEFINITIONS AND DRAW ******** -; ********************************************* -align 4 -sdraw_window: - mcall 12,1 - - xor eax,eax ; function 0 : define and draw window - xor esi,esi - mcall ,<100,215>,<100,70>,0x13400088,,title - - mcall 8,<47,10>,<31,10>,2,0x702050 - - push ebx - add ebx,13*65536 - mov edi,ebx - inc edx - mcall - pop ebx - - add ecx,15*65536 - inc edx - mcall - - mov ebx,edi - inc edx - mcall - - inc edx - mcall ,<160,40>,<28,14> - - mcall 4,<15,33>,0x80ffffff,setuptext ; write text to window - - add ebx,15 - add edx,10 - mcall - - mcall ,<169,32>,,buttext - - call drawtype - call drawtime - call drawflag - - mcall 12,2 - ret -;------------------------------------------------------------------------------ -align 4 -drawtype: - mov edx,0xffffff - test [params], 1 - jz noblue - - mov edx,0x4e00e7 -;-------------------------------------- -align 4 -noblue: - mcall 13,<80,75>,<30,12> - xor ecx,ecx - mov edx,typetext - add edx,[type] - mcall 4,<82,32>,,,12 - ret -;------------------------------------------------------------------------------ -align 4 -drawtime: - mov edx,0xffffff - test [params], 1 - jz noblue1 - - mov edx,0x4e00e7 -;-------------------------------------- -align 4 -noblue1: - mcall 13,<80,15>,<45,12> - xor esi,esi - movzx ecx,byte [time] - mcall 47,0x00020000,,<82,47> - ret -;------------------------------------------------------------------------------ -align 4 -drawflag: - mcall 8,,,0x80000007 ; before we need delete button -; otherwise, a few hours later the application will spend all buttons of system - mcall ,<150,10>,<45,10>,7,0xe0e0e0 ; then create button - - mov edx,flag - bt dword [params],0 - jc setf - - inc edx -;-------------------------------------- -align 4 -setf: - xor ecx,ecx - mcall 4,<153,47>,,,1 - ret -;------------------------------------------------------------------------------ align 4 ; DATA AREA type dd 12 delay dd 100 @@ -575,7 +341,6 @@ stringlen dd 1 stringstart dd 0 stringpos dw 16 -time db 15 ; время до запуска заставки в минутах params db 0 ;if bit 0 set-ssaver works if bit 1 set-setup works fileinfo: @@ -586,12 +351,12 @@ fileinfo: .point: dd 0 db '/sys/macros.inc',0 -buttext db 'SHOW',0 -flag db 'V ' -title db 'SCREENSAVER SETUP',0 -setuptext db 'TYPE: < >',0 - db 'TIME: < > MINUTES NEVER',0 -typetext db 'BLACK SCREENCOLOR LINES ASSEMBLER ' +f70: ; run + dd 7, 0, 0, 0, 0 + db '/sys/@SS',0 + +screensaver db ? + ;------------------------------- IM_END: ; UNINITIALIZED DATA top_right_corner rd 1 @@ -604,9 +369,5 @@ fileinfo_buffer: rb 40 ;------------------------------- rb 512 -sthread_stack_top: - rb 512 -thread_stack_top: - rb 512 stack_top: I_END: diff --git a/programs/system/ss/trunk/Tupfile.lua b/programs/system/ss/trunk/Tupfile.lua deleted file mode 100644 index a340291389..0000000000 --- a/programs/system/ss/trunk/Tupfile.lua +++ /dev/null @@ -1,3 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) -tup.rule({"@ss.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "@ss") diff --git a/programs/system/ss/trunk/build_en.bat b/programs/system/ss/trunk/build_en.bat deleted file mode 100644 index 4629c2f083..0000000000 --- a/programs/system/ss/trunk/build_en.bat +++ /dev/null @@ -1,6 +0,0 @@ -@erase lang.inc -@echo lang fix en >lang.inc -@fasm -m 16384 @ss.asm @ss -@kpack @ss -@erase lang.inc -@pause \ No newline at end of file diff --git a/programs/system/ss/trunk/build_ru.bat b/programs/system/ss/trunk/build_ru.bat deleted file mode 100644 index 0bfa374768..0000000000 --- a/programs/system/ss/trunk/build_ru.bat +++ /dev/null @@ -1,6 +0,0 @@ -@erase lang.inc -@echo lang fix ru >lang.inc -@fasm -m 16384 @ss.asm @ss -@kpack @ss -@erase lang.inc -@pause \ No newline at end of file