#include "lisp.h"
#include "w32term.h" /* for all of the w32 includes */
#include "dispextern.h" /* frame.h seems to want this */
+#include "keyboard.h"
#include "frame.h" /* Need this to get the X window of selected_frame */
#include "blockinput.h"
#include "buffer.h"
clipboard. */
static Lisp_Object Vselection_coding_system;
-/* Coding system for the next communicating with other X clients. */
+/* Coding system for the next communicating with other Windows programs. */
static Lisp_Object Vnext_selection_coding_system;
+/* The last text we put into the clipboard. This is used to prevent
+ passing back our own text from the clipboard, instead of using the
+ kill ring. The former is undesirable because the clipboard data
+ could be MULEtilated by inappropriately chosen
+ (next-)selection-coding-system. For this reason, we must store the
+ text *after* it was encoded/Unix-to-DOS-converted. */
+static unsigned char *last_clipboard_text = NULL;
+static size_t clipboard_storage_size = 0;
+
#if 0
DEFUN ("w32-open-clipboard", Fw32_open_clipboard, Sw32_open_clipboard, 0, 1, 0,
- "This opens the clipboard with the given frame pointer.")
+ doc: /* This opens the clipboard with the given frame pointer. */)
(frame)
Lisp_Object frame;
{
BOOL ok = FALSE;
if (!NILP (frame))
- CHECK_LIVE_FRAME (frame, 0);
+ CHECK_LIVE_FRAME (frame);
BLOCK_INPUT;
return (ok ? frame : Qnil);
}
-DEFUN ("w32-empty-clipboard", Fw32_empty_clipboard, Sw32_empty_clipboard, 0, 0, 0,
- "This empties the clipboard and assigns ownership to the window which opened the clipboard.")
+DEFUN ("w32-empty-clipboard", Fw32_empty_clipboard,
+ Sw32_empty_clipboard, 0, 0, 0,
+ doc: /* Empty the clipboard.
+Assigns ownership of the clipboard to the window which opened it. */)
()
{
BOOL ok = FALSE;
return (ok ? Qt : Qnil);
}
-DEFUN ("w32-close-clipboard", Fw32_close_clipboard, Sw32_close_clipboard, 0, 0, 0,
- "This closes the clipboard.")
+DEFUN ("w32-close-clipboard", Fw32_close_clipboard,
+ Sw32_close_clipboard, 0, 0, 0,
+ doc: /* Close the clipboard. */)
()
{
BOOL ok = FALSE;
#endif
-DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, Sw32_set_clipboard_data, 1, 2, 0,
- "This sets the clipboard data to the given text.")
+DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
+ Sw32_set_clipboard_data, 1, 2, 0,
+ doc: /* This sets the clipboard data to the given text. */)
(string, frame)
Lisp_Object string, frame;
{
unsigned char *src;
unsigned char *dst;
- CHECK_STRING (string, 0);
+ CHECK_STRING (string);
if (!NILP (frame))
- CHECK_LIVE_FRAME (frame, 0);
+ CHECK_LIVE_FRAME (frame);
BLOCK_INPUT;
{
/* Since we are now handling multilingual text, we must consider
encoding text for the clipboard. */
- int charsets[MAX_CHARSET + 1];
- int num;
-
- bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
- num = ((nbytes <= 1 /* Check the possibility of short cut. */
- || !STRING_MULTIBYTE (string)
- || nbytes == XSTRING (string)->size)
- ? 0
- : find_charset_in_str (src, nbytes, charsets, Qnil, 1));
+ int charset_info = find_charset_in_text (src, XSTRING (string)->size,
+ nbytes, NULL, Qnil);
- if (!num || (num == 1 && charsets[CHARSET_ASCII]))
+ if (charset_info == 0)
{
/* No multibyte character in OBJ. We need not encode it. */
}
else
{
- /* We must encode contents of OBJ to compound text format.
- The format is compatible with what the target `STRING'
- expects if OBJ contains only ASCII and Latin-1
- characters. */
+ /* We must encode contents of OBJ to the selection coding
+ system. */
int bufsize;
struct coding_system coding;
HANDLE htext2;
Vnext_selection_coding_system = Vselection_coding_system;
setup_coding_system
(Fcheck_coding_system (Vnext_selection_coding_system), &coding);
+ coding.src_multibyte = 1;
+ coding.dst_multibyte = 0;
Vnext_selection_coding_system = Qnil;
coding.mode |= CODING_MODE_LAST_BLOCK;
bufsize = encoding_buffer_size (&coding, nbytes);
goto error;
encode_coding (&coding, src, dst, nbytes, bufsize);
Vlast_coding_system_used = coding.symbol;
+
+ /* Stash away the data we are about to put into the clipboard, so we
+ could later check inside Fw32_get_clipboard_data whether
+ the clipboard still holds our data. */
+ if (clipboard_storage_size < coding.produced)
+ {
+ clipboard_storage_size = coding.produced + 100;
+ last_clipboard_text = (char *) xrealloc (last_clipboard_text,
+ clipboard_storage_size);
+ }
+ if (last_clipboard_text)
+ memcpy (last_clipboard_text, dst, coding.produced);
+
GlobalUnlock (htext);
+
/* Shrink data block to actual size. */
- htext2 = GlobalReAlloc (htext, coding.produced, GMEM_MOVEABLE | GMEM_DDESHARE);
+ htext2 = GlobalReAlloc (htext, coding.produced,
+ GMEM_MOVEABLE | GMEM_DDESHARE);
if (htext2 != NULL) htext = htext2;
}
}
if (!OpenClipboard ((!NILP (frame) && FRAME_W32_P (XFRAME (frame))) ? FRAME_W32_WINDOW (XFRAME (frame)) : NULL))
goto error;
-
+
ok = EmptyClipboard () && SetClipboardData (CF_TEXT, htext);
CloseClipboard ();
ok = FALSE;
if (htext) GlobalFree (htext);
-
+ if (last_clipboard_text)
+ *last_clipboard_text = '\0';
+
done:
UNBLOCK_INPUT;
return (ok ? string : Qnil);
}
-DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data, Sw32_get_clipboard_data, 0, 1, 0,
- "This gets the clipboard data in text format.")
+DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data,
+ Sw32_get_clipboard_data, 0, 1, 0,
+ doc: /* This gets the clipboard data in text format. */)
(frame)
Lisp_Object frame;
{
Lisp_Object ret = Qnil;
if (!NILP (frame))
- CHECK_LIVE_FRAME (frame, 0);
+ CHECK_LIVE_FRAME (frame);
BLOCK_INPUT;
nbytes = strlen (src);
+ /* If the text in clipboard is identical to what we put there
+ last time w32_set_clipboard_data was called, pretend there's no
+ data in the clipboard. This is so we don't pass our own text
+ from the clipboard (which might be troublesome if the killed
+ text includes null characters). */
+ if (last_clipboard_text
+ && clipboard_storage_size >= nbytes
+ && memcmp(last_clipboard_text, src, nbytes) == 0)
+ goto closeclip;
+
if (
#if 1
1
Vnext_selection_coding_system = Vselection_coding_system;
setup_coding_system
(Fcheck_coding_system (Vnext_selection_coding_system), &coding);
+ coding.src_multibyte = 0;
+ coding.dst_multibyte = 1;
Vnext_selection_coding_system = Qnil;
coding.mode |= CODING_MODE_LAST_BLOCK;
bufsize = decoding_buffer_size (&coding, nbytes);
buf = (unsigned char *) xmalloc (bufsize);
decode_coding (&coding, src, buf, nbytes, bufsize);
Vlast_coding_system_used = coding.symbol;
- truelen = (coding.fake_multibyte
- ? multibyte_chars_in_text (buf, coding.produced)
- : coding.produced_char);
- ret = make_string_from_bytes ((char *) buf, truelen, coding.produced);
+ ret = make_string_from_bytes ((char *) buf,
+ coding.produced_char, coding.produced);
xfree (buf);
}
else
/* Support checking for a clipboard selection. */
DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
- 0, 1, 0,
- "Whether there is an owner for the given X Selection.\n\
-The arg should be the name of the selection in question, typically one of\n\
-the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.\n\
-\(Those are literal upper-case symbol names, since that's what X expects.)\n\
-For convenience, the symbol nil is the same as `PRIMARY',\n\
-and t is the same as `SECONDARY'.")
+ 0, 1, 0,
+ doc: /* Whether there is an owner for 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, since that's what X expects.)
+For convenience, the symbol nil is the same as `PRIMARY',
+and t is the same as `SECONDARY'. */)
(selection)
Lisp_Object selection;
{
- CHECK_SYMBOL (selection, 0);
+ CHECK_SYMBOL (selection);
/* Return nil for PRIMARY and SECONDARY selections; for CLIPBOARD, check
if the clipboard currently has valid text format contents. */
defsubr (&Sx_selection_exists_p);
DEFVAR_LISP ("selection-coding-system", &Vselection_coding_system,
- "Coding system for communicating with other X clients.\n\
-When sending or receiving text via cut_buffer, selection, and clipboard,\n\
-the text is encoded or decoded by this coding system.\n\
-A default value is `compound-text'");
+ doc: /* Coding system for communicating with other programs.
+When sending or receiving text via cut_buffer, selection, and clipboard,
+the text is encoded or decoded by this coding system. */);
Vselection_coding_system=intern ("iso-latin-1-dos");
DEFVAR_LISP ("next-selection-coding-system", &Vnext_selection_coding_system,
- "Coding system for the next communication with other X clients.\n\
-Usually, `selection-coding-system' is used for communicating with\n\
-other X clients. But, if this variable is set, it is used for the\n\
-next communication only. After the communication, this variable is\n\
-set to nil.");
+ doc: /* Coding system for the next communication with other programs.
+Usually, `selection-coding-system' is used for communicating with
+other programs. But, if this variable is set, it is used for the
+next communication only. After the communication, this variable is
+set to nil. */);
Vnext_selection_coding_system = Qnil;
QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD);
HCoop / bpt / emacs.git / blobdiff