brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display: Ignore the modmask passed into meta_display_begin_grab_op

Browse Source 
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.
This commit is contained in:
Jasper St. Pierre 2014-04-07 17:22:55 -04:00
parent b0ea0afd2f
commit 42bcad6549
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/display-private.h
View File

@ -196,7 +196,6 @@ struct _MetaDisplay
int grab_tile_monitor_number; int grab_tile_monitor_number;
int grab_latest_motion_x; int grab_latest_motion_x;
int grab_latest_motion_y; int grab_latest_motion_y;
gulong grab_mask;
guint grab_have_pointer : 1; guint grab_have_pointer : 1;
guint grab_have_keyboard : 1; guint grab_have_keyboard : 1;
guint grab_frame_action : 1; guint grab_frame_action : 1;

3
src/core/display.c
View File

@ -1867,7 +1867,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
gboolean pointer_already_grabbed, gboolean pointer_already_grabbed,
gboolean frame_action, gboolean frame_action,
int button, int button,
gulong modmask, gulong modmask, /* XXX - ignored */
guint32 timestamp, guint32 timestamp,
int root_x, int root_x,
int root_y) int root_y)
@ -1962,7 +1962,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
display->grab_window = grab_window; display->grab_window = grab_window;
display->grab_xwindow = grab_xwindow; display->grab_xwindow = grab_xwindow;
display->grab_button = button; display->grab_button = button;
display->grab_mask = modmask;
if (window) if (window)
{ {
display->grab_tile_mode = window->tile_mode; display->grab_tile_mode = window->tile_mode;

2
src/core/keybindings.c
View File

@ -1763,7 +1763,7 @@ process_overlay_key (MetaDisplay *display,
binding = display_get_keybinding (display, binding = display_get_keybinding (display,
display->overlay_key_combo.keycode, display->overlay_key_combo.keycode,
display->grab_mask); 0);
if (binding && if (binding &&
meta_compositor_filter_keybinding (display->compositor, binding)) meta_compositor_filter_keybinding (display->compositor, binding))
return TRUE; return TRUE;