diff options
Diffstat (limited to 'gdk')
41 files changed, 258 insertions, 258 deletions
diff --git a/gdk/broadway/gdkdevice-broadway.c b/gdk/broadway/gdkdevice-broadway.c index 23fc5fd8dd..8fe6eab346 100644 --- a/gdk/broadway/gdkdevice-broadway.c +++ b/gdk/broadway/gdkdevice-broadway.c @@ -24,8 +24,8 @@ #include "gdkprivate-broadway.h" static void gdk_broadway_device_get_state (GdkDevice *device, - GdkSurface *surface, - gdouble *axes, + GdkSurface *surface, + double *axes, GdkModifierType *mask); static void gdk_broadway_device_set_surface_cursor (GdkDevice *device, GdkSurface *surface, @@ -46,8 +46,8 @@ static GdkGrabStatus gdk_broadway_device_grab (GdkDevice *device, static void gdk_broadway_device_ungrab (GdkDevice *device, guint32 time_); static GdkSurface * gdk_broadway_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); @@ -79,11 +79,11 @@ gdk_broadway_device_init (GdkBroadwayDevice *device_core) static void gdk_broadway_device_get_state (GdkDevice *device, - GdkSurface *surface, - gdouble *axes, + GdkSurface *surface, + double *axes, GdkModifierType *mask) { - gdouble x, y; + double x, y; gdk_surface_get_device_position (surface, device, &x, &y, mask); @@ -271,8 +271,8 @@ gdk_broadway_device_ungrab (GdkDevice *device, static GdkSurface * gdk_broadway_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkSurface *surface = NULL; diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c index 5b5abdb6b3..87a0642630 100644 --- a/gdk/broadway/gdksurface-broadway.c +++ b/gdk/broadway/gdksurface-broadway.c @@ -736,8 +736,8 @@ gdk_broadway_surface_get_root_coords (GdkSurface *surface, static gboolean gdk_broadway_surface_get_device_state (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { GdkSurface *child; diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c index 908fc75af8..d28b7e5b97 100644 --- a/gdk/gdkcairo.c +++ b/gdk/gdkcairo.c @@ -213,8 +213,8 @@ gdk_cairo_surface_paint_pixbuf (cairo_surface_t *surface, void gdk_cairo_set_source_pixbuf (cairo_t *cr, const GdkPixbuf *pixbuf, - gdouble pixbuf_x, - gdouble pixbuf_y) + double pixbuf_x, + double pixbuf_y) { cairo_format_t format; cairo_surface_t *surface; diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h index 49b4117eb0..e2dc85c41c 100644 --- a/gdk/gdkcairo.h +++ b/gdk/gdkcairo.h @@ -35,8 +35,8 @@ void gdk_cairo_set_source_rgba (cairo_t *cr, GDK_AVAILABLE_IN_ALL void gdk_cairo_set_source_pixbuf (cairo_t *cr, const GdkPixbuf *pixbuf, - gdouble pixbuf_x, - gdouble pixbuf_y); + double pixbuf_x, + double pixbuf_y); GDK_AVAILABLE_IN_ALL void gdk_cairo_rectangle (cairo_t *cr, diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index ae6cd79e6b..745b8910a0 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -52,11 +52,11 @@ typedef struct _GdkAxisInfo GdkAxisInfo; struct _GdkAxisInfo { GdkAxisUse use; - gdouble min_axis; - gdouble max_axis; - gdouble min_value; - gdouble max_value; - gdouble resolution; + double min_axis; + double max_axis; + double min_value; + double max_value; + double resolution; }; enum { @@ -550,7 +550,7 @@ gdk_device_get_property (GObject *object, void gdk_device_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask) { g_return_if_fail (GDK_IS_DEVICE (device)); @@ -608,7 +608,7 @@ gdk_device_get_surface_at_position (GdkDevice *device, double *win_x, double *win_y) { - gdouble tmp_x, tmp_y; + double tmp_x, tmp_y; GdkSurface *surface; g_return_val_if_fail (GDK_IS_DEVICE (device), NULL); @@ -873,9 +873,9 @@ gdk_device_get_n_axes (GdkDevice *device) **/ gboolean gdk_device_get_axis (GdkDevice *device, - gdouble *axes, + double *axes, GdkAxisUse use, - gdouble *value) + double *value) { int i; @@ -994,9 +994,9 @@ _gdk_device_reset_axes (GdkDevice *device) guint _gdk_device_add_axis (GdkDevice *device, GdkAxisUse use, - gdouble min_value, - gdouble max_value, - gdouble resolution) + double min_value, + double max_value, + double resolution) { GdkAxisInfo axis_info; guint pos; @@ -1039,9 +1039,9 @@ void _gdk_device_get_axis_info (GdkDevice *device, guint index_, GdkAxisUse *use, - gdouble *min_value, - gdouble *max_value, - gdouble *resolution) + double *min_value, + double *max_value, + double *resolution) { GdkAxisInfo *info; @@ -1078,17 +1078,17 @@ gboolean _gdk_device_translate_surface_coord (GdkDevice *device, GdkSurface *surface, guint index_, - gdouble value, - gdouble *axis_value) + double value, + double *axis_value) { GdkAxisInfo axis_info; GdkAxisInfo *axis_info_x, *axis_info_y; - gdouble device_width, device_height; - gdouble x_offset, y_offset; - gdouble x_scale, y_scale; - gdouble x_min, y_min; - gdouble x_resolution, y_resolution; - gdouble device_aspect; + double device_width, device_height; + double x_offset, y_offset; + double x_scale, y_scale; + double x_min, y_min; + double x_resolution, y_resolution; + double device_aspect; int surface_width, surface_height; if (index_ >= device->axes->len) @@ -1179,16 +1179,16 @@ _gdk_device_translate_surface_coord (GdkDevice *device, gboolean _gdk_device_translate_screen_coord (GdkDevice *device, GdkSurface *surface, - gdouble surface_root_x, - gdouble surface_root_y, - gdouble screen_width, - gdouble screen_height, + double surface_root_x, + double surface_root_y, + double screen_width, + double screen_height, guint index_, - gdouble value, - gdouble *axis_value) + double value, + double *axis_value) { GdkAxisInfo axis_info; - gdouble axis_width, scale, offset; + double axis_width, scale, offset; if (index_ >= device->axes->len) return FALSE; @@ -1229,11 +1229,11 @@ _gdk_device_translate_screen_coord (GdkDevice *device, gboolean _gdk_device_translate_axis (GdkDevice *device, guint index_, - gdouble value, - gdouble *axis_value) + double value, + double *axis_value) { GdkAxisInfo axis_info; - gdouble axis_width, out; + double axis_width, out; if (index_ >= device->axes->len) return FALSE; @@ -1258,8 +1258,8 @@ void _gdk_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GDK_DEVICE_GET_CLASS (device)->query_state (device, @@ -1272,8 +1272,8 @@ _gdk_device_query_state (GdkDevice *device, GdkSurface * _gdk_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { return GDK_DEVICE_GET_CLASS (device)->surface_at_position (device, diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index 09286c6119..7fe2aebb84 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -116,7 +116,7 @@ GdkAxisUse gdk_device_get_axis_use (GdkDevice *device, GDK_AVAILABLE_IN_ALL void gdk_device_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask); GDK_AVAILABLE_IN_ALL GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device, @@ -127,9 +127,9 @@ GDK_AVAILABLE_IN_ALL int gdk_device_get_n_axes (GdkDevice *device); GDK_AVAILABLE_IN_ALL gboolean gdk_device_get_axis (GdkDevice *device, - gdouble *axes, + double *axes, GdkAxisUse use, - gdouble *value); + double *value); GDK_AVAILABLE_IN_ALL GdkDisplay * gdk_device_get_display (GdkDevice *device); diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h index 1bd00c4241..07184a3abe 100644 --- a/gdk/gdkdeviceprivate.h +++ b/gdk/gdkdeviceprivate.h @@ -63,7 +63,7 @@ struct _GdkDeviceClass void (* get_state) (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask); void (* set_surface_cursor)(GdkDevice *device, @@ -73,8 +73,8 @@ struct _GdkDeviceClass void (* query_state) (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); GdkGrabStatus (* grab) (GdkDevice *device, GdkSurface *surface, @@ -98,36 +98,36 @@ void _gdk_device_set_associated_device (GdkDevice *device, void _gdk_device_reset_axes (GdkDevice *device); guint _gdk_device_add_axis (GdkDevice *device, GdkAxisUse use, - gdouble min_value, - gdouble max_value, - gdouble resolution); + double min_value, + double max_value, + double resolution); void _gdk_device_get_axis_info (GdkDevice *device, guint index, GdkAxisUse *use, - gdouble *min_value, - gdouble *max_value, - gdouble *resolution); + double *min_value, + double *max_value, + double *resolution); gboolean _gdk_device_translate_surface_coord (GdkDevice *device, GdkSurface *surface, guint index, - gdouble value, - gdouble *axis_value); + double value, + double *axis_value); gboolean _gdk_device_translate_screen_coord (GdkDevice *device, GdkSurface *surface, - gdouble surface_root_x, - gdouble surface_root_y, - gdouble screen_width, - gdouble screen_height, + double surface_root_x, + double surface_root_y, + double screen_width, + double screen_height, guint index, - gdouble value, - gdouble *axis_value); + double value, + double *axis_value); gboolean _gdk_device_translate_axis (GdkDevice *device, guint index, - gdouble value, - gdouble *axis_value); + double value, + double *axis_value); GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device, int n_events); @@ -140,12 +140,12 @@ void _gdk_device_remove_physical_device (GdkDevice *device, void _gdk_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); GdkSurface * _gdk_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); void gdk_device_set_seat (GdkDevice *device, diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 5651bd1300..92f1de8a18 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -584,7 +584,7 @@ get_current_toplevel (GdkDisplay *display, GdkModifierType *state_out) { GdkSurface *pointer_surface; - gdouble x, y; + double x, y; GdkModifierType state; pointer_surface = _gdk_device_surface_at_position (device, &x, &y, &state); diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h index 2ddc6d81cf..13decb82be 100644 --- a/gdk/gdkdisplayprivate.h +++ b/gdk/gdkdisplayprivate.h @@ -62,7 +62,7 @@ typedef struct typedef struct { GdkSurface *surface_under_pointer; /* surface that last got a normal enter event */ - gdouble toplevel_x, toplevel_y; + double toplevel_x, toplevel_y; guint32 state; guint32 button; GdkDevice *last_physical_device; diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 2248b94208..8131d54d59 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -993,12 +993,12 @@ gdk_event_triggers_context_menu (GdkEvent *event) static gboolean gdk_events_get_axis_distances (GdkEvent *event1, GdkEvent *event2, - gdouble *x_distance, - gdouble *y_distance, - gdouble *distance) + double *x_distance, + double *y_distance, + double *distance) { - gdouble x1, x2, y1, y2; - gdouble xd, yd; + double x1, x2, y1, y2; + double xd, yd; if (!gdk_event_get_position (event1, &x1, &y1) || !gdk_event_get_position (event2, &x2, &y2)) @@ -1033,7 +1033,7 @@ gdk_events_get_axis_distances (GdkEvent *event1, gboolean gdk_events_get_distance (GdkEvent *event1, GdkEvent *event2, - gdouble *distance) + double *distance) { return gdk_events_get_axis_distances (event1, event2, NULL, NULL, @@ -1056,9 +1056,9 @@ gdk_events_get_distance (GdkEvent *event1, gboolean gdk_events_get_angle (GdkEvent *event1, GdkEvent *event2, - gdouble *angle) + double *angle) { - gdouble x_distance, y_distance, distance; + double x_distance, y_distance, distance; if (!gdk_events_get_axis_distances (event1, event2, &x_distance, &y_distance, @@ -1097,10 +1097,10 @@ gdk_events_get_angle (GdkEvent *event1, gboolean gdk_events_get_center (GdkEvent *event1, GdkEvent *event2, - gdouble *x, - gdouble *y) + double *x, + double *y) { - gdouble x1, x2, y1, y2; + double x1, x2, y1, y2; if (!gdk_event_get_position (event1, &x1, &y1) || !gdk_event_get_position (event2, &x2, &y2)) diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index a4d85365fd..0a70e407d1 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -188,8 +188,8 @@ void _gdk_synthesize_crossing_events (GdkDisplay *display, GdkDevice *device, GdkDevice *source_device, GdkCrossingMode mode, - gdouble toplevel_x, - gdouble toplevel_y, + double toplevel_x, + double toplevel_y, GdkModifierType mask, guint32 time_, GdkEvent *event_in_queue, @@ -331,8 +331,8 @@ struct _GdkGeometry int base_height; int width_inc; int height_inc; - gdouble min_aspect; - gdouble max_aspect; + double min_aspect; + double max_aspect; GdkGravity win_gravity; }; diff --git a/gdk/gdkrgba.c b/gdk/gdkrgba.c index 80c4349572..20940db9d3 100644 --- a/gdk/gdkrgba.c +++ b/gdk/gdkrgba.c @@ -132,7 +132,7 @@ gdk_rgba_is_opaque (const GdkRGBA *rgba) static gboolean parse_rgb_value (const char *str, char **endp, - gdouble *number) + double *number) { const char *p; @@ -186,7 +186,7 @@ gdk_rgba_parse (GdkRGBA *rgba, const char *spec) { gboolean has_alpha; - gdouble r, g, b, a; + double r, g, b, a; char *str = (char *) spec; char *p; diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index eb2776b164..6b58c1f027 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -1705,7 +1705,7 @@ gdk_surface_get_device_position (GdkSurface *surface, double *y, GdkModifierType *mask) { - gdouble tmp_x, tmp_y; + double tmp_x, tmp_y; GdkModifierType tmp_mask; g_return_if_fail (GDK_IS_SURFACE (surface)); diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h index b3a8457a58..5d750bfe2e 100644 --- a/gdk/gdksurfaceprivate.h +++ b/gdk/gdksurfaceprivate.h @@ -125,8 +125,8 @@ struct _GdkSurfaceClass int *root_y); gboolean (* get_device_state) (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask); void (* set_input_region) (GdkSurface *surface, diff --git a/gdk/macos/gdkmacosdevice.c b/gdk/macos/gdkmacosdevice.c index 3b77c7a7d0..8dbbe1ac61 100644 --- a/gdk/macos/gdkmacosdevice.c +++ b/gdk/macos/gdkmacosdevice.c @@ -65,8 +65,8 @@ gdk_macos_device_set_surface_cursor (GdkDevice *device, static GdkSurface * gdk_macos_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *state) { GdkMacosDisplay *display; @@ -129,10 +129,10 @@ gdk_macos_device_ungrab (GdkDevice *device, static void gdk_macos_device_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask) { - gdouble x_pos, y_pos; + double x_pos, y_pos; g_assert (GDK_IS_MACOS_DEVICE (device)); g_assert (GDK_IS_MACOS_SURFACE (surface)); @@ -150,8 +150,8 @@ static void gdk_macos_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkDisplay *display; diff --git a/gdk/macos/gdkmacosdisplay-translate.c b/gdk/macos/gdkmacosdisplay-translate.c index 8e86459987..799031e3ef 100644 --- a/gdk/macos/gdkmacosdisplay-translate.c +++ b/gdk/macos/gdkmacosdisplay-translate.c @@ -433,7 +433,7 @@ fill_pinch_event (GdkMacosDisplay *display, } last_state = FP_STATE_IDLE; GdkSeat *seat; GdkTouchpadGesturePhase phase; - gdouble angle_delta = 0.0; + double angle_delta = 0.0; g_assert (GDK_IS_MACOS_DISPLAY (display)); g_assert (GDK_IS_MACOS_SURFACE (surface)); @@ -590,8 +590,8 @@ fill_scroll_event (GdkMacosDisplay *self, GdkDevice *pointer; GdkEvent *ret = NULL; GdkSeat *seat; - gdouble dx; - gdouble dy; + double dx; + double dy; g_assert (GDK_IS_MACOS_SURFACE (surface)); g_assert (nsevent != NULL); @@ -606,8 +606,8 @@ fill_scroll_event (GdkMacosDisplay *self, if ([nsevent hasPreciseScrollingDeltas]) { - gdouble sx; - gdouble sy; + double sx; + double sy; /* * TODO: We probably need another event type for the diff --git a/gdk/macos/gdkmacosdrag.c b/gdk/macos/gdkmacosdrag.c index 7cc70d921e..32c4a4ac74 100644 --- a/gdk/macos/gdkmacosdrag.c +++ b/gdk/macos/gdkmacosdrag.c @@ -305,8 +305,8 @@ gdk_drag_get_current_actions (GdkModifierType state, static void gdk_drag_update (GdkDrag *drag, - gdouble x_root, - gdouble y_root, + double x_root, + double y_root, GdkModifierType mods, guint32 evtime) { diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c index a5bc4098b9..1c0cdc12e9 100644 --- a/gdk/macos/gdkmacossurface.c +++ b/gdk/macos/gdkmacossurface.c @@ -230,8 +230,8 @@ gdk_macos_surface_get_root_coords (GdkSurface *surface, static gboolean gdk_macos_surface_get_device_state (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { GdkDisplay *display; diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index e9fc839e83..0715bdeea5 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -73,8 +73,8 @@ typedef struct _GdkWaylandTabletPadData GdkWaylandTabletPadData; struct _GdkWaylandTouchData { uint32_t id; - gdouble x; - gdouble y; + double x; + double y; GdkSurface *surface; uint32_t touch_down_serial; guint initial_touch : 1; @@ -85,7 +85,7 @@ struct _GdkWaylandPointerFrameData GdkEvent *event; /* Specific to the scroll event */ - gdouble delta_x, delta_y; + double delta_x, delta_y; int32_t discrete_x, discrete_y; gint8 is_scroll_stop; enum wl_pointer_axis_source source; @@ -147,7 +147,7 @@ struct _GdkWaylandTabletPadGroupData struct { guint source; gboolean is_stop; - gdouble value; + double value; } axis_tmp_info; }; @@ -186,7 +186,7 @@ struct _GdkWaylandTabletData GdkWaylandTabletToolData *current_tool; int axis_indices[GDK_AXIS_LAST]; - gdouble *axes; + double *axes; }; struct _GdkWaylandSeat @@ -253,7 +253,7 @@ struct _GdkWaylandSeat /* Some tracking on gesture events */ guint gesture_n_fingers; - gdouble gesture_scale; + double gesture_scale; GdkCursor *grab_cursor; }; @@ -310,10 +310,10 @@ static void deliver_key_event (GdkWaylandSeat *seat, static void gdk_wayland_device_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask) { - gdouble x, y; + double x, y; gdk_surface_get_device_position (surface, device, &x, &y, mask); @@ -538,8 +538,8 @@ static void gdk_wayland_device_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkWaylandPointerData *pointer; @@ -788,8 +788,8 @@ gdk_wayland_device_ungrab (GdkDevice *device, static GdkSurface * gdk_wayland_device_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkWaylandPointerData *pointer; @@ -1357,8 +1357,8 @@ flush_discrete_scroll_event (GdkWaylandSeat *seat, static void flush_smooth_scroll_event (GdkWaylandSeat *seat, - gdouble delta_x, - gdouble delta_y, + double delta_x, + double delta_y, gboolean is_stop) { GdkEvent *event; @@ -2543,8 +2543,8 @@ emit_gesture_swipe_event (GdkWaylandSeat *seat, GdkTouchpadGesturePhase phase, guint32 _time, guint32 n_fingers, - gdouble dx, - gdouble dy) + double dx, + double dy) { GdkEvent *event; @@ -2638,10 +2638,10 @@ emit_gesture_pinch_event (GdkWaylandSeat *seat, GdkTouchpadGesturePhase phase, guint32 _time, guint n_fingers, - gdouble dx, - gdouble dy, - gdouble scale, - gdouble angle_delta) + double dx, + double dy, + double scale, + double angle_delta) { GdkEvent *event; @@ -3393,7 +3393,7 @@ gdk_wayland_device_tablet_clone_tool_axes (GdkWaylandTabletData *tablet, g_free (tablet->axes); tablet->axes = - g_new0 (gdouble, gdk_device_get_n_axes (tablet->stylus_device)); + g_new0 (double, gdk_device_get_n_axes (tablet->stylus_device)); g_object_thaw_notify (G_OBJECT (tablet->stylus_device)); } @@ -3402,7 +3402,7 @@ static void gdk_wayland_mimic_device_axes (GdkDevice *logical, GdkDevice *physical) { - gdouble axis_min, axis_max, axis_resolution; + double axis_min, axis_max, axis_resolution; GdkAxisUse axis_use; int axis_count; int i; @@ -3510,7 +3510,7 @@ static double * tablet_copy_axes (GdkWaylandTabletData *tablet) { return g_memdup (tablet->axes, - sizeof (gdouble) * gdk_device_get_n_axes (tablet->stylus_device)); + sizeof (double) * gdk_device_get_n_axes (tablet->stylus_device)); } static void @@ -3917,7 +3917,7 @@ tablet_pad_strip_handle_position (void *data, g_message ("tablet pad strip handle position, strip = %p position = %d", wp_tablet_pad_strip, position)); - group->axis_tmp_info.value = (gdouble) position / 65535; + group->axis_tmp_info.value = (double) position / 65535; } static void diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index d0e6298e56..03a00a14fb 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -1445,11 +1445,11 @@ get_order (const char *s) return 0; } -static gdouble +static double get_dpi_from_gsettings (GdkWaylandDisplay *display_wayland) { GSettings *settings; - gdouble factor; + double factor; settings = g_hash_table_lookup (display_wayland->settings, "org.gnome.desktop.interface"); diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index b6e60a40fe..2883b61947 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -3105,8 +3105,8 @@ gdk_wayland_surface_get_root_coords (GdkSurface *surface, static gboolean gdk_wayland_surface_get_device_state (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { gboolean return_val; diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c index 4a7fac2bd2..4de03fec42 100644 --- a/gdk/win32/gdkclipdrop-win32.c +++ b/gdk/win32/gdkclipdrop-win32.c @@ -2477,7 +2477,7 @@ transmute_cf_dib_to_image_bmp (const guchar *data, { if (p[3] != 0) { - gdouble inverse_alpha = 255./p[3]; + double inverse_alpha = 255./p[3]; p[0] = p[0] * inverse_alpha + 0.5; p[1] = p[1] * inverse_alpha + 0.5; diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c index 9bfdd2c443..a7a6464d75 100644 --- a/gdk/win32/gdkcursor-win32.c +++ b/gdk/win32/gdkcursor-win32.c @@ -1003,8 +1003,8 @@ _gdk_win32_display_update_cursors (GdkWin32Display *display) GdkPixbuf * gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, - gdouble *x_hot, - gdouble *y_hot) + double *x_hot, + double *y_hot) { GdkPixbuf *pixbuf = NULL; ICONINFO ii; diff --git a/gdk/win32/gdkdevice-virtual.c b/gdk/win32/gdkdevice-virtual.c index c6460c5f22..c63bb7fa9a 100644 --- a/gdk/win32/gdkdevice-virtual.c +++ b/gdk/win32/gdkdevice-virtual.c @@ -37,7 +37,7 @@ _gdk_device_virtual_set_active (GdkDevice *device, GdkDeviceVirtual *virtual = GDK_DEVICE_VIRTUAL (device); int n_axes, i; GdkAxisUse use; - gdouble min_value, max_value, resolution; + double min_value, max_value, resolution; if (virtual->active_device == new_active) return; @@ -62,7 +62,7 @@ _gdk_device_virtual_set_active (GdkDevice *device, static void gdk_device_virtual_get_state (GdkDevice *device, GdkSurface *window, - gdouble *axes, + double *axes, GdkModifierType *mask) { GdkDeviceVirtual *virtual = GDK_DEVICE_VIRTUAL (device); @@ -100,8 +100,8 @@ static void gdk_device_virtual_query_state (GdkDevice *device, GdkSurface *window, GdkSurface **child_window, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkDeviceVirtual *virtual = GDK_DEVICE_VIRTUAL (device); diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c index 0f83610952..67b16bd51f 100644 --- a/gdk/win32/gdkdevice-win32.c +++ b/gdk/win32/gdkdevice-win32.c @@ -32,7 +32,7 @@ G_DEFINE_TYPE (GdkDeviceWin32, gdk_device_win32, GDK_TYPE_DEVICE) static void gdk_device_win32_get_state (GdkDevice *device, GdkSurface *window, - gdouble *axes, + double *axes, GdkModifierType *mask) { double x, y; @@ -166,8 +166,8 @@ screen_to_client (HWND hwnd, POINT screen_pt, POINT *client_pt) GdkSurface * _gdk_device_win32_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkSurface *window = NULL; diff --git a/gdk/win32/gdkdevice-win32.h b/gdk/win32/gdkdevice-win32.h index b59d775f99..2559412426 100644 --- a/gdk/win32/gdkdevice-win32.h +++ b/gdk/win32/gdkdevice-win32.h @@ -45,8 +45,8 @@ struct _GdkDeviceWin32Class GType gdk_device_win32_get_type (void) G_GNUC_CONST; GdkSurface *_gdk_device_win32_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); G_END_DECLS diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c index 124fcef2e7..04acb571fd 100644 --- a/gdk/win32/gdkdevice-wintab.c +++ b/gdk/win32/gdkdevice-wintab.c @@ -57,7 +57,7 @@ get_current_mask (void) static void gdk_device_wintab_get_state (GdkDevice *device, GdkSurface *window, - gdouble *axes, + double *axes, GdkModifierType *mask) { GdkDeviceWintab *device_wintab; @@ -177,8 +177,8 @@ gdk_device_wintab_ungrab (GdkDevice *device, static GdkSurface * gdk_device_wintab_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { return NULL; @@ -187,14 +187,14 @@ gdk_device_wintab_surface_at_position (GdkDevice *device, void _gdk_device_wintab_translate_axes (GdkDeviceWintab *device_wintab, GdkSurface *window, - gdouble *axes, - gdouble *x, - gdouble *y) + double *axes, + double *x, + double *y) { GdkDevice *device; GdkSurface *impl_surface; int root_x, root_y; - gdouble temp_x, temp_y; + double temp_x, temp_y; int i; device = GDK_DEVICE (device_wintab); diff --git a/gdk/win32/gdkdevice-wintab.h b/gdk/win32/gdkdevice-wintab.h index 2679d73b80..088a84e7f4 100644 --- a/gdk/win32/gdkdevice-wintab.h +++ b/gdk/win32/gdkdevice-wintab.h @@ -62,9 +62,9 @@ GType gdk_device_wintab_get_type (void) G_GNUC_CONST; void _gdk_device_wintab_translate_axes (GdkDeviceWintab *device, GdkSurface *window, - gdouble *axes, - gdouble *x, - gdouble *y); + double *axes, + double *x, + double *y); G_END_DECLS diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c index df456c29fd..fcdf5b13da 100644 --- a/gdk/win32/gdkdevicemanager-win32.c +++ b/gdk/win32/gdkdevicemanager-win32.c @@ -1044,7 +1044,7 @@ gdk_input_other_event (GdkDisplay *display, if (event_type == GDK_BUTTON_PRESS || event_type == GDK_BUTTON_RELEASE) { - axes = g_new (gdouble, num_axes); + axes = g_new (double, num_axes); _gdk_device_wintab_translate_axes (source_device, window, @@ -1080,7 +1080,7 @@ gdk_input_other_event (GdkDisplay *display, } else { - axes = g_new (gdouble, num_axes); + axes = g_new (double, num_axes); _gdk_device_wintab_translate_axes (source_device, window, axes, diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index 8d6caa9ae3..4720804de6 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -2307,8 +2307,8 @@ gdk_win32_drag_drop_performed (GdkDrag *drag, static void gdk_local_drag_update (GdkDrag *drag, - gdouble x_root, - gdouble y_root, + double x_root, + double y_root, DWORD grfKeyState, guint32 evtime) { diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index a2ff0d952e..cd7fea354c 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2755,9 +2755,9 @@ gdk_event_translate (MSG *msg, delta_x = delta_y = 0.0; if (msg->message == WM_MOUSEWHEEL) - delta_y = (double) GET_WHEEL_DELTA_WPARAM (msg->wParam) / (gdouble) WHEEL_DELTA; + delta_y = (double) GET_WHEEL_DELTA_WPARAM (msg->wParam) / (double) WHEEL_DELTA; else if (msg->message == WM_MOUSEHWHEEL) - delta_x = (double) GET_WHEEL_DELTA_WPARAM (msg->wParam) / (gdouble) WHEEL_DELTA; + delta_x = (double) GET_WHEEL_DELTA_WPARAM (msg->wParam) / (double) WHEEL_DELTA; /* Positive delta scrolls up, not down, see API documentation for WM_MOUSEWHEEL message. */ @@ -3291,7 +3291,7 @@ gdk_event_translate (MSG *msg, RECT decorated_rect; RECT undecorated_drag; int decoration_width, decoration_height; - gdouble drag_aspect; + double drag_aspect; int drag_width, drag_height, new_width, new_height; GetClientRect (GDK_SURFACE_HWND (window), &rect); @@ -3313,7 +3313,7 @@ gdk_event_translate (MSG *msg, drag_width = undecorated_drag.right - undecorated_drag.left; drag_height = undecorated_drag.bottom - undecorated_drag.top; - drag_aspect = (gdouble) drag_width / drag_height; + drag_aspect = (double) drag_width / drag_height; GDK_NOTE (EVENTS, g_print (" (ASPECT:%g--%g curr: %g)", impl->hints.min_aspect, impl->hints.max_aspect, drag_aspect)); diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 06af6e8303..ad96754187 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -249,8 +249,8 @@ gdk_win32_impl_frame_clock_after_paint (GdkFrameClock *clock, if (SUCCEEDED (hr)) { - timings->refresh_interval = timing_info.qpcRefreshPeriod * (gdouble)G_USEC_PER_SEC / tick_frequency.QuadPart; - timings->presentation_time = timing_info.qpcCompose * (gdouble)G_USEC_PER_SEC / tick_frequency.QuadPart; + timings->refresh_interval = timing_info.qpcRefreshPeriod * (double)G_USEC_PER_SEC / tick_frequency.QuadPart; + timings->presentation_time = timing_info.qpcCompose * (double)G_USEC_PER_SEC / tick_frequency.QuadPart; } } @@ -1804,8 +1804,8 @@ gdk_win32_surface_get_root_coords (GdkSurface *window, static gboolean gdk_surface_win32_get_device_state (GdkSurface *window, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { GdkSurface *child; @@ -2249,9 +2249,9 @@ unsnap (GdkSurface *window, /* If the window fits into new work area without resizing it, * place it into new work area without resizing it. */ - gdouble left, right, up, down, hratio, vratio; - gdouble hscale, vscale; - gdouble new_left, new_up; + double left, right, up, down, hratio, vratio; + double hscale, vscale; + double new_left, new_up; left = impl->snap_stash->x; right = 1.0 - (impl->snap_stash->x + impl->snap_stash->width); @@ -2265,7 +2265,7 @@ unsnap (GdkSurface *window, hscale = hratio / (1.0 + hratio); } - new_left = (gdouble) (rect.width - impl->snap_stash_int->width) * hscale; + new_left = (double) (rect.width - impl->snap_stash_int->width) * hscale; vscale = 1.0; @@ -2275,7 +2275,7 @@ unsnap (GdkSurface *window, vscale = vratio / (1.0 + vratio); } - new_up = (gdouble) (rect.height - impl->snap_stash_int->height) * vscale; + new_up = (double) (rect.height - impl->snap_stash_int->height) * vscale; rect.x = round (rect.x + new_left); rect.y = round (rect.y + new_up); @@ -2360,10 +2360,10 @@ stash_window (GdkSurface *window, wwidth = (hmonitor_info.rcWork.right - hmonitor_info.rcWork.left) / impl->surface_scale; wheight = (hmonitor_info.rcWork.bottom - hmonitor_info.rcWork.top) / impl->surface_scale; - impl->snap_stash->x = (gdouble) (x) / (gdouble) (wwidth); - impl->snap_stash->y = (gdouble) (y) / (gdouble) (wheight); - impl->snap_stash->width = (gdouble) width / (gdouble) (wwidth); - impl->snap_stash->height = (gdouble) height / (gdouble) (wheight); + impl->snap_stash->x = (double) (x) / (double) (wwidth); + impl->snap_stash->y = (double) (y) / (double) (wheight); + impl->snap_stash->width = (double) width / (double) (wwidth); + impl->snap_stash->height = (double) height / (double) (wheight); impl->snap_stash_int->x = x; impl->snap_stash_int->y = y; @@ -2730,7 +2730,7 @@ static void adjust_indicator_rectangle (GdkRectangle *rect, gboolean inward) { - gdouble inverter; + double inverter; const int gap = AEROSNAP_INDICATOR_EDGE_GAP; #if defined(MORE_AEROSNAP_DEBUGGING) GdkRectangle cache = *rect; @@ -2759,12 +2759,12 @@ rounded_rectangle (cairo_t *cr, int y, int width, int height, - gdouble radius, - gdouble line_width, + double radius, + double line_width, GdkRGBA *fill, GdkRGBA *outline) { - gdouble degrees = M_PI / 180.0; + double degrees = M_PI / 180.0; if (fill == NULL && outline == NULL) return; @@ -2798,8 +2798,8 @@ rounded_rectangle (cairo_t *cr, } /* Translates linear animation scale into some kind of curve */ -static gdouble -curve (gdouble val) +static double +curve (double val) { /* TODO: try different curves. For now it's just linear */ return val; @@ -2814,10 +2814,10 @@ draw_indicator (GdkW32DragMoveResizeContext *context, GdkRGBA fill = {0, 0, 1.0, 0.8}; GdkRectangle current_rect; gint64 current_time = g_get_monotonic_time (); - gdouble animation_progress; + double animation_progress; gboolean last_draw; - gdouble line_width; - gdouble corner_radius; + double line_width; + double corner_radius; gint64 animation_duration; GdkWin32Surface *impl = GDK_WIN32_SURFACE (context->window); @@ -2836,7 +2836,7 @@ draw_indicator (GdkW32DragMoveResizeContext *context, if (timestamp != 0) current_time = timestamp; - animation_progress = (gdouble) (current_time - context->indicator_start_time) / animation_duration; + animation_progress = (double) (current_time - context->indicator_start_time) / animation_duration; if (animation_progress > 1.0) animation_progress = 1.0; @@ -2919,7 +2919,7 @@ redraw_indicator (gpointer user_data) HDC hdc; POINT source_point = { 0, 0 }; gboolean last_draw; - gdouble indicator_opacity; + double indicator_opacity; GdkWin32Surface *impl; gboolean do_source_remove = FALSE; diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h index 84e7dbaee0..649e29c869 100644 --- a/gdk/win32/gdksurface-win32.h +++ b/gdk/win32/gdksurface-win32.h @@ -79,10 +79,10 @@ typedef enum _GdkWin32AeroSnapState GdkWin32AeroSnapState; struct _GdkRectangleDouble { - gdouble x; - gdouble y; - gdouble width; - gdouble height; + double x; + double y; + double width; + double height; }; typedef struct _GdkRectangleDouble GdkRectangleDouble; @@ -311,7 +311,7 @@ struct _GdkWin32Surface * we remember the opacity value here and apply it * during UpdateLayredWindow() call, for layered windows. */ - gdouble layered_opacity; + double layered_opacity; HDC hdc; int hdc_count; diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h index dcd9471dc9..3582e81572 100644 --- a/gdk/win32/gdkwin32misc.h +++ b/gdk/win32/gdkwin32misc.h @@ -90,8 +90,8 @@ GdkSurface * gdk_win32_surface_lookup_for_display (GdkDisplay *display, /* For internal GTK use only */ GDK_AVAILABLE_IN_ALL GdkPixbuf *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, - gdouble *x_hot, - gdouble *y_hot); + double *x_hot, + double *y_hot); GDK_AVAILABLE_IN_ALL HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf); GDK_AVAILABLE_IN_ALL diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index 01736e6821..62507c1a3b 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -39,8 +39,8 @@ struct _ScrollValuator guint n_valuator : 4; guint direction : 4; guint last_value_valid : 1; - gdouble last_value; - gdouble increment; + double last_value; + double increment; }; struct _GdkX11DeviceXI2 @@ -49,7 +49,7 @@ struct _GdkX11DeviceXI2 int device_id; GArray *scroll_valuators; - gdouble *last_axes; + double *last_axes; }; struct _GdkX11DeviceXI2Class @@ -72,7 +72,7 @@ static void gdk_x11_device_xi2_set_property (GObject *object, static void gdk_x11_device_xi2_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask); static void gdk_x11_device_xi2_set_surface_cursor (GdkDevice *device, GdkSurface *surface, @@ -80,8 +80,8 @@ static void gdk_x11_device_xi2_set_surface_cursor (GdkDevice *device, static void gdk_x11_device_xi2_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); static GdkGrabStatus gdk_x11_device_xi2_grab (GdkDevice *device, @@ -95,8 +95,8 @@ static void gdk_x11_device_xi2_ungrab (GdkDevice *device, guint32 time_); static GdkSurface * gdk_x11_device_xi2_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask); @@ -190,7 +190,7 @@ gdk_x11_device_xi2_set_property (GObject *object, static void gdk_x11_device_xi2_get_state (GdkDevice *device, GdkSurface *surface, - gdouble *axes, + double *axes, GdkModifierType *mask) { GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device); @@ -214,7 +214,7 @@ gdk_x11_device_xi2_get_state (GdkDevice *device, { XIAnyClassInfo *class_info = info->classes[i]; GdkAxisUse use; - gdouble value; + double value; if (class_info->type != XIValuatorClass) continue; @@ -285,15 +285,15 @@ static void gdk_x11_device_xi2_query_state (GdkDevice *device, GdkSurface *surface, GdkSurface **child_surface, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkX11DeviceXI2 *device_xi2 = GDK_X11_DEVICE_XI2 (device); GdkDisplay *display; GdkX11Screen *default_screen; Window xroot_window, xchild_window, xwindow; - gdouble xroot_x, xroot_y, xwin_x, xwin_y; + double xroot_x, xroot_y, xwin_x, xwin_y; XIButtonState button_state; XIModifierState mod_state; XIGroupState group_state; @@ -447,8 +447,8 @@ gdk_x11_device_xi2_ungrab (GdkDevice *device, static GdkSurface * gdk_x11_device_xi2_surface_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, + double *win_x, + double *win_y, GdkModifierType *mask) { GdkX11Surface *impl; @@ -458,7 +458,7 @@ gdk_x11_device_xi2_surface_at_position (GdkDevice *device, Display *xdisplay; GdkSurface *surface; Window xwindow, root, child, last = None; - gdouble xroot_x, xroot_y, xwin_x, xwin_y; + double xroot_x, xroot_y, xwin_x, xwin_y; XIButtonState button_state = { 0 }; XIModifierState mod_state; XIGroupState group_state; @@ -744,7 +744,7 @@ void _gdk_x11_device_xi2_add_scroll_valuator (GdkX11DeviceXI2 *device, guint n_valuator, GdkScrollDirection direction, - gdouble increment) + double increment) { ScrollValuator scroll; @@ -762,9 +762,9 @@ _gdk_x11_device_xi2_add_scroll_valuator (GdkX11DeviceXI2 *device, gboolean _gdk_x11_device_xi2_get_scroll_delta (GdkX11DeviceXI2 *device, guint n_valuator, - gdouble valuator_value, + double valuator_value, GdkScrollDirection *direction_ret, - gdouble *delta_ret) + double *delta_ret) { guint i; @@ -835,7 +835,7 @@ _gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device) return device->device_id; } -gdouble +double gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, int n_axis) { @@ -850,13 +850,13 @@ gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, void gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device, - gdouble *axes, + double *axes, int n_axes) { g_free (device->last_axes); if (axes && n_axes) - device->last_axes = g_memdup (axes, sizeof (gdouble) * n_axes); + device->last_axes = g_memdup (axes, sizeof (double) * n_axes); else device->last_axes = NULL; } diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index 51cd98a2a5..67dccb5b87 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -204,9 +204,9 @@ static void translate_valuator_class (GdkDisplay *display, GdkDevice *device, Atom valuator_label, - gdouble min, - gdouble max, - gdouble resolution) + double min, + double max, + double resolution) { static gboolean initialized = FALSE; static Atom label_atoms [GDK_AXIS_LAST] = { 0 }; @@ -1187,25 +1187,25 @@ set_user_time (GdkEvent *event) gdk_x11_surface_set_user_time (surface, time); } -static gdouble * +static double * translate_axes (GdkDevice *device, - gdouble x, - gdouble y, + double x, + double y, GdkSurface *surface, XIValuatorState *valuators) { guint n_axes, i; - gdouble *axes; - gdouble *vals; + double *axes; + double *vals; n_axes = gdk_device_get_n_axes (device); - axes = g_new0 (gdouble, n_axes); + axes = g_new0 (double, n_axes); vals = valuators->values; for (i = 0; i < MIN (valuators->mask_len * 8, n_axes); i++) { GdkAxisUse use; - gdouble val; + double val; if (!XIMaskIsSet (valuators->mask, i)) { @@ -1313,13 +1313,13 @@ get_event_surface (GdkEventTranslator *translator, static gboolean scroll_valuators_changed (GdkX11DeviceXI2 *device, XIValuatorState *valuators, - gdouble *dx, - gdouble *dy) + double *dx, + double *dy) { gboolean has_scroll_valuators = FALSE; GdkScrollDirection direction; guint n_axes, i, n_val; - gdouble *vals; + double *vals; n_axes = gdk_device_get_n_axes (GDK_DEVICE (device)); vals = valuators->values; @@ -1328,7 +1328,7 @@ scroll_valuators_changed (GdkX11DeviceXI2 *device, for (i = 0; i < MIN (valuators->mask_len * 8, n_axes); i++) { - gdouble delta; + double delta; if (!XIMaskIsSet (valuators->mask, i)) continue; @@ -1704,7 +1704,7 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator, case XI_Motion: { XIDeviceEvent *xev = (XIDeviceEvent *) ev; - gdouble delta_x, delta_y; + double delta_x, delta_y; double x, y; double *axes; diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c index 291a892156..ba119a45b8 100644 --- a/gdk/x11/gdkdrag-x11.c +++ b/gdk/x11/gdkdrag-x11.c @@ -2163,8 +2163,8 @@ gdk_drag_get_current_actions (GdkModifierType state, static void gdk_drag_update (GdkDrag *drag, - gdouble x_root, - gdouble y_root, + double x_root, + double y_root, GdkModifierType mods, guint32 evtime) { diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c index a5d17e232c..810202614d 100644 --- a/gdk/x11/gdkeventsource.c +++ b/gdk/x11/gdkeventsource.c @@ -130,7 +130,7 @@ create_synth_crossing_event (GdkEventType evtype, GdkEvent *real_event) { GdkEvent *event; - gdouble x, y; + double x, y; g_assert (evtype == GDK_ENTER_NOTIFY || evtype == GDK_LEAVE_NOTIFY); diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index eeae4abbe5..97155106a5 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -152,19 +152,19 @@ GdkDevice * _gdk_x11_device_manager_xi2_lookup (GdkX11DeviceManagerXI2 *devic void _gdk_x11_device_xi2_add_scroll_valuator (GdkX11DeviceXI2 *device, guint n_valuator, GdkScrollDirection direction, - gdouble increment); + double increment); gboolean _gdk_x11_device_xi2_get_scroll_delta (GdkX11DeviceXI2 *device, guint n_valuator, - gdouble valuator_value, + double valuator_value, GdkScrollDirection *direction_ret, - gdouble *delta_ret); + double *delta_ret); void _gdk_device_xi2_reset_scroll_valuators (GdkX11DeviceXI2 *device); -gdouble gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, +double gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, int n_axis); void gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device, - gdouble *axes, + double *axes, int n_axes); gboolean _gdk_x11_display_supports_cursor_alpha (GdkDisplay *display); diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index 261b123940..95f340bc70 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -2292,8 +2292,8 @@ gdk_surface_get_geometry_hints (GdkSurface *surface, { *geom_mask |= GDK_HINT_ASPECT; - geometry->min_aspect = (gdouble) size_hints->min_aspect.x / (gdouble) size_hints->min_aspect.y; - geometry->max_aspect = (gdouble) size_hints->max_aspect.x / (gdouble) size_hints->max_aspect.y; + geometry->min_aspect = (double) size_hints->min_aspect.x / (double) size_hints->min_aspect.y; + geometry->max_aspect = (double) size_hints->max_aspect.x / (double) size_hints->max_aspect.y; } if (size_hints->flags & PWinGravity) @@ -2711,8 +2711,8 @@ gdk_x11_surface_get_frame_extents (GdkSurface *surface, static gboolean gdk_x11_surface_get_device_state (GdkSurface *surface, GdkDevice *device, - gdouble *x, - gdouble *y, + double *x, + double *y, GdkModifierType *mask) { GdkSurface *child; @@ -3841,8 +3841,8 @@ get_move_resize_data (GdkDisplay *display, static void check_maximize (MoveResizeData *mv_resize, - gdouble x_root, - gdouble y_root) + double x_root, + double y_root) { GdkSurfaceState state; int y; @@ -3863,8 +3863,8 @@ check_maximize (MoveResizeData *mv_resize, static void check_unmaximize (MoveResizeData *mv_resize, - gdouble x_root, - gdouble y_root) + double x_root, + double y_root) { GdkSurfaceState state; int dx, dy; diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c index 226bbcd985..a3a548227c 100644 --- a/gdk/x11/gdkxftdefaults.c +++ b/gdk/x11/gdkxftdefaults.c @@ -109,7 +109,7 @@ get_boolean_default (GdkX11Screen *x11_screen, static gboolean get_double_default (GdkX11Screen *x11_screen, const char *option, - gdouble *value) + double *value) { Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen); char *v, *e; |