From edc291261f7042ed734db047a6b643d36be622e5 Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Mon, 19 Jan 2026 18:33:36 +0100
Subject: [PATCH] gui2: added Button, RootWindow. Touch now works again.

---
 avr/devices/c03/main/main.asm        |    2 +
 avr/devices/c03/main/testwin.asm     | 1053 +++++++++++++++-----------
 avr/modules/lcd2/gui2/button.asm     |   99 +++
 avr/modules/lcd2/gui2/guiapp.asm     |   86 ++-
 avr/modules/lcd2/gui2/rootwidget.asm |   56 ++
 avr/modules/lcd2/gui2/widget.asm     |  190 +++--
 6 files changed, 959 insertions(+), 527 deletions(-)
 create mode 100644 avr/modules/lcd2/gui2/button.asm
 create mode 100644 avr/modules/lcd2/gui2/rootwidget.asm

diff --git a/avr/devices/c03/main/main.asm b/avr/devices/c03/main/main.asm
index 579df2d..5c2e9f0 100644
--- a/avr/devices/c03/main/main.asm
+++ b/avr/devices/c03/main/main.asm
@@ -309,7 +309,9 @@ test:
 
 .include "modules/lcd2/gui2/object.asm"
 .include "modules/lcd2/gui2/widget.asm"
+.include "modules/lcd2/gui2/rootwidget.asm"
 .include "modules/lcd2/gui2/label.asm"
+.include "modules/lcd2/gui2/button.asm"
 .include "modules/lcd2/gui2/imageview.asm"
 .include "modules/lcd2/gui2/sensorwatch.asm"
 .include "modules/lcd2/gui2/valuelabel.asm"
diff --git a/avr/devices/c03/main/testwin.asm b/avr/devices/c03/main/testwin.asm
index f06baa3..b8c387b 100644
--- a/avr/devices/c03/main/testwin.asm
+++ b/avr/devices/c03/main/testwin.asm
@@ -74,6 +74,18 @@ winSensorWatch3Image_ramdata:
 winSensorWatch3Value_ramdata:
   .byte VLABEL_SD_SIZE
 
+buttonNetwork_ramdata:
+  .byte IMGVIEW_SD_SIZE
+
+
+debugValue1_ramdata:
+  .byte VLABEL_SD_SIZE
+
+debugValue2_ramdata:
+  .byte VLABEL_SD_SIZE
+
+debugValue3_ramdata:
+  .byte VLABEL_SD_SIZE
 
 
 
@@ -102,9 +114,11 @@ testApp_signalmap:
   .db 0, WIDGET_SIGNAL_TOUCH,   LOW(GuiApp_OnTouch),       HIGH(GuiApp_OnTouch)
   .db 0, OBJECT_SIGNAL_RECVMSG, LOW(GuiApp_OnMsgReceived), HIGH(GuiApp_OnMsgReceived)
   .db 0, OBJECT_SIGNAL_CREATE,  LOW(GuiApp_OnCreate),      HIGH(GuiApp_OnCreate)
+  .db 0, GUIAPP_SIGNAL_DEBUG,   LOW(onAppDebug),           HIGH(onAppDebug)
   .db 0, 0, 0, 0           ; end of table
 
 
+
 testRootWin_flashdata:
   ; OBJECT
   .db 0x55, 0xaa               ; magic
@@ -121,10 +135,11 @@ testRootWin_flashdata:
   .dw DISPLAY_WIDTH             ; W
   .dw DISPLAY_HEIGHT            ; H
   .dw STYLE_WIN_FOREGROUND      ; front color
-;  .dw STYLE_WIN_BACKGROUND ; back color
-  .dw DISPLAY_COLOR_YELLOW
+  .dw STYLE_WIN_BACKGROUND      ; back color
   .dw STYLE_WIN_FONT*2          ; font
   .dw testRootWin_ramdata       ; ptr to SDRAM
+  ; ROOTWIDGET
+  .dw testApp_flashdata*2       ; GuiApp
 testRootWin_signalmap:
   .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate),  HIGH(Widget_OnCreate)
   .db 0, WIDGET_SIGNAL_DRAW,   LOW(Widget_OnDrawNop), HIGH(Widget_OnDrawNop)
@@ -157,441 +172,607 @@ testWin_signalmap:
   .db 0, 0, 0, 0  ; end of table
 
 
