desktop: Install a black background for REMOTE roles

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

diff --git a/src/compositor.c b/src/compositor.c
index 4ac0d95..7540fe3 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -876,14 +876,15 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
        int use_current_mode = 0;
        int use_pixman = 0;
        bool use_shadow;
+       bool without_input = false;
        int ret;
 
        const struct weston_option options[] = {
                { WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
-               { WESTON_OPTION_INTEGER, "tty", 0, &config.tty },
                { WESTON_OPTION_STRING, "drm-device", 0, &config.specific_device },
                { WESTON_OPTION_BOOLEAN, "current-mode", 0, &use_current_mode },
                { WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
+               { WESTON_OPTION_BOOLEAN, "continue-without-input", false, &without_input }
        };
 
        parse_options(options, ARRAY_LENGTH(options), argc, argv);
@@ -898,6 +899,9 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
        weston_config_section_get_bool(section, "pixman-shadow", &use_shadow, 1);
        config.use_pixman_shadow = use_shadow;
 
+       if (without_input)
+               ivi->compositor->require_input = !without_input;
+
        ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
                                             &config.base);
        if (ret < 0)
@@ -1303,18 +1307,25 @@ to_ivi_surface(struct weston_surface *surface)
 
 static void
 activate_binding(struct weston_seat *seat,
-                struct weston_view *focus_view)
+                struct weston_view *focus_view, uint32_t flags)
 {
-       struct weston_surface *focus = focus_view->surface;
-       struct weston_surface *main_surface =
-               weston_surface_get_main_surface(focus);
-       struct ivi_surface *surface;
+       struct weston_surface *focus_surface;
+       struct weston_surface *main_surface;
+       struct ivi_surface *ivi_surface;
+       struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(seat);
+
+       if (!focus_view)
+               return;
+
+       focus_surface = focus_view->surface;
+       main_surface = weston_surface_get_main_surface(focus_surface);
 
-       surface = to_ivi_surface(main_surface);
-       if (!surface)
+       ivi_surface = to_ivi_surface(main_surface);
+       if (!ivi_surface)
                return;
 
-       weston_seat_set_keyboard_focus(seat, focus);
+       if (ivi_seat)
+               ivi_shell_activate_surface(ivi_surface, ivi_seat, flags);
 }
 
 static void
@@ -1327,7 +1338,8 @@ click_to_activate_binding(struct weston_pointer *pointer,
        if (pointer->focus == NULL)
                return;
 
-       activate_binding(pointer->seat, pointer->focus);
+       activate_binding(pointer->seat, pointer->focus,
+                        WESTON_ACTIVATE_FLAG_CLICKED);
 }
 
 static void
@@ -1340,7 +1352,8 @@ touch_to_activate_binding(struct weston_touch *touch,
        if (touch->focus == NULL)
                return;
 
-       activate_binding(touch->seat, touch->focus);
+       activate_binding(touch->seat, touch->focus,
+                        WESTON_ACTIVATE_FLAG_NONE);
 }
 
 static void
@@ -1589,7 +1602,7 @@ copy_command_line(int argc, char * const argv[])
 }
 
 WL_EXPORT
-int wet_main(int argc, char *argv[])
+int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
 {
        struct ivi_compositor ivi = { 0 };
        char *cmdline;
@@ -1678,8 +1691,10 @@ int wet_main(int argc, char *argv[])
                        backend = choose_default_backend();
        }
        /* from [core] */
-       weston_config_section_get_bool(section, "hide-cursor", &ivi.hide_cursor, false);
-       weston_config_section_get_bool(section, "activate-by-default", &ivi.activate_by_default, true);
+       weston_config_section_get_bool(section, "hide-cursor",
+                                      &ivi.hide_cursor, false);
+       weston_config_section_get_bool(section, "activate-by-default",
+                                      &ivi.activate_by_default, true);
 
        display = wl_display_create();
        loop = wl_display_get_event_loop(display);
@@ -1700,7 +1715,7 @@ int wet_main(int argc, char *argv[])
                if (!signals[i])
                        goto error_signals;
 
-       ivi.compositor = weston_compositor_create(display, log_ctx, &ivi);
+       ivi.compositor = weston_compositor_create(display, log_ctx, &ivi, test_data);
        if (!ivi.compositor) {
                weston_log("fatal: failed to create compositor.\n");
                goto error_signals;