grpc-proxy: Terminate thread when we're exiting

[src/agl-compositor.git] / src / layout.c

diff --git a/src/layout.c b/src/layout.c
index 8c8b4be..89c2097 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -170,6 +170,12 @@ ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output)
                        if (parse_activation_area(t, output) < 0)
                                weston_log("Invalid activation-area \"%s\" for output %s\n",
                                           t, output->name);
+               } else {
+                       weston_log("WARNING: activation-area detected in ini file, "
+                                       "but agl_shell override detected!\n");
+                       if (parse_activation_area(t, output) < 0)
+                               weston_log("Invalid activation-area \"%s\" for output %s\n",
+                                          t, output->name);
                }
        }
        free(t);
@@ -575,7 +581,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                        return;
                }
 
-               if (!surf->ivi->activate_by_default) {
+               if (!surf->ivi->activate_by_default && !surf->xwayland.is_set) {
                        weston_log("Refusing to activate surface role %d, app_id %s\n",
                                        surf->role, app_id);
 
@@ -605,7 +611,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                                 */
                                weston_log("Surface no app_id, role %s activating by default\n",
                                        ivi_layout_get_surface_role_name(surf));
-                               ivi_layout_activate_by_surf(r_output, surf);
+                               if (surf->xwayland.is_set) {
+                                       ivi_layout_activate_by_surf(r_output, surf);
+                                       ivi_layout_activate_complete(r_output, surf);
+                               } else {
+                                       ivi_layout_activate_by_surf(r_output, surf);
+                               }
                        }
                }