Bump version to 3.14.1.5

Update NEWS.
meta-wayland-surface: Correcly scale the input region
2014-10-30 11:01:04 +00:00 · 2014-10-27 18:13:00 +01:00 · 2014-10-27 18:12:52 +01:00 · 2014-10-19 17:43:23 +00:00 · 2014-10-16 11:00:51 +02:00 · 2014-10-15 23:54:20 +02:00
6 changed files with 651 additions and 818 deletions
--- a/10
+++ b/10
@@ -1,3 +1,13 @@
+3.14.1.5
+========
+* Fix wayland hiDPI regressions [Adel; #739161]
+
+Contributors:
+  Adel Gadllah, Florian Müllner, Jasper St. Pierre
+
+Translations:
+  Dušan Kazik [sk]
+
 3.14.1
 ======
 * Fix move-titlebar-onscreen function [Florian; #736915]
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.62)

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [14])
-m4_define([mutter_micro_version], [1])
+m4_define([mutter_micro_version], [1.5])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
--- a/po/sk.po
+++ b/po/sk.po
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1965,7 +1965,7 @@ meta_display_end_grab_op (MetaDisplay *display,
       * beginning of the grab_op.
       */
      if (!meta_prefs_get_raise_on_click () &&
-          display->grab_threshold_movement_reached)
+          !display->grab_threshold_movement_reached)
        meta_window_raise (display->grab_window);

      meta_window_grab_op_ended (grab_window, grab_op);
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -3022,7 +3022,6 @@ check_fullscreen_func (gpointer data)
 {
  MetaScreen *screen = data;
  MetaWindow *window;
-  GSList *tmp;
  GSList *fullscreen_monitors = NULL;
  GSList *obscured_monitors = NULL;
  gboolean in_fullscreen_changed = FALSE;
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -393,10 +393,7 @@ commit_pending_state (MetaWaylandSurface      *surface,
    }

  if (pending->scale > 0)
-    {
-      surface->scale = pending->scale;
-      meta_surface_actor_wayland_scale_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor));
-    }
+    surface->scale = pending->scale;

  if (!cairo_region_is_empty (pending->damage))
    surface_process_damage (surface, pending->damage);
@@ -411,10 +408,14 @@ commit_pending_state (MetaWaylandSurface      *surface,
    }
  if (pending->input_region)
    {
-      pending->input_region = scale_region (pending->input_region, surface->scale);
+      pending->input_region = scale_region (pending->input_region,
+                                            meta_surface_actor_wayland_get_scale (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor)));
      meta_surface_actor_set_input_region (surface->surface_actor, pending->input_region);
    }

+  /* scale surface texture */
+  meta_surface_actor_wayland_scale_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor));
+
  /* wl_surface.frame */
  wl_list_insert_list (&compositor->frame_callbacks, &pending->frame_callback_list);
  wl_list_init (&pending->frame_callback_list);
Author	SHA1	Message	Date
Florian Müllner	a19eda5ae7	Bump version to 3.14.1.5 Update NEWS.	2014-10-30 11:01:04 +00:00
Adel Gadllah	0a9bbe0109	meta-wayland-surface: Correcly scale the input region The input region currently only gets scaled by the surface scale while ignoring the output scale, which causes input events to not get delivered correctly for clients on hidpi screens. So take the output scale into account when doing so. https://bugzilla.gnome.org/show_bug.cgi?id=739161	2014-10-27 18:13:00 +01:00
Adel Gadllah	a8eb42e43c	Revert "wayland-surface: Apply the surface scale only if needed" This commit is wrong, it assumes that the scale only applies to the one set by the client but its not. meta_surface_actor_wayland_scale_texture also handles the output scale. Revert the commit to fix hidpi for wayland clients like weston-terminal. This reverts commit `0364ea9140`. https://bugzilla.gnome.org/show_bug.cgi?id=739161	2014-10-27 18:12:52 +01:00
Dušan Kazik	9d0c9f1f42	Updated Slovak translation	2014-10-19 17:43:23 +00:00
Florian Müllner	9fa0743394	Remove unused variable	2014-10-16 11:00:51 +02:00
Jasper St. Pierre	bb79a20fac	display: Fix accidental inversion from `2f9c601` Commit `2f9c601` accidentally changed the logic here, changing the grab behavior when not using raise-on-click. Fix this. Spotted-by: Adam Goode <adam@spicenitz.org>	2014-10-15 23:54:20 +02:00