Commit 75d93109 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Change coordinate translation apis to take doubles

Change gtk_widget_translate_coordinates and
gtk_native_get_surface_transform to operate
on doubles. Update all callers.
parent 93d4253c
......@@ -1043,7 +1043,7 @@ gtk_cell_area_real_event (GtkCellArea *area,
GtkCellRenderer *focus_renderer;
GdkRectangle alloc_area;
double event_x, event_y;
int x, y;
double x, y;
GtkNative *native;
/* We may need some semantics to tell us the offset of the event
......
......@@ -274,6 +274,7 @@ get_child_position (GtkOverlay *overlay,
GtkRequisition req;
GtkAllocation alloc;
gint s, e;
double x, y;
gtk_widget_get_preferred_size (widget, &req, NULL);
......@@ -287,11 +288,11 @@ get_child_position (GtkOverlay *overlay,
gtk_widget_translate_coordinates (editor->sv_plane,
gtk_widget_get_parent (editor->grid),
0, -6,
&allocation->x, &allocation->y);
&x, &y);
if (gtk_widget_get_direction (GTK_WIDGET (overlay)) == GTK_TEXT_DIR_RTL)
allocation->x = 0;
x = 0;
else
allocation->x = gtk_widget_get_width (GTK_WIDGET (overlay)) - req.width;
x = gtk_widget_get_width (GTK_WIDGET (overlay)) - req.width;
}
else if (widget == editor->h_popup)
{
......@@ -302,12 +303,12 @@ get_child_position (GtkOverlay *overlay,
gtk_widget_translate_coordinates (editor->h_slider,
gtk_widget_get_parent (editor->grid),
- req.width - 6, editor->popup_position - req.height / 2,
&allocation->x, &allocation->y);
&x, &y);
else
gtk_widget_translate_coordinates (editor->h_slider,
gtk_widget_get_parent (editor->grid),
alloc.width + 6, editor->popup_position - req.height / 2,
&allocation->x, &allocation->y);
&x, &y);
}
else if (widget == editor->a_popup)
{
......@@ -317,13 +318,13 @@ get_child_position (GtkOverlay *overlay,
gtk_widget_translate_coordinates (editor->a_slider,
gtk_widget_get_parent (editor->grid),
editor->popup_position - req.width / 2, - req.height - 6,
&allocation->x, &allocation->y);
&x, &y);
}
else
return FALSE;
allocation->x = CLAMP (allocation->x, 0, gtk_widget_get_width (GTK_WIDGET (overlay)) - req.width);
allocation->y = CLAMP (allocation->y, 0, gtk_widget_get_height (GTK_WIDGET (overlay)) - req.height);
allocation->x = CLAMP (x, 0, gtk_widget_get_width (GTK_WIDGET (overlay)) - req.width);
allocation->y = CLAMP (y, 0, gtk_widget_get_height (GTK_WIDGET (overlay)) - req.height);
return TRUE;
}
......
......@@ -120,8 +120,8 @@ gtk_drag_icon_native_get_renderer (GtkNative *native)
static void
gtk_drag_icon_native_get_surface_transform (GtkNative *native,
int *x,
int *y)
double *x,
double *y)
{
GtkCssBoxes css_boxes;
const graphene_rect_t *margin_rect;
......
......@@ -490,7 +490,7 @@ gtk_drag_source_drag_begin (GtkDragSource *source)
{
GtkWidget *widget;
GdkDevice *device;
int x, y;
double x, y;
GtkNative *native;
GdkSurface *surface;
double px, py;
......@@ -509,8 +509,8 @@ gtk_drag_source_drag_begin (GtkDragSource *source)
gtk_widget_translate_coordinates (widget, GTK_WIDGET (native), source->start_x, source->start_y, &x, &y);
gdk_surface_get_device_position (surface, device, &px, &py, NULL);
dx = round (px) - x;
dy = round (py) - y;
dx = round (px - x);
dy = round (py - y);
g_signal_emit (source, signals[PREPARE], 0, source->start_x, source->start_y, &content);
if (!content)
......
......@@ -253,7 +253,7 @@ scroll_to_child (GtkWidget *child)
GtkEmojiChooser *chooser;
GtkAdjustment *adj;
GtkAllocation alloc;
int pos;
double pos;
double value;
double page_size;
......
......@@ -2799,7 +2799,7 @@ gtk_entry_get_icon_at_pos (GtkEntry *entry,
for (i = 0; i < MAX_ICONS; i++)
{
EntryIconInfo *icon_info = priv->icons[i];
int icon_x, icon_y;
double icon_x, icon_y;
if (icon_info == NULL)
continue;
......
......@@ -1428,6 +1428,7 @@ rename_selected_cb (GtkTreeModel *model,
GtkFileChooserWidget *impl = data;
GdkRectangle rect;
gchar *filename;
double x, y;
gtk_tree_model_get (model, iter,
MODEL_COL_FILE, &impl->rename_file_source_file,
......@@ -1442,7 +1443,9 @@ rename_selected_cb (GtkTreeModel *model,
gtk_widget_translate_coordinates (impl->browse_files_tree_view,
GTK_WIDGET (impl),
rect.x, rect.y,
&rect.x, &rect.y);
&x, &y);
rect.x = x;
rect.y = y;
filename = g_file_get_basename (impl->rename_file_source_file);
gtk_editable_set_text (GTK_EDITABLE (impl->rename_file_name_entry), filename);
......@@ -2009,9 +2012,10 @@ file_list_show_popover (GtkFileChooserWidget *impl,
gtk_widget_translate_coordinates (impl->browse_files_tree_view,
GTK_WIDGET (impl),
rect.x, rect.y,
&rect.x, &rect.y);
&x, &y);
rect.x = CLAMP (x - 20, 0, bounds.size.width - 40);
rect.y = y;
rect.width = 40;
g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
......@@ -2113,15 +2117,14 @@ click_cb (GtkGesture *gesture,
GtkFileChooserWidget *impl)
{
PopoverData *pd;
int xx, yy;
pd = g_new (PopoverData, 1);
pd->impl = impl;
gtk_widget_translate_coordinates (impl->browse_files_tree_view,
GTK_WIDGET (impl),
x, y, &xx, &yy);
pd->x = xx;
pd->y = yy;
x, y, &x, &y);
pd->x = x;
pd->y = y;
g_idle_add (file_list_show_popover_in_idle, pd);
}
......
......@@ -354,6 +354,7 @@ notify_cursor_location (GtkIMContextWayland *context)
{
GtkIMContextWaylandGlobal *global;
cairo_rectangle_int_t rect;
double x, y;
global = gtk_im_context_wayland_get_global (context);
if (global == NULL)
......@@ -363,8 +364,10 @@ notify_cursor_location (GtkIMContextWayland *context)
gtk_widget_translate_coordinates (context->widget,
GTK_WIDGET (gtk_widget_get_root (context->widget)),
rect.x, rect.y,
&rect.x, &rect.y);
&x, &y);
rect.x = x;
rect.y = y;
zwp_text_input_v3_set_cursor_rectangle (global->text_input,
rect.x, rect.y,
rect.width, rect.height);
......
......@@ -1284,7 +1284,7 @@ translate_event_coordinates (GdkEvent *event,
GtkNative *native;
graphene_point_t p;
double event_x, event_y;
int native_x, native_y;
double native_x, native_y;
*x = *y = 0;
......@@ -1432,8 +1432,8 @@ update_pointer_focus_state (GtkWindow *toplevel,
GtkWidget *old_target = NULL;
GdkEventSequence *sequence;
GdkDevice *device;
gdouble x, y;
int nx, ny;
double x, y;
double nx, ny;
device = gdk_event_get_device (event);
sequence = gdk_event_get_event_sequence (event);
......@@ -1525,7 +1525,7 @@ handle_pointing_event (GdkEvent *event)
GdkEventSequence *sequence;
GdkDevice *device;
double x, y;
int native_x, native_y;
double native_x, native_y;
GtkWidget *native;
GdkEventType type;
......
......@@ -48,8 +48,8 @@ gtk_native_default_get_renderer (GtkNative *self)
static void
gtk_native_default_get_surface_transform (GtkNative *self,
int *x,
int *y)
double *x,
double *y)
{
*x = 0;
*y = 0;
......@@ -111,8 +111,8 @@ gtk_native_get_renderer (GtkNative *self)
*/
void
gtk_native_get_surface_transform (GtkNative *self,
int *x,
int *y)
double *x,
double *y)
{
g_return_if_fail (GTK_IS_NATIVE (self));
g_return_if_fail (x != NULL);
......
......@@ -49,8 +49,8 @@ struct _GtkNativeInterface
GskRenderer * (* get_renderer) (GtkNative *self);
void (* get_surface_transform) (GtkNative *self,
int *x,
int *y);
double *x,
double *y);
void (* check_resize) (GtkNative *self);
};
......@@ -69,8 +69,8 @@ GskRenderer *gtk_native_get_renderer (GtkNative *self);
GDK_AVAILABLE_IN_ALL
void gtk_native_get_surface_transform (GtkNative *self,
int *x,
int *y);
double *x,
double *y);
G_END_DECLS
......
......@@ -1686,8 +1686,6 @@ drag_motion_callback (GtkDropTarget *target,
if (row != NULL)
{
gint dest_y, dest_x;
g_object_get (row, "order-index", &row_index, NULL);
g_object_get (sidebar->row_placeholder, "order-index", &row_placeholder_index, NULL);
/* We order the bookmarks sections based on the bookmark index that we
......@@ -1703,9 +1701,9 @@ drag_motion_callback (GtkDropTarget *target,
row_placeholder_index = row_index;
gtk_widget_translate_coordinates (GTK_WIDGET (sidebar), GTK_WIDGET (row),
x, y,
&dest_x, &dest_y);
&x, &y);
if (dest_y > sidebar->drag_row_height / 2 && row_index > 0)
if (y > sidebar->drag_row_height / 2 && row_index > 0)
row_placeholder_index++;
}
else
......@@ -3459,8 +3457,8 @@ on_row_dragged (GtkGestureDrag *gesture,
if (gtk_drag_check_threshold (GTK_WIDGET (row), 0, 0, x, y))
{
gdouble start_x, start_y;
gint drag_x, drag_y;
double start_x, start_y;
double drag_x, drag_y;
GdkContentProvider *content;
GdkSurface *surface;
GdkDevice *device;
......
......@@ -1898,14 +1898,17 @@ on_address_entry_show_help_pressed (GtkPlacesView *view,
GtkEntry *entry)
{
GdkRectangle rect;
double x, y;
/* Setup the auxiliary popover's rectangle */
gtk_entry_get_icon_area (GTK_ENTRY (view->address_entry),
GTK_ENTRY_ICON_SECONDARY,
&rect);
gtk_widget_translate_coordinates (view->address_entry, GTK_WIDGET (view),
rect.x, rect.y, &rect.x, &rect.y);
rect.x, rect.y, &x, &y);
rect.x = x;
rect.y = y;
gtk_popover_set_pointing_to (GTK_POPOVER (view->server_adresses_popover), &rect);
gtk_widget_set_visible (view->server_adresses_popover, TRUE);
}
......
......@@ -218,8 +218,8 @@ gtk_popover_native_get_renderer (GtkNative *native)
static void
gtk_popover_native_get_surface_transform (GtkNative *native,
int *x,
int *y)
double *x,
double *y)
{
GtkCssBoxes css_boxes;
const graphene_rect_t *margin_rect;
......@@ -1212,8 +1212,8 @@ gtk_popover_update_shape (GtkPopover *popover)
cairo_surface_t *cairo_surface;
cairo_region_t *region;
cairo_t *cr;
int x, y;
int native_x, native_y;
double x, y;
double native_x, native_y;
gtk_native_get_surface_transform (GTK_NATIVE (popover), &native_x, &native_y);
gtk_css_boxes_init (&content_css_boxes, priv->contents_widget);
......
......@@ -1806,20 +1806,19 @@ update_initial_slider_position (GtkRange *range,
double y)
{
GtkRangePrivate *priv = gtk_range_get_instance_private (range);
int trough_x, trough_y;
gtk_widget_translate_coordinates (GTK_WIDGET (range), priv->trough_widget,
x, y, &trough_x, &trough_y);
x, y, &x, &y);
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
priv->slide_initial_slider_position = MAX (0, priv->slider_x);
priv->slide_initial_coordinate_delta = trough_x - priv->slide_initial_slider_position;
priv->slide_initial_coordinate_delta = x - priv->slide_initial_slider_position;
}
else
{
priv->slide_initial_slider_position = MAX (0, priv->slider_y);
priv->slide_initial_coordinate_delta = trough_y - priv->slide_initial_slider_position;
priv->slide_initial_coordinate_delta = y - priv->slide_initial_slider_position;
}
}
......@@ -1899,7 +1898,7 @@ gtk_range_click_gesture_pressed (GtkGestureClick *gesture,
(!primary_warps && shift_pressed && button == GDK_BUTTON_PRIMARY) ||
(!primary_warps && button == GDK_BUTTON_MIDDLE)))
{
int slider_range_x, slider_range_y;
double slider_range_x, slider_range_y;
graphene_rect_t slider_bounds;
gtk_widget_translate_coordinates (priv->trough_widget, widget,
......@@ -1993,9 +1992,10 @@ update_slider_position (GtkRange *range,
gdouble mark_delta;
gdouble zoom;
gint i;
double x, y;
gtk_widget_translate_coordinates (GTK_WIDGET (range), priv->trough_widget,
mouse_x, mouse_y, &mouse_x, &mouse_y);
mouse_x, mouse_y, &x, &y);
if (priv->zoom &&
gtk_widget_compute_bounds (priv->trough_widget, priv->trough_widget, &trough_bounds))
......@@ -2028,15 +2028,15 @@ update_slider_position (GtkRange *range,
zoom_divisor = zoom - 1.0;
if (priv->orientation == GTK_ORIENTATION_VERTICAL)
priv->slide_initial_slider_position = (zoom * (mouse_y - priv->slide_initial_coordinate_delta) - slider_bounds.origin.y) / zoom_divisor;
priv->slide_initial_slider_position = (zoom * (y - priv->slide_initial_coordinate_delta) - slider_bounds.origin.y) / zoom_divisor;
else
priv->slide_initial_slider_position = (zoom * (mouse_x - priv->slide_initial_coordinate_delta) - slider_bounds.origin.x) / zoom_divisor;
priv->slide_initial_slider_position = (zoom * (x - priv->slide_initial_coordinate_delta) - slider_bounds.origin.x) / zoom_divisor;
}
if (priv->orientation == GTK_ORIENTATION_VERTICAL)
delta = mouse_y - (priv->slide_initial_coordinate_delta + priv->slide_initial_slider_position);
delta = y - (priv->slide_initial_coordinate_delta + priv->slide_initial_slider_position);
else
delta = mouse_x - (priv->slide_initial_coordinate_delta + priv->slide_initial_slider_position);
delta = x - (priv->slide_initial_coordinate_delta + priv->slide_initial_slider_position);
c = priv->slide_initial_slider_position + zoom * delta;
......@@ -2635,18 +2635,19 @@ gtk_range_calc_marks (GtkRange *range)
{
GtkRangePrivate *priv = gtk_range_get_instance_private (range);
GdkRectangle slider;
double x, y;
gint i;
for (i = 0; i < priv->n_marks; i++)
{
gtk_range_compute_slider_position (range, priv->marks[i], &slider);
gtk_widget_translate_coordinates (priv->trough_widget, GTK_WIDGET (range),
slider.x, slider.y, &slider.x, &slider.y);
slider.x, slider.y, &x, &y);
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
priv->mark_pos[i] = slider.x + slider.width / 2;
priv->mark_pos[i] = x + slider.width / 2;
else
priv->mark_pos[i] = slider.y + slider.height / 2;
priv->mark_pos[i] = y + slider.height / 2;
}
}
......
......@@ -80,8 +80,8 @@ gtk_text_handle_native_get_renderer (GtkNative *native)
static void
gtk_text_handle_native_get_surface_transform (GtkNative *native,
int *x,
int *y)
double *x,
double *y)
{
GtkCssBoxes css_boxes;
const graphene_rect_t *margin_rect;
......@@ -115,6 +115,7 @@ gtk_text_handle_present_surface (GtkTextHandle *handle)
GdkPopupLayout *layout;
GdkRectangle rect;
GtkRequisition req;
double x, y;
gtk_widget_get_preferred_size (widget, NULL, &req);
gtk_text_handle_get_padding (handle, &handle->border);
......@@ -126,7 +127,9 @@ gtk_text_handle_present_surface (GtkTextHandle *handle)
gtk_widget_translate_coordinates (gtk_widget_get_parent (widget),
gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW),
rect.x, rect.y, &rect.x, &rect.y);
rect.x, rect.y, &x, &y);
rect.x = x;
rect.y = y;
if (handle->role == GTK_TEXT_HANDLE_ROLE_CURSOR)
rect.x -= rect.width / 2;
......
......@@ -8618,19 +8618,19 @@ gtk_text_view_do_popup (GtkTextView *text_view,
GtkNative *native;
GdkSurface *surface;
double px, py;
int nx, ny;
double nx, ny;
native = gtk_widget_get_native (GTK_WIDGET (text_view));
surface = gtk_native_get_surface (native);
gdk_surface_get_device_position (surface, device, &px, &py, NULL);
gtk_native_get_surface_transform (native, &nx, &ny);
rect.x = round (px) - nx;
rect.y = round (py) - ny;
gtk_widget_translate_coordinates (GTK_WIDGET (gtk_widget_get_native (GTK_WIDGET (text_view))),
GTK_WIDGET (text_view),
rect.x, rect.y,
&rect.x, &rect.y);
px - nx, py - ny,
&px, &py);
rect.x = px;
rect.y = py;
}
gtk_popover_set_pointing_to (GTK_POPOVER (priv->popup_menu), &rect);
......
......@@ -376,7 +376,6 @@ gtk_tooltip_trigger_tooltip_query (GtkWidget *widget)
GdkSurface *surface;
double x, y;
GtkWidget *toplevel;
int dx, dy;
g_return_if_fail (GTK_IS_WIDGET (widget));
......@@ -403,9 +402,9 @@ gtk_tooltip_trigger_tooltip_query (GtkWidget *widget)
if (gtk_native_get_surface (GTK_NATIVE (toplevel)) != surface)
return;
gtk_widget_translate_coordinates (toplevel, widget, round (x), round (y), &dx, &dy);
gtk_widget_translate_coordinates (toplevel, widget, x, y, &x, &y);
gtk_tooltip_handle_event_internal (GDK_MOTION_NOTIFY, surface, widget, dx, dy);
gtk_tooltip_handle_event_internal (GDK_MOTION_NOTIFY, surface, widget, x, y);
}
static void
......@@ -426,7 +425,8 @@ _gtk_widget_find_at_coords (GdkSurface *surface,
{
GtkWidget *event_widget;
GtkWidget *picked_widget;
int native_x, native_y;
double x, y;
double native_x, native_y;
g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL);
......@@ -436,13 +436,16 @@ _gtk_widget_find_at_coords (GdkSurface *surface,
return NULL;
gtk_native_get_surface_transform (GTK_NATIVE (event_widget), &native_x, &native_y);
surface_x -= native_x;
surface_y -= native_y;
x = surface_x - native_x;
y = surface_y - native_y;
picked_widget = gtk_widget_pick (event_widget, surface_x, surface_y, GTK_PICK_INSENSITIVE);
picked_widget = gtk_widget_pick (event_widget, x, y, GTK_PICK_INSENSITIVE);
if (picked_widget != NULL)
gtk_widget_translate_coordinates (event_widget, picked_widget, surface_x, surface_y, widget_x, widget_y);
gtk_widget_translate_coordinates (event_widget, picked_widget, x, y, &x, &y);
*widget_x = x;
*widget_y = y;
return picked_widget;
}
......@@ -553,15 +556,23 @@ gtk_tooltip_run_requery (GtkWidget **widget,
if (!return_value)
{
GtkWidget *parent = gtk_widget_get_parent (*widget);
GtkWidget *parent = gtk_widget_get_parent (*widget);
if (parent)
{
double xx = *x;
double yy = *y;
gtk_widget_translate_coordinates (*widget, parent, xx, yy, &xx, &yy);
if (parent)
gtk_widget_translate_coordinates (*widget, parent, *x, *y, x, y);
*x = xx;
*y = yy;
}
*widget = parent;
}
*widget = parent;
}
else
break;
break;
}
while (*widget);
......@@ -588,7 +599,7 @@ gtk_tooltip_position (GtkTooltip *tooltip,
int rect_anchor_dx = 0;
int cursor_size;
int anchor_rect_padding;
int native_x, native_y;
double native_x, native_y;
gtk_widget_realize (GTK_WIDGET (tooltip->window));
......@@ -907,8 +918,7 @@ _gtk_tooltip_handle_event (GtkWidget *target,
GdkEventType event_type;
GdkSurface *surface;
double x, y;
int native_x, native_y;
int tx, ty;
double nx, ny;
GtkWidget *native;
if (!tooltips_enabled (event))
......@@ -919,13 +929,9 @@ _gtk_tooltip_handle_event (GtkWidget *target,
gdk_event_get_position (event, &x, &y);
native = GTK_WIDGET (gtk_widget_get_native (target));
gtk_native_get_surface_transform (GTK_NATIVE (native), &native_x, &native_y);
gtk_widget_translate_coordinates (native, target,
x - native_x,
y - native_y,
&tx, &ty);
gtk_tooltip_handle_event_internal (event_type, surface, target, tx, ty);
gtk_native_get_surface_transform (GTK_NATIVE (native), &nx, &ny);
gtk_widget_translate_coordinates (native, target, x - nx, y - ny, &x, &y);
gtk_tooltip_handle_event_internal (event_type, surface, target, x, y);
}
/* dx/dy must be in @target_widget's coordinates */
......@@ -933,8 +939,8 @@ static void
gtk_tooltip_handle_event_internal (GdkEventType event_type,
GdkSurface *surface,
GtkWidget *target_widget,
gdouble dx,
gdouble dy)
double dx,
double dy)
{
int x = dx, y = dy;
GdkDisplay *display;
......
......@@ -94,8 +94,8 @@ gtk_tooltip_window_native_get_renderer (GtkNative *native)
static void
gtk_tooltip_window_native_get_surface_transform (GtkNative *native,
int *x,
int *y)
double *x,
double *y)
{
GtkCssBoxes css_boxes;