mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-x11: Wait for configure_notify for fullscreen

Browse Source 
Some window managers (kwin at least) don't give us our final fullscreen
size before map_notify.  Currently we stop waiting for configire_notify
once we get mapped and in case of kwin that means we don't receive our
fullscreen size configure_notify.  With this patch, if we don't get a
configure_notify before map_notify, we just wait for the first one after
map_notify and hope that's our size.

https://bugs.freedesktop.org/show_bug.cgi?id=60608
This commit is contained in:
Kristian Høgsberg
2013-02-14 21:14:11 -05:00
parent 81585e9d2a
commit 8e7adbff68
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-x11.c
+18 -6
View File
@@ -487,25 +487,32 @@ x11_output_wait_for_map(struct x11_compositor *c, struct x11_output *output)
xcb_map_notify_event_t *map_notify; xcb_map_notify_event_t *map_notify;
xcb_configure_notify_event_t *configure_notify; xcb_configure_notify_event_t *configure_notify;
xcb_generic_event_t *event; xcb_generic_event_t *event;
int mapped = 0; int mapped = 0, configured = 0;
uint8_t response_type; uint8_t response_type;
/* This isn't the nicest way to do this. Ideally, we could /* This isn't the nicest way to do this. Ideally, we could
* just go back to the main loop and once we get the map * just go back to the main loop and once we get the configure
* notify, we add the output to the compositor. While we do * notify, we add the output to the compositor. While we do
* support output hotplug, we can't start up with no outputs. * support output hotplug, we can't start up with no outputs.
* We could add the output and then resize once we get the map * We could add the output and then resize once we get the
* notify, but we don't want to start up and immediately * configure notify, but we don't want to start up and
* resize the output. */ * immediately resize the output.
*
* Also, some window managers don't give us our final
* fullscreen size before map_notify, so if we don't get a
* configure_notify before map_notify, we just wait for the
* first one and hope that's our size. */
xcb_flush(c->conn); xcb_flush(c->conn);
while (!mapped) { while (!mapped || !configured) {
event = xcb_wait_for_event(c->conn); event = xcb_wait_for_event(c->conn);
response_type = event->response_type & ~0x80; response_type = event->response_type & ~0x80;
switch (response_type) { switch (response_type) {
case XCB_MAP_NOTIFY: case XCB_MAP_NOTIFY:
fprintf(stderr, "got XCB_MAP_NOTIFY\n");
map_notify = (xcb_map_notify_event_t *) event; map_notify = (xcb_map_notify_event_t *) event;
if (map_notify->window == output->window) if (map_notify->window == output->window)
mapped = 1; mapped = 1;
@@ -515,8 +522,13 @@ x11_output_wait_for_map(struct x11_compositor *c, struct x11_output *output)
configure_notify = configure_notify =
(xcb_configure_notify_event_t *) event; (xcb_configure_notify_event_t *) event;
fprintf(stderr, "got XCB_CONFIGURE_NOTIFY %dx%d\n",
configure_notify->width,
configure_notify->height);
output->mode.width = configure_notify->width; output->mode.width = configure_notify->width;
output->mode.height = configure_notify->height; output->mode.height = configure_notify->height;
configured = 1;
break; break;
} }
} }