xemacs-beta: src/select-x.c comparison

comparison src/select-x.c @ 456:e7ef97881643 r21-2-43

Import from CVS: tag r21-2-43

author	cvs
date	Mon, 13 Aug 2007 11:41:24 +0200
parents	576fb035e263
children	c33ae14dd6d0

comparison

equal deleted inserted replaced

-:5b97c1cd6ed0
+:e7ef97881643
 #ifdef MOTIF_CLIPBOARDS
 # include <Xm/CutPaste.h>
 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
 #ifdef CUT_BUFFER_SUPPORT
 /* 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;
+/* Enable motif selection optimizations. */
+int x_selection_strict_motif_ownership;
 /* Utility functions */
 static void lisp_data_to_selection_data (struct device *,
 /* Do protocol to assert ourself as a selection owner.
 */
 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);
 struct frame *sel_frame = selected_frame ();
 Window selecting_window = XtWindow (FRAME_X_TEXT_WIDGET (sel_frame));
 */
 selection_time = make_opaque (&thyme, sizeof (thyme));
 #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;
 }
 #ifdef MOTIF_CLIPBOARDS /* Bend over baby.  Take it and like it. */
 static void
 hack_motif_clipboard_selection (Atom selection_atom,
 				Lisp_Object selection_value,
 				Time thyme,
 				Display *display,
-				Window selecting_window)
+				Window selecting_window,
-/*				Bool owned_p)*/
+				int owned_p)
 {
 struct device *d = get_device_from_display (display);
 /* Those Motif wankers can't be bothered to follow the ICCCM, and do
 their own non-Xlib non-Xt clipboard processing.  So we have to do
 this so that linked-in Motif widgets don't get themselves wedged.
 */
 /* No, this is no good, because then 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. */
-/*      && !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
 Widget widget = FRAME_X_TEXT_WIDGET (selected_frame());
 #endif
 If the selection owner doesn't reply in this many seconds, we give up.
 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 true 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
 Xatoms_of_select_x (struct device *d)
 {

Mercurial > hg > xemacs-beta

comparison src/select-x.c @ 456:e7ef97881643 r21-2-43