X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/35cf62d95cdcd5323dcea4a5385942c342ff1d9c..3fa2054efdfa3c22456072254e6c67682a595233:/src/nsselect.m diff --git a/src/nsselect.m b/src/nsselect.m index 5741236c98..d95ff79987 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -1,6 +1,6 @@ /* NeXT/Open/GNUstep / MacOSX Cocoa selection processing for emacs. - Copyright (C) 1993-1994, 2005-2006, 2008-2012 - Free Software Foundation, Inc. + Copyright (C) 1993-1994, 2005-2006, 2008-2013 Free Software + Foundation, Inc. This file is part of GNU Emacs. @@ -28,7 +28,6 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu) /* This should be the first include, as it may set up #defines affecting interpretation of even the system includes. */ #include -#include #include "lisp.h" #include "nsterm.h" @@ -62,7 +61,7 @@ symbol_to_nsstring (Lisp_Object sym) if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; if (EQ (sym, QTEXT)) return NSStringPboardType; - return [NSString stringWithUTF8String: SDATA (XSYMBOL (sym)->xname)]; + return [NSString stringWithUTF8String: SSDATA (SYMBOL_NAME (sym))]; } static NSPasteboard * @@ -118,7 +117,7 @@ clean_local_selection_data (Lisp_Object obj) if (size == 1) return clean_local_selection_data (AREF (obj, 0)); - copy = Fmake_vector (make_number (size), Qnil); + copy = make_uninit_vector (size); for (i = 0; i < size; i++) ASET (copy, i, clean_local_selection_data (AREF (obj, i))); return copy; @@ -157,7 +156,7 @@ ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype) CHECK_STRING (str); - utfStr = SDATA (str); + utfStr = SSDATA (str); nsStr = [[NSString alloc] initWithBytesNoCopy: utfStr length: SBYTES (str) encoding: NSUTF8StringEncoding @@ -183,7 +182,7 @@ ns_get_local_selection (Lisp_Object selection_name, Lisp_Object target_type) { Lisp_Object local_value; - Lisp_Object handler_fn, value, type, check; + Lisp_Object handler_fn, value, check; ptrdiff_t count; local_value = assq_no_quit (selection_name, Vselection_alist); @@ -204,7 +203,6 @@ ns_get_local_selection (Lisp_Object selection_name, check = value; if (CONSP (value) && SYMBOLP (XCAR (value))) { - type = XCAR (value); check = XCDR (value); } @@ -221,9 +219,10 @@ ns_get_local_selection (Lisp_Object selection_name, return value; // FIXME: Why `quit' rather than `error'? - Fsignal (Qquit, Fcons (build_string ( - "invalid data returned by selection-conversion function"), - Fcons (handler_fn, Fcons (value, Qnil)))); + Fsignal (Qquit, + list3 (build_string ("invalid data returned by" + " selection-conversion function"), + handler_fn, value)); // FIXME: Beware, `quit' can return!! return Qnil; } @@ -258,8 +257,7 @@ ns_string_from_pasteboard (id pb) if (type == nil) { Fsignal (Qquit, - Fcons (build_string ("empty or unsupported pasteboard type"), - Qnil)); + list1 (build_string ("empty or unsupported pasteboard type"))); return Qnil; } @@ -277,8 +275,8 @@ ns_string_from_pasteboard (id pb) else { Fsignal (Qquit, - Fcons (build_string ("pasteboard doesn't contain valid data"), - Qnil)); + list1 (build_string ("pasteboard doesn't contain" + " valid data"))); return Qnil; } } @@ -296,7 +294,7 @@ ns_string_from_pasteboard (id pb) utfStr = [mstr UTF8String]; length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; -#if ! defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 +#if ! defined (NS_IMPL_COCOA) if (!utfStr) { utfStr = [mstr cString]; @@ -307,7 +305,7 @@ ns_string_from_pasteboard (id pb) NS_HANDLER { message1 ("ns_string_from_pasteboard: UTF8String failed\n"); -#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 +#if defined (NS_IMPL_COCOA) utfStr = "Conversion failed"; #else utfStr = [str lossyCString]; @@ -336,12 +334,18 @@ ns_string_to_pasteboard (id pb, Lisp_Object str) DEFUN ("x-own-selection-internal", Fx_own_selection_internal, - Sx_own_selection_internal, 2, 2, 0, - doc: /* Assert a selection. -SELECTION-NAME is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. + Sx_own_selection_internal, 2, 3, 0, + doc: /* Assert an X selection of type SELECTION and value VALUE. +SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. +\(Those are literal upper-case symbol names, since that's what X expects.) VALUE is typically a string, or a cons of two markers, but may be -anything that the functions on `selection-converter-alist' know about. */) - (Lisp_Object selection_name, Lisp_Object selection_value) +anything that the functions on `selection-converter-alist' know about. + +FRAME should be a frame that should own the selection. If omitted or +nil, it defaults to the selected frame. + +On Nextstep, FRAME is unused. */) + (Lisp_Object selection, Lisp_Object value, Lisp_Object frame) { id pb; Lisp_Object old_value, new_value; @@ -349,17 +353,16 @@ anything that the functions on `selection-converter-alist' know about. */) Lisp_Object successful_p = Qnil, rest; Lisp_Object target_symbol, data; - - check_ns (); - CHECK_SYMBOL (selection_name); - if (NILP (selection_value)) - error ("selection-value may not be nil."); - pb = ns_symbol_to_pb (selection_name); + check_window_system (NULL); + CHECK_SYMBOL (selection); + if (NILP (value)) + error ("selection value may not be nil."); + pb = ns_symbol_to_pb (selection); if (pb == nil) return Qnil; ns_declare_pasteboard (pb); - old_value = assq_no_quit (selection_name, Vselection_alist); - new_value = Fcons (selection_name, Fcons (selection_value, Qnil)); + old_value = assq_no_quit (selection, Vselection_alist); + new_value = list2 (selection, value); if (NILP (old_value)) Vselection_alist = Fcons (new_value, Vselection_alist); @@ -369,7 +372,7 @@ anything that the functions on `selection-converter-alist' know about. */) /* We only support copy of text. */ type = NSStringPboardType; target_symbol = ns_string_to_symbol (type); - data = ns_get_local_selection (selection_name, target_symbol); + data = ns_get_local_selection (selection, target_symbol); if (!NILP (data)) { if (STRINGP (data)) @@ -380,64 +383,86 @@ anything that the functions on `selection-converter-alist' know about. */) if (!EQ (Vns_sent_selection_hooks, Qunbound)) { for (rest = Vns_sent_selection_hooks; CONSP (rest); rest = Fcdr (rest)) - call3 (Fcar (rest), selection_name, target_symbol, successful_p); + call3 (Fcar (rest), selection, target_symbol, successful_p); } - - return selection_value; + + return value; } DEFUN ("x-disown-selection-internal", Fx_disown_selection_internal, - Sx_disown_selection_internal, 1, 2, 0, - doc: /* If we own the selection SELECTION, disown it. */) - (Lisp_Object selection_name, Lisp_Object time) + Sx_disown_selection_internal, 1, 3, 0, + doc: /* If we own the selection SELECTION, disown it. +Disowning it means there is no such selection. + +Sets the last-change time for the selection to TIME-OBJECT (by default +the time of the last event). + +TERMINAL should be a terminal object or a frame specifying the X +server to query. If omitted or nil, that stands for the selected +frame's display, or the first available X display. + +On Nextstep, the TIME-OBJECT and TERMINAL arguments are unused. +On MS-DOS, all this does is return non-nil if we own the selection. */) + (Lisp_Object selection, Lisp_Object time_object, Lisp_Object terminal) { id pb; - check_ns (); - CHECK_SYMBOL (selection_name); - if (NILP (assq_no_quit (selection_name, Vselection_alist))) return Qnil; + check_window_system (NULL); + CHECK_SYMBOL (selection); + if (NILP (assq_no_quit (selection, Vselection_alist))) return Qnil; - pb = ns_symbol_to_pb (selection_name); + pb = ns_symbol_to_pb (selection); if (pb != nil) ns_undeclare_pasteboard (pb); return Qt; } DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p, - 0, 1, 0, doc: /* Whether there is an owner for the given selection. -The arg should be the name of the selection in question, typically one of -the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names.) -For convenience, the symbol nil is the same as `PRIMARY', -and t is the same as `SECONDARY'.) */) - (Lisp_Object selection) + 0, 2, 0, doc: /* Whether there is an owner for the given X selection. +SELECTION should be the name of the selection in question, typically +one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. (X expects +these literal upper-case names.) The symbol nil is the same as +`PRIMARY', and t is the same as `SECONDARY'. + +TERMINAL should be a terminal object or a frame specifying the X +server to query. If omitted or nil, that stands for the selected +frame's display, or the first available X display. + +On Nextstep, TERMINAL is unused. */) + (Lisp_Object selection, Lisp_Object terminal) { id pb; NSArray *types; - check_ns (); + check_window_system (NULL); CHECK_SYMBOL (selection); if (EQ (selection, Qnil)) selection = QPRIMARY; if (EQ (selection, Qt)) selection = QSECONDARY; pb = ns_symbol_to_pb (selection); if (pb == nil) return Qnil; - + types = [pb types]; return ([types count] == 0) ? Qnil : Qt; } DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p, - 0, 1, 0, - doc: /* Whether the current Emacs process owns the given selection. + 0, 2, 0, + doc: /* Whether the current Emacs process owns the given X Selection. The arg should be the name of the selection in question, typically one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names.) +\(Those are literal upper-case symbol names, since that's what X expects.) For convenience, the symbol nil is the same as `PRIMARY', -and t is the same as `SECONDARY'.) */) - (Lisp_Object selection) +and t is the same as `SECONDARY'. + +TERMINAL should be a terminal object or a frame specifying the X +server to query. If omitted or nil, that stands for the selected +frame's display, or the first available X display. + +On Nextstep, TERMINAL is unused. */) + (Lisp_Object selection, Lisp_Object terminal) { - check_ns (); + check_window_system (NULL); CHECK_SYMBOL (selection); if (EQ (selection, Qnil)) selection = QPRIMARY; if (EQ (selection, Qt)) selection = QSECONDARY; @@ -446,16 +471,26 @@ and t is the same as `SECONDARY'.) */) DEFUN ("x-get-selection-internal", Fx_get_selection_internal, - Sx_get_selection_internal, 2, 2, 0, - doc: /* Return text selected from some pasteboard. -SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. -\(Those are literal upper-case symbol names.) -TYPE is the type of data desired, typically `STRING'. */) - (Lisp_Object selection_name, Lisp_Object target_type) + Sx_get_selection_internal, 2, 4, 0, + doc: /* Return text selected from some X window. +SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. +\(Those are literal upper-case symbol names, since that's what X expects.) +TARGET-TYPE is the type of data desired, typically `STRING'. + +TIME-STAMP is the time to use in the XConvertSelection call for foreign +selections. If omitted, defaults to the time for the last event. + +TERMINAL should be a terminal object or a frame specifying the X +server to query. If omitted or nil, that stands for the selected +frame's display, or the first available X display. + +On Nextstep, TIME-STAMP and TERMINAL are unused. */) + (Lisp_Object selection_name, Lisp_Object target_type, + Lisp_Object time_stamp, Lisp_Object terminal) { Lisp_Object val; - check_ns (); + check_window_system (NULL); CHECK_SYMBOL (selection_name); CHECK_SYMBOL (target_type); val = ns_get_local_selection (selection_name, target_type); @@ -479,7 +514,7 @@ SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. */) (Lisp_Object selection) { id pb; - check_ns (); + check_window_system (NULL); pb = ns_symbol_to_pb (selection); return pb != nil ? ns_string_from_pasteboard (pb) : Qnil; } @@ -492,7 +527,7 @@ SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. */) (Lisp_Object selection, Lisp_Object string) { id pb; - check_ns (); + check_window_system (NULL); pb = ns_symbol_to_pb (selection); if (pb != nil) ns_string_to_pasteboard (pb, string); return Qnil;