Changeset 192

Timestamp:

12/05/07 15:36:24 (1 year ago)

Author:

conrad

Message:

apply UTF-8 support patch by Sergey Kogan (Debian bug #231413)
This patch adds a -u, --utf8 option for reading utf8 input

Files:

• xsel/trunk/xsel.1x (modified) (2 diffs)
• xsel/trunk/xsel.c (modified) (14 diffs)

xsel/trunk/xsel.1x

@@ -81 +81 @@
-
-.PP
+\fBEncoding options\fR
+.TP
+\fB\-u\fR, \fB\-\-utf8\fR 
+Request selection in UTF8 if possible.
+This option is useful when working with selections in national
+(non Latin-1) charsets. If your X-server and target application
+support UTF8_STRING exchange, then selection is returned as
+UTF8 string. If your X-server doesn't support this extension,
+option has no effect. If target application doesn's support
+UTF8 selection target, empty selection is returned.
+
+.PP
-\fBX options\fR
-.TP
@@ -109 +121 @@
-debugging level, ie. print more information.
-.TP
-v\fR, \fB\-
+
-output version information and exit
-.PP

xsel/trunk/xsel.c

@@ -57 +57 @@
-static Atom null_atom; /* The NULL atom */
-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.
-
-
-
+
+
+
+
-
-/* do_follow: Follow mode for output */
@@ -109 +112 @@
-  printf ("  -d, --delete          Request that the selection be cleared and that\n");
-  printf ("                        the application owning it delete its contents\n\n");
+  printf ("Encoding options\n");
+  printf ("  -u, --utf8            Request selection in UTF-8 if possible\n\n");
-  printf ("Selection options\n");
-  printf ("  -p, --primary         Operate on the PRIMARY selection (default)\n");
@@ -226 +231 @@
-  if (atom == null_atom) return "NULL";
-  if (atom == text_atom) return "TEXT";
+  if (utf8_atom!=XA_STRING && atom == utf8_atom) return "UTF8_STRING";
-  if (atom == XInternAtom (display, "XSEL_DATA", True)) return "XSEL_DATA";
-
@@ -598 +604 @@
-                                        *(int *)value);
-          keep_waiting = False;
-
+utf8_atom && target != 
-          /* Report non-TEXT atoms */
-          print_debug (D_WARN, "Selection (type %s) is not a string.",
@@ -1266 +1272 @@
-
-/*
+ * handle_utf8_string (display, requestor, property, sel)
+ *
+ * Handle a UTF8_STRING request; setting 'sel' as the data
+ */
+static HandleResult
+handle_utf8_string (Display * display, Window requestor, Atom property,
+               unsigned char * sel, Atom selection, Time time,
+               MultTrack * mparent)
+{
+  return
+    change_property (display, requestor, property, utf8_atom, 8,
+                     PropModeReplace, sel, strlen(sel),
+                     selection, time, mparent);
+}
+
+/*
- * handle_delete (display, requestor, property)
- *
@@ -1310 +1332 @@
-    } else if (mt->atoms[i] == XA_STRING || mt->atoms[i] == text_atom) {
-      retval |= handle_string (mt->display, mt->requestor, mt->atoms[i+1],
+                               mt->sel, mt->selection, mt->time, mt);
+    } else if (mt->atoms[i] == utf8_atom) {
+      retval |= handle_utf8_string (mt->display, mt->requestor, mt->atoms[i+1],
-                               mt->sel, mt->selection, mt->time, mt);
-    } else if (mt->atoms[i] == delete_atom) {
@@ -1482 +1507 @@
-    ev.property = xsr->property;
-    hr = handle_string (ev.display, ev.requestor, ev.property, sel,
+                        ev.selection, ev.time, NULL);
+  } else if (ev.target == utf8_atom) {
+    /* Received UTF8_STRING request */
+    ev.property = xsr->property;
+    hr = handle_utf8_string (ev.display, ev.requestor, ev.property, sel,
-                        ev.selection, ev.time, NULL);
-  } else if (ev.target == delete_atom) {
@@ -1695 +1725 @@
-  unsigned char * text1, * text2;
-
-XA_STRING
-XA_STRING
+local_target
+local_target
-
-  set_selection_pair__daemon (text1, text2);
@@ -1713 +1743 @@
-  unsigned char * text1, * text2;
-
-XA_STRING
-XA_STRING
+local_target
+local_target
-
-  set_selection_pair__daemon (text2, text1);
@@ -1753 +1783 @@
-  char * display_name = NULL;
-  long timeout_ms = 0L;
+  int need_utf8 = False;
-
-  progname = argv[0];
@@ -1778 +1809 @@
-      do_append = True;
-      dont_output = True;
+    } else if (OPT("--utf8") || OPT("-u")) {
+      need_utf8 = True;
-    } else if (OPT("--input") || OPT("-i")) {
-      do_input = True;
@@ -1880 +1913 @@
-    print_debug (D_WARN, "XA_SECONDARY not named \"SECONDARY\"\n");
-
+  NUM_TARGETS=0;
-  /* Get the TIMESTAMP atom */
-  timestamp_atom = XInternAtom (display, "TIMESTAMP", False);
-  supported_targets[s++] = timestamp_atom;
+  NUM_TARGETS++;
-
-  /* Get the MULTIPLE atom */
-  multiple_atom = XInternAtom (display, "MULTIPLE", False);
-  supported_targets[s++] = multiple_atom;
+  NUM_TARGETS++;
-
-  /* Get the TARGETS atom */
-  targets_atom = XInternAtom (display, "TARGETS", False);
-  supported_targets[s++] = targets_atom;
+  NUM_TARGETS++;
-
-  /* Get the DELETE atom */
-  delete_atom = XInternAtom (display, "DELETE", False);
-  supported_targets[s++] = delete_atom;
+  NUM_TARGETS++;
-
-  /* Get the INCR atom */
-  incr_atom = XInternAtom (display, "INCR", False);
-  supported_targets[s++] = incr_atom;
+  NUM_TARGETS++;
-
-  /* Get the NULL atom */
-  null_atom = XInternAtom (display, "NULL", False);
+  NUM_TARGETS++;
-
-  /* Get the TEXT atom */
-  text_atom = XInternAtom (display, "TEXT", False);
-  supported_targets[s++] = text_atom;
+  NUM_TARGETS++;
+
+  /* Get the UTF8_STRING atom */
+  utf8_atom = XInternAtom (display, "UTF8_STRING", True);
+  if( utf8_atom != None)
+    {
+    supported_targets[s++] = utf8_atom;
+    NUM_TARGETS++;
+    }
+  else
+    {
+    utf8_atom = XA_STRING;
+    }
-
-  supported_targets[s++] = XA_STRING;
-
+
+
+
+
+
+
+
+
+
+
-  /* handle selection keeping and exit if so */
-  if (do_keep) {
@@ -1929 +1991 @@
-  if (do_output || !dont_output) {
-    /* Get the current selection */
-XA_STRING
+local_target
-    if (old_sel) printf ("%s", old_sel);
-  }
@@ -1941 +2003 @@
-  else if (do_input || !dont_input) {
-    if (do_append) {
-XA_STRING
+local_target
-      new_sel = copy_sel (old_sel);
-    }