emacs: lisp/msb.el comparison

comparison lisp/msb.el @ 10371:629821e2b42e

Better format of files-by-directory menus. Split big menus into sub-menus. (msb-max-menu-items): Changed default value. This variable now depicts the maximum number of items in a sub-menu. (msb-display-most-recently-used): Changed default value. (mouse-select-buffer): Now handles several levels of sub-menus. New format on return value.

author	Richard M. Stallman <rms@gnu.org>
date	Mon, 09 Jan 1995 22:16:23 +0000
parents	52a1e5ef144c
children	c0e27466fb3f

comparison

equal deleted inserted replaced

-:4b1c8dc724e6
+:629821e2b42e
 ;;; msb.el --- Customizable buffer-selection with multiple menus.
 ;; Copyright (C) 1993, 1994 Lars Lindberg <Lars.Lindberg@sypro.cap.se>
 ;;
 ;; Author: Lars Lindberg <Lars.Lindberg@sypro.cap.se>
 ;; Created: 8 Oct 1993
+;; Lindberg's last update version: 3.27
 ;; Keywords: mouse buffer menu
 ;;
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2 of the License, or
 ;;   sorting - you will get latest used buffer first.
 ;;
 ;;   Also check out the variable `msb-display-invisible-buffers-p'.
 ;; Known bugs:
-;; - `msb' does not work on a non-X-toolkit Emacs.
+;; - Files-by-directory
+;;   + No possibility to show client/changed buffers separately
 ;; Future enhancements:
 ;; - [Mattes] had a suggestion about sorting files by extension.
 ;;   I (Lars Lindberg) think this case could be solved if msb.el was
 ;;   rewritten to handle more dynamic splitting.  It's now completely
 ;;   static, depending on the menu-cond.  If the splitting could also
 The separators will appear between all menus that have a sorting key that differs by this value or more.")
 (defvar msb-files-by-directory-sort-key 0
 "*The sort key for files sorted by directory")
