Mercurial > hg > xemacs-beta
annotate lisp/x-scrollbar.el @ 5569:d19b6e3bdf91
#'cl-defsubst-expand; avoid mutually-recursive symbol macros.
lisp/ChangeLog addition:
2011-09-10 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-defsubst-expand):
Change set 2a6a8da4dd7c of
http://mid.gmane.org/19966.17522.332164.615228@parhasard.net
wasn't sufficiently comprehensive, symbol macros can be mutually
rather than simply recursive, and they can equally hang. Thanks
for the bug report, Michael Sperber, and for the test case,
Stephen Turnbull.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 10 Sep 2011 13:17:29 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-scrollbar.el --- scrollbar resourcing and such. |
| 2 | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 ;; Copyright (C) 1995, 1996 Ben Wing. | |
| 6 | |
| 7 ;; Author: Ben Wing <ben@xemacs.org> | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: extensions, dumped | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
13 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
14 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
15 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
16 ;; option) any later version. |
| 428 | 17 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
18 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
19 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
20 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
21 ;; for more details. |
| 428 | 22 |
| 23 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
24 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 25 |
| 26 ;;; Synched up with: Not synched. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs (when X and menubar support is compiled in). | |
| 31 | |
| 32 ;;; Code: | |
| 33 | |
| 502 | 34 (globally-declare-fboundp |
| 35 '(x-init-specifier-from-resources x-get-resource)) | |
| 36 | |
| 428 | 37 (defun x-init-scrollbar-from-resources (locale) |
| 38 (x-init-specifier-from-resources | |
| 39 (specifier-fallback scrollbar-width) 'natnum locale | |
| 40 '("scrollBarWidth" . "ScrollBarWidth") | |
| 41 ;; The name strings are wrong, but the scrollbar name is | |
| 42 ;; non-deterministic so it is a poor way to set a resource | |
| 43 ;; for the scrollbar anyhow. | |
| 44 (cond ((featurep 'athena-scrollbars) | |
| 45 '("scrollbar.thickness" . "ScrollBar.Thickness")) | |
| 46 ((featurep 'lucid-scrollbars) | |
| 47 '("scrollbar.width" . "XlwScrollBar.Width")) | |
| 48 ((featurep 'motif-scrollbars) | |
| 49 '("scrollbar.width" . "XmScrollBar.Width")))) | |
| 50 ;; Athena scrollbars accept either 'thickness' or 'width'. | |
| 51 ;; If any of the previous resources succeeded, the following | |
| 52 ;; call does nothing; so there's no harm in doing it all the | |
| 53 ;; time. | |
| 54 (if (featurep 'athena-scrollbars) | |
| 55 (x-init-specifier-from-resources | |
| 56 (specifier-fallback scrollbar-width) 'natnum locale | |
| 57 '("scrollbar.width" . "ScrollBar.Width"))) | |
| 58 | |
| 59 ;; lather, rinse, repeat. | |
| 60 (x-init-specifier-from-resources | |
| 61 (specifier-fallback scrollbar-height) 'natnum locale | |
| 62 '("scrollBarHeight" . "ScrollBarHeight") | |
| 63 ;; The name strings are wrong, but the scrollbar name is | |
| 64 ;; non-deterministic so it is a poor way to set a resource | |
| 65 ;; for the scrollbar anyhow. | |
| 66 (cond ((featurep 'athena-scrollbars) | |
| 67 '("scrollbar.thickness" . "ScrollBar.Thickness")) | |
| 68 ((featurep 'lucid-scrollbars) | |
| 69 '("scrollbar.height" . "XlwScrollBar.Height")) | |
| 70 ((featurep 'motif-scrollbars) | |
| 71 '("scrollbar.height" . "XmScrollBar.Height")))) | |
| 72 ;; Athena scrollbars accept either 'thickness' or 'height'. | |
| 73 ;; If any of the previous resources succeeded, the following | |
| 74 ;; call does nothing; so there's no harm in doing it all the | |
| 75 ;; time. | |
| 76 (if (featurep 'athena-scrollbars) | |
| 77 (x-init-specifier-from-resources | |
| 78 (specifier-fallback scrollbar-height) 'natnum locale | |
| 79 '("scrollbar.height" . "ScrollBar.Height"))) | |
| 80 | |
| 81 ;; Now do ScrollBarPlacement.scrollBarPlacement | |
| 82 (let ((case-fold-search t) | |
| 83 (resval (x-get-resource "ScrollBarPlacement" "scrollBarPlacement" | |
| 442 | 84 'string locale nil 'warn))) |
| 428 | 85 (cond |
| 86 ((null resval)) | |
| 87 ((string-match "^top[_-]left$" resval) | |
| 88 (set-specifier scrollbar-on-top-p t locale) | |
| 89 (set-specifier scrollbar-on-left-p t locale)) | |
| 90 ((string-match "^top[_-]right$" resval) | |
| 91 (set-specifier scrollbar-on-top-p t locale) | |
| 92 (set-specifier scrollbar-on-left-p nil locale)) | |
| 93 ((string-match "^bottom[_-]left$" resval) | |
| 94 (set-specifier scrollbar-on-top-p nil locale) | |
| 95 (set-specifier scrollbar-on-left-p t locale)) | |
| 96 ((string-match "^bottom[_-]right$" resval) | |
| 97 (set-specifier scrollbar-on-top-p nil locale) | |
| 98 (set-specifier scrollbar-on-left-p nil locale)) | |
| 99 (t | |
| 100 (display-warning 'resource | |
| 101 (format "Illegal value '%s' for scrollBarPlacement resource" resval))))) | |
| 102 | |
| 103 ) | |
| 104 | |
| 105 ;;; x-scrollbar.el ends here |