brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Remove width/height from meta_window_new_for_wayland

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-11-19 15:32:33 -05:00
parent ca342c4573
commit d945501be6
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/window-private.h
View File

@ -508,8 +508,6 @@ MetaWindow* meta_window_new_with_attrs (MetaDisplay *display,
MetaCompEffect effect, MetaCompEffect effect,
XWindowAttributes *attrs); XWindowAttributes *attrs);
MetaWindow *meta_window_new_for_wayland (MetaDisplay *display, MetaWindow *meta_window_new_for_wayland (MetaDisplay *display,
int width,
int height,
MetaWaylandSurface *surface); MetaWaylandSurface *surface);
void meta_window_unmanage (MetaWindow *window, void meta_window_unmanage (MetaWindow *window,
guint32 timestamp); guint32 timestamp);

6
src/core/window.c
View File

@ -1369,8 +1369,6 @@ display_notify_window (MetaDisplay *display, MetaWindow *window)
MetaWindow * MetaWindow *
meta_window_new_for_wayland (MetaDisplay *display, meta_window_new_for_wayland (MetaDisplay *display,
int width,
int height,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
{ {
XWindowAttributes attrs; XWindowAttributes attrs;
@ -1379,8 +1377,8 @@ meta_window_new_for_wayland (MetaDisplay *display,
attrs.x = 0; attrs.x = 0;
attrs.y = 0; attrs.y = 0;
attrs.width = width; attrs.width = 1;
attrs.height = height; attrs.height = 1;
attrs.border_width = 0; attrs.border_width = 0;
attrs.depth = 24; attrs.depth = 24;
attrs.visual = NULL; attrs.visual = NULL;

6
src/wayland/meta-wayland-surface.c
View File

@ -246,7 +246,6 @@ static void
surface_ensure_window (MetaWaylandSurface *surface) surface_ensure_window (MetaWaylandSurface *surface)
{ {
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_get_display ();
int width, height;
if (surface->window) if (surface->window)
return; return;
@ -254,10 +253,7 @@ surface_ensure_window (MetaWaylandSurface *surface)
if (!surface_wants_window (surface)) if (!surface_wants_window (surface))
return; return;
width = surface->buffer_ref.buffer->width; surface->window = meta_window_new_for_wayland (display, surface);
height = surface->buffer_ref.buffer->height;
surface->window = meta_window_new_for_wayland (display, width, height, surface);
} }
static void static void