diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-06-01 11:14:02 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-06-01 11:14:38 -0400 |
| commit | c1be8e59de2e68764da4790064f337e788dfaf89 (patch) | |
| tree | 01a169db44bd8cd841925fb201063959ac6fbd63 /src/compositor-x11.c | |
| parent | baf43592855c78b36dee33cb0d8e325388ae2dd5 (diff) | |
Pass config_file through to weston_compositor_init
This allows us to do config parsing there.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src/compositor-x11.c')
| -rw-r--r-- | src/compositor-x11.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compositor-x11.c b/src/compositor-x11.c index ac6dce4..d23553e 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -848,7 +848,7 @@ x11_destroy(struct weston_compositor *ec) static struct weston_compositor * x11_compositor_create(struct wl_display *display, int width, int height, int count, int fullscreen, - int argc, char *argv[]) + int argc, char *argv[], const char *config_file) { struct x11_compositor *c; xcb_screen_iterator_t s; @@ -883,7 +883,8 @@ x11_compositor_create(struct wl_display *display, c->base.destroy = x11_destroy; /* Can't init base class until we have a current egl context */ - if (weston_compositor_init(&c->base, display, argc, argv) < 0) + if (weston_compositor_init(&c->base, display, argc, argv, + config_file) < 0) return NULL; for (i = 0, x = 0; i < count; i++) { @@ -907,7 +908,8 @@ x11_compositor_create(struct wl_display *display, } WL_EXPORT struct weston_compositor * -backend_init(struct wl_display *display, int argc, char *argv[]) +backend_init(struct wl_display *display, int argc, char *argv[], + const char *config_file) { int width = 1024, height = 640, fullscreen = 0, count = 1; @@ -922,5 +924,5 @@ backend_init(struct wl_display *display, int argc, char *argv[]) return x11_compositor_create(display, width, height, count, fullscreen, - argc, argv); + argc, argv, config_file); } |