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

xwm: do not configure frame window None

Browse Source 
Spotted this in debug log:
[xwm-wm-x11] XWM: configure window 4194324: x=32 y=32 width=1920 height=1080 border_width=0 stack_mode=0
[xwm-wm-x11] XWM: configure window 0: width=1984 height=1144

Trying to configure window 0 makes no sense. So do not try.

To avoid patching two different places with the same thing, refactor the code
into a common helper.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2019-12-05 16:47:16 +02:00 committed by Daniel Stone
parent dcd2b420a6
commit 2add217690
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
xwayland/window-manager.c
View File

@ -754,6 +754,23 @@ weston_wm_configure_window(struct weston_wm *wm, xcb_window_t window_id,
free(buf);
}
static void
weston_wm_window_configure_frame(struct weston_wm_window *window)
{
uint16_t mask;
uint32_t values[2];
int width, height;
if (!window->frame_id)
return;
weston_wm_window_get_frame_size(window, &width, &height);
values[0] = width;
values[1] = height;
mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;
weston_wm_configure_window(window->wm, window->frame_id, mask, values);
}
static void
weston_wm_handle_configure_request(struct weston_wm *wm, xcb_generic_event_t *event)
{
@ -762,7 +779,8 @@ weston_wm_handle_configure_request(struct weston_wm *wm, xcb_generic_event_t *ev
struct weston_wm_window *window;
uint32_t values[16];
uint16_t mask;
int x, y, width, height, i = 0;
int x, y;
int i = 0;
wm_printf(wm, "XCB_CONFIGURE_REQUEST (window %d) %d,%d @ %dx%d\n",
configure_request->window,
@ -806,13 +824,7 @@ weston_wm_handle_configure_request(struct weston_wm *wm, xcb_generic_event_t *ev
}
weston_wm_configure_window(wm, window->id, mask, values);
weston_wm_window_get_frame_size(window, &width, &height);
values[0] = width;
values[1] = height;
mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;
weston_wm_configure_window(wm, window->frame_id, mask, values);
weston_wm_window_configure_frame(window);
weston_wm_window_schedule_repaint(window);
}
@ -2687,7 +2699,7 @@ weston_wm_window_configure(void *data)
struct weston_wm_window *window = data;
struct weston_wm *wm = window->wm;
uint32_t values[4];
int x, y, width, height;
int x, y;
if (window->configure_source) {
wl_event_source_remove(window->configure_source);
@ -2708,14 +2720,7 @@ weston_wm_window_configure(void *data)
XCB_CONFIG_WINDOW_HEIGHT,
values);
weston_wm_window_get_frame_size(window, &width, &height);
values[0] = width;
values[1] = height;
weston_wm_configure_window(wm, window->frame_id,
XCB_CONFIG_WINDOW_WIDTH |
XCB_CONFIG_WINDOW_HEIGHT,
values);
weston_wm_window_configure_frame(window);
weston_wm_window_schedule_repaint(window);
}