This lets modules parse options from the command line.
}
static int
-load_modules(struct weston_compositor *ec, const char *modules)
+load_modules(struct weston_compositor *ec, const char *modules,
+ int *argc, char *argv[], const char *config_file)
{
const char *p, *end;
char buffer[256];
- int (*module_init)(struct weston_compositor *ec);
+ int (*module_init)(struct weston_compositor *ec,
+ int *argc, char *argv[], const char *config_file);
if (modules == NULL)
return 0;
snprintf(buffer, sizeof buffer, "%.*s", (int) (end - p), p);
module_init = load_module(buffer, "module_init");
if (module_init)
- module_init(ec);
+ module_init(ec, argc, argv, config_file);
p = end;
while (*p == ',')
p++;
sigaction(SIGSEGV, &segv_action, NULL);
segv_compositor = ec;
-
- for (i = 1; i < argc; i++)
- weston_log("fatal: unhandled option: %s\n", argv[i]);
- if (argc > 1) {
- ret = EXIT_FAILURE;
- goto out;
- }
-
free(config_file);
ec->option_idle_time = idle_time;
setenv("WAYLAND_DISPLAY", socket_name, 1);
- if (load_modules(ec, modules) < 0)
+ if (load_modules(ec, modules, &argc, argv, config_file) < 0)
goto out;
- if (load_modules(ec, option_modules) < 0)
+ if (load_modules(ec, option_modules, &argc, argv, config_file) < 0)
goto out;
+ for (i = 1; i < argc; i++)
+ weston_log("fatal: unhandled option: %s\n", argv[i]);
+ if (argc > 1) {
+ ret = EXIT_FAILURE;
+ goto out;
+ }
+
if (wl_display_add_socket(display, socket_name)) {
weston_log("fatal: failed to add socket: %m\n");
ret = EXIT_FAILURE;
const char *config_file);
int
-module_init(struct weston_compositor *compositor);
+module_init(struct weston_compositor *compositor,
+ int *argc, char *argv[], const char *config_file);
void
weston_transformed_coord(int width, int height,
}
static void
-shell_configuration(struct desktop_shell *shell)
+shell_configuration(struct desktop_shell *shell, const char *config_file)
{
- char *config_file;
char *path = NULL;
int duration = 60;
unsigned int num_workspaces = DEFAULT_NUM_WORKSPACES;
{ "screensaver", saver_keys, ARRAY_LENGTH(saver_keys), NULL },
};
- config_file = config_file_path("weston.ini");
parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
- free(config_file);
shell->screensaver.path = path;
shell->screensaver.duration = duration;
}
WL_EXPORT int
-module_init(struct weston_compositor *ec)
+module_init(struct weston_compositor *ec,
+ int *argc, char *argv[], const char *config_file)
{
struct weston_seat *seat;
struct desktop_shell *shell;
wl_array_init(&shell->workspaces.array);
wl_list_init(&shell->workspaces.client_list);
- shell_configuration(shell);
+ shell_configuration(shell, config_file);
for (i = 0; i < shell->workspaces.num; i++) {
pws = wl_array_add(&shell->workspaces.array, sizeof *pws);
}
WL_EXPORT int
-module_init(struct weston_compositor *compositor)
+module_init(struct weston_compositor *compositor,
+ int *argc, char *argv[], const char *config_file)
{
struct tablet_shell *shell;
struct wl_event_loop *loop;
}
WL_EXPORT int
-module_init(struct weston_compositor *compositor)
+module_init(struct weston_compositor *compositor,
+ int *argc, char *argv[], const char *config_file)
+
{
struct wl_display *display = compositor->wl_display;
struct weston_xserver *wxs;
}
WL_EXPORT int
-module_init(struct weston_compositor *compositor)
+module_init(struct weston_compositor *compositor,
+ int *argc, char *argv[], const char *config_file)
{
struct wl_event_loop *loop;
}
WL_EXPORT int
-module_init(struct weston_compositor *compositor)
+module_init(struct weston_compositor *compositor,
+ int *argc, char *argv[], const char *config_file)
{
struct wl_event_loop *loop;
}
WL_EXPORT int
-module_init(struct weston_compositor *ec)
+module_init(struct weston_compositor *ec,
+ int *argc, char *argv[], const char *config_file)
{
struct weston_test *test;
struct wl_event_loop *loop;