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

cursor-renderer: Popups need to set cursors, too

Browse Source 
Popups could not set the cursor image, because the cursor tracker would
ignore window cursors if we had a popup active. The correct condition to
check for is already in should_block_wayland. Rename this to the more
sensible name windows_are_interactable, and use it in the cursor tracker.
This commit is contained in:
Jasper St. Pierre 2014-08-15 13:30:31 -04:00
parent f8dcea3975
commit 471e6b9e13
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-cursor-tracker.c
View File

@ -61,7 +61,7 @@ get_displayed_cursor (MetaCursorTracker *tracker)
if (!tracker->is_showing) if (!tracker->is_showing)
return NULL; return NULL;
if (display->grab_op == META_GRAB_OP_NONE) if (meta_grab_op_windows_are_interactable (display->grab_op))
{ {
if (tracker->has_window_cursor) if (tracker->has_window_cursor)
return tracker->window_cursor; return tracker->window_cursor;

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

@ -380,7 +380,7 @@ gboolean meta_grab_op_is_resizing (MetaGrabOp op);
gboolean meta_grab_op_is_moving_or_resizing (MetaGrabOp op); gboolean meta_grab_op_is_moving_or_resizing (MetaGrabOp op);
gboolean meta_grab_op_is_mouse (MetaGrabOp op); gboolean meta_grab_op_is_mouse (MetaGrabOp op);
gboolean meta_grab_op_is_keyboard (MetaGrabOp op); gboolean meta_grab_op_is_keyboard (MetaGrabOp op);
gboolean meta_grab_op_should_block_wayland (MetaGrabOp op); gboolean meta_grab_op_windows_are_interactable (MetaGrabOp op);
void meta_display_increment_focus_sentinel (MetaDisplay *display); void meta_display_increment_focus_sentinel (MetaDisplay *display);
void meta_display_decrement_focus_sentinel (MetaDisplay *display); void meta_display_decrement_focus_sentinel (MetaDisplay *display);

14
src/core/display.c
View File

@ -1261,23 +1261,21 @@ meta_grab_op_is_moving_or_resizing (MetaGrabOp op)
} }
/** /**
* meta_grab_op_should_block_wayland: * meta_grab_op_windows_are_interactable:
* @op: A #MetaGrabOp * @op: A #MetaGrabOp
* *
* Starting a grab with one of these grab operations means * Whether windows can be interacted with in this grab operation.
* that we will remove key / pointer focus from the current
* Wayland focus.
*/ */
gboolean gboolean
meta_grab_op_should_block_wayland (MetaGrabOp op) meta_grab_op_windows_are_interactable (MetaGrabOp op)
{ {
switch (op) switch (op)
{ {
case META_GRAB_OP_WAYLAND_POPUP: case META_GRAB_OP_WAYLAND_POPUP:
case META_GRAB_OP_NONE: case META_GRAB_OP_NONE:
return FALSE;
default:
return TRUE; return TRUE;
default:
return FALSE;
} }
} }
@ -1446,7 +1444,7 @@ meta_display_sync_wayland_input_focus (MetaDisplay *display)
MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default (); MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default ();
MetaWindow *focus_window = NULL; MetaWindow *focus_window = NULL;
if (meta_grab_op_should_block_wayland (display->grab_op)) if (!meta_grab_op_windows_are_interactable (display->grab_op))
focus_window = NULL; focus_window = NULL;
else if (meta_display_xwindow_is_a_no_focus_window (display, display->focus_xwindow)) else if (meta_display_xwindow_is_a_no_focus_window (display, display->focus_xwindow))
focus_window = NULL; focus_window = NULL;