comparison lisp/mouse.el @ 31258:12f2e341ee9c

(mouse-major-mode-menu): Use local-key-binding. (mouse-popup-menubar): Add minor mode menus. (popup-menu): Check for lookup-key returning number.

31257:790050caa073

		 ;; in sequence until a first binding is found.
		 (let ((mouse-click (apply 'vector event))
		       binding)
		   (while (and map (null binding))
		     (setq binding (lookup-key (car map) mouse-click))
		     (setq map (cdr map)))
		   binding)
	       ;; We were given a single keymap.
	       (lookup-key map (apply 'vector event)))))
	(setq map nil)

	 ;; It is either nil or (SOME-SYMBOL).
	 (mouse-major-mode-menu-prefix nil)
	 ;; Keymap from which to inherit; may be null.
	 (ancestor (mouse-major-mode-menu-1
		    (and (current-local-map)
			 (lookup-key (current-local-map) [menu-bar]))))
	 ;; Make a keymap in which our last command leads to a menu or
	 ;; default to the edit menu.
	 (newmap (if ancestor
		     (make-sparse-keymap (concat mode-name " Mode"))
		   menu-bar-edit-menu))

  (run-hooks 'activate-menubar-hook)
  (let* ((local-menu (and (current-local-map)
			  (lookup-key (current-local-map) [menu-bar])))
	 (global-menu (lookup-key global-map [menu-bar]))
	 (local-title-or-map (and local-menu (cadr local-menu)))
	 (global-title-or-map (cadr global-menu)))
    ;; If the keymaps don't have prompt string (a lazy programmer
    ;; didn't bother to provide one), create it and insert it into the
    ;; keymaps; each keymap gets its own prompt.  This is required for
    ;; non-toolkit versions to display non-empty menu pane names.

    (or (stringp global-title-or-map)
	(setq global-menu (cons 'keymap
			        (cons "Global Menu"
				      (cdr global-menu)))))
    ;; Supplying the list is faster than making a new map.
    (popup-menu (if local-menu
		    (list global-menu local-menu)
		  (list global-menu))
		event prefix)))

(defun mouse-popup-menubar-stuff (event prefix)
  "Popup a menu like either `mouse-major-mode-menu' or `mouse-popup-menubar'.
Use the former if the menu bar is showing, otherwise the latter."

31258:12f2e341ee9c

		 ;; in sequence until a first binding is found.
		 (let ((mouse-click (apply 'vector event))
		       binding)
		   (while (and map (null binding))
		     (setq binding (lookup-key (car map) mouse-click))
		     (if (numberp binding) ; `too long'
		       (setq binding nil))
		     (setq map (cdr map)))
		   binding)
	       ;; We were given a single keymap.
	       (lookup-key map (apply 'vector event)))))
	(setq map nil)

	 ;; It is either nil or (SOME-SYMBOL).
	 (mouse-major-mode-menu-prefix nil)
	 ;; Keymap from which to inherit; may be null.
	 (ancestor (mouse-major-mode-menu-1
		    (and (current-local-map)
			 (local-key-binding [menu-bar]))))
	 ;; Make a keymap in which our last command leads to a menu or
	 ;; default to the edit menu.
	 (newmap (if ancestor
		     (make-sparse-keymap (concat mode-name " Mode"))
		   menu-bar-edit-menu))

  (run-hooks 'activate-menubar-hook)
  (let* ((local-menu (and (current-local-map)
			  (lookup-key (current-local-map) [menu-bar])))
	 (global-menu (lookup-key global-map [menu-bar]))
	 (local-title-or-map (and local-menu (cadr local-menu)))
	 (minor-mode-menus (mapcar #'cdr (minor-mode-key-binding [menu-bar])))
	 (global-title-or-map (cadr global-menu)))
    ;; If the keymaps don't have prompt string (a lazy programmer
    ;; didn't bother to provide one), create it and insert it into the
    ;; keymaps; each keymap gets its own prompt.  This is required for
    ;; non-toolkit versions to display non-empty menu pane names.

    (or (stringp global-title-or-map)
	(setq global-menu (cons 'keymap
			        (cons "Global Menu"
				      (cdr global-menu)))))
    ;; Supplying the list is faster than making a new map.
    (popup-menu (append (list global-menu)
			(if local-menu
			    (list local-menu))
			minor-mode-menus)
		event prefix)))

(defun mouse-popup-menubar-stuff (event prefix)
  "Popup a menu like either `mouse-major-mode-menu' or `mouse-popup-menubar'.
Use the former if the menu bar is showing, otherwise the latter."