-(defvar msb-max-menu-items 25
+(defvar msb-max-menu-items 15
 "*The maximum number of items in a menu.
-If this variable is set to 15 for instance, then the 15 latest used
+If this variable is set to 15 for instance, then the submenu will be split up in minor parts, 15 items each.
-buffer that fits in a certain submenu will appear in that submenu.
 Nil means no limit.")
 (defvar msb-max-file-menu-items 10
 "*The maximum number of items from different directories.
 When the menu is of type `file by directory', this is the maximum
 number of buffers that are clumped togehter from different
 directories.
+Set this to 1 if you want one menu per directory instead of clumping
+them together.
 If the value is not a number, then the value 10 is used.")
 (defvar msb-most-recently-used-sort-key -1010
 "*Where should the menu with the most recently used buffers be placed?")
-(defvar msb-display-most-recently-used t
+(defvar msb-display-most-recently-used 15
 "*How many buffers should be in the most-recently-used menu.
-No buffers at all if less than 1 or nil.
+No buffers at all if less than 1 or nil (or any non-number).")
-T means use the value of `msb-max-menu-items' in the way it is defined.")
 (defvar msb-most-recently-used-title "Most recently used (%d)"
 "*The title for the most-recently-used menu.")
 (defvar msb-horizontal-shift-function '(lambda () 0)
 "*The appearance of a buffer menu.
 The default function to call for handling the appearance of a menu
 item.  It should take to arguments, BUFFER and MAX-BUFFER-NAME-LENGTH,
 where the latter is the max length of all buffer names.
+The function should return the string to use in the menu.
 When the function is called, BUFFER is the current buffer.
 This function is called for items in the variable `msb-menu-cond' that
 have nil as ITEM-HANDLING-FUNCTION.  See `msb-menu-cond' for more
 information.")
 ;; If this is non-nil, then it is a string that describes the error.
 (defvar msb--error nil)
 ;;;
-;;; Some example function to be used for `msb-item-sort-function'.
+;;; Some example function to be used for `msb-item-handling-function'.
 ;;;
 (defun msb-item-handler (buffer &optional maxbuf)
 "Create one string item, concerning BUFFER, for the buffer menu.
 The item looks like:
 *% <buffer-name>
 (if buffer-read-only "%" " ")
 (if (and (boundp 'vc-mode) vc-mode) "#" " ")
 (or buffer-file-name "")))
 ;;;
-;;; Some example function to be used for `msb-item-handling-function'.
+;;; Some example function to be used for `msb-item-sort-function'.
 ;;;
 (defun msb-sort-by-name (item1 item2)
 "Sorts the items depending on their buffer-name
 An item look like (NAME . BUFFER)."
 (string-lessp (buffer-name (cdr item1))
 See the function `mouse-select-buffer' and the variable
 `msb-menu-cond' for more information about how the menus are split."
 (interactive "e")
 (let ((buffer (mouse-select-buffer event))
 	(window (posn-window (event-start event))))
-(cond
+(when buffer
-(buffer
+(unless (framep window) (select-window window))
-(or (framep window) (select-window window))
+(switch-to-buffer buffer)))
-(switch-to-buffer (car (cdr buffer))))))
 nil)
 ;;;
 ;;; Some supportive functions
 ;;;
 (append
 (mapcan (function
 	       (lambda (item)
 		 (cond
 		  ((and path
-			msb-max-menu-items
-			(< (length buffers) msb-max-menu-items)
 			(string= path (car item)))
 		   (push (cdr item) buffers)
 		   nil)
 		  (t
 		   (when path
 	  (setq tmp-rest (cdr tmp-rest))
 	  (setq item (car tmp-rest)))
 	(cond
 	 ((> (length buffers) max-clumped-together)
 	  (setq last-path (car first))
-	  (when top-found-p
+	  (setq first
-	    (setq first (cons (concat (car first) "/...")
+		(cons (format (if top-found-p
-			      (cdr first)))
+				  "%s/... (%d)"
-	    (setq top-found-p nil))
+				"%s (%d)")
+			      (car first)
+			      (length (cdr first)))
+		      (cdr first)))
+	  (setq top-found-p nil)
 	  (push first final-list)
 	  (setq first (car rest)
 		rest (cdr rest))
 	  (setq path (car first)
 		buffers (cdr first)))
 				       (substring path 0 (length last-path))))
 			 (and (< (length path) (length last-path))
 			      (string= path
 				       (substring last-path 0 (length path))))))
-	    (when top-found-p
+	    (setq first
-	      (setq first (cons (concat (car first) "/...")
+		  (cons (format (if top-found-p
-				(cdr first)))
+				    "%s/... (%d)"
-	      (setq top-found-p nil))
+				  "%s (%d)")
+				(car first)
+				(length (cdr first)))
+			(cdr first)))
+	    (setq top-found-p nil)
 	    (push first final-list)
 	    (setq first (car rest)
 		  rest (cdr rest))
 	    (setq path (car first)
 		buffers (cdr first)))))))
-(when top-found-p
+(setq first
-(setq first (cons (concat (car first)
+	  (cons (format (if top-found-p
-				(if (string-match "/$" (car first))
+			    "%s/... (%d)"
-				    "..."
+			  "%s (%d)")
-				  "/..."))
+			(car first)
-			(cdr first)))
+			(length (cdr first)))
-(setq top-found-p nil))
+		(cdr first)))
+(setq top-found-p nil)
 (push first final-list)
 (nreverse final-list)))
 ;; Create a vector as:
 ;; [BUFFER-LIST-VARIABLE CONDITION MENU-SORT-KEY MENU-TITLE ITEM-HANDLER SORTER)
 			      (eval (aref fi 1))) ;Test CONDITION
 			(not (and (eq result 'no-multi)
 				  multi-flag))
 			(progn (when (eq result 'multi)
 				 (setq multi-flag t))
-			       t)
+			       t))
-			(or (not msb-max-menu-items)
-			    (< (length (eval (aref fi 0)))
-			       msb-max-menu-items)))
 		collect fi
 		until (and result
 			   (not (eq result 'multi)))))
 (when (and (not function-info-list)
 	       (not result))
 			(sort buffer-list sorter))))))))))
 ;; Returns a list on the form ((TITLE . BUFFER-LIST)) for
 ;; the most recently used buffers.
 (defun msb--most-recently-used-menu (max-buffer-name-length)
-(when (and msb-display-most-recently-used
+(when (and (numberp msb-display-most-recently-used)
-	     (or (not (numberp msb-display-most-recently-used))
+	     (> msb-display-most-recently-used 0))
-		 (> msb-display-most-recently-used 0)))
+(let* ((most-recently-used
-(let* ((max-in-menu
-	    (if (numberp msb-display-most-recently-used)
-		msb-display-most-recently-used
-	      msb-max-menu-items))
-	   (most-recently-used
 	    (loop with n = 0
 		  for buffer in (cdr (buffer-list))
 		  if (save-excursion
 		       (set-buffer buffer)
 		       (and (not (msb-invisible-buffer-p))
 			    (cons (funcall msb-item-handling-function
 					   buffer
 					   max-buffer-name-length)
 				  buffer))
 		  and do (incf n)
-		  until (and max-in-menu (>= n max-in-menu)))))
+		  until (>= n msb-display-most-recently-used))))
 (cons (if (stringp msb-most-recently-used-title)
 		(format msb-most-recently-used-title
 			(length most-recently-used))
 	      (signal 'wrong-type-argument (list msb-most-recently-used-title)))
 	    most-recently-used))))
 		       (cons msb-files-by-directory-sort-key
 			     (cons (car buffer-list)
 				   (sort
 				    (mapcar (function
 					     (lambda (buffer)
-					       (cons (buffer-name buffer)
+					       (cons (save-excursion
+						       (set-buffer buffer)
+						       (funcall msb-item-handling-function
+							      buffer
+							      max-buffer-name-length))
 						     buffer)))
 					    (cdr buffer-list))
 				    (function
 				     (lambda (item1 item2)
 				       (string< (car item1) (car item2)))))))))
 		     (msb--choose-file-menu file-buffers))))
 ;; Now make the menu - a list of (TITLE . BUFFER-LIST)
