From 63d7efd042de0daee68d81fd84f467855ea52d97 Mon Sep 17 00:00:00 2001 From: David Botton Date: Thu, 2 Dec 2021 16:02:57 -0500 Subject: [PATCH] Adjust for scrolling on x and y automatically --- source/clog-base.lisp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/source/clog-base.lisp b/source/clog-base.lisp index 323aeb8..c146f5c 100644 --- a/source/clog-base.lisp +++ b/source/clog-base.lisp @@ -176,8 +176,8 @@ result or if time out DEFAULT-ANSWER (Private)")) ;;;;;;;;;;;;;;;;;;;;;;; (defparameter mouse-event-script - "+ (e.clientX - e.currentTarget.getBoundingClientRect().left) + ':' + - (e.clientY - e.currentTarget.getBoundingClientRect().top) + ':' + + "+ (e.clientX - e.currentTarget.getBoundingClientRect().left + e.currentTarget.scrollLeft) + ':' + + (e.clientY - e.currentTarget.getBoundingClientRect().top + e.currentTarget.scrollTop) + ':' + e.screenX + ':' + e.screenY + ':' + e.which + ':' + e.altKey + ':' + e.ctrlKey + ':' + e.shiftKey + ':' + e.metaKey + ':' + e.clientX + ':' + e.clientY + ':' + e.pageX + ':' + e.pageY" @@ -210,8 +210,12 @@ result or if time out DEFAULT-ANSWER (Private)")) ;;;;;;;;;;;;;;;;;;;;;;; (defparameter touch-event-script - "+ (e.touches[0].clientX - e.touches[0].currentTarget.getBoundingClientRect().left) + ':' + - (e.touches[0].clientY - e.touches[0].currentTarget.getBoundingClientRect().top) + ':' + + "+ (e.touches[0].clientX - + e.touches[0].currentTarget.getBoundingClientRect().left + + e.touches[0].currentTarget.scrollLeft) + ':' + + (e.touches[0].clientY - + e.touches[0].currentTarget.getBoundingClientRect().top + + e.touches[0].currentTarget.scrollTop) + ':' + e.touches[0].screenX + ':' + e.touches[0].screenY + ':' + e.touches.length + ':' + e.altKey + ':' + e.ctrlKey + ':' + @@ -244,8 +248,8 @@ result or if time out DEFAULT-ANSWER (Private)")) ;;;;;;;;;;;;;;;;;;;;;;;;; (defparameter pointer-event-script - "+ (e.clientX - e.currentTarget.getBoundingClientRect().left) + ':' + - (e.clientY - e.currentTarget.getBoundingClientRect().top) + ':' + + "+ (e.clientX - e.currentTarget.getBoundingClientRect().left + e.currentTarget.scrollLeft) + ':' + + (e.clientY - e.currentTarget.getBoundingClientRect().top + e.currentTarget.scrollTop) + ':' + e.screenX + ':' + e.screenY + ':' + e.which + ':' + e.altKey + ':' + e.ctrlKey + ':' + e.shiftKey + ':' + e.metaKey + ':' + e.clientX + ':' + e.clientY + ':' + e.pageX + ':' + e.pageY" @@ -298,8 +302,8 @@ result or if time out DEFAULT-ANSWER (Private)")) ;;;;;;;;;;;;;;;;;;;;;; (defparameter drop-event-script - "+ (e.clientX - e.currentTarget.getBoundingClientRect().left) + ':' + - (e.clientY - e.currentTarget.getBoundingClientRect().top) + ':' + + "+ (e.clientX - e.currentTarget.getBoundingClientRect().left + e.currentTarget.scrollLeft) + ':' + + (e.clientY - e.currentTarget.getBoundingClientRect().top + e.currentTarget.scrollTop + ':' + encodeURIComponent(e.originalEvent.dataTransfer.getData('~A'))" "JavaScript to collect drop event data from browser.")