Fix compiler warnings from OS X Lion: a missing #include and some

[sgt/utils] / xcopy / xcopy.c

diff --git a/xcopy/xcopy.c b/xcopy/xcopy.c
index 2ee43c6..bc5e329 100644 (file)
--- a/xcopy/xcopy.c
+++ b/xcopy/xcopy.c
@@ -10,6 +10,9 @@
 #include <math.h>
 #include <errno.h>
 #include <assert.h>
+#include <ctype.h>
+
+#include <unistd.h>
 
 #include <X11/X.h>
 #include <X11/Intrinsic.h>
@@ -409,22 +412,23 @@ int init_X(void) {
            /*
             * ICCCM-required cut buffer initialisation.
             */
+           static const unsigned char emptystring[] = {0};
            XChangeProperty(disp, root, XA_CUT_BUFFER0,
-                           XA_STRING, 8, PropModeAppend, "", 0);
+                           XA_STRING, 8, PropModeAppend, emptystring, 0);
            XChangeProperty(disp, root, XA_CUT_BUFFER1,
-                           XA_STRING, 8, PropModeAppend, "", 0);
+                           XA_STRING, 8, PropModeAppend, emptystring, 0);
            XChangeProperty(disp, root, XA_CUT_BUFFER2,
-                           XA_STRING, 8, PropModeAppend, "", 0);
+                           XA_STRING, 8, PropModeAppend, emptystring, 0);
            XChangeProperty(disp, root, XA_CUT_BUFFER3,
-                           XA_STRING, 8, PropModeAppend, "", 0);
+                           XA_STRING, 8, PropModeAppend, emptystring, 0);
            XChangeProperty(disp, root, XA_CUT_BUFFER4,
-                           XA_STRING, 8, PropModeAppend, "", 0);
+                           XA_STRING, 8, PropModeAppend, emptystring, 0);
            XChangeProperty(disp, root, XA_CUT_BUFFER5,
-                           XA_STRING, 8, PropModeAppend, "", 0);
+                           XA_STRING, 8, PropModeAppend, emptystring, 0);
            XChangeProperty(disp, root, XA_CUT_BUFFER6,
-                           XA_STRING, 8, PropModeAppend, "", 0);
+                           XA_STRING, 8, PropModeAppend, emptystring, 0);
            XChangeProperty(disp, root, XA_CUT_BUFFER7,
-                           XA_STRING, 8, PropModeAppend, "", 0);
+                           XA_STRING, 8, PropModeAppend, emptystring, 0);
            /*
             * Rotate the cut buffers and add our text in CUT_BUFFER0.
             */
@@ -519,6 +523,16 @@ Atom convert_sel_inner(Window requestor, Atom target, Atom property) {
 }
 
 Atom convert_sel_outer(Window requestor, Atom target, Atom property) {
+    /*
+     * ICCCM 2.2 says that obsolete clients requesting the selection
+     * request may not specify a property name under which they want
+     * the data written to their window; selection owners are
+     * encouraged to support such clients by reusing the selection
+     * target name as the property.
+     */
+    if (property == None)
+        property = target;
+
     if (target == multiple_atom) {
        /*
         * Support for the MULTIPLE selection type, since it's
@@ -530,7 +544,7 @@ Atom convert_sel_outer(Window requestor, Atom target, Atom property) {
        int size = sel_delta;
        Atom actual_type;
        int actual_format, i;
-       long nitems, bytes_after, nread;
+       unsigned long nitems, bytes_after, nread;
        unsigned char *data;
        Atom *adata;
 
@@ -557,7 +571,7 @@ Atom convert_sel_outer(Window requestor, Atom target, Atom property) {
 
        adata = (Atom *)data;
 
-       for (i = 0; i+1 < nitems; i += 2) {
+       for (i = 0; i+1 < (long)nitems; i += 2) {
             if (adata[i+1] != (Atom)None)   /* ICCCM says this isn't allowed */
                 adata[i+1] = convert_sel_inner(requestor, adata[i],
                                                adata[i+1]);
@@ -600,22 +614,27 @@ void run_X(void) {
                 return;
             }
         } else {
+            int have_ownership = True;
+
             switch (ev.type) {
               case SelectionClear:
                 /* Selection has been cleared by another app. */
-                return;
+                have_ownership = False;
+                break;
               case SelectionRequest:
-                e2.xselection.type = SelectionNotify;
-                e2.xselection.requestor = ev.xselectionrequest.requestor;
-                e2.xselection.selection = ev.xselectionrequest.selection;
-                e2.xselection.target = ev.xselectionrequest.target;
-                e2.xselection.time = ev.xselectionrequest.time;
-                e2.xselection.property =
-                   convert_sel_outer(ev.xselectionrequest.requestor,
-                                     ev.xselectionrequest.target,
-                                     ev.xselectionrequest.property);
-                XSendEvent (disp, ev.xselectionrequest.requestor,
-                           False, 0, &e2);
+                if (have_ownership) {
+                    e2.xselection.type = SelectionNotify;
+                    e2.xselection.requestor = ev.xselectionrequest.requestor;
+                    e2.xselection.selection = ev.xselectionrequest.selection;
+                    e2.xselection.target = ev.xselectionrequest.target;
+                    e2.xselection.time = ev.xselectionrequest.time;
+                    e2.xselection.property =
+                        convert_sel_outer(ev.xselectionrequest.requestor,
+                                          ev.xselectionrequest.target,
+                                          ev.xselectionrequest.property);
+                    XSendEvent (disp, ev.xselectionrequest.requestor,
+                                False, 0, &e2);
+                }
                 break;
               case PropertyNotify:
                 for (i = j = 0; i < nincrs; i++) {
@@ -654,6 +673,8 @@ void run_X(void) {
                 nincrs = j;
                 break;
             }
+            if (nincrs == 0 && !have_ownership)
+                return;
         }
     }
 }
@@ -670,7 +691,7 @@ void done_X(void) {
 void do_paste(Window window, Atom property, int cutbuffer) {
     Atom actual_type;
     int actual_format, i;
-    long nitems, bytes_after, nread;
+    unsigned long nitems, bytes_after, nread;
     unsigned char *data;
     int incremental = False;
     XEvent ev;