*/
#include "ivi-compositor.h"
+#include "policy.h"
#include <assert.h>
#include <errno.h>
#include <libweston/weston-log.h>
#include "shared/os-compatibility.h"
+#include "shared/helpers.h"
#include "agl-shell-server-protocol.h"
struct weston_config_section *section;
int use_current_mode = 0;
int use_pixman = 0;
- int use_shadow;
+ bool use_shadow;
int ret;
const struct weston_option options[] = {
bool *use_pixman, bool *fullscreen, int *output_count)
{
struct weston_config_section *section;
- int pixman;
+ bool pixman;
int fs = 0;
const struct weston_option options[] = {
struct xkb_rule_names xkb_names;
struct weston_config_section *section;
int repaint_msec;
- int vt_switching;
- int require_input;
+ bool vt_switching;
+ bool require_input;
/* agl-compositor.ini [keyboard] */
section = weston_config_get_section(config, "keyboard", NULL, NULL);
int version = 0;
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;
+ int ret = EXIT_FAILURE;
const struct weston_option core_options[] = {
{ WESTON_OPTION_STRING, "backend", 'B', &backend },
{ WESTON_OPTION_BOOLEAN, "version", 0, &version },
{ WESTON_OPTION_BOOLEAN, "no-config", 0, &no_config },
{ WESTON_OPTION_STRING, "config", 'c', &config_file },
- { WESTON_OPTION_BOOLEAN, "debug", 0, &debug_protocol },
};
wl_list_init(&ivi.outputs);
wl_list_init(&ivi.surfaces);
wl_list_init(&ivi.pending_surfaces);
+ wl_list_init(&ivi.popup_pending_apps);
wl_list_init(&ivi.desktop_clients);
/* Prevent any clients we spawn getting our stdin */
log_ctx = weston_log_ctx_compositor_create();
if (!log_ctx) {
fprintf(stderr, "Failed to initialize weston debug framework.\n");
- return EXIT_FAILURE;
+ return ret;
}
log_scope = weston_compositor_add_log_scope(log_ctx, "log",
"agl-compositor log\n",
- NULL, NULL);
+ NULL, NULL, NULL);
log_file_open(log);
weston_log_set_handler(vlog, vlog_continue);
logger = weston_log_subscriber_create_log(logfile);
+ weston_log_subscribe(log_ctx, logger, "log");
if (load_config(&ivi.config, no_config, config_file) < 0)
goto error_signals;
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;
wl_display_run(display);
+ ret = ivi.compositor->exit_code;
+
wl_display_destroy_clients(display);
error_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])
log_file_close();
if (ivi.config)
weston_config_destroy(ivi.config);
+
+ return ret;
}