-testWinHeader_flashdata:
-  ; OBJECT
-  .db 0x55, 0xaa               ; magic
-  .dw testWinBody_flashdata*2    ; next
-  .dw testWin_flashdata*2        ; parent
-  .dw 0                          ; first child
-  .dw 0                          ; target
-  .dw 0                          ; selector (ony lower 8 bits used)
-  .dw testWinHeader_signalmap*2  ; signal map
-  ; WIDGET
-  .db 0, 0                        ; opts lo, hi
-  .dw 0                           ; X
-  .dw 0                           ; Y
-  .dw DISPLAY_WIDTH               ; W
-  .dw STYLE_WIN_TITLE_HEIGHT      ; H
-  .dw STYLE_WIN_TITLE_FOREGROUND  ; front color
-  .dw STYLE_WIN_TITLE_BACKGROUND  ; back color
-  .dw STYLE_WIN_FONT*2            ; font
-  .dw testWinHeader_ramdata       ; ptr to SDRAM
-  ; LABEL
-  .dw testWinHeader_text*2        ; text
-
-testWinHeader_text:
-  .db "Test-Window", 0
-testWinHeader_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,   LOW(Label_OnDraw),    HIGH(Label_OnDraw)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-testWinBody_flashdata:
-  ; OBJECT
-  .db 0x55, 0xaa               ; magic
-  .dw 0                                     ; next
-  .dw testWin_flashdata*2                   ; parent
-  .dw winSensorWatch1*2                     ; first child
-  .dw 0                                     ; target
-  .dw 0                                     ; selector (ony lower 8 bits used)
-  .dw testWinBody_signalmap*2               ; signal map
-  ; WIDGET
-  .db 0, 0                                  ; opts lo, hi
-  .dw 0                                     ; X
-  .dw STYLE_WIN_TITLE_HEIGHT                ; Y
-  .dw DISPLAY_WIDTH                         ; W
-  .dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT ; H
-  .dw STYLE_WIN_FOREGROUND                  ; front color
-;  .dw DISPLAY_COLOR_YELLOW
-  .dw STYLE_WIN_BACKGROUND                  ; back color
-  .dw STYLE_WIN_FONT*2                      ; font
-  .dw testWinBody_ramdata                   ; ptr to SDRAM
-
-testWinBody_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,   LOW(Widget_OnDraw),    HIGH(Widget_OnDraw)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-winSensorWatch1:
-  ; OBJECT
-  .db 0x55, 0xaa                            ; magic
-  .dw winSensorWatch2*2                     ; next
-  .dw testWinBody_flashdata*2               ; parent
-  .dw winSensorWatch1Title*2                ; first child
-  .dw 0                                     ; target
-  .dw 0                                     ; selector (ony lower 8 bits used)
-  .dw winSensorWatch1_signalmap*2           ; signal map
-  ; WIDGET
-  .db (1<<WIDGET_OPTSLO_MSGRECV_BIT), 0     ; opts lo, hi
-  .dw 4                                     ; X
-  .dw 4                                     ; Y
-  .dw 100                                   ; W   (image=96, 2 px borders)
-  .dw 100                                   ; H
-  .dw STYLE_WIN_FOREGROUND                  ; front color
-  .dw STYLE_WIN_BACKGROUND                  ; back color
-  .dw STYLE_WIN_FONT*2                      ; font
-  .dw winSensorWatch1_ramdata               ; ptr to SDRAM
-
-winSensorWatch1_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE,          LOW(SensorWatch_OnCreate),       HIGH(SensorWatch_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,            LOW(Widget_OnDraw),              HIGH(Widget_OnDraw)
-  .db 0, OBJECT_SIGNAL_RECVMSG,         LOW(SensorWatch_OnMsgReceived),  HIGH(SensorWatch_OnMsgReceived)
-  .db 0, SENSORWATCH_SIGNAL_SETSOURCE,  LOW(SensorWatch_OnSetSource),    HIGH(SensorWatch_OnSetSource)
-  .db 0, SENSORWATCH_SIGNAL_SETLIMWARN, LOW(SensorWatch_OnSetLimitWarn), HIGH(SensorWatch_OnSetLimitWarn)
-  .db 0, SENSORWATCH_SIGNAL_SETLIMCRIT, LOW(SensorWatch_OnSetLimitCrit), HIGH(SensorWatch_OnSetLimitCrit)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-winSensorWatch1Title:
-  ; OBJECT
-  .db 0x55, 0xaa               ; magic
-  .dw winSensorWatch1Image*2     ; next
-  .dw winSensorWatch1*2          ; parent
-  .dw 0                          ; first child
-  .dw 0                          ; target
-  .dw 0                          ; selector (ony lower 8 bits used)
-  .dw winSensorWatch1Title_signalmap*2  ; signal map
-  ; WIDGET
-  .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
-  .dw 2                                      ; X
-  .dw 1                                      ; Y
-  .dw 96                                     ; W
-  .dw STYLE_WIN_FONT_HEIGHT+2                ; H
-  .dw STYLE_WIN_FOREGROUND                   ; front color
-  .dw STYLE_WIN_BACKGROUND                   ; back color
-  .dw STYLE_WIN_FONT*2                       ; font
-  .dw winSensorWatch1Title_ramdata           ; ptr to SDRAM
-  ; LABEL
-  .dw winSensorWatch1Title_text*2            ; text
-
-winSensorWatch1Title_text:
-  .db "CO2", 0
-
-winSensorWatch1Title_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,   LOW(Label_OnDraw),    HIGH(Label_OnDraw)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-winSensorWatch1Image:
-  ; OBJECT
-  .db 0x55, 0xaa                            ; magic
-  .dw winSensorWatch1Value*2                ; next
-  .dw winSensorWatch1*2                     ; parent
-  .dw 0                                     ; first child
-  .dw 0                                     ; target
-  .dw 0                                     ; selector (ony lower 8 bits used)
-  .dw winSensorWatch1Image_signalmap*2      ; signal map
-  ; WIDGET
-  .db 0, 0                                  ; opts lo, hi
-  .dw 2                                     ; X
-  .dw STYLE_WIN_FONT_HEIGHT+2               ; Y
-  .dw 96                                    ; W
-  .dw 96                                    ; H
-  .dw STYLE_WIN_FOREGROUND                  ; front color
-  .dw STYLE_WIN_BACKGROUND                  ; back color
-  .dw STYLE_WIN_FONT*2                      ; font
-  .dw winSensorWatch1Image_ramdata          ; ptr to SDRAM
-  ; IMGVIEW
-  .dw RESSSOURCE_IMG_CLOUD96                ; ressource id
-
-winSensorWatch1Image_signalmap:
-  .db 0, WIDGET_SIGNAL_DRAW,      LOW(ImageView_OnDraw),     HIGH(ImageView_OnDraw)
-  .db 0, IMGVIEW_SIGNAL_SETBGCOL, LOW(ImageView_OnSetBgCol), HIGH(ImageView_OnSetBgCol)
-  .db 0, OBJECT_SIGNAL_CREATE,    LOW(ImageView_OnCreate),   HIGH(ImageView_OnCreate)
-  .db 0, 0, 0, 0  ; end of table
-
-
-winSensorWatch1Value:
-  ; OBJECT
-  .db 0x55, 0xaa                             ; magic
-  .dw 0                                      ; next
-  .dw winSensorWatch1*2                      ; parent
-  .dw 0                                      ; first child
-  .dw 0                                      ; target
-  .dw 0                                      ; selector (ony lower 8 bits used)
-  .dw winSensorWatch1Value_signalmap*2       ; signal map
-  ; WIDGET
-  .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
-  .dw 2                                      ; X
-  .dw STYLE_WIN_FONT_HEIGHT+2+96+2           ; Y
-  .dw 96                                     ; W
-  .dw STYLE_WIN_FONT_HEIGHT+4                ; H
-  .dw STYLE_WIN_FOREGROUND                   ; front color
-  .dw STYLE_WIN_BACKGROUND                   ; back color
-  .dw STYLE_WIN_FONT*2                       ; font
-  .dw winSensorWatch1Value_ramdata           ; ptr to SDRAM
-  ; VALUELABEL
-  .db 0, 0                                   ; num of post-komma digits
-
-
-winSensorWatch1Value_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE,   LOW(Widget_OnCreate),       HIGH(Widget_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
-  .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-
-
-
-winSensorWatch2:
-  ; OBJECT
-  .db 0x55, 0xaa                            ; magic
-  .dw winSensorWatch3*2                     ; next
-  .dw testWinBody_flashdata*2               ; parent
-  .dw winSensorWatch2Title*2                ; first child
-  .dw 0                                     ; target
-  .dw 0                                     ; selector (ony lower 8 bits used)
-  .dw winSensorWatch2_signalmap*2           ; signal map
-  ; WIDGET
-  .db (1<<WIDGET_OPTSLO_MSGRECV_BIT), 0     ; opts lo, hi
-  .dw 108                                   ; X
-  .dw 4                                     ; Y
-  .dw 100                                   ; W   (image=96, 2 px borders)
-  .dw 100                                   ; H
-  .dw STYLE_WIN_FOREGROUND                  ; front color
-  .dw STYLE_WIN_BACKGROUND                  ; back color
-  .dw STYLE_WIN_FONT*2                      ; font
-  .dw winSensorWatch2_ramdata               ; ptr to SDRAM
-
-winSensorWatch2_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE,          LOW(SensorWatch_OnCreate),       HIGH(SensorWatch_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,            LOW(Widget_OnDraw),              HIGH(Widget_OnDraw)
-  .db 0, OBJECT_SIGNAL_RECVMSG,         LOW(SensorWatch_OnMsgReceived),  HIGH(SensorWatch_OnMsgReceived)
-  .db 0, SENSORWATCH_SIGNAL_SETSOURCE,  LOW(SensorWatch_OnSetSource),    HIGH(SensorWatch_OnSetSource)
-  .db 0, SENSORWATCH_SIGNAL_SETLIMWARN, LOW(SensorWatch_OnSetLimitWarn), HIGH(SensorWatch_OnSetLimitWarn)
-  .db 0, SENSORWATCH_SIGNAL_SETLIMCRIT, LOW(SensorWatch_OnSetLimitCrit), HIGH(SensorWatch_OnSetLimitCrit)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-winSensorWatch2Title:
-  ; OBJECT
-  .db 0x55, 0xaa               ; magic
-  .dw winSensorWatch2Image*2     ; next
-  .dw winSensorWatch2*2          ; parent
-  .dw 0                          ; first child
-  .dw 0                          ; target
-  .dw 0                          ; selector (ony lower 8 bits used)
-  .dw winSensorWatch2Title_signalmap*2  ; signal map
-  ; WIDGET
-  .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
-  .dw 2                                      ; X
-  .dw 1                                      ; Y
-  .dw 96                                     ; W
-  .dw STYLE_WIN_FONT_HEIGHT+2                ; H
-  .dw STYLE_WIN_FOREGROUND                   ; front color
-  .dw STYLE_WIN_BACKGROUND                   ; back color
-  .dw STYLE_WIN_FONT*2                       ; font
-  .dw winSensorWatch2Title_ramdata           ; ptr to SDRAM
-  ; LABEL
-  .dw winSensorWatch2Title_text*2            ; text
-
-winSensorWatch2Title_text:
-  .db "Temp", 0, 0
-
-winSensorWatch2Title_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,   LOW(Label_OnDraw),    HIGH(Label_OnDraw)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-winSensorWatch2Image:
-  ; OBJECT
-  .db 0x55, 0xaa                            ; magic
-  .dw winSensorWatch2Value*2                ; next
-  .dw winSensorWatch2*2                     ; parent
-  .dw 0                                     ; first child
-  .dw 0                                     ; target
-  .dw 0                                     ; selector (ony lower 8 bits used)
-  .dw winSensorWatch2Image_signalmap*2      ; signal map
-  ; WIDGET
-  .db 0, 0                                  ; opts lo, hi
-  .dw 2                                     ; X
-  .dw STYLE_WIN_FONT_HEIGHT+2               ; Y
-  .dw 96                                    ; W
-  .dw 96                                    ; H
-  .dw STYLE_WIN_FOREGROUND                  ; front color
-  .dw STYLE_WIN_BACKGROUND                  ; back color
-  .dw STYLE_WIN_FONT*2                      ; font
-  .dw winSensorWatch2Image_ramdata          ; ptr to SDRAM
-  ; IMGVIEW
-  .dw RESSSOURCE_IMG_TEMP96                ; ressource id
-
-winSensorWatch2Image_signalmap:
-  .db 0, WIDGET_SIGNAL_DRAW,      LOW(ImageView_OnDraw),     HIGH(ImageView_OnDraw)
-  .db 0, IMGVIEW_SIGNAL_SETBGCOL, LOW(ImageView_OnSetBgCol), HIGH(ImageView_OnSetBgCol)
-  .db 0, OBJECT_SIGNAL_CREATE,    LOW(ImageView_OnCreate),   HIGH(ImageView_OnCreate)
-  .db 0, 0, 0, 0  ; end of table
-
-
-winSensorWatch2Value:
-  ; OBJECT
-  .db 0x55, 0xaa                             ; magic
-  .dw 0                                      ; next
-  .dw winSensorWatch2*2                      ; parent
-  .dw 0                                      ; first child
-  .dw 0                                      ; target
-  .dw 0                                      ; selector (ony lower 8 bits used)
-  .dw winSensorWatch2Value_signalmap*2       ; signal map
-  ; WIDGET
-  .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
-  .dw 2                                      ; X
-  .dw STYLE_WIN_FONT_HEIGHT+2+96+2           ; Y
-  .dw 96                                     ; W
-  .dw STYLE_WIN_FONT_HEIGHT+4                ; H
-  .dw STYLE_WIN_FOREGROUND                   ; front color
-  .dw STYLE_WIN_BACKGROUND                   ; back color
-  .dw STYLE_WIN_FONT*2                       ; font
-  .dw winSensorWatch2Value_ramdata           ; ptr to SDRAM
-  ; VALUELABEL
-  .db 2, 0                                   ; num of post-komma digits
-
-
-winSensorWatch2Value_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE,   LOW(Widget_OnCreate),       HIGH(Widget_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
-  .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-
-
-
-winSensorWatch3:
-  ; OBJECT
-  .db 0x55, 0xaa                            ; magic
-  .dw 0                                     ; next
-  .dw testWinBody_flashdata*2               ; parent
-  .dw winSensorWatch3Title*2                ; first child
-  .dw 0                                     ; target
-  .dw 0                                     ; selector (ony lower 8 bits used)
-  .dw winSensorWatch3_signalmap*2           ; signal map
-  ; WIDGET
-  .db (1<<WIDGET_OPTSLO_MSGRECV_BIT), 0     ; opts lo, hi
-  .dw 212                                   ; X
-  .dw 4                                     ; Y
-  .dw 100                                   ; W   (image=96, 2 px borders)
-  .dw 100                                   ; H
-  .dw STYLE_WIN_FOREGROUND                  ; front color
-  .dw STYLE_WIN_BACKGROUND                  ; back color
-  .dw STYLE_WIN_FONT*2                      ; font
-  .dw winSensorWatch3_ramdata               ; ptr to SDRAM
-
-winSensorWatch3_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE,          LOW(SensorWatch_OnCreate),       HIGH(SensorWatch_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,            LOW(Widget_OnDraw),              HIGH(Widget_OnDraw)
-  .db 0, OBJECT_SIGNAL_RECVMSG,         LOW(SensorWatch_OnMsgReceived),  HIGH(SensorWatch_OnMsgReceived)
-  .db 0, SENSORWATCH_SIGNAL_SETSOURCE,  LOW(SensorWatch_OnSetSource),    HIGH(SensorWatch_OnSetSource)
-  .db 0, SENSORWATCH_SIGNAL_SETLIMWARN, LOW(SensorWatch_OnSetLimitWarn), HIGH(SensorWatch_OnSetLimitWarn)
-  .db 0, SENSORWATCH_SIGNAL_SETLIMCRIT, LOW(SensorWatch_OnSetLimitCrit), HIGH(SensorWatch_OnSetLimitCrit)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-winSensorWatch3Title:
-  ; OBJECT
-  .db 0x55, 0xaa               ; magic
-  .dw winSensorWatch3Image*2     ; next
-  .dw winSensorWatch3*2          ; parent
-  .dw 0                          ; first child
-  .dw 0                          ; target
-  .dw 0                          ; selector (ony lower 8 bits used)
-  .dw winSensorWatch3Title_signalmap*2  ; signal map
-  ; WIDGET
-  .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
-  .dw 2                                      ; X
-  .dw 1                                      ; Y
-  .dw 96                                     ; W
-  .dw STYLE_WIN_FONT_HEIGHT+2                ; H
-  .dw STYLE_WIN_FOREGROUND                   ; front color
-  .dw STYLE_WIN_BACKGROUND                   ; back color
-  .dw STYLE_WIN_FONT*2                       ; font
-  .dw winSensorWatch3Title_ramdata           ; ptr to SDRAM
-  ; LABEL
-  .dw winSensorWatch3Title_text*2            ; text
-
-winSensorWatch3Title_text:
-  .db "Hum", 0
-
-winSensorWatch3Title_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,   LOW(Label_OnDraw),    HIGH(Label_OnDraw)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
-winSensorWatch3Image:
-  ; OBJECT
-  .db 0x55, 0xaa                            ; magic
-  .dw winSensorWatch3Value*2                ; next
-  .dw winSensorWatch3*2                     ; parent
-  .dw 0                                     ; first child
-  .dw 0                                     ; target
-  .dw 0                                     ; selector (ony lower 8 bits used)
-  .dw winSensorWatch3Image_signalmap*2      ; signal map
-  ; WIDGET
-  .db 0, 0                                  ; opts lo, hi
-  .dw 2                                     ; X
-  .dw STYLE_WIN_FONT_HEIGHT+2               ; Y
-  .dw 96                                    ; W
-  .dw 96                                    ; H
-  .dw STYLE_WIN_FOREGROUND                  ; front color
-  .dw STYLE_WIN_BACKGROUND                  ; back color
-  .dw STYLE_WIN_FONT*2                      ; font
-  .dw winSensorWatch3Image_ramdata          ; ptr to SDRAM
-  ; IMGVIEW
-  .dw RESSSOURCE_IMG_HUMIDITY96             ; ressource id
-
-winSensorWatch3Image_signalmap:
-  .db 0, WIDGET_SIGNAL_DRAW,      LOW(ImageView_OnDraw),     HIGH(ImageView_OnDraw)
-  .db 0, IMGVIEW_SIGNAL_SETBGCOL, LOW(ImageView_OnSetBgCol), HIGH(ImageView_OnSetBgCol)
-  .db 0, OBJECT_SIGNAL_CREATE,    LOW(ImageView_OnCreate),   HIGH(ImageView_OnCreate)
-  .db 0, 0, 0, 0  ; end of table
-
-
-winSensorWatch3Value:
-  ; OBJECT
-  .db 0x55, 0xaa                             ; magic
-  .dw 0                                      ; next
-  .dw winSensorWatch3*2                      ; parent
-  .dw 0                                      ; first child
-  .dw 0                                      ; target
-  .dw 0                                      ; selector (ony lower 8 bits used)
-  .dw winSensorWatch3Value_signalmap*2       ; signal map
-  ; WIDGET
-  .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
-  .dw 2                                      ; X
-  .dw STYLE_WIN_FONT_HEIGHT+2+96+2           ; Y
-  .dw 96                                     ; W
-  .dw STYLE_WIN_FONT_HEIGHT+4                ; H
-  .dw STYLE_WIN_FOREGROUND                   ; front color
-  .dw STYLE_WIN_BACKGROUND                   ; back color
-  .dw STYLE_WIN_FONT*2                       ; font
-  .dw winSensorWatch3Value_ramdata           ; ptr to SDRAM
-  ; VALUELABEL
-  .db 0, 0                                   ; num of post-komma digits
-
-
-winSensorWatch3Value_signalmap:
-  .db 0, OBJECT_SIGNAL_CREATE,   LOW(Widget_OnCreate),       HIGH(Widget_OnCreate)
-  .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
-  .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
-  .db 0, 0, 0, 0  ; end of table
-
-
-
 
+  testWinHeader_flashdata:
+    ; OBJECT
+    .db 0x55, 0xaa               ; magic
+    .dw testWinBody_flashdata*2    ; next
+    .dw testWin_flashdata*2        ; parent
+    .dw 0                          ; first child
+    .dw 0                          ; target
+    .dw 0                          ; selector (ony lower 8 bits used)
+    .dw testWinHeader_signalmap*2  ; signal map
+    ; WIDGET
+    .db 0, 0                        ; opts lo, hi
+    .dw 0                           ; X
+    .dw 0                           ; Y
+    .dw DISPLAY_WIDTH               ; W
+    .dw STYLE_WIN_TITLE_HEIGHT      ; H
+    .dw STYLE_WIN_TITLE_FOREGROUND  ; front color
+    .dw STYLE_WIN_TITLE_BACKGROUND  ; back color
+    .dw STYLE_WIN_FONT*2            ; font
+    .dw testWinHeader_ramdata       ; ptr to SDRAM
+    ; LABEL
+    .dw testWinHeader_text*2        ; text
+  
+  testWinHeader_text:
+    .db "Test-Window", 0
+  testWinHeader_signalmap:
+    .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
+    .db 0, WIDGET_SIGNAL_DRAW,   LOW(Label_OnDraw),    HIGH(Label_OnDraw)
+    .db 0, 0, 0, 0  ; end of table
+  
+  
+  
+    testWinBody_flashdata:
+      ; OBJECT
+      .db 0x55, 0xaa               ; magic
+      .dw 0                                     ; next
+      .dw testWin_flashdata*2                   ; parent
+      .dw winSensorWatch1*2                     ; first child
+      .dw 0                                     ; target
+      .dw 0                                     ; selector (ony lower 8 bits used)
+      .dw testWinBody_signalmap*2               ; signal map
+      ; WIDGET
+      .db 0, 0                                  ; opts lo, hi
+      .dw 0                                     ; X
+      .dw STYLE_WIN_TITLE_HEIGHT                ; Y
+      .dw DISPLAY_WIDTH                         ; W
+      .dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT ; H
+      .dw STYLE_WIN_FOREGROUND                  ; front color
+    ;  .dw DISPLAY_COLOR_YELLOW
+      .dw STYLE_WIN_BACKGROUND                  ; back color
+      .dw STYLE_WIN_FONT*2                      ; font
+      .dw testWinBody_ramdata                   ; ptr to SDRAM
+    
+    testWinBody_signalmap:
+      .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
+      .db 0, WIDGET_SIGNAL_DRAW,   LOW(Widget_OnDraw),    HIGH(Widget_OnDraw)
+      .db 0, 0, 0, 0  ; end of table
+    
+    
+    
+      winSensorWatch1:
+        ; OBJECT
+        .db 0x55, 0xaa                            ; magic
+        .dw winSensorWatch2*2                     ; next
+        .dw testWinBody_flashdata*2               ; parent
+        .dw winSensorWatch1Title*2                ; first child
+        .dw 0                                     ; target
+        .dw 0                                     ; selector (ony lower 8 bits used)
+        .dw winSensorWatch1_signalmap*2           ; signal map
+        ; WIDGET
+        .db (1<<WIDGET_OPTSLO_MSGRECV_BIT), 0     ; opts lo, hi
+        .dw 4                                     ; X
+        .dw 4                                     ; Y
+        .dw 100                                   ; W   (image=96, 2 px borders)
+        .dw 100                                   ; H
+        .dw STYLE_WIN_FOREGROUND                  ; front color
+        .dw STYLE_WIN_BACKGROUND                  ; back color
+        .dw STYLE_WIN_FONT*2                      ; font
+        .dw winSensorWatch1_ramdata               ; ptr to SDRAM
+      
+      winSensorWatch1_signalmap:
+        .db 0, OBJECT_SIGNAL_CREATE,          LOW(SensorWatch_OnCreate),       HIGH(SensorWatch_OnCreate)
+        .db 0, WIDGET_SIGNAL_DRAW,            LOW(Widget_OnDraw),              HIGH(Widget_OnDraw)
+        .db 0, OBJECT_SIGNAL_RECVMSG,         LOW(SensorWatch_OnMsgReceived),  HIGH(SensorWatch_OnMsgReceived)
+        .db 0, SENSORWATCH_SIGNAL_SETSOURCE,  LOW(SensorWatch_OnSetSource),    HIGH(SensorWatch_OnSetSource)
+        .db 0, SENSORWATCH_SIGNAL_SETLIMWARN, LOW(SensorWatch_OnSetLimitWarn), HIGH(SensorWatch_OnSetLimitWarn)
+        .db 0, SENSORWATCH_SIGNAL_SETLIMCRIT, LOW(SensorWatch_OnSetLimitCrit), HIGH(SensorWatch_OnSetLimitCrit)
+        .db 0, 0, 0, 0  ; end of table
+      
+      
+      
+        winSensorWatch1Title:
+          ; OBJECT
+          .db 0x55, 0xaa               ; magic
+          .dw winSensorWatch1Image*2     ; next
+          .dw winSensorWatch1*2          ; parent
+          .dw 0                          ; first child
+          .dw 0                          ; target
+          .dw 0                          ; selector (ony lower 8 bits used)
+          .dw winSensorWatch1Title_signalmap*2  ; signal map
+          ; WIDGET
+          .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+          .dw 2                                      ; X
+          .dw 1                                      ; Y
+          .dw 96                                     ; W
+          .dw STYLE_WIN_FONT_HEIGHT+2                ; H
+          .dw STYLE_WIN_FOREGROUND                   ; front color
+          .dw STYLE_WIN_BACKGROUND                   ; back color
+          .dw STYLE_WIN_FONT*2                       ; font
+          .dw winSensorWatch1Title_ramdata           ; ptr to SDRAM
+          ; LABEL
+          .dw winSensorWatch1Title_text*2            ; text
+        
+        winSensorWatch1Title_text:
+          .db "CO2", 0
+        
+        winSensorWatch1Title_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,   LOW(Label_OnDraw),    HIGH(Label_OnDraw)
+          .db 0, 0, 0, 0  ; end of table
+        
+        
+        
+        winSensorWatch1Image:
+          ; OBJECT
+          .db 0x55, 0xaa                            ; magic
+          .dw winSensorWatch1Value*2                ; next
+          .dw winSensorWatch1*2                     ; parent
+          .dw 0                                     ; first child
+          .dw 0                                     ; target
+          .dw 0                                     ; selector (ony lower 8 bits used)
+          .dw winSensorWatch1Image_signalmap*2      ; signal map
+          ; WIDGET
+          .db 0, 0                                  ; opts lo, hi
+          .dw 2                                     ; X
+          .dw STYLE_WIN_FONT_HEIGHT+2               ; Y
+          .dw 96                                    ; W
+          .dw 96                                    ; H
+          .dw STYLE_WIN_FOREGROUND                  ; front color
+          .dw STYLE_WIN_BACKGROUND                  ; back color
+          .dw STYLE_WIN_FONT*2                      ; font
+          .dw winSensorWatch1Image_ramdata          ; ptr to SDRAM
+          ; IMGVIEW
+          .dw RESSSOURCE_IMG_CLOUD96                ; ressource id
+        
+        winSensorWatch1Image_signalmap:
+          .db 0, WIDGET_SIGNAL_DRAW,      LOW(ImageView_OnDraw),     HIGH(ImageView_OnDraw)
+          .db 0, IMGVIEW_SIGNAL_SETBGCOL, LOW(ImageView_OnSetBgCol), HIGH(ImageView_OnSetBgCol)
+          .db 0, OBJECT_SIGNAL_CREATE,    LOW(ImageView_OnCreate),   HIGH(ImageView_OnCreate)
+          .db 0, 0, 0, 0  ; end of table
+        
+        
+        
+        winSensorWatch1Value:
+          ; OBJECT
+          .db 0x55, 0xaa                             ; magic
+          .dw 0                                      ; next
+          .dw winSensorWatch1*2                      ; parent
+          .dw 0                                      ; first child
+          .dw 0                                      ; target
+          .dw 0                                      ; selector (ony lower 8 bits used)
+          .dw winSensorWatch1Value_signalmap*2       ; signal map
+          ; WIDGET
+          .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+          .dw 2                                      ; X
+          .dw STYLE_WIN_FONT_HEIGHT+2+96+2           ; Y
+          .dw 96                                     ; W
+          .dw STYLE_WIN_FONT_HEIGHT+4                ; H
+          .dw STYLE_WIN_FOREGROUND                   ; front color
+          .dw STYLE_WIN_BACKGROUND                   ; back color
+          .dw STYLE_WIN_FONT*2                       ; font
+          .dw winSensorWatch1Value_ramdata           ; ptr to SDRAM
+          ; VALUELABEL
+          .db 0, 0                                   ; num of post-komma digits
+        
+        
+        winSensorWatch1Value_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE,   LOW(ValueLabel_OnCreate),   HIGH(ValueLabel_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
+          .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
+          .db 0, 0, 0, 0  ; end of table
+      
+      
+      
+      winSensorWatch2:
+        ; OBJECT
+        .db 0x55, 0xaa                            ; magic
+        .dw winSensorWatch3*2                     ; next
+        .dw testWinBody_flashdata*2               ; parent
+        .dw winSensorWatch2Title*2                ; first child
+        .dw 0                                     ; target
+        .dw 0                                     ; selector (ony lower 8 bits used)
+        .dw winSensorWatch2_signalmap*2           ; signal map
+        ; WIDGET
+        .db (1<<WIDGET_OPTSLO_MSGRECV_BIT), 0     ; opts lo, hi
+        .dw 108                                   ; X
+        .dw 4                                     ; Y
+        .dw 100                                   ; W   (image=96, 2 px borders)
+        .dw 100                                   ; H
+        .dw STYLE_WIN_FOREGROUND                  ; front color
+        .dw STYLE_WIN_BACKGROUND                  ; back color
+        .dw STYLE_WIN_FONT*2                      ; font
+        .dw winSensorWatch2_ramdata               ; ptr to SDRAM
+      
+      winSensorWatch2_signalmap:
+        .db 0, OBJECT_SIGNAL_CREATE,          LOW(SensorWatch_OnCreate),       HIGH(SensorWatch_OnCreate)
+        .db 0, WIDGET_SIGNAL_DRAW,            LOW(Widget_OnDraw),              HIGH(Widget_OnDraw)
+        .db 0, OBJECT_SIGNAL_RECVMSG,         LOW(SensorWatch_OnMsgReceived),  HIGH(SensorWatch_OnMsgReceived)
+        .db 0, SENSORWATCH_SIGNAL_SETSOURCE,  LOW(SensorWatch_OnSetSource),    HIGH(SensorWatch_OnSetSource)
+        .db 0, SENSORWATCH_SIGNAL_SETLIMWARN, LOW(SensorWatch_OnSetLimitWarn), HIGH(SensorWatch_OnSetLimitWarn)
+        .db 0, SENSORWATCH_SIGNAL_SETLIMCRIT, LOW(SensorWatch_OnSetLimitCrit), HIGH(SensorWatch_OnSetLimitCrit)
+        .db 0, 0, 0, 0  ; end of table
+      
+      
+      
+        winSensorWatch2Title:
+          ; OBJECT
+          .db 0x55, 0xaa               ; magic
+          .dw winSensorWatch2Image*2     ; next
+          .dw winSensorWatch2*2          ; parent
+          .dw 0                          ; first child
+          .dw 0                          ; target
+          .dw 0                          ; selector (ony lower 8 bits used)
+          .dw winSensorWatch2Title_signalmap*2  ; signal map
+          ; WIDGET
+          .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+          .dw 2                                      ; X
+          .dw 1                                      ; Y
+          .dw 96                                     ; W
+          .dw STYLE_WIN_FONT_HEIGHT+2                ; H
+          .dw STYLE_WIN_FOREGROUND                   ; front color
+          .dw STYLE_WIN_BACKGROUND                   ; back color
+          .dw STYLE_WIN_FONT*2                       ; font
+          .dw winSensorWatch2Title_ramdata           ; ptr to SDRAM
+          ; LABEL
+          .dw winSensorWatch2Title_text*2            ; text
+        
+        winSensorWatch2Title_text:
+          .db "Temp", 0, 0
+        
+        winSensorWatch2Title_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,   LOW(Label_OnDraw),    HIGH(Label_OnDraw)
+          .db 0, 0, 0, 0  ; end of table
+        
+        
+        
+        winSensorWatch2Image:
+          ; OBJECT
+          .db 0x55, 0xaa                            ; magic
+          .dw winSensorWatch2Value*2                ; next
+          .dw winSensorWatch2*2                     ; parent
+          .dw 0                                     ; first child
+          .dw 0                                     ; target
+          .dw 0                                     ; selector (ony lower 8 bits used)
+          .dw winSensorWatch2Image_signalmap*2      ; signal map
+          ; WIDGET
+          .db 0, 0                                  ; opts lo, hi
+          .dw 2                                     ; X
+          .dw STYLE_WIN_FONT_HEIGHT+2               ; Y
+          .dw 96                                    ; W
+          .dw 96                                    ; H
+          .dw STYLE_WIN_FOREGROUND                  ; front color
+          .dw STYLE_WIN_BACKGROUND                  ; back color
+          .dw STYLE_WIN_FONT*2                      ; font
+          .dw winSensorWatch2Image_ramdata          ; ptr to SDRAM
+          ; IMGVIEW
+          .dw RESSSOURCE_IMG_TEMP96                ; ressource id
+        
+        winSensorWatch2Image_signalmap:
+          .db 0, WIDGET_SIGNAL_DRAW,      LOW(ImageView_OnDraw),     HIGH(ImageView_OnDraw)
+          .db 0, IMGVIEW_SIGNAL_SETBGCOL, LOW(ImageView_OnSetBgCol), HIGH(ImageView_OnSetBgCol)
+          .db 0, OBJECT_SIGNAL_CREATE,    LOW(ImageView_OnCreate),   HIGH(ImageView_OnCreate)
+          .db 0, 0, 0, 0  ; end of table
+        
+        
+        winSensorWatch2Value:
+          ; OBJECT
+          .db 0x55, 0xaa                             ; magic
+          .dw 0                                      ; next
+          .dw winSensorWatch2*2                      ; parent
+          .dw 0                                      ; first child
+          .dw 0                                      ; target
+          .dw 0                                      ; selector (ony lower 8 bits used)
+          .dw winSensorWatch2Value_signalmap*2       ; signal map
+          ; WIDGET
+          .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+          .dw 2                                      ; X
+          .dw STYLE_WIN_FONT_HEIGHT+2+96+2           ; Y
+          .dw 96                                     ; W
+          .dw STYLE_WIN_FONT_HEIGHT+4                ; H
+          .dw STYLE_WIN_FOREGROUND                   ; front color
+          .dw STYLE_WIN_BACKGROUND                   ; back color
+          .dw STYLE_WIN_FONT*2                       ; font
+          .dw winSensorWatch2Value_ramdata           ; ptr to SDRAM
+          ; VALUELABEL
+          .db 2, 0                                   ; num of post-komma digits
+        
+        
+        winSensorWatch2Value_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE,   LOW(ValueLabel_OnCreate),   HIGH(ValueLabel_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
+          .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
+          .db 0, 0, 0, 0  ; end of table
+      
+      
+      
+      winSensorWatch3:
+        ; OBJECT
+        .db 0x55, 0xaa                            ; magic
+        .dw buttonNetwork*2                       ; next
+        .dw testWinBody_flashdata*2               ; parent
+        .dw winSensorWatch3Title*2                ; first child
+        .dw 0                                     ; target
+        .dw 0                                     ; selector (ony lower 8 bits used)
+        .dw winSensorWatch3_signalmap*2           ; signal map
+        ; WIDGET
+        .db (1<<WIDGET_OPTSLO_MSGRECV_BIT), 0     ; opts lo, hi
+        .dw 212                                   ; X
+        .dw 4                                     ; Y
+        .dw 100                                   ; W   (image=96, 2 px borders)
+        .dw 100                                   ; H
+        .dw STYLE_WIN_FOREGROUND                  ; front color
+        .dw STYLE_WIN_BACKGROUND                  ; back color
+        .dw STYLE_WIN_FONT*2                      ; font
+        .dw winSensorWatch3_ramdata               ; ptr to SDRAM
+      
+      winSensorWatch3_signalmap:
+        .db 0, OBJECT_SIGNAL_CREATE,          LOW(SensorWatch_OnCreate),       HIGH(SensorWatch_OnCreate)
+        .db 0, WIDGET_SIGNAL_DRAW,            LOW(Widget_OnDraw),              HIGH(Widget_OnDraw)
+        .db 0, OBJECT_SIGNAL_RECVMSG,         LOW(SensorWatch_OnMsgReceived),  HIGH(SensorWatch_OnMsgReceived)
+        .db 0, SENSORWATCH_SIGNAL_SETSOURCE,  LOW(SensorWatch_OnSetSource),    HIGH(SensorWatch_OnSetSource)
+        .db 0, SENSORWATCH_SIGNAL_SETLIMWARN, LOW(SensorWatch_OnSetLimitWarn), HIGH(SensorWatch_OnSetLimitWarn)
+        .db 0, SENSORWATCH_SIGNAL_SETLIMCRIT, LOW(SensorWatch_OnSetLimitCrit), HIGH(SensorWatch_OnSetLimitCrit)
+        .db 0, 0, 0, 0  ; end of table
+      
+      
+      
+        winSensorWatch3Title:
+          ; OBJECT
+          .db 0x55, 0xaa                             ; magic
+          .dw winSensorWatch3Image*2                 ; next
+          .dw winSensorWatch3*2                      ; parent
+          .dw 0                                      ; first child
+          .dw 0                                      ; target
+          .dw 0                                      ; selector (ony lower 8 bits used)
+          .dw winSensorWatch3Title_signalmap*2       ; signal map
+          ; WIDGET
+          .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+          .dw 2                                      ; X
+          .dw 1                                      ; Y
+          .dw 96                                     ; W
+          .dw STYLE_WIN_FONT_HEIGHT+2                ; H
+          .dw STYLE_WIN_FOREGROUND                   ; front color
+          .dw STYLE_WIN_BACKGROUND                   ; back color
+          .dw STYLE_WIN_FONT*2                       ; font
+          .dw winSensorWatch3Title_ramdata           ; ptr to SDRAM
+          ; LABEL
+          .dw winSensorWatch3Title_text*2            ; text
+        
+        winSensorWatch3Title_text:
+          .db "Hum", 0
+        
+        winSensorWatch3Title_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE, LOW(Widget_OnCreate), HIGH(Widget_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,   LOW(Label_OnDraw),    HIGH(Label_OnDraw)
+          .db 0, 0, 0, 0  ; end of table
+        
+        
+        
+        winSensorWatch3Image:
+          ; OBJECT
+          .db 0x55, 0xaa                            ; magic
+          .dw winSensorWatch3Value*2                ; next
+          .dw winSensorWatch3*2                     ; parent
+          .dw 0                                     ; first child
+          .dw 0                                     ; target
+          .dw 0                                     ; selector (ony lower 8 bits used)
+          .dw winSensorWatch3Image_signalmap*2      ; signal map
+          ; WIDGET
+          .db 0, 0                                  ; opts lo, hi
+          .dw 2                                     ; X
+          .dw STYLE_WIN_FONT_HEIGHT+2               ; Y
+          .dw 96                                    ; W
+          .dw 96                                    ; H
+          .dw STYLE_WIN_FOREGROUND                  ; front color
+          .dw STYLE_WIN_BACKGROUND                  ; back color
+          .dw STYLE_WIN_FONT*2                      ; font
+          .dw winSensorWatch3Image_ramdata          ; ptr to SDRAM
+          ; IMGVIEW
+          .dw RESSSOURCE_IMG_HUMIDITY96             ; ressource id
+        
+        winSensorWatch3Image_signalmap:
+          .db 0, WIDGET_SIGNAL_DRAW,      LOW(ImageView_OnDraw),     HIGH(ImageView_OnDraw)
+          .db 0, IMGVIEW_SIGNAL_SETBGCOL, LOW(ImageView_OnSetBgCol), HIGH(ImageView_OnSetBgCol)
+          .db 0, OBJECT_SIGNAL_CREATE,    LOW(ImageView_OnCreate),   HIGH(ImageView_OnCreate)
+          .db 0, 0, 0, 0  ; end of table
+        
+        
+        winSensorWatch3Value:
+          ; OBJECT
+          .db 0x55, 0xaa                             ; magic
+          .dw 0                                      ; next
+          .dw winSensorWatch3*2                      ; parent
+          .dw 0                                      ; first child
+          .dw 0                                      ; target
+          .dw 0                                      ; selector (ony lower 8 bits used)
+          .dw winSensorWatch3Value_signalmap*2       ; signal map
+          ; WIDGET
+          .db 0, (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+          .dw 2                                      ; X
+          .dw STYLE_WIN_FONT_HEIGHT+2+96+2           ; Y
+          .dw 96                                     ; W
+          .dw STYLE_WIN_FONT_HEIGHT+4                ; H
+          .dw STYLE_WIN_FOREGROUND                   ; front color
+          .dw STYLE_WIN_BACKGROUND                   ; back color
+          .dw STYLE_WIN_FONT*2                       ; font
+          .dw winSensorWatch3Value_ramdata           ; ptr to SDRAM
+          ; VALUELABEL
+          .db 0, 0                                   ; num of post-komma digits
+        
+        
+        winSensorWatch3Value_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE,   LOW(ValueLabel_OnCreate),   HIGH(ValueLabel_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
+          .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
+          .db 0, 0, 0, 0  ; end of table
+
+
+      buttonNetwork:
+        ; OBJECT
+        .db 0x55, 0xaa                             ; magic
+        .dw debugValue1*2                          ; next
+        .dw testWinBody_flashdata*2                ; parent
+        .dw 0                                      ; first child
+        .dw testWinBody_flashdata*2                ; target
+        .dw 0                                      ; selector (ony lower 8 bits used)
+        .dw buttonNetwork_signalmap*2              ; signal map
+        ; WIDGET
+        .db (1<<WIDGET_OPTSLO_INPUT_BIT) | (1<<WIDGET_OPTSLO_BORDER_BIT), 0 ; opts lo, hi
+        .dw DISPLAY_WIDTH-56                         ; X
+        .dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-56 ; Y
+        .dw 54                                     ; W
+        .dw 54                                     ; H
+        .dw STYLE_BUTTON_COL_FG_NORM               ; front color
+        .dw STYLE_BUTTON_COL_BG_NORM               ; back color
+        .dw STYLE_WIN_FONT*2                       ; font
+        .dw buttonNetwork_ramdata                  ; ptr to SDRAM
+        ; IMGVIEW
+        .dw RESSSOURCE_IMG_NETWORK                 ; ressource id
+      
+      buttonNetwork_signalmap:
+        .db 0, WIDGET_SIGNAL_TOUCH,     LOW(Button_OnTouch),       HIGH(Button_OnTouch)
+        .db 0, WIDGET_SIGNAL_DRAW,      LOW(ImageView_OnDraw),     HIGH(ImageView_OnDraw)
+        .db 0, IMGVIEW_SIGNAL_SETBGCOL, LOW(ImageView_OnSetBgCol), HIGH(ImageView_OnSetBgCol)
+        .db 0, OBJECT_SIGNAL_CREATE,    LOW(ImageView_OnCreate),   HIGH(ImageView_OnCreate)
+        .db 0, 0, 0, 0  ; end of table
+
+
+      debugValue1:
+        ; OBJECT
+        .db 0x55, 0xaa                             ; magic
+        .dw debugValue2*2                          ; next
+        .dw testWinBody_flashdata*2                ; parent
+        .dw 0                                      ; first child
+        .dw 0                                      ; target
+        .dw 0                                      ; selector (ony lower 8 bits used)
+        .dw debugValue1_signalmap*2       ; signal map
+        ; WIDGET
+        .db (1<<WIDGET_OPTSLO_BORDER_BIT), (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+        .dw 4                                      ; X
+        .dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-56 ; Y
+        .dw 100                                    ; W
+        .dw STYLE_WIN_FONT_HEIGHT+4                ; H
+        .dw STYLE_WIN_FOREGROUND                   ; front color
+        .dw STYLE_WIN_BACKGROUND                   ; back color
+        .dw STYLE_WIN_FONT*2                       ; font
+        .dw debugValue1_ramdata           ; ptr to SDRAM
+        ; VALUELABEL
+        .db 0, 0                                   ; num of post-komma digits
+
+        debugValue1_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE,   LOW(ValueLabel_OnCreate),   HIGH(ValueLabel_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
+          .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
+          .db 0, 0, 0, 0  ; end of table
+
+
+
+      debugValue2:
+        ; OBJECT
+        .db 0x55, 0xaa                             ; magic
+        .dw debugValue3*2                          ; next
+        .dw testWinBody_flashdata*2                ; parent
+        .dw 0                                      ; first child
+        .dw 0                                      ; target
+        .dw 0                                      ; selector (ony lower 8 bits used)
+        .dw debugValue2_signalmap*2       ; signal map
+        ; WIDGET
+        .db (1<<WIDGET_OPTSLO_BORDER_BIT), (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+        .dw 108                                      ; X
+        .dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-56 ; Y
+        .dw 100                                    ; W
+        .dw STYLE_WIN_FONT_HEIGHT+4                ; H
+        .dw STYLE_WIN_FOREGROUND                   ; front color
+        .dw STYLE_WIN_BACKGROUND                   ; back color
+        .dw STYLE_WIN_FONT*2                       ; font
+        .dw debugValue2_ramdata           ; ptr to SDRAM
+        ; VALUELABEL
+        .db 0, 0                                   ; num of post-komma digits
+
+        debugValue2_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE,   LOW(ValueLabel_OnCreate),   HIGH(ValueLabel_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
+          .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
+          .db 0, 0, 0, 0  ; end of table
+
+
+      debugValue3:
+        ; OBJECT
+        .db 0x55, 0xaa                             ; magic
+        .dw 0                                      ; next
+        .dw testWinBody_flashdata*2                ; parent
+        .dw 0                                      ; first child
+        .dw 0                                      ; target
+        .dw 0                                      ; selector (ony lower 8 bits used)
+        .dw debugValue3_signalmap*2       ; signal map
+        ; WIDGET
+        .db (1<<WIDGET_OPTSLO_BORDER_BIT), (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
+        .dw 4                                      ; X
+        .dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-30 ; Y
+        .dw 100                                    ; W
+        .dw STYLE_WIN_FONT_HEIGHT+4                ; H
+        .dw STYLE_WIN_FOREGROUND                   ; front color
+        .dw STYLE_WIN_BACKGROUND                   ; back color
+        .dw STYLE_WIN_FONT*2                       ; font
+        .dw debugValue3_ramdata           ; ptr to SDRAM
+        ; VALUELABEL
+        .db 0, 0                                   ; num of post-komma digits
+
+        debugValue3_signalmap:
+          .db 0, OBJECT_SIGNAL_CREATE,   LOW(ValueLabel_OnCreate),   HIGH(ValueLabel_OnCreate)
+          .db 0, WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),     HIGH(ValueLabel_OnDraw)
+          .db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
+          .db 0, 0, 0, 0  ; end of table
+
+
+
+onAppDebug:
+  push zl
+    push zh
+      push xl
+        push xh
+          ; read X
+          ld r18, X+                             ; WIDGET_DATA_TOUCH_OFFS_X_LO
+          ld r19, X+                             ; WIDGET_DATA_TOUCH_OFFS_X_HI
+          push xl
+            push xh
+              mov xl, r18
+              mov xh, r19
+              ldi zl, LOW(debugValue1*2)
+              ldi zh, HIGH(debugValue1*2)
+              ldi r16, VLABEL_SIGNAL_SETVALUE
+              clr r17
+              bigcall OBJ_HandleSignal
+            pop xh
+          pop xl
+          ; read Y
+          ld r18, X+                             ; WIDGET_DATA_TOUCH_OFFS_Y_LO
+          ld r19, X+                             ; WIDGET_DATA_TOUCH_OFFS_Y_HI
+          push xl
+            push xh
+              mov xl, r18
+              mov xh, r19
+              ldi zl, LOW(debugValue2*2)
+              ldi zh, HIGH(debugValue2*2)
+              ldi r16, VLABEL_SIGNAL_SETVALUE
+              clr r17
+              bigcall OBJ_HandleSignal
+            pop xh
+          pop xl
+          ; read flags
+          ld r18, X+                             ; WIDGET_DATA_TOUCH_OFFS_Y_LO
+          push xl
+            push xh
+              mov xl, r18
+              clr xh
+              ldi zl, LOW(debugValue3*2)
+              ldi zh, HIGH(debugValue3*2)
+              ldi r16, VLABEL_SIGNAL_SETVALUE
+              clr r17
+              bigcall OBJ_HandleSignal
+            pop xh
+          pop xl
+
+        pop xh
+      pop xl
+    pop zh
+  pop zl 
+  ret
+; @end
 
 
 
diff --git a/avr/modules/lcd2/gui2/button.asm b/avr/modules/lcd2/gui2/button.asm
new file mode 100644
index 0000000..dda1509
--- /dev/null
+++ b/avr/modules/lcd2/gui2/button.asm
@@ -0,0 +1,99 @@
+; ***************************************************************************
+; copyright   : (C) 2026 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_GUI2_BUTTON_ASM
+#define AQH_AVR_GUI2_BUTTON_ASM
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+
+; ---------------------------------------------------------------------------
+; @routine Button_OnTouch @global
+;
+; @param Z byte address of widget object (for LPM!)
+; @param X pointer to TOUCH event (see @ref WIDGET_DATA_TOUCH_OFFS_X_LO)
+; @return CFLAG set if signal handled
+; @clobbers any, !Z
+
+Button_OnTouch:
+#if 0
+push zl
+  push zh
+    bigcall Widget_GetApp
+    mov zl, r18
+    mov zh, r19
+    ldi r16, GUIAPP_SIGNAL_DEBUG
+    clr r17
+    bigcall OBJ_HandleSignal
+  pop zh
+pop zl
+#endif
+
+  rcall Widget_GetSdramPtr               ; Y:=SDRAM data for widget
+
+  ; read touch signal data from X
+  ld r18, X+                             ; WIDGET_DATA_TOUCH_OFFS_X_LO
+  ld r19, X+                             ; WIDGET_DATA_TOUCH_OFFS_X_HI
+  ld r20, X+                             ; WIDGET_DATA_TOUCH_OFFS_Y_LO
+  ld r21, X+                             ; WIDGET_DATA_TOUCH_OFFS_Z_HI
+  ld r22, X                              ; WIDGET_DATA_TOUCH_OFFS_STATE
+  sbiw xh:xl, 4
+
+  sbrs r22, DISPLAY_IFLAGS_PRESSED_BIT
+    rjmp Button_OnTouch_up
+  ; down (active touch)
+  ldd r16, Y+WIDGET_SD_OFFS_FLAGS
+  sbrc r16, WIDGET_FLAGS_PRESSED_BIT
+    rjmp Button_OnTouch_ret              ; already pressed, jmp
+  ; newly pressed
+  rcall widgetLoadCoordsForFullWidget    ; get X, Y, W, H (none)
+  rcall Widget_MakeAbsPos                ; (R16, R17)
+  rcall Widget_IsPointInRect             ; (R16, R17)
+  brcc Button_OnTouch_ret                ; touch not inside this widget, jmp
+
+  ; touch down inside this widget, handle
+  bigcall Widget_GrabTouchEvents         ; (r16, r17, r18, r19, X)
+  brcc Button_OnTouch_ret
+  ldi r16, (1<<WIDGET_FLAGS_PRESSED_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT)
+  push yl
+    push yh
+      bigcall Widget_AddFlagsDown        ; (R17, R18, R19, R22, R23, Y)
+    pop yh
+  pop yl
+  rjmp Button_OnTouch_ret
+Button_OnTouch_up:
+  ldd r16, Y+WIDGET_SD_OFFS_FLAGS
+  sbrs r16, WIDGET_FLAGS_PRESSED_BIT
+    rjmp Button_OnTouch_ret
+  ; was pressed, not any more
+  bigcall Widget_UngrabTouchEvents        ; (r16, r17, r18, r19, X)
+  push yl
+    push yh
+      ldi r16, (1<<WIDGET_FLAGS_PRESSED_BIT)
+      bigcall Widget_SubFlagsDown        ; (R17, R18, R19, R22, R23, Y)
+      ldi r16, (1<<WIDGET_FLAGS_DIRTY_BIT)
+      bigcall Widget_AddFlagsDown        ; (R17, R18, R19, R22, R23, Y)
+      ldi r16, WIDGET_SIGNAL_CLICKED     ; emit "CLICKED" signal
+      bigcall OBJ_EmitSignal
+    pop yh
+  pop yl
+Button_OnTouch_ret:
+  sec
+  ret
+; @end
+
+
+
+
+#endif
+
diff --git a/avr/modules/lcd2/gui2/guiapp.asm b/avr/modules/lcd2/gui2/guiapp.asm
index 5764ece..8889d1e 100644
--- a/avr/modules/lcd2/gui2/guiapp.asm
+++ b/avr/modules/lcd2/gui2/guiapp.asm
@@ -26,7 +26,8 @@
 .equ GUIAPP_SIGNAL_RAISE        =  OBJECT_SIGNAL_NEXTFREE+0 ; app->cntrl: X=WIDGET to raise
 .equ GUIAPP_SIGNAL_SHOW         =  OBJECT_SIGNAL_NEXTFREE+1 ; cntrl->app
 .equ GUIAPP_SIGNAL_HIDE         =  OBJECT_SIGNAL_NEXTFREE+2 ; cntrl->app
-.equ GUIAPP_SIGNAL_NEXTFREE     =  OBJECT_SIGNAL_NEXTFREE+3
+.equ GUIAPP_SIGNAL_DEBUG        =  OBJECT_SIGNAL_NEXTFREE+3
+.equ GUIAPP_SIGNAL_NEXTFREE     =  OBJECT_SIGNAL_NEXTFREE+4
 
 ; SDRAM data for guiapp
 .equ GUIAPP_SD_OFFS_FLAGS            = 0
@@ -75,7 +76,7 @@ GuiApp_Init:
 
 
 ; ---------------------------------------------------------------------------
-; @routine GuiApp_Every100ms
+; @routine GuiApp_Every100ms @global
 ;
 ; @param Z byte address of guiapp object (for LPM!)
 
@@ -89,7 +90,7 @@ GuiApp_Every100ms:
 
 
 ; ---------------------------------------------------------------------------
-; @routine GuiApp_Every100ms
+; @routine GuiApp_MsgReceived @global
 ;
 ; @param Z byte address of guiapp object (for LPM!)
 
@@ -109,7 +110,7 @@ GuiApp_MsgReceived:
 
 GuiApp_OnTimer:
   ; check for touch event
-;  rcall guiAppCheckTouch
+  rcall guiAppCheckTouch
 
   ; send timer signal to all accepting widgets
   push zl
@@ -154,14 +155,25 @@ GuiApp_OnTimer_ret:
 ; @param X pointer to touch event in SDRAM
 
 GuiApp_OnTouch:
+bigcall onAppDebug
+
   push zl
     push zh
-      adiw zh:zl, GUIAPP_OFFS_ROOTWIDGET_LO
-      lpm r18, Z+
-      lpm zh, Z
+      rcall GuiApp_GetSdramPtr
+      ldd r18, Y+GUIAPP_SD_OFFS_TOUCHWIDGET_LO
+      ldd r19, Y+GUIAPP_SD_OFFS_TOUCHWIDGET_HI
+      mov r16, r18
+      or r16, r19
+      breq GuiApp_OnTouch_sendToAll
       mov zl, r18
-      or r18, zh
-      breq GuiApp_OnTouch_done
+      mov zh, r19
+      ldi r16, WIDGET_SIGNAL_TOUCH
+      clr r17
+      bigcall OBJ_HandleSignal
+      rjmp GuiApp_OnTouch_done
+GuiApp_OnTouch_sendToAll:
+      rcall GuiApp_GetRootWidgetToZ
+      brcc GuiApp_OnTouch_done
       ; send touch signal (TODO: check for grabbed touch)
       bigcall Widget_Tree_SendTouchSignal
 GuiApp_OnTouch_done:
@@ -326,6 +338,62 @@ GuiApp_ShowView_ret:
 
 
 
+
+; ---------------------------------------------------------------------------
+; @routine GuiApp_GrabTouchEvents
+;
+; @param Z byte address of gui app object (for LPM!)
+; @param X byte address of widget grabbing touch events
+; @return CFLAG set if grabbed, cleared otherwise
+; @clobbers R16, R17, Y
+
+GuiApp_GrabTouchEvents:
+  rcall OBJ_IsObject                      ; (none)
+  brcc GuiApp_GrabTouchEvents_ret
+  rcall GuiApp_GetSdramPtr                ; (none)
+  ldd r16, Y+GUIAPP_SD_OFFS_TOUCHWIDGET_LO
+  ldd r17, Y+GUIAPP_SD_OFFS_TOUCHWIDGET_HI
+  or r16, r17
+  clc
+  brne GuiApp_GrabTouchEvents_ret         ; only grab if not already grabbed!
+  std Y+GUIAPP_SD_OFFS_TOUCHWIDGET_LO, xl
+  std Y+GUIAPP_SD_OFFS_TOUCHWIDGET_HI, xh
+  sec
+GuiApp_GrabTouchEvents_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine GuiApp_UngrabTouchEvents
+;
+; @param Z byte address of gui app object (for LPM!)
+; @param X byte address of widget ungrabbing touch events
+; @return CFLAG set if ungrabbed, cleared otherwise
+; @clobbers R16, R17
+
+GuiApp_UngrabTouchEvents:
+  rcall OBJ_IsObject                      ; (none)
+  brcc GuiApp_UngrabTouchEvents_ret
+  rcall GuiApp_GetSdramPtr                ; (none)
+  ldd r16, Y+GUIAPP_SD_OFFS_TOUCHWIDGET_LO
+  ldd r17, Y+GUIAPP_SD_OFFS_TOUCHWIDGET_HI
+  eor r16, xl
+  eor r17, xh
+  or r16, r17
+  clc
+  brne GuiApp_UngrabTouchEvents_ret         ; only ungrab same widget!
+  clr r16
+  std Y+GUIAPP_SD_OFFS_TOUCHWIDGET_LO, r16
+  std Y+GUIAPP_SD_OFFS_TOUCHWIDGET_HI, r16
+  sec
+GuiApp_UngrabTouchEvents_ret:
+  ret
+; @end
+
+
+
 ; ---------------------------------------------------------------------------
 ; @routine guiAppHideCurrent
 ;
diff --git a/avr/modules/lcd2/gui2/rootwidget.asm b/avr/modules/lcd2/gui2/rootwidget.asm
new file mode 100644
index 0000000..4e56103
--- /dev/null
+++ b/avr/modules/lcd2/gui2/rootwidget.asm
@@ -0,0 +1,56 @@
+; ***************************************************************************
+; copyright   : (C) 2026 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_GUI2_ROOTWIDGET_ASM
+#define AQH_AVR_GUI2_ROOTWIDGET_ASM
+
+
+; ***************************************************************************
+; defines
+
+; RootWidget in flash
+.equ ROOTWIDGET_OFFS_BEGIN      =  WIDGET_SIZE
+.equ ROOTWIDGET_OFFS_APP_LO     =  ROOTWIDGET_OFFS_BEGIN+0
+.equ ROOTWIDGET_OFFS_APP_HI     =  ROOTWIDGET_OFFS_BEGIN+1
+.equ ROOTWIDGET_SIZE            =  ROOTWIDGET_OFFS_BEGIN+2
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; @routine RootWidget_GetApp @global
+;
+; @param  Z       byte address of object (for LPM!)
+; @return R19:R18 byte address pointer to GuiApp
+; @clobbers none
+
+RootWidget_GetApp:
+  bigcall OBJ_IsObject              ; (none)
+  brcc RootWidget_GetApp_ret
+  adiw zh:zl, ROOTWIDGET_OFFS_APP_LO
+  lpm r18, Z+
+  lpm r19, Z
+  sbiw zh:zl, ROOTWIDGET_OFFS_APP_LO+1
+  sec
+RootWidget_GetApp_ret:
+  ret
+; @end
+
+
+
+#endif
+
+
+
diff --git a/avr/modules/lcd2/gui2/widget.asm b/avr/modules/lcd2/gui2/widget.asm
index c62478d..c2b935c 100644
--- a/avr/modules/lcd2/gui2/widget.asm
+++ b/avr/modules/lcd2/gui2/widget.asm
@@ -118,85 +118,6 @@ Widget_OnCreate:
 
 
 
-; ---------------------------------------------------------------------------
-; @routine Widget_OnTouch @global
-;
-; @param Z byte address of widget object (for LPM!)
-; @param xl param1
-; @param xh param2
-; @return CFLAG set if signal handled
-; @clobbers any, !Z
-
-Widget_OnTouch:
-  ; check whether inputs are handled by this widget
-  adiw zh:zl, WIDGET_OFFS_OPTS_LO
-  lpm r16, Z
-  sbiw zh:zl, WIDGET_OFFS_OPTS_LO
-  andi r16, (1<<WIDGET_OPTSLO_INPUT_BIT)
-  clc
-  breq Widget_OnTouch_ret
-  
-  rcall Widget_GetSdramPtr
-  ; check whether widget is active
-  ldd r17, Y+WIDGET_SD_OFFS_FLAGS
-  andi r17, (1<<WIDGET_FLAGS_ACTIVE_BIT)
-  breq Widget_OnTouch_secRet             ; nope, jmp
-  
-  ; read touch signal data from X
-  ld r18, X+                             ; WIDGET_DATA_TOUCH_OFFS_X_LO
-  ld r19, X+                             ; WIDGET_DATA_TOUCH_OFFS_X_HI
-  ld r20, X+                             ; WIDGET_DATA_TOUCH_OFFS_Y_LO
-  ld r21, X+                             ; WIDGET_DATA_TOUCH_OFFS_Z_HI
-  ld r22, X+                             ; WIDGET_DATA_TOUCH_OFFS_STATE
-
-  ; check for change of touch press
-  mov r16, r22
-  andi r16, (1<<DISPLAY_IFLAGS_CHGPRESS_BIT)
-  breq Widget_OnTouch_secRet             ; no press change, jmp
-
-  ; check for position inside this widget
-  rcall widgetLoadCoordsForFullWidget
-  rcall Widget_MakeAbsPos                ; (R16, R17)
-  rcall Widget_IsPointInRect             ; (R16, R17)
-  sbci r16, 0                            ; r16=ff if touched inside, 0 otherwise
-  
-  ; touch changed, check whether touch came down or up
-  mov r18, r22
-  andi r18, (1<<DISPLAY_IFLAGS_PRESSED_BIT)
-  breq Widget_OnTouch_up
-  
-  ; touch came down
-  ldd r17, Y+WIDGET_SD_OFFS_FLAGS
-  andi r17, (1<<WIDGET_FLAGS_PRESSED_BIT)
-  brne Widget_OnTouch_secRet     ; already down
-  tst r16                                ; down inside this widget?
-  brne Widget_OnTouch_secRet     ; nope, jmp
-  ldd r17, Y+WIDGET_SD_OFFS_FLAGS
-  ori r17, (1<<WIDGET_FLAGS_PRESSED_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT) ; up, dirty
-  std Y+WIDGET_SD_OFFS_FLAGS, r17
-  rjmp Widget_OnTouch_secRet
-
-Widget_OnTouch_up:
-  ldd r17, Y+WIDGET_SD_OFFS_FLAGS
-  andi r17, (1<<WIDGET_FLAGS_PRESSED_BIT)
-  breq Widget_OnTouch_secRet     ; already up
-  ldd r17, Y+WIDGET_SD_OFFS_FLAGS
-  cbr r17, (1<<WIDGET_FLAGS_PRESSED_BIT) ; up
-  ori r17, (1<<WIDGET_FLAGS_DIRTY_BIT)
-  std Y+WIDGET_SD_OFFS_FLAGS, r17
-  tst r16                                ; was touch lost inside this widget?
-  brne Widget_OnTouch_secRet             ; nope, jmp
-  ; emit "CLICKED" signal
-  ldi r16, WIDGET_SIGNAL_CLICKED
-  rcall OBJ_EmitSignal
-Widget_OnTouch_secRet:
-  sec
-Widget_OnTouch_ret:
-  ret
-; @end
-
-
-
 ; ---------------------------------------------------------------------------
 ; @routine Widget_OnDraw @global
 ;
@@ -278,8 +199,8 @@ Widget_IsPointInRect:
 
   mov r16, r20    ; checkY-widgetY
   mov r17, r21
-  sub r16, r8
-  sbc r17, r9
+  sub r16, r6
+  sbc r17, r7
   brcs Widget_IsPointInRect_no   ; jmp if above widget
   sub r16, r10    ; sub height
   sbc r17, r11
@@ -348,6 +269,110 @@ Widget_GetSdramPtr:
 
 
 
+; ---------------------------------------------------------------------------
+; @routine Widget_GetRootWidget @global
+;
+; @param  Z  byte address of object (for LPM!)
+; @return Z  byte address pointer to RootWidget
+; @clobbers r18, r19
+
+Widget_GetRootWidget:
+  rcall OBJ_IsObject                      ; (none)
+  brcc Widget_GetRootWidget_end
+Widget_GetRootWidget_loop:
+    bigcall OBJ_GetParent                 ; (none)
+    brcc Widget_GetRootWidget_found       ; no parent, return current Z
+    mov zl, r18
+    mov zh, r19
+  rjmp Widget_GetRootWidget_loop
+Widget_GetRootWidget_found:
+  sec
+Widget_GetRootWidget_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Widget_GetApp @global
+;
+; @param  Z       byte address of object (for LPM!)
+; @return R19:R18 byte address pointer to GuiApp
+; @clobbers (r18, r19)
+
+Widget_GetApp:
+  rcall OBJ_IsObject                      ; (none)
+  brcc Widget_GetApp_ret
+  push zl
+    push zh
+      rcall Widget_GetRootWidget          ; Z:=rootWidget (r18, r19)
+      brcc Widget_GetApp_popRet
+      rcall RootWidget_GetApp             ; R19:R18=app (none)
+Widget_GetApp_popRet:
+    pop zh
+  pop zl  
+Widget_GetApp_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Widget_GrabTouchEvents @global
+;
+; Let this widget grab touch events until ungrabbed.
+;
+; @param  Z byte address of object (for LPM!)
+; @return CFLAG set if grabbed, cleared on error
+; @clobbers X, Y (r16, r17, r18, r19)
+
+Widget_GrabTouchEvents:
+  push zl
+    push zh
+      mov xl, zl
+      mov xh, zh
+      rcall Widget_GetApp                  ; R19:R18:=app
+      brcc Widget_GrabTouchEvents_popRet
+      mov zl, r18
+      mov zh, r19
+      bigcall GuiApp_GrabTouchEvents       ; (R16, R17)
+Widget_GrabTouchEvents_popRet:
+    pop zh
+  pop zl
+  ret
+; @end
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Widget_UngrabTouchEvents @global
+;
+; Let this widget un-grab touch events.
+;
+; @param  Z byte address of object (for LPM!)
+; @return CFLAG set if ungrabbed, cleared on error
+; @clobbers X (r16, r17, r18, r19)
+
+Widget_UngrabTouchEvents:
+  push zl
+    push zh
+      mov xl, zl
+      mov xh, zh
+      rcall Widget_GetApp                  ; R19:R18:=app
+      brcc Widget_UngrabTouchEvents_popRet
+      mov zl, r18
+      mov zh, r19
+      bigcall GuiApp_UngrabTouchEvents       ; (R16, R17)
+Widget_UngrabTouchEvents_popRet:
+    pop zh
+  pop zl
+  ret
+; @end
+
+
+
+
 ; ---------------------------------------------------------------------------
 ; @routine Widget_AddFlagsDown @global
 ;
@@ -1264,13 +1289,14 @@ Widget_CalcStringWidthFLASH_done:
 
 
 ; ---------------------------------------------------------------------------
-; @routine Widget_AlignPosXY
+; @routine widgetLoadCoordsForFullWidget
 ;
 ; @param Z byte address of widget object (for LPM!)
 ; @return r5:r4   X (0)
 ; @return r7:r6   Y (0)
 ; @return r9:r8   widget width
 ; @return r11:R10 widget height
+; @clobbers none
 
 widgetLoadCoordsForFullWidget:
   clr r4