[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Where the menu should be appeared when C-mouse-3 is triggered
From: |
Masatake YAMATO |
Subject: |
Re: Where the menu should be appeared when C-mouse-3 is triggered |
Date: |
Fri, 10 Aug 2012 22:52:56 +0900 (JST) |
Thanks.
>> Hi, could you review this patch?
>
> Yes, sorry for the delay. Installed,
>
>
> Stefan
>
>
>> http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00602.html
>> -------------------------------------------------------------------------
>> Hi,
>
>> About POSITION argument of popup-menu you suggested:
>
>>> Maybe a better direction is to make popup-menu (and x-popup-menu, ...)
>>> accept posn arguments, so you can just use things like (event-end
>>> <event>) or (posn-at-point) to specify where to display it. The
>>> docstring of popup-menu seems to indicate that an `event' can be used,
>>> but at least in my tests it doesn't seem to work.
>>>
>>> Could you look at making a patch to do that (i.e. accept a posn,
>>> or maybe an event)?
>
>> I've revised the POSITION argument handling.
>> Now `popup-menu-normalize-position' handles all POSITION variants.
>> I have not touch `x-popup-menu' yet.
>
>> Masatake YAMATO
>
>> === modified file 'lisp/ChangeLog'
>> --- lisp/ChangeLog 2012-07-27 16:42:19 +0000
>> +++ lisp/ChangeLog 2012-07-28 09:16:29 +0000
>> @@ -1,3 +1,13 @@
>> +2012-07-28 Masatake YAMATO <address@hidden>
>> +
>> + * mouse.el (popup-menu-normalize-position): New function.
>> + (popup-menu): Use `popup-menu-normalize-position' to normalize
>> + the form for POSITION argument.
>> +
>> + * term/x-win.el (x-menu-bar-open): Use
>> + the value returend from (posn-at-point) as position
>> + passed to `popup-menu'.
>> +
>> 2012-07-27 Fabián Ezequiel Gallina <address@hidden>
>
>> Consistent completion in inferior python with emacs -nw.
>
>> === modified file 'lisp/mouse.el'
>> --- lisp/mouse.el 2012-07-26 08:32:25 +0000
>> +++ lisp/mouse.el 2012-07-28 09:18:46 +0000
>> @@ -101,11 +101,8 @@
>> "Popup the given menu and call the selected option.
>> MENU can be a keymap, an easymenu-style menu or a list of keymaps as for
>> `x-popup-menu'.
>> -
>> -POSITION can be a click event or ((XOFFSET YOFFSET) WINDOW) and
>> -defaults to the current mouse position. If POSITION is the
>> -symbol `point', the current point position is used.
>> -
>> +The menu is shown at the place where POSITION specifies. About
>> +the form of POSITION, see `popup-menu-normalize-position'.
>> PREFIX is the prefix argument (if any) to pass to the command."
>> (let* ((map (cond
>> ((keymapp menu) menu)
>> @@ -114,18 +111,8 @@
>> (filter (when (symbolp map)
>> (plist-get (get map 'menu-prop) :filter))))
>> (if filter (funcall filter (symbol-function map)) map)))))
>> - event cmd)
>> - (setq position
>> - (cond
>> - ((eq position 'point)
>> - (let* ((pp (posn-at-point))
>> - (xy (posn-x-y pp)))
>> - (list (list (car xy) (cdr xy)) (posn-window pp))))
>> - ((not position)
>> - (let ((mp (mouse-pixel-position)))
>> - (list (list (cadr mp) (cddr mp)) (car mp))))
>> - (t
>> - position)))
>> + event cmd
>> + (position (popup-menu-normalize-position position)))
>> ;; The looping behavior was taken from lmenu's popup-menu-popup
>> (while (and map (setq event
>> ;; map could be a prefix key, in which case
>> @@ -163,6 +150,37 @@
>> ;; mouse-major-mode-menu was using `command-execute' instead.
>> (call-interactively cmd))))
>
>> +(defun popup-menu-normalize-position (position)
>> + "Converts the POSITION to the form which `popup-menu' expects internally.
>> +POSITION can be nil, an click event, a posn- value, or a value having
>> +form ((XOFFSET YOFFSET) WINDOW).
>> +If nil, the current mouse position is used.
>> +If an click event, the value returend from `event-end' is used."
>> + (pcase position
>> + ;; nil -> mouse cursor position
>> + ;; this pattern must be before `eventp' because
>> + ;; nil is an event.
>> + (`nil
>> + (let ((mp (mouse-pixel-position)))
>> + (list (list (cadr mp) (cddr mp)) (car mp))))
>> + ;; value returned from (event-end (read-event)) or (posn-at-point)
>> + ((or `(,window ,area-or-pos (,x . ,y)
>> + ,timestamp ,object ,pos (,col . ,row)
>> + ,image (,dx . ,dy) (,width . ,height))
>> + `(,window ,pos (0 . 0) 0))
>> + (let ((xy (posn-x-y position)))
>> + (list (list (car xy) (cdr xy))
>> + (posn-window position))))
>> + ;; pattern expected by popup-menu
>> + (`((,xoffset ,yoffset) ,window)
>> + position)
>> + ;; event
>> + ((pred eventp)
>> + (popup-menu-normalize-position (event-end position)))
>> + ;; rejects
>> + (t
>> + (error "Unexpected position form"))))
>> +
>> (defun minor-mode-menu-from-indicator (indicator)
>> "Show menu for minor mode specified by INDICATOR.
>> Interactively, INDICATOR is read using completion.
>
>> === modified file 'lisp/term/x-win.el'
>> --- lisp/term/x-win.el 2012-07-20 11:32:30 +0000
>> +++ lisp/term/x-win.el 2012-07-28 05:08:48 +0000
>> @@ -1316,7 +1316,7 @@
>> (popup-menu (mouse-menu-bar-map)
>> (if (listp last-nonmenu-event)
>> nil
>> - 'point)))))
>> + (posn-at-point))))))
>
>>
>> ;;; Window system initialization.
>
>
>