annotate lisp/gutter-items.el @ 406:b8cc9ab3f761 r21-2-33

Import from CVS: tag r21-2-33
author cvs
date Mon, 13 Aug 2007 11:17:09 +0200
parents 2f8bb876ab1d
children 501cfd01ee6d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
1 ;;; gutter-items.el --- Gutter content for XEmacs.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
2
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
3 ;; Copyright (C) 1999 Free Software Foundation, Inc.
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
4 ;; Copyright (C) 1999, 2000 Andy Piper.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
5
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
6 ;; Maintainer: XEmacs Development Team
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
7 ;; Keywords: frames, extensions, internal, dumped
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
8
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
9 ;; This file is part of XEmacs.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
10
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
11 ;; XEmacs is free software; you can redistribute it and/or modify it
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
12 ;; under the terms of the GNU General Public License as published by
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
14 ;; any later version.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
15
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
16 ;; XEmacs is distributed in the hope that it will be useful, but
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
19 ;; General Public License for more details.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
20
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
22 ;; along with Xmacs; see the file COPYING. If not, write to the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
23 ;; Free Software Foundation, 59 Temple Place - Suite 330,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
24 ;; Boston, MA 02111-1307, USA.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
25
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
26 ;; Some of this is taken from the buffer-menu stuff in menubar-items.el
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
27
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
28 ;;; The Buffers tab
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
29
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
30 (defgroup buffers-tab nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
31 "Customization of `Buffers' tab."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
32 :group 'gutter)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
33
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
34 (defvar gutter-buffers-tab nil
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
35 "A tab widget in the gutter for displaying buffers.
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
36 Do not set this. Use `glyph-image-instance' and
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
37 `set-image-instance-property' to change the properties of the tab.")
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
38
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
39 (defcustom gutter-buffers-tab-visible-p
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
40 (gutter-element-visible-p default-gutter-visible-p 'buffers-tab)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
41 "Whether the buffers tab is globally visible.
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
42 This option should be set through the options menu."
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
43 :group 'buffers-tab
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
44 :type 'boolean
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
45 :set #'(lambda (var val)
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
46 (set-gutter-element-visible-p default-gutter-visible-p
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
47 'buffers-tab val)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
48 (setq gutter-buffers-tab-visible-p val)))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
49
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
50 (defvar gutter-buffers-tab-orientation 'top
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
51 "Where the buffers tab currently is. Do not set this.")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
52
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
53 (defvar gutter-buffers-tab-extent nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
54
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
55 (defcustom buffers-tab-max-size 6
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
56 "*Maximum number of entries which may appear on the \"Buffers\" tab.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
57 If this is 10, then only the ten most-recently-selected buffers will be
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
58 shown. If this is nil, then all buffers will be shown. Setting this to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
59 a large number or nil will slow down tab responsiveness."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
60 :type '(choice (const :tag "Show all" nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
61 (integer 6))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
62 :group 'buffers-tab)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
63
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
64 (defcustom buffers-tab-switch-to-buffer-function 'buffers-tab-switch-to-buffer
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
65 "*The function to call to select a buffer from the buffers tab.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
66 `switch-to-buffer' is a good choice, as is `pop-to-buffer'."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
67 :type '(radio (function-item switch-to-buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
68 (function-item pop-to-buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
69 (function :tag "Other"))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
70 :group 'buffers-tab)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
71
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
72 (defcustom buffers-tab-omit-function 'buffers-menu-omit-invisible-buffers
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
73 "*If non-nil, a function specifying the buffers to omit from the buffers tab.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
74 This is passed a buffer and should return non-nil if the buffer should be
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
75 omitted. The default value `buffers-tab-omit-invisible-buffers' omits
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
76 buffers that are normally considered \"invisible\" (those whose name
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
77 begins with a space)."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
78 :type '(choice (const :tag "None" nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
79 function)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
80 :group 'buffers-tab)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
81
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
82 (defcustom buffers-tab-selection-function 'select-buffers-tab-buffers-by-mode
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
83 "*If non-nil, a function specifying the buffers to select from the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
84 buffers tab. This is passed two buffers and should return non-nil if
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
85 the second buffer should be selected. The default value
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
86 `select-buffers-tab-buffers-by-mode' groups buffers by major mode and
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
87 by `buffers-tab-grouping-regexp'."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
88
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
89 :type '(choice (const :tag "None" nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
90 function)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
91 :group 'buffers-tab)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
92
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
93 (defcustom buffers-tab-sort-function nil
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
94 "*If non-nil, a function specifying the buffers to select from the
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
95 buffers tab. This is passed the buffer list and returns the list in the
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
96 order desired for the tab widget. The default value `nil' leaves the
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
97 list in `buffer-list' order (usual most-recently-selected-first)."
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
98
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
99 :type '(choice (const :tag "None" nil)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
100 function)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
101 :group 'buffers-tab)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
102
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
103 (make-face 'buffers-tab "Face for displaying the buffers tab.")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
104 (set-face-parent 'buffers-tab 'default)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
105
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
106 (defcustom buffers-tab-face 'buffers-tab
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
107 "*Face to use for displaying the buffers tab."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
108 :type 'face
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
109 :group 'buffers-tab)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
110
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
111 (defcustom buffers-tab-grouping-regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
112 '("^\\(gnus-\\|message-mode\\|mime/viewer-mode\\)"
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
113 "^\\(emacs-lisp-\\|lisp-\\)")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
114 "*If non-nil, a list of regular expressions for buffer grouping.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
115 Each regular expression is applied to the current major-mode symbol
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
116 name and mode-name, if it matches then any other buffers that match
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
117 the same regular expression be added to the current group."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
118 :type '(choice (const :tag "None" nil)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
119 sexp)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
120 :group 'buffers-tab)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
121
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
122 (defcustom buffers-tab-format-buffer-line-function 'format-buffers-tab-line
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
123 "*The function to call to return a string to represent a buffer in the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
124 buffers tab. The function is passed a buffer and should return a
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
125 string. The default value `format-buffers-tab-line' just returns the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
126 name of the buffer, optionally truncated to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
127 `buffers-tab-max-buffer-line-length'. Also check out
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
128 `slow-format-buffers-menu-line' which returns a whole bunch of info
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
129 about a buffer."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
130 :type 'function
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
131 :group 'buffers-tab)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
132
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
133 (defvar buffers-tab-default-buffer-line-length
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
134 (make-specifier-and-init 'generic '((global ((default) . 25))) t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
135 "*Maximum length of text which may appear in a \"Buffers\" tab.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
136 This is a specifier, use set-specifier to modify it.")
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
137
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
138 (defcustom buffers-tab-max-buffer-line-length
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
139 (specifier-instance buffers-tab-default-buffer-line-length)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
140 "*Maximum length of text which may appear in a \"Buffers\" tab.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
141 Buffer names over this length will be truncated with elipses.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
142 If this is 0, then the full buffer name will be shown."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
143 :type '(choice (const :tag "Show all" 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
144 (integer 25))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
145 :group 'buffers-tab
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
146 :set #'(lambda (var val)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
147 (set-specifier buffers-tab-default-buffer-line-length val)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
148 (setq buffers-tab-max-buffer-line-length val)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
149
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
150 (defun buffers-tab-switch-to-buffer (buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
151 "For use as a value for `buffers-tab-switch-to-buffer-function'."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
152 (unless (eq (window-buffer) buffer)
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
153 ;; this used to add the norecord flag to both calls below.
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
154 ;; this is bogus because it is a pervasive assumption in XEmacs
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
155 ;; that the current buffer is at the front of the buffers list.
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
156 ;; for example, select an item and then do M-C-l
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
157 ;; (switch-to-other-buffer). Things get way confused.
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
158 ;;
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
159 ;; Andy, if you want to maintain the current look, you must
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
160 ;; *uncouple* the gutter order and buffers order.
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
161 (if (> (length (windows-of-buffer buffer)) 0)
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
162 (select-window (car (windows-of-buffer buffer)))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
163 (switch-to-buffer buffer))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
164
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
165 (defun select-buffers-tab-buffers-by-mode (buf1 buf2)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
166 "For use as a value of `buffers-tab-selection-function'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
167 This selects buffers by major mode `buffers-tab-grouping-regexp'."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
168 (let ((mode1 (symbol-name (symbol-value-in-buffer 'major-mode buf1)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
169 (mode2 (symbol-name (symbol-value-in-buffer 'major-mode buf2)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
170 (modenm1 (symbol-value-in-buffer 'mode-name buf1))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
171 (modenm2 (symbol-value-in-buffer 'mode-name buf2)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
172 (cond ((or (eq mode1 mode2)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
173 (eq modenm1 modenm2)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
174 (and (string-match "^[^-]+-" mode1)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
175 (string-match
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
176 (concat "^" (regexp-quote
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
177 (substring mode1 0 (match-end 0))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
178 mode2))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
179 (and buffers-tab-grouping-regexp
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
180 (find-if #'(lambda (x)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
181 (or
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
182 (and (string-match x mode1)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
183 (string-match x mode2))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
184 (and (string-match x modenm1)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
185 (string-match x modenm2))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
186 buffers-tab-grouping-regexp)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
187 t)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
188 (t nil))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
189
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
190 (defun format-buffers-tab-line (buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
191 "For use as a value of `buffers-tab-format-buffer-line-function'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
192 This just returns the buffer's name, optionally truncated."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
193 (let ((len (specifier-instance buffers-tab-default-buffer-line-length)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
194 (if (and (> len 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
195 (> (length (buffer-name buffer)) len))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
196 (if (string-match ".*<.>$" (buffer-name buffer))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
197 (concat (substring (buffer-name buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
198 0 (- len 6)) "..."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
199 (substring (buffer-name buffer) -3))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
200 (concat (substring (buffer-name buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
201 0 (- len 3)) "..."))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
202 (buffer-name buffer))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
203
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
204 (defsubst build-buffers-tab-internal (buffers)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
205 (let ((selected t))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
206 (mapcar
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
207 #'(lambda (buffer)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
208 (prog1
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
209 (vector
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
210 (funcall buffers-tab-format-buffer-line-function
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
211 buffer)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
212 (list buffers-tab-switch-to-buffer-function
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
213 (buffer-name buffer))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
214 :selected selected)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
215 (when selected (setq selected nil))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
216 buffers)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
217
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
218 ;;; #### SJT I'd really like this function to have just two hooks: (1) the
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
219 ;;; buffer filter list and (2) a sort function list. Both should be lists
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
220 ;;; of functions. Each filter takes two arguments: a buffer and a model
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
221 ;;; buffer. (The model buffer argument allows selecting according to the
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
222 ;;; mode or directory of that buffer.) The filter returns t if the buffer
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
223 ;;; should be listed and nil otherwise. Effectively the filter amounts to
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
224 ;;; the conjuction of the filter list. (Optionally the filter could take a
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
225 ;;; frame instead of a buffer or generalize to a locale as in a specifier?)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
226 ;;; The filtering is done this way to preserve the ordering imposed by
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
227 ;;; `buffer-list'. In addition, the in-deletion argument will be used the
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
228 ;;; same way as in the current design.
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
229 ;;; The list is checked for length and pruned according to least-recently-
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
230 ;;; selected. (Optionally there could be some kind of sort function here,
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
231 ;;; too.)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
232 ;;; Finally the list is sorted to gutter display order, and the tab data
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
233 ;;; structure is created and returned.
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
234 ;;; #### Docstring isn't very well expressed.
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
235 (defun buffers-tab-items (&optional in-deletion frame force-selection)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
236 "This is the tab filter for the top-level buffers \"Buffers\" tab.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
237 It dynamically creates a list of buffers to use as the contents of the tab.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
238 Only the most-recently-used few buffers will be listed on the tab, for
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
239 efficiency reasons. You can control how many buffers will be shown by
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
240 setting `buffers-tab-max-size'. You can control the text of the tab
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
241 items by redefining the function `format-buffers-menu-line'."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
242 (save-match-data
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
243 (let* ((buffers (delete-if buffers-tab-omit-function (buffer-list frame)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
244 (first-buf (car buffers)))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
245 ;; maybe force the selected window
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
246 (when (and force-selection
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
247 (not in-deletion)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
248 (not (eq first-buf (window-buffer (selected-window frame)))))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
249 (setq buffers (cons (window-buffer (selected-window frame))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
250 (delq first-buf buffers))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
251 ;; if we're in deletion ignore the current buffer
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
252 (when in-deletion
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
253 (setq buffers (delq (current-buffer) buffers))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
254 (setq first-buf (car buffers)))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
255 ;; select buffers in group (default is by mode)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
256 (when buffers-tab-selection-function
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
257 (delete-if-not #'(lambda (buf)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
258 (funcall buffers-tab-selection-function
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
259 first-buf buf)) buffers))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
260 ;; maybe shorten list of buffers
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
261 (and (integerp buffers-tab-max-size)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
262 (> buffers-tab-max-size 1)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
263 (> (length buffers) buffers-tab-max-size)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
264 (setcdr (nthcdr buffers-tab-max-size buffers) nil))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
265 ;; sort buffers in group (default is most-recently-selected)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
266 (when buffers-tab-sort-function
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
267 (setq buffers (funcall buffers-tab-sort-function buffers)))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
268 ;; convert list of buffers to list of structures used by tab widget
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
269 (setq buffers (build-buffers-tab-internal buffers))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
270 buffers)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
271
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
272 (defun add-tab-to-gutter ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
273 "Put a tab control in the gutter area to hold the most recent buffers."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
274 (setq gutter-buffers-tab-orientation (default-gutter-position))
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
275 (let ((gutter-string (copy-sequence "\n")))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
276 (unless gutter-buffers-tab-extent
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
277 (setq gutter-buffers-tab-extent (make-extent 0 1 gutter-string)))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
278 (set-extent-begin-glyph
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
279 gutter-buffers-tab-extent
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
280 (setq gutter-buffers-tab
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
281 (make-glyph
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
282 (vector 'tab-control :descriptor "Buffers" :face buffers-tab-face
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
283 :orientation gutter-buffers-tab-orientation
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
284 (if (or (eq gutter-buffers-tab-orientation 'top)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
285 (eq gutter-buffers-tab-orientation 'bottom))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
286 :pixel-width :pixel-height)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
287 (if (or (eq gutter-buffers-tab-orientation 'top)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
288 (eq gutter-buffers-tab-orientation 'bottom))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
289 '(gutter-pixel-width) '(gutter-pixel-height))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
290 :properties (list :items (buffers-tab-items nil nil t))))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
291
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
292 ;; Nuke all existing tabs
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
293 (remove-gutter-element top-gutter 'buffers-tab)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
294 (remove-gutter-element bottom-gutter 'buffers-tab)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
295 (remove-gutter-element left-gutter 'buffers-tab)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
296 (remove-gutter-element right-gutter 'buffers-tab)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
297 ;; Put tabs into all devices that will be able to display them
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
298 (mapcar
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
299 #'(lambda (x)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
300 (when (valid-image-instantiator-format-p 'tab-control x)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
301 (cond ((eq gutter-buffers-tab-orientation 'top)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
302 ;; This looks better than a 3d border
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
303 (set-specifier top-gutter-border-width 0 'global x)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
304 (set-gutter-element top-gutter 'buffers-tab
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
305 gutter-string 'global x))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
306 ((eq gutter-buffers-tab-orientation 'bottom)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
307 (set-specifier bottom-gutter-border-width 0 'global x)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
308 (set-gutter-element bottom-gutter 'buffers-tab
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
309 gutter-string 'global x))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
310 ((eq gutter-buffers-tab-orientation 'left)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
311 (set-specifier left-gutter-border-width 0 'global x)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
312 (set-gutter-element left-gutter 'buffers-tab
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
313 gutter-string 'global x)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
314 (set-specifier left-gutter-width
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
315 (glyph-width gutter-buffers-tab)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
316 'global x))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
317 ((eq gutter-buffers-tab-orientation 'right)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
318 (set-specifier right-gutter-border-width 0 'global x)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
319 (set-gutter-element right-gutter 'buffers-tab
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
320 gutter-string 'global x)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
321 (set-specifier right-gutter-width
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
322 (glyph-width gutter-buffers-tab)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
323 'global x))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
324 )))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
325 (console-type-list))))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
326
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
327 (defun update-tab-in-gutter (&optional frame-or-buffer force-selection)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
328 "Update the tab control in the gutter area."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
329 (let ((locale (if (framep frame-or-buffer) frame-or-buffer)))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
330 ;; dedicated frames don't get tabs
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
331 (unless (and (framep locale)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
332 (window-dedicated-p (frame-selected-window locale)))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
333 (when (specifier-instance default-gutter-visible-p locale)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
334 (unless (and gutter-buffers-tab
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
335 (eq (default-gutter-position)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
336 gutter-buffers-tab-orientation))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
337 (add-tab-to-gutter))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
338 (when (valid-image-instantiator-format-p 'tab-control locale)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
339 (let ((inst (glyph-image-instance
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
340 gutter-buffers-tab
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
341 (when (framep frame-or-buffer)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
342 (last-nonminibuf-window frame-or-buffer)))))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
343 (set-image-instance-property inst :items
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
344 (buffers-tab-items
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
345 nil locale force-selection))))))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
346
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
347 (defun remove-buffer-from-gutter-tab ()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
348 "Remove the current buffer from the tab control in the gutter area."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
349 (when (and (valid-image-instantiator-format-p 'tab-control)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
350 (specifier-instance default-gutter-visible-p))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
351 (let ((inst (glyph-image-instance gutter-buffers-tab))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
352 (buffers (buffers-tab-items t)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
353 (unless buffers
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
354 (setq buffers (build-buffers-tab-internal
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
355 (list
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
356 (get-buffer-create "*scratch*")))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
357 (set-image-instance-property inst :items buffers))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
358
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
359 ;; A myriad of different update hooks all doing slightly different things
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
360 (add-hook 'kill-buffer-hook 'remove-buffer-from-gutter-tab)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
361 (add-hook 'create-frame-hook
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
362 #'(lambda (frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
363 (when gutter-buffers-tab (update-tab-in-gutter frame t))))
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
364 (add-hook 'buffer-list-changed-hook 'update-tab-in-gutter)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
365 (add-hook 'default-gutter-position-changed-hook
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
366 #'(lambda ()
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
367 (when gutter-buffers-tab (update-tab-in-gutter))))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
368 (add-hook 'gutter-element-visibility-changed-hook
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
369 #'(lambda (prop visible-p)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
370 (when (and (eq prop 'buffers-tab) visible-p)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
371 (update-tab-in-gutter))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
372
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
373 ;;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
374 ;; progress display
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
375 ;; ripped off from message display
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
376 ;;
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
377 (defcustom progress-display-use-echo-area nil
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
378 "*Whether progress gauge display should display in the echo area.
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
379 If NIL then progress gauges will be displayed with whatever native widgets
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
380 are available on the current console. If non-NIL then progress display will be
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
381 textual and displayed in the echo area."
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
382 :type 'boolean
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
383 :group 'gutter)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
384
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
385 (defvar progress-glyph-height 32
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
386 "Height of the gutter area for progress messages.")
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
387
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
388 (defvar progress-display-popup-period 0.5
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
389 "The time that the progress gauge should remain up after completion")
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
390
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
391 ;; private variables
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
392 (defvar progress-text-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
393 (make-glyph [string :data ""]))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
394
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
395 (defvar progress-layout-glyph nil)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
396 (defvar progress-gauge-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
397 (make-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
398 `[progress-gauge
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
399 :pixel-height (- progress-glyph-height 8)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
400 :pixel-width 250
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
401 :descriptor "Progress"]))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
402
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
403 (defun set-progress-display-style (style)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
404 "Control the appearance of the progress gauge.
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
405 If STYLE is 'large, the default, then the progress-display text is
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
406 displayed above the gauge itself. If STYLE is 'small then the gauge
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
407 and text are arranged side-by-side."
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
408 (cond
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
409 ((eq style 'small)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
410 (setq progress-glyph-height 24)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
411 (setq progress-layout-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
412 (make-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
413 `[layout
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
414 :orientation horizontal
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
415 :items (,progress-gauge-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
416 [button
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
417 :pixel-height (- progress-glyph-height 8)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
418 ;; 'quit is special and acts "asynchronously".
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
419 :descriptor "Stop" :callback 'quit]
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
420 ,progress-text-glyph)])))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
421 (t
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
422 (setq progress-glyph-height 32)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
423 (setq progress-layout-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
424 (make-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
425 `[layout
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
426 :orientation vertical :justify left
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
427 :items (,progress-text-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
428 [layout
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
429 :pixel-height (eval progress-glyph-height)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
430 :orientation horizontal
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
431 :items (,progress-gauge-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
432 [button
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
433 :pixel-height (- progress-glyph-height 8)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
434 :descriptor " Stop "
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
435 ;; 'quit is special and acts "asynchronously".
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
436 :callback 'quit])])])))))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
437
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
438 (defcustom progress-display-style 'large
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
439 "*Control the appearance of the progress gauge.
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
440 If 'large, the default, then the progress-display text is displayed
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
441 above the gauge itself. If 'small then the gauge and text are arranged
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
442 side-by-side."
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
443 :group 'gutter
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
444 :type '(choice (const :tag "large" large)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
445 (const :tag "small" small))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
446 :set #'(lambda (var val)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
447 (set-progress-display-style val)))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
448
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
449 (defvar progress-stack nil
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
450 "An alist of label/string pairs representing active progress gauges.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
451 The first element in the list is currently displayed in the gutter area.
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
452 Do not modify this directly--use the `progress-display' or
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
453 `display-progress-display'/`clear-progress-display' functions.")
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
454
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
455 (defvar progress-abort-glyph
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
456 (make-glyph
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
457 `[layout :orientation vertical :justify left
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
458 :items (,progress-text-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
459 [layout
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
460 :pixel-height progress-glyph-height
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
461 :orientation horizontal])]))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
462
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
463 (defun progress-displayed-p (&optional return-string frame)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
464 "Return a non-nil value if a progress gauge is presently displayed in the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
465 gutter area. If optional argument RETURN-STRING is non-nil,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
466 return a string containing the message, otherwise just return t."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
467 (let ((buffer (get-buffer-create " *Gutter Area*")))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
468 (and (< (point-min buffer) (point-max buffer))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
469 (if return-string
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
470 (buffer-substring nil nil buffer)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
471 t))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
472
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
473 ;;; Returns the string which remains in the echo area, or nil if none.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
474 ;;; If label is nil, the whole message stack is cleared.
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
475 (defun clear-progress-display (&optional label frame no-restore)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
476 "Remove any progress gauge with LABEL from the progress gauge-stack,
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
477 erasing it from the gutter area if it's currently displayed there.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
478 If a message remains at the head of the progress-stack and NO-RESTORE
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
479 is nil, it will be displayed. The string which remains in the gutter
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
480 area will be returned, or nil if the progress-stack is now empty.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
481 If LABEL is nil, the entire progress-stack is cleared.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
482
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
483 Unless you need the return value or you need to specify a label,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
484 you should just use (progress nil)."
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
485 (if (or (not (valid-image-instantiator-format-p 'progress-gauge frame))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
486 progress-display-use-echo-area)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
487 (clear-message label frame nil no-restore)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
488 (or frame (setq frame (selected-frame)))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
489 (remove-progress-display label frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
490 (let ((inhibit-read-only t)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
491 (zmacs-region-stays zmacs-region-stays)) ; preserve from change
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
492 (erase-buffer (get-buffer-create " *Gutter Area*")))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
493 (if no-restore
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
494 nil ; just preparing to put another msg up
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
495 (if progress-stack
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
496 (let ((oldmsg (cdr (car progress-stack))))
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
497 (raw-append-progress-display oldmsg nil frame)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
498 oldmsg)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
499 ;; nothing to display so get rid of the gauge
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
500 (set-specifier bottom-gutter-border-width 0 frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
501 (set-gutter-element-visible-p bottom-gutter-visible-p
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
502 'progress nil frame)))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
503
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
504 (defun progress-display-clear-when-idle (&optional label)
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
505 (add-one-shot-hook 'pre-idle-hook
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
506 `(lambda ()
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
507 (clear-progress-display ',label))))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
508
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
509 (defun remove-progress-display (&optional label frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
510 ;; If label is nil, we want to remove all matching progress gauges.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
511 (while (and progress-stack
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
512 (or (null label) ; null label means clear whole stack
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
513 (eq label (car (car progress-stack)))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
514 (setq progress-stack (cdr progress-stack)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
515 (let ((s progress-stack))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
516 (while (cdr s)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
517 (let ((msg (car (cdr s))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
518 (if (eq label (car msg))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
519 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
520 (setcdr s (cdr (cdr s))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
521 (setq s (cdr s)))))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
522
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
523 (defun progress-display-dispatch-non-command-events ()
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
524 ;; don't allow errors to hose things
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
525 (condition-case t
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
526 ;; (sit-for 0) is too agressive and cause more display than we
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
527 ;; want.
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
528 (dispatch-non-command-events)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
529 nil))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
530
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
531 (defun append-progress-display (label message &optional value frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
532 (or frame (setq frame (selected-frame)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
533 ;; Add a new entry to the message-stack, or modify an existing one
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
534 (let* ((top (car progress-stack))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
535 (tmsg (cdr top)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
536 (if (eq label (car top))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
537 (progn
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
538 (setcdr top message)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
539 (if (equal tmsg message)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
540 (set-image-instance-property
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
541 (glyph-image-instance progress-gauge-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
542 (frame-selected-window frame))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
543 :value value)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
544 (raw-append-progress-display message value frame))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
545 (redisplay-gutter-area))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
546 (push (cons label message) progress-stack)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
547 (raw-append-progress-display message value frame))
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
548 (progress-display-dispatch-non-command-events)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
549 ;; either get command events or sit waiting for them
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
550 (when (eq value 100)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
551 ; (sit-for progress-display-popup-period nil)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
552 (clear-progress-display label))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
553
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
554 (defun abort-progress-display (label message &optional frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
555 (if (or (not (valid-image-instantiator-format-p 'progress-gauge frame))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
556 progress-display-use-echo-area)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
557 (display-message label (concat message "aborted.") frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
558 (or frame (setq frame (selected-frame)))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
559 ;; Add a new entry to the message-stack, or modify an existing one
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
560 (let* ((top (car progress-stack))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
561 (inhibit-read-only t)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
562 (zmacs-region-stays zmacs-region-stays))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
563 (if (eq label (car top))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
564 (setcdr top message)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
565 (push (cons label message) progress-stack))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
566 (unless (equal message "")
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
567 (insert-string message (get-buffer-create " *Gutter Area*"))
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
568 (let* ((gutter-string (copy-sequence "\n"))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
569 (ext (make-extent 0 1 gutter-string)))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
570 ;; do some funky display here.
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
571 (set-extent-begin-glyph ext progress-abort-glyph)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
572 ;; fixup the gutter specifiers
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
573 (set-gutter-element bottom-gutter 'progress gutter-string frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
574 (set-specifier bottom-gutter-border-width 2 frame)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
575 (set-image-instance-property
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
576 (glyph-image-instance progress-text-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
577 (frame-selected-window frame)) :data message)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
578 (set-specifier bottom-gutter-height 'autodetect frame)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
579 (set-gutter-element-visible-p bottom-gutter-visible-p
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
580 'progress t frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
581 ;; we have to do this so redisplay is up-to-date and so
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
582 ;; redisplay-gutter-area performs optimally.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
583 (redisplay-gutter-area)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
584 (sit-for progress-display-popup-period nil)
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
585 (clear-progress-display label frame)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
586 (set-extent-begin-glyph ext progress-layout-glyph)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
587 (set-gutter-element bottom-gutter 'progress gutter-string frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
588 )))))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
589
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
590 (defun raw-append-progress-display (message &optional value frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
591 (unless (equal message "")
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
592 (let* ((inhibit-read-only t)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
593 (zmacs-region-stays zmacs-region-stays)
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
594 (val (or value 0))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
595 (gutter-string (copy-sequence "\n"))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
596 (ext (make-extent 0 1 gutter-string)))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
597 (insert-string message (get-buffer-create " *Gutter Area*"))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
598 ;; do some funky display here.
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
599 (set-extent-begin-glyph ext progress-layout-glyph)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
600 ;; fixup the gutter specifiers
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
601 (set-gutter-element bottom-gutter 'progress gutter-string frame)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
602 (set-specifier bottom-gutter-border-width 2 frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
603 (set-image-instance-property
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
604 (glyph-image-instance progress-gauge-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
605 (frame-selected-window frame))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
606 :value val)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
607 (set-image-instance-property
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
608 (glyph-image-instance progress-text-glyph (frame-selected-window frame))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
609 :data message)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
610 (if (and (eq (specifier-instance bottom-gutter-height frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
611 'autodetect)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
612 (gutter-element-visible-p bottom-gutter-visible-p
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
613 'progress frame))
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
614 ;; if the gauge is already visible then just draw the gutter
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
615 ;; checking for user events
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
616 (progn
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
617 (redisplay-gutter-area)
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
618 (progress-display-dispatch-non-command-events))
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
619 ;; otherwise make the gutter visible and redraw the frame
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
620 (set-specifier bottom-gutter-height 'autodetect frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
621 (set-gutter-element-visible-p bottom-gutter-visible-p
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
622 'progress t frame)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
623 ;; we have to do this so redisplay is up-to-date and so
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
624 ;; redisplay-gutter-area performs optimally. This may also
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
625 ;; make sure the frame geometry looks ok.
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
626 (progress-display-dispatch-non-command-events)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
627 (redisplay-frame frame)
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
628 ))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
629
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
630 (defun display-progress-display (label message &optional value frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
631 "Display a progress gauge and message in the bottom gutter area.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
632 First argument LABEL is an identifier for this message. MESSAGE is
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
633 the string to display. Use `clear-progress-display' to remove a labelled
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
634 message."
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
635 (cond ((eq value 'abort)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
636 (abort-progress-display label message frame))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
637 ((or (not (valid-image-instantiator-format-p 'progress-gauge frame))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
638 progress-display-use-echo-area)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
639 (display-message label
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
640 (concat message (if (eq value 100) "done."
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
641 (make-string (/ value 5) ?.)))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
642 frame))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
643 (t
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
644 (append-progress-display label message value frame))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
645
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
646 (defun current-progress-display (&optional frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
647 "Return the current progress gauge in the gutter area, or nil.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
648 The FRAME argument is currently unused."
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
649 (cdr (car progress-stack)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
650
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
651 ;;; may eventually be frame-dependent
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
652 (defun current-progress-display-label (&optional frame)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
653 (car (car progress-stack)))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
654
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
655 (defun progress-display (fmt &optional value &rest args)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
656 "Print a progress gauge and message in the bottom gutter area of the frame.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
657 The arguments are the same as to `format'.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
658
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
659 If the only argument is nil, clear any existing progress gauge."
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
660 (save-excursion
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
661 (if (and (null fmt) (null args))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
662 (prog1 nil
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
663 (clear-progress-display nil))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
664 (let ((str (apply 'format fmt args)))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
665 (display-progress-display 'progress str value)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
666 str))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
667
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
668 (defun lprogress-display (label fmt &optional value &rest args)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
669 "Print a progress gauge and message in the bottom gutter area of the frame.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
670 First argument LABEL is an identifier for this progress gauge. The rest of the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
671 arguments are the same as to `format'."
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
672 ;; #### sometimes the buffer gets changed temporarily. I don't know
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
673 ;; why this is, so protect against it.
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
674 (save-excursion
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
675 (if (and (null fmt) (null args))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
676 (prog1 nil
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
677 (clear-progress-display label nil))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
678 (let ((str (apply 'format fmt args)))
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
679 (display-progress-display label str value)
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
680 str))))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
681
406
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
682 ;;
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
683 ;; Simple search dialog
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
684 ;;
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
685 (defvar search-dialog-direction t)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
686 (defvar search-dialog-text
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
687 (make-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
688 [edit-field :width 15 :descriptor "" :active t :face default]))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
689
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
690 (defun search-dialog-callback (parent image-instance event)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
691 (save-selected-frame
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
692 (select-frame parent)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
693 (funcall (if search-dialog-direction
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
694 'search-forward 'search-backward)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
695 (image-instance-property
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
696 (glyph-image-instance search-dialog-text
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
697 (frame-selected-window
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
698 (event-channel event))) :text))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
699 (isearch-highlight (match-beginning 0) (match-end 0))))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
700
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
701 (defun make-search-dialog ()
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
702 "Popup a search dialog box."
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
703 (interactive)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
704 (let* ((parent (selected-frame)))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
705 (set-buffer-dedicated-frame
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
706 (get-buffer-create "Dialog")
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
707 (make-dialog-box
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
708 (make-glyph
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
709 `[layout
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
710 :orientation horizontal :justify left
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
711 :height 10 :width 40
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
712 :border [string :data "Search"]
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
713 :items
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
714 ([layout :orientation vertical :justify left
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
715 :items
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
716 ([string :data "Search for:"]
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
717 [button :descriptor "Match case"
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
718 :style toggle
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
719 :selected (not case-fold-search)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
720 :callback (setq case-fold-search
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
721 (not case-fold-search))]
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
722 [button :descriptor "Forwards"
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
723 :style radio
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
724 :selected search-dialog-direction
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
725 :callback (setq search-dialog-direction t)]
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
726 [button :descriptor "Backwards"
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
727 :style radio
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
728 :selected (not search-dialog-direction)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
729 :callback (setq search-dialog-direction nil)]
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
730 )]
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
731 [layout :orientation vertical :justify left
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
732 :items
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
733 (search-dialog-text
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
734 [button :width 10 :descriptor "Find Next"
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
735 :callback-ex
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
736 (lambda (image-instance event)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
737 (search-dialog-callback ,parent
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
738 image-instance event))]
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
739 [button :width 10 :descriptor "Cancel"
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
740 :callback-ex
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
741 (lambda (image-instance event)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
742 (isearch-dehighlight)
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
743 (delete-frame
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
744 (event-channel event)))])])])
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
745 '(height 10 width 40)))))
b8cc9ab3f761 Import from CVS: tag r21-2-33
cvs
parents: 404
diff changeset
746
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
747 (provide 'gutter-items)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
748 ;;; gutter-items.el ends here.