diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-08-20 00:10:52 +0200 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2014-08-20 16:04:17 -0700 |
| commit | 7ba79bfec694181dc70a4759369a4fb4506cdca8 (patch) | |
| tree | d66497ecb4447b63d6f5cefc95930bb833d2a2c2 | |
| parent | 43f55fb150ac66498d29f33e5eaa49a1cb456f7e (diff) | |
| download | waffle-7ba79bfec694181dc70a4759369a4fb4506cdca8.tar.gz | |
x11: fix for a non-zero default screen
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
| -rw-r--r-- | src/waffle/x11/x11_window.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/waffle/x11/x11_window.c b/src/waffle/x11/x11_window.c index 582cc02..b2e3631 100644 --- a/src/waffle/x11/x11_window.c +++ b/src/waffle/x11/x11_window.c @@ -53,6 +53,19 @@ x11_winddow_get_depth(xcb_connection_t *conn, return 0; } +static xcb_screen_t * +get_xcb_screen(const xcb_setup_t *setup, int screen) +{ + xcb_screen_iterator_t iter; + + iter = xcb_setup_roots_iterator(setup); + for (; iter.rem; --screen, xcb_screen_next(&iter)) + if (screen == 0) + return iter.data; + + return NULL; +} + bool x11_window_init(struct x11_window *self, struct x11_display *dpy, @@ -75,7 +88,7 @@ x11_window_init(struct x11_window *self, goto error; } - const xcb_screen_t *screen = xcb_setup_roots_iterator(setup).data; + const xcb_screen_t *screen = get_xcb_screen(setup, dpy->screen); if (!screen) { wcore_errorf(WAFFLE_ERROR_UNKNOWN, "failed to get xcb screen"); goto error; |