Mercurial > hg > xemacs-beta
annotate src/glyphs-shared.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 | b3ea9c582280 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 608 | 1 /* Routines shared between window-system backends for glyph objects. |
| 563 | 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. |
| 4226 | 3 Copyright (C) 1995 Board of Trustees, University of Illinois |
| 563 | 4 Copyright (C) 1995 Tinker Systems |
| 771 | 5 Copyright (C) 1995, 1996, 2001 Ben Wing |
| 563 | 6 Copyright (C) 1995 Sun Microsystems |
| 4226 | 7 Copyright (C) 1998, 1999, 2000 Andy Piper |
| 563 | 8 |
| 9 This file is part of XEmacs. | |
| 10 | |
| 11 XEmacs is free software; you can redistribute it and/or modify it | |
| 12 under the terms of the GNU General Public License as published by the | |
| 13 Free Software Foundation; either version 2, or (at your option) any | |
| 14 later version. | |
| 15 | |
| 16 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 17 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 18 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 19 for more details. | |
| 20 | |
| 21 You should have received a copy of the GNU General Public License | |
| 22 along with XEmacs; see the file COPYING. If not, write to | |
| 23 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 Boston, MA 02111-1307, USA. */ | |
| 25 | |
| 26 /* Synched up with: Not in FSF. */ | |
| 27 | |
| 28 /* taken from glyphs-*.c | |
| 29 HINT HINT HINT Bill Perry: Please put code here and avoid massive | |
| 30 duplication in *-gtk.c!!! */ | |
| 31 | |
| 32 #include <config.h> | |
| 33 #include "lisp.h" | |
| 34 | |
| 800 | 35 #include "buffer.h" |
| 563 | 36 #include "elhash.h" |
| 800 | 37 #include "faces.h" |
| 563 | 38 #include "frame.h" |
| 800 | 39 #include "glyphs.h" |
| 40 #include "imgproc.h" | |
| 563 | 41 #include "insdel.h" |
| 800 | 42 #include "lstream.h" |
| 563 | 43 #include "opaque.h" |
| 44 #include "sysdep.h" | |
| 800 | 45 #include "window.h" |
| 46 | |
| 563 | 47 #include "sysfile.h" |
| 48 | |
| 49 Lisp_Object Q_resource_type, Q_resource_id; | |
| 50 | |
| 51 void | |
| 52 shared_resource_validate (Lisp_Object instantiator) | |
| 53 { | |
| 54 if ((NILP (find_keyword_in_vector (instantiator, Q_file)) | |
| 55 && | |
| 56 NILP (find_keyword_in_vector (instantiator, Q_resource_id))) | |
| 57 || | |
| 58 NILP (find_keyword_in_vector (instantiator, Q_resource_type))) | |
| 59 sferror ("Must supply :file, :resource-id and :resource-type", | |
| 60 instantiator); | |
| 61 } | |
| 62 | |
| 63 | |
| 64 Lisp_Object | |
| 65 shared_resource_normalize (Lisp_Object inst, Lisp_Object console_type, | |
| 2286 | 66 Lisp_Object UNUSED (dest_mask), Lisp_Object tag) |
| 563 | 67 { |
| 68 /* This function can call lisp */ | |
| 69 Lisp_Object file = Qnil; | |
| 70 struct gcpro gcpro1, gcpro2; | |
| 71 Lisp_Object alist = Qnil; | |
| 72 | |
| 73 GCPRO2 (file, alist); | |
| 74 | |
| 75 file = potential_pixmap_file_instantiator (inst, Q_file, Q_data, | |
| 76 console_type); | |
| 77 | |
| 4226 | 78 if (NILP (file)) /* normalization impossible for the console type */ |
| 79 RETURN_UNGCPRO (Qnil); | |
| 80 | |
| 563 | 81 if (CONSP (file)) /* failure locating filename */ |
| 82 signal_double_image_error ("Opening pixmap file", | |
| 83 "no such file or directory", | |
| 84 Fcar (file)); | |
| 85 | |
| 4226 | 86 if (EQ (file, Qt)) /* no conversion necessary */ |
| 563 | 87 RETURN_UNGCPRO (inst); |
| 88 | |
| 89 alist = tagged_vector_to_alist (inst); | |
| 90 | |
| 91 { | |
| 92 alist = remassq_no_quit (Q_file, alist); | |
| 93 alist = Fcons (Fcons (Q_file, file), alist); | |
| 94 } | |
| 95 | |
| 96 { | |
| 97 Lisp_Object result = alist_to_tagged_vector (tag, alist); | |
| 98 free_alist (alist); | |
| 99 RETURN_UNGCPRO (result); | |
| 100 } | |
| 101 } | |
| 102 | |
| 608 | 103 /* Originally from xmu.c, but is now shared across X11, GTK, and MSW. */ |
| 104 /* | |
| 105 * Based on an optimized version provided by Jim Becker, August 5, 1988. | |
| 106 */ | |
| 107 | |
| 108 | |
| 109 #ifndef BitmapSuccess | |
| 110 #define BitmapSuccess 0 | |
| 111 #define BitmapOpenFailed 1 | |
| 112 #define BitmapFileInvalid 2 | |
| 113 #define BitmapNoMemory 3 | |
| 114 #endif | |
| 115 | |
| 116 #define MAX_SIZE 255 | |
| 117 | |
| 118 /* shared data for the image read/parse logic */ | |
| 119 static short hexTable[256]; /* conversion value */ | |
| 120 static int hex_initialized; /* easier to fill in at run time */ | |
| 121 | |
| 122 | |
| 123 /* | |
| 124 * Table index for the hex values. Initialized once, first time. | |
| 125 * Used for translation value or delimiter significance lookup. | |
| 126 */ | |
| 127 static void initHexTable (void) | |
| 128 { | |
| 129 /* | |
| 130 * We build the table at run time for several reasons: | |
| 131 * | |
| 132 * 1. portable to non-ASCII machines. | |
| 133 * 2. still reentrant since we set the init flag after setting table. | |
| 134 * 3. easier to extend. | |
| 135 * 4. less prone to bugs. | |
| 136 */ | |
| 137 hexTable['0'] = 0; hexTable['1'] = 1; | |
| 138 hexTable['2'] = 2; hexTable['3'] = 3; | |
| 139 hexTable['4'] = 4; hexTable['5'] = 5; | |
| 140 hexTable['6'] = 6; hexTable['7'] = 7; | |
| 141 hexTable['8'] = 8; hexTable['9'] = 9; | |
| 142 hexTable['A'] = 10; hexTable['B'] = 11; | |
| 143 hexTable['C'] = 12; hexTable['D'] = 13; | |
| 144 hexTable['E'] = 14; hexTable['F'] = 15; | |
| 145 hexTable['a'] = 10; hexTable['b'] = 11; | |
| 146 hexTable['c'] = 12; hexTable['d'] = 13; | |
| 147 hexTable['e'] = 14; hexTable['f'] = 15; | |
| 148 | |
| 149 /* delimiters of significance are flagged w/ negative value */ | |
| 150 hexTable[' '] = -1; hexTable[','] = -1; | |
| 151 hexTable['}'] = -1; hexTable['\n'] = -1; | |
| 152 hexTable['\t'] = -1; | |
| 153 | |
| 154 hex_initialized = 1; | |
| 155 } | |
| 156 | |
| 157 /* | |
| 158 * read next hex value in the input stream, return -1 if EOF | |
| 159 */ | |
| 160 static int NextInt (FILE *fstream) | |
| 161 { | |
| 162 int ch; | |
| 163 int value = 0; | |
| 164 int gotone = 0; | |
| 165 int done = 0; | |
| 166 | |
| 167 /* loop, accumulate hex value until find delimiter */ | |
| 168 /* skip any initial delimiters found in read stream */ | |
| 169 | |
| 170 while (!done) { | |
| 171 ch = getc(fstream); | |
| 172 if (ch == EOF) { | |
| 173 value = -1; | |
| 174 done++; | |
| 175 } else { | |
| 176 /* trim high bits, check type and accumulate */ | |
| 177 ch &= 0xff; | |
| 178 if (isascii(ch) && isxdigit(ch)) { | |
| 179 value = (value << 4) + hexTable[ch]; | |
| 180 gotone++; | |
| 181 } else if ((hexTable[ch]) < 0 && gotone) | |
| 182 done++; | |
| 183 } | |
| 184 } | |
| 185 return value; | |
| 186 } | |
| 187 | |
| 188 | |
| 189 /* | |
| 190 * The data returned by the following routine is always in left-most byte | |
| 191 * first and left-most bit first. If it doesn't return BitmapSuccess then | |
| 192 * its arguments won't have been touched. This routine should look as much | |
| 193 * like the Xlib routine XReadBitmapfile as possible. | |
| 194 */ | |
| 611 | 195 static int |
| 2367 | 196 read_bitmap_data (FILE *fstream, int *width, int *height, Binbyte **datap, |
| 611 | 197 int *x_hot, int *y_hot) |
| 608 | 198 { |
| 2367 | 199 Binbyte *data = NULL; /* working variable */ |
| 200 Ascbyte line[MAX_SIZE]; /* input line from file */ | |
| 608 | 201 int size; /* number of bytes of data */ |
| 2367 | 202 Ascbyte name_and_type[MAX_SIZE]; /* an input line */ |
| 203 Ascbyte *type; /* for parsing */ | |
| 608 | 204 int value; /* from an input line */ |
| 205 int version10p; /* boolean, old format */ | |
| 206 int padding; /* to handle alignment */ | |
| 207 int bytes_per_line; /* per scanline of data */ | |
| 647 | 208 int ww = 0; /* width */ |
| 209 int hh = 0; /* height */ | |
| 608 | 210 int hx = -1; /* x hotspot */ |
| 211 int hy = -1; /* y hotspot */ | |
| 212 | |
| 213 #ifndef Xmalloc | |
| 214 #define Xmalloc(size) malloc(size) | |
| 215 #endif | |
| 216 | |
| 217 /* first time initialization */ | |
| 218 if (!hex_initialized) initHexTable(); | |
| 219 | |
| 220 /* error cleanup and return macro */ | |
| 221 #define RETURN(code) { if (data) free (data); return code; } | |
| 222 | |
| 223 while (fgets(line, MAX_SIZE, fstream)) { | |
| 224 if (strlen(line) == MAX_SIZE-1) { | |
| 225 RETURN (BitmapFileInvalid); | |
| 226 } | |
| 227 if (sscanf(line,"#define %s %d",name_and_type,&value) == 2) { | |
| 228 if (!(type = strrchr(name_and_type, '_'))) | |
| 229 type = name_and_type; | |
| 230 else | |
| 231 type++; | |
| 232 | |
| 233 if (!strcmp("width", type)) | |
| 647 | 234 ww = value; |
| 608 | 235 if (!strcmp("height", type)) |
| 647 | 236 hh = value; |
| 608 | 237 if (!strcmp("hot", type)) { |
| 238 if (type-- == name_and_type || type-- == name_and_type) | |
| 239 continue; | |
| 240 if (!strcmp("x_hot", type)) | |
| 241 hx = value; | |
| 242 if (!strcmp("y_hot", type)) | |
| 243 hy = value; | |
| 244 } | |
| 245 continue; | |
| 246 } | |
| 247 | |
| 248 if (sscanf(line, "static short %s = {", name_and_type) == 1) | |
| 249 version10p = 1; | |
| 250 else if (sscanf(line,"static unsigned char %s = {",name_and_type) == 1) | |
| 251 version10p = 0; | |
| 252 else if (sscanf(line, "static char %s = {", name_and_type) == 1) | |
| 253 version10p = 0; | |
| 254 else | |
| 255 continue; | |
| 256 | |
| 257 if (!(type = strrchr(name_and_type, '_'))) | |
| 258 type = name_and_type; | |
| 259 else | |
| 260 type++; | |
| 261 | |
| 262 if (strcmp("bits[]", type)) | |
| 263 continue; | |
| 264 | |
| 265 if (!ww || !hh) | |
| 266 RETURN (BitmapFileInvalid); | |
| 267 | |
| 268 if ((ww % 16) && ((ww % 16) < 9) && version10p) | |
| 269 padding = 1; | |
| 270 else | |
| 271 padding = 0; | |
| 272 | |
| 273 bytes_per_line = (ww+7)/8 + padding; | |
| 274 | |
| 275 size = bytes_per_line * hh; | |
| 2367 | 276 data = (Binbyte *) Xmalloc ((unsigned int) size); |
| 608 | 277 if (!data) |
| 278 RETURN (BitmapNoMemory); | |
| 279 | |
| 280 if (version10p) { | |
| 2367 | 281 Binbyte *ptr; |
| 608 | 282 int bytes; |
| 283 | |
| 284 for (bytes=0, ptr=data; bytes<size; (bytes += 2)) { | |
| 285 if ((value = NextInt(fstream)) < 0) | |
| 286 RETURN (BitmapFileInvalid); | |
| 287 *(ptr++) = value; | |
| 288 if (!padding || ((bytes+2) % bytes_per_line)) | |
| 289 *(ptr++) = value >> 8; | |
| 290 } | |
| 291 } else { | |
| 2367 | 292 Binbyte *ptr; |
| 608 | 293 int bytes; |
| 294 | |
| 295 for (bytes=0, ptr=data; bytes<size; bytes++, ptr++) { | |
| 296 if ((value = NextInt(fstream)) < 0) | |
| 297 RETURN (BitmapFileInvalid); | |
| 298 *ptr=value; | |
| 299 } | |
| 300 } | |
| 301 break; | |
| 302 } /* end while */ | |
| 303 | |
| 304 if (data == NULL) { | |
| 305 RETURN (BitmapFileInvalid); | |
| 306 } | |
| 307 | |
| 308 *datap = data; | |
| 309 data = NULL; | |
| 310 *width = ww; | |
| 311 *height = hh; | |
| 312 if (x_hot) *x_hot = hx; | |
| 313 if (y_hot) *y_hot = hy; | |
| 314 | |
| 315 RETURN (BitmapSuccess); | |
| 316 } | |
| 317 | |
| 318 | |
| 611 | 319 int |
| 771 | 320 read_bitmap_data_from_file (Lisp_Object filename, |
| 611 | 321 /* Remaining args are RETURNED */ |
| 647 | 322 int *width, |
| 323 int *height, | |
| 2367 | 324 Binbyte **datap, |
| 611 | 325 int *x_hot, int *y_hot) |
| 608 | 326 { |
| 771 | 327 FILE *fstream; |
| 328 int status; | |
| 329 Extbyte *fileext; | |
| 608 | 330 |
|
4834
b3ea9c582280
Use new cygwin_conv_path API with Cygwin 1.7 for converting names between Win32 and POSIX, UTF-8-aware, with attendant changes elsewhere
Ben Wing <ben@xemacs.org>
parents:
4226
diff
changeset
|
331 LISP_PATHNAME_CONVERT_OUT (filename, fileext); |
| 771 | 332 if ((fstream = fopen (fileext, "r")) == NULL) |
| 333 return BitmapOpenFailed; | |
| 334 status = read_bitmap_data (fstream, width, height, datap, x_hot, y_hot); | |
| 335 retry_fclose (fstream); | |
| 336 return status; | |
| 608 | 337 } |
| 338 | |
| 563 | 339 void |
| 340 syms_of_glyphs_shared (void) | |
| 341 { | |
| 342 DEFKEYWORD (Q_resource_id); | |
| 343 DEFKEYWORD (Q_resource_type); | |
| 344 } |