Launcher: Fix drag and drop

2017-09-02 12:39:40 +02:00
parent 14c3824632
commit 498b665c8a
6 changed files with 243 additions and 241 deletions
--- a/src/server.c
+++ b/src/server.c
@@ -131,110 +131,6 @@ const char *GetAtomName(Display *disp, Atom a)
        return XGetAtomName(disp, a);
 }

-// This fetches all the data from a property
-struct Property read_property(Display *disp, Window w, Atom property)
-{
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long bytes_after;
-    unsigned char *ret = 0;
-
-    int read_bytes = 1024;
-
-    // Keep trying to read the property until there are no
-    // bytes unread.
-    do {
-        if (ret != 0)
-            XFree(ret);
-        XGetWindowProperty(disp,
-                           w,
-                           property,
-                           0,
-                           read_bytes,
-                           False,
-                           AnyPropertyType,
-                           &actual_type,
-                           &actual_format,
-                           &nitems,
-                           &bytes_after,
-                           &ret);
-        read_bytes *= 2;
-    } while (bytes_after != 0);
-
-    fprintf(stderr, "tint2: DnD %s:%d: Property:\n", __FILE__, __LINE__);
-    fprintf(stderr, "tint2: DnD %s:%d: Actual type: %s\n", __FILE__, __LINE__, GetAtomName(disp, actual_type));
-    fprintf(stderr, "tint2: DnD %s:%d: Actual format: %d\n", __FILE__, __LINE__, actual_format);
-    fprintf(stderr, "tint2: DnD %s:%d: Number of items: %lu\n", __FILE__, __LINE__, nitems);
-
-    Property p;
-    p.data = ret;
-    p.format = actual_format;
-    p.nitems = nitems;
-    p.type = actual_type;
-
-    return p;
-}
-
-// This function takes a list of targets which can be converted to (atom_list, nitems)
-// and a list of acceptable targets with prioritees (datatypes). It returns the highest
-// entry in datatypes which is also in atom_list: ie it finds the best match.
-Atom pick_target_from_list(Display *disp, Atom *atom_list, int nitems)
-{
-    Atom to_be_requested = None;
-    int i;
-    for (i = 0; i < nitems; i++) {
-        const char *atom_name = GetAtomName(disp, atom_list[i]);
-        fprintf(stderr, "tint2: DnD %s:%d: Type %d = %s\n", __FILE__, __LINE__, i, atom_name);
-
-        // See if this data type is allowed and of higher priority (closer to zero)
-        // than the present one.
-        if (strcmp(atom_name, "STRING") == 0) {
-            to_be_requested = atom_list[i];
-        }
-    }
-
-    return to_be_requested;
-}
-
-// Finds the best target given up to three atoms provided (any can be None).
-// Useful for part of the Xdnd protocol.
-Atom pick_target_from_atoms(Display *disp, Atom t1, Atom t2, Atom t3)
-{
-    Atom atoms[3];
-    int n = 0;
-
-    if (t1 != None)
-        atoms[n++] = t1;
-
-    if (t2 != None)
-        atoms[n++] = t2;
-
-    if (t3 != None)
-        atoms[n++] = t3;
-
-    return pick_target_from_list(disp, atoms, n);
-}
-
-// Finds the best target given a local copy of a property.
-Atom pick_target_from_targets(Display *disp, Property p)
-{
-    // The list of targets is a list of atoms, so it should have type XA_ATOM
-    // but it may have the type TARGETS instead.
-
-    if ((p.type != XA_ATOM && p.type != server.atom.TARGETS) || p.format != 32) {
-        // This would be really broken. Targets have to be an atom list
-        // and applications should support this. Nevertheless, some
-        // seem broken (MATLAB 7, for instance), so ask for STRING
-        // next instead as the lowest common denominator
-        return XA_STRING;
-    } else {
-        Atom *atom_list = (Atom *)p.data;
-
-        return pick_target_from_list(disp, atom_list, p.nitems);
-    }
-}
-
 void cleanup_server()
 {
    if (server.colormap)