[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/osm 0cd30df38f 1/4: Fix mouse drag issue
From: |
ELPA Syncer |
Subject: |
[elpa] externals/osm 0cd30df38f 1/4: Fix mouse drag issue |
Date: |
Fri, 11 Mar 2022 07:57:43 -0500 (EST) |
branch: externals/osm
commit 0cd30df38f5d9880f269ef82c4c025d8ff20bdad
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Fix mouse drag issue
---
README.org | 2 +-
osm.el | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/README.org b/README.org
index 5231aaa369..cb8af85be1 100644
--- a/README.org
+++ b/README.org
@@ -82,7 +82,7 @@ Key bindings in =osm-mode= buffer:
- ~<mouse-2>~: =osm-org-link-click= - Store point as Org link
- ~<mouse-3>~: =osm-bookmark-set-click= - Store point as bookmark
- ~<osm-bookmark mouse-*>~: =osm-bookmark-delete-click= - Click on bookmark at
point to delete
-- ~<down-mouse-*>~: =osm-drag= - Drag the map with the mouse
+- ~<down-mouse-*>~: =osm-mouse-drag= - Drag the map with the mouse
- ~d~, ~DEL~: =osm-bookmark-delete= - Delete selected bookmark
- ~n~: =osm-bookmark-rename= - Rename selected bookmark
- ~t~: =osm-goto= - Go to location
diff --git a/osm.el b/osm.el
index e35beca0e0..bfb81c74b2 100644
--- a/osm.el
+++ b/osm.el
@@ -170,9 +170,9 @@ Should be at least 7 days according to the server usage
policies."
(define-key map [mouse-1] #'osm-center-click)
(define-key map [mouse-2] #'osm-org-link-click)
(define-key map [mouse-3] #'osm-bookmark-set-click)
- (define-key map [down-mouse-1] #'osm-drag)
- (define-key map [down-mouse-2] #'osm-drag)
- (define-key map [down-mouse-3] #'osm-drag)
+ (define-key map [down-mouse-1] #'osm-mouse-drag)
+ (define-key map [down-mouse-2] #'osm-mouse-drag)
+ (define-key map [down-mouse-3] #'osm-mouse-drag)
(define-key map [up] #'osm-up)
(define-key map [down] #'osm-down)
(define-key map [left] #'osm-left)
@@ -380,7 +380,7 @@ Should be at least 7 days according to the server usage
policies."
(osm--download)))))
(osm--download))))
-(defun osm-drag (event)
+(defun osm-mouse-drag (event)
"Handle drag EVENT."
(interactive "@e")
(pcase-let ((`(,sx . ,sy) (posn-x-y (event-start event)))
@@ -396,6 +396,9 @@ Should be at least 7 days according to the server usage
policies."
(define-key map [mouse-1] #'ignore)
(define-key map [mouse-2] #'ignore)
(define-key map [mouse-3] #'ignore)
+ (define-key map [drag-mouse-1] #'ignore)
+ (define-key map [drag-mouse-2] #'ignore)
+ (define-key map [drag-mouse-3] #'ignore)
(pcase-let ((`(,ex . ,ey) (posn-x-y event)))
(setq osm--x (- sx ex)
osm--y (- sy ey))
@@ -1243,7 +1246,7 @@ xmlns='http://www.w3.org/2000/svg'
xmlns:xlink='http://www.w3.org/1999/xlink'>
#'osm-up-up #'osm-down-down #'osm-left-left
#'osm-right-right
#'osm-zoom-out #'osm-zoom-in #'osm-bookmark-set))
(put sym 'command-modes '(osm-mode)))
-(dolist (sym (list #'osm-drag #'osm-center-click #'osm-org-link-click
+(dolist (sym (list #'osm-mouse-drag #'osm-center-click #'osm-org-link-click
#'osm-bookmark-set-click #'osm-bookmark-select-click))
(put sym 'completion-predicate #'ignore))