#include "remote.h"
#endif
-#ifdef HAVE_WALTHAM
-#include <waltham-transmitter/transmitter_api.h>
-#endif
-
static int cached_tm_mday = -1;
static struct weston_log_scope *log_scope;
return -1;
}
-static int
+int
parse_activation_area(const char *geometry, struct ivi_output *output)
{
int n;
}
}
-#ifdef HAVE_WALTHAM
-static int
-load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config)
-{
- struct weston_compositor *compositor = ivi->compositor;
- int (*module_init)(struct weston_compositor *wc);
-
- module_init = weston_load_module("waltham-transmitter.so",
- "wet_module_init");
- if (!module_init)
- return -1;
-
- if (module_init(compositor) < 0)
- return -1;
-
- ivi->waltham_transmitter_api = weston_get_transmitter_api(compositor);
- if (!ivi->waltham_transmitter_api) {
- weston_log("Failed to load waltham-transmitter plugin.\n");
- return -1;
- }
-
- weston_log("waltham-transmitter plug-in loaded\n");
- return 0;
-}
-#else
-static int
-load_waltham_plugin(struct ivi_compositor *ivi, struct weston_config *config)
-{
- return -1;
-}
-#endif
-
#ifdef HAVE_REMOTING
static int
drm_backend_remoted_output_configure(struct weston_output *output,
goto err;
}
- if (weston_output_enable(ivi_output->output) < 0) {
+ if ((ret = weston_output_enable(ivi_output->output)) < 0) {
weston_log("Enabling remoted output \"%s\" failed.\n",
output_name);
goto err;
}
}
-static void
-ivi_enable_waltham_outputs(struct ivi_compositor *ivi)
-{
- struct weston_config_section *transmitter_section = NULL;
- const char *sect_name;
- struct weston_config *config = ivi->config;
-
- while (weston_config_next_section(config, &transmitter_section, §_name)) {
- if (strcmp(sect_name, "transmitter-output"))
- continue;
-
- struct ivi_output *ivi_output = NULL;
- bool output_found = false;
- char *_name = NULL;
-
- weston_config_section_get_string(transmitter_section,
- "name", &_name, NULL);
- wl_list_for_each(ivi_output, &ivi->outputs, link) {
- if (!strcmp(ivi_output->name, _name)) {
- output_found = true;
- break;
- }
- }
-
- if (output_found) {
- free(_name);
- continue;
- }
-
- ivi_output = zalloc(sizeof(*ivi_output));
- if (!ivi_output) {
- free(_name);
- continue;
- }
-
- ivi_output->ivi = ivi;
- ivi_output->name = _name;
- ivi_output->config = transmitter_section;
-
- if (remote_output_init(ivi_output, ivi->compositor,
- transmitter_section, ivi->remoting_api)) {
- free(ivi_output->name);
- free(ivi_output);
- continue;
- }
-
- ivi_output->type = OUTPUT_WALTHAM;
- ivi_output->output_destroy.notify = handle_output_destroy;
- weston_output_add_destroy_listener(ivi_output->output,
- &ivi_output->output_destroy);
-
- wl_list_insert(&ivi->outputs, &ivi_output->link);
- ivi_output_configure_app_id(ivi_output);
- }
-}
-
static int
load_remoting_plugin(struct ivi_compositor *ivi, struct weston_config *config)
{
}
load_remoting_plugin(ivi, ivi->config);
- load_waltham_plugin(ivi, ivi->config);
error:
free(config.gbm_format);
snprintf(buffer, sizeof buffer, "%.*s", (int) (end - p), p);
if (strstr(buffer, "xwayland.so")) {
- weston_log("Xwayland plug-in not supported!\n");
- p = end;
- while (*p == ',')
- p++;
- continue;
- }
-
- if (strstr(buffer, "systemd-notify.so")) {
+ *xwayland = true;
+ } else if (strstr(buffer, "systemd-notify.so")) {
weston_log("systemd-notify plug-in already loaded!\n");
- p = end;
- while (*p == ',')
- p++;
- continue;
- }
+ } else {
+ module_init = weston_load_module(buffer, "wet_module_init");
+ if (!module_init)
+ return -1;
- module_init = weston_load_module(buffer, "wet_module_init");
- if (!module_init)
- return -1;
+ if (module_init(ivi->compositor, *argc, argv) < 0)
+ return -1;
- if (module_init(ivi->compositor, *argc, argv) < 0)
- return -1;
+ }
p = end;
while (*p == ',')
return str;
}
+#if !defined(BUILD_XWAYLAND)
+int
+wet_load_xwayland(struct weston_compositor *comp)
+{
+ weston_log("Attempted to load xwayland library but compositor "
+ "was *not* built with xwayland support!\n");
+ return -1;
+}
+#endif
+
+static void
+weston_log_setup_scopes(struct weston_log_context *log_ctx,
+ struct weston_log_subscriber *subscriber,
+ const char *names)
+{
+ assert(log_ctx);
+ assert(subscriber);
+
+ char *tokenize = strdup(names);
+ char *token = strtok(tokenize, ",");
+ while (token) {
+ weston_log_subscribe(log_ctx, subscriber, token);
+ token = strtok(NULL, ",");
+ }
+ free(tokenize);
+}
+
+static void
+weston_log_subscribe_to_scopes(struct weston_log_context *log_ctx,
+ struct weston_log_subscriber *logger,
+ const char *debug_scopes)
+{
+ if (logger && debug_scopes)
+ weston_log_setup_scopes(log_ctx, logger, debug_scopes);
+ else
+ weston_log_subscribe(log_ctx, logger, "log");
+}
+
WL_EXPORT
int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
{
char *log = NULL;
char *modules = NULL;
char *option_modules = NULL;
+ char *debug_scopes = NULL;
int help = 0;
int version = 0;
int no_config = 0;
int debug = 0;
+ bool list_debug_scopes = false;
char *config_file = NULL;
struct weston_log_context *log_ctx = NULL;
struct weston_log_subscriber *logger;
{ WESTON_OPTION_BOOLEAN, "debug", 0, &debug },
{ WESTON_OPTION_STRING, "config", 'c', &config_file },
{ WESTON_OPTION_STRING, "modules", 0, &option_modules },
+ { WESTON_OPTION_STRING, "debug-scopes", 'l', &debug_scopes },
+ { WESTON_OPTION_STRING, "list-debug-scopes", 'L', &list_debug_scopes },
};
wl_list_init(&ivi.outputs);
weston_log_set_handler(vlog, vlog_continue);
logger = weston_log_subscriber_create_log(logfile);
- weston_log_subscribe(log_ctx, logger, "log");
+ weston_log_subscribe_to_scopes(log_ctx, logger, debug_scopes);
weston_log("Command line: %s\n", cmdline);
free(cmdline);
if (load_modules(&ivi, option_modules, &argc, argv, &xwayland) < 0)
goto error_compositor;
+ if (!xwayland) {
+ weston_config_section_get_bool(section, "xwayland", &xwayland,
+ false);
+ }
+
+ if (ivi_shell_init(&ivi) < 0)
+ goto error_compositor;
+
+ if (xwayland) {
+ if (wet_load_xwayland(ivi.compositor) < 0)
+ goto error_compositor;
+ }
+
if (ivi_policy_init(&ivi) < 0)
goto error_compositor;
- if (ivi_shell_init(&ivi) < 0)
+
+ if (list_debug_scopes) {
+ struct weston_log_scope *nscope = NULL;
+
+ weston_log("Printing available debug scopes:\n");
+
+ while ((nscope = weston_log_scopes_iterate(ivi.compositor, nscope))) {
+ weston_log("\tscope name: %s, desc: %s",
+ weston_log_scope_get_name(nscope),
+ weston_log_scope_get_description(nscope));
+ }
+
+ weston_log("\n");
+
goto error_compositor;
+ }
add_bindings(ivi.compositor);
if (ivi.remoting_api)
ivi_enable_remote_outputs(&ivi);
- if (ivi.waltham_transmitter_api)
- ivi_enable_waltham_outputs(&ivi);
-
if (create_listening_socket(display, socket_name) < 0)
goto error_compositor;