Mercurial > emacs
comparison lisp/progmodes/ebrowse.el @ 63448:b9811baefe1a
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-410
Remove "-face" suffix from ebrowse faces
2005-06-14 Miles Bader <miles@gnu.org>
* lisp/progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-file-name, ebrowse-default, ebrowse-member-attribute)
(ebrowse-member-class, ebrowse-progress):
Remove "-face" suffix from face names.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face):
New backward-compatibility aliases for renamed faces.
(ebrowse-show-progress, ebrowse-show-file-name-at-point)
(ebrowse-set-mark-props, ebrowse-draw-tree-fn)
(ebrowse-draw-member-buffer-class-line, ebrowse-draw-member-long-fn)
(ebrowse-draw-member-short-fn): Use renamed ebrowse faces.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 14 Jun 2005 22:49:47 +0000 |
parents | f2892faa87d4 |
children | a13c7f436bfa a1b34dec1104 |
comparison
equal
deleted
inserted
replaced
63447:7976e5fa0225 | 63448:b9811baefe1a |
---|---|
155 (defgroup ebrowse-faces nil | 155 (defgroup ebrowse-faces nil |
156 "Faces used by Ebrowse." | 156 "Faces used by Ebrowse." |
157 :group 'ebrowse) | 157 :group 'ebrowse) |
158 | 158 |
159 | 159 |
160 (defface ebrowse-tree-mark-face | 160 (defface ebrowse-tree-mark |
161 '((((min-colors 88)) (:foreground "red1")) | 161 '((((min-colors 88)) (:foreground "red1")) |
162 (t (:foreground "red"))) | 162 (t (:foreground "red"))) |
163 "*The face used for the mark character in the tree." | 163 "*The face used for the mark character in the tree." |
164 :group 'ebrowse-faces) | 164 :group 'ebrowse-faces) |
165 | 165 ;; backward-compatibility alias |
166 | 166 (put 'ebrowse-tree-mark-face 'face-alias 'ebrowse-tree-mark) |
167 (defface ebrowse-root-class-face | 167 |
168 | |
169 (defface ebrowse-root-class | |
168 '((((min-colors 88)) (:weight bold :foreground "blue1")) | 170 '((((min-colors 88)) (:weight bold :foreground "blue1")) |
169 (t (:weight bold :foreground "blue"))) | 171 (t (:weight bold :foreground "blue"))) |
170 "*The face used for root classes in the tree." | 172 "*The face used for root classes in the tree." |
171 :group 'ebrowse-faces) | 173 :group 'ebrowse-faces) |
172 | 174 ;; backward-compatibility alias |
173 | 175 (put 'ebrowse-root-class-face 'face-alias 'ebrowse-root-class) |
174 (defface ebrowse-file-name-face | 176 |
177 | |
178 (defface ebrowse-file-name | |
175 '((t (:italic t))) | 179 '((t (:italic t))) |
176 "*The face for filenames displayed in the tree." | 180 "*The face for filenames displayed in the tree." |
177 :group 'ebrowse-faces) | 181 :group 'ebrowse-faces) |
178 | 182 ;; backward-compatibility alias |
179 | 183 (put 'ebrowse-file-name-face 'face-alias 'ebrowse-file-name) |
180 (defface ebrowse-default-face | 184 |
185 | |
186 (defface ebrowse-default | |
181 '((t nil)) | 187 '((t nil)) |
182 "*Face for everything else in the tree not having other faces." | 188 "*Face for everything else in the tree not having other faces." |
183 :group 'ebrowse-faces) | 189 :group 'ebrowse-faces) |
184 | 190 ;; backward-compatibility alias |
185 | 191 (put 'ebrowse-default-face 'face-alias 'ebrowse-default) |
186 (defface ebrowse-member-attribute-face | 192 |
193 | |
194 (defface ebrowse-member-attribute | |
187 '((((min-colors 88)) (:foreground "red1")) | 195 '((((min-colors 88)) (:foreground "red1")) |
188 (t (:foreground "red"))) | 196 (t (:foreground "red"))) |
189 "*Face used to display member attributes." | 197 "*Face used to display member attributes." |
190 :group 'ebrowse-faces) | 198 :group 'ebrowse-faces) |
191 | 199 ;; backward-compatibility alias |
192 | 200 (put 'ebrowse-member-attribute-face 'face-alias 'ebrowse-member-attribute) |
193 (defface ebrowse-member-class-face | 201 |
202 | |
203 (defface ebrowse-member-class | |
194 '((t (:foreground "purple"))) | 204 '((t (:foreground "purple"))) |
195 "*Face used to display the class title in member buffers." | 205 "*Face used to display the class title in member buffers." |
196 :group 'ebrowse-faces) | 206 :group 'ebrowse-faces) |
197 | 207 ;; backward-compatibility alias |
198 | 208 (put 'ebrowse-member-class-face 'face-alias 'ebrowse-member-class) |
199 (defface ebrowse-progress-face | 209 |
210 | |
211 (defface ebrowse-progress | |
200 '((((min-colors 88)) (:background "blue1")) | 212 '((((min-colors 88)) (:background "blue1")) |
201 (t (:background "blue"))) | 213 (t (:background "blue"))) |
202 "*Face for progress indicator." | 214 "*Face for progress indicator." |
203 :group 'ebrowse-faces) | 215 :group 'ebrowse-faces) |
216 ;; backward-compatibility alias | |
217 (put 'ebrowse-progress-face 'face-alias 'ebrowse-progress) | |
204 | 218 |
205 | 219 |
206 | 220 |
207 ;;; Utilities. | 221 ;;; Utilities. |
208 | 222 |
881 (when start (setq ebrowse-n-boxes 0)) | 895 (when start (setq ebrowse-n-boxes 0)) |
882 (setq ebrowse-n-boxes (mod (1+ ebrowse-n-boxes) ebrowse-max-boxes)) | 896 (setq ebrowse-n-boxes (mod (1+ ebrowse-n-boxes) ebrowse-max-boxes)) |
883 (message (concat title ": " | 897 (message (concat title ": " |
884 (propertize (make-string ebrowse-n-boxes | 898 (propertize (make-string ebrowse-n-boxes |
885 (if (display-color-p) ?\ ?+)) | 899 (if (display-color-p) ?\ ?+)) |
886 'face 'ebrowse-progress-face))))) | 900 'face 'ebrowse-progress))))) |
887 | 901 |
888 | 902 |
889 ;;; Reading a tree from disk | 903 ;;; Reading a tree from disk |
890 | 904 |
891 (defun ebrowse-read () | 905 (defun ebrowse-read () |
1308 (indent-to ebrowse-source-file-column) | 1322 (indent-to ebrowse-source-file-column) |
1309 (insert "(" (or (ebrowse-cs-file | 1323 (insert "(" (or (ebrowse-cs-file |
1310 (ebrowse-ts-class tree)) | 1324 (ebrowse-ts-class tree)) |
1311 "unknown") | 1325 "unknown") |
1312 ")")) | 1326 ")")) |
1313 (ebrowse-set-face start (point) 'ebrowse-file-name-face) | 1327 (ebrowse-set-face start (point) 'ebrowse-file-name) |
1314 (beginning-of-line) | 1328 (beginning-of-line) |
1315 (forward-line 1)))))) | 1329 (forward-line 1)))))) |
1316 | 1330 |
1317 | 1331 |
1318 (defun ebrowse-toggle-file-name-display () | 1332 (defun ebrowse-toggle-file-name-display () |
1826 TREE denotes the class shown." | 1840 TREE denotes the class shown." |
1827 (add-text-properties | 1841 (add-text-properties |
1828 start end | 1842 start end |
1829 `(mouse-face highlight ebrowse-what mark ebrowse-tree ,tree | 1843 `(mouse-face highlight ebrowse-what mark ebrowse-tree ,tree |
1830 help-echo "double-mouse-1: mark/unmark")) | 1844 help-echo "double-mouse-1: mark/unmark")) |
1831 (ebrowse-set-face start end 'ebrowse-tree-mark-face)) | 1845 (ebrowse-set-face start end 'ebrowse-tree-mark)) |
1832 | 1846 |
1833 | 1847 |
1834 (defun* ebrowse-draw-tree-fn (&aux stack1 stack2 start) | 1848 (defun* ebrowse-draw-tree-fn (&aux stack1 stack2 start) |
1835 "Display a single class and recursively its subclasses. | 1849 "Display a single class and recursively its subclasses. |
1836 This function may look weird, but this is faster than recursion." | 1850 This function may look weird, but this is faster than recursion." |
1853 | 1867 |
1854 ;; If template class, add <> | 1868 ;; If template class, add <> |
1855 (when (ebrowse-template-p class) | 1869 (when (ebrowse-template-p class) |
1856 (insert "<>")) | 1870 (insert "<>")) |
1857 (ebrowse-set-face start (point) (if (zerop level) | 1871 (ebrowse-set-face start (point) (if (zerop level) |
1858 'ebrowse-root-class-face | 1872 'ebrowse-root-class |
1859 'ebrowse-default-face)) | 1873 'ebrowse-default)) |
1860 (setf start-of-class-name start | 1874 (setf start-of-class-name start |
1861 end-of-class-name (point)) | 1875 end-of-class-name (point)) |
1862 ;; If filenames are to be displayed... | 1876 ;; If filenames are to be displayed... |
1863 (when ebrowse--show-file-names-flag | 1877 (when ebrowse--show-file-names-flag |
1864 (indent-to ebrowse-source-file-column) | 1878 (indent-to ebrowse-source-file-column) |
1865 (setq start (point)) | 1879 (setq start (point)) |
1866 (insert "(" | 1880 (insert "(" |
1867 (or (ebrowse-cs-file class) | 1881 (or (ebrowse-cs-file class) |
1868 "unknown") | 1882 "unknown") |
1869 ")") | 1883 ")") |
1870 (ebrowse-set-face start (point) 'ebrowse-file-name-face)) | 1884 (ebrowse-set-face start (point) 'ebrowse-file-name)) |
1871 (ebrowse-set-mark-props start-of-line (1+ start-of-line) tree) | 1885 (ebrowse-set-mark-props start-of-line (1+ start-of-line) tree) |
1872 (add-text-properties | 1886 (add-text-properties |
1873 start-of-class-name end-of-class-name | 1887 start-of-class-name end-of-class-name |
1874 `(mouse-face highlight ebrowse-what class-name | 1888 `(mouse-face highlight ebrowse-what class-name |
1875 ebrowse-tree ,tree | 1889 ebrowse-tree ,tree |
2692 (insert (ebrowse-qualified-class-name (ebrowse-ts-class tree))) | 2706 (insert (ebrowse-qualified-class-name (ebrowse-ts-class tree))) |
2693 (when (ebrowse-template-p (ebrowse-ts-class tree)) | 2707 (when (ebrowse-template-p (ebrowse-ts-class tree)) |
2694 (insert "<>")) | 2708 (insert "<>")) |
2695 (setq class-name-end (point)) | 2709 (setq class-name-end (point)) |
2696 (insert ":\n\n") | 2710 (insert ":\n\n") |
2697 (ebrowse-set-face start (point) 'ebrowse-member-class-face) | 2711 (ebrowse-set-face start (point) 'ebrowse-member-class) |
2698 (add-text-properties | 2712 (add-text-properties |
2699 class-name-start class-name-end | 2713 class-name-start class-name-end |
2700 '(ebrowse-what class-name | 2714 '(ebrowse-what class-name |
2701 mouse-face highlight | 2715 mouse-face highlight |
2702 help-echo "mouse-3: menu")) | 2716 help-echo "mouse-3: menu")) |
2808 (let ((start (point))) | 2822 (let ((start (point))) |
2809 (insert "<") | 2823 (insert "<") |
2810 (ebrowse-draw-member-attributes member-struc) | 2824 (ebrowse-draw-member-attributes member-struc) |
2811 (insert ">") | 2825 (insert ">") |
2812 (ebrowse-set-face start (point) | 2826 (ebrowse-set-face start (point) |
2813 'ebrowse-member-attribute-face))) | 2827 'ebrowse-member-attribute))) |
2814 (insert " ") | 2828 (insert " ") |
2815 (ebrowse-draw-member-regexp member-struc)))) | 2829 (ebrowse-draw-member-regexp member-struc)))) |
2816 (insert "\n") | 2830 (insert "\n") |
2817 (goto-char (point-min))) | 2831 (goto-char (point-min))) |
2818 | 2832 |
2839 (when ebrowse--attributes-flag | 2853 (when ebrowse--attributes-flag |
2840 (insert "<") | 2854 (insert "<") |
2841 (ebrowse-draw-member-attributes member) | 2855 (ebrowse-draw-member-attributes member) |
2842 (insert "> ") | 2856 (insert "> ") |
2843 (ebrowse-set-face start-of-entry (point) | 2857 (ebrowse-set-face start-of-entry (point) |
2844 'ebrowse-member-attribute-face)) | 2858 'ebrowse-member-attribute)) |
2845 ;; insert member name truncated to column width | 2859 ;; insert member name truncated to column width |
2846 (setq start-of-name (point)) | 2860 (setq start-of-name (point)) |
2847 (insert (substring name 0 | 2861 (insert (substring name 0 |
2848 (min (length name) | 2862 (min (length name) |
2849 (1- ebrowse--column-width)))) | 2863 (1- ebrowse--column-width)))) |