-(let* ((buffers (buffer-list))
+(let* (menu
-	   menu
 	   (most-recently-used
 	    (msb--most-recently-used-menu max-buffer-name-length))
 	   (others (append file-buffers
 			   (loop for elt
-			 across function-info-vector
+				 across function-info-vector
-			 for value = (msb--create-sort-item elt)
+				 for value = (msb--create-sort-item elt)
-			 if value collect value))))
+				 if value collect value))))
 (setq menu
 	    (mapcar 'cdr		;Remove the SORT-KEY
 		    ;; Sort the menus - not the items.
 		    (msb--add-separators
 		    (sort
 (defun mouse-select-buffer (event)
 "Pop up several menus of buffers, for selection with the mouse.
 Returns the selected buffer or nil if no buffer is selected.
-The way the buffers are splitted is conveniently handled with the
+The way the buffers are split is conveniently handled with the
 variable `msb-menu-cond'."
 ;; Popup the menu and return the selected buffer.
 (when (or msb--error
 	    (not msb--last-buffer-menu)
 	    (not (fboundp 'frame-or-buffer-changed-p))
 	    (frame-or-buffer-changed-p))
 (setq msb--error nil)
 (setq msb--last-buffer-menu (msb--create-buffer-menu)))
-(let ((position event))
+(let ((position event)
+	choice)
 (when (and (fboundp 'posn-x-y)
 	       (fboundp 'posn-window))
 (let ((posX (car (posn-x-y (event-start event))))
 	    (posY (cdr (posn-x-y (event-start event))))
-	    (posWind (posn-window (event-start event)))
+	    (posWind (posn-window (event-start event))))
-	    name)
 	;; adjust position
 	(setq posX (- posX (funcall msb-horizontal-shift-function))
 	      position (list (list posX posY) posWind))))
-(setq name (x-popup-menu position msb--last-buffer-menu))
+(setq choice (x-popup-menu position msb--last-buffer-menu))
-;; If toggle bring up the
 (cond
-((eq (car name) 'toggle)
+((eq (car choice) 'toggle)
-	(msb--toggle-menu-type)
+;; Bring up the menu again with type toggled.
-	(mouse-select-buffer event))
+(msb--toggle-menu-type)
-((and (numberp (car name))
+(mouse-select-buffer event))
-	   (null (cdr name)))
+((and (numberp (car choice))
-(let ((msb--last-buffer-menu (nthcdr 3 (assq (car name) msb--last-buffer-menu))))
+	   (null (cdr choice)))
+(let ((msb--last-buffer-menu (nthcdr 3 (assq (car choice) msb--last-buffer-menu))))
 	(mouse-select-buffer event)))
-((and (stringp (car name))
+((while (numberp (car choice))
-	   (null (cdr name)))
+	(setq choice (cdr choice))))
-(cons nil name))
+((and (stringp (car choice))
-(t
+	   (null (cdr choice)))
-name))))
+(car choice))
+(t
+(error "Unknown form for buffer: %s" choice)))))
 ;; Add separators
 (defun msb--add-separators (sorted-list)
 (cond
 ((or (not msb-separator-diff)
 	   (t
 	    (setq last-key (car item))
 	    (list item)))))
 sorted-list)))))
+(defun msb--split-menus-2 (list mcount result)
+(cond
+((> (length list) msb-max-menu-items)
+(let ((count 0)
+	  sub-name
+	  (tmp-list nil))
+(while (< count msb-max-menu-items)
+	(push (pop list) tmp-list)
+	(incf count))
+(setq tmp-list (nreverse tmp-list))
+(setq sub-name (concat (car (car tmp-list)) "..."))
+(push (append (list mcount sub-name
+			'keymap sub-name)
+		  tmp-list)
+	  result))
+(msb--split-menus-2 list (1+ mcount) result))
+((null result)
+list)
+(t
+(let (sub-name)
+(setq sub-name (concat (car (car list)) "..."))
+(push (append (list mcount sub-name
+			'keymap sub-name)
+		  list)
+	  result))
+(nreverse result))))
+(defun msb--split-menus (list)
+(msb--split-menus-2 list 0 nil))
 (defun msb--make-keymap-menu (raw-menu)
 (let ((end (cons '(nil) 'menu-bar-select-buffer))
 	(mcount 0))
 (mapcar
 (function
 (lambda (sub-menu)
 	(cond
 	 ((eq 'separator sub-menu)
 	  (list 'separator "---"))
 	 (t
-	  (append (list (incf mcount) (car sub-menu)
+	  (let ((buffers (mapcar (function
-			'keymap (car sub-menu))
+				  (lambda (item)
-		  (mapcar (function
+				    (let ((string (car item))
-			   (lambda (item)
+					  (buffer (cdr item)))
-			     (let ((string (car item))
+				      (cons (buffer-name buffer)
-				   (buffer (cdr item)))
+					    (cons string end)))))
-			       (cons (buffer-name buffer)
+				 (cdr sub-menu))))
-				     (cons string end)))))
+	    (append (list (incf mcount) (car sub-menu)
-		   (cdr sub-menu)))))))
+			  'keymap (car sub-menu))
+		    (msb--split-menus buffers)))))))
 raw-menu)))
 (defun menu-bar-update-buffers (&optional arg)
 ;; If user discards the Buffers item, play along.
 (when (and (lookup-key (current-global-map) [menu-bar buffer])
 (substitute-key-definition 'mouse-buffer-menu 'msb (current-global-map)))
 (provide 'msb)
 (eval-after-load 'msb (run-hooks 'msb-after-load-hooks))
 ;;; msb.el ends here

Mercurial > emacs

comparison lisp/msb.el @ 10371:629821e2b42e