mutter: Replace cairo_rectangle_int_t with MtkRectangle

Note: the various helpers in boxes.c were not ported yet, see the next
commit. This was intentionally done to simplify the porting process

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3128>
This commit is contained in:
Bilal Elmoussaoui
2023-07-19 16:59:04 +02:00
parent c1703337e4
commit 918ae0f4d4
51 changed files with 194 additions and 191 deletions

View File

@ -65,7 +65,7 @@ struct _MetaWaylandTextInput
uint32_t anchor;
} surrounding;
cairo_rectangle_int_t cursor_rect;
MtkRectangle cursor_rect;
uint32_t content_type_hint;
uint32_t content_type_purpose;
@ -584,7 +584,7 @@ text_input_set_cursor_rectangle (struct wl_client *client,
if (!client_matches_focus (text_input, client))
return;
text_input->cursor_rect = (cairo_rectangle_int_t) { x, y, width, height };
text_input->cursor_rect = (MtkRectangle) { x, y, width, height };
text_input->pending_state |= META_WAYLAND_PENDING_STATE_INPUT_RECT;
}
@ -595,7 +595,7 @@ meta_wayland_text_input_reset (MetaWaylandTextInput *text_input)
text_input->content_type_hint = ZWP_TEXT_INPUT_V3_CONTENT_HINT_NONE;
text_input->content_type_purpose = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NORMAL;
text_input->text_change_cause = ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_INPUT_METHOD;
text_input->cursor_rect = (cairo_rectangle_int_t) { 0, 0, 0, 0 };
text_input->cursor_rect = (MtkRectangle) { 0, 0, 0, 0 };
text_input->pending_state = META_WAYLAND_PENDING_STATE_NONE;
}
@ -661,7 +661,7 @@ text_input_commit_state (struct wl_client *client,
{
graphene_rect_t cursor_rect;
float x1, y1, x2, y2;
cairo_rectangle_int_t rect;
MtkRectangle rect;
rect = text_input->cursor_rect;
meta_wayland_surface_get_absolute_coordinates (text_input->surface,