[gtk+/wip/matthiasc/drop-root-window: 1/7] Drop keynav for dnd

[Matthias Clasen <matthiasc src gnome org>]

commit 8621943552e0c48e7ad4a5348e9fab28fb5ccb94
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Aug 8 15:28:45 2017 -0400

    Drop keynav for dnd
    
    This is very much an easter egg, and it is the last place where
    we use the root window in libgtk.

 gtk/gtkdnd.c |   57 ++-------------------------------------------------------
 1 files changed, 2 insertions(+), 55 deletions(-)
---
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 1a04427..196b61b 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2384,9 +2384,6 @@ gtk_drag_motion_cb (GtkWidget      *widget,
   return TRUE;
 }
 
-#define BIG_STEP 20
-#define SMALL_STEP 1
-
 /* “key-press/release-event” callback during drag */
 static gboolean
 gtk_drag_key_cb (GtkWidget   *widget, 
@@ -2394,14 +2391,6 @@ gtk_drag_key_cb (GtkWidget   *widget,
                  gpointer     data)
 {
   GtkDragSourceInfo *info = (GtkDragSourceInfo *)data;
-  GdkModifierType state;
-  GdkWindow *root_window;
-  GdkDevice *pointer;
-  gint dx, dy;
-
-  dx = dy = 0;
-  state = event->state & gtk_accelerator_get_default_mod_mask ();
-  pointer = gdk_device_get_associated_device (gdk_event_get_device ((GdkEvent *) event));
 
   if (event->type == GDK_KEY_PRESS)
     {
@@ -2409,7 +2398,7 @@ gtk_drag_key_cb (GtkWidget   *widget,
         {
         case GDK_KEY_Escape:
           gtk_drag_cancel_internal (info, GTK_DRAG_RESULT_USER_CANCELLED, event->time);
-          return TRUE;
+          break;
 
         case GDK_KEY_space:
         case GDK_KEY_Return:
@@ -2426,52 +2415,10 @@ gtk_drag_key_cb (GtkWidget   *widget,
             {
               gtk_drag_cancel_internal (info, GTK_DRAG_RESULT_NO_TARGET, event->time);
             }
-
-          return TRUE;
-
-        case GDK_KEY_Up:
-        case GDK_KEY_KP_Up:
-          dy = (state & GDK_MOD1_MASK) ? -BIG_STEP : -SMALL_STEP;
-          break;
-
-        case GDK_KEY_Down:
-        case GDK_KEY_KP_Down:
-          dy = (state & GDK_MOD1_MASK) ? BIG_STEP : SMALL_STEP;
-          break;
-
-        case GDK_KEY_Left:
-        case GDK_KEY_KP_Left:
-          dx = (state & GDK_MOD1_MASK) ? -BIG_STEP : -SMALL_STEP;
-          break;
-
-        case GDK_KEY_Right:
-        case GDK_KEY_KP_Right:
-          dx = (state & GDK_MOD1_MASK) ? BIG_STEP : SMALL_STEP;
           break;
-        }
+       }
     }
 
-  /* Now send a "motion" so that the modifier state is updated */
-
-  /* The state is not yet updated in the event, so we need
-   * to query it here. We could use XGetModifierMapping, but
-   * that would be overkill.
-   */
-  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-  gdk_window_get_device_position (root_window, pointer, NULL, NULL, &state);
-  event->state = state;
-
-  if (dx != 0 || dy != 0)
-    {
-      info->cur_x += dx;
-      info->cur_y += dy;
-      gdk_device_warp (pointer,
-                       gtk_widget_get_screen (widget),
-                       info->cur_x, info->cur_y);
-    }
-
-  gtk_drag_update (info, info->cur_screen, info->cur_x, info->cur_y, (GdkEvent *)event);
-
   return TRUE;
 }