Refine previous fix of x_set_window_size to handle Bug#17077.