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

libweston: Rename weston_surface::configure to ::committed

Browse Source 
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Acked-by: Giulio Camuffo <giulio.camuffo@kdab.com>

Differential Revision: https://phabricator.freedesktop.org/D1246
This commit is contained in:
Quentin Glidic
2016-08-12 10:41:33 +02:00
parent cde1345d69
commit 2edc3d5462
11 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/input-panel-ivi.c
+8 -8
View File
@@ -167,9 +167,9 @@ input_panel_get_label(struct weston_surface *surface, char *buf, size_t len)
}
static void
input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
input_panel_committed(struct weston_surface *surface, int32_t sx, int32_t sy)
{
struct input_panel_surface *ip_surface = surface->configure_private;
struct input_panel_surface *ip_surface = surface->committed_private;
struct ivi_shell *shell = ip_surface->shell;
struct weston_view *view;
float x, y;
@@ -202,7 +202,7 @@ destroy_input_panel_surface(struct input_panel_surface *input_panel_surface)
wl_list_remove(&input_panel_surface->surface_destroy_listener.link);
wl_list_remove(&input_panel_surface->link);
input_panel_surface->surface->configure = NULL;
input_panel_surface->surface->committed = NULL;
weston_surface_set_label_func(input_panel_surface->surface, NULL);
weston_view_destroy(input_panel_surface->view);
@@ -212,8 +212,8 @@ destroy_input_panel_surface(struct input_panel_surface *input_panel_surface)
static struct input_panel_surface *
get_input_panel_surface(struct weston_surface *surface)
{
if (surface->configure == input_panel_configure) {
return surface->configure_private;
if (surface->committed == input_panel_committed) {
return surface->committed_private;
} else {
return NULL;
}
@@ -243,8 +243,8 @@ create_input_panel_surface(struct ivi_shell *shell,
if (!input_panel_surface)
return NULL;
surface->configure = input_panel_configure;
surface->configure_private = input_panel_surface;
surface->committed = input_panel_committed;
surface->committed_private = input_panel_surface;
weston_surface_set_label_func(surface, input_panel_get_label);
input_panel_surface->shell = shell;
@@ -329,7 +329,7 @@ input_panel_get_input_panel_surface(struct wl_client *client,
if (!ipsurf) {
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
"surface->configure already set");
"surface->committed already set");
return;
}
ivi-shell/ivi-shell.c
+8 -8
View File
@@ -78,17 +78,17 @@ struct ivi_shell_setting
*/
static void
ivi_shell_surface_configure(struct weston_surface *, int32_t, int32_t);
ivi_shell_surface_committed(struct weston_surface *, int32_t, int32_t);
static struct ivi_shell_surface *
get_ivi_shell_surface(struct weston_surface *surface)
{
struct ivi_shell_surface *shsurf;
if (surface->configure != ivi_shell_surface_configure)
if (surface->committed != ivi_shell_surface_committed)
return NULL;
shsurf = surface->configure_private;
shsurf = surface->committed_private;
assert(shsurf);
assert(shsurf->surface == surface);
@@ -123,7 +123,7 @@ shell_surface_send_configure(struct weston_surface *surface,
}
static void
ivi_shell_surface_configure(struct weston_surface *surface,
ivi_shell_surface_committed(struct weston_surface *surface,
int32_t sx, int32_t sy)
{
struct ivi_shell_surface *ivisurf = get_ivi_shell_surface(surface);
@@ -166,8 +166,8 @@ layout_surface_cleanup(struct ivi_shell_surface *ivisurf)
ivi_layout_surface_destroy(ivisurf->layout_surface);
ivisurf->layout_surface = NULL;
ivisurf->surface->configure = NULL;
ivisurf->surface->configure_private = NULL;
ivisurf->surface->committed = NULL;
ivisurf->surface->committed_private = NULL;
weston_surface_set_label_func(ivisurf->surface, NULL);
ivisurf->surface = NULL;
@@ -298,8 +298,8 @@ application_surface_create(struct wl_client *client,
ivisurf->surface = weston_surface;
weston_surface->configure = ivi_shell_surface_configure;
weston_surface->configure_private = ivisurf;
weston_surface->committed = ivi_shell_surface_committed;
weston_surface->committed_private = ivisurf;
weston_surface_set_label_func(weston_surface,
ivi_shell_surface_get_label);