xserver: Branch 'xwayland-1.12' - 2 commits
Kristian Høgsberg
krh at kemper.freedesktop.org
Wed Aug 1 10:43:16 PDT 2012
hw/xfree86/xwayland/xwayland-output.c | 9 ++++-----
hw/xfree86/xwayland/xwayland-private.h | 4 ----
hw/xfree86/xwayland/xwayland.c | 2 --
3 files changed, 4 insertions(+), 11 deletions(-)
New commits:
commit ce4ca685f4d46c2e53ef8dd87d05c5daf0ed75b0
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Wed Aug 1 13:44:08 2012 -0400
xwayland: Remove unused 'hack' fields
diff --git a/hw/xfree86/xwayland/xwayland-output.c b/hw/xfree86/xwayland/xwayland-output.c
index e3bbd87..f9e6067 100644
--- a/hw/xfree86/xwayland/xwayland-output.c
+++ b/hw/xfree86/xwayland/xwayland-output.c
@@ -267,9 +267,6 @@ display_handle_mode(void *data,
if (flags & WL_OUTPUT_MODE_CURRENT) {
xwl_output->width = width;
xwl_output->height = height;
-
- xwl_output->xwl_screen->width = width;
- xwl_output->xwl_screen->height = height;
}
}
diff --git a/hw/xfree86/xwayland/xwayland-private.h b/hw/xfree86/xwayland/xwayland-private.h
index 6322060..8d8590f 100644
--- a/hw/xfree86/xwayland/xwayland-private.h
+++ b/hw/xfree86/xwayland/xwayland-private.h
@@ -62,10 +62,6 @@ struct xwl_screen {
struct xorg_list window_list;
uint32_t serial;
- /* FIXME: Hack. */
- int32_t width, height;
- int32_t root_x, root_y;
-
CreateWindowProcPtr CreateWindow;
DestroyWindowProcPtr DestroyWindow;
RealizeWindowProcPtr RealizeWindow;
diff --git a/hw/xfree86/xwayland/xwayland.c b/hw/xfree86/xwayland/xwayland.c
index f32d561..67ac7d4 100644
--- a/hw/xfree86/xwayland/xwayland.c
+++ b/hw/xfree86/xwayland/xwayland.c
@@ -314,8 +314,6 @@ void xwl_screen_close(struct xwl_screen *xwl_screen)
xorg_list_init(&xwl_screen->seat_list);
xorg_list_init(&xwl_screen->damage_window_list);
xorg_list_init(&xwl_screen->window_list);
- xwl_screen->root_x = 0;
- xwl_screen->root_y = 0;
wl_display_roundtrip(xwl_screen->display);
}
commit d587d162c4149e7c258a0f3a2e3db064fc76eece
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Wed Aug 1 13:43:31 2012 -0400
xwayland: Add mode for current mode, not the last mode in the list
diff --git a/hw/xfree86/xwayland/xwayland-output.c b/hw/xfree86/xwayland/xwayland-output.c
index e596bbd..e3bbd87 100644
--- a/hw/xfree86/xwayland/xwayland-output.c
+++ b/hw/xfree86/xwayland/xwayland-output.c
@@ -264,11 +264,13 @@ display_handle_mode(void *data,
{
struct xwl_output *xwl_output = data;
- xwl_output->width = width;
- xwl_output->height = height;
+ if (flags & WL_OUTPUT_MODE_CURRENT) {
+ xwl_output->width = width;
+ xwl_output->height = height;
- xwl_output->xwl_screen->width = width;
- xwl_output->xwl_screen->height = height;
+ xwl_output->xwl_screen->width = width;
+ xwl_output->xwl_screen->height = height;
+ }
}
static const struct wl_output_listener output_listener = {
More information about the xorg-commit
mailing list