Mercurial > hg > xemacs-beta
annotate src/select-gtk.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 |
|---|---|
| 462 | 1 /* GTK selection processing for XEmacs |
| 2 Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 771 | 3 Copyright (C) 2001 Ben Wing. |
| 462 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not synched with FSF. */ | |
| 23 | |
| 24 /* Authorship: | |
| 25 | |
| 26 Written by Kevin Gallo for FSF Emacs. | |
| 27 Rewritten for mswindows by Jonathan Harris, December 1997 for 21.0. | |
| 28 Rewritten for GTK by William Perry, April 2000 for 21.1 | |
| 29 */ | |
| 30 | |
| 31 | |
| 32 #include <config.h> | |
| 33 #include "lisp.h" | |
| 872 | 34 |
| 462 | 35 #include "buffer.h" |
| 872 | 36 #include "device-impl.h" |
| 37 #include "events.h" | |
| 38 #include "frame.h" | |
| 39 #include "opaque.h" | |
| 462 | 40 #include "select.h" |
| 872 | 41 |
| 42 #include "console-gtk-impl.h" | |
| 462 | 43 |
| 44 static Lisp_Object Vretrieved_selection; | |
| 45 static gboolean waiting_for_selection; | |
| 46 Lisp_Object Vgtk_sent_selection_hooks; | |
| 47 | |
| 778 | 48 extern int lisp_to_time (Lisp_Object, time_t *); |
| 49 extern Lisp_Object time_to_lisp (time_t); | |
| 50 | |
| 647 | 51 static GdkAtom |
| 2286 | 52 symbol_to_gtk_atom (struct device *UNUSED (d), Lisp_Object sym, |
| 53 int only_if_exists) | |
| 647 | 54 { |
| 55 if (NILP (sym)) return GDK_SELECTION_PRIMARY; | |
| 56 if (EQ (sym, Qt)) return GDK_SELECTION_SECONDARY; | |
| 57 if (EQ (sym, QPRIMARY)) return GDK_SELECTION_PRIMARY; | |
| 58 if (EQ (sym, QSECONDARY)) return GDK_SELECTION_SECONDARY; | |
| 59 | |
| 60 { | |
| 61 const Extbyte *nameext; | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
62 nameext = LISP_STRING_TO_EXTERNAL (Fsymbol_name (sym), Qctext); |
| 647 | 63 return gdk_atom_intern (nameext, only_if_exists ? TRUE : FALSE); |
| 64 } | |
| 65 } | |
| 462 | 66 |
| 647 | 67 static Lisp_Object |
| 2286 | 68 atom_to_symbol (struct device *UNUSED (d), GdkAtom atom) |
| 647 | 69 { |
| 70 if (atom == GDK_SELECTION_PRIMARY) return (QPRIMARY); | |
| 71 if (atom == GDK_SELECTION_SECONDARY) return (QSECONDARY); | |
| 72 | |
| 73 { | |
| 867 | 74 Ibyte *intstr; |
| 647 | 75 Extbyte *str = gdk_atom_name (atom); |
| 76 | |
| 77 if (! str) return Qnil; | |
| 462 | 78 |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
79 intstr = EXTERNAL_TO_ITEXT (str, Qctext); |
| 647 | 80 g_free (str); |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
2620
diff
changeset
|
81 return intern_istring (intstr); |
| 647 | 82 } |
| 83 } | |
| 84 | |
| 4984 | 85 #define THIS_IS_GTK |
| 86 #include "select-xlike-inc.c" | |
| 87 #undef THIS_IS_GTK | |
| 647 | 88 |
| 89 | |
| 462 | 90 /* Set the selection data to GDK_NONE and NULL data, meaning we were |
| 91 ** unable to do what they wanted. | |
| 92 */ | |
| 93 static void | |
| 94 gtk_decline_selection_request (GtkSelectionData *data) | |
| 95 { | |
| 96 gtk_selection_data_set (data, GDK_NONE, 0, NULL, 0); | |
| 97 } | |
| 98 | |
| 99 /* Used as an unwind-protect clause so that, if a selection-converter signals | |
| 100 an error, we tell the requestor that we were unable to do what they wanted | |
| 101 before we throw to top-level or go into the debugger or whatever. | |
| 102 */ | |
| 103 struct _selection_closure | |
| 104 { | |
| 105 GtkSelectionData *data; | |
| 106 gboolean successful; | |
| 107 }; | |
| 108 | |
| 109 static Lisp_Object | |
| 110 gtk_selection_request_lisp_error (Lisp_Object closure) | |
| 111 { | |
| 112 struct _selection_closure *cl = (struct _selection_closure *) | |
| 113 get_opaque_ptr (closure); | |
| 114 | |
| 115 free_opaque_ptr (closure); | |
| 116 if (cl->successful == TRUE) | |
| 117 return Qnil; | |
| 118 gtk_decline_selection_request (cl->data); | |
| 119 return Qnil; | |
| 120 } | |
| 121 | |
| 122 /* This provides the current selection to a requester. | |
| 123 ** | |
| 124 ** This is connected to the selection_get() signal of the application | |
| 125 ** shell in device-gtk.c:gtk_init_device(). | |
| 126 ** | |
| 127 ** This is radically different than the old selection code (21.1.x), | |
| 128 ** but has been modeled after the X code, and appears to work. | |
| 129 ** | |
| 130 ** WMP Feb 12 2001 | |
| 131 */ | |
| 132 void | |
| 2286 | 133 emacs_gtk_selection_handle (GtkWidget *UNUSED (widget), |
| 462 | 134 GtkSelectionData *selection_data, |
| 2286 | 135 guint UNUSED (info), |
| 462 | 136 guint time_stamp, |
| 2286 | 137 gpointer UNUSED (data)) |
| 462 | 138 { |
| 139 /* This function can GC */ | |
| 140 struct gcpro gcpro1, gcpro2; | |
| 141 Lisp_Object temp_obj; | |
| 142 Lisp_Object selection_symbol; | |
| 143 Lisp_Object target_symbol = Qnil; | |
| 144 Lisp_Object converted_selection = Qnil; | |
| 145 guint32 local_selection_time; | |
| 146 Lisp_Object successful_p = Qnil; | |
| 147 int count; | |
| 148 struct device *d = decode_gtk_device (Qnil); | |
| 149 struct _selection_closure *cl = NULL; | |
| 150 | |
| 151 GCPRO2 (converted_selection, target_symbol); | |
| 152 | |
| 153 selection_symbol = atom_to_symbol (d, selection_data->selection); | |
| 154 target_symbol = atom_to_symbol (d, selection_data->target); | |
| 155 | |
| 156 #if 0 /* #### MULTIPLE doesn't work yet */ | |
| 157 if (EQ (target_symbol, QMULTIPLE)) | |
| 158 target_symbol = fetch_multiple_target (selection_data); | |
| 159 #endif | |
| 160 | |
| 2620 | 161 temp_obj = get_selection_raw_time(selection_symbol); |
| 462 | 162 |
| 163 if (NILP (temp_obj)) | |
| 164 { | |
| 165 /* We don't appear to have the selection. */ | |
| 166 gtk_decline_selection_request (selection_data); | |
| 167 | |
| 168 goto DONE_LABEL; | |
| 169 } | |
| 170 | |
| 171 local_selection_time = * (guint32 *) XOPAQUE_DATA (temp_obj); | |
| 172 | |
| 173 if (time_stamp != GDK_CURRENT_TIME && | |
| 174 local_selection_time > time_stamp) | |
| 175 { | |
| 176 /* Someone asked for the selection, and we have one, but not the one | |
| 177 they're looking for. */ | |
| 178 gtk_decline_selection_request (selection_data); | |
| 179 goto DONE_LABEL; | |
| 180 } | |
| 181 | |
| 182 converted_selection = select_convert_out (selection_symbol, | |
| 183 target_symbol, Qnil); | |
| 184 | |
| 185 /* #### Is this the right thing to do? I'm no X expert. -- ajh */ | |
| 186 if (NILP (converted_selection)) | |
| 187 { | |
| 188 /* We don't appear to have a selection in that data type. */ | |
| 189 gtk_decline_selection_request (selection_data); | |
| 190 goto DONE_LABEL; | |
| 191 } | |
| 192 | |
| 193 count = specpdl_depth (); | |
| 194 | |
| 2367 | 195 cl = xnew (struct _selection_closure); |
| 462 | 196 cl->data = selection_data; |
| 197 cl->successful = FALSE; | |
| 198 | |
| 199 record_unwind_protect (gtk_selection_request_lisp_error, | |
| 200 make_opaque_ptr (cl)); | |
| 201 | |
| 202 { | |
| 2367 | 203 Rawbyte *data; |
| 665 | 204 Bytecount size; |
| 462 | 205 int format; |
| 206 GdkAtom type; | |
| 207 lisp_data_to_selection_data (d, converted_selection, | |
| 208 &data, &type, &size, &format); | |
| 209 | |
| 647 | 210 gtk_selection_data_set (selection_data, type, format, data, |
| 211 /* #### is this right? */ | |
| 212 (unsigned int) size); | |
| 462 | 213 successful_p = Qt; |
| 214 /* Tell x_selection_request_lisp_error() it's cool. */ | |
| 215 cl->successful = TRUE; | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
216 xfree (data); |
| 462 | 217 } |
| 218 | |
| 771 | 219 unbind_to (count); |
| 462 | 220 |
| 221 DONE_LABEL: | |
| 222 | |
| 1726 | 223 if (cl) |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
224 xfree (cl); |
| 462 | 225 |
| 226 UNGCPRO; | |
| 227 | |
| 228 /* Let random lisp code notice that the selection has been asked for. */ | |
| 229 { | |
| 230 Lisp_Object val = Vgtk_sent_selection_hooks; | |
| 231 if (!UNBOUNDP (val) && !NILP (val)) | |
| 232 { | |
| 233 Lisp_Object rest; | |
| 234 if (CONSP (val) && !EQ (XCAR (val), Qlambda)) | |
| 235 for (rest = val; !NILP (rest); rest = Fcdr (rest)) | |
| 236 call3 (Fcar (rest), selection_symbol, target_symbol, successful_p); | |
| 237 else | |
| 238 call3 (val, selection_symbol, target_symbol, successful_p); | |
| 239 } | |
| 240 } | |
| 241 } | |
| 242 | |
| 243 | |
| 746 | 244 void |
| 2286 | 245 emacs_gtk_selection_clear_event_handle (GtkWidget *UNUSED (widget), |
| 746 | 246 GdkEventSelection *event, |
| 2286 | 247 gpointer UNUSED (data)) |
| 746 | 248 { |
| 249 GdkAtom selection = event->selection; | |
| 250 guint32 changed_owner_time = event->time; | |
| 251 struct device *d = decode_gtk_device (Qnil); | |
| 252 | |
| 253 Lisp_Object selection_symbol, local_selection_time_lisp; | |
| 254 guint32 local_selection_time; | |
| 255 | |
| 256 selection_symbol = atom_to_symbol (d, selection); | |
| 257 | |
| 2620 | 258 local_selection_time_lisp = get_selection_raw_time (selection_symbol); |
| 746 | 259 |
| 260 /* We don't own the selection, so that's fine. */ | |
| 261 if (NILP (local_selection_time_lisp)) | |
| 262 return; | |
| 263 | |
| 264 local_selection_time = *(guint32 *) XOPAQUE_DATA (local_selection_time_lisp); | |
| 265 | |
| 266 /* This SelectionClear is for a selection that we no longer own, so we can | |
| 267 disregard it. (That is, we have reasserted the selection since this | |
| 268 request was generated.) | |
| 269 */ | |
| 270 if (changed_owner_time != GDK_CURRENT_TIME && | |
| 271 local_selection_time > changed_owner_time) | |
| 272 return; | |
| 273 | |
| 274 handle_selection_clear (selection_symbol); | |
| 275 } | |
| 276 | |
| 277 | |
| 462 | 278 |
| 279 static GtkWidget *reading_selection_reply; | |
| 280 static GdkAtom reading_which_selection; | |
| 281 static int selection_reply_timed_out; | |
| 282 | |
| 283 /* Gets the current selection owned by another application */ | |
| 284 void | |
| 2286 | 285 emacs_gtk_selection_received (GtkWidget *UNUSED (widget), |
| 462 | 286 GtkSelectionData *selection_data, |
| 2286 | 287 gpointer UNUSED (user_data)) |
| 462 | 288 { |
| 289 waiting_for_selection = FALSE; | |
| 290 Vretrieved_selection = Qnil; | |
| 291 | |
| 292 reading_selection_reply = NULL; | |
| 293 | |
| 294 signal_fake_event (); | |
| 295 | |
| 296 if (selection_data->length < 0) | |
| 297 { | |
| 298 return; | |
| 299 } | |
| 300 | |
| 301 Vretrieved_selection = | |
| 302 selection_data_to_lisp_data (NULL, | |
| 303 selection_data->data, | |
| 304 selection_data->length, | |
| 305 selection_data->type, | |
| 306 selection_data->format); | |
| 307 } | |
| 308 | |
| 309 static int | |
| 2286 | 310 selection_reply_done (void *UNUSED (ignore)) |
| 462 | 311 { |
| 312 return !reading_selection_reply; | |
| 313 } | |
| 314 | |
| 315 /* Do protocol to read selection-data from the server. | |
| 316 Converts this to lisp data and returns it. | |
| 317 */ | |
| 318 static Lisp_Object | |
| 319 gtk_get_foreign_selection (Lisp_Object selection_symbol, | |
| 320 Lisp_Object target_type) | |
| 321 { | |
| 322 /* This function can GC */ | |
| 323 struct device *d = decode_gtk_device (Qnil); | |
| 324 GtkWidget *requestor = DEVICE_GTK_APP_SHELL (d); | |
| 325 guint32 requestor_time = DEVICE_GTK_MOUSE_TIMESTAMP (d); | |
| 326 GdkAtom selection_atom = symbol_to_gtk_atom (d, selection_symbol, 0); | |
| 327 int speccount; | |
| 328 GdkAtom type_atom = symbol_to_gtk_atom (d, (CONSP (target_type) ? | |
| 329 XCAR (target_type) : target_type), 0); | |
| 330 | |
| 331 gtk_selection_convert (requestor, selection_atom, type_atom, | |
| 332 requestor_time); | |
| 333 | |
| 334 signal_fake_event (); | |
| 335 | |
| 336 /* Block until the reply has been read. */ | |
| 337 reading_selection_reply = requestor; | |
| 338 reading_which_selection = selection_atom; | |
| 339 selection_reply_timed_out = 0; | |
| 340 | |
| 341 speccount = specpdl_depth (); | |
| 342 | |
| 343 #if 0 | |
| 344 /* add a timeout handler */ | |
| 345 if (gtk_selection_timeout > 0) | |
| 346 { | |
| 347 Lisp_Object id = Fadd_timeout (make_int (x_selection_timeout), | |
| 348 Qx_selection_reply_timeout_internal, | |
| 349 Qnil, Qnil); | |
| 350 record_unwind_protect (Fdisable_timeout, id); | |
| 351 } | |
| 352 #endif | |
| 353 | |
| 354 /* This is ^Gable */ | |
| 355 wait_delaying_user_input (selection_reply_done, 0); | |
| 356 | |
| 357 if (selection_reply_timed_out) | |
| 563 | 358 signal_error (Qselection_conversion_error, "timed out waiting for reply from selection owner", Qunbound); |
| 462 | 359 |
| 771 | 360 unbind_to (speccount); |
| 462 | 361 |
| 362 /* otherwise, the selection is waiting for us on the requested property. */ | |
| 363 return select_convert_in (selection_symbol, | |
| 364 target_type, | |
| 365 Vretrieved_selection); | |
| 366 } | |
| 367 | |
| 368 | |
| 369 #if 0 | |
| 370 static void | |
| 371 gtk_get_window_property (struct device *d, GtkWidget *window, GdkAtom property, | |
| 372 Extbyte **data_ret, int *bytes_ret, | |
| 373 GdkAtom *actual_type_ret, int *actual_format_ret, | |
| 374 unsigned long *actual_size_ret, int delete_p) | |
| 375 { | |
| 647 | 376 /* deleted */ |
| 462 | 377 } |
| 378 | |
| 379 | |
| 380 static void | |
| 381 receive_incremental_selection (Display *display, Window window, Atom property, | |
| 382 /* this one is for error messages only */ | |
| 383 Lisp_Object target_type, | |
| 384 unsigned int min_size_bytes, | |
| 385 Extbyte **data_ret, int *size_bytes_ret, | |
| 386 Atom *type_ret, int *format_ret, | |
| 387 unsigned long *size_ret) | |
| 388 { | |
| 647 | 389 /* deleted */ |
| 462 | 390 } |
| 391 | |
| 392 | |
| 393 static Lisp_Object | |
| 394 gtk_get_window_property_as_lisp_data (struct device *d, | |
| 395 GtkWidget *window, | |
| 396 GdkAtom property, | |
| 397 /* next two for error messages only */ | |
| 398 Lisp_Object target_type, | |
| 399 GdkAtom selection_atom) | |
| 400 { | |
| 647 | 401 /* deleted */ |
| 462 | 402 } |
| 403 #endif | |
| 404 | |
| 405 | |
| 406 | |
| 407 static Lisp_Object | |
| 2286 | 408 gtk_own_selection (Lisp_Object selection_name, |
| 409 Lisp_Object UNUSED (selection_value), | |
| 410 Lisp_Object UNUSED (how_to_add), | |
| 411 Lisp_Object UNUSED (selection_type), int UNUSED (owned_p)) | |
| 462 | 412 { |
| 413 struct device *d = decode_gtk_device (Qnil); | |
| 414 GtkWidget *selecting_window = GTK_WIDGET (DEVICE_GTK_APP_SHELL (d)); | |
| 415 /* Use the time of the last-read mouse or keyboard event. | |
| 416 For selection purposes, we use this as a sleazy way of knowing what the | |
| 417 current time is in server-time. This assumes that the most recently read | |
| 418 mouse or keyboard event has something to do with the assertion of the | |
| 419 selection, which is probably true. | |
| 420 */ | |
| 421 guint32 thyme = DEVICE_GTK_MOUSE_TIMESTAMP (d); | |
| 422 GdkAtom selection_atom; | |
| 423 | |
| 424 CHECK_SYMBOL (selection_name); | |
| 425 selection_atom = symbol_to_gtk_atom (d, selection_name, 0); | |
| 426 | |
| 427 gtk_selection_owner_set (selecting_window, | |
| 428 selection_atom, | |
| 429 thyme); | |
| 430 | |
| 2620 | 431 /* [[ We do NOT use time_to_lisp() here any more, like we used to. |
| 462 | 432 That assumed equivalence of time_t and Time, which is not |
| 433 necessarily the case (e.g. under OSF on the Alphas, where | |
| 434 Time is a 64-bit quantity and time_t is a 32-bit quantity). | |
| 435 | |
| 2620 | 436 Opaque pointers are the clean way to go here. ]] |
| 437 | |
| 438 See my comment on the same issue in select-x.c -- Aidan. */ | |
| 793 | 439 return make_opaque (&thyme, sizeof (thyme)); |
| 462 | 440 } |
| 441 | |
| 442 static void | |
| 443 gtk_disown_selection (Lisp_Object selection, Lisp_Object timeval) | |
| 444 { | |
| 445 struct device *d = decode_gtk_device (Qnil); | |
| 446 GdkAtom selection_atom; | |
| 447 guint32 timestamp; | |
| 448 | |
| 449 CHECK_SYMBOL (selection); | |
| 450 selection_atom = symbol_to_gtk_atom (d, selection, 0); | |
| 451 | |
| 452 if (NILP (timeval)) | |
| 453 timestamp = DEVICE_GTK_MOUSE_TIMESTAMP (d); | |
| 454 else | |
| 455 { | |
| 456 time_t the_time; | |
| 457 lisp_to_time (timeval, &the_time); | |
| 458 timestamp = (guint32) the_time; | |
| 459 } | |
| 460 | |
| 461 gtk_selection_owner_set (NULL, selection_atom, timestamp); | |
| 462 } | |
| 463 | |
| 464 static Lisp_Object | |
| 465 gtk_selection_exists_p (Lisp_Object selection, | |
| 2286 | 466 Lisp_Object UNUSED (selection_type)) |
| 462 | 467 { |
| 468 struct device *d = decode_gtk_device (Qnil); | |
| 469 | |
| 470 return (gdk_selection_owner_get (symbol_to_gtk_atom (d, selection, 0)) ? Qt : Qnil); | |
| 471 } | |
| 472 | |
| 473 | |
| 474 | |
| 475 /************************************************************************/ | |
| 476 /* initialization */ | |
| 477 /************************************************************************/ | |
| 478 | |
| 479 void | |
| 480 syms_of_select_gtk (void) | |
| 481 { | |
| 482 } | |
| 483 | |
| 484 void | |
| 485 console_type_create_select_gtk (void) | |
| 486 { | |
| 487 CONSOLE_HAS_METHOD (gtk, own_selection); | |
| 488 CONSOLE_HAS_METHOD (gtk, disown_selection); | |
| 489 CONSOLE_HAS_METHOD (gtk, selection_exists_p); | |
| 490 CONSOLE_HAS_METHOD (gtk, get_foreign_selection); | |
| 491 } | |
| 492 | |
| 493 void | |
| 494 vars_of_select_gtk (void) | |
| 495 { | |
| 496 staticpro (&Vretrieved_selection); | |
| 497 Vretrieved_selection = Qnil; | |
| 498 | |
| 499 DEFVAR_LISP ("gtk-sent-selection-hooks", &Vgtk_sent_selection_hooks /* | |
| 500 A function or functions to be called after we have responded to some | |
| 501 other client's request for the value of a selection that we own. The | |
| 502 function(s) will be called with four arguments: | |
| 503 - the name of the selection (typically PRIMARY, SECONDARY, or CLIPBOARD); | |
| 504 - the name of the selection-type which we were requested to convert the | |
| 505 selection into before sending (for example, STRING or LENGTH); | |
| 506 - and whether we successfully transmitted the selection. | |
| 507 We might have failed (and declined the request) for any number of reasons, | |
| 508 including being asked for a selection that we no longer own, or being asked | |
| 509 to convert into a type that we don't know about or that is inappropriate. | |
| 510 This hook doesn't let you change the behavior of emacs's selection replies, | |
| 511 it merely informs you that they have happened. | |
| 512 */ ); | |
| 513 Vgtk_sent_selection_hooks = Qunbound; | |
| 514 } |