Mercurial > hg > xemacs-beta
annotate lisp/x-misc.el @ 5627:37fb945697f5
text_width_single_run cleanup.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2011-12-28 Didier Verna <didier@xemacs.org>
* redisplay-xlike-inc.c (XLIKE_text_width_single_run): Get only
what's needed as argument: an XLIKE_DISPLAY instead of a frame
pointer.
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_output_string): Update accordingly.
Use the generic XLIKE_ name instead of the specific x_ one.
| author | Didier Verna <didier@xemacs.org> |
|---|---|
| date | Wed, 28 Dec 2011 10:53:38 +0100 |
| parents | 6506fcb40fcf |
| children |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-misc.el --- miscellaneous X functions. |
| 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:
4783
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:
4783
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:
4783
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:
4783
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:
4783
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:
4783
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:
4783
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:
4783
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:
4783
diff
changeset
|
24 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 25 |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;; This file is dumped with XEmacs (when X support is compiled in). | |
| 29 | |
| 30 ;;; Code: | |
| 31 | |
| 502 | 32 (globally-declare-fboundp |
| 33 '(x-get-resource)) | |
| 34 | |
| 428 | 35 (defun x-bogosity-check-resource (name class type) |
| 36 "Check for a bogus resource specification." | |
| 37 (let ((bogus (x-get-resource | |
| 38 (concat "__no-such-friggin-locale__." name) | |
| 39 (concat "__No-such-friggin-widget__." class) | |
| 40 type 'global nil t))) | |
| 41 (if bogus | |
| 42 (display-warning | |
| 43 'resource | |
| 44 (format "Bad resource specification encountered: something like | |
| 45 Emacs*%s: %s | |
| 46 You should replace the * with a . in order to get proper behavior when | |
| 47 you use the specifier and/or `set-face-*' functions." name bogus))))) | |
| 48 | |
| 49 (defun x-init-specifier-from-resources (specifier type locale | |
| 50 &rest resource-list) | |
| 51 "Initialize a specifier from the resource database. | |
| 52 LOCALE specifies the locale that is to be initialized and should be | |
| 53 a frame, a device, or 'global. TYPE is the type of the resource and | |
| 54 should be one of 'string, 'boolean, 'integer, or 'natnum. The | |
| 55 remaining args should be conses of names and classes of resources | |
| 56 to be examined. The first resource with a value specified becomes | |
| 57 the spec for SPECIFIER in LOCALE. (However, if SPECIFIER already | |
| 58 has a spec in LOCALE, nothing is done.) Finally, if LOCALE is 'global, | |
| 59 a check is done for bogus resource specifications." | |
| 60 (if (eq locale 'global) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
61 (mapc #'(lambda (x) |
|
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
62 (x-bogosity-check-resource (car x) (cdr x) type)) |
|
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
63 resource-list)) |
| 428 | 64 (if (not (specifier-spec-list specifier locale)) |
| 65 (catch 'done | |
| 66 (while resource-list | |
| 67 (let* ((name (caar resource-list)) | |
| 68 (class (cdar resource-list)) | |
| 69 (resource | |
| 442 | 70 (x-get-resource name class type locale nil 'warn))) |
| 428 | 71 (if resource |
| 72 (progn | |
| 73 (add-spec-to-specifier specifier resource locale) | |
| 74 (throw 'done t)))) | |
| 75 (setq resource-list (cdr resource-list)))))) | |
| 76 | |
| 77 (defun x-get-resource-and-bogosity-check (name class type &optional locale) | |
| 78 (x-bogosity-check-resource name class type) | |
| 442 | 79 (x-get-resource name class type locale nil 'warn)) |
| 428 | 80 |
| 81 (defun x-get-resource-and-maybe-bogosity-check (name class type &optional | |
| 82 locale) | |
| 83 (if (eq locale 'global) | |
| 84 (x-bogosity-check-resource name class type)) | |
| 442 | 85 (x-get-resource name class type locale nil 'warn)) |
| 428 | 86 |
|
5324
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
87 (defun device-x-display (&optional device) |
|
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
88 "If DEVICE is an X11 device, return its DISPLAY. |
|
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
89 |
|
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
90 DEVICE defaults to the selected device." |
|
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
91 (and (eq 'x (device-type device)) (device-connection device))) |
|
d0bb90d90736
Provide #'device-x-display, as documented in Lispref; thanks, Jeff Mincy.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
92 |
| 428 | 93 ;;; x-misc.el ends here |