Mercurial > hg > xemacs-beta
annotate src/select-xlike-inc.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 358aa3bb603f |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 647 | 1 /* Selection processing for XEmacs -- common btwn select-x.c and select-gtk.c |
| 2 Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not synched with FSF. */ | |
| 22 | |
| 4984 | 23 #ifdef THIS_IS_X |
| 647 | 24 #define XE_ATOM_TYPE Atom |
| 25 #define XE_ATOM_TO_SYMBOL x_atom_to_symbol | |
| 26 #define XE_SYMBOL_TO_ATOM symbol_to_x_atom | |
| 27 #else | |
| 28 #define XE_ATOM_TYPE GdkAtom | |
| 29 #define XE_ATOM_TO_SYMBOL atom_to_symbol | |
| 30 #define XE_SYMBOL_TO_ATOM symbol_to_gtk_atom | |
| 4984 | 31 #endif /* THIS_IS_X */ |
| 647 | 32 |
| 33 /* #### These are going to move into Lisp code(!) with the aid of | |
| 34 some new functions I'm working on - ajh */ | |
| 35 | |
| 36 /* These functions convert from the selection data read from the server into | |
| 37 something that we can use from elisp, and vice versa. | |
| 38 | |
| 39 Type: Format: Size: Elisp Type: | |
| 40 ----- ------- ----- ----------- | |
| 41 * 8 * String | |
| 42 ATOM 32 1 Symbol | |
| 43 ATOM 32 > 1 Vector of Symbols | |
| 44 * 16 1 Integer | |
| 45 * 16 > 1 Vector of Integers | |
| 46 * 32 1 if <=16 bits: Integer | |
| 47 if > 16 bits: Cons of top16, bot16 | |
| 48 * 32 > 1 Vector of the above | |
| 49 | |
| 3833 | 50 NOTE NOTE NOTE: |
| 51 Format == 32 means that the buffer will be C longs, which need not be | |
| 52 32-bit quantities. See the note in select-x.c (x_get_window_property). | |
| 53 | |
| 647 | 54 When converting a Lisp number to C, it is assumed to be of format 16 if |
| 55 it is an integer, and of format 32 if it is a cons of two integers. | |
| 56 | |
| 57 When converting a vector of numbers from Elisp to C, it is assumed to be | |
| 58 of format 16 if every element in the vector is an integer, and is assumed | |
| 59 to be of format 32 if any element is a cons of two integers. | |
| 60 | |
| 61 When converting an object to C, it may be of the form (SYMBOL . <data>) | |
| 62 where SYMBOL is what we should claim that the type is. Format and | |
| 63 representation are as above. | |
| 64 | |
| 65 NOTE: Under Mule, when someone shoves us a string without a type, we | |
| 3025 | 66 set the type to `COMPOUND_TEXT' and automatically convert to Compound |
| 647 | 67 Text. If the string has a type, we assume that the user wants the |
| 68 data sent as-is so we just do "binary" conversion. | |
| 69 */ | |
| 70 | |
| 71 | |
| 72 static Lisp_Object | |
| 73 selection_data_to_lisp_data (struct device *d, | |
| 2367 | 74 Rawbyte *data, |
| 665 | 75 Bytecount size, |
| 647 | 76 XE_ATOM_TYPE type, |
| 77 int format) | |
| 78 { | |
| 4984 | 79 #ifdef THIS_IS_X |
| 647 | 80 if (type == DEVICE_XATOM_NULL (d)) |
| 81 return QNULL; | |
| 82 | |
| 83 /* Convert any 8-bit data to a string, for compactness. */ | |
| 84 else if (format == 8) | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3833
diff
changeset
|
85 return make_extstring ((Extbyte *) data, size, |
| 647 | 86 type == DEVICE_XATOM_TEXT (d) || |
| 87 type == DEVICE_XATOM_COMPOUND_TEXT (d) | |
| 88 ? Qctext : Qbinary); | |
| 89 | |
| 90 /* Convert a single atom to a Lisp Symbol. | |
| 91 Convert a set of atoms to a vector of symbols. */ | |
| 92 else if (type == XA_ATOM) | |
| 93 #else | |
| 94 if (type == gdk_atom_intern ("NULL", 0)) | |
| 95 return QNULL; | |
| 96 | |
| 97 /* Convert any 8-bit data to a string, for compactness. */ | |
| 98 else if (format == 8) | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3833
diff
changeset
|
99 return make_extstring ((Extbyte *) data, size, |
| 647 | 100 ((type == gdk_atom_intern ("TEXT", FALSE)) || |
| 101 (type == gdk_atom_intern ("COMPOUND_TEXT", FALSE))) | |
| 102 ? Qctext : Qbinary); | |
| 103 | |
| 104 /* Convert a single atom to a Lisp Symbol. | |
| 105 Convert a set of atoms to a vector of symbols. */ | |
| 106 else if (type == gdk_atom_intern ("ATOM", FALSE)) | |
| 4984 | 107 #endif /* THIS_IS_X */ |
| 647 | 108 { |
| 109 if (size == sizeof (XE_ATOM_TYPE)) | |
| 110 return XE_ATOM_TO_SYMBOL (d, *((XE_ATOM_TYPE *) data)); | |
| 111 else | |
| 112 { | |
| 665 | 113 Elemcount i; |
| 114 Elemcount len = size / sizeof (XE_ATOM_TYPE); | |
| 647 | 115 Lisp_Object v = Fmake_vector (make_int (len), Qzero); |
| 116 for (i = 0; i < len; i++) | |
| 117 Faset (v, make_int (i), XE_ATOM_TO_SYMBOL (d, ((XE_ATOM_TYPE *) data) [i])); | |
| 118 return v; | |
| 119 } | |
| 120 } | |
| 121 | |
| 122 /* Convert a single 16 or small 32 bit number to a Lisp Int. | |
| 123 If the number is > 16 bits, convert it to a cons of integers, | |
| 124 16 bits in each half. | |
| 125 */ | |
| 126 else if (format == 32 && size == sizeof (long)) | |
| 127 return word_to_lisp (((unsigned long *) data) [0]); | |
| 128 else if (format == 16 && size == sizeof (short)) | |
| 129 return make_int ((int) (((unsigned short *) data) [0])); | |
| 130 | |
| 131 /* Convert any other kind of data to a vector of numbers, represented | |
| 132 as above (as an integer, or a cons of two 16 bit integers). | |
| 133 | |
| 134 #### Perhaps we should return the actual type to lisp as well. | |
| 135 | |
| 136 (x-get-selection-internal 'PRIMARY 'LINE_NUMBER) | |
| 137 ==> [4 4] | |
| 138 | |
| 139 and perhaps it should be | |
| 140 | |
| 141 (x-get-selection-internal 'PRIMARY 'LINE_NUMBER) | |
| 142 ==> (SPAN . [4 4]) | |
| 143 | |
| 144 Right now the fact that the return type was SPAN is discarded before | |
| 145 lisp code gets to see it. | |
| 146 */ | |
| 147 else if (format == 16) | |
| 148 { | |
| 665 | 149 Elemcount i; |
| 647 | 150 Lisp_Object v = make_vector (size / 4, Qzero); |
| 151 for (i = 0; i < size / 4; i++) | |
| 152 { | |
| 153 int j = (int) ((unsigned short *) data) [i]; | |
| 154 Faset (v, make_int (i), make_int (j)); | |
| 155 } | |
| 156 return v; | |
| 157 } | |
| 158 else | |
| 159 { | |
| 665 | 160 Elemcount i; |
| 647 | 161 Lisp_Object v = make_vector (size / 4, Qzero); |
| 162 for (i = 0; i < size / 4; i++) | |
| 163 { | |
| 164 unsigned long j = ((unsigned long *) data) [i]; | |
| 165 Faset (v, make_int (i), word_to_lisp (j)); | |
| 166 } | |
| 167 return v; | |
| 168 } | |
| 169 } | |
| 170 | |
| 171 | |
| 172 static void | |
| 173 lisp_data_to_selection_data (struct device *d, | |
| 174 Lisp_Object obj, | |
| 2367 | 175 Rawbyte **data_ret, |
| 647 | 176 XE_ATOM_TYPE *type_ret, |
| 665 | 177 Bytecount *size_ret, |
| 647 | 178 int *format_ret) |
| 179 { | |
| 180 Lisp_Object type = Qnil; | |
| 181 | |
| 182 if (CONSP (obj) && SYMBOLP (XCAR (obj))) | |
| 183 { | |
| 184 type = XCAR (obj); | |
| 185 obj = XCDR (obj); | |
| 186 if (CONSP (obj) && NILP (XCDR (obj))) | |
| 187 obj = XCAR (obj); | |
| 188 } | |
| 189 | |
| 190 if (EQ (obj, QNULL) || (EQ (type, QNULL))) | |
| 191 { /* This is not the same as declining */ | |
| 192 *format_ret = 32; | |
| 193 *size_ret = 0; | |
| 194 *data_ret = 0; | |
| 195 type = QNULL; | |
| 196 } | |
| 197 else if (STRINGP (obj)) | |
| 198 { | |
| 199 const Extbyte *extval; | |
| 665 | 200 Bytecount extvallen; |
| 647 | 201 |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
202 LISP_STRING_TO_SIZED_EXTERNAL (obj, extval, extvallen, |
|
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
203 (NILP (type) ? Qctext : Qbinary)); |
| 647 | 204 *format_ret = 8; |
| 205 *size_ret = extvallen; | |
| 2367 | 206 *data_ret = xnew_rawbytes (*size_ret); |
| 647 | 207 memcpy (*data_ret, extval, *size_ret); |
| 208 #ifdef MULE | |
| 209 if (NILP (type)) type = QCOMPOUND_TEXT; | |
| 210 #else | |
| 211 if (NILP (type)) type = QSTRING; | |
| 212 #endif | |
| 213 } | |
| 214 else if (CHARP (obj)) | |
| 215 { | |
| 867 | 216 Ibyte buf[MAX_ICHAR_LEN]; |
| 647 | 217 Bytecount len; |
| 218 const Extbyte *extval; | |
| 665 | 219 Bytecount extvallen; |
| 647 | 220 |
| 221 *format_ret = 8; | |
| 867 | 222 len = set_itext_ichar (buf, XCHAR (obj)); |
| 647 | 223 TO_EXTERNAL_FORMAT (DATA, (buf, len), |
| 224 ALLOCA, (extval, extvallen), | |
| 225 Qctext); | |
| 226 *size_ret = extvallen; | |
| 2367 | 227 *data_ret = xnew_rawbytes (*size_ret); |
| 647 | 228 memcpy (*data_ret, extval, *size_ret); |
| 229 #ifdef MULE | |
| 230 if (NILP (type)) type = QCOMPOUND_TEXT; | |
| 231 #else | |
| 232 if (NILP (type)) type = QSTRING; | |
| 233 #endif | |
| 234 } | |
| 235 else if (SYMBOLP (obj)) | |
| 236 { | |
| 237 *format_ret = 32; | |
| 238 *size_ret = 1; | |
| 2367 | 239 *data_ret = xnew_rawbytes (sizeof (XE_ATOM_TYPE) + 1); |
| 647 | 240 (*data_ret) [sizeof (XE_ATOM_TYPE)] = 0; |
| 241 (*(XE_ATOM_TYPE **) data_ret) [0] = XE_SYMBOL_TO_ATOM (d, obj, 0); | |
| 242 if (NILP (type)) type = QATOM; | |
| 243 } | |
| 244 else if (INTP (obj) && | |
| 245 XINT (obj) <= 0x7FFF && | |
| 246 XINT (obj) >= -0x8000) | |
| 247 { | |
| 248 *format_ret = 16; | |
| 249 *size_ret = 1; | |
| 2367 | 250 *data_ret = xnew_rawbytes (sizeof (short) + 1); |
| 647 | 251 (*data_ret) [sizeof (short)] = 0; |
| 252 (*(short **) data_ret) [0] = (short) XINT (obj); | |
| 253 if (NILP (type)) type = QINTEGER; | |
| 254 } | |
| 255 else if (INTP (obj) || CONSP (obj)) | |
| 256 { | |
| 257 *format_ret = 32; | |
| 258 *size_ret = 1; | |
| 2367 | 259 *data_ret = xnew_rawbytes (sizeof (long) + 1); |
| 647 | 260 (*data_ret) [sizeof (long)] = 0; |
| 261 (*(unsigned long **) data_ret) [0] = lisp_to_word (obj); | |
| 262 if (NILP (type)) type = QINTEGER; | |
| 263 } | |
| 264 else if (VECTORP (obj)) | |
| 265 { | |
| 266 /* Lisp Vectors may represent a set of ATOMs; | |
| 267 a set of 16 or 32 bit INTEGERs; | |
| 268 or a set of ATOM_PAIRs (represented as [[A1 A2] [A3 A4] ...] | |
| 269 */ | |
| 665 | 270 Elemcount i; |
| 647 | 271 |
| 272 if (SYMBOLP (XVECTOR_DATA (obj) [0])) | |
| 273 /* This vector is an ATOM set */ | |
| 274 { | |
| 275 if (NILP (type)) type = QATOM; | |
| 276 *size_ret = XVECTOR_LENGTH (obj); | |
| 277 *format_ret = 32; | |
| 2367 | 278 *data_ret = xnew_rawbytes ((*size_ret) * sizeof (XE_ATOM_TYPE)); |
| 647 | 279 for (i = 0; i < *size_ret; i++) |
| 280 if (SYMBOLP (XVECTOR_DATA (obj) [i])) | |
| 281 (*(XE_ATOM_TYPE **) data_ret) [i] = | |
| 282 XE_SYMBOL_TO_ATOM (d, XVECTOR_DATA (obj) [i], 0); | |
| 283 else | |
| 284 syntax_error | |
| 285 ("all elements of the vector must be of the same type", obj); | |
| 286 } | |
| 287 #if 0 /* #### MULTIPLE doesn't work yet */ | |
| 288 else if (VECTORP (XVECTOR_DATA (obj) [0])) | |
| 289 /* This vector is an ATOM_PAIR set */ | |
| 290 { | |
| 291 if (NILP (type)) type = QATOM_PAIR; | |
| 292 *size_ret = XVECTOR_LENGTH (obj); | |
| 293 *format_ret = 32; | |
| 2367 | 294 *data_ret = |
| 295 xnew_rawbytes ((*size_ret) * sizeof (XE_ATOM_TYPE) * 2); | |
| 647 | 296 for (i = 0; i < *size_ret; i++) |
| 297 if (VECTORP (XVECTOR_DATA (obj) [i])) | |
| 298 { | |
| 299 Lisp_Object pair = XVECTOR_DATA (obj) [i]; | |
| 300 if (XVECTOR_LENGTH (pair) != 2) | |
| 301 syntax_error | |
| 302 ("elements of the vector must be vectors of exactly two elements", pair); | |
| 303 | |
| 304 (*(XE_ATOM_TYPE **) data_ret) [i * 2] = | |
| 305 XE_SYMBOL_TO_ATOM (d, XVECTOR_DATA (pair) [0], 0); | |
| 306 (*(XE_ATOM_TYPE **) data_ret) [(i * 2) + 1] = | |
| 307 XE_SYMBOL_TO_ATOM (d, XVECTOR_DATA (pair) [1], 0); | |
| 308 } | |
| 309 else | |
| 310 syntax_error | |
| 311 ("all elements of the vector must be of the same type", obj); | |
| 312 } | |
| 313 #endif | |
| 314 else | |
| 315 /* This vector is an INTEGER set, or something like it */ | |
| 316 { | |
| 317 *size_ret = XVECTOR_LENGTH (obj); | |
| 318 if (NILP (type)) type = QINTEGER; | |
| 319 *format_ret = 16; | |
| 320 for (i = 0; i < *size_ret; i++) | |
| 321 if (CONSP (XVECTOR_DATA (obj) [i])) | |
| 322 *format_ret = 32; | |
| 323 else if (!INTP (XVECTOR_DATA (obj) [i])) | |
| 324 syntax_error | |
| 325 ("all elements of the vector must be integers or conses of integers", obj); | |
| 326 | |
| 2367 | 327 *data_ret = xnew_rawbytes (*size_ret * (*format_ret/8)); |
| 647 | 328 for (i = 0; i < *size_ret; i++) |
| 329 if (*format_ret == 32) | |
| 330 (*((unsigned long **) data_ret)) [i] = | |
| 331 lisp_to_word (XVECTOR_DATA (obj) [i]); | |
| 332 else | |
| 333 (*((unsigned short **) data_ret)) [i] = | |
| 334 (unsigned short) lisp_to_word (XVECTOR_DATA (obj) [i]); | |
| 335 } | |
| 336 } | |
| 337 else | |
| 338 invalid_argument ("unrecognized selection data", obj); | |
| 339 | |
| 340 *type_ret = XE_SYMBOL_TO_ATOM (d, type, 0); | |
| 341 } | |
| 342 |