diff options
| author | Po Lu | 2023-11-15 20:58:46 +0800 |
|---|---|---|
| committer | Po Lu | 2023-11-15 21:07:14 +0800 |
| commit | a9a8d5e95992ab63a63305e2a0b2d2b36bb2c698 (patch) | |
| tree | 3c8317f4e782afd2b988141231f199ac0eaf2c53 /java | |
| parent | 03d2e26108b21b4a9c86a30e5552f9535f4245ac (diff) | |
| download | emacs-a9a8d5e95992ab63a63305e2a0b2d2b36bb2c698.tar.gz emacs-a9a8d5e95992ab63a63305e2a0b2d2b36bb2c698.zip | |
Register ``pinch to zoom'' touch screen gestures
* doc/emacs/input.texi (Touchscreens): Address pinch gestures.
* doc/lispref/commands.texi (Touchscreen Events): Address touch
screen pinch events and the process by which they are produced.
* java/org/gnu/emacs/EmacsWindow.java (figureChange)
<ACTION_POINTER_DOWN>: Supply pointer index to getX and getY,
correcting a mistake where the first touch point's coordinate
was saved here in lieu of the pointer that was pressed's.
* lisp/touch-screen.el (touch-screen-current-tool): Revise doc
string.
(touch-screen-aux-tool): New variable.
(touch-screen-scroll-point-to-y, touch-screen-pinch): New
functions.
(global-map): Bind [touchscreen-pinch] to touch-screen-pinch.
(touch-screen-handle-point-update): Revise doc string; set new
tenth field of t-s-c-t to POINT relative to its window, without
regard to whether an event has been sent.
(touch-screen-distance, touch-screen-centrum): New functions.
(touch-screen-handle-aux-point-update): New function; generate
and send touchscreen-pinch if need be.
(touch-screen-handle-point-up): If an ancillary tool exists,
transfer the information there into touch-screen-current-tool
and clear t-s-a-t.
(touch-screen-handle-touch): Call t-s-a-p-u as is proper; set
t-s-a-t if a touchscreen-down event arrives and t-s-c-t is set.
* src/androidterm.c (handle_one_android_event): Properly save
the event's X and Y when a new touch point is registered.
Diffstat (limited to 'java')
| -rw-r--r-- | java/org/gnu/emacs/EmacsWindow.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java index d7a37a8d57f..013f09cb756 100644 --- a/java/org/gnu/emacs/EmacsWindow.java +++ b/java/org/gnu/emacs/EmacsWindow.java | |||
| @@ -918,8 +918,8 @@ public final class EmacsWindow extends EmacsHandleObject | |||
| 918 | it in the map. */ | 918 | it in the map. */ |
| 919 | pointerIndex = event.getActionIndex (); | 919 | pointerIndex = event.getActionIndex (); |
| 920 | pointerID = event.getPointerId (pointerIndex); | 920 | pointerID = event.getPointerId (pointerIndex); |
| 921 | coordinate = new Coordinate ((int) event.getX (0), | 921 | coordinate = new Coordinate ((int) event.getX (pointerIndex), |
| 922 | (int) event.getY (0), | 922 | (int) event.getY (pointerIndex), |
| 923 | buttonForEvent (event), | 923 | buttonForEvent (event), |
| 924 | pointerID); | 924 | pointerID); |
| 925 | pointerMap.put (pointerID, coordinate); | 925 | pointerMap.put (pointerID, coordinate); |