diff options
Diffstat (limited to 'src')
28 files changed, 65 insertions, 150 deletions
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c index 7b05d72eb..b019b4d7d 100644 --- a/src/backends/meta-backend.c +++ b/src/backends/meta-backend.c @@ -258,7 +258,7 @@ meta_backend_monitors_changed (MetaBackend *backend) meta_backend_get_monitor_manager (backend); ClutterDeviceManager *manager = clutter_device_manager_get_default (); ClutterInputDevice *device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE); - ClutterPoint point; + graphene_point_t point; meta_backend_sync_screen_size (backend); diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c index dae40b3d3..b1bcbc842 100644 --- a/src/backends/meta-cursor-renderer.c +++ b/src/backends/meta-cursor-renderer.c @@ -315,13 +315,13 @@ meta_cursor_renderer_set_position (MetaCursorRenderer *renderer, meta_cursor_renderer_update_cursor (renderer, priv->displayed_cursor); } -ClutterPoint +graphene_point_t meta_cursor_renderer_get_position (MetaCursorRenderer *renderer) { MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); - return (ClutterPoint) { + return (graphene_point_t) { .x = priv->current_x, .y = priv->current_y }; diff --git a/src/backends/meta-cursor-renderer.h b/src/backends/meta-cursor-renderer.h index 60f1dbe15..cfa7bc995 100644 --- a/src/backends/meta-cursor-renderer.h +++ b/src/backends/meta-cursor-renderer.h @@ -62,7 +62,7 @@ void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer, void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer, float x, float y); -ClutterPoint meta_cursor_renderer_get_position (MetaCursorRenderer *renderer); +graphene_point_t meta_cursor_renderer_get_position (MetaCursorRenderer *renderer); void meta_cursor_renderer_force_update (MetaCursorRenderer *renderer); MetaCursorSprite * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer); diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c index 45291e286..ec95e62af 100644 --- a/src/backends/meta-cursor-tracker.c +++ b/src/backends/meta-cursor-tracker.c @@ -407,7 +407,7 @@ get_pointer_position_clutter (int *x, { ClutterDeviceManager *cmanager; ClutterInputDevice *cdevice; - ClutterPoint point; + graphene_point_t point; cmanager = clutter_device_manager_get_default (); cdevice = clutter_device_manager_get_core_device (cmanager, CLUTTER_POINTER_DEVICE); diff --git a/src/backends/meta-screen-cast-monitor-stream-src.c b/src/backends/meta-screen-cast-monitor-stream-src.c index f582217e5..0cf553482 100644 --- a/src/backends/meta-screen-cast-monitor-stream-src.c +++ b/src/backends/meta-screen-cast-monitor-stream-src.c @@ -167,7 +167,7 @@ is_cursor_in_stream (MetaScreenCastMonitorStreamSrc *monitor_src) } else { - ClutterPoint cursor_position; + graphene_point_t cursor_position; cursor_position = meta_cursor_renderer_get_position (cursor_renderer); return clutter_rect_contains_point (&logical_monitor_rect, @@ -384,7 +384,7 @@ meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc ClutterRect logical_monitor_rect; MetaRendererView *view; float view_scale; - ClutterPoint cursor_position; + graphene_point_t cursor_position; int x, y; cursor_sprite = meta_cursor_renderer_get_cursor (cursor_renderer); diff --git a/src/backends/meta-screen-cast-window-stream-src.c b/src/backends/meta-screen-cast-window-stream-src.c index c31830b03..35ee2e7c9 100644 --- a/src/backends/meta-screen-cast-window-stream-src.c +++ b/src/backends/meta-screen-cast-window-stream-src.c @@ -112,8 +112,8 @@ maybe_draw_cursor_sprite (MetaScreenCastWindowStreamSrc *window_src, MetaCursorSprite *cursor_sprite; CoglTexture *cursor_texture; MetaScreenCastWindow *screen_cast_window; - ClutterPoint cursor_position; - ClutterPoint relative_cursor_position; + graphene_point_t cursor_position; + graphene_point_t relative_cursor_position; cairo_surface_t *cursor_surface; uint8_t *cursor_surface_data; GError *error = NULL; @@ -298,7 +298,7 @@ is_cursor_in_stream (MetaScreenCastWindowStreamSrc *window_src) MetaCursorRenderer *cursor_renderer = meta_backend_get_cursor_renderer (backend); MetaCursorSprite *cursor_sprite; - ClutterPoint cursor_position; + graphene_point_t cursor_position; MetaScreenCastWindow *screen_cast_window; cursor_sprite = meta_cursor_renderer_get_cursor (cursor_renderer); @@ -423,9 +423,9 @@ meta_screen_cast_window_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc meta_backend_get_cursor_renderer (backend); MetaScreenCastWindow *screen_cast_window = window_src->screen_cast_window; MetaCursorSprite *cursor_sprite; - ClutterPoint cursor_position; + graphene_point_t cursor_position; float scale; - ClutterPoint relative_cursor_position; + graphene_point_t relative_cursor_position; int x, y; cursor_sprite = meta_cursor_renderer_get_cursor (cursor_renderer); diff --git a/src/backends/meta-screen-cast-window.c b/src/backends/meta-screen-cast-window.c index ce2bf82c9..809aca9be 100644 --- a/src/backends/meta-screen-cast-window.c +++ b/src/backends/meta-screen-cast-window.c @@ -54,9 +54,9 @@ meta_screen_cast_window_transform_relative_position (MetaScreenCastWindow *scree gboolean meta_screen_cast_window_transform_cursor_position (MetaScreenCastWindow *screen_cast_window, MetaCursorSprite *cursor_sprite, - ClutterPoint *cursor_position, + graphene_point_t *cursor_position, float *out_cursor_scale, - ClutterPoint *out_relative_cursor_position) + graphene_point_t *out_relative_cursor_position) { MetaScreenCastWindowInterface *iface = META_SCREEN_CAST_WINDOW_GET_IFACE (screen_cast_window); diff --git a/src/backends/meta-screen-cast-window.h b/src/backends/meta-screen-cast-window.h index badd88224..b836fec5c 100644 --- a/src/backends/meta-screen-cast-window.h +++ b/src/backends/meta-screen-cast-window.h @@ -48,9 +48,9 @@ struct _MetaScreenCastWindowInterface gboolean (*transform_cursor_position) (MetaScreenCastWindow *screen_cast_window, MetaCursorSprite *cursor_sprite, - ClutterPoint *cursor_position, + graphene_point_t *cursor_position, float *out_cursor_scale, - ClutterPoint *out_relative_cursor_position); + graphene_point_t *out_relative_cursor_position); void (*capture_into) (MetaScreenCastWindow *screen_cast_window, MetaRectangle *bounds, @@ -70,9 +70,9 @@ void meta_screen_cast_window_transform_relative_position (MetaScreenCastWindow * gboolean meta_screen_cast_window_transform_cursor_position (MetaScreenCastWindow *screen_cast_window, MetaCursorSprite *cursor_sprite, - ClutterPoint *cursor_position, + graphene_point_t *cursor_position, float *out_cursor_scale, - ClutterPoint *out_relative_cursor_position); + graphene_point_t *out_relative_cursor_position); void meta_screen_cast_window_capture_into (MetaScreenCastWindow *screen_cast_window, MetaRectangle *bounds, diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 2ae5165ec..0bfae6d30 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -150,7 +150,7 @@ constrain_all_screen_monitors (ClutterInputDevice *device, float *x, float *y) { - ClutterPoint current; + graphene_point_t current; float cx, cy; GList *logical_monitors, *l; diff --git a/src/backends/native/meta-barrier-native.c b/src/backends/native/meta-barrier-native.c index e336d31bf..34a2c90c4 100644 --- a/src/backends/native/meta-barrier-native.c +++ b/src/backends/native/meta-barrier-native.c @@ -468,7 +468,7 @@ meta_barrier_manager_native_process (MetaBarrierManagerNative *manager, float *x, float *y) { - ClutterPoint prev_pos; + graphene_point_t prev_pos; float prev_x; float prev_y; float orig_x = *x; diff --git a/src/backends/native/meta-device-manager-native.c b/src/backends/native/meta-device-manager-native.c index d64458e6b..f94abddb2 100644 --- a/src/backends/native/meta-device-manager-native.c +++ b/src/backends/native/meta-device-manager-native.c @@ -380,7 +380,7 @@ notify_pinch_gesture_event (ClutterInputDevice *input_device, MetaSeatNative *seat; ClutterStage *stage; ClutterEvent *event = NULL; - ClutterPoint pos; + graphene_point_t pos; /* We can drop the event on the floor if no stage has been * associated with the device yet. */ @@ -427,7 +427,7 @@ notify_swipe_gesture_event (ClutterInputDevice *input_device, MetaSeatNative *seat; ClutterStage *stage; ClutterEvent *event = NULL; - ClutterPoint pos; + graphene_point_t pos; /* We can drop the event on the floor if no stage has been * associated with the device yet. */ diff --git a/src/backends/native/meta-seat-native.c b/src/backends/native/meta-seat-native.c index 714624cea..a14509bd3 100644 --- a/src/backends/native/meta-seat-native.c +++ b/src/backends/native/meta-seat-native.c @@ -571,7 +571,7 @@ meta_seat_native_notify_button (MetaSeatNative *seat, if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE) { - ClutterPoint point; + graphene_point_t point; clutter_input_device_get_coords (input_device, NULL, &point); event->button.x = point.x; diff --git a/src/backends/native/meta-seat-native.h b/src/backends/native/meta-seat-native.h index 0b8f3a002..9dd2fbdad 100644 --- a/src/backends/native/meta-seat-native.h +++ b/src/backends/native/meta-seat-native.h @@ -39,7 +39,7 @@ struct _MetaTouchState int device_slot; int seat_slot; - ClutterPoint coords; + graphene_point_t coords; }; struct _MetaSeatNative diff --git a/src/compositor/meta-dnd-actor.c b/src/compositor/meta-dnd-actor.c index af49ee27d..31a01db90 100644 --- a/src/compositor/meta-dnd-actor.c +++ b/src/compositor/meta-dnd-actor.c @@ -207,7 +207,7 @@ meta_dnd_actor_drag_finish (MetaDnDActor *self, if (CLUTTER_ACTOR_IS_VISIBLE (self->drag_origin)) { float anchor_x, anchor_y; - ClutterPoint dest; + graphene_point_t dest; clutter_actor_get_transformed_position (self->drag_origin, &dest.x, &dest.y); diff --git a/src/compositor/meta-feedback-actor.c b/src/compositor/meta-feedback-actor.c index 74ab8054c..c8eb0fcac 100644 --- a/src/compositor/meta-feedback-actor.c +++ b/src/compositor/meta-feedback-actor.c @@ -241,7 +241,7 @@ void meta_feedback_actor_update (MetaFeedbackActor *self, const ClutterEvent *event) { - ClutterPoint point; + graphene_point_t point; g_return_if_fail (META_IS_FEEDBACK_ACTOR (self)); g_return_if_fail (event != NULL); diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index d644bc9a4..6e86424dc 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -1174,9 +1174,9 @@ meta_window_actor_transform_relative_position (MetaScreenCastWindow *screen_cast static gboolean meta_window_actor_transform_cursor_position (MetaScreenCastWindow *screen_cast_window, MetaCursorSprite *cursor_sprite, - ClutterPoint *cursor_position, + graphene_point_t *cursor_position, float *out_cursor_scale, - ClutterPoint *out_relative_cursor_position) + graphene_point_t *out_relative_cursor_position) { MetaWindowActor *window_actor = META_WINDOW_ACTOR (screen_cast_window); MetaWindowActorPrivate *priv = diff --git a/src/tests/clutter-test-utils.c b/src/tests/clutter-test-utils.c index 3bd99989e..c75bc4974 100644 --- a/src/tests/clutter-test-utils.c +++ b/src/tests/clutter-test-utils.c @@ -264,7 +264,7 @@ clutter_test_run (void) typedef struct { ClutterActor *stage; - ClutterPoint point; + graphene_point_t point; gpointer result; @@ -339,10 +339,10 @@ on_key_press_event (ClutterActor *stage, * Since: 1.18 */ gboolean -clutter_test_check_actor_at_point (ClutterActor *stage, - const ClutterPoint *point, - ClutterActor *actor, - ClutterActor **result) +clutter_test_check_actor_at_point (ClutterActor *stage, + const graphene_point_t *point, + ClutterActor *actor, + ClutterActor **result) { ValidateData *data; guint press_id = 0; @@ -401,10 +401,10 @@ clutter_test_check_actor_at_point (ClutterActor *stage, * Since: 1.18 */ gboolean -clutter_test_check_color_at_point (ClutterActor *stage, - const ClutterPoint *point, - const ClutterColor *color, - ClutterColor *result) +clutter_test_check_color_at_point (ClutterActor *stage, + const graphene_point_t *point, + const ClutterColor *color, + ClutterColor *result) { ValidateData *data; gboolean retval; diff --git a/src/tests/clutter-test-utils.h b/src/tests/clutter-test-utils.h index f666d8773..62e8e9fdc 100644 --- a/src/tests/clutter-test-utils.h +++ b/src/tests/clutter-test-utils.h @@ -121,7 +121,7 @@ ClutterActor * clutter_test_get_stage (void); #define clutter_test_assert_actor_at_point(stage,point,actor) \ G_STMT_START { \ - const ClutterPoint *__p = (point); \ + const graphene_point_t *__p = (point); \ ClutterActor *__actor = (actor); \ ClutterActor *__stage = (stage); \ ClutterActor *__res; \ @@ -141,7 +141,7 @@ G_STMT_START { \ #define clutter_test_assert_color_at_point(stage,point,color) \ G_STMT_START { \ - const ClutterPoint *__p = (point); \ + const graphene_point_t *__p = (point); \ const ClutterColor *__c = (color); \ ClutterActor *__stage = (stage); \ ClutterColor __res; \ @@ -158,15 +158,15 @@ G_STMT_START { \ } G_STMT_END CLUTTER_EXPORT -gboolean clutter_test_check_actor_at_point (ClutterActor *stage, - const ClutterPoint *point, - ClutterActor *actor, - ClutterActor **result); +gboolean clutter_test_check_actor_at_point (ClutterActor *stage, + const graphene_point_t *point, + ClutterActor *actor, + ClutterActor **result); CLUTTER_EXPORT -gboolean clutter_test_check_color_at_point (ClutterActor *stage, - const ClutterPoint *point, - const ClutterColor *color, - ClutterColor *result); +gboolean clutter_test_check_color_at_point (ClutterActor *stage, + const graphene_point_t *point, + const ClutterColor *color, + ClutterColor *result); G_END_DECLS diff --git a/src/tests/clutter/conform/actor-layout.c b/src/tests/clutter/conform/actor-layout.c index 099a279e1..9a9814b08 100644 --- a/src/tests/clutter/conform/actor-layout.c +++ b/src/tests/clutter/conform/actor-layout.c @@ -8,7 +8,7 @@ actor_basic_layout (void) ClutterActor *stage = clutter_test_get_stage (); ClutterActor *vase; ClutterActor *flower[3]; - ClutterPoint p; + graphene_point_t p; vase = clutter_actor_new (); clutter_actor_set_name (vase, "Vase"); @@ -33,13 +33,13 @@ actor_basic_layout (void) clutter_actor_set_name (flower[2], "Green Flower"); clutter_actor_add_child (vase, flower[2]); - clutter_point_init (&p, 50, 50); + graphene_point_init (&p, 50, 50); clutter_test_assert_actor_at_point (stage, &p, flower[0]); - clutter_point_init (&p, 150, 50); + graphene_point_init (&p, 150, 50); clutter_test_assert_actor_at_point (stage, &p, flower[1]); - clutter_point_init (&p, 250, 50); + graphene_point_init (&p, 250, 50); clutter_test_assert_actor_at_point (stage, &p, flower[2]); } @@ -49,7 +49,7 @@ actor_margin_layout (void) ClutterActor *stage = clutter_test_get_stage (); ClutterActor *vase; ClutterActor *flower[3]; - ClutterPoint p; + graphene_point_t p; vase = clutter_actor_new (); clutter_actor_set_name (vase, "Vase"); @@ -78,13 +78,13 @@ actor_margin_layout (void) clutter_actor_set_margin_bottom (flower[2], 6); clutter_actor_add_child (vase, flower[2]); - clutter_point_init (&p, 0, 7); + graphene_point_init (&p, 0, 7); clutter_test_assert_actor_at_point (stage, &p, flower[0]); - clutter_point_init (&p, 106, 50); + graphene_point_init (&p, 106, 50); clutter_test_assert_actor_at_point (stage, &p, flower[1]); - clutter_point_init (&p, 212, 7); + graphene_point_init (&p, 212, 7); clutter_test_assert_actor_at_point (stage, &p, flower[2]); } diff --git a/src/tests/clutter/conform/meson.build b/src/tests/clutter/conform/meson.build index 24c80e82a..eced790b1 100644 --- a/src/tests/clutter/conform/meson.build +++ b/src/tests/clutter/conform/meson.build @@ -33,7 +33,6 @@ clutter_conform_tests_general_tests = [ 'interval', 'script-parser', 'units', - 'point', ] clutter_conform_tests_deprecated_tests = [ diff --git a/src/tests/clutter/conform/point.c b/src/tests/clutter/conform/point.c deleted file mode 100644 index c8ecac709..000000000 --- a/src/tests/clutter/conform/point.c +++ /dev/null @@ -1,84 +0,0 @@ -#include "tests/clutter-test-utils.h" - -#include <clutter/clutter.h> - -static void -point_on_nonempty_quadrilateral (void) -{ - int p; - static const ClutterPoint vertices[4] = - { - { 1.f, 2.f }, - { 6.f, 3.f }, - { 7.f, 6.f }, - { 0.f, 5.f } - }; - static const ClutterPoint points_inside[] = - { - { 2.f, 3.f }, - { 1.f, 4.f }, - { 5.f, 5.f }, - { 4.f, 3.f }, - }; - static const ClutterPoint points_outside[] = - { - { 3.f, 1.f }, - { 7.f, 4.f }, - { 4.f, 6.f }, - { 99.f, -77.f }, - { -1.f, 3.f }, - { -8.f, -8.f }, - { 11.f, 4.f }, - { -7.f, 4.f }, - }; - - for (p = 0; p < G_N_ELEMENTS (points_inside); p++) - { - const ClutterPoint *point = &points_inside[p]; - - g_assert_true (clutter_point_inside_quadrilateral (point, vertices)); - } - - for (p = 0; p < G_N_ELEMENTS (points_outside); p++) - { - const ClutterPoint *point = &points_outside[p]; - - g_assert_false (clutter_point_inside_quadrilateral (point, vertices)); - } -} - -static void -point_on_empty_quadrilateral (void) -{ - int p; - static const ClutterPoint vertices[4] = - { - { 5.f, 6.f }, - { 5.f, 6.f }, - { 5.f, 6.f }, - { 5.f, 6.f }, - }; - static const ClutterPoint points_outside[] = - { - { 3.f, 1.f }, - { 7.f, 4.f }, - { 4.f, 6.f }, - { 99.f, -77.f }, - { -1.f, 3.f }, - { -8.f, -8.f }, - }; - - for (p = 0; p < G_N_ELEMENTS (points_outside); p++) - { - const ClutterPoint *point = &points_outside[p]; - - g_assert_false (clutter_point_inside_quadrilateral (point, vertices)); - } - - g_assert_false (clutter_point_inside_quadrilateral (&vertices[0], vertices)); -} - -CLUTTER_TEST_SUITE ( - CLUTTER_TEST_UNIT ("/point/on_nonempty_quadrilateral", point_on_nonempty_quadrilateral) - CLUTTER_TEST_UNIT ("/point/on_empty_quadrilateral", point_on_empty_quadrilateral) -) diff --git a/src/tests/clutter/interactive/test-events.c b/src/tests/clutter/interactive/test-events.c index 013231ef8..f31c7d228 100644 --- a/src/tests/clutter/interactive/test-events.c +++ b/src/tests/clutter/interactive/test-events.c @@ -218,7 +218,7 @@ input_cb (ClutterActor *actor, { ClutterActor *stage = clutter_actor_get_stage (actor); ClutterActor *source_actor = clutter_event_get_source (event); - ClutterPoint position; + graphene_point_t position; gchar *state; gchar keybuf[128]; gint device_id; diff --git a/src/wayland/meta-pointer-confinement-wayland.c b/src/wayland/meta-pointer-confinement-wayland.c index 29e5cc3fb..d5491e9f4 100644 --- a/src/wayland/meta-pointer-confinement-wayland.c +++ b/src/wayland/meta-pointer-confinement-wayland.c @@ -622,7 +622,7 @@ meta_pointer_confinement_wayland_maybe_warp (MetaPointerConfinementWayland *self { MetaWaylandSeat *seat; MetaWaylandSurface *surface; - ClutterPoint point; + graphene_point_t point; float sx; float sy; cairo_region_t *region; diff --git a/src/wayland/meta-wayland-cursor-surface.c b/src/wayland/meta-wayland-cursor-surface.c index 76268d5f2..7ce462ee7 100644 --- a/src/wayland/meta-wayland-cursor-surface.c +++ b/src/wayland/meta-wayland-cursor-surface.c @@ -186,7 +186,7 @@ meta_wayland_cursor_surface_is_on_logical_monitor (MetaWaylandSurfaceRole *role, META_WAYLAND_CURSOR_SURFACE (surface->role); MetaWaylandCursorSurfacePrivate *priv = meta_wayland_cursor_surface_get_instance_private (cursor_surface); - ClutterPoint point; + graphene_point_t point; ClutterRect logical_monitor_rect; if (!priv->cursor_renderer) diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c index 38aa0f317..b9d3a6c75 100644 --- a/src/wayland/meta-wayland-data-device.c +++ b/src/wayland/meta-wayland-data-device.c @@ -1161,7 +1161,7 @@ meta_wayland_data_device_start_drag (MetaWaylandDataDevice *data { MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device); MetaWaylandDragGrab *drag_grab; - ClutterPoint pos, surface_pos; + graphene_point_t pos, surface_pos; ClutterModifierType modifiers; MetaSurfaceActor *surface_actor; diff --git a/src/wayland/meta-wayland-dnd-surface.c b/src/wayland/meta-wayland-dnd-surface.c index 2020309a8..bcb5317a2 100644 --- a/src/wayland/meta-wayland-dnd-surface.c +++ b/src/wayland/meta-wayland-dnd-surface.c @@ -72,7 +72,7 @@ dnd_surface_find_logical_monitor (MetaWaylandActorSurface *actor_surface) meta_backend_get_cursor_renderer (backend); MetaMonitorManager *monitor_manager = meta_backend_get_monitor_manager (backend); - ClutterPoint pointer_pos; + graphene_point_t pointer_pos; pointer_pos = meta_cursor_renderer_get_position (cursor_renderer); return meta_monitor_manager_get_logical_monitor_at (monitor_manager, diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index 751f6b9b9..4619af78d 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -926,7 +926,7 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, if (surface != NULL) { struct wl_client *client = wl_resource_get_client (surface->resource); - ClutterPoint pos; + graphene_point_t pos; pointer->focus_surface = surface; @@ -1039,7 +1039,7 @@ meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer, wl_fixed_t *sy) { float xf = 0.0f, yf = 0.0f; - ClutterPoint pos; + graphene_point_t pos; clutter_input_device_get_coords (pointer->device, NULL, &pos); meta_wayland_surface_get_relative_coordinates (surface, pos.x, pos.y, &xf, &yf); diff --git a/src/wayland/meta-xwayland-dnd.c b/src/wayland/meta-xwayland-dnd.c index 3ad58e4d2..c01402317 100644 --- a/src/wayland/meta-xwayland-dnd.c +++ b/src/wayland/meta-xwayland-dnd.c @@ -519,7 +519,7 @@ meta_x11_drag_dest_update (MetaWaylandDataDevice *data_device, MetaWaylandCompositor *compositor = meta_wayland_compositor_get_default (); MetaXWaylandDnd *dnd = compositor->xwayland_manager.dnd; MetaWaylandSeat *seat = compositor->seat; - ClutterPoint pos; + graphene_point_t pos; clutter_input_device_get_coords (seat->pointer->device, NULL, &pos); xdnd_send_position (dnd, dnd->dnd_dest, @@ -602,7 +602,7 @@ pick_drop_surface (MetaWaylandCompositor *compositor, { MetaDisplay *display = meta_get_display (); MetaWindow *focus_window = NULL; - ClutterPoint pos; + graphene_point_t pos; clutter_event_get_coords (event, &pos.x, &pos.y); focus_window = meta_stack_get_default_focus_window_at_point (display->stack, @@ -793,7 +793,7 @@ meta_xwayland_dnd_handle_client_message (MetaWaylandCompositor *compositor, else if (event->message_type == xdnd_atoms[ATOM_DND_POSITION]) { ClutterEvent *motion; - ClutterPoint pos; + graphene_point_t pos; uint32_t action = 0; dnd->client_message_timestamp = event->data.l[3]; |