Changeset 3395

Timestamp:

08/12/04 22:47:02 (4 years ago)

Author:

miyoshi

Message:

(last_clipboard_text): New variable form Emacs CVS
HEAD.
(clipboard_storage_size): Ditto.
(Fw32_set_clipboard_data): Stash away the data we are about to put
into the clipboard. These codes are imported from Emacs CVS HEAD.
(Fw32_get_clipboard_data): If the text in clipboard is identical
to what we put there last time, pretend there's no data in the
clipboard. These codes are imported from Emacs CVS HEAD.

Files:

• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/mw32clpbd.c (modified) (4 diffs)

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2004-08-12  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32clpbd.c (last_clipboard_text): New variable form Emacs CVS
+        HEAD.
+        (clipboard_storage_size): Ditto.
+        (Fw32_set_clipboard_data): Stash away the data we are about to put
+        into the clipboard. These codes are imported from Emacs CVS HEAD.
+        (Fw32_get_clipboard_data): If the text in clipboard is identical
+        to what we put there last time, pretend there's no data in the
+        clipboard. These codes are imported from Emacs CVS HEAD.
+
-2004-08-11  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/mw32clpbd.c

@@ -47 +47 @@
-Lisp_Object Vw32_clipboard_coding_system;
-int mw32_mule_clipboard_format;
+
+/* The last text we put into the clipboard.  This is used when the OS
+   does not support sequence numbers (NT4, 95). It is undesirable to
+   use data put on the clipboard by Emacs 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;
-
-/* From w32select.c(GNU Emacs) */
@@ -102 +111 @@
-  lptext[size] = '\0';
-
+  /* 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 < size)
+    {
+      clipboard_storage_size = size + 100;
+      last_clipboard_text = (char *) xrealloc (last_clipboard_text,
+                                               clipboard_storage_size);
+    }
+  if (last_clipboard_text)
+    memcpy (last_clipboard_text, lptext, size);
+
-  GlobalUnlock (htext);
-
@@ -121 +143 @@
-  if (htext)
-    GlobalFree (htext);
+  if (last_clipboard_text)
+    *last_clipboard_text = '\0';
-
- done:
@@ -166 +190 @@
-    goto closeclip;
-            
+  nbytes = strlen (lptext);
+
+  /* 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, lptext, nbytes) == 0)
+    goto closeclip;
+
-  if (NILP (code))
-    code = Vw32_clipboard_coding_system;
-  setup_coding_system (Fcheck_coding_system (code), &coding);
-
-  nbytes = strlen (lptext);
-  bufsize = encoding_buffer_size (&coding, nbytes);
-  buf = (unsigned char*) xmalloc (bufsize);