Handle escaped characters in paste URLs.

Audio_Track.C

@@ -0,0 +1,120 @@
+
+/*******************************************************************************/
+/* Copyright (C) 2008 Jonathan Moore Liles                                     */
+/*                                                                             */
+/* This program is free software; you can redistribute it and/or modify it     */
+/* under the terms of the GNU General Public License as published by the       */
+/* Free Software Foundation; either version 2 of the License, or (at your      */
+/* option) any later version.                                                  */
+/*                                                                             */
+/* This program is distributed in the hope that it will be useful, but WITHOUT */
+/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       */
+/* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for   */
+/* more details.                                                               */
+/*                                                                             */
+/* You should have received a copy of the GNU General Public License along     */
+/* with This program; see the file COPYING.  If not,write to the Free Software */
+/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+/*******************************************************************************/
+
+#include "Audio_Track.H"
+
+
+static
+void
+deurlify ( char *url )
+{
+    char *r, *w;
+
+    r = w = url;
+
+    for ( ; *r; r++, w++ )
+    {
+        if ( *r == '%' )
+        {
+            char data[3] = { *(r + 1), *(r + 2), 0 };
+
+            int c;
+
+            sscanf( data, "%2X", &c );
+
+            *w = c;
+
+            r += 2;
+        }
+        else
+            *w = *r;
+    }
+
+    *w = NULL;
+}
+
+/** event handler that supports DND of audio clips */
+int
+Audio_Track::handle ( int m )
+{
+    switch ( m )
+    {
+        case FL_DND_DRAG:
+        case FL_DND_ENTER:
+        case FL_ENTER:
+//                    dump();
+            return 1;
+        case FL_DND_LEAVE:
+        case FL_DND_RELEASE:
+            return 1;
+        case FL_PASTE:
+        {
+            const char *text = Fl::event_text();
+
+            char *file;
+
+            if ( ! sscanf( text, "file://%a[^\r\n]\n", &file ) )
+            {
+                printf( "invalid drop \"%s\"\n", text );
+                return 0;
+            }
+
+            deurlify( file );
+
+            printf( "pasted file \"%s\"\n", file );
+
+            Audio_File *c = Audio_File::from_file( file );
+
+            if ( ! c )
+            {
+                free( file );
+                return 0;
+            }
+
+            Region *r = new Region( c );
+
+            r->offset( timeline->x_to_ts( Fl::event_x() ) );
+
+            this->add( r );
+
+            redraw();
+            return 1;
+        }
+        default:
+            return Track::handle( m );
+    }
+}
+
+
+
+void
+Audio_Track::dump ( void )
+{
+
+    printf( "1 \"%s\" {\n", /* name() */ "Track" );
+
+    sort();
+    for ( list <Track_Widget *>::const_iterator r = _widgets.begin(); r != _widgets.end(); r++ )
+    {
+        printf( "\t" );
+        ((Region*)(*r))->dump();
+    }
+
+    printf( "}\n" );
+}

Audio_Track.H

@@ -31,78 +31,9 @@ public:
 
     Audio_Track ( int X, int Y, int W, int H ) : Track( X, Y, W, H )
         {
-
-/*             Fl_Group *o = new Fl_Group( 0, 0, 100, H ); */
-/*             new Fl_Input( 0, 0, 100, 24, "name:" ); */
-/*             o->end(); */
-
-        }
-
-    /** event handler that supports DND of audio clips */
-    int
-    handle ( int m )
-        {
-            switch ( m )
-            {
-                case FL_DND_DRAG:
-                case FL_DND_ENTER:
-                case FL_ENTER:
-//                    dump();
-                    return 1;
-                case FL_DND_LEAVE:
-                case FL_DND_RELEASE:
-                    return 1;
-                case FL_PASTE:
-                {
-                    const char *text = Fl::event_text();
-
-                    char *file;
-
-                    if ( ! sscanf( text, "file://%a[^\r\n]\n", &file ) )
-                    {
-                        printf( "invalid drop \"%s\"\n", text );
-                        return 0;
-                    }
-
-                    printf( "pasted file \"%s\"\n", file );
-
-                    Audio_File *c = Audio_File::from_file( file );
-
-                    if ( ! c )
-                    {
-                        free( file );
-                        return 0;
-                    }
-
-                    Region *r = new Region( c );
-
-                    r->offset( timeline->x_to_ts( Fl::event_x() ) );
-
-                    this->add( r );
-
-                    redraw();
-                    return 1;
-                }
-                default:
-                    return Track::handle( m );
-            }
         }
 
+    int handle ( int m );
+    void dump ( void );
 
-
-    void
-    dump ( void )
-        {
-
-            printf( "1 \"%s\" {\n", /* name() */ "Track" );
-
-            sort();
-            for ( list <Track_Widget *>::const_iterator r = _widgets.begin(); r != _widgets.end(); r++ )
-            {
-                printf( "\t" );
-                ((Region*)(*r))->dump();
-            }
-
-            printf( "}\n" );
-        }
 };

Makefile

@@ -5,7 +5,7 @@ CXXFLAGS=-ggdb -Wall -O0
 LIBS=-lsndfile  `fltk-config --ldflags`
 # CXXFLAGS=`fltk-config -cxxflags`
 
-SRCS= Waveform.C  Region.C  Peaks.C  main.C Track.C Timeline.C Audio_File.C Audio_File_SF.C Loggable.C
+SRCS= Waveform.C  Region.C  Peaks.C  main.C Track.C Audio_Track.C Timeline.C Audio_File.C Audio_File_SF.C Loggable.C
 
 OBJS=$(SRCS:.C=.o)