X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fselect-x.c;h=2ab3161ee2687878ecdb576684d0e8ba01c788ec;hb=506a27d9690049e121fccf1a8947ec57e62055aa;hp=25bd52a87d49e43cacb5e49373c841c6c1cf3d49;hpb=caf1416adb403b6334ce635e58b269b6c653aa39;p=chise%2Fxemacs-chise.git.1

diff --git a/src/select-x.c b/src/select-x.c
index 25bd52a..2ab3161 100644
--- a/src/select-x.c
+++ b/src/select-x.c
@@ -46,7 +46,8 @@ Lisp_Object time_to_lisp (time_t);
 static void hack_motif_clipboard_selection (Atom selection_atom,
 					    Lisp_Object selection_value,
 					    Time thyme, Display *display,
-					    Window selecting_window);
+					    Window selecting_window,
+					    int owned_p);
 #endif
 
 #define CUT_BUFFER_SUPPORT
@@ -72,7 +73,10 @@ Lisp_Object Vx_sent_selection_hooks;
 /* If the selection owner takes too long to reply to a selection request,
    we give up on it.  This is in seconds (0 = no timeout).
  */
-int x_selection_timeout;
+Fixnum x_selection_timeout;
+
+/* Enable motif selection optimizations. */
+int x_selection_strict_motif_ownership;
 
 
 /* Utility functions */
@@ -201,7 +205,8 @@ x_atom_to_symbol (struct device *d, Atom atom)
  */
 static Lisp_Object
 x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value,
-		 Lisp_Object how_to_add, Lisp_Object selection_type)
+		 Lisp_Object how_to_add, Lisp_Object selection_type,
+		 int owned_p)
 {
   struct device *d = decode_x_device (Qnil);
   Display *display = DEVICE_X_DISPLAY (d);
@@ -233,7 +238,7 @@ x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value,
 
 #ifdef MOTIF_CLIPBOARDS
   hack_motif_clipboard_selection (selection_atom, selection_value,
-				  thyme, display, selecting_window);
+				  thyme, display, selecting_window, owned_p);
 #endif
   return selection_time;
 }
@@ -249,8 +254,8 @@ hack_motif_clipboard_selection (Atom selection_atom,
 				Lisp_Object selection_value,
 				Time thyme,
 				Display *display,
-				Window selecting_window)
-     /*				Bool owned_p)*/
+				Window selecting_window,
+				int owned_p)
 {
   struct device *d = get_device_from_display (display);
   /* Those Motif wankers can't be bothered to follow the ICCCM, and do
@@ -270,7 +275,10 @@ hack_motif_clipboard_selection (Atom selection_atom,
 	 to look up the new value, and you can't Copy from a buffer, Paste
 	 into a text field, then Copy something else from the buffer and
 	 paste it into the text field -- it pastes the first thing again. */
-/*      && !owned_p */
+      && (!owned_p 
+	  /* Selectively re-enable this because for most users its
+	     just too painful - especially over a remote link. */
+	  || x_selection_strict_motif_ownership)
       )
     {
 #ifdef MOTIF_INCREMENTAL_CLIPBOARDS_WORK
@@ -374,7 +382,7 @@ motif_clipboard_cb (Widget widget, int *data_id, int *private_id, int *reason)
 	Window window = (Window) *private_id;
 	Lisp_Object selection = select_convert_out (QCLIPBOARD, Qnil, Qnil);
 
-	/* Whichever lazy git wrote this originally just called abort()
+	/* Whichever lazy git wrote this originally just called ABORT()
 	   when anything didn't go their way... */
 
 	/* Try some other text types */
@@ -501,14 +509,41 @@ x_reply_selection_request (XSelectionRequestEvent *event, int format,
     }
   else
     {
+#ifndef HAVE_XTREGISTERDRAWABLE
+      invalid_operation("Copying that much data requires X11R6.", Qunbound);
+#else
       /* Send an INCR selection. */
       int prop_id;
+      Widget widget = FRAME_X_TEXT_WIDGET (XFRAME(DEVICE_SELECTED_FRAME(d)));
 
       if (x_window_to_frame (d, window)) /* #### debug */
 	error ("attempt to transfer an INCR to ourself!");
 #if 0
       stderr_out ("\nINCR %d\n", bytes_remaining);
 #endif
+      /* Tell Xt not to drop PropertyNotify events that arrive for the
+	 target window, rather, pass them to us. This would be a hack, but
+	 the Xt selection routines are broken for our purposes--we can't
+	 pass them callbacks from Lisp, for example. Let's call it a
+	 workaround.
+ 
+	 The call to wait_for_property_change means we can break out of that
+	 function, switch to another frame on the same display (which will
+	 be another Xt widget), select a huge amount of text, and have the
+	 same (foreign) app ask for another incremental selection
+	 transfer. Programming like X11 made sense, would mean that, in that
+	 case, XtRegisterDrawable is called twice with different widgets.
+ 
+	 Since the results of calling XtRegisterDrawable when the drawable
+	 is already registered with another widget are undefined, we want to
+	 avoid that--so, only call it when XtWindowToWidget returns NULL,
+	 which it will only do with a valid Window if it's not already
+	 registered. */
+      if (NULL == XtWindowToWidget(display, window))
+      {
+	XtRegisterDrawable(display, (Drawable)window, widget);
+      }
+      
       prop_id = expect_property_change (display, window, reply.property,
 					PropertyDelete);
 
@@ -552,10 +587,14 @@ x_reply_selection_request (XSelectionRequestEvent *event, int format,
       stderr_out ("  INCR done\n");
 #endif
       if (! waiting_for_other_props_on_window (display, window))
-	XSelectInput (display, window, 0L);
+      {
+        XSelectInput (display, window, 0L);
+        XtUnregisterDrawable(display, (Drawable)window);
+      }
 
       XChangeProperty (display, window, reply.property, type, format,
 		       PropModeReplace, data, 0);
+#endif /* HAVE_XTREGISTERDRAWABLE */
     }
 }
 
@@ -1620,6 +1659,14 @@ Set the value of the named CUTBUFFER (typically CUT_BUFFER0) to STRING.
 	  continue;
 	}
 
+#ifdef UTF2000
+      if ((*ptr) <= 0xC3)
+	{
+	  chartypes = LATIN_1;
+	  ptr += 2;
+	  continue;
+	}
+#else
       if ((*ptr) == LEADING_BYTE_LATIN_ISO8859_1 ||
 	  (*ptr) == LEADING_BYTE_CONTROL_1)
 	{
@@ -1627,6 +1674,7 @@ Set the value of the named CUTBUFFER (typically CUT_BUFFER0) to STRING.
 	  ptr += 2;
 	  continue;
 	}
+#endif
 
       chartypes = WORLD;
       break;
@@ -1772,6 +1820,17 @@ A value of 0 means wait as long as necessary.  This is initialized from the
 \"*selectionTimeout\" resource (which is expressed in milliseconds).
 */ );
   x_selection_timeout = 0;
+
+  DEFVAR_BOOL ("x-selection-strict-motif-ownership", &x_selection_strict_motif_ownership /*
+*If nil and XEmacs already owns the clipboard, don't own it again in the
+Motif way. Owning the selection on the Motif way does a huge amount of
+X protocol, and it makes killing text incredibly slow when using an
+X terminal.  However, when enabled Motif text fields don't bother to look up
+the new value, and you can't Copy from a buffer, Paste into a text
+field, then Copy something else from the buffer and paste it into the
+text field; it pastes the first thing again.
+*/ );
+  x_selection_strict_motif_ownership = 1;
 }
 
 void