martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gui2: reorganized init/alloc code, added Widget_Resize, Widget_Move

Browse Source
This commit is contained in:
Martin Preuss
2026-03-04 23:26:05 +01:00
parent 0081c33c00
commit afdd52eaf6
1 changed files with 70 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
avr/modules/lcd2/gui2/base/widget.asm
View File

@@ -16,18 +16,18 @@
; Widget in flash ; Widget in flash
.equ WIDGET_OFFS_WIDGET = OBJECT_SIZE .equ WIDGET_OFFS_BEGIN = OBJECT_SIZE
.equ WIDGET_OFFS_X_LO = WIDGET_OFFS_WIDGET+0 .equ WIDGET_OFFS_X_LO = WIDGET_OFFS_BEGIN+0
.equ WIDGET_OFFS_X_HI = WIDGET_OFFS_WIDGET+1 .equ WIDGET_OFFS_X_HI = WIDGET_OFFS_BEGIN+1
.equ WIDGET_OFFS_Y_LO = WIDGET_OFFS_WIDGET+2 .equ WIDGET_OFFS_Y_LO = WIDGET_OFFS_BEGIN+2
.equ WIDGET_OFFS_Y_HI = WIDGET_OFFS_WIDGET+3 .equ WIDGET_OFFS_Y_HI = WIDGET_OFFS_BEGIN+3
.equ WIDGET_OFFS_WIDTH_LO = WIDGET_OFFS_WIDGET+4 .equ WIDGET_OFFS_WIDTH_LO = WIDGET_OFFS_BEGIN+4
.equ WIDGET_OFFS_WIDTH_HI = WIDGET_OFFS_WIDGET+5 .equ WIDGET_OFFS_WIDTH_HI = WIDGET_OFFS_BEGIN+5
.equ WIDGET_OFFS_HEIGHT_LO = WIDGET_OFFS_WIDGET+6 .equ WIDGET_OFFS_HEIGHT_LO = WIDGET_OFFS_BEGIN+6
.equ WIDGET_OFFS_HEIGHT_HI = WIDGET_OFFS_WIDGET+7 .equ WIDGET_OFFS_HEIGHT_HI = WIDGET_OFFS_BEGIN+7
.equ WIDGET_OFFS_STYLE_LO = WIDGET_OFFS_WIDGET+8 ; byte address (for LPM!) .equ WIDGET_OFFS_STYLE_LO = WIDGET_OFFS_BEGIN+8 ; byte address (for LPM!)
.equ WIDGET_OFFS_STYLE_HI = WIDGET_OFFS_WIDGET+9 .equ WIDGET_OFFS_STYLE_HI = WIDGET_OFFS_BEGIN+9
.equ WIDGET_SIZE = WIDGET_OFFS_WIDGET+10 .equ WIDGET_SIZE = WIDGET_OFFS_BEGIN+10
; widget style object ; widget style object
.equ WIDGET_STYLE_OFFS_FRONTCOL_NORM = 0 .equ WIDGET_STYLE_OFFS_FRONTCOL_NORM = 0
@@ -103,6 +103,8 @@
; @routine Widget_Init @global ; @routine Widget_Init @global
; ;
; @param Y address of object in SDRAM ; @param Y address of object in SDRAM
; @param r16 value for OBJECT_OFFS_OPTS_LO
; @param r17 value for OBJECT_OFFS_OPTS_HI
; @clobbers r16, r17, X ; @clobbers r16, r17, X
Widget_Init: Widget_Init:
@@ -112,9 +114,9 @@ Widget_Init:
; clear widget-specific data ; clear widget-specific data
mov xl, yl mov xl, yl
mov xh, yh mov xh, yh
adiw xh:xl, WIDGET_OFFS_WIDGET adiw xh:xl, WIDGET_OFFS_BEGIN
clr r16 clr r16
ldi r17, (WIDGET_SIZE-WIDGET_OFFS_WIDGET) ldi r17, (WIDGET_SIZE-WIDGET_OFFS_BEGIN)
bigcall Utils_FillSram ; (r17, X) bigcall Utils_FillSram ; (r17, X)
; set default signal map ; set default signal map
@@ -129,6 +131,14 @@ Widget_Init:
ldi r16, HIGH(Widget_DefaultStyle*2) ldi r16, HIGH(Widget_DefaultStyle*2)
std Y+WIDGET_OFFS_STYLE_HI, r16 std Y+WIDGET_OFFS_STYLE_HI, r16
; initial size: 1x1 px
ldi r16, 1
clr r17
std Y+WIDGET_OFFS_WIDTH_LO, r16
std Y+WIDGET_OFFS_WIDTH_HI, r17
std Y+WIDGET_OFFS_HEIGHT_LO, r16
std Y+WIDGET_OFFS_HEIGHT_HI, r17
ret ret
; @end ; @end
@@ -146,6 +156,48 @@ Widget_Fini:
; ---------------------------------------------------------------------------
; @routine Widget_Resize @global
;
; @param Y address of widget
; @param r9:r8 W
; @param r11:r10 H
; @clobbers r16
Widget_Resize:
std Y+WIDGET_OFFS_WIDTH_LO, r8
std Y+WIDGET_OFFS_WIDTH_HI, r9
std Y+WIDGET_OFFS_HEIGHT_LO, r10
std Y+WIDGET_OFFS_HEIGHT_HI, r11
ldd r16, Y+OBJECT_OFFS_FLAGS
ori r16, (1<<WIDGET_FLAGS_LAYOUT_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT)
std Y+OBJECT_OFFS_FLAGS, r16
ret
; @end
; ---------------------------------------------------------------------------
; @routine Widget_Move @global
;
; @param Y address of widget
; @param r5:r4 X0
; @param r7:r6 Y0
; @clobbers r16
Widget_Move:
std Y+WIDGET_OFFS_X_LO, r4
std Y+WIDGET_OFFS_X_HI, r5
std Y+WIDGET_OFFS_Y_LO, r6
std Y+WIDGET_OFFS_Y_HI, r7
ldd r16, Y+OBJECT_OFFS_FLAGS
ori r16, (1<<WIDGET_FLAGS_LAYOUT_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT)
std Y+OBJECT_OFFS_FLAGS, r16
ret
; @end
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; @routine Widget_OnDraw @global ; @routine Widget_OnDraw @global
; ;
@@ -600,6 +652,8 @@ widgetCalcAbsPosAndBorders:
; ***************************************************************************
; data in FLASH
Widget_DefaultSignalmap: Widget_DefaultSignalmap:
.db 0, WIDGET_SIGNAL_DRAW, LOW(Widget_OnDraw), HIGH(Widget_OnDraw) .db 0, WIDGET_SIGNAL_DRAW, LOW(Widget_OnDraw), HIGH(Widget_OnDraw)
@@ -624,3 +678,5 @@ Widget_DefaultStyle:
.db 12, 16 ; charWidth, charHeight .db 12, 16 ; charWidth, charHeight
#endif