mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore surface.map_toplevel() if already mapped

Browse source
This commit is contained in:
Kristian Høgsberg 2011-01-07 08:38:56 -05:00
parent 175e6cec39
commit 8f66a57b4d
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compositor/compositor.c
View file

@ -130,6 +130,7 @@ wlsc_surface_create(struct wlsc_compositor *compositor,
wl_list_init(&surface->surface.destroy_listener_list); wl_list_init(&surface->surface.destroy_listener_list);
wl_list_init(&surface->link); wl_list_init(&surface->link);
surface->mapped = 0;
glGenTextures(1, &surface->texture); glGenTextures(1, &surface->texture);
glBindTexture(GL_TEXTURE_2D, surface->texture); glBindTexture(GL_TEXTURE_2D, surface->texture);
@ -440,12 +441,16 @@ surface_map_toplevel(struct wl_client *client,
{ {
struct wlsc_surface *es = (struct wlsc_surface *) surface; struct wlsc_surface *es = (struct wlsc_surface *) surface;
if (es->mapped)
return;
es->x = 10 + random() % 400; es->x = 10 + random() % 400;
es->y = 10 + random() % 400; es->y = 10 + random() % 400;
wlsc_surface_update_matrix(es); wlsc_surface_update_matrix(es);
wl_list_insert(es->compositor->surface_list.prev, &es->link); wl_list_insert(es->compositor->surface_list.prev, &es->link);
wlsc_compositor_schedule_repaint(es->compositor); wlsc_compositor_schedule_repaint(es->compositor);
es->mapped = 1;
} }
static void static void

1
compositor/compositor.h
View file

@ -146,6 +146,7 @@ struct wlsc_surface {
struct wlsc_matrix matrix_inv; struct wlsc_matrix matrix_inv;
struct wl_visual *visual; struct wl_visual *visual;
struct wl_buffer *buffer; struct wl_buffer *buffer;
int mapped;
}; };
void void