*/
#include "ivi-compositor.h"
+#include "policy.h"
#include <assert.h>
#include <errno.h>
#include <unistd.h>
#include <linux/input.h>
-#include <libweston-6/compositor-drm.h>
-#include <libweston-6/compositor-wayland.h>
-#include <libweston-6/compositor-x11.h>
-#include <libweston-6/compositor.h>
-#include <libweston-6/windowed-output-api.h>
-#include <libweston-6/config-parser.h>
+#include <libweston/backend-drm.h>
+#include <libweston/backend-wayland.h>
+#ifdef HAVE_BACKEND_X11
+#include <libweston/backend-x11.h>
+#endif
+#include <libweston/libweston.h>
+#include <libweston/windowed-output-api.h>
+#include <libweston/config-parser.h>
+#include <libweston/weston-log.h>
#include "shared/os-compatibility.h"
+#include "shared/helpers.h"
#include "agl-shell-server-protocol.h"
return output;
}
-static void
-ivi_output_destroy(struct ivi_output *output)
-{
- weston_output_destroy(output->output);
- free(output->name);
- wl_list_remove(&output->link);
- free(output);
-}
-
static int
count_heads(struct weston_output *output)
{
weston_head_detach(head);
if (count_heads(ivi_output->output) == 0) {
- ivi_output_destroy(ivi_output);
weston_output_disable(ivi_output->output);
}
}
return windowed_create_outputs(ivi, output_count, "WL", "wayland");
}
+#ifdef HAVE_BACKEND_X11
static int
load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
{
return windowed_create_outputs(ivi, output_count, "X", "screen");
}
+#else
+static int
+load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
+{
+ return -1;
+}
+#endif
static int
load_backend(struct ivi_compositor *ivi, const char *backend,
struct ivi_surface *surface;
surface = to_ivi_surface(main_surface);
- if (!surface || surface->role != IVI_SURFACE_ROLE_DESKTOP)
+ if (!surface)
return;
weston_seat_set_keyboard_focus(seat, focus);
global_filter(const struct wl_client *client, const struct wl_global *global,
void *data)
{
-#if 0
- struct ivi_compositor *ivi = data;
- const struct wl_interface *iface = wl_global_get_interface(global);
-
- if (iface == &agl_shell_interface)
- return client == ivi->shell_client.client;
-#endif
-
return true;
}
}
static FILE *logfile;
-//static struct weston_log_scope *log_scope;
-//static struct weston_log_scope *protocol_scope;
static int
log_timestamp(void)
exit(error_code);
}
+static void
+ivi_compositor_get_quirks(struct ivi_compositor *ivi)
+{
+ struct weston_config_section *section;
+
+ if (!ivi->config)
+ return;
+
+ section = weston_config_get_section(ivi->config, "shell", NULL, NULL);
+ weston_config_section_get_bool(section, "activate-by-default",
+ &ivi->quirks.activate_apps_by_default, 0);
+
+}
+
int main(int argc, char *argv[])
{
struct ivi_compositor ivi = { 0 };
- struct wl_display *display;
+ struct wl_display *display = NULL;
struct wl_event_loop *loop;
struct wl_event_source *signals[3] = { 0 };
struct weston_config_section *section;
int no_config = 0;
char *config_file = NULL;
int debug_protocol = 0;
+ struct weston_log_context *log_ctx = NULL;
+ struct weston_log_scope *log_scope;
+ struct weston_log_subscriber *logger;
const struct weston_option core_options[] = {
{ WESTON_OPTION_STRING, "backend", 'B', &backend },
wl_list_init(&ivi.outputs);
wl_list_init(&ivi.surfaces);
- wl_list_init(&ivi.shell_clients);
wl_list_init(&ivi.pending_surfaces);
+ wl_list_init(&ivi.desktop_clients);
/* Prevent any clients we spawn getting our stdin */
os_fd_set_cloexec(STDIN_FILENO);
return EXIT_SUCCESS;
}
+ log_ctx = weston_log_ctx_compositor_create();
+ if (!log_ctx) {
+ fprintf(stderr, "Failed to initialize weston debug framework.\n");
+ return EXIT_FAILURE;
+ }
+
+ log_scope = weston_compositor_add_log_scope(log_ctx, "log",
+ "agl-compositor log\n",
+ NULL, NULL);
+
log_file_open(log);
weston_log_set_handler(vlog, vlog_continue);
+ logger = weston_log_subscriber_create_log(logfile);
+
if (load_config(&ivi.config, no_config, config_file) < 0)
goto error_signals;
section = weston_config_get_section(ivi.config, "core", NULL, NULL);
backend = choose_default_backend();
}
+ ivi_compositor_get_quirks(&ivi);
+
display = wl_display_create();
loop = wl_display_get_event_loop(display);
if (!signals[i])
goto error_signals;
-#if 0
- log_ctx = weston_log_ctx_compositor_create();
- if (!log_ctx) {
- weston_log("Failed to initialize weston debug framework.\n");
- goto error_signals;
- }
-#endif
-
- ivi.compositor = weston_compositor_create(display, &ivi);
+ ivi.compositor = weston_compositor_create(display, log_ctx, &ivi);
if (!ivi.compositor) {
weston_log("fatal: failed to create compositor.\n");
goto error_signals;
}
-#if 0
- if (debug_protocol)
- weston_compositor_enable_debug_protocol(ivi.compositor);
-#endif
-
if (compositor_init_config(ivi.compositor, ivi.config) < 0)
goto error_compositor;
if (ivi_desktop_init(&ivi) < 0)
goto error_compositor;
+ if (ivi_policy_init(&ivi) < 0)
+ goto error_compositor;
+
if (ivi_shell_init(&ivi) < 0)
goto error_compositor;
weston_compositor_flush_heads_changed(ivi.compositor);
+ ivi_shell_init_black_fs(&ivi);
+
if (create_listening_socket(display, socket_name) < 0)
goto error_compositor;
ivi_shell_create_global(&ivi);
ivi_launch_shell_client(&ivi);
+ ivi_agl_systemd_notify(&ivi);
wl_display_run(display);
wl_display_destroy_clients(display);
error_compositor:
+ weston_compositor_tear_down(ivi.compositor);
+
+ weston_compositor_log_scope_destroy(log_scope);
+ log_scope = NULL;
+
+ weston_log_ctx_compositor_destroy(ivi.compositor);
weston_compositor_destroy(ivi.compositor);
+ weston_log_subscriber_destroy_log(logger);
+
+ ivi_policy_destroy(ivi.policy);
+
error_signals:
for (size_t i = 0; i < ARRAY_LENGTH(signals); ++i)
if (signals[i])
Code Review / src / agl-compositor.git / blobdiff