Bump version to 3.9.5

Update NEWS.

NEWS

@@ -1,3 +1,13 @@
+3.9.5
+=====
+* Don't select for touch events on the stage [Jasper; #697192]
+* Don't queue redraws for obscured regions [Adel; #703332]
+* Export timestamp of global keybinding events [Bastien; #704858]
+* Misc bug fixes and cleanups [Jasper, Rico; #703970]
+
+Contributors:
+  Adel Gadllah, Bastien Nocera, Jasper St. Pierre, Rico Tzschichholz
+
 3.9.4
 =====
 * Tweak window shadows [Allan; #702141]

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
 
 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [9])
-m4_define([mutter_micro_version], [4])
+m4_define([mutter_micro_version], [5])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])

doc/reference/meta-sections.txt

@@ -409,7 +409,6 @@ meta_prefs_get_theme
 meta_prefs_get_titlebar_font
 meta_prefs_get_num_workspaces
 meta_prefs_get_dynamic_workspaces
-meta_prefs_get_application_based
 meta_prefs_get_disable_workarounds
 meta_prefs_get_auto_raise
 meta_prefs_get_auto_raise_delay

src/compositor/compositor.c

@@ -660,6 +660,9 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
     XISetMask (mask.mask, XI_FocusIn);
     XISetMask (mask.mask, XI_FocusOut);
     XISetMask (mask.mask, XI_Motion);
+    XIClearMask (mask.mask, XI_TouchBegin);
+    XIClearMask (mask.mask, XI_TouchEnd);
+    XIClearMask (mask.mask, XI_TouchUpdate);
     XISelectEvents (xdisplay, xwin, &mask, 1);
 
     event_mask = ExposureMask | PropertyChangeMask | StructureNotifyMask;

src/compositor/meta-window-actor.c

@@ -69,9 +69,6 @@ struct _MetaWindowActorPrivate
   Damage            damage;
 
   guint8            opacity;
-  guint8            shadow_opacity;
-
-  gchar *           desc;
 
   /* A region that matches the shape of the window, including frame bounds */
   cairo_region_t   *shape_region;
@@ -130,8 +127,6 @@ struct _MetaWindowActorPrivate
 
   guint             no_shadow              : 1;
 
-  guint             no_more_x_calls        : 1;
-
   guint             unredirected           : 1;
 
   /* This is used to detect fullscreen windows that need to be unredirected */
@@ -323,9 +318,6 @@ window_decorated_notify (MetaWindow *mw,
       priv->damage = None;
     }
 
-  g_free (priv->desc);
-  priv->desc = NULL;
-
   priv->xwindow = new_xwindow;
 
   /*
@@ -457,7 +449,6 @@ meta_window_actor_finalize (GObject *object)
   MetaWindowActorPrivate *priv = self->priv;
 
   g_list_free_full (priv->frames, (GDestroyNotify) frame_data_free);
-  g_free (priv->desc);
 
   G_OBJECT_CLASS (meta_window_actor_parent_class)->finalize (object);
 }
@@ -852,25 +843,6 @@ meta_window_actor_is_override_redirect (MetaWindowActor *self)
   return meta_window_is_override_redirect (self->priv->window);
 }
 
-const char *meta_window_actor_get_description (MetaWindowActor *self)
-{
-  /*
-   * For windows managed by the WM, we just defer to the WM for the window
-   * description. For override-redirect windows, we create the description
-   * ourselves, but only on demand.
-   */
-  if (self->priv->window)
-    return meta_window_get_description (self->priv->window);
-
-  if (G_UNLIKELY (self->priv->desc == NULL))
-    {
-      self->priv->desc = g_strdup_printf ("Override Redirect (0x%x)",
-                                         (guint) self->priv->xwindow);
-    }
-
-  return self->priv->desc;
-}
-
 /**
  * meta_window_actor_get_workspace:
  * @self: #MetaWindowActor
@@ -1340,14 +1312,6 @@ meta_window_actor_destroy (MetaWindowActor *self)
 
   priv->needs_destroy = TRUE;
 
-  /*
-   * Once the window destruction is initiated we can no longer perform any
-   * furter X-based operations. For example, if we have a Map effect running,
-   * we cannot query the window geometry once the effect completes. So, flag
-   * this.
-   */
-  priv->no_more_x_calls = TRUE;
-
   if (!meta_window_actor_effect_in_progress (self))
     clutter_actor_destroy (CLUTTER_ACTOR (self));
 }

src/compositor/meta-window-group.c

@@ -91,8 +91,9 @@ meta_window_group_paint (ClutterActor *actor)
 {
   cairo_region_t *visible_region;
   ClutterActor *stage;
+  ClutterActorIter iter;
+  ClutterActor *child;
   cairo_rectangle_int_t visible_rect;
-  GList *children, *l;
   int paint_x_origin, paint_y_origin;
   int actor_x_origin, actor_y_origin;
   int paint_x_offset, paint_y_offset;
@@ -123,13 +124,6 @@ meta_window_group_paint (ClutterActor *actor)
   paint_x_offset = paint_x_origin - actor_x_origin;
   paint_y_offset = paint_y_origin - actor_y_origin;
 
-  /* We walk the list from top to bottom (opposite of painting order),
-   * and subtract the opaque area of each window out of the visible
-   * region that we pass to the windows below.
-   */
-  children = clutter_actor_get_children (actor);
-  children = g_list_reverse (children);
-
   /* Get the clipped redraw bounds from Clutter so that we can avoid
    * painting shadows on windows that don't need to be painted in this
    * frame. In the case of a multihead setup with mismatched monitor
@@ -151,12 +145,18 @@ meta_window_group_paint (ClutterActor *actor)
       cairo_region_subtract_rectangle (visible_region, &unredirected_rect);
     }
 
-  for (l = children; l; l = l->next)
+  /* We walk the list from top to bottom (opposite of painting order),
+   * and subtract the opaque area of each window out of the visible
+   * region that we pass to the windows below.
+   */
+  clutter_actor_iter_init (&iter, actor);
+  while (clutter_actor_iter_prev (&iter, &child))
     {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (l->data))
+      if (!CLUTTER_ACTOR_IS_VISIBLE (child))
         continue;
 
-      if (l->data == info->unredirected_window)
+      if (info->unredirected_window != NULL &&
+          child == CLUTTER_ACTOR (info->unredirected_window))
         continue;
 
       /* If an actor has effects applied, then that can change the area
@@ -175,12 +175,12 @@ meta_window_group_paint (ClutterActor *actor)
        * as well for the same reason, but omitted for simplicity in the
        * hopes that no-one will do that.
        */
-      if (clutter_actor_has_effects (l->data))
+      if (clutter_actor_has_effects (child))
         continue;
 
-      if (META_IS_WINDOW_ACTOR (l->data))
+      if (META_IS_WINDOW_ACTOR (child))
         {
-          MetaWindowActor *window_actor = l->data;
+          MetaWindowActor *window_actor = META_WINDOW_ACTOR (child);
           int x, y;
 
           if (!meta_actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
@@ -204,13 +204,12 @@ meta_window_group_paint (ClutterActor *actor)
           meta_window_actor_set_visible_region_beneath (window_actor, visible_region);
           cairo_region_translate (visible_region, x, y);
         }
-      else if (META_IS_BACKGROUND_ACTOR (l->data) ||
+      else if (META_IS_BACKGROUND_ACTOR (child) ||
-               META_IS_BACKGROUND_GROUP (l->data))
+               META_IS_BACKGROUND_GROUP (child))
         {
-          ClutterActor *background_actor = l->data;
           int x, y;
 
-          if (!meta_actor_is_untransformed (CLUTTER_ACTOR (background_actor), &x, &y))
+          if (!meta_actor_is_untransformed (child, &x, &y))
             continue;
 
           x += paint_x_offset;
@@ -218,10 +217,10 @@ meta_window_group_paint (ClutterActor *actor)
 
           cairo_region_translate (visible_region, - x, - y);
 
-          if (META_IS_BACKGROUND_GROUP (background_actor))
+          if (META_IS_BACKGROUND_GROUP (child))
-            meta_background_group_set_visible_region (META_BACKGROUND_GROUP (background_actor), visible_region);
+            meta_background_group_set_visible_region (META_BACKGROUND_GROUP (child), visible_region);
           else
-            meta_background_actor_set_visible_region (META_BACKGROUND_ACTOR (background_actor), visible_region);
+            meta_background_actor_set_visible_region (META_BACKGROUND_ACTOR (child), visible_region);
           cairo_region_translate (visible_region, x, y);
         }
     }
@@ -233,21 +232,20 @@ meta_window_group_paint (ClutterActor *actor)
   /* Now that we are done painting, unset the visible regions (they will
    * mess up painting clones of our actors)
    */
-  for (l = children; l; l = l->next)
+  clutter_actor_iter_init (&iter, actor);
+  while (clutter_actor_iter_next (&iter, &child))
     {
-      if (META_IS_WINDOW_ACTOR (l->data))
+      if (META_IS_WINDOW_ACTOR (child))
         {
-          MetaWindowActor *window_actor = l->data;
+          MetaWindowActor *window_actor = META_WINDOW_ACTOR (child);
           meta_window_actor_reset_visible_regions (window_actor);
         }
-      else if (META_IS_BACKGROUND_ACTOR (l->data))
+      else if (META_IS_BACKGROUND_ACTOR (child))
         {
-          MetaBackgroundActor *background_actor = l->data;
+          MetaBackgroundActor *background_actor = META_BACKGROUND_ACTOR (child);
           meta_background_actor_set_visible_region (background_actor, NULL);
         }
     }
-
-  g_list_free (children);
 }
 
 static gboolean

src/core/display-private.h

@@ -460,7 +460,8 @@ void meta_display_remove_autoraise_callback (MetaDisplay *display);
 void meta_display_overlay_key_activate (MetaDisplay *display);
 void meta_display_accelerator_activate (MetaDisplay *display,
                                         guint        action,
-                                        guint        deviceid);
+                                        guint        deviceid,
+                                        guint        timestamp);
 gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display);
 
 /* In above-tab-keycode.c */

src/core/display.c

@@ -254,7 +254,7 @@ meta_display_class_init (MetaDisplayClass *klass)
                   G_SIGNAL_RUN_LAST,
                   0,
                   NULL, NULL, NULL,
-                  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
+                  G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
 
   /**
    * MetaDisplay::modifiers-accelerator-activated:
@@ -2494,30 +2494,12 @@ event_callback (XEvent   *event,
                   /* This is from our synchronous grab since
                    * it has no modifiers and was on the client window
                    */
-                  int mode;
-              
-                  /* When clicking a different app in click-to-focus
-                   * in application-based mode, and the different
-                   * app is not a dock or desktop, eat the focus click.
-                   */
-                  if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
-                      meta_prefs_get_application_based () &&
-                      !window->has_focus &&
-                      window->type != META_WINDOW_DOCK &&
-                      window->type != META_WINDOW_DESKTOP &&
-                      (display->focus_window == NULL ||
-                       !meta_window_same_application (window,
-                                                      display->focus_window)))
-                    mode = XIAsyncDevice; /* eat focus click */
-                  else
-                    mode = XIReplayDevice; /* give event back */
 
-                  meta_verbose ("Allowing events mode %s time %u\n",
+                  meta_verbose ("Allowing events time %u\n",
-                                mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
                                 (unsigned int)device_event->time);
 
                   XIAllowEvents (display->xdisplay, device_event->deviceid,
-                                 mode, device_event->time);
+                                 XIReplayDevice, device_event->time);
                 }
 
               if (begin_move && window->has_move_func)
@@ -3790,6 +3772,12 @@ meta_spew_event (MetaDisplay *display,
   if (event->type == (display->damage_event_base + XDamageNotify))
     return;
 
+  if (event->type == (display->xsync_event_base + XSyncAlarmNotify))
+    return;
+
+  if (event->type == PropertyNotify && event->xproperty.atom == display->atom__NET_WM_USER_TIME)
+    return;
+
   input_event = get_input_event (display, event);
 
   if (input_event)
@@ -5904,10 +5892,11 @@ meta_display_overlay_key_activate (MetaDisplay *display)
 void
 meta_display_accelerator_activate (MetaDisplay *display,
                                    guint        action,
-                                   guint        deviceid)
+                                   guint        deviceid,
+                                   guint        timestamp)
 {
   g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED],
-                 0, action, deviceid);
+                 0, action, deviceid, timestamp);
 }
 
 gboolean

src/core/keybindings.c

@@ -1312,7 +1312,7 @@ handle_external_grab (MetaDisplay    *display,
   guint action = meta_display_get_keybinding_action (display,
                                                      binding->keycode,
                                                      binding->mask);
-  meta_display_accelerator_activate (display, action, event->deviceid);
+  meta_display_accelerator_activate (display, action, event->deviceid, event->time);
 }
 
 

src/core/prefs.c

@@ -89,7 +89,6 @@ static GDesktopTitlebarAction action_double_click_titlebar = G_DESKTOP_TITLEBAR_
 static GDesktopTitlebarAction action_middle_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_LOWER;
 static GDesktopTitlebarAction action_right_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_MENU;
 static gboolean dynamic_workspaces = FALSE;
-static gboolean application_based = FALSE;
 static gboolean disable_workarounds = FALSE;
 static gboolean auto_raise = FALSE;
 static gboolean auto_raise_delay = 500;
@@ -298,13 +297,6 @@ static MetaBoolPreference preferences_bool[] =
       },
       &dynamic_workspaces,
     },
-    {
-      { "application-based",
-        SCHEMA_GENERAL,
-        META_PREF_APPLICATION_BASED,
-      },
-      NULL, /* feature is known but disabled */
-    },
     {
       { "disable-workarounds",
         SCHEMA_GENERAL,
@@ -1723,14 +1715,6 @@ meta_prefs_get_dynamic_workspaces (void)
   return dynamic_workspaces;
 }
 
-gboolean
-meta_prefs_get_application_based (void)
-{
-  return FALSE; /* For now, we never want this to do anything */
-  
-  return application_based;
-}
-
 gboolean
 meta_prefs_get_disable_workarounds (void)
 {
@@ -1768,9 +1752,6 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_NUM_WORKSPACES:
       return "NUM_WORKSPACES";
 
-    case META_PREF_APPLICATION_BASED:
-      return "APPLICATION_BASED";
-
     case META_PREF_KEYBINDINGS:
       return "KEYBINDINGS";
 

src/meta/meta-window-actor.h

@@ -64,7 +64,6 @@ gint               meta_window_actor_get_workspace        (MetaWindowActor *self
 MetaWindow *       meta_window_actor_get_meta_window      (MetaWindowActor *self);
 ClutterActor *     meta_window_actor_get_texture          (MetaWindowActor *self);
 gboolean           meta_window_actor_is_override_redirect (MetaWindowActor *self);
-const char *       meta_window_actor_get_description      (MetaWindowActor *self);
 gboolean       meta_window_actor_showing_on_its_workspace (MetaWindowActor *self);
 gboolean       meta_window_actor_is_destroyed (MetaWindowActor *self);
 

src/meta/prefs.h

@@ -49,7 +49,6 @@
  * @META_PREF_TITLEBAR_FONT: title-bar font
  * @META_PREF_NUM_WORKSPACES: number of workspaces
  * @META_PREF_DYNAMIC_WORKSPACES: dynamic workspaces
- * @META_PREF_APPLICATION_BASED: application-based
  * @META_PREF_KEYBINDINGS: keybindings
  * @META_PREF_DISABLE_WORKAROUNDS: disable workarounds
  * @META_PREF_BUTTON_LAYOUT: button layout
@@ -88,7 +87,6 @@ typedef enum
   META_PREF_TITLEBAR_FONT,
   META_PREF_NUM_WORKSPACES,
   META_PREF_DYNAMIC_WORKSPACES,
-  META_PREF_APPLICATION_BASED,
   META_PREF_KEYBINDINGS,
   META_PREF_DISABLE_WORKAROUNDS,
   META_PREF_BUTTON_LAYOUT,
@@ -136,7 +134,6 @@ const char*                 meta_prefs_get_theme              (void);
 const PangoFontDescription* meta_prefs_get_titlebar_font      (void);
 int                         meta_prefs_get_num_workspaces     (void);
 gboolean                    meta_prefs_get_dynamic_workspaces (void);
-gboolean                    meta_prefs_get_application_based  (void);
 gboolean                    meta_prefs_get_disable_workarounds (void);
 gboolean                    meta_prefs_get_auto_raise         (void);
 int                         meta_prefs_get_auto_raise_delay   (void);