Mercurial > hg > xemacs-beta
view lisp/dragdrop.el @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 16 Aug 2009 20:55:49 +0100 |
parents | 79940b592197 |
children | bc4f2511bbea |
line wrap: on
line source
;;; dragdrop.el --- window system-independent Drag'n'Drop support. ;; Copyright (C) 1998 Oliver Graf <ograf@fga.de> ;; Maintainer: XEmacs Development Team, Oliver Graf <ograf@fga.de> ;; Keywords: mouse, gui, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs (when drag'n'drop support is compiled in). ;;; Code: ;; we need mouse-set-point (require 'mouse) (provide 'dragdrop) ;; I think this is a better name for the custom group ;; looks better in the menu and the group display as dragdrop ;; Anyway: is dragdrop- a good prefix for all this? ;; What if someone trys drop<TAB> in the minibuffer? (defgroup drag-n-drop nil "*{EXPERIMENTAL} Window system-independent drag'n'drop support." :group 'editing) (defcustom dragdrop-drop-at-point nil "*{EXPERIMENTAL} If non-nil, drop text at the cursor location. Otherwise, the cursor will be moved to the location of the pointer drop before text is inserted." :type 'boolean :group 'drag-n-drop) (defcustom dragdrop-autoload-tm-view nil "*{EXPERIMENTAL} If non-nil, autoload tm-view to decode MIME data. Otherwise, the buffer is only decoded if tm-view is already available." :type 'boolean :group 'drag-n-drop) ;; the widget for editing the drop-functions (define-widget 'dragdrop-function-widget 'list "*{EXPERIMENTAL} Widget for editing drop dispatch functions." :args `((choice :tag "Function" (function-item experimental-dragdrop-drop-url-default) (function-item experimental-dragdrop-drop-mime-default) (function-item experimental-dragdrop-drop-log-function) (function :tag "Other" nil)) (choice :tag "Button" :value t (choice-item :tag "Ignore" t) (choice-item 0) (choice-item 1) (choice-item 2) (choice-item 3) (choice-item 4) (choice-item 5) (choice-item 6) (choice-item 7)) (radio-button-choice :tag "Modifiers" (const :tag "Ignore Modifier Keys" t) (checklist :greedy t :format "Modifier Keys:\n%v" :extra-offset 6 (const shift) (const control) (const meta) (const alt) (const hyper) (const super))) (repeat :inline t :value nil :tag "Extra Function Arguments" (sexp :tag "Arg" :value nil))) :value '(nil t t)) (defcustom experimental-dragdrop-drop-functions '((experimental-dragdrop-drop-url-default t t) (experimental-dragdrop-drop-mime-default t t)) "*{EXPERIMENTAL} This is the standart drop function search list. Each element is a list of a function, a button selector, a modifier selector and optional argumets to the function call. The function must accept at least two arguments: first is the event of the drop, second the object data, followed by any of the optional arguments provided in this list. The functions are called in order, until one returns t." :group 'drag-n-drop :type '(repeat dragdrop-function-widget)) (defgroup dnd-debug nil "*{EXPERIMENTAL} Drag'n'Drop debugging options." :group 'drag-n-drop) (defcustom dragdrop-drop-log nil "*{EXPERIMENTAL} If non-nil, every drop is logged. The name of the buffer is set in the custom 'dragdrop-drop-log-name" :group 'dnd-debug :type 'boolean) (defcustom dragdrop-drop-log-name "*drop log buffer*" "*{EXPERIMENTAL} The name of the buffer used to log drops. Set dragdrop-drop-log to non-nil to enable this feature." :group 'dnd-debug :type 'string) (defvar dragdrop-drop-log-buffer nil "*{EXPERIMENTAL} Buffer to log drops in debug mode.") ;; ;; Drop API ;; (defun dragdrop-drop-dispatch (object) "*{EXPERIMENTAL} This function identifies DROP type misc-user-events. It calls functions which will handle the drag." (let ((event current-mouse-event)) (and dragdrop-drop-log (experimental-dragdrop-drop-log-function event object)) (dragdrop-drop-find-functions event object))) (defun dragdrop-drop-find-functions (event object) "Finds valid drop-handle functions and executes them to dispose the drop. It does this by looking for extent-properties called 'experimental-dragdrop-drop-functions and for variables named like this." (catch 'dragdrop-drop-is-done (and (event-over-text-area-p event) ;; let's search the extents (catch 'dragdrop-extents-done (let ((window (event-window event)) (pos (event-point event)) (cpos (event-closest-point event)) (buffer nil)) (or window (throw 'dragdrop-extents-done nil)) (or pos (setq pos cpos)) (select-window window) (setq buffer (window-buffer)) (let ((ext (extent-at pos buffer 'experimental-dragdrop-drop-functions))) (while (not (eq ext nil)) (dragdrop-drop-do-functions (extent-property ext 'experimental-dragdrop-drop-functions) event object) (setq ext (extent-at pos buffer 'experimental-dragdrop-drop-functions ext))))))) ;; now look into the variable experimental-dragdrop-drop-functions (dragdrop-drop-do-functions experimental-dragdrop-drop-functions event object))) (defun dragdrop-compare-mods (first-mods second-mods) "Returns t if both first-mods and second-mods contain the same elements. Order is not important." (let ((moda (copy-sequence first-mods)) (modb (copy-sequence second-mods))) (while (and (not (eq moda ())) (not (eq modb ()))) (setq modb (delete (car moda) modb)) (setq moda (delete (car moda) moda))) (and (eq moda ()) (eq modb ())))) (defun dragdrop-drop-do-functions (drop-funs event object) "Calls all functions in drop-funs with object until one returns t. Returns t if one of drop-funs returns t. Otherwise returns nil." (let ((flist nil) (button (event-button event)) (mods (event-modifiers event))) (while (not (eq drop-funs ())) (setq flist (car drop-funs)) (and (or (eq (cadr flist) t) (= (cadr flist) button)) (or (eq (caddr flist) t) (dragdrop-compare-mods (caddr flist) mods)) (apply (car flist) `(,event ,object ,@(cdddr flist))) ;; (funcall (car flist) event object) (throw 'dragdrop-drop-is-done t)) (setq drop-funs (cdr drop-funs)))) nil) (defun experimental-dragdrop-drop-log-function (event object &optional message buffer) "*{EXPERIMENTAL} Logs any drops into a buffer. If buffer is nil, it inserts the data into a buffer called after dragdrop-drop-log-name. If dragdrop-drop-log is non-nil, this is done automatically for each drop. The function always returns nil." (save-excursion (cond ((buffer-live-p buffer) (set-buffer buffer)) ((stringp buffer) (set-buffer (get-buffer-create buffer))) ((buffer-live-p dragdrop-drop-log-buffer) (set-buffer dragdrop-drop-log-buffer)) (t (setq dragdrop-drop-log-buffer (get-buffer-create dragdrop-drop-log-name)) (set-buffer dragdrop-drop-log-buffer))) (insert (format "* %s: %s\n" (current-time-string) (if message message "received a drop"))) (insert (format " at %d,%d (%d,%d) with button %d and mods %s\n" (event-x event) (event-y event) (event-x-pixel event) (event-y-pixel event) (event-button event) (event-modifiers event))) (insert (format " data is of type %s (%d %s)\n" (cond ((eq (car object) 'dragdrop-URL) "URL") ((eq (car object) 'dragdrop-MIME) "MIME") (t "UNKNOWN")) (length (cdr object)) (if (= (length (cdr object)) 1) "element" "elements"))) (let ((i 1) (data (cdr object))) (while (not (eq data ())) (insert (format " Element %d: %S\n" i (car data))) (setq i (1+ i)) (setq data (cdr data)))) (insert "----------\n")) nil) (defun experimental-dragdrop-drop-url-default (event object) "*{EXPERIMENTAL} Default handler for dropped URL data. Finds files and URLs. Returns nil if object does not contain URL data." (cond ((eq (car object) 'dragdrop-URL) (let* ((data (cdr object)) (frame (event-channel event)) (x pop-up-windows) (window (or (event-window event) (frame-selected-window frame) (frame-highest-window frame 0)))) (setq pop-up-windows nil) (while (not (eq data ())) (cond ((dragdrop-is-some-url "file" (car data)) ;; if it is some file, pop it to a buffer (cond (window (select-window window))) (switch-to-buffer (find-file-noselect (substring (car data) 5)))) ;; to-do: open ftp URLs with efs... (t ;; some other URL, try to fire up some browser for it (if-fboundp 'browse-url (browse-url (car data)) (display-message 'error "Can't show URL, no browser selected")))) (undo-boundary) (setq data (cdr data))) (make-frame-visible frame) (setq pop-up-windows x) t)) (t nil))) (defun experimental-dragdrop-drop-mime-default (event object) "*{EXPERIMENTAL} Default handler for dropped MIME data. Inserts text into buffer, creates MIME buffers for other types. Returns nil if object does not contain MIME data." (cond ((eq (car object) 'dragdrop-MIME) (let ((ldata (cdr object)) (frame (event-channel event)) (x pop-up-windows) (data nil)) ;; how should this be handled??? ;; insert drops of text/* into buffer ;; create new buffer if pointer is outside buffer... ;; but there are many other ways... ;; ;; first thing: check if it's only text/plain and if the ;; drop happened inside some buffer. if yes insert it into ;; this buffer (hope it is not encoded in some MIME way) ;; ;; Remember: ("text/plain" "dosnotmatter" "somedata") ;; drops are inserted at mouse-point, if inside a buffer (while (not (eq ldata ())) (setq data (car ldata)) (if (and (listp data) (= (length data) 3) (listp (car data)) (stringp (caar data)) (string= (caar data) "text/plain") (event-over-text-area-p event)) (let ((window (event-window event))) (and window (select-window window)) (and (not dragdrop-drop-at-point) (mouse-set-point event)) (insert (caddr data))) (let ((buf (get-buffer-create "*MIME-Drop data*"))) (set-buffer buf) (pop-to-buffer buf nil frame) (or (featurep 'tm-view) (and dragdrop-autoload-tm-view (require 'tm-view))) (cond ((stringp data) ;; this is some raw MIME stuff ;; create some buffer and let tm do the job ;; ;; this is always the same buffer!!! ;; change? (erase-buffer) (insert data) (and (featurep 'tm-view) (declare-fboundp (mime/viewer-mode buf)))) ((and (listp data) (= (length data) 3)) ;; change the internal content-type representation to the ;; way tm does it ("content/type" (key . value)*) ;; but for now list will do the job ;; ;; this is always the same buffer!!! ;; change? (erase-buffer) (insert (caddr data)) (and (featurep 'tm-view) ;; this list of (car data) should be done before ;; enqueing the event (declare-fboundp (mime/viewer-mode buf (car data) (cadr data))))) (t (display-message 'error "Wrong drop data"))))) (undo-boundary) (setq ldata (cdr ldata))) (make-frame-visible frame) (setq pop-up-windows x)) t) (t nil))) (defun dragdrop-is-some-url (method url) "Returns true if method equals the start of url. If method does not end into ':' this is appended before the compare." (cond ((and (stringp url) (stringp method) (> (length url) (length method))) ;; is this ?: check efficient enough? (if (not (string= (substring method -1) ":")) (setq method (concat method ":"))) (string= method (substring url 0 (length method)))) (t nil))) ;; ;; Drag API ;; (defun experimental-dragdrop-drag (event object) "*{EXPERIMENTAL} The generic drag function. Tries to do the best with object in the selected protocol. Object must comply to the standart drag'n'drop object format." (error "Not implemented")) (defun experimental-dragdrop-drag-region (event begin end) "*{EXPERIMENTAL} Drag a region. This function uses special data types if the low-level protocol requires it. It does so by calling dragdrop-drag-pure-text." (experimental-dragdrop-drag-pure-text event (buffer-substring-no-properties begin end))) (defun experimental-dragdrop-drag-pure-text (event text) "*{EXPERIMENTAL} Drag text-only data. Takes care of special low-level protocol data types. Text must be a list of strings." (error "Not implemented")) (defun experimental-dragdrop-drag-pure-file (event file) "*{EXPERIMENTAL} Drag filepath-only data. Takes care of special low-level protocol data types. file must be a list of strings." (error "Not implemented")) ;; ;; The following ones come from frame.el but the better belong here ;; until changed ;; (defun cde-start-drag (event type data) "Implement the CDE drag operation. Calls the internal function cde-start-drag-internal to do the actual work." (interactive "_eXX") (if (featurep 'cde) ;; Avoid build-time doc string warning by calling the function ;; in the following roundabout way: (funcall (intern "cde-start-drag-internal") event type data) (error "CDE functionality not compiled in."))) (defun cde-start-drag-region (event begin end) "Implement the CDE drag operation for a region. Calls the internal function CDE-start-drag-internal to do the actual work. This always does buffer transfers." ;; Oliver Graf <ograf@fga.de> (interactive "_er") (if (featurep 'cde) (funcall (intern "cde-start-drag-internal") event nil (list (buffer-substring-no-properties begin end))) (error "CDE functionality not compiled in."))) ;; the OffiX drag stuff will soon move also (perhaps mouse.el) ;; if the drag event is done (defun offix-start-drag (event data &optional type) "Implement the OffiX drag operation. Calls the internal function offix-start-drag-internal to do the actual work. If type is not given, DndText is assumed." ;; Oliver Graf <ograf@fga.de> (interactive "esi") (if (featurep 'offix) (funcall (intern "offix-start-drag-internal") event data type) (error "OffiX functionality not compiled in."))) (defun offix-start-drag-region (event begin end) "Implement the OffiX drag operation for a region. Calls the internal function offix-start-drag-internal to do the actual work. This always assumes DndText as type." ;; Oliver Graf <ograf@fga.de> (interactive "_er") (if (featurep 'offix) (funcall (intern "offix-start-drag-internal") event (buffer-substring-no-properties begin end)) (error "OffiX functionality not compiled in."))) (defun gtk-start-drag (event data &optional type) (interactive "esi") (if (featurep 'gtk) (declare-fboundp (gtk-start-drag-internal event data type)) (error "GTK functionality not compiled in."))) (defun gtk-start-drag-region (event begin end) (interactive "_er") (if (featurep 'gtk) (declare-fboundp (gtk-start-drag-internal event (buffer-substring-no-properties begin end) "text/plain")) (error "GTK functionality not compiled in."))) ;;; dragdrop.el ends here