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

compositor: Export functions and add weston_suface::force_configure for fullscreen

Browse Source 
This will facilitate the implementation of fullscreen.

Signed-off-by: Alex Wu <zhiwen.wu@linux.intel.com>
This commit is contained in:
Alex Wu
2012-02-28 18:07:54 +08:00
committed by Kristian Høgsberg
parent c6d7f60b19
commit 8811bf9e8d
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+13 -2
View File
@@ -212,6 +212,7 @@ weston_surface_create(struct weston_compositor *compositor)
surface->buffer = NULL; surface->buffer = NULL;
surface->output = NULL; surface->output = NULL;
surface->force_configure = 0;
pixman_region32_init(&surface->damage); pixman_region32_init(&surface->damage);
pixman_region32_init(&surface->opaque); pixman_region32_init(&surface->opaque);
@@ -231,7 +232,7 @@ weston_surface_create(struct weston_compositor *compositor)
return surface; return surface;
} }
static void WL_EXPORT void
weston_surface_set_color(struct weston_surface *surface, weston_surface_set_color(struct weston_surface *surface,
GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
{ {
@@ -639,6 +640,15 @@ destroy_surface(struct wl_resource *resource)
free(surface); free(surface);
} }
WL_EXPORT void
weston_surface_destroy(struct weston_surface *surface)
{
/* Not a valid way to destroy a client surface */
assert(surface->surface.resource.client == NULL);
destroy_surface(&surface->surface.resource);
}
static void static void
weston_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface) weston_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
{ {
@@ -1132,7 +1142,7 @@ surface_attach(struct wl_client *client,
if (es->output == NULL) { if (es->output == NULL) {
shell->map(shell, es, buffer->width, buffer->height, sx, sy); shell->map(shell, es, buffer->width, buffer->height, sx, sy);
} else if (sx != 0 || sy != 0 || } else if (es->force_configure || sx != 0 || sy != 0 ||
es->geometry.width != buffer->width || es->geometry.width != buffer->width ||
es->geometry.height != buffer->height) { es->geometry.height != buffer->height) {
GLfloat from_x, from_y; GLfloat from_x, from_y;
@@ -1144,6 +1154,7 @@ surface_attach(struct wl_client *client,
es->geometry.x + to_x - from_x, es->geometry.x + to_x - from_x,
es->geometry.y + to_y - from_y, es->geometry.y + to_y - from_y,
buffer->width, buffer->height); buffer->width, buffer->height);
es->force_configure = 0;
} }
weston_buffer_attach(buffer, &es->surface); weston_buffer_attach(buffer, &es->surface);
src/compositor.h
+9
View File
@@ -301,6 +301,8 @@ struct weston_surface {
struct wl_buffer *buffer; struct wl_buffer *buffer;
struct wl_listener buffer_destroy_listener; struct wl_listener buffer_destroy_listener;
int force_configure;
}; };
void void
@@ -507,4 +509,11 @@ struct weston_zoom *
weston_zoom_run(struct weston_surface *surface, GLfloat start, GLfloat stop, weston_zoom_run(struct weston_surface *surface, GLfloat start, GLfloat stop,
weston_zoom_done_func_t done, void *data); weston_zoom_done_func_t done, void *data);
void
weston_surface_set_color(struct weston_surface *surface,
GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
void
weston_surface_destroy(struct weston_surface *surface);
#endif #endif