Changeset 199

Timestamp:

01/12/08 23:09:19 (1 year ago)

Author:

conrad

Message:

automatically determine whether or not the selection owner can handle
UTF8_STRING, rather than requiring the user to decide.

Files:

• xsel/trunk/xsel.c (modified) (12 diffs)

xsel/trunk/xsel.c

@@ -62 +62 @@
-static Atom text_atom; /* The TEXT atom */
-static Atom utf8_atom; /* The UTF8 atom */
-static Atom local_target; /* UTF8_STRING or STRING */
-
-/* Number of selection targets served by this.
@@ -629 +628 @@
-                                        *(int *)value);
-          keep_waiting = False;
-
+
+
-          /* Report non-TEXT atoms */
-          print_debug (D_WARN, "Selection (type %s) is not a string.",
@@ -705 +705 @@
-  return retval;
-}
+
+/*
+ * get_selection_text (Atom selection)
+ *
+ * Retrieve a text selection. First attempt to retrieve it as UTF_STRING,
+ * and if that fails attempt to retrieve it as a plain XA_STRING.
+ *
+ * NB. Before implementing this, an attempt was made to query TARGETS and
+ * request UTF8_STRING only if listed there, as described in:
+ * http://www.pps.jussieu.fr/~jch/software/UTF8_STRING/UTF8_STRING.text
+ * However, that did not seem to work reliably when tested against various
+ * applications (eg. Mozilla Firefox). This method is of course more
+ * reliable.
+ */
+static unsigned char *
+get_selection_text (Atom selection)
+{
+  unsigned char * retval;
+
+  if ((retval = get_selection (selection, utf8_atom)) == NULL)
+    retval = get_selection (selection, XA_STRING);
+
+  return retval;
+}
+
-
-/*
@@ -1303 +1328 @@
-static HandleResult
-handle_utf8_string (Display * display, Window requestor, Atom property,
-
-
+     
+     
-{
-  return
@@ -1360 +1385 @@
-    } else if (mt->atoms[i] == utf8_atom) {
-      retval |= handle_utf8_string (mt->display, mt->requestor, mt->atoms[i+1],
-
+     
-    } else if (mt->atoms[i] == delete_atom) {
-      retval |= handle_delete (mt->display, mt->requestor, mt->atoms[i+1]);
@@ -1537 +1562 @@
-    ev.property = xsr->property;
-    hr = handle_utf8_string (ev.display, ev.requestor, ev.property, sel,
-
+     
-  } else if (ev.target == delete_atom) {
-    /* Received DELETE request */
@@ -1750 +1775 @@
-  unsigned char * text1, * text2;
-
- (XA_PRIMARY, local_target
- (XA_SECONDARY, local_target
+_text (XA_PRIMARY
+_text (XA_SECONDARY
-
-  set_selection_pair__daemon (text1, text2);
@@ -1768 +1793 @@
-  unsigned char * text1, * text2;
-
- (XA_PRIMARY, local_target
- (XA_SECONDARY, local_target
+_text (XA_PRIMARY
+_text (XA_SECONDARY
-
-  set_selection_pair__daemon (text2, text1);
@@ -1945 +1970 @@
-
-  NUM_TARGETS=0;
+
-  /* Get the TIMESTAMP atom */
-  timestamp_atom = XInternAtom (display, "TIMESTAMP", False);
@@ -1991 +2017 @@
-  NUM_TARGETS++;
-
-  if( need_utf8 == True) {
-    local_target=utf8_atom;
-  } else {
-    local_target=XA_STRING;
-  }
-
-  /* handle selection keeping and exit if so */
-  if (do_keep) {
@@ -2017 +2037 @@
-  if (do_output || !dont_output) {
-    /* Get the current selection */
- (selection, local_target
+_text (selection
-    if (old_sel) printf ("%s", old_sel);
-  }
@@ -2029 +2049 @@
-  else if (do_input || !dont_input) {
-    if (do_append) {
- (selection, local_target
+_text (selection
-      new_sel = copy_sel (old_sel);
-    }