mirror of
https://github.com/brl/mutter.git
synced 2025-08-06 00:24:42 +00:00
Remove HAVE_WAYLAND ifdefs
Wayland support is always enabled now. https://bugzilla.gnome.org/show_bug.cgi?id=705497
This commit is contained in:
@@ -1906,9 +1906,7 @@ update_focus_window (MetaDisplay *display,
|
||||
Window xwindow,
|
||||
gulong serial)
|
||||
{
|
||||
#ifdef HAVE_WAYLAND
|
||||
MetaWaylandCompositor *compositor;
|
||||
#endif
|
||||
|
||||
display->focus_serial = serial;
|
||||
|
||||
@@ -1949,7 +1947,6 @@ update_focus_window (MetaDisplay *display,
|
||||
else
|
||||
meta_topic (META_DEBUG_FOCUS, "* Focus --> NULL with serial %lu\n", serial);
|
||||
|
||||
#ifdef HAVE_WAYLAND
|
||||
if (meta_is_wayland_compositor ())
|
||||
{
|
||||
compositor = meta_wayland_compositor_get_default ();
|
||||
@@ -1962,7 +1959,6 @@ update_focus_window (MetaDisplay *display,
|
||||
else
|
||||
meta_topic (META_DEBUG_FOCUS, "Focus change has no effect, because there is no matching wayland surface");
|
||||
}
|
||||
#endif
|
||||
|
||||
g_object_notify (G_OBJECT (display), "focus-window");
|
||||
meta_display_update_active_window_hint (display);
|
||||
@@ -3246,12 +3242,10 @@ event_callback (XEvent *event,
|
||||
erratically because of the lag between updating the window
|
||||
position from the surface position. Instead we bypass the
|
||||
translation altogether by directly using the Clutter events */
|
||||
#ifdef HAVE_WAYLAND
|
||||
if (meta_is_wayland_compositor () &&
|
||||
event->type == GenericEvent &&
|
||||
event->xcookie.evtype == XI_Motion)
|
||||
return FALSE;
|
||||
#endif
|
||||
|
||||
return meta_display_handle_event (display, event);
|
||||
}
|
||||
|
Reference in New Issue
Block a user