summaryrefslogtreecommitdiff
path: root/gdk/x11
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2020-07-24 22:32:16 +0200
committerBenjamin Otte <otte@redhat.com>2020-07-25 00:47:36 +0200
commit3078b180fe79efd0e58239dabb7098c40aced1a8 (patch)
treea4ce228bafd8df1eff46d2410554a2b2a3c0f12e /gdk/x11
parent556997f9df3b771733fc49a02d5424aee276e29f (diff)
downloadgtk+-3078b180fe79efd0e58239dabb7098c40aced1a8.tar.gz
Replace "gdouble" with "double"
Diffstat (limited to 'gdk/x11')
-rw-r--r--gdk/x11/gdkdevice-xi2.c44
-rw-r--r--gdk/x11/gdkdevicemanager-xi2.c30
-rw-r--r--gdk/x11/gdkdrag-x11.c4
-rw-r--r--gdk/x11/gdkeventsource.c2
-rw-r--r--gdk/x11/gdkprivate-x11.h10
-rw-r--r--gdk/x11/gdksurface-x11.c16
-rw-r--r--gdk/x11/gdkxftdefaults.c2
7 files changed, 54 insertions, 54 deletions
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;