isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

core: Make meta_window_handle_ungrabbed_event() touch-aware

Browse Source 
This fixes the effects of this function on touchscreens in wayland
(most notably, window raising & focusing).
This commit is contained in:
Carlos Garnacho 2015-11-24 15:43:42 +01:00
parent 3078f70f90
commit c625d2ee9d
1 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core/window.c
View File

@ -7669,13 +7669,29 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
MetaDisplay *display = window->display; MetaDisplay *display = window->display;
gboolean unmodified; gboolean unmodified;
gboolean is_window_grab; gboolean is_window_grab;
ClutterModifierType grab_mods, event_mods;
gfloat x, y;
guint button;
if (window->frame && meta_ui_frame_handle_event (window->frame->ui_frame, event)) if (window->frame && meta_ui_frame_handle_event (window->frame->ui_frame, event))
return; return;
if (event->type != CLUTTER_BUTTON_PRESS) if (event->type != CLUTTER_BUTTON_PRESS &&
event->type != CLUTTER_TOUCH_BEGIN)
return; return;
if (event->type == CLUTTER_TOUCH_BEGIN)
{
ClutterEventSequence *sequence;
button = 1;
sequence = clutter_event_get_event_sequence (event);
if (!meta_display_is_pointer_emulating_sequence (window->display, sequence))
return;
}
else
button = clutter_event_get_button (event);
if (display->grab_op != META_GRAB_OP_NONE) if (display->grab_op != META_GRAB_OP_NONE)
return; return;
@ -7706,9 +7722,12 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
* care about. Just let the event through. * care about. Just let the event through.
*/ */
ClutterModifierType grab_mods = meta_display_get_window_grab_modifiers (display); grab_mods = meta_display_get_window_grab_modifiers (display);
unmodified = (event->button.modifier_state & grab_mods) == 0; event_mods = clutter_event_get_state (event);
is_window_grab = (event->button.modifier_state & grab_mods) == grab_mods; unmodified = (event_mods & grab_mods) == 0;
is_window_grab = (event_mods & grab_mods) == grab_mods;
clutter_event_get_coords (event, &x, &y);
if (unmodified) if (unmodified)
{ {
@ -7725,7 +7744,7 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Focusing %s due to unmodified button %u press (display.c)\n", "Focusing %s due to unmodified button %u press (display.c)\n",
window->desc, event->button.button); window->desc, button);
meta_window_focus (window, event->any.time); meta_window_focus (window, event->any.time);
} }
else else
@ -7735,9 +7754,9 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
display->allow_terminal_deactivation = TRUE; display->allow_terminal_deactivation = TRUE;
meta_verbose ("Allowing events time %u\n", meta_verbose ("Allowing events time %u\n",
(unsigned int)event->button.time); (unsigned int)event->any.time);
} }
else if (is_window_grab && (int) event->button.button == meta_prefs_get_mouse_button_resize ()) else if (is_window_grab && (int) button == meta_prefs_get_mouse_button_resize ())
{ {
if (window->has_resize_func) if (window->has_resize_func)
{ {
@ -7748,10 +7767,10 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
meta_window_get_frame_rect (window, &frame_rect); meta_window_get_frame_rect (window, &frame_rect);
west = event->button.x < (frame_rect.x + 1 * frame_rect.width / 3); west = x < (frame_rect.x + 1 * frame_rect.width / 3);
east = event->button.x > (frame_rect.x + 2 * frame_rect.width / 3); east = x > (frame_rect.x + 2 * frame_rect.width / 3);
north = event->button.y < (frame_rect.y + 1 * frame_rect.height / 3); north = y < (frame_rect.y + 1 * frame_rect.height / 3);
south = event->button.y > (frame_rect.y + 2 * frame_rect.height / 3); south = y > (frame_rect.y + 2 * frame_rect.height / 3);
if (west) if (west)
op |= META_GRAB_OP_WINDOW_DIR_WEST; op |= META_GRAB_OP_WINDOW_DIR_WEST;
@ -7769,23 +7788,21 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
op, op,
TRUE, TRUE,
FALSE, FALSE,
event->button.button, button,
0, 0,
event->any.time, event->any.time,
event->button.x, x, y);
event->button.y);
} }
} }
else if (is_window_grab && (int) event->button.button == meta_prefs_get_mouse_button_menu ()) else if (is_window_grab && (int) button == meta_prefs_get_mouse_button_menu ())
{ {
if (meta_prefs_get_raise_on_click ()) if (meta_prefs_get_raise_on_click ())
meta_window_raise (window); meta_window_raise (window);
meta_window_show_menu (window, meta_window_show_menu (window,
META_WINDOW_MENU_WM, META_WINDOW_MENU_WM,
event->button.x, x, y);
event->button.y);
} }
else if (is_window_grab && (int) event->button.button == 1) else if (is_window_grab && (int) button == 1)
{ {
if (window->has_move_func) if (window->has_move_func)
{ {
@ -7795,11 +7812,10 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
META_GRAB_OP_MOVING, META_GRAB_OP_MOVING,
TRUE, TRUE,
FALSE, FALSE,
event->button.button, button,
0, 0,
event->any.time, event->any.time,
event->button.x, x, y);
event->button.y);
} }
} }
} }