Mercurial > hg > xemacs-beta
view tests/Dnd/droptest.el @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 31 Jan 2010 18:29:48 +0000 |
parents | bc4f2511bbea |
children | d88ad9ccfa66 |
line wrap: on
line source
;; a short example how to use the new Drag'n'Drop API in ;; combination with extents. ;; (defun dnd-drop-message (event object text) (message "Dropped %s with :%s" text object) ;; signal that we have done something with the data t) (defun do-nothing (event object) ;; signal that the data is still unprocessed nil) (defun start-drag (event what &optional typ) ;; short drag interface, until the real one is implemented (cond ((featurep 'cde) (if (not typ) (funcall (intern "cde-start-drag-internal") event nil (list what)) (funcall (intern "cde-start-drag-internal") event t what))) (t display-message 'error "no valid drag protocols implemented"))) (defun start-region-drag (event) (interactive "_e") (if (click-inside-extent-p event zmacs-region-extent) ;; okay, this is a drag (cond ((featurep 'cde) (cde-start-drag-region event (extent-start-position zmacs-region-extent) (extent-end-position zmacs-region-extent))) (t (error "No CDE support compiled in"))))) (defun make-drop-targets () (let ((buf (get-buffer-create "*DND misc-user extent test buffer*")) (s nil) (e nil)) (set-buffer buf) (pop-to-buffer buf) (setq s (point)) (insert "[ DROP TARGET 1]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'experimental-dragdrop-drop-functions '((do-nothing t t) (dnd-drop-message t t "on target 1"))) (set-extent-property ext 'mouse-face 'highlight) (insert " ") (setq s (point)) (insert "[ DROP TARGET 2]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'experimental-dragdrop-drop-functions '((dnd-drop-message t t "on target 2"))) (set-extent-property ext 'mouse-face 'highlight) (insert " ") (setq s (point)) (insert "[ DROP TARGET 3]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'experimental-dragdrop-drop-functions '((dnd-drop-message t t "on target 3"))) (set-extent-property ext 'mouse-face 'highlight) (newline 2))) (defun make-drag-starters () (let ((buf (get-buffer-create "*DND misc-user extent test buffer*")) (s nil) (e nil) (ext nil) (kmap nil)) (set-buffer buf) (pop-to-buffer buf) (erase-buffer buf) (insert "Try to drag data from one of the upper extents to one\nof the lower extents. Make sure that your minibuffer is big\ncause it is used to display the data.\n\nYou may also try to select some of this text and drag it with button2.\n\nTo ") (setq s (point)) (insert "EXIT") (setq e (point)) (insert " this demo, press 'q'.") (setq ext (make-extent s e)) (setq kmap (make-keymap)) (define-key kmap [button1] 'end-dnd-demo) (set-extent-property ext 'keymap kmap) (set-extent-property ext 'mouse-face 'highlight) (newline 2) (setq s (point)) (insert "[ TEXT DRAG TEST ]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (define-key kmap [button1] 'text-drag) (set-extent-property ext 'keymap kmap) (insert " ") (setq s (point)) (insert "[ FILE DRAG TEST ]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (if (featurep 'cde) (define-key kmap [button1] 'cde-file-drag) (define-key kmap [button1] 'file-drag)) (set-extent-property ext 'keymap kmap) (insert " ") (setq s (point)) (insert "[ FILES DRAG TEST ]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (define-key kmap [button1] 'files-drag) (set-extent-property ext 'keymap kmap) (insert " ") (setq s (point)) (insert "[ URL DRAG TEST ]") (setq e (point)) (setq ext (make-extent s e)) (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (if (featurep 'cde) (define-key kmap [button1] 'cde-file-drag) (define-key kmap [button1] 'url-drag)) (set-extent-property ext 'keymap kmap) (newline 3))) (defun text-drag (event) (interactive "@e") (start-drag event "That's a test")) (defun file-drag (event) (interactive "@e") (start-drag event "/tmp/DropTest.xpm" 2)) (defun cde-file-drag (event) (interactive "@e") (start-drag event '("/tmp/DropTest.xpm") t)) (defun url-drag (event) (interactive "@e") (start-drag event "http://www.xemacs.org/" 8)) (defun files-drag (event) (interactive "@e") (start-drag event '("/tmp/DropTest.html" "/tmp/DropTest.xpm" "/tmp/DropTest.tex") 3)) (setq experimental-dragdrop-drop-functions '((do-nothing t t) ;; CDE does not have any button info... (dnd-drop-message 0 t "cde-drop somewhere else") (dnd-drop-message 2 t "region somewhere else") (dnd-drop-message 1 t "drag-source somewhere else") (do-nothing t t))) (make-drag-starters) (make-drop-targets) (defun end-dnd-demo () (interactive) (global-set-key [button2] button2-func) (bury-buffer)) (setq lmap (make-keymap)) (use-local-map lmap) (local-set-key [q] 'end-dnd-demo) (setq button2-func (lookup-key global-map [button2])) (global-set-key [button2] 'start-region-drag)