corrected off by 1 error in cMB2WC() call (thanks valgrind)

[wxWidgets.git] / src / gtk / dnd.cpp

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index b9e4d38b87ca2e409e4f00897583b446ddcf1c35..c995a53350540539662f9447732e92b362aee5e8 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.cpp
+// Name:        src/gtk/dnd.cpp

 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDropTarget class
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,39 +10,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dnd.h"
-#include "wx/log.h"
-
-

 #if wxUSE_DRAG_AND_DROP
 
 #if wxUSE_DRAG_AND_DROP
 

-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/gdicmn.h"
-#include "wx/intl.h"
-#include "wx/utils.h"
-
-#include "wx/gtk/private.h"
-
-#include <gdk/gdkprivate.h>
-
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkselection.h>
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// thread system
-//-----------------------------------------------------------------------------
+#include "wx/dnd.h"

 
 

-#if wxUSE_THREADS
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

+#include <gtk/gtk.h>
+

 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------


@@ -52,10 +34,17 @@ extern bool g_blockEventsOnDrag;
 // the flags used for the last DoDragDrop()
 static long gs_flagsForDrag = 0;
 
 // the flags used for the last DoDragDrop()
 static long gs_flagsForDrag = 0;
 

+#ifdef __WXDEBUG__

 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here
 // (there are quite a few of them, so don't enable this by default)
 static const wxChar *TRACE_DND = _T("dnd");
 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_DND) to enable the trace messages from here
 // (there are quite a few of them, so don't enable this by default)
 static const wxChar *TRACE_DND = _T("dnd");

+#endif
+
+// global variables because GTK+ DnD want to have the
+// mouse event that caused it
+extern GdkEvent *g_lastMouseEvent;
+extern int       g_lastButtonNumber;

 
 //----------------------------------------------------------------------------
 // standard icons
 
 //----------------------------------------------------------------------------
 // standard icons


@@ -173,8 +162,6 @@ static void target_drag_leave( GtkWidget *WXUNUSED(widget),
                                guint WXUNUSED(time),
                                wxDropTarget *drop_target )
 {
                                guint WXUNUSED(time),
                                wxDropTarget *drop_target )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );
     /* inform the wxDropTarget about the current GdkDragContext.
        this is only valid for the duration of this call */
     drop_target->SetDragContext( context );


@@ -203,8 +190,6 @@ static gboolean target_drag_motion( GtkWidget *WXUNUSED(widget),
                                     guint time,
                                     wxDropTarget *drop_target )
 {
                                     guint time,
                                     wxDropTarget *drop_target )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     /* Owen Taylor: "if the coordinates not in a drop zone,
        return FALSE, otherwise call gtk_drag_status() and
        return TRUE" */
     /* Owen Taylor: "if the coordinates not in a drop zone,
        return FALSE, otherwise call gtk_drag_status() and
        return TRUE" */


@@ -301,8 +286,6 @@ static gboolean target_drag_drop( GtkWidget *widget,
                                   guint time,
                                   wxDropTarget *drop_target )
 {
                                   guint time,
                                   wxDropTarget *drop_target )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     /* Owen Taylor: "if the drop is not in a drop zone,
        return FALSE, otherwise, if you aren't accepting
        the drop, call gtk_drag_finish() with success == FALSE
     /* Owen Taylor: "if the drop is not in a drop zone,
        return FALSE, otherwise, if you aren't accepting
        the drop, call gtk_drag_finish() with success == FALSE


@@ -340,7 +323,9 @@ static gboolean target_drag_drop( GtkWidget *widget,
 
     if (!ret)
     {
 
     if (!ret)
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );
         wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned FALSE") );

+#endif

 
         /* cancel the whole thing */
         gtk_drag_finish( context,
 
         /* cancel the whole thing */
         gtk_drag_finish( context,


@@ -350,7 +335,9 @@ static gboolean target_drag_drop( GtkWidget *widget,
     }
     else
     {
     }
     else
     {

-        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned TRUE") );
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnDrop returned true") );
+#endif

 
 #if wxUSE_THREADS
         /* disable GUI threads */
 
 #if wxUSE_THREADS
         /* disable GUI threads */


@@ -359,7 +346,7 @@ static gboolean target_drag_drop( GtkWidget *widget,
         GdkAtom format = drop_target->GetMatchingPair();
 
         // this does happen somehow, see bug 555111
         GdkAtom format = drop_target->GetMatchingPair();
 
         // this does happen somehow, see bug 555111

-        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") )
+        wxCHECK_MSG( format, FALSE, _T("no matching GdkAtom for format?") );

 
 /*
         GdkDragAction action = GDK_ACTION_MOVE;
 
 /*
         GdkDragAction action = GDK_ACTION_MOVE;


@@ -404,8 +391,6 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
                                        guint time,
                                        wxDropTarget *drop_target )
 {
                                        guint time,
                                        wxDropTarget *drop_target )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     /* Owen Taylor: "call gtk_drag_finish() with
        success == TRUE" */
 
     /* Owen Taylor: "call gtk_drag_finish() with
        success == TRUE" */
 


@@ -418,7 +403,9 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
         return;
     }
 
         return;
     }
 

+#ifdef __WXDEBUG__

     wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );
     wxLogTrace(TRACE_DND, wxT( "Drop target: data received event") );

+#endif

 
     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */
 
     /* inform the wxDropTarget about the current GtkSelectionData.
        this is only valid for the duration of this call */


@@ -428,14 +415,18 @@ static void target_drag_data_received( GtkWidget *WXUNUSED(widget),
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {
 
     if ( wxIsDragResultOk( drop_target->OnData( x, y, result ) ) )
     {

-        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned TRUE") );
+#ifdef __WXDEBUG__
+        wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned true") );
+#endif

 
         /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {
 
         /* tell GTK that data transfer was successful */
         gtk_drag_finish( context, TRUE, FALSE, time );
     }
     else
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );
         wxLogTrace(TRACE_DND, wxT( "Drop target: OnData returned FALSE") );

+#endif

 
         /* tell GTK that data transfer was not successful */
         gtk_drag_finish( context, FALSE, FALSE, time );
 
         /* tell GTK that data transfer was not successful */
         gtk_drag_finish( context, FALSE, FALSE, time );


@@ -603,12 +594,12 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
                        guint               WXUNUSED(time),
                        wxDropSource       *drop_source )
 {
                        guint               WXUNUSED(time),
                        wxDropSource       *drop_source )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     wxDataFormat format( selection_data->target );
 
     wxDataFormat format( selection_data->target );
 

+#ifdef __WXDEBUG__

     wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
                format.GetId().c_str());
     wxLogTrace(TRACE_DND, wxT("Drop source: format requested: %s"),
                format.GetId().c_str());

+#endif

 
     drop_source->m_retValue = wxDragCancel;
 
 
     drop_source->m_retValue = wxDragCancel;
 


@@ -616,20 +607,26 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 
     if (!data)
     {
 
     if (!data)
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );
         wxLogTrace(TRACE_DND, wxT("Drop source: no data object") );

-        return;
+#endif
+       return;

     }
 
     if (!data->IsSupportedFormat(format))
     {
     }
 
     if (!data->IsSupportedFormat(format))
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );
         wxLogTrace(TRACE_DND, wxT("Drop source: unsupported format") );

-        return;
+#endif
+       return;

     }
 
     if (data->GetDataSize(format) == 0)
     {
     }
 
     if (data->GetDataSize(format) == 0)
     {

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );
         wxLogTrace(TRACE_DND, wxT("Drop source: empty data") );

-        return;
+#endif
+       return;

     }
 
     size_t size = data->GetDataSize(format);
     }
 
     size_t size = data->GetDataSize(format);


@@ -662,38 +659,6 @@ source_drag_data_get  (GtkWidget          *WXUNUSED(widget),
 }
 }
 
 }
 }
 

-//----------------------------------------------------------------------------
-// "drag_data_delete"
-//----------------------------------------------------------------------------
-
-extern "C" {
-static void source_drag_data_delete( GtkWidget *WXUNUSED(widget),
-                                     GdkDragContext *context,
-                                     wxDropSource *WXUNUSED(drop_source) )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    // printf( "Drag source: drag_data_delete\n" );
-}
-}
-
-//----------------------------------------------------------------------------
-// "drag_begin"
-//----------------------------------------------------------------------------
-
-extern "C" {
-static void source_drag_begin( GtkWidget          *WXUNUSED(widget),
-                               GdkDragContext     *WXUNUSED(context),
-                               wxDropSource       *WXUNUSED(drop_source) )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    // printf( "Drag source: drag_begin.\n" );
-}
-}
-

 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // "drag_end"
 //----------------------------------------------------------------------------


@@ -703,8 +668,6 @@ static void source_drag_end( GtkWidget          *WXUNUSED(widget),
                              GdkDragContext     *WXUNUSED(context),
                              wxDropSource       *drop_source )
 {
                              GdkDragContext     *WXUNUSED(context),
                              wxDropSource       *drop_source )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     // printf( "Drag source: drag_end.\n" );
 
     drop_source->m_waiting = false;
     // printf( "Drag source: drag_end.\n" );
 
     drop_source->m_waiting = false;


@@ -719,9 +682,6 @@ extern "C" {
 static gint
 gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {
 static gint
 gtk_dnd_window_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDropSource *source )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
 
     return 0;
     source->GiveFeedback( ConvertFromGTK(source->m_dragContext->action) );
 
     return 0;


@@ -811,14 +771,14 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     GdkPixmap *pixmap = icon->GetPixmap();
 
     gint width,height;
     GdkPixmap *pixmap = icon->GetPixmap();
 
     gint width,height;

-    gdk_window_get_size (pixmap, &width, &height);
+    gdk_drawable_get_size (pixmap, &width, &height);

 
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
     gtk_widget_push_colormap (colormap);
 
     m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
     gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
     gtk_widget_push_colormap (colormap);
 
     m_iconWindow = gtk_window_new (GTK_WINDOW_POPUP);
     gtk_widget_set_events (m_iconWindow, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);

-    gtk_widget_set_app_paintable (GTK_WIDGET (m_iconWindow), TRUE);
+    gtk_widget_set_app_paintable (m_iconWindow, TRUE);

 
     gtk_widget_pop_colormap ();
 
 
     gtk_widget_pop_colormap ();
 


@@ -845,6 +805,14 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     if (g_blockEventsOnDrag)
         return wxDragNone;
 
     if (g_blockEventsOnDrag)
         return wxDragNone;
 

+    // don't start dragging if no button is down
+    if (g_lastButtonNumber == 0)
+        return wxDragNone;
+
+    // we can only start a drag after a mouse event
+    if (g_lastMouseEvent == NULL)
+        return wxDragNone;
+

     // disabled for now
     g_blockEventsOnDrag = true;
 
     // disabled for now
     g_blockEventsOnDrag = true;
 


@@ -860,65 +828,38 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     for (size_t i = 0; i < count; i++)
     {
         GdkAtom atom = array[i];
     for (size_t i = 0; i < count; i++)
     {
         GdkAtom atom = array[i];

+#ifdef __WXDEBUG__

         wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));
         wxLogTrace(TRACE_DND, wxT("Drop source: Supported atom %s"), gdk_atom_name( atom ));

-        gtk_target_list_add( target_list, atom, 0, 0 );
+#endif
+       gtk_target_list_add( target_list, atom, 0, 0 );

     }
     delete[] array;
 
     }
     delete[] array;
 

-    GdkEventMotion event;
-    event.window = m_widget->window;
-    int x = 0;
-    int y = 0;
-    GdkModifierType state;
-    gdk_window_get_pointer( event.window, &x, &y, &state );
-    event.x = x;
-    event.y = y;
-    event.state = state;
-    event.time = (guint32)GDK_CURRENT_TIME;
-
-    /* GTK wants to know which button was pressed which caused the dragging */
-    int button_number = 0;
-    if (event.state & GDK_BUTTON1_MASK) button_number = 1;
-    else if (event.state & GDK_BUTTON2_MASK) button_number = 2;
-    else if (event.state & GDK_BUTTON3_MASK) button_number = 3;
+    int action = GDK_ACTION_COPY;
+    if ( flags & wxDrag_AllowMove )
+        action |= GDK_ACTION_MOVE;

 
 

-#if wxUSE_THREADS
-    /* disable GUI threads */
-#endif
+    // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad
+    //     to use a global to pass the flags to the drop target but I'd
+    //     surely prefer a better way to do it
+    gs_flagsForDrag = flags;

 
 

-    /* don't start dragging if no button is down */
-    if (button_number)
-    {
-        int action = GDK_ACTION_COPY;
-        if ( flags & wxDrag_AllowMove )
-            action |= GDK_ACTION_MOVE;
-
-        // VZ: as we already use g_blockEventsOnDrag it shouldn't be that bad
-        //     to use a global to pass the flags to the drop target but I'd
-        //     surely prefer a better way to do it
-        gs_flagsForDrag = flags;
-
-        GdkDragContext *context = gtk_drag_begin( m_widget,
+    GdkDragContext *context = gtk_drag_begin( m_widget,

                 target_list,
                 (GdkDragAction)action,
                 target_list,
                 (GdkDragAction)action,

-                button_number,  /* number of mouse button which started drag */
-                (GdkEvent*) &event );
+                g_lastButtonNumber,  // number of mouse button which started drag
+                (GdkEvent*) g_lastMouseEvent );

 
 

-        m_dragContext = context;
+    m_dragContext = context;

 
 

-        PrepareIcon( action, context );
+    PrepareIcon( action, context );

 
 

-        while (m_waiting)
-            gtk_main_iteration();
+    while (m_waiting)
+        gtk_main_iteration();

 
 

-        m_retValue = ConvertFromGTK(context->action);
-        if ( m_retValue == wxDragNone )
-            m_retValue = wxDragCancel;
-    }
-
-#if wxUSE_THREADS
-    /* re-enable GUI threads */
-#endif
+    m_retValue = ConvertFromGTK(context->action);
+    if ( m_retValue == wxDragNone )
+         m_retValue = wxDragCancel;

 
     g_blockEventsOnDrag = false;
 
 
     g_blockEventsOnDrag = false;
 


@@ -933,10 +874,6 @@ void wxDropSource::RegisterWindow()
 
     g_signal_connect (m_widget, "drag_data_get",
                       G_CALLBACK (source_drag_data_get), this);
 
     g_signal_connect (m_widget, "drag_data_get",
                       G_CALLBACK (source_drag_data_get), this);

-    g_signal_connect (m_widget, "drag_data_delete",
-                      G_CALLBACK (source_drag_data_delete), this);
-    g_signal_connect (m_widget, "drag_begin",
-                      G_CALLBACK (source_drag_begin), this);

     g_signal_connect (m_widget, "drag_end",
                       G_CALLBACK (source_drag_end), this);
 
     g_signal_connect (m_widget, "drag_end",
                       G_CALLBACK (source_drag_end), this);
 


@@ -950,12 +887,6 @@ void wxDropSource::UnregisterWindow()
     g_signal_handlers_disconnect_by_func (m_widget,
                                           (gpointer) source_drag_data_get,
                                           this);
     g_signal_handlers_disconnect_by_func (m_widget,
                                           (gpointer) source_drag_data_get,
                                           this);

-    g_signal_handlers_disconnect_by_func (m_widget,
-                                          (gpointer) source_drag_data_delete,
-                                          this);
-    g_signal_handlers_disconnect_by_func (m_widget,
-                                          (gpointer) source_drag_begin,
-                                          this);

     g_signal_handlers_disconnect_by_func (m_widget,
                                           (gpointer) source_drag_end,
                                           this);
     g_signal_handlers_disconnect_by_func (m_widget,
                                           (gpointer) source_drag_end,
                                           this);