From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#62250: 29.0.60; Allow context menu from text properties to not override everything Date: Sun, 02 Apr 2023 19:35:15 +0300 Organization: LINKOV.NET Message-ID: <86a5zqcke4.fsf@mail.linkov.net> References: <87ttyixzt2.fsf@gmail.com> <865yaxq5xh.fsf@mail.linkov.net> <87cz55rjir.fsf@gmail.com> <86fsa0r60v.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22783"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 62250@debbugs.gnu.org To: Augusto Stoffel Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Apr 02 18:42:19 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pj0mZ-0005kY-Bq for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 02 Apr 2023 18:42:19 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pj0mK-0003nS-Fk; Sun, 02 Apr 2023 12:42:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pj0mI-0003mu-Qw for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 12:42:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pj0mI-0007Wn-Ij for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 12:42:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pj0mI-0000wX-E3 for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 12:42:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 02 Apr 2023 16:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62250 X-GNU-PR-Package: emacs Original-Received: via spool by 62250-submit@debbugs.gnu.org id=B62250.16804536873584 (code B ref 62250); Sun, 02 Apr 2023 16:42:02 +0000 Original-Received: (at 62250) by debbugs.gnu.org; 2 Apr 2023 16:41:27 +0000 Original-Received: from localhost ([127.0.0.1]:42504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj0li-0000vj-UP for submit@debbugs.gnu.org; Sun, 02 Apr 2023 12:41:27 -0400 Original-Received: from relay3-d.mail.gandi.net ([217.70.183.195]:48767) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj0lg-0000v2-VT for 62250@debbugs.gnu.org; Sun, 02 Apr 2023 12:41:25 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id DB75E60004; Sun, 2 Apr 2023 16:41:18 +0000 (UTC) In-Reply-To: <86fsa0r60v.fsf@mail.linkov.net> (Juri Linkov's message of "Sun, 19 Mar 2023 19:43:28 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:259114 Archived-At: --=-=-= Content-Type: text/plain >> Just for the record, this would be useful to create a >> context menu for images. > > The patch below will allow using the text property like > > 'context-menu-functions '(image-context-menu) Here is a complete patch that uses the new text property for create a context menu for images: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=context-menu-functions.patch diff --git a/lisp/iimage.el b/lisp/iimage.el index b4c175a7b63..8235c4a6fdb 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el @@ -134,6 +134,7 @@ iimage-mode-buffer :max-width (- (nth 2 edges) (nth 0 edges)) :max-height (- (nth 3 edges) (nth 1 edges))) keymap ,image-map + context-menu-functions (image-context-menu) modification-hooks (iimage-modification-hook))) (remove-list-of-text-properties diff --git a/lisp/image.el b/lisp/image.el index 2372fd1ce09..11bf46c80cc 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -188,6 +188,29 @@ image-map "C-" #'image-mouse-increase-size "C-" #'image-mouse-increase-size) +(defun image-context-menu (menu click) + "Populate MENU with image-related commands at CLICK." + (when (mouse-posn-property (event-start click) 'display) + (define-key menu [image-separator] menu-bar-separator) + (let ((easy-menu (make-sparse-keymap "Image"))) + (easy-menu-define nil easy-menu nil + '("Image" + ["Zoom In" image-increase-size + :help "Enlarge the image"] + ["Zoom Out" image-decrease-size + :help "Shrink the image"] + ["Rotate Clockwise" image-rotate + :help "Rotate the image"] + ["Flip horizontally" image-flip-horizontally + :help "Flip horizontally"] + ["Flip vertically" image-flip-vertically + :help "Flip vertically"])) + (dolist (item (reverse (lookup-key easy-menu [menu-bar image]))) + (when (consp item) + (define-key menu (vector (car item)) (cdr item)))))) + + menu) + (defun image-load-path-for-library (library image &optional path no-error) "Return a suitable search path for images used by LIBRARY. @@ -615,6 +638,7 @@ put-image (overlay-put overlay 'put-image t) (overlay-put overlay 'before-string string) (overlay-put overlay 'keymap image-map) + (overlay-put overlay 'context-menu-functions '(image-context-menu)) overlay))) @@ -665,7 +689,9 @@ insert-image image) rear-nonsticky t inhibit-isearch ,inhibit-isearch - keymap ,image-map)))) + keymap ,image-map + context-menu-functions + (image-context-menu))))) ;;;###autoload @@ -702,7 +728,9 @@ insert-sliced-image (add-text-properties start (point) `(display ,(list (list 'slice x y dx dy) image) rear-nonsticky (display) - keymap ,image-map)) + keymap ,image-map + context-menu-functions + (image-context-menu))) (setq x (+ x dx)))) (setq x 0.0 y (+ y dy)) diff --git a/lisp/mouse.el b/lisp/mouse.el index 6b9accd6758..2cd2840bad9 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -368,9 +368,10 @@ context-menu-map the function `context-menu-filter-function'." (let* ((menu (make-sparse-keymap (propertize "Context Menu" 'hide t))) (click (or click last-input-event)) - (window (posn-window (event-start click))) - (fun (mouse-posn-property (event-start click) - 'context-menu-function))) + (start (event-start click)) + (window (posn-window start)) + (fun (mouse-posn-property start 'context-menu-function)) + (funs (mouse-posn-property start 'context-menu-functions))) (unless (eq (selected-window) window) (select-window window)) @@ -380,7 +381,9 @@ context-menu-map (run-hook-wrapped 'context-menu-functions (lambda (fun) (setq menu (funcall fun menu click)) - nil))) + nil)) + (dolist (fun funs) + (setq menu (funcall fun menu click)))) ;; Remove duplicate separators as well as ones at the beginning or ;; end of the menu. --=-=-=--