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

compositor: make functions static

Browse Source 
I know it's hard to figure out what the shells or backends will be
using as internal API at this point but we can try to minimize the
amount of WL_EXPORT being used anyway.

[pq: redone due to my earlier changes]

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Tiago Vignatti 2012-02-10 16:26:19 +02:00 committed by Pekka Paalanen
parent 0f997016a7
commit 9d3935296c
2 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/compositor.c
View File

@ -450,7 +450,7 @@ weston_surface_from_global(struct weston_surface *surface,
*sy = floorf(syf);
}
WL_EXPORT void
static void
weston_surface_damage_rectangle(struct weston_surface *surface,
int32_t sx, int32_t sy,
int32_t width, int32_t height)
@ -484,7 +484,7 @@ weston_surface_damage(struct weston_surface *surface)
weston_compositor_schedule_repaint(surface->compositor);
}
WL_EXPORT void
static void
weston_surface_damage_below(struct weston_surface *surface)
{
weston_surface_update_transform(surface);
@ -528,7 +528,25 @@ weston_compositor_get_time(void)
return tv.tv_sec * 1000 + tv.tv_usec / 1000;
}
WL_EXPORT void
static struct weston_surface *
weston_compositor_pick_surface(struct weston_compositor *compositor,
int32_t x, int32_t y, int32_t *sx, int32_t *sy)
{
struct weston_surface *surface;
wl_list_for_each(surface, &compositor->surface_list, link) {
if (surface->surface.resource.client == NULL)
continue;
weston_surface_from_global(surface, x, y, sx, sy);
if (0 <= *sx && *sx < surface->geometry.width &&
0 <= *sy && *sy < surface->geometry.height)
return surface;
}
return NULL;
}
static void
weston_device_repick(struct wl_input_device *device, uint32_t time)
{
struct weston_input_device *wd = (struct weston_input_device *) device;
@ -1246,24 +1264,6 @@ const static struct wl_compositor_interface compositor_interface = {
compositor_create_surface,
};
WL_EXPORT struct weston_surface *
weston_compositor_pick_surface(struct weston_compositor *compositor,
int32_t x, int32_t y, int32_t *sx, int32_t *sy)
{
struct weston_surface *surface;
wl_list_for_each(surface, &compositor->surface_list, link) {
if (surface->surface.resource.client == NULL)
continue;
weston_surface_from_global(surface, x, y, sx, sy);
if (0 <= *sx && *sx < surface->geometry.width &&
0 <= *sy && *sy < surface->geometry.height)
return surface;
}
return NULL;
}
WL_EXPORT void
weston_compositor_wake(struct weston_compositor *compositor)
{

14
src/compositor.h
View File

@ -310,9 +310,6 @@ void
weston_surface_from_global(struct weston_surface *surface,
int32_t x, int32_t y, int32_t *sx, int32_t *sy);
void
weston_device_repick(struct wl_input_device *device, uint32_t time);
void
weston_spring_init(struct weston_spring *spring,
double k, double current, double target);
@ -356,9 +353,6 @@ void
weston_output_finish_frame(struct weston_output *output, int msecs);
void
weston_output_damage(struct weston_output *output);
struct weston_surface *
weston_compositor_pick_surface(struct weston_compositor *compositor,
int32_t x, int32_t y, int32_t *sx, int32_t *sy);
void
weston_compositor_repick(struct weston_compositor *compositor);
void
@ -410,14 +404,6 @@ weston_surface_assign_output(struct weston_surface *surface);
void
weston_surface_damage(struct weston_surface *surface);
void
weston_surface_damage_below(struct weston_surface *surface);
void
weston_surface_damage_rectangle(struct weston_surface *surface,
int32_t x, int32_t y,
int32_t width, int32_t height);
void
weston_buffer_post_release(struct wl_buffer *buffer);