Mercurial > hg > xemacs-beta
annotate lisp/gtk-ffi.el @ 5632:bd80d9103fc8
Integrate CL code better into core, remove obsolete compatibility code.
lisp/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
Call #'cl-compile-time-init explicitly here, don't rely on
bytecomp-load-hook for what is core functionality.
* cl-extra.el:
* cl-extra.el (require):
* cl-extra.el (make-random-state):
* cl-extra.el (random-state-p):
* cl-extra.el (make-hashtable): Removed.
* cl-extra.el (make-weak-hashtable): Removed.
* cl-extra.el (make-key-weak-hashtable): Removed.
* cl-extra.el (make-value-weak-hashtable): Removed.
* cl-extra.el ('hashtablep): Removed.
* cl-extra.el ('hashtable-fullness): Removed.
* cl-extra.el ('hashtable-test-function): Removed.
* cl-extra.el ('hashtable-type): Removed.
* cl-extra.el ('hashtable-size): Removed.
* cl-extra.el ('copy-hashtable): Removed.
* cl-extra.el (cl-builtin-gethash): Removed.
* cl-extra.el (cl-builtin-remhash): Removed.
* cl-extra.el (cl-builtin-clrhash): Removed.
* cl-extra.el (cl-builtin-maphash): Removed.
* cl-extra.el ('cl-gethash): Removed.
* cl-extra.el ('cl-puthash): Removed.
* cl-extra.el ('cl-remhash): Removed.
* cl-extra.el ('cl-clrhash): Removed.
* cl-extra.el ('cl-maphash): Removed.
* cl-extra.el ('cl-make-hash-table): Removed.
* cl-extra.el ('cl-hash-table-p): Removed.
* cl-extra.el ('cl-hash-table-count): Removed.
* cl-extra.el (cl-prettyexpand):
* cl-extra.el (names):
Remove compatibility aliases from this file.
In #'cl-prettyexpand, if FULL is nil, don't expand return-from
either, for symmetry with not expanding block.
Drop cl-extra-load-hook, it's useless when cl-extra is dumped
(since third-party code can't use it, and dumped code shouldn't
use it.)
* cl-macs.el:
* cl-macs.el (cl-pop2):
* cl-macs.el (defun*):
* cl-macs.el (cl-parse-loop-clause):
Remove some no-longer-needed compatibility kludges.
* cl.el:
* cl.el ('cl-map-extents): Removed.
* cl.el (cl-random-time):
* cl.el (list*): New, moved back from subr.el, given a shorter
implementation.
* cl.el ('cl-member): Removed.
* cl.el ('cl-floor): Removed.
* cl.el ('cl-ceiling): Removed.
* cl.el ('cl-truncate): Removed.
* cl.el ('cl-round): Removed.
* cl.el ('cl-mod): Removed.
Remove some compatibility aliases; these may conflict with
package usage, in which case the packages need to be updated, the
new names are available in 21.4, and that's the most recent
version we support.
* cl.el (cl-hacked-flag): Removed.
* cl.el (cl-hack-byte-compiler): Removed.
* subr.el:
* subr.el (list*): Moved back to cl.el.
* update-elc-2.el (batch-update-elc-2):
* update-elc.el (do-autoload-commands):
Add an autoload for cl-compile-time-init in these two files, they
run on bare temacs, auto-autoload isn't available to them, and now
bytecomp calls cl-compile-time-init explicitly.
* cl-compat.el: Removed. This file was long obsolete.
man/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Top):
* cl.texi (Usage):
* cl.texi (Organization):
* cl.texi (Efficiency Concerns):
* cl.texi (Common Lisp Compatibility):
Remove documentation of cl-compat, now it's deleted.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 30 Dec 2011 16:05:31 +0000 |
| parents | 4dee0387b9de |
| children |
| rev | line source |
|---|---|
| 462 | 1 ;;; gtk-ffi.el --- Foreign function interface for the GTK object system |
| 2 | |
| 3 ;; Copyright (C) 2000 Free Software Foundation | |
| 4 | |
| 5 ;; Maintainer: William Perry <wmperry@gnu.org> | |
| 6 ;; Keywords: extensions, dumped | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
462
diff
changeset
|
10 ;; 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:
462
diff
changeset
|
11 ;; 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:
462
diff
changeset
|
12 ;; 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:
462
diff
changeset
|
13 ;; option) any later version. |
| 462 | 14 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
462
diff
changeset
|
15 ;; 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:
462
diff
changeset
|
16 ;; 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:
462
diff
changeset
|
17 ;; 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:
462
diff
changeset
|
18 ;; for more details. |
| 462 | 19 |
| 20 ;; 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:
462
diff
changeset
|
21 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 462 | 22 |
| 23 ;;; Synched up with: Not in FSF | |
| 24 | |
| 25 ;;; Commentary: | |
| 26 | |
| 27 ;; This file is dumped with XEmacs. | |
| 28 | |
| 29 (defvar gtk-type-aliases '((GtkType . guint) | |
| 30 (GdkAtom . gulong) | |
| 31 (GdkBitmap . GdkWindow) | |
| 32 (time_t . guint) | |
| 33 (none . void) | |
| 34 (GdkDrawable . GdkWindow) | |
| 35 (GdkBitmap . GdkWindow) | |
| 36 (GdkPixmap . GdkWindow)) | |
| 37 "An assoc list of aliases for commonly used GTK types that are not | |
| 38 really part of the object system.") | |
| 39 | |
| 40 (defvar gtk-ffi-debug nil | |
|
5384
3889ef128488
Fix misspelled words, and some grammar, across the entire source tree.
Jerry James <james@xemacs.org>
parents:
462
diff
changeset
|
41 "If non-nil, all functions defined with `gtk-import-function' will be checked |
| 462 | 42 for missing marshallers.") |
| 43 | |
| 44 (defun gtk-ffi-check-function (func) | |
| 45 ;; We don't call gtk-main or gtk-main-quit because it thoroughly | |
| 46 ;; hoses us (locks up xemacs handling events, but no lisp). | |
| 47 (if (not (memq func '(gtk-main gtk-main-quit))) | |
| 48 (condition-case err | |
| 49 (funcall func) | |
| 50 (error | |
| 51 (case (car err) | |
| 52 (wrong-number-of-arguments nil) | |
| 53 (error | |
| 54 (if (string= "Could not locate marshaller function" (nth 1 err)) | |
| 55 (progn | |
| 56 (set-buffer (get-buffer-create "needed marshallers")) | |
| 57 (display-buffer (current-buffer)) | |
| 58 (goto-char (point-max)) | |
| 59 (insert | |
| 60 (format "%S\n" | |
| 61 (split-string | |
| 62 (substring (nth 2 err) (length "emacs_gtk_marshal_")) "_+"))))))))))) | |
| 63 | |
| 64 (defmacro gtk-import-function (retval name &rest args) | |
| 65 (if (symbolp name) | |
| 66 (setq name (symbol-name name))) | |
| 67 (let ((lisp-name (intern (replace-in-string name "_" "-"))) | |
| 68 (doc-string nil)) | |
| 69 (setq retval (or (cdr-safe (assoc retval gtk-type-aliases)) retval) | |
| 70 doc-string (concat "The lisp version of " name ".\n" | |
| 71 (if args | |
| 72 (concat "Prototype: " (prin1-to-string args))))) | |
| 73 | |
| 74 ;; Drop off any naming of arguments, etc. | |
| 75 (if (and args (consp (car args))) | |
| 76 (setq args (mapcar 'car args))) | |
| 77 | |
| 78 ;; Get rid of any type aliases. | |
| 79 (setq args (mapcar (lambda (x) | |
| 80 (or (cdr-safe (assoc x gtk-type-aliases)) x)) args)) | |
| 81 | |
| 82 `(progn | |
| 83 (defun ,lisp-name (&rest args) | |
| 84 ,doc-string | |
| 85 (if (not (get (quote ,lisp-name) 'gtk-ffi nil)) | |
| 86 (put (quote ,lisp-name) 'gtk-ffi | |
| 87 (gtk-import-function-internal (quote ,retval) ,name | |
| 88 (quote ,args)))) | |
| 89 (gtk-call-function (get (quote ,lisp-name) 'gtk-ffi 'ignore) args)) | |
| 90 (and gtk-ffi-debug (gtk-ffi-check-function (quote ,lisp-name)))))) | |
| 91 | |
| 92 (defmacro gtk-import-variable (type name) | |
| 93 (if (symbolp name) (setq name (symbol-name name))) | |
| 94 (let ((lisp-name (intern (replace-in-string name "_" "-"))) | |
| 95 (doc-string nil)) | |
| 96 (setq type (or (cdr-safe (assoc type gtk-type-aliases)) type) | |
| 97 doc-string (concat "Retrieve the variable " name " (type: " (symbol-name type) ").\n")) | |
| 98 `(defun ,lisp-name () | |
| 99 ,doc-string | |
| 100 (gtk-import-variable-internal (quote ,type) ,name)))) | |
| 101 | |
| 102 (provide 'gtk-ffi) |