Apps/unvwater: Added support for window resizing

This commit is contained in:
2025-03-13 11:48:52 +02:00
committed by Max Logaev
parent 99ddd88ff8
commit 31ca1c76bb

View File

@@ -1,8 +1,11 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; A unvwater demo ; SPDX-License-Identifier: GPL-2.0-only
; Programmed by Octavio Vega Fernandez ; Unvwater demo
; Copyright (C) 2010-2025 KolibriOS team
;
; Initially programmed by Octavio Vega Fernandez (c) in OctASM
; http://octavio.vega.fernandez.googlepages.com/CV4.HTM ; http://octavio.vega.fernandez.googlepages.com/CV4.HTM
; Converted to KolibriOS, By Asper ; Converted to FASM for KolibriOS by Asper
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
use32 use32
@@ -21,24 +24,13 @@ include '../../proc32.inc'
include '../../macros.inc' include '../../macros.inc'
include '../../KOSfuncs.inc' include '../../KOSfuncs.inc'
macro start_draw_window x,y,xsize,ysize,areacolor,caption;,capsize Screen_W dd 600-10 ;10 px for borders
{ Screen_H dd 400
mcall SF_REDRAW, SSF_BEGIN_DRAW
mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
push eax
lea ecx, [y*65536+ysize+eax]; [y start] *65536 + [y size] + [skin_height]
mov ebx, x*65536+xsize ; [x start] *65536 + [x size]
mov edx, areacolor ; color of work area RRGGBB
mov edi, caption;0x00ddeeff ; color of frames RRGGBB
mcall SF_CREATE_WINDOW
pop eax
}
SCREEN_WIDTH equ (600-10) ;10 px for borders
SCREEN_HEIGHT equ 400
align 4
STARTAPP: STARTAPP:
mcall SF_SYS_MISC,SSF_HEAP_INIT
call OnResize
mcall SF_SYSTEM, SSF_GET_CPU_FREQUENCY mcall SF_SYSTEM, SSF_GET_CPU_FREQUENCY
shr eax, 28 shr eax, 28
mov dword [delay], eax mov dword [delay], eax
@@ -51,13 +43,17 @@ init_palette:
inc al inc al
jnz @b jnz @b
align 4
MAIN: MAIN:
xor esi, esi xor esi, esi
mov ecx, SCREEN_WIDTH*SCREEN_HEIGHT mov edi, [img]
mov ecx, [Screen_W]
imul ecx, [Screen_H]
l11: l11:
xor ebx, ebx xor ebx, ebx
mov edx, 303h mov edx, 303h
sub esi, SCREEN_WIDTH+1 sub esi, [Screen_W]
dec esi
l2: l2:
cmp esi,0 cmp esi,0
jge @f jge @f
@@ -68,18 +64,21 @@ l2:
sub esi, ecx sub esi, ecx
@@: @@:
add bl, [esi+img] add bl, [esi+edi]
adc bh, ah adc bh, ah
inc esi inc esi
dec dh dec dh
jnz l2 jnz l2
mov dh, 3 mov dh, 3
add esi, SCREEN_WIDTH-3 add esi, [Screen_W]
sub esi, 3
dec dl dec dl
jnz l2 jnz l2
sub esi, 2*SCREEN_WIDTH-1 sub esi, [Screen_W]
sub esi, [Screen_W]
inc esi
cmp esi,0 cmp esi,0
jge @f jge @f
add esi, ecx add esi, ecx
@@ -89,7 +88,7 @@ l2:
sub esi, ecx sub esi, ecx
@@: @@:
mov al, [img+esi] mov al, [edi+esi]
sub bx, ax sub bx, ax
shl ax, 2 shl ax, 2
sub bx, ax sub bx, ax
@@ -98,7 +97,7 @@ l2:
mov ax, bx mov ax, bx
shr ax, 7 shr ax, 7
sub bx, ax sub bx, ax
mov [img+esi], bl mov [edi+esi], bl
inc esi inc esi
cmp esi, ecx cmp esi, ecx
@@ -136,9 +135,48 @@ button:
je close_app je close_app
jmp MAIN jmp MAIN
align 4
draw_window: draw_window:
start_draw_window 100,70,SCREEN_WIDTH+9,SCREEN_HEIGHT+4,0x54224466,labelt;, 14;labellen-labelt mcall SF_REDRAW, SSF_BEGIN_DRAW
mov dword [skin_h], eax mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
mov [skin_h], eax
lea ecx, [70*65536+4+eax]
add ecx, [Screen_H] ; [y start] *65536 + [y size] + [skin_height]
mov ebx, 100 shl 16
add ebx, [Screen_W]
add ebx, 9
mov edi, labelt
mcall SF_CREATE_WINDOW,,, 0x53224466
mcall SF_THREAD_INFO,procinfo,-1
mov eax, [skin_h]
add eax, 4
sub eax, [procinfo.box.height]
neg eax
cmp eax, [Screen_H]
je .end_h
cmp eax,32 ;min height
jge @f
mov eax,32
@@:
mov [Screen_H],eax
xor eax,eax
mov [Screen_W],eax
.end_h:
mov eax,[procinfo.box.width]
sub eax,9
cmp eax,[Screen_W]
je .resize_end
cmp eax,64 ;min width
jge @f
mov eax,64
@@:
mov [Screen_W],eax
call OnResize
.resize_end:
mcall SF_REDRAW, SSF_END_DRAW mcall SF_REDRAW, SSF_END_DRAW
ret ret
@@ -148,22 +186,33 @@ fail:
close_app: close_app:
mcall SF_TERMINATE_PROCESS mcall SF_TERMINATE_PROCESS
align 4
OnResize:
mov ecx,[Screen_W]
imul ecx,[Screen_H]
mcall SF_SYS_MISC,SSF_MEM_REALLOC,,[img]
mov byte[eax],1 ; set the coordinate of the start of the first wave:
; eax+0 -> point(0,0), eax+H*W+W -> point(W,H)
mov [img],eax
ret
align 4
copy_buffer_to_video: copy_buffer_to_video:
pusha pusha
;mcall SF_SYSTEM, SSF_WAIT_RETRACE ;mcall SF_SYSTEM, SSF_WAIT_RETRACE
mcall SF_SLEEP, [delay] mcall SF_SLEEP, [delay]
mov eax, dword [skin_h] mov eax, [skin_h]
lea edx, [5*65536+eax] lea edx, [5*65536+eax]
mov ecx, SCREEN_WIDTH*65536+SCREEN_HEIGHT ;ecx = w*65536+h mov ecx, [Screen_W]
shl ecx, 16
add ecx, [Screen_H]
;mov edx, 5*65536+25 ;edx = x*65536+y ;mov edx, 5*65536+25 ;edx = x*65536+y
mov esi, 8 mov esi, 8
mov edi, Paleta mov edi, Paleta
xor ebp, ebp xor ebp, ebp
mcall SF_PUT_IMAGE_EXT, img mcall SF_PUT_IMAGE_EXT, [img]
popa popa
ret ret
@@ -176,8 +225,8 @@ skin_h dd 25 ; Skin height.
I_END: I_END:
Paleta rb 1024 Paleta rb 1024
img db 1 img dd 0
rb SCREEN_WIDTH*SCREEN_HEIGHT procinfo process_information
rb 256 rb 256
align 4 align 4
STACKTOP: STACKTOP: