<br><br><div class="gmail_quote">On Sun, Nov 4, 2012 at 5:47 PM, Scott Moreau <span dir="ltr"><<a href="mailto:oreaus@gmail.com" target="_blank">oreaus@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
This code was confusing and the fallback paths are never used here. The<br>
fallback is already set accordingly when configured_output_list is built.<br>
---<br>
<br>
This patch probably depends on "compisitor-x11: Handle --fullscreen better."<br>
<br>
src/compositor-x11.c | 8 ++++----<br>
1 file changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/compositor-x11.c b/src/compositor-x11.c<br>
index 75de857..e410ab2 100644<br>
--- a/src/compositor-x11.c<br>
+++ b/src/compositor-x11.c<br>
@@ -1201,8 +1201,8 @@ x11_compositor_create(struct wl_display *display,<br>
if (x11_input_create(c, no_input) < 0)<br>
goto err_egl;<br>
<br>
- width = option_width ? option_width : 1024;<br>
- height = option_height ? option_height : 640;<br>
+ width = option_width;<br>
+ height = option_height;<br>
count = option_count ? option_count : 1;<br>
<br>
wl_list_for_each(o, &configured_output_list, link) {<br>
@@ -1211,9 +1211,9 @@ x11_compositor_create(struct wl_display *display,<br>
o->height = c->screen->height_in_pixels;<br>
}<br>
output = x11_compositor_create_output(c, x, 0,<br>
- option_width ? width :<br>
+ width ? width :<br>
o->width,<br>
- option_height ? height :<br>
+ height ? height :<br>
o->height,<br>
fullscreen, no_input,<br>
o->name, o->transform);<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.11.7<br>
<br></font></span></blockquote><div><br><br>Sorry, please disregard this patch. I see now why I had to do it this way. This patch would break the x11 backend if there are no configured outputs.<br><br><br>Thanks,<br><br>
Scott<br></div></div><br>