}
surface->configure = black_surface_configure;
- surface->private = fs_surface;
+ surface->configure_private = fs_surface;
weston_surface_configure(surface, x, y, w, h);
weston_surface_set_color(surface, 0.0, 0.0, 0.0, 1);
pixman_region32_fini(&surface->opaque);
get_shell_surface(struct weston_surface *surface)
{
if (surface->configure == shell_surface_configure)
- return surface->private;
+ return surface->configure_private;
else
return NULL;
}
}
surface->configure = shell_surface_configure;
- surface->private = shsurf;
+ surface->configure_private = shsurf;
shsurf->shell = (struct desktop_shell *) shell;
shsurf->unresponsive = 0;
static void
background_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height)
{
- struct desktop_shell *shell = es->private;
+ struct desktop_shell *shell = es->configure_private;
configure_static_surface(es, &shell->background_layer, width, height);
}
}
surface->configure = background_configure;
- surface->private = shell;
+ surface->configure_private = shell;
surface->output = output_resource->data;
desktop_shell_send_configure(resource, 0,
surface_resource,
static void
panel_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height)
{
- struct desktop_shell *shell = es->private;
+ struct desktop_shell *shell = es->configure_private;
configure_static_surface(es, &shell->panel_layer, width, height);
}
}
surface->configure = panel_configure;
- surface->private = shell;
+ surface->configure_private = shell;
surface->output = output_resource->data;
desktop_shell_send_configure(resource, 0,
surface_resource,
static void
lock_surface_configure(struct weston_surface *surface, int32_t sx, int32_t sy, int32_t width, int32_t height)
{
- struct desktop_shell *shell = surface->private;
+ struct desktop_shell *shell = surface->configure_private;
if (width == 0)
return;
&shell->lock_surface_listener);
surface->configure = lock_surface_configure;
- surface->private = shell;
+ surface->configure_private = shell;
}
static void
{
if (es->configure == black_surface_configure) {
if (fs_surface)
- *fs_surface = (struct weston_surface *)es->private;
+ *fs_surface = (struct weston_surface *)es->configure_private;
return true;
}
return false;
static void
screensaver_configure(struct weston_surface *surface, int32_t sx, int32_t sy, int32_t width, int32_t height)
{
- struct desktop_shell *shell = surface->private;
+ struct desktop_shell *shell = surface->configure_private;
if (width == 0)
return;
struct weston_output *output = output_resource->data;
surface->configure = screensaver_configure;
- surface->private = shell;
+ surface->configure_private = shell;
surface->output = output;
}
get_input_panel_surface(struct weston_surface *surface)
{
if (surface->configure == input_panel_configure) {
- return surface->private;
+ return surface->configure_private;
} else {
return NULL;
}
return NULL;
surface->configure = input_panel_configure;
- surface->private = input_panel_surface;
+ surface->configure_private = input_panel_surface;
input_panel_surface->shell = shell;
static void
test_surface_configure(struct weston_surface *surface, int32_t sx, int32_t sy, int32_t width, int32_t height)
{
- struct weston_test_surface *test_surface = surface->private;
+ struct weston_test_surface *test_surface = surface->configure_private;
struct weston_test *test = test_surface->test;
if (wl_list_empty(&surface->layer_link))
struct weston_test_surface *test_surface;
surface->configure = test_surface_configure;
- if (surface->private == NULL)
- surface->private = malloc(sizeof *test_surface);
- test_surface = surface->private;
+ if (surface->configure_private == NULL)
+ surface->configure_private = malloc(sizeof *test_surface);
+ test_surface = surface->configure_private;
if (test_surface == NULL) {
wl_resource_post_no_memory(resource);
return;