[mutter/wayland] display: Ignore the modmask passed into meta_display_begin_grab_op

[Jasper St. Pierre <jstpierre src gnome org>]

commit 42bcad6549c44e093b83b5fbd00abc43f987ff8f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Apr 7 17:22:55 2014 -0400

    display: Ignore the modmask passed into meta_display_begin_grab_op
    
    A careful analysis of mutter's codebase shows that nothing actually
    passes anything but 0 to this. gnome-shell has one instance, but it's
    most likely a mistake.
    
    Remove the grab_mask field and the one place in keybindings.c that uses it.
    
    The parameter to begin_grab_op is left in for API compatibility reasons.

 src/core/display-private.h |    1 -
 src/core/display.c         |    3 +--
 src/core/keybindings.c     |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/core/display-private.h b/src/core/display-private.h
index 84ee5a8..2bbf184 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -196,7 +196,6 @@ struct _MetaDisplay
   int           grab_tile_monitor_number;
   int         grab_latest_motion_x;
   int         grab_latest_motion_y;
-  gulong      grab_mask;
   guint       grab_have_pointer : 1;
   guint       grab_have_keyboard : 1;
   guint       grab_frame_action : 1;
diff --git a/src/core/display.c b/src/core/display.c
index cdcfdd2..4556389 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1867,7 +1867,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
                             gboolean     pointer_already_grabbed,
                             gboolean     frame_action,
                             int          button,
-                            gulong       modmask,
+                            gulong       modmask, /* XXX - ignored */
                             guint32      timestamp,
                             int          root_x,
                             int          root_y)
@@ -1962,7 +1962,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
   display->grab_window = grab_window;
   display->grab_xwindow = grab_xwindow;
   display->grab_button = button;
-  display->grab_mask = modmask;
   if (window)
     {
       display->grab_tile_mode = window->tile_mode;
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 1dd04d5..5344aa1 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1763,7 +1763,7 @@ process_overlay_key (MetaDisplay *display,
 
           binding = display_get_keybinding (display,
                                             display->overlay_key_combo.keycode,
-                                            display->grab_mask);
+                                            0);
           if (binding &&
               meta_compositor_filter_keybinding (display->compositor, binding))
             return TRUE;