gdk: Enable unity builds

Instruct meson to compile all gsk sources in one pass. This lets
the compiler inline freely between our sources, and is much nicer
than moving functions into the headers as static inlines.

gdk/filetransferportal.c

@@ -53,18 +53,18 @@ typedef struct {
   const char **files;
   int len;
   int start;
-} AddFileData;
+} FileTransferAddFileData;
 
-static void add_files (GDBusProxy  *proxy,
-                       AddFileData *afd);
+static void file_transfer_add_files (GDBusProxy              *proxy,
+                                     FileTransferAddFileData *afd);
 
 static void
-add_files_done (GObject      *object,
-                GAsyncResult *result,
-                gpointer      data)
+file_transfer_add_files_done (GObject      *object,
+                              GAsyncResult *result,
+                              gpointer      data)
 {
   GDBusProxy *proxy = G_DBUS_PROXY (object);
-  AddFileData *afd = data;
+  FileTransferAddFileData *afd = data;
   GError *error = NULL;
   GVariant *ret;
 
@@ -87,15 +87,15 @@ add_files_done (GObject      *object,
       return;
     }
 
-  add_files (proxy, afd);
+  file_transfer_add_files (proxy, afd);
 }
 
 /* We call AddFiles in chunks of 16 to avoid running into
  * the per-message fd limit of the bus.
  */
 static void
-add_files (GDBusProxy  *proxy,
-           AddFileData *afd)
+file_transfer_add_files (GDBusProxy              *proxy,
+                         FileTransferAddFileData *afd)
 {
   GUnixFDList *fd_list;
   GVariantBuilder fds, options;
@@ -154,18 +154,18 @@ add_files (GDBusProxy  *proxy,
                                        0, -1,
                                        fd_list,
                                        NULL,
-                                       add_files_done, afd);
+                                       file_transfer_add_files_done, afd);
 
   g_object_unref (fd_list);
 }
 
 static void
-start_session_done (GObject      *object,
-                    GAsyncResult *result,
-                    gpointer      data)
+file_transfer_start_session_done (GObject      *object,
+                                  GAsyncResult *result,
+                                  gpointer      data)
 {
   GDBusProxy *proxy = G_DBUS_PROXY (object);
-  AddFileData *afd = data;
+  FileTransferAddFileData *afd = data;
   GError *error = NULL;
   GVariant *ret;
   const char *key;
@@ -185,7 +185,7 @@ start_session_done (GObject      *object,
 
   g_variant_unref (ret);
 
-  add_files (proxy, afd);
+  file_transfer_add_files (proxy, afd);
 }
 
 void
@@ -195,7 +195,7 @@ file_transfer_portal_register_files (const char          **files,
                                      gpointer              data)
 {
   GTask *task;
-  AddFileData *afd;
+  FileTransferAddFileData *afd;
   GVariantBuilder options;
 
   task = g_task_new (NULL, NULL, callback, data);
@@ -208,7 +208,7 @@ file_transfer_portal_register_files (const char          **files,
       return;
     }
 
-  afd = g_new (AddFileData, 1);
+  afd = g_new (FileTransferAddFileData, 1);
   afd->task = task;
   afd->files = files;
   afd->len = g_strv_length ((char **)files);
@@ -222,7 +222,7 @@ file_transfer_portal_register_files (const char          **files,
 
   g_dbus_proxy_call (file_transfer_proxy, "StartTransfer",
                      g_variant_new ("(a{sv})", &options),
-                     0, -1, NULL, start_session_done, afd);
+                     0, -1, NULL, file_transfer_start_session_done, afd);
 }
 
 gboolean
@@ -240,9 +240,9 @@ file_transfer_portal_register_files_finish (GAsyncResult  *result,
 }
 
 static void
-retrieve_files_done (GObject      *object,
-                     GAsyncResult *result,
-                     gpointer      data)
+file_transfer_retrieve_files_done (GObject      *object,
+                                   GAsyncResult *result,
+                                   gpointer      data)
 {
   GDBusProxy *proxy = G_DBUS_PROXY (object);
   GTask *task = data;
@@ -260,7 +260,7 @@ retrieve_files_done (GObject      *object,
 
   g_variant_get (ret, "(^a&s)", &files);
 
-  g_object_set_data_full (G_OBJECT (task), "files", g_strdupv (files), (GDestroyNotify)g_strfreev);
+  g_object_set_data_full (G_OBJECT (task), "files", g_strdupv (files), (GDestroyNotify) g_strfreev);
 
   g_variant_unref (ret);
 
@@ -290,7 +290,7 @@ file_transfer_portal_retrieve_files (const char          *key,
                      "RetrieveFiles",
                      g_variant_new ("(sa{sv})", key, &options),
                      0, -1, NULL,
-                     retrieve_files_done, task);
+                     file_transfer_retrieve_files_done, task);
 }
 
 gboolean
@@ -311,9 +311,9 @@ file_transfer_portal_retrieve_files_finish (GAsyncResult   *result,
 /* serializer */
 
 static void
-file_serializer_finish (GObject      *source,
-                        GAsyncResult *result,
-                        gpointer      serializer)
+gdk_content_serializer_file_portal_finish (GObject      *source,
+                                           GAsyncResult *result,
+                                           gpointer      serializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GError *error = NULL;
@@ -325,9 +325,9 @@ file_serializer_finish (GObject      *source,
 }
 
 static void
-portal_ready (GObject *object,
-              GAsyncResult *result,
-              gpointer serializer)
+file_transfer_portal_ready (GObject      *object,
+                            GAsyncResult *result,
+                            gpointer      serializer)
 {
   GError *error = NULL;
   char *key;
@@ -343,13 +343,13 @@ portal_ready (GObject *object,
                                    strlen (key) + 1,
                                    gdk_content_serializer_get_priority (serializer),
                                    gdk_content_serializer_get_cancellable (serializer),
-                                   file_serializer_finish,
+                                   gdk_content_serializer_file_portal_finish,
                                    serializer);
   gdk_content_serializer_set_task_data (serializer, key, g_free);
 }
 
 static void
-portal_file_serializer (GdkContentSerializer *serializer)
+file_transfer_portal_serializer (GdkContentSerializer *serializer)
 {
   GPtrArray *files;
   const GValue *value;
@@ -403,16 +403,16 @@ portal_file_serializer (GdkContentSerializer *serializer)
     }
 
   /* this call doesn't copy the strings, so keep the array around until the registration is done */
-  file_transfer_portal_register_files ((const char **)files->pdata, TRUE, portal_ready, serializer);
-  gdk_content_serializer_set_task_data (serializer, files, (GDestroyNotify)g_ptr_array_unref);
+  file_transfer_portal_register_files ((const char **)files->pdata, TRUE, file_transfer_portal_ready, serializer);
+  gdk_content_serializer_set_task_data (serializer, files, (GDestroyNotify) g_ptr_array_unref);
 }
 
 /* deserializer */
 
 static void
-portal_finish (GObject *object,
-               GAsyncResult *result,
-               gpointer deserializer)
+file_transfer_portal_finish (GObject      *object,
+                             GAsyncResult *result,
+                             gpointer      deserializer)
 {
   char **files = NULL;
   GError *error = NULL;
@@ -452,9 +452,9 @@ portal_finish (GObject *object,
 }
 
 static void
-portal_file_deserializer_finish (GObject      *source,
-                                 GAsyncResult *result,
-                                 gpointer      deserializer)
+file_transfer_portal_deserializer_finish (GObject      *source,
+                                          GAsyncResult *result,
+                                          gpointer      deserializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GError *error = NULL;
@@ -487,12 +487,12 @@ portal_file_deserializer_finish (GObject      *source,
       return;
     }
 
-  file_transfer_portal_retrieve_files (key, portal_finish, deserializer);
+  file_transfer_portal_retrieve_files (key, file_transfer_portal_finish, deserializer);
   gdk_content_deserializer_set_task_data (deserializer, key, g_free);
 }
 
 static void
-portal_file_deserializer (GdkContentDeserializer *deserializer)
+file_transfer_portal_deserializer (GdkContentDeserializer *deserializer)
 {
   GOutputStream *output;
 
@@ -503,43 +503,43 @@ portal_file_deserializer (GdkContentDeserializer *deserializer)
                                 G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
                                 gdk_content_deserializer_get_priority (deserializer),
                                 gdk_content_deserializer_get_cancellable (deserializer),
-                                portal_file_deserializer_finish,
+                                file_transfer_portal_deserializer_finish,
                                 deserializer);
   g_object_unref (output);
 }
 
 static void
-connection_closed (GDBusConnection *connection,
-                   gboolean         remote_peer_vanished,
-                   GError          *error)
+file_transfer_portal_connection_closed (GDBusConnection *connection,
+                                        gboolean         remote_peer_vanished,
+                                        GError          *error)
 {
   g_clear_object (&file_transfer_proxy);
 }
 
 static void
-finish_registration (void)
+file_transfer_portal_finish_registration (void)
 {
   gdk_content_register_serializer (G_TYPE_FILE,
                                    "application/vnd.portal.filetransfer",
-                                   portal_file_serializer,
+                                   file_transfer_portal_serializer,
                                    NULL,
                                    NULL);
 
   gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
                                    "application/vnd.portal.filetransfer",
-                                   portal_file_serializer,
+                                   file_transfer_portal_serializer,
                                    NULL,
                                    NULL);
 
   gdk_content_register_deserializer ("application/vnd.portal.filetransfer",
                                      GDK_TYPE_FILE_LIST,
-                                     portal_file_deserializer,
+                                     file_transfer_portal_deserializer,
                                      NULL,
                                      NULL);
 
   gdk_content_register_deserializer ("application/vnd.portal.filetransfer",
                                      G_TYPE_FILE,
-                                     portal_file_deserializer,
+                                     file_transfer_portal_deserializer,
                                      NULL,
                                      NULL);
 
@@ -549,35 +549,35 @@ finish_registration (void)
    */
   gdk_content_register_serializer (G_TYPE_FILE,
                                    "application/vnd.portal.files",
-                                   portal_file_serializer,
+                                   file_transfer_portal_serializer,
                                    NULL,
                                    NULL);
 
   gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
                                    "application/vnd.portal.files",
-                                   portal_file_serializer,
+                                   file_transfer_portal_serializer,
                                    NULL,
                                    NULL);
 
   gdk_content_register_deserializer ("application/vnd.portal.files",
                                      GDK_TYPE_FILE_LIST,
-                                     portal_file_deserializer,
+                                     file_transfer_portal_deserializer,
                                      NULL,
                                      NULL);
 
   gdk_content_register_deserializer ("application/vnd.portal.files",
                                      G_TYPE_FILE,
-                                     portal_file_deserializer,
+                                     file_transfer_portal_deserializer,
                                      NULL,
                                      NULL);
 
   /* Free the singleton when the connection closes, important for test */
   g_signal_connect (g_dbus_proxy_get_connection (G_DBUS_PROXY (file_transfer_proxy)),
-                    "closed", G_CALLBACK (connection_closed), NULL);
+                    "closed", G_CALLBACK (file_transfer_portal_connection_closed), NULL);
 }
 
 static gboolean
-proxy_has_owner (GDBusProxy *proxy)
+file_transfer_portal_proxy_has_owner (GDBusProxy *proxy)
 {
   char *owner;
 
@@ -611,11 +611,11 @@ file_transfer_portal_register (void)
                                 NULL,
                                 NULL);
 
-      if (file_transfer_proxy && !proxy_has_owner (file_transfer_proxy))
+      if (file_transfer_proxy && !file_transfer_portal_proxy_has_owner (file_transfer_proxy))
         g_clear_object (&file_transfer_proxy);
 
       if (file_transfer_proxy)
-        finish_registration ();
+        file_transfer_portal_finish_registration ();
     }
 }
 

gdk/gdkapplaunchcontext.c

@@ -49,21 +49,21 @@
  * ```
  */
 
-static void    gdk_app_launch_context_finalize    (GObject           *object);
+static void   gdk_app_launch_context_finalize    (GObject           *object);
 static char * gdk_app_launch_context_get_display_name (GAppLaunchContext *context,
                                                         GAppInfo          *info,
                                                         GList             *files);
 static char * gdk_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
                                                              GAppInfo          *info,
                                                              GList             *files);
-static void    gdk_app_launch_context_launch_failed (GAppLaunchContext *context,
-                                                     const char        *startup_notify_id);
+static void   gdk_app_launch_context_launch_failed (GAppLaunchContext *context,
+                                                    const char        *startup_notify_id);
 
 
 enum
 {
-  PROP_0,
-  PROP_DISPLAY
+  GDK_APP_LAUNCH_CONTEXT_PROP_0,
+  GDK_APP_LAUNCH_CONTEXT_PROP_DISPLAY
 };
 
 G_DEFINE_TYPE (GdkAppLaunchContext, gdk_app_launch_context, G_TYPE_APP_LAUNCH_CONTEXT)
@@ -78,7 +78,7 @@ gdk_app_launch_context_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_APP_LAUNCH_CONTEXT_PROP_DISPLAY:
       g_value_set_object (value, context->display);
       break;
     default:
@@ -96,7 +96,7 @@ gdk_app_launch_context_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_APP_LAUNCH_CONTEXT_PROP_DISPLAY:
       context->display = g_value_dup_object (value);
       break;
     default:
@@ -124,7 +124,7 @@ gdk_app_launch_context_class_init (GdkAppLaunchContextClass *klass)
    *
    * The display that the `GdkAppLaunchContext` is on.
    */
-  g_object_class_install_property (gobject_class, PROP_DISPLAY,
+  g_object_class_install_property (gobject_class, GDK_APP_LAUNCH_CONTEXT_PROP_DISPLAY,
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));

gdk/gdkcicpparams.c

@@ -65,15 +65,15 @@ G_DEFINE_TYPE (GdkCicpParams, gdk_cicp_params, G_TYPE_OBJECT)
 
 enum
 {
-  PROP_COLOR_PRIMARIES = 1,
-  PROP_TRANSFER_FUNCTION,
-  PROP_MATRIX_COEFFICIENTS,
-  PROP_RANGE,
+  GDK_CICP_PARAMS_PROP_COLOR_PRIMARIES = 1,
+  GDK_CICP_PARAMS_PROP_TRANSFER_FUNCTION,
+  GDK_CICP_PARAMS_PROP_MATRIX_COEFFICIENTS,
+  GDK_CICP_PARAMS_PROP_RANGE,
 
-  N_PROPERTIES,
+  GDK_CICP_PARAMS_N_PROPERTIES,
 };
 
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
+static GParamSpec *gdk_cicp_params_properties[GDK_CICP_PARAMS_N_PROPERTIES] = { NULL, };
 
 static void
 gdk_cicp_params_init (GdkCicpParams *self)
@@ -94,19 +94,19 @@ gdk_cicp_params_get_property (GObject    *object,
 
   switch (property_id)
     {
-    case PROP_COLOR_PRIMARIES:
+    case GDK_CICP_PARAMS_PROP_COLOR_PRIMARIES:
       g_value_set_uint (value, self->cicp.color_primaries);
       break;
 
-    case PROP_TRANSFER_FUNCTION:
+    case GDK_CICP_PARAMS_PROP_TRANSFER_FUNCTION:
       g_value_set_uint (value, self->cicp.transfer_function);
       break;
 
-    case PROP_MATRIX_COEFFICIENTS:
+    case GDK_CICP_PARAMS_PROP_MATRIX_COEFFICIENTS:
       g_value_set_uint (value, self->cicp.matrix_coefficients);
       break;
 
-    case PROP_RANGE:
+    case GDK_CICP_PARAMS_PROP_RANGE:
       g_value_set_enum (value, self->cicp.range);
       break;
 
@@ -126,19 +126,19 @@ gdk_cicp_params_set_property (GObject      *object,
 
   switch (property_id)
     {
-    case PROP_COLOR_PRIMARIES:
+    case GDK_CICP_PARAMS_PROP_COLOR_PRIMARIES:
       gdk_cicp_params_set_color_primaries (self, g_value_get_uint (value));
       break;
 
-    case PROP_TRANSFER_FUNCTION:
+    case GDK_CICP_PARAMS_PROP_TRANSFER_FUNCTION:
       gdk_cicp_params_set_transfer_function (self, g_value_get_uint (value));
       break;
 
-    case PROP_MATRIX_COEFFICIENTS:
+    case GDK_CICP_PARAMS_PROP_MATRIX_COEFFICIENTS:
       gdk_cicp_params_set_matrix_coefficients (self, g_value_get_uint (value));
       break;
 
-    case PROP_RANGE:
+    case GDK_CICP_PARAMS_PROP_RANGE:
       gdk_cicp_params_set_range (self, g_value_get_enum (value));
       break;
 
@@ -172,7 +172,7 @@ gdk_cicp_params_class_init (GdkCicpParamsClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_COLOR_PRIMARIES] =
+  gdk_cicp_params_properties[GDK_CICP_PARAMS_PROP_COLOR_PRIMARIES] =
     g_param_spec_uint ("color-primaries", NULL, NULL,
                        0, 255, 2,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -195,7 +195,7 @@ gdk_cicp_params_class_init (GdkCicpParamsClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_TRANSFER_FUNCTION] =
+  gdk_cicp_params_properties[GDK_CICP_PARAMS_PROP_TRANSFER_FUNCTION] =
     g_param_spec_uint ("transfer-function", NULL, NULL,
                        0, 255, 2,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -212,7 +212,7 @@ gdk_cicp_params_class_init (GdkCicpParamsClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_MATRIX_COEFFICIENTS] =
+  gdk_cicp_params_properties[GDK_CICP_PARAMS_PROP_MATRIX_COEFFICIENTS] =
     g_param_spec_uint ("matrix-coefficients", NULL, NULL,
                        0, 255, 2,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -226,13 +226,13 @@ gdk_cicp_params_class_init (GdkCicpParamsClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_RANGE] =
+  gdk_cicp_params_properties[GDK_CICP_PARAMS_PROP_RANGE] =
     g_param_spec_enum ("range", NULL, NULL,
                        GDK_TYPE_CICP_RANGE,
                        GDK_CICP_RANGE_NARROW,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (object_class, N_PROPERTIES, properties);
+  g_object_class_install_properties (object_class, GDK_CICP_PARAMS_N_PROPERTIES, gdk_cicp_params_properties);
 }
 
 /* }}} */
@@ -294,7 +294,7 @@ gdk_cicp_params_set_color_primaries (GdkCicpParams *self,
     return;
 
   self->cicp.color_primaries = color_primaries;
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_COLOR_PRIMARIES]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_cicp_params_properties[GDK_CICP_PARAMS_PROP_COLOR_PRIMARIES]);
 }
 
 /**
@@ -334,7 +334,7 @@ gdk_cicp_params_set_transfer_function (GdkCicpParams *self,
     return;
 
   self->cicp.transfer_function = transfer_function;
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TRANSFER_FUNCTION]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_cicp_params_properties[GDK_CICP_PARAMS_PROP_TRANSFER_FUNCTION]);
 }
 
 /**
@@ -374,7 +374,7 @@ gdk_cicp_params_set_matrix_coefficients (GdkCicpParams *self,
     return;
 
   self->cicp.matrix_coefficients = matrix_coefficients;
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MATRIX_COEFFICIENTS]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_cicp_params_properties[GDK_CICP_PARAMS_PROP_MATRIX_COEFFICIENTS]);
 }
 
 /**
@@ -414,7 +414,7 @@ gdk_cicp_params_set_range (GdkCicpParams *self,
     return;
 
   self->cicp.range = range;
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_RANGE]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_cicp_params_properties[GDK_CICP_PARAMS_PROP_RANGE]);
 }
 
 /**

gdk/gdkclipboard.c

@@ -67,21 +67,21 @@ struct _GdkClipboardPrivate
 };
 
 enum {
-  PROP_0,
-  PROP_DISPLAY,
-  PROP_FORMATS,
-  PROP_LOCAL,
-  PROP_CONTENT,
-  N_PROPERTIES
+  GDK_CLIPBOARD_PROP_0,
+  GDK_CLIPBOARD_PROP_DISPLAY,
+  GDK_CLIPBOARD_PROP_FORMATS,
+  GDK_CLIPBOARD_PROP_LOCAL,
+  GDK_CLIPBOARD_PROP_CONTENT,
+  GDK_CLIPBOARD_N_PROPERTIES
 };
 
 enum {
-  CHANGED,
-  N_SIGNALS
+  GDK_CLIPBOARD_CHANGED,
+  GDK_CLIPBOARD_N_SIGNALS
 };
 
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
-static guint signals[N_SIGNALS] = { 0 };
+static GParamSpec *gdk_clipboard_properties[GDK_CLIPBOARD_N_PROPERTIES] = { NULL, };
+static guint gdk_clipboard_signals[GDK_CLIPBOARD_N_SIGNALS] = { 0 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GdkClipboard, gdk_clipboard, G_TYPE_OBJECT)
 
@@ -96,7 +96,7 @@ gdk_clipboard_set_property (GObject      *gobject,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_CLIPBOARD_PROP_DISPLAY:
       priv->display = g_value_get_object (value);
       g_assert (priv->display != NULL);
       break;
@@ -118,19 +118,19 @@ gdk_clipboard_get_property (GObject    *gobject,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_CLIPBOARD_PROP_DISPLAY:
       g_value_set_object (value, priv->display);
       break;
 
-    case PROP_FORMATS:
+    case GDK_CLIPBOARD_PROP_FORMATS:
       g_value_set_boxed (value, priv->formats);
       break;
 
-    case PROP_CONTENT:
+    case GDK_CLIPBOARD_PROP_CONTENT:
       g_value_set_object (value, priv->content);
       break;
 
-    case PROP_LOCAL:
+    case GDK_CLIPBOARD_PROP_LOCAL:
       g_value_set_boolean (value, priv->local);
       break;
 
@@ -169,11 +169,11 @@ gdk_clipboard_real_claim (GdkClipboard       *clipboard,
   gdk_content_formats_ref (formats);
   formats = gdk_content_formats_union_deserialize_gtypes (formats);
   priv->formats = formats;
-  g_object_notify_by_pspec (G_OBJECT (clipboard), properties[PROP_FORMATS]);
+  g_object_notify_by_pspec (G_OBJECT (clipboard), gdk_clipboard_properties[GDK_CLIPBOARD_PROP_FORMATS]);
   if (priv->local != local)
     {
       priv->local = local;
-      g_object_notify_by_pspec (G_OBJECT (clipboard), properties[PROP_LOCAL]);
+      g_object_notify_by_pspec (G_OBJECT (clipboard), gdk_clipboard_properties[GDK_CLIPBOARD_PROP_LOCAL]);
     }
 
   if (priv->content != content)
@@ -202,12 +202,12 @@ gdk_clipboard_real_claim (GdkClipboard       *clipboard,
                             clipboard);
         }
 
-      g_object_notify_by_pspec (G_OBJECT (clipboard), properties[PROP_CONTENT]);
+      g_object_notify_by_pspec (G_OBJECT (clipboard), gdk_clipboard_properties[GDK_CLIPBOARD_PROP_CONTENT]);
     }
 
   g_object_thaw_notify (G_OBJECT (clipboard));
 
-  g_signal_emit (clipboard, signals[CHANGED], 0);
+  g_signal_emit (clipboard, gdk_clipboard_signals[GDK_CLIPBOARD_CHANGED], 0);
 
   return TRUE;
 }
@@ -357,7 +357,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
    *
    * The `GdkDisplay` that the clipboard belongs to.
    */
-  properties[PROP_DISPLAY] =
+  gdk_clipboard_properties[GDK_CLIPBOARD_PROP_DISPLAY] =
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READWRITE |
@@ -370,7 +370,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
    *
    * The possible formats that the clipboard can provide its data in.
    */
-  properties[PROP_FORMATS] =
+  gdk_clipboard_properties[GDK_CLIPBOARD_PROP_FORMATS] =
     g_param_spec_boxed ("formats", NULL, NULL,
                         GDK_TYPE_CONTENT_FORMATS,
                         G_PARAM_READABLE |
@@ -382,7 +382,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
    *
    * %TRUE if the contents of the clipboard are owned by this process.
    */
-  properties[PROP_LOCAL] =
+  gdk_clipboard_properties[GDK_CLIPBOARD_PROP_LOCAL] =
     g_param_spec_boolean ("local", NULL, NULL,
                           TRUE,
                           G_PARAM_READABLE |
@@ -395,7 +395,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
    * The `GdkContentProvider` or %NULL if the clipboard is empty or contents are
    * provided otherwise.
    */
-  properties[PROP_CONTENT] =
+  gdk_clipboard_properties[GDK_CLIPBOARD_PROP_CONTENT] =
     g_param_spec_object ("content", NULL, NULL,
                          GDK_TYPE_CONTENT_PROVIDER,
                          G_PARAM_READABLE |
@@ -408,7 +408,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
    *
    * Emitted when the clipboard changes ownership.
    */
-  signals[CHANGED] =
+  gdk_clipboard_signals[GDK_CLIPBOARD_CHANGED] =
     g_signal_new (I_("changed"),
                   G_TYPE_FROM_CLASS (class),
                   G_SIGNAL_RUN_LAST,
@@ -416,7 +416,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
-  g_object_class_install_properties (object_class, N_PROPERTIES, properties);
+  g_object_class_install_properties (object_class, GDK_CLIPBOARD_N_PROPERTIES, gdk_clipboard_properties);
 }
 
 static void
@@ -743,7 +743,7 @@ gdk_clipboard_read_value_got_stream (GObject      *source,
 }
 
 static void
-free_value (gpointer value)
+gdk_clipboard_free_value (gpointer value)
 {
   g_value_unset (value);
   g_free (value);
@@ -769,7 +769,7 @@ gdk_clipboard_read_value_internal (GdkClipboard        *clipboard,
   g_task_set_source_tag (task, source_tag);
   value = g_new0 (GValue, 1);
   g_value_init (value, type);
-  g_task_set_task_data (task, value, free_value);
+  g_task_set_task_data (task, value, gdk_clipboard_free_value);
 
   if (priv->local)
     {

gdk/gdkcolorstate.c

@@ -482,7 +482,7 @@ GdkDefaultColorState gdk_default_color_states[] = {
   },
 };
 
- /* }}} */
+/* }}} */
 /* {{{ Cicp implementation */
 
 typedef struct _GdkCicpColorState GdkCicpColorState;

gdk/gdkcontentdeserializer.c

@@ -59,9 +59,9 @@ struct _Deserializer
   GDestroyNotify                  notify;
 };
 
-GQueue deserializers = G_QUEUE_INIT;
+GQueue gdk_content_deserializers = G_QUEUE_INIT;
 
-static void init (void);
+static void gdk_content_deserializers_init (void);
 
 #define GDK_CONTENT_DESERIALIZER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CONTENT_DESERIALIZER, GdkContentDeserializerClass))
 #define GDK_IS_CONTENT_DESERIALIZER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CONTENT_DESERIALIZER))
@@ -418,22 +418,22 @@ gdk_content_register_deserializer (const char                *mime_type,
   deserializer->data = data;
   deserializer->notify = notify;
 
-  g_queue_push_tail (&deserializers, deserializer);
+  g_queue_push_tail (&gdk_content_deserializers, deserializer);
 }
 
 static Deserializer *
-lookup_deserializer (const char *mime_type,
-                     GType       type)
+gdk_content_deserializer_lookup (const char *mime_type,
+                                 GType       type)
 {
   GList *l;
 
   g_return_val_if_fail (mime_type != NULL, NULL);
 
-  init ();
+  gdk_content_deserializers_init ();
 
   mime_type = g_intern_string (mime_type);
 
-  for (l = g_queue_peek_head_link (&deserializers); l; l = l->next)
+  for (l = g_queue_peek_head_link (&gdk_content_deserializers); l; l = l->next)
     {
       Deserializer *deserializer = l->data;
 
@@ -462,12 +462,12 @@ gdk_content_formats_union_deserialize_gtypes (GdkContentFormats *formats)
 
   g_return_val_if_fail (formats != NULL, NULL);
 
-  init ();
+  gdk_content_deserializers_init ();
 
   builder = gdk_content_formats_builder_new ();
   gdk_content_formats_builder_add_formats (builder, formats);
 
-  for (l = g_queue_peek_head_link (&deserializers); l; l = l->next)
+  for (l = g_queue_peek_head_link (&gdk_content_deserializers); l; l = l->next)
     {
       Deserializer *deserializer = l->data;
 
@@ -497,12 +497,12 @@ gdk_content_formats_union_deserialize_mime_types (GdkContentFormats *formats)
 
   g_return_val_if_fail (formats != NULL, NULL);
 
-  init ();
+  gdk_content_deserializers_init ();
 
   builder = gdk_content_formats_builder_new ();
   gdk_content_formats_builder_add_formats (builder, formats);
 
-  for (l = g_queue_peek_head_link (&deserializers); l; l = l->next)
+  for (l = g_queue_peek_head_link (&gdk_content_deserializers); l; l = l->next)
     {
       Deserializer *deserializer = l->data;
 
@@ -558,7 +558,7 @@ gdk_content_deserialize_async (GInputStream        *stream,
   g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable));
   g_return_if_fail (callback != NULL);
 
-  deserializer = lookup_deserializer (mime_type, type);
+  deserializer = gdk_content_deserializer_lookup (mime_type, type);
 
   gdk_content_deserializer_run (mime_type,
                                 type,
@@ -612,9 +612,9 @@ gdk_content_deserialize_finish (GAsyncResult  *result,
 /*** DESERIALIZERS ***/
 
 static void
-pixbuf_deserializer_finish (GObject      *source,
-                            GAsyncResult *res,
-                            gpointer      deserializer)
+gdk_content_deserializer_pixbuf_finish (GObject      *source,
+                                        GAsyncResult *res,
+                                        gpointer      deserializer)
 {
   GdkPixbuf *pixbuf;
   GValue *value;
@@ -647,18 +647,18 @@ pixbuf_deserializer_finish (GObject      *source,
 }
 
 static void
-pixbuf_deserializer (GdkContentDeserializer *deserializer)
+gdk_content_deserializer_pixbuf (GdkContentDeserializer *deserializer)
 {
   gdk_pixbuf_new_from_stream_async (gdk_content_deserializer_get_input_stream (deserializer),
-				    gdk_content_deserializer_get_cancellable (deserializer),
-                                    pixbuf_deserializer_finish,
+                                    gdk_content_deserializer_get_cancellable (deserializer),
+                                    gdk_content_deserializer_pixbuf_finish,
                                     deserializer);
 }
 
 static void
-texture_deserializer_finish (GObject      *source,
-                             GAsyncResult *result,
-                             gpointer      deserializer)
+gdk_content_deserializer_texture_finish (GObject      *source,
+                                         GAsyncResult *result,
+                                         gpointer      deserializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GBytes *bytes;
@@ -688,7 +688,7 @@ texture_deserializer_finish (GObject      *source,
 }
 
 static void
-texture_deserializer (GdkContentDeserializer *deserializer)
+gdk_content_deserializer_texture (GdkContentDeserializer *deserializer)
 {
   GOutputStream *output;
 
@@ -700,15 +700,15 @@ texture_deserializer (GdkContentDeserializer *deserializer)
                                 | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
                                 gdk_content_deserializer_get_priority (deserializer),
                                 gdk_content_deserializer_get_cancellable (deserializer),
-                                texture_deserializer_finish,
+                                gdk_content_deserializer_texture_finish,
                                 deserializer);
   g_object_unref (output);
 }
 
 static void
-string_deserializer_finish (GObject      *source,
-                            GAsyncResult *result,
-                            gpointer      deserializer)
+gdk_content_deserializer_string_finish (GObject      *source,
+                                        GAsyncResult *result,
+                                        gpointer      deserializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GError *error = NULL;
@@ -744,7 +744,7 @@ string_deserializer_finish (GObject      *source,
 }
 
 static void
-string_deserializer (GdkContentDeserializer *deserializer)
+gdk_content_deserializer_string (GdkContentDeserializer *deserializer)
 {
   GOutputStream *output, *filter;
   GCharsetConverter *converter;
@@ -770,15 +770,15 @@ string_deserializer (GdkContentDeserializer *deserializer)
                                 G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
                                 gdk_content_deserializer_get_priority (deserializer),
                                 gdk_content_deserializer_get_cancellable (deserializer),
-                                string_deserializer_finish,
+                                gdk_content_deserializer_string_finish,
                                 deserializer);
   g_object_unref (filter);
 }
 
 static void
-file_uri_deserializer_finish (GObject      *source,
-                              GAsyncResult *result,
-                              gpointer      deserializer)
+gdk_content_deserializer_file_uri_finish (GObject      *source,
+                                          GAsyncResult *result,
+                                          gpointer      deserializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GError *error = NULL;
@@ -828,7 +828,7 @@ file_uri_deserializer_finish (GObject      *source,
 }
 
 static void
-file_uri_deserializer (GdkContentDeserializer *deserializer)
+gdk_content_deserializer_file_uri (GdkContentDeserializer *deserializer)
 {
   GOutputStream *output;
 
@@ -839,15 +839,15 @@ file_uri_deserializer (GdkContentDeserializer *deserializer)
                                 G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
                                 gdk_content_deserializer_get_priority (deserializer),
                                 gdk_content_deserializer_get_cancellable (deserializer),
-                                file_uri_deserializer_finish,
+                                gdk_content_deserializer_file_uri_finish,
                                 deserializer);
   g_object_unref (output);
 }
 
 static void
-color_deserializer_finish (GObject      *source,
-                           GAsyncResult *result,
-                           gpointer      deserializer)
+gdk_content_deserializer_color_finish (GObject      *source,
+                                       GAsyncResult *result,
+                                       gpointer      deserializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GError *error = NULL;
@@ -883,7 +883,7 @@ color_deserializer_finish (GObject      *source,
 }
 
 static void
-color_deserializer (GdkContentDeserializer *deserializer)
+gdk_content_deserializer_color (GdkContentDeserializer *deserializer)
 {
   GOutputStream *output;
   guint16 *data;
@@ -896,13 +896,13 @@ color_deserializer (GdkContentDeserializer *deserializer)
                                 G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
                                 gdk_content_deserializer_get_priority (deserializer),
                                 gdk_content_deserializer_get_cancellable (deserializer),
-                                color_deserializer_finish,
+                                gdk_content_deserializer_color_finish,
                                 deserializer);
   g_object_unref (output);
 }
 
 static void
-init (void)
+gdk_content_deserializers_init (void)
 {
   static gboolean initialized = FALSE;
   GSList *formats, *f;
@@ -915,17 +915,17 @@ init (void)
 
   gdk_content_register_deserializer ("image/png",
                                      GDK_TYPE_TEXTURE,
-                                     texture_deserializer,
+                                     gdk_content_deserializer_texture,
                                      NULL,
                                      NULL);
   gdk_content_register_deserializer ("image/tiff",
                                      GDK_TYPE_TEXTURE,
-                                     texture_deserializer,
+                                     gdk_content_deserializer_texture,
                                      NULL,
                                      NULL);
   gdk_content_register_deserializer ("image/jpeg",
                                      GDK_TYPE_TEXTURE,
-                                     texture_deserializer,
+                                     gdk_content_deserializer_texture,
                                      NULL,
                                      NULL);
 
@@ -948,12 +948,12 @@ init (void)
               !g_str_equal (name, "tiff"))
             gdk_content_register_deserializer (*m,
                                                GDK_TYPE_TEXTURE,
-                                               pixbuf_deserializer,
+                                               gdk_content_deserializer_pixbuf,
                                                NULL,
                                                NULL);
           gdk_content_register_deserializer (*m,
                                              GDK_TYPE_PIXBUF,
-                                             pixbuf_deserializer,
+                                             gdk_content_deserializer_pixbuf,
                                              NULL,
                                              NULL);
         }
@@ -969,19 +969,19 @@ init (void)
 
   gdk_content_register_deserializer ("text/uri-list",
                                      GDK_TYPE_FILE_LIST,
-                                     file_uri_deserializer,
+                                     gdk_content_deserializer_file_uri,
                                      NULL,
                                      NULL);
 
   gdk_content_register_deserializer ("text/uri-list",
                                      G_TYPE_FILE,
-                                     file_uri_deserializer,
+                                     gdk_content_deserializer_file_uri,
                                      NULL,
                                      NULL);
 
   gdk_content_register_deserializer ("text/plain;charset=utf-8",
                                      G_TYPE_STRING,
-                                     string_deserializer,
+                                     gdk_content_deserializer_string,
                                      (gpointer) "utf-8",
                                      NULL);
   if (!g_get_charset (&charset))
@@ -990,21 +990,20 @@ init (void)
 
       gdk_content_register_deserializer (mime,
                                          G_TYPE_STRING,
-                                         string_deserializer,
+                                         gdk_content_deserializer_string,
                                          (gpointer) charset,
                                          g_free);
       g_free (mime);
     }
   gdk_content_register_deserializer ("text/plain",
                                      G_TYPE_STRING,
-                                     string_deserializer,
+                                     gdk_content_deserializer_string,
                                      (gpointer) "ASCII",
                                      NULL);
 
   gdk_content_register_deserializer ("application/x-color",
                                      GDK_TYPE_RGBA,
-                                     color_deserializer,
+                                     gdk_content_deserializer_color,
                                      NULL,
                                      NULL);
 }
-

gdk/gdkcontentprovider.c

@@ -47,19 +47,19 @@ struct _GdkContentProviderPrivate
 };
 
 enum {
-  PROP_0,
-  PROP_FORMATS,
-  PROP_STORABLE_FORMATS,
-  N_PROPERTIES
+  GDK_CONTENT_PROVIDER_PROP_0,
+  GDK_CONTENT_PROVIDER_PROP_FORMATS,
+  GDK_CONTENT_PROVIDER_PROP_STORABLE_FORMATS,
+  GDK_CONTENT_PROVIDER_N_PROPERTIES
 };
 
 enum {
-  CONTENT_CHANGED,
-  N_SIGNALS
+  GDK_CONTENT_PROVIDER_CONTENT_CHANGED,
+  GDK_CONTENT_PROVIDER_N_SIGNALS
 };
 
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
-static guint signals[N_SIGNALS] = { 0 };
+static GParamSpec *gdk_content_provider_properties[GDK_CONTENT_PROVIDER_N_PROPERTIES] = { NULL, };
+static guint gdk_content_provider_signals[GDK_CONTENT_PROVIDER_N_SIGNALS] = { 0 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GdkContentProvider, gdk_content_provider, G_TYPE_OBJECT)
 
@@ -139,11 +139,11 @@ gdk_content_provider_get_property (GObject    *gobject,
 
   switch (prop_id)
     {
-    case PROP_FORMATS:
+    case GDK_CONTENT_PROVIDER_PROP_FORMATS:
       g_value_take_boxed (value, gdk_content_provider_ref_formats (provider));
       break;
 
-    case PROP_STORABLE_FORMATS:
+    case GDK_CONTENT_PROVIDER_PROP_STORABLE_FORMATS:
       g_value_take_boxed (value, gdk_content_provider_ref_storable_formats (provider));
       break;
 
@@ -173,7 +173,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
    *
    * The possible formats that the provider can provide its data in.
    */
-  properties[PROP_FORMATS] =
+  gdk_content_provider_properties[GDK_CONTENT_PROVIDER_PROP_FORMATS] =
     g_param_spec_boxed ("formats", NULL, NULL,
                         GDK_TYPE_CONTENT_FORMATS,
                         G_PARAM_READABLE |
@@ -185,7 +185,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
    *
    * The subset of formats that clipboard managers should store this provider's data in.
    */
-  properties[PROP_STORABLE_FORMATS] =
+  gdk_content_provider_properties[GDK_CONTENT_PROVIDER_PROP_STORABLE_FORMATS] =
     g_param_spec_boxed ("storable-formats", NULL, NULL,
                         GDK_TYPE_CONTENT_FORMATS,
                         G_PARAM_READABLE |
@@ -197,7 +197,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
    *
    * Emitted whenever the content provided by this provider has changed.
    */
-  signals[CONTENT_CHANGED] =
+  gdk_content_provider_signals[GDK_CONTENT_PROVIDER_CONTENT_CHANGED] =
     g_signal_new (I_("content-changed"),
                   G_TYPE_FROM_CLASS (class),
                   G_SIGNAL_RUN_LAST,
@@ -205,7 +205,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
-  g_object_class_install_properties (object_class, N_PROPERTIES, properties);
+  g_object_class_install_properties (object_class, GDK_CONTENT_PROVIDER_N_PROPERTIES, gdk_content_provider_properties);
 }
 
 static void
@@ -261,9 +261,9 @@ gdk_content_provider_content_changed (GdkContentProvider *provider)
 {
   g_return_if_fail (GDK_IS_CONTENT_PROVIDER (provider));
 
-  g_signal_emit (provider, signals[CONTENT_CHANGED], 0);
+  g_signal_emit (provider, gdk_content_provider_signals[GDK_CONTENT_PROVIDER_CONTENT_CHANGED], 0);
 
-  g_object_notify_by_pspec (G_OBJECT (provider), properties[PROP_FORMATS]);
+  g_object_notify_by_pspec (G_OBJECT (provider), gdk_content_provider_properties[GDK_CONTENT_PROVIDER_PROP_FORMATS]);
 }
 
 /**

gdk/gdkcontentserializer.c

@@ -64,9 +64,9 @@ struct _Serializer
   GDestroyNotify                  notify;
 };
 
-GQueue serializers = G_QUEUE_INIT;
+GQueue gdk_content_serializers = G_QUEUE_INIT;
 
-static void init (void);
+static void gdk_content_serializers_init (void);
 
 #define GDK_CONTENT_SERIALIZER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CONTENT_SERIALIZER, GdkContentSerializerClass))
 #define GDK_IS_CONTENT_SERIALIZER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CONTENT_SERIALIZER))
@@ -424,7 +424,7 @@ gdk_content_register_serializer (GType                    type,
   serializer->data = data;
   serializer->notify = notify;
 
-  g_queue_push_tail (&serializers, serializer);
+  g_queue_push_tail (&gdk_content_serializers, serializer);
 }
 
 static Serializer *
@@ -435,11 +435,11 @@ lookup_serializer (const char *mime_type,
 
   g_return_val_if_fail (mime_type != NULL, NULL);
 
-  init ();
+  gdk_content_serializers_init ();
 
   mime_type = g_intern_string (mime_type);
 
-  for (l = g_queue_peek_head_link (&serializers); l; l = l->next)
+  for (l = g_queue_peek_head_link (&gdk_content_serializers); l; l = l->next)
     {
       Serializer *serializer = l->data;
 
@@ -468,12 +468,12 @@ gdk_content_formats_union_serialize_gtypes (GdkContentFormats *formats)
 
   g_return_val_if_fail (formats != NULL, NULL);
 
-  init ();
+  gdk_content_serializers_init ();
 
   builder = gdk_content_formats_builder_new ();
   gdk_content_formats_builder_add_formats (builder, formats);
 
-  for (l = g_queue_peek_head_link (&serializers); l; l = l->next)
+  for (l = g_queue_peek_head_link (&gdk_content_serializers); l; l = l->next)
     {
       Serializer *serializer = l->data;
 
@@ -503,12 +503,12 @@ gdk_content_formats_union_serialize_mime_types (GdkContentFormats *formats)
 
   g_return_val_if_fail (formats != NULL, NULL);
 
-  init ();
+  gdk_content_serializers_init ();
 
   builder = gdk_content_formats_builder_new ();
   gdk_content_formats_builder_add_formats (builder, formats);
 
-  for (l = g_queue_peek_head_link (&serializers); l; l = l->next)
+  for (l = g_queue_peek_head_link (&gdk_content_serializers); l; l = l->next)
     {
       Serializer *serializer = l->data;
 
@@ -610,9 +610,9 @@ gdk_content_serialize_finish (GAsyncResult  *result,
 
 
 static void
-pixbuf_serializer_finish (GObject      *source,
-                          GAsyncResult *res,
-                          gpointer      serializer)
+gdk_content_serializer_pixbuf_finish (GObject      *source,
+                                      GAsyncResult *res,
+                                      gpointer      serializer)
 {
   GError *error = NULL;
 
@@ -623,7 +623,7 @@ pixbuf_serializer_finish (GObject      *source,
 }
 
 static void
-pixbuf_serializer (GdkContentSerializer *serializer)
+gdk_content_serializer_pixbuf (GdkContentSerializer *serializer)
 {
   const GValue *value;
   GdkPixbuf *pixbuf;
@@ -652,7 +652,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
                                    gdk_content_serializer_get_output_stream (serializer),
                                    name,
                                    gdk_content_serializer_get_cancellable (serializer),
-                                   pixbuf_serializer_finish,
+                                   gdk_content_serializer_pixbuf_finish,
                                    serializer,
                                    g_str_equal (name, "png") ? "compression" : NULL, "2",
                                    NULL);
@@ -660,9 +660,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
-texture_serializer_finish (GObject      *source,
-                           GAsyncResult *res,
-                           gpointer      user_data)
+gdk_content_serializer_texture_finish (GObject      *source,
+                                       GAsyncResult *res,
+                                       gpointer      user_data)
 {
   GdkContentSerializer *serializer = GDK_CONTENT_SERIALIZER (source);
   GError *error = NULL;
@@ -674,10 +674,10 @@ texture_serializer_finish (GObject      *source,
 }
 
 static void
-serialize_texture_in_thread (GTask        *task,
-                             gpointer      source_object,
-                             gpointer      task_data,
-                             GCancellable *cancellable)
+gdk_content_serializer_texture_in_thread (GTask        *task,
+                                          gpointer      source_object,
+                                          gpointer      task_data,
+                                          GCancellable *cancellable)
 {
   GdkContentSerializer *serializer = source_object;
   const GValue *value;
@@ -718,22 +718,22 @@ serialize_texture_in_thread (GTask        *task,
 }
 
 static void
-texture_serializer (GdkContentSerializer *serializer)
+gdk_content_serializer_texture (GdkContentSerializer *serializer)
 {
   GTask *task;
 
   task = g_task_new (serializer,
                      gdk_content_serializer_get_cancellable (serializer),
-                     texture_serializer_finish,
+                     gdk_content_serializer_texture_finish,
                      NULL);
-  g_task_run_in_thread (task, serialize_texture_in_thread);
+  g_task_run_in_thread (task, gdk_content_serializer_texture_in_thread);
   g_object_unref (task);
 }
 
 static void
-string_serializer_finish (GObject      *source,
-                          GAsyncResult *result,
-                          gpointer      serializer)
+gdk_content_serializer_string_finish (GObject      *source,
+                                      GAsyncResult *result,
+                                      gpointer      serializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GError *error = NULL;
@@ -745,7 +745,7 @@ string_serializer_finish (GObject      *source,
 }
 
 static void
-string_serializer (GdkContentSerializer *serializer)
+gdk_content_serializer_string (GdkContentSerializer *serializer)
 {
   GOutputStream *filter;
   GCharsetConverter *converter;
@@ -775,15 +775,15 @@ string_serializer (GdkContentSerializer *serializer)
                                    strlen (text),
                                    gdk_content_serializer_get_priority (serializer),
                                    gdk_content_serializer_get_cancellable (serializer),
-                                   string_serializer_finish,
+                                   gdk_content_serializer_string_finish,
                                    serializer);
   g_object_unref (filter);
 }
 
 static void
-file_serializer_finish (GObject      *source,
-                        GAsyncResult *result,
-                        gpointer      serializer)
+gdk_content_serializer_file_finish (GObject      *source,
+                                    GAsyncResult *result,
+                                    gpointer      serializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GError *error = NULL;
@@ -795,7 +795,7 @@ file_serializer_finish (GObject      *source,
 }
 
 static char *
-file_get_native_uri (GFile *file)
+gdk_file_get_native_uri (GFile *file)
 {
   char *path;
 
@@ -811,7 +811,7 @@ file_get_native_uri (GFile *file)
 }
 
 static void
-file_uri_serializer (GdkContentSerializer *serializer)
+gdk_content_serializer_file_uri (GdkContentSerializer *serializer)
 {
   GFile *file;
   GString *str;
@@ -826,7 +826,7 @@ file_uri_serializer (GdkContentSerializer *serializer)
       file = g_value_get_object (gdk_content_serializer_get_value (serializer));
       if (file)
         {
-          uri = file_get_native_uri (file);
+          uri = gdk_file_get_native_uri (file);
           g_string_append (str, uri);
           g_free (uri);
         }
@@ -842,7 +842,7 @@ file_uri_serializer (GdkContentSerializer *serializer)
 
       for (l = g_value_get_boxed (value); l; l = l->next)
         {
-          uri = file_get_native_uri (l->data);
+          uri = gdk_file_get_native_uri (l->data);
           g_string_append (str, uri);
           g_free (uri);
           g_string_append (str, "\r\n");
@@ -854,13 +854,13 @@ file_uri_serializer (GdkContentSerializer *serializer)
                                    str->len,
                                    gdk_content_serializer_get_priority (serializer),
                                    gdk_content_serializer_get_cancellable (serializer),
-                                   file_serializer_finish,
+                                   gdk_content_serializer_file_finish,
                                    serializer);
   gdk_content_serializer_set_task_data (serializer, g_string_free (str, FALSE), g_free);
 }
 
 static void
-file_text_serializer (GdkContentSerializer *serializer)
+gdk_content_serializer_file_text (GdkContentSerializer *serializer)
 {
   const GValue *value;
   char *path = NULL;
@@ -906,15 +906,15 @@ file_text_serializer (GdkContentSerializer *serializer)
                                    strlen (path),
                                    gdk_content_serializer_get_priority (serializer),
                                    gdk_content_serializer_get_cancellable (serializer),
-                                   file_serializer_finish,
+                                   gdk_content_serializer_file_finish,
                                    serializer);
   gdk_content_serializer_set_task_data (serializer, path, g_free);
 }
 
 static void
-color_serializer_finish (GObject      *source,
-                         GAsyncResult *result,
-                         gpointer      serializer)
+gdk_content_serializer_color_finish (GObject      *source,
+                                     GAsyncResult *result,
+                                     gpointer      serializer)
 {
   GOutputStream *stream = G_OUTPUT_STREAM (source);
   GError *error = NULL;
@@ -926,7 +926,7 @@ color_serializer_finish (GObject      *source,
 }
 
 static void
-color_serializer (GdkContentSerializer *serializer)
+gdk_content_serializer_color (GdkContentSerializer *serializer)
 {
   const GValue *value;
   GdkRGBA *rgba;
@@ -948,13 +948,13 @@ color_serializer (GdkContentSerializer *serializer)
                                    4 * sizeof (guint16),
                                    gdk_content_serializer_get_priority (serializer),
                                    gdk_content_serializer_get_cancellable (serializer),
-                                   color_serializer_finish,
+                                   gdk_content_serializer_color_finish,
                                    serializer);
   gdk_content_serializer_set_task_data (serializer, data, g_free);
 }
 
 static void
-init (void)
+gdk_content_serializers_init (void)
 {
   static gboolean initialized = FALSE;
   GSList *formats, *f;
@@ -967,17 +967,17 @@ init (void)
 
   gdk_content_register_serializer (GDK_TYPE_TEXTURE,
                                    "image/png",
-                                   texture_serializer,
+                                   gdk_content_serializer_texture,
                                    NULL, NULL);
 
   gdk_content_register_serializer (GDK_TYPE_TEXTURE,
                                    "image/tiff",
-                                   texture_serializer,
+                                   gdk_content_serializer_texture,
                                    NULL, NULL);
 
   gdk_content_register_serializer (GDK_TYPE_TEXTURE,
                                    "image/jpeg",
-                                   texture_serializer,
+                                   gdk_content_serializer_texture,
                                    NULL, NULL);
 
   formats = gdk_pixbuf_get_formats ();
@@ -1001,12 +1001,12 @@ init (void)
               !g_str_equal (name, "jpeg"))
             gdk_content_register_serializer (GDK_TYPE_TEXTURE,
                                              *m,
-                                             pixbuf_serializer,
+                                             gdk_content_serializer_pixbuf,
                                              gdk_pixbuf_format_get_name (fmt),
                                              g_free);
           gdk_content_register_serializer (GDK_TYPE_PIXBUF,
                                            *m,
-                                           pixbuf_serializer,
+                                           gdk_content_serializer_pixbuf,
                                            gdk_pixbuf_format_get_name (fmt),
                                            g_free);
         }
@@ -1022,29 +1022,29 @@ init (void)
 
   gdk_content_register_serializer (G_TYPE_FILE,
                                    "text/uri-list",
-                                   file_uri_serializer,
+                                   gdk_content_serializer_file_uri,
                                    NULL,
                                    NULL);
   gdk_content_register_serializer (G_TYPE_FILE,
                                    "text/plain;charset=utf-8",
-                                   file_text_serializer,
+                                   gdk_content_serializer_file_text,
                                    NULL,
                                    NULL);
 
   gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
                                    "text/uri-list",
-                                   file_uri_serializer,
+                                   gdk_content_serializer_file_uri,
                                    NULL,
                                    NULL);
   gdk_content_register_serializer (GDK_TYPE_FILE_LIST,
                                    "text/plain;charset=utf-8",
-                                   file_text_serializer,
+                                   gdk_content_serializer_file_text,
                                    NULL,
                                    NULL);
 
   gdk_content_register_serializer (G_TYPE_STRING,
                                    "text/plain;charset=utf-8",
-                                   string_serializer,
+                                   gdk_content_serializer_string,
                                    (gpointer) "utf-8",
                                    NULL);
   if (!g_get_charset (&charset))
@@ -1052,21 +1052,20 @@ init (void)
       char *mime = g_strdup_printf ("text/plain;charset=%s", charset);
       gdk_content_register_serializer (G_TYPE_STRING,
                                        mime,
-                                       string_serializer,
+                                       gdk_content_serializer_string,
                                        (gpointer) charset,
                                        NULL);
       g_free (mime);
     }
   gdk_content_register_serializer (G_TYPE_STRING,
                                    "text/plain",
-                                   string_serializer,
+                                   gdk_content_serializer_string,
                                    (gpointer) "ASCII",
                                    NULL);
 
   gdk_content_register_serializer (GDK_TYPE_RGBA,
                                    "application/x-color",
-                                   color_serializer,
+                                   gdk_content_serializer_color,
                                    NULL,
                                    NULL);
 }
-

gdk/gdkcursor.c

@@ -75,12 +75,12 @@
  */
 
 enum {
-  PROP_0,
-  PROP_FALLBACK,
-  PROP_HOTSPOT_X,
-  PROP_HOTSPOT_Y,
-  PROP_NAME,
-  PROP_TEXTURE,
+  GDK_CURSOR_PROP_0,
+  GDK_CURSOR_PROP_FALLBACK,
+  GDK_CURSOR_PROP_HOTSPOT_X,
+  GDK_CURSOR_PROP_HOTSPOT_Y,
+  GDK_CURSOR_PROP_NAME,
+  GDK_CURSOR_PROP_TEXTURE,
 };
 
 G_DEFINE_TYPE (GdkCursor, gdk_cursor, G_TYPE_OBJECT)
@@ -95,19 +95,19 @@ gdk_cursor_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_FALLBACK:
+    case GDK_CURSOR_PROP_FALLBACK:
       g_value_set_object (value, cursor->fallback);
       break;
-    case PROP_HOTSPOT_X:
+    case GDK_CURSOR_PROP_HOTSPOT_X:
       g_value_set_int (value, cursor->hotspot_x);
       break;
-    case PROP_HOTSPOT_Y:
+    case GDK_CURSOR_PROP_HOTSPOT_Y:
       g_value_set_int (value, cursor->hotspot_y);
       break;
-    case PROP_NAME:
+    case GDK_CURSOR_PROP_NAME:
       g_value_set_string (value, cursor->name);
       break;
-    case PROP_TEXTURE:
+    case GDK_CURSOR_PROP_TEXTURE:
       g_value_set_object (value, cursor->texture);
       break;
     default:
@@ -126,19 +126,19 @@ gdk_cursor_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_FALLBACK:
+    case GDK_CURSOR_PROP_FALLBACK:
       cursor->fallback = g_value_dup_object (value);
       break;
-    case PROP_HOTSPOT_X:
+    case GDK_CURSOR_PROP_HOTSPOT_X:
       cursor->hotspot_x = g_value_get_int (value);
       break;
-    case PROP_HOTSPOT_Y:
+    case GDK_CURSOR_PROP_HOTSPOT_Y:
       cursor->hotspot_y = g_value_get_int (value);
       break;
-    case PROP_NAME:
+    case GDK_CURSOR_PROP_NAME:
       cursor->name = g_value_dup_string (value);
       break;
-    case PROP_TEXTURE:
+    case GDK_CURSOR_PROP_TEXTURE:
       cursor->texture = g_value_dup_object (value);
       break;
     default:
@@ -177,7 +177,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
    * Cursor to fall back to if this cursor cannot be displayed.
    */
   g_object_class_install_property (object_class,
-                                   PROP_FALLBACK,
+                                   GDK_CURSOR_PROP_FALLBACK,
                                    g_param_spec_object ("fallback", NULL, NULL,
                                                         GDK_TYPE_CURSOR,
                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
@@ -189,7 +189,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
    * X position of the cursor hotspot in the cursor image.
    */
   g_object_class_install_property (object_class,
-                                   PROP_HOTSPOT_X,
+                                   GDK_CURSOR_PROP_HOTSPOT_X,
                                    g_param_spec_int ("hotspot-x", NULL, NULL,
                                                      0, G_MAXINT, 0,
                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
@@ -201,7 +201,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
    * Y position of the cursor hotspot in the cursor image.
    */
   g_object_class_install_property (object_class,
-                                   PROP_HOTSPOT_Y,
+                                   GDK_CURSOR_PROP_HOTSPOT_Y,
                                    g_param_spec_int ("hotspot-y", NULL, NULL,
                                                      0, G_MAXINT, 0,
                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
@@ -215,7 +215,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
    * The name will be %NULL if the cursor was created from a texture.
    */
   g_object_class_install_property (object_class,
-                                   PROP_NAME,
+                                   GDK_CURSOR_PROP_NAME,
                                    g_param_spec_string ("name", NULL, NULL,
                                                         NULL,
                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
@@ -229,7 +229,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
    * The texture will be %NULL if the cursor was created from a name.
    */
   g_object_class_install_property (object_class,
-                                   PROP_TEXTURE,
+                                   GDK_CURSOR_PROP_TEXTURE,
                                    g_param_spec_object ("texture", NULL, NULL,
                                                         GDK_TYPE_TEXTURE,
                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |

gdk/gdkdevice.c

@@ -48,12 +48,12 @@ struct _GdkAxisInfo
 };
 
 enum {
-  CHANGED,
-  TOOL_CHANGED,
-  LAST_SIGNAL
+  GDK_DEVICE_CHANGED,
+  GDK_DEVICE_TOOL_CHANGED,
+  GDK_DEVICE_LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint gdk_device_signals[GDK_DEVICE_LAST_SIGNAL] = { 0 };
 
 
 static void gdk_device_finalize     (GObject      *object);
@@ -71,27 +71,27 @@ static void gdk_device_get_property (GObject      *object,
 G_DEFINE_ABSTRACT_TYPE (GdkDevice, gdk_device, G_TYPE_OBJECT)
 
 enum {
-  PROP_0,
-  PROP_DISPLAY,
-  PROP_NAME,
-  PROP_SOURCE,
-  PROP_HAS_CURSOR,
-  PROP_N_AXES,
-  PROP_VENDOR_ID,
-  PROP_PRODUCT_ID,
-  PROP_SEAT,
-  PROP_NUM_TOUCHES,
-  PROP_TOOL,
-  PROP_DIRECTION,
-  PROP_HAS_BIDI_LAYOUTS,
-  PROP_CAPS_LOCK_STATE,
-  PROP_NUM_LOCK_STATE,
-  PROP_SCROLL_LOCK_STATE,
-  PROP_MODIFIER_STATE,
-  LAST_PROP
+  GDK_DEVICE_PROP_0,
+  GDK_DEVICE_PROP_DISPLAY,
+  GDK_DEVICE_PROP_NAME,
+  GDK_DEVICE_PROP_SOURCE,
+  GDK_DEVICE_PROP_HAS_CURSOR,
+  GDK_DEVICE_PROP_N_AXES,
+  GDK_DEVICE_PROP_VENDOR_ID,
+  GDK_DEVICE_PROP_PRODUCT_ID,
+  GDK_DEVICE_PROP_SEAT,
+  GDK_DEVICE_PROP_NUM_TOUCHES,
+  GDK_DEVICE_PROP_TOOL,
+  GDK_DEVICE_PROP_DIRECTION,
+  GDK_DEVICE_PROP_HAS_BIDI_LAYOUTS,
+  GDK_DEVICE_PROP_CAPS_LOCK_STATE,
+  GDK_DEVICE_PROP_NUM_LOCK_STATE,
+  GDK_DEVICE_PROP_SCROLL_LOCK_STATE,
+  GDK_DEVICE_PROP_MODIFIER_STATE,
+  GDK_DEVICE_LAST_PROP
 };
 
-static GParamSpec *device_props[LAST_PROP] = { NULL, };
+static GParamSpec *gdk_device_properties[GDK_DEVICE_LAST_PROP] = { NULL, };
 
 static void
 gdk_device_class_init (GdkDeviceClass *klass)
@@ -108,7 +108,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * The `GdkDisplay` the `GdkDevice` pertains to.
    */
-  device_props[PROP_DISPLAY] =
+  gdk_device_properties[GDK_DEVICE_PROP_DISPLAY] =
       g_param_spec_object ("display", NULL, NULL,
                            GDK_TYPE_DISPLAY,
                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
@@ -118,7 +118,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * The device name.
    */
-  device_props[PROP_NAME] =
+  gdk_device_properties[GDK_DEVICE_PROP_NAME] =
       g_param_spec_string ("name", NULL, NULL,
                            NULL,
                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
@@ -129,7 +129,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * Source type for the device.
    */
-  device_props[PROP_SOURCE] =
+  gdk_device_properties[GDK_DEVICE_PROP_SOURCE] =
       g_param_spec_enum ("source", NULL, NULL,
                          GDK_TYPE_INPUT_SOURCE,
                          GDK_SOURCE_MOUSE,
@@ -141,7 +141,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * Whether the device is represented by a cursor on the screen.
    */
-  device_props[PROP_HAS_CURSOR] =
+  gdk_device_properties[GDK_DEVICE_PROP_HAS_CURSOR] =
       g_param_spec_boolean ("has-cursor", NULL, NULL,
                             FALSE,
                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
@@ -152,7 +152,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * Number of axes in the device.
    */
-  device_props[PROP_N_AXES] =
+  gdk_device_properties[GDK_DEVICE_PROP_N_AXES] =
       g_param_spec_uint ("n-axes", NULL, NULL,
                          0, G_MAXUINT,
                          0,
@@ -165,7 +165,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * See [method@Gdk.Device.get_vendor_id].
    */
-  device_props[PROP_VENDOR_ID] =
+  gdk_device_properties[GDK_DEVICE_PROP_VENDOR_ID] =
       g_param_spec_string ("vendor-id", NULL, NULL,
                            NULL,
                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
@@ -178,7 +178,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * See [method@Gdk.Device.get_product_id].
    */
-  device_props[PROP_PRODUCT_ID] =
+  gdk_device_properties[GDK_DEVICE_PROP_PRODUCT_ID] =
       g_param_spec_string ("product-id", NULL, NULL,
                            NULL,
                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
@@ -189,7 +189,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * `GdkSeat` of this device.
    */
-  device_props[PROP_SEAT] =
+  gdk_device_properties[GDK_DEVICE_PROP_SEAT] =
       g_param_spec_object ("seat", NULL, NULL,
                            GDK_TYPE_SEAT,
                            G_PARAM_READWRITE |
@@ -203,7 +203,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    * Will be 0 if the device is not a touch device or if the number
    * of touches is unknown.
    */
-  device_props[PROP_NUM_TOUCHES] =
+  gdk_device_properties[GDK_DEVICE_PROP_NUM_TOUCHES] =
       g_param_spec_uint ("num-touches", NULL, NULL,
                          0, G_MAXUINT,
                          0,
@@ -215,7 +215,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * The `GdkDeviceTool` that is currently used with this device.
    */
-  device_props[PROP_TOOL] =
+  gdk_device_properties[GDK_DEVICE_PROP_TOOL] =
     g_param_spec_object ("tool", NULL, NULL,
                          GDK_TYPE_DEVICE_TOOL,
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -227,7 +227,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * This is only relevant for keyboard devices.
    */
-  device_props[PROP_DIRECTION] =
+  gdk_device_properties[GDK_DEVICE_PROP_DIRECTION] =
       g_param_spec_enum ("direction", NULL, NULL,
                          PANGO_TYPE_DIRECTION, PANGO_DIRECTION_NEUTRAL,
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -239,7 +239,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * This is only relevant for keyboard devices.
    */
-  device_props[PROP_HAS_BIDI_LAYOUTS] =
+  gdk_device_properties[GDK_DEVICE_PROP_HAS_BIDI_LAYOUTS] =
       g_param_spec_boolean ("has-bidi-layouts", NULL, NULL,
                             FALSE,
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -251,7 +251,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * This is only relevant for keyboard devices.
    */
-  device_props[PROP_CAPS_LOCK_STATE] =
+  gdk_device_properties[GDK_DEVICE_PROP_CAPS_LOCK_STATE] =
       g_param_spec_boolean ("caps-lock-state", NULL, NULL,
                             FALSE,
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -263,7 +263,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * This is only relevant for keyboard devices.
    */
-  device_props[PROP_NUM_LOCK_STATE] =
+  gdk_device_properties[GDK_DEVICE_PROP_NUM_LOCK_STATE] =
       g_param_spec_boolean ("num-lock-state", NULL, NULL,
                             FALSE,
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -275,7 +275,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * This is only relevant for keyboard devices.
    */
-  device_props[PROP_SCROLL_LOCK_STATE] =
+  gdk_device_properties[GDK_DEVICE_PROP_SCROLL_LOCK_STATE] =
       g_param_spec_boolean ("scroll-lock-state", NULL, NULL,
                             FALSE,
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -287,13 +287,13 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * This is only relevant for keyboard devices.
    */
-  device_props[PROP_MODIFIER_STATE] =
+  gdk_device_properties[GDK_DEVICE_PROP_MODIFIER_STATE] =
       g_param_spec_flags ("modifier-state", NULL, NULL,
                           GDK_TYPE_MODIFIER_TYPE,
                           GDK_NO_MODIFIER_MASK,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (object_class, LAST_PROP, device_props);
+  g_object_class_install_properties (object_class, GDK_DEVICE_LAST_PROP, gdk_device_properties);
 
   /**
    * GdkDevice::changed:
@@ -307,7 +307,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    * that case the logical device will change to reflect the axes
    * and keys on the new physical device.
    */
-  signals[CHANGED] =
+  gdk_device_signals[GDK_DEVICE_CHANGED] =
     g_signal_new (g_intern_static_string ("changed"),
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -322,7 +322,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    *
    * Emitted on pen/eraser devices whenever tools enter or leave proximity.
    */
-  signals[TOOL_CHANGED] =
+  gdk_device_signals[GDK_DEVICE_TOOL_CHANGED] =
     g_signal_new (g_intern_static_string ("tool-changed"),
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -389,30 +389,30 @@ gdk_device_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_DEVICE_PROP_DISPLAY:
       device->display = g_value_get_object (value);
       break;
-    case PROP_NAME:
+    case GDK_DEVICE_PROP_NAME:
       g_free (device->name);
 
       device->name = g_value_dup_string (value);
       break;
-    case PROP_SOURCE:
+    case GDK_DEVICE_PROP_SOURCE:
       device->source = g_value_get_enum (value);
       break;
-    case PROP_HAS_CURSOR:
+    case GDK_DEVICE_PROP_HAS_CURSOR:
       device->has_cursor = g_value_get_boolean (value);
       break;
-    case PROP_VENDOR_ID:
+    case GDK_DEVICE_PROP_VENDOR_ID:
       device->vendor_id = g_value_dup_string (value);
       break;
-    case PROP_PRODUCT_ID:
+    case GDK_DEVICE_PROP_PRODUCT_ID:
       device->product_id = g_value_dup_string (value);
       break;
-    case PROP_SEAT:
+    case GDK_DEVICE_PROP_SEAT:
       device->seat = g_value_get_object (value);
       break;
-    case PROP_NUM_TOUCHES:
+    case GDK_DEVICE_PROP_NUM_TOUCHES:
       device->num_touches = g_value_get_uint (value);
       break;
     default:
@@ -431,52 +431,52 @@ gdk_device_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_DEVICE_PROP_DISPLAY:
       g_value_set_object (value, device->display);
       break;
-    case PROP_NAME:
+    case GDK_DEVICE_PROP_NAME:
       g_value_set_string (value, device->name);
       break;
-    case PROP_SOURCE:
+    case GDK_DEVICE_PROP_SOURCE:
       g_value_set_enum (value, device->source);
       break;
-    case PROP_HAS_CURSOR:
+    case GDK_DEVICE_PROP_HAS_CURSOR:
       g_value_set_boolean (value, device->has_cursor);
       break;
-    case PROP_N_AXES:
+    case GDK_DEVICE_PROP_N_AXES:
       g_value_set_uint (value, device->axes->len);
       break;
-    case PROP_VENDOR_ID:
+    case GDK_DEVICE_PROP_VENDOR_ID:
       g_value_set_string (value, device->vendor_id);
       break;
-    case PROP_PRODUCT_ID:
+    case GDK_DEVICE_PROP_PRODUCT_ID:
       g_value_set_string (value, device->product_id);
       break;
-    case PROP_SEAT:
+    case GDK_DEVICE_PROP_SEAT:
       g_value_set_object (value, device->seat);
       break;
-    case PROP_NUM_TOUCHES:
+    case GDK_DEVICE_PROP_NUM_TOUCHES:
       g_value_set_uint (value, device->num_touches);
       break;
-    case PROP_TOOL:
+    case GDK_DEVICE_PROP_TOOL:
       g_value_set_object (value, device->last_tool);
       break;
-    case PROP_DIRECTION:
+    case GDK_DEVICE_PROP_DIRECTION:
       g_value_set_enum (value, gdk_device_get_direction (device));
       break;
-    case PROP_HAS_BIDI_LAYOUTS:
+    case GDK_DEVICE_PROP_HAS_BIDI_LAYOUTS:
       g_value_set_boolean (value, gdk_device_has_bidi_layouts (device));
       break;
-    case PROP_CAPS_LOCK_STATE:
+    case GDK_DEVICE_PROP_CAPS_LOCK_STATE:
       g_value_set_boolean (value, gdk_device_get_caps_lock_state (device));
       break;
-    case PROP_NUM_LOCK_STATE:
+    case GDK_DEVICE_PROP_NUM_LOCK_STATE:
       g_value_set_boolean (value, gdk_device_get_num_lock_state (device));
       break;
-    case PROP_SCROLL_LOCK_STATE:
+    case GDK_DEVICE_PROP_SCROLL_LOCK_STATE:
       g_value_set_boolean (value, gdk_device_get_scroll_lock_state (device));
       break;
-    case PROP_MODIFIER_STATE:
+    case GDK_DEVICE_PROP_MODIFIER_STATE:
       g_value_set_flags (value, gdk_device_get_modifier_state (device));
       break;
     default:
@@ -806,7 +806,7 @@ _gdk_device_reset_axes (GdkDevice *device)
   for (i = device->axes->len - 1; i >= 0; i--)
     g_array_remove_index (device->axes, i);
 
-  g_object_notify_by_pspec (G_OBJECT (device), device_props[PROP_N_AXES]);
+  g_object_notify_by_pspec (G_OBJECT (device), gdk_device_properties[GDK_DEVICE_PROP_N_AXES]);
 }
 
 guint
@@ -845,7 +845,7 @@ _gdk_device_add_axis (GdkDevice   *device,
   device->axes = g_array_append_val (device->axes, axis_info);
   pos = device->axes->len - 1;
 
-  g_object_notify_by_pspec (G_OBJECT (device), device_props[PROP_N_AXES]);
+  g_object_notify_by_pspec (G_OBJECT (device), gdk_device_properties[GDK_DEVICE_PROP_N_AXES]);
 
   return pos;
 }
@@ -1181,7 +1181,7 @@ gdk_device_update_tool (GdkDevice     *device,
   if (g_set_object (&device->last_tool, tool))
     {
       g_object_notify (G_OBJECT (device), "tool");
-      g_signal_emit (device, signals[TOOL_CHANGED], 0, tool);
+      g_signal_emit (device, gdk_device_signals[GDK_DEVICE_TOOL_CHANGED], 0, tool);
     }
 }
 

gdk/gdkdisplay.c

@@ -74,24 +74,24 @@
 
 enum
 {
-  PROP_0,
-  PROP_COMPOSITED,
-  PROP_RGBA,
-  PROP_SHADOW_WIDTH,
-  PROP_INPUT_SHAPES,
-  PROP_DMABUF_FORMATS,
-  LAST_PROP
+  GDK_DISPLAY_PROP_0,
+  GDK_DISPLAY_PROP_COMPOSITED,
+  GDK_DISPLAY_PROP_RGBA,
+  GDK_DISPLAY_PROP_SHADOW_WIDTH,
+  GDK_DISPLAY_PROP_INPUT_SHAPES,
+  GDK_DISPLAY_PROP_DMABUF_FORMATS,
+  GDK_DISPLAY_LAST_PROP
 };
 
-static GParamSpec *props[LAST_PROP] = { NULL, };
+static GParamSpec *gdk_display_properties[GDK_DISPLAY_LAST_PROP] = { NULL, };
 
 enum {
-  OPENED,
-  CLOSED,
-  SEAT_ADDED,
-  SEAT_REMOVED,
-  SETTING_CHANGED,
-  LAST_SIGNAL
+  GDK_DISPLAY_OPENED,
+  GDK_DISPLAY_CLOSED,
+  GDK_DISPLAY_SEAT_ADDED,
+  GDK_DISPLAY_SEAT_REMOVED,
+  GDK_DISPLAY_SETTING_CHANGED,
+  GDK_DISPLAY_LAST_SIGNAL
 };
 
 typedef struct _GdkDisplayPrivate GdkDisplayPrivate;
@@ -124,7 +124,7 @@ static void gdk_display_finalize    (GObject         *object);
 
 static GdkAppLaunchContext *gdk_display_real_get_app_launch_context (GdkDisplay *display);
 
-static guint signals[LAST_SIGNAL] = { 0 };
+static guint gdk_display_signals[GDK_DISPLAY_LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GdkDisplay, gdk_display, G_TYPE_OBJECT)
 
@@ -138,23 +138,23 @@ gdk_display_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_COMPOSITED:
+    case GDK_DISPLAY_PROP_COMPOSITED:
       g_value_set_boolean (value, gdk_display_is_composited (display));
       break;
 
-    case PROP_RGBA:
+    case GDK_DISPLAY_PROP_RGBA:
       g_value_set_boolean (value, gdk_display_is_rgba (display));
       break;
 
-    case PROP_SHADOW_WIDTH:
+    case GDK_DISPLAY_PROP_SHADOW_WIDTH:
       g_value_set_boolean (value, gdk_display_supports_shadow_width (display));
       break;
 
-    case PROP_INPUT_SHAPES:
+    case GDK_DISPLAY_PROP_INPUT_SHAPES:
       g_value_set_boolean (value, gdk_display_supports_input_shapes (display));
       break;
 
-    case PROP_DMABUF_FORMATS:
+    case GDK_DISPLAY_PROP_DMABUF_FORMATS:
       g_value_set_boxed (value, gdk_display_get_dmabuf_formats (display));
       break;
 
@@ -234,7 +234,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * %TRUE if the display properly composites the alpha channel.
    */
-  props[PROP_COMPOSITED] =
+  gdk_display_properties[GDK_DISPLAY_PROP_COMPOSITED] =
     g_param_spec_boolean ("composited", NULL, NULL,
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -244,7 +244,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * %TRUE if the display supports an alpha channel.
    */
-  props[PROP_RGBA] =
+  gdk_display_properties[GDK_DISPLAY_PROP_RGBA] =
     g_param_spec_boolean ("rgba", NULL, NULL,
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -256,7 +256,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * Since: 4.14
    */
-  props[PROP_SHADOW_WIDTH] =
+  gdk_display_properties[GDK_DISPLAY_PROP_SHADOW_WIDTH] =
     g_param_spec_boolean ("shadow-width", NULL, NULL,
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -266,7 +266,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * %TRUE if the display supports input shapes.
    */
-  props[PROP_INPUT_SHAPES] =
+  gdk_display_properties[GDK_DISPLAY_PROP_INPUT_SHAPES] =
     g_param_spec_boolean ("input-shapes", NULL, NULL,
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -278,12 +278,12 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * Since: 4.14
    */
-  props[PROP_DMABUF_FORMATS] =
+  gdk_display_properties[GDK_DISPLAY_PROP_DMABUF_FORMATS] =
     g_param_spec_boxed ("dmabuf-formats", NULL, NULL,
                         GDK_TYPE_DMABUF_FORMATS,
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (object_class, LAST_PROP, props);
+  g_object_class_install_properties (object_class, GDK_DISPLAY_LAST_PROP, gdk_display_properties);
 
   /**
    * GdkDisplay::opened:
@@ -291,7 +291,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * Emitted when the connection to the windowing system for @display is opened.
    */
-  signals[OPENED] =
+  gdk_display_signals[GDK_DISPLAY_OPENED] =
     g_signal_new (g_intern_static_string ("opened"),
 		  G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -307,7 +307,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * Emitted when the connection to the windowing system for @display is closed.
    */
-  signals[CLOSED] =
+  gdk_display_signals[GDK_DISPLAY_CLOSED] =
     g_signal_new (g_intern_static_string ("closed"),
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
@@ -325,7 +325,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * Emitted whenever a new seat is made known to the windowing system.
    */
-  signals[SEAT_ADDED] =
+  gdk_display_signals[GDK_DISPLAY_SEAT_ADDED] =
     g_signal_new (g_intern_static_string ("seat-added"),
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
@@ -340,7 +340,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * Emitted whenever a seat is removed by the windowing system.
    */
-  signals[SEAT_REMOVED] =
+  gdk_display_signals[GDK_DISPLAY_SEAT_REMOVED] =
     g_signal_new (g_intern_static_string ("seat-removed"),
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
@@ -355,7 +355,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    *
    * Emitted whenever a setting changes its value.
    */
-  signals[SETTING_CHANGED] =
+  gdk_display_signals[GDK_DISPLAY_SETTING_CHANGED] =
     g_signal_new (g_intern_static_string ("setting-changed"),
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
@@ -491,7 +491,7 @@ gdk_display_close (GdkDisplay *display)
     {
       display->closed = TRUE;
 
-      g_signal_emit (display, signals[CLOSED], 0, FALSE);
+      g_signal_emit (display, gdk_display_signals[GDK_DISPLAY_CLOSED], 0, FALSE);
       g_object_run_dispose (G_OBJECT (display));
 
       g_object_unref (display);
@@ -1151,7 +1151,7 @@ gdk_display_set_input_shapes (GdkDisplay *display,
 
   priv->input_shapes = input_shapes;
 
-  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_INPUT_SHAPES]);
+  g_object_notify_by_pspec (G_OBJECT (display), gdk_display_properties[GDK_DISPLAY_PROP_INPUT_SHAPES]);
 }
 
 static GdkAppLaunchContext *
@@ -2116,7 +2116,7 @@ gdk_display_set_composited (GdkDisplay *display,
 
   priv->composited = composited;
 
-  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_COMPOSITED]);
+  g_object_notify_by_pspec (G_OBJECT (display), gdk_display_properties[GDK_DISPLAY_PROP_COMPOSITED]);
 }
 
 /**
@@ -2161,7 +2161,7 @@ gdk_display_set_rgba (GdkDisplay *display,
 
   priv->rgba = rgba;
 
-  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_RGBA]);
+  g_object_notify_by_pspec (G_OBJECT (display), gdk_display_properties[GDK_DISPLAY_PROP_RGBA]);
 }
 
 /**
@@ -2201,7 +2201,7 @@ gdk_display_set_shadow_width (GdkDisplay *display,
 
   priv->shadow_width = shadow_width;
 
-  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_SHADOW_WIDTH]);
+  g_object_notify_by_pspec (G_OBJECT (display), gdk_display_properties[GDK_DISPLAY_PROP_SHADOW_WIDTH]);
 }
 
 static void
@@ -2223,7 +2223,7 @@ gdk_display_add_seat (GdkDisplay *display,
   g_return_if_fail (GDK_IS_SEAT (seat));
 
   display->seats = g_list_append (display->seats, g_object_ref (seat));
-  g_signal_emit (display, signals[SEAT_ADDED], 0, seat);
+  g_signal_emit (display, gdk_display_signals[GDK_DISPLAY_SEAT_ADDED], 0, seat);
 
   g_signal_connect (seat, "device-removed", G_CALLBACK (device_removed_cb), display);
 }
@@ -2244,7 +2244,7 @@ gdk_display_remove_seat (GdkDisplay *display,
   if (link)
     {
       display->seats = g_list_remove_link (display->seats, link);
-      g_signal_emit (display, signals[SEAT_REMOVED], 0, seat);
+      g_signal_emit (display, gdk_display_signals[GDK_DISPLAY_SEAT_REMOVED], 0, seat);
       g_object_unref (link->data);
       g_list_free (link);
     }
@@ -2374,7 +2374,7 @@ gdk_display_get_monitor_at_surface (GdkDisplay *display,
 void
 gdk_display_emit_opened (GdkDisplay *display)
 {
-  g_signal_emit (display, signals[OPENED], 0);
+  g_signal_emit (display, gdk_display_signals[GDK_DISPLAY_OPENED], 0);
 }
 
 /**
@@ -2405,7 +2405,7 @@ void
 gdk_display_setting_changed (GdkDisplay       *display,
                              const char       *name)
 {
-  g_signal_emit (display, signals[SETTING_CHANGED], 0, name);
+  g_signal_emit (display, gdk_display_signals[GDK_DISPLAY_SETTING_CHANGED], 0, name);
 }
 
 void

gdk/gdkdisplaymanager.c

@@ -100,13 +100,13 @@
  */
 
 enum {
-  PROP_0,
-  PROP_DEFAULT_DISPLAY
+  GDK_DISPLAY_MANAGER_PROP_0,
+  GDK_DISPLAY_MANAGER_PROP_DEFAULT_DISPLAY
 };
 
 enum {
-  DISPLAY_OPENED,
-  LAST_SIGNAL
+  GDK_DISPLAY_MANAGER_DISPLAY_OPENED,
+  GDK_DISPLAY_MANAGER_LAST_SIGNAL
 };
 
 static void gdk_display_manager_set_property (GObject                *object,
@@ -118,7 +118,7 @@ static void gdk_display_manager_get_property (GObject                *object,
                                               GValue                 *value,
                                               GParamSpec             *pspec);
 
-static guint signals[LAST_SIGNAL] = { 0 };
+static guint gdk_display_manager_signals[GDK_DISPLAY_MANAGER_LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT)
 
@@ -137,7 +137,7 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
    *
    * Emitted when a display is opened.
    */
-  signals[DISPLAY_OPENED] =
+  gdk_display_manager_signals[GDK_DISPLAY_MANAGER_DISPLAY_OPENED] =
     g_signal_new (g_intern_static_string ("display-opened"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -154,7 +154,7 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
    * The default display.
    */
   g_object_class_install_property (object_class,
-                                   PROP_DEFAULT_DISPLAY,
+                                   GDK_DISPLAY_MANAGER_PROP_DEFAULT_DISPLAY,
                                    g_param_spec_object ("default-display", NULL, NULL,
                                                         GDK_TYPE_DISPLAY,
                                                         G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));
@@ -173,7 +173,7 @@ gdk_display_manager_set_property (GObject      *object,
 {
   switch (prop_id)
     {
-    case PROP_DEFAULT_DISPLAY:
+    case GDK_DISPLAY_MANAGER_PROP_DEFAULT_DISPLAY:
       gdk_display_manager_set_default_display (GDK_DISPLAY_MANAGER (object),
                                                g_value_get_object (value));
       break;
@@ -191,7 +191,7 @@ gdk_display_manager_get_property (GObject      *object,
 {
   switch (prop_id)
     {
-    case PROP_DEFAULT_DISPLAY:
+    case GDK_DISPLAY_MANAGER_PROP_DEFAULT_DISPLAY:
       g_value_set_object (value,
                           gdk_display_manager_get_default_display (GDK_DISPLAY_MANAGER (object)));
       break;
@@ -455,7 +455,7 @@ _gdk_display_manager_add_display (GdkDisplayManager *manager,
 
   manager->displays = g_slist_prepend (manager->displays, display);
 
-  g_signal_emit (manager, signals[DISPLAY_OPENED], 0, display);
+  g_signal_emit (manager, gdk_display_manager_signals[GDK_DISPLAY_MANAGER_DISPLAY_OPENED], 0, display);
 }
 
 /* NB: This function can be called multiple times per display. */

gdk/gdkdmabuftexturebuilder.c

@@ -119,24 +119,24 @@ struct _GdkDmabufTextureBuilderClass
 
 enum
 {
-  PROP_0,
-  PROP_DISPLAY,
-  PROP_WIDTH,
-  PROP_HEIGHT,
-  PROP_FOURCC,
-  PROP_MODIFIER,
-  PROP_PREMULTIPLIED,
-  PROP_N_PLANES,
-  PROP_COLOR_STATE,
-  PROP_UPDATE_REGION,
-  PROP_UPDATE_TEXTURE,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_0,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_DISPLAY,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_WIDTH,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_HEIGHT,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_FOURCC,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_MODIFIER,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_PREMULTIPLIED,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_N_PLANES,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_COLOR_STATE,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_REGION,
+  GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE,
 
-  N_PROPS
+  GDK_DMABUF_TEXTURE_BUILDER_N_PROPS
 };
 
 G_DEFINE_TYPE (GdkDmabufTextureBuilder, gdk_dmabuf_texture_builder, G_TYPE_OBJECT)
 
-static GParamSpec *properties[N_PROPS] = { NULL, };
+static GParamSpec *gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_N_PROPS] = { NULL, };
 
 static void
 gdk_dmabuf_texture_builder_dispose (GObject *object)
@@ -160,43 +160,43 @@ gdk_dmabuf_texture_builder_get_property (GObject    *object,
 
   switch (property_id)
     {
-    case PROP_DISPLAY:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_DISPLAY:
       g_value_set_object (value, self->display);
       break;
 
-    case PROP_WIDTH:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_WIDTH:
       g_value_set_uint (value, self->width);
       break;
 
-    case PROP_HEIGHT:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_HEIGHT:
       g_value_set_uint (value, self->height);
       break;
 
-    case PROP_FOURCC:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_FOURCC:
       g_value_set_uint (value, self->dmabuf.fourcc);
       break;
 
-    case PROP_MODIFIER:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_MODIFIER:
       g_value_set_uint64 (value, self->dmabuf.modifier);
       break;
 
-    case PROP_PREMULTIPLIED:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_PREMULTIPLIED:
       g_value_set_boolean (value, self->premultiplied);
       break;
 
-    case PROP_N_PLANES:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_N_PLANES:
       g_value_set_uint (value, self->dmabuf.n_planes);
       break;
 
-    case PROP_COLOR_STATE:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_COLOR_STATE:
       g_value_set_boxed (value, self->color_state);
       break;
 
-    case PROP_UPDATE_REGION:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_REGION:
       g_value_set_boxed (value, self->update_region);
       break;
 
-    case PROP_UPDATE_TEXTURE:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE:
       g_value_set_object (value, self->update_texture);
       break;
 
@@ -216,43 +216,43 @@ gdk_dmabuf_texture_builder_set_property (GObject      *object,
 
   switch (property_id)
     {
-    case PROP_DISPLAY:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_DISPLAY:
       gdk_dmabuf_texture_builder_set_display (self, g_value_get_object (value));
       break;
 
-    case PROP_WIDTH:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_WIDTH:
       gdk_dmabuf_texture_builder_set_width (self, g_value_get_uint (value));
       break;
 
-    case PROP_HEIGHT:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_HEIGHT:
       gdk_dmabuf_texture_builder_set_height (self, g_value_get_uint (value));
       break;
 
-    case PROP_FOURCC:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_FOURCC:
       gdk_dmabuf_texture_builder_set_fourcc (self, g_value_get_uint (value));
       break;
 
-    case PROP_MODIFIER:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_MODIFIER:
       gdk_dmabuf_texture_builder_set_modifier (self, g_value_get_uint64 (value));
       break;
 
-    case PROP_PREMULTIPLIED:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_PREMULTIPLIED:
       gdk_dmabuf_texture_builder_set_premultiplied (self, g_value_get_boolean (value));
       break;
 
-    case PROP_N_PLANES:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_N_PLANES:
       gdk_dmabuf_texture_builder_set_n_planes (self, g_value_get_uint (value));
       break;
 
-    case PROP_COLOR_STATE:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_COLOR_STATE:
       gdk_dmabuf_texture_builder_set_color_state (self, g_value_get_boxed (value));
       break;
 
-    case PROP_UPDATE_REGION:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_REGION:
       gdk_dmabuf_texture_builder_set_update_region (self, g_value_get_boxed (value));
       break;
 
-    case PROP_UPDATE_TEXTURE:
+    case GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE:
       gdk_dmabuf_texture_builder_set_update_texture (self, g_value_get_object (value));
       break;
 
@@ -278,7 +278,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.14
    */
-  properties[PROP_DISPLAY] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_DISPLAY] =
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -290,7 +290,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.14
    */
-  properties[PROP_WIDTH] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_WIDTH] =
     g_param_spec_uint ("width", NULL, NULL,
                        0, G_MAXUINT, 0,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -302,7 +302,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.14
    */
-  properties[PROP_HEIGHT] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_HEIGHT] =
     g_param_spec_uint ("height", NULL, NULL,
                        0, G_MAXUINT, 0,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -314,7 +314,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.14
    */
-  properties[PROP_FOURCC] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_FOURCC] =
     g_param_spec_uint ("fourcc", NULL, NULL,
                        0, 0xffffffff, 0,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -326,7 +326,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.14
    */
-  properties[PROP_MODIFIER] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_MODIFIER] =
     g_param_spec_uint64 ("modifier", NULL, NULL,
                          0, G_MAXUINT, 0,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -340,7 +340,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.14
    */
-  properties[PROP_PREMULTIPLIED] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_PREMULTIPLIED] =
     g_param_spec_boolean ("premultiplied", NULL, NULL,
                           TRUE,
                           G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -350,12 +350,12 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * The number of planes of the texture.
    *
-   * Note that you can set properties for other planes,
+   * Note that you can set gdk_dmabuf_texture_builder_properties for other planes,
    * but they will be ignored when constructing the texture.
    *
    * Since: 4.14
    */
-  properties[PROP_N_PLANES] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_N_PLANES] =
     g_param_spec_uint ("n-planes", NULL, NULL,
                        1, GDK_DMABUF_MAX_PLANES, 1,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -367,7 +367,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_COLOR_STATE] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_COLOR_STATE] =
     g_param_spec_boxed ("color-state", NULL, NULL,
                         GDK_TYPE_COLOR_STATE,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -379,7 +379,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.14
    */
-  properties[PROP_UPDATE_REGION] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_REGION] =
     g_param_spec_boxed ("update-region", NULL, NULL,
                         CAIRO_GOBJECT_TYPE_REGION,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -391,12 +391,12 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
    *
    * Since: 4.14
    */
-  properties[PROP_UPDATE_TEXTURE] =
+  gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE] =
     g_param_spec_object ("update-texture", NULL, NULL,
                          GDK_TYPE_TEXTURE,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+  g_object_class_install_properties (gobject_class, GDK_DMABUF_TEXTURE_BUILDER_N_PROPS, gdk_dmabuf_texture_builder_properties);
 }
 
 static void
@@ -467,7 +467,7 @@ gdk_dmabuf_texture_builder_set_display (GdkDmabufTextureBuilder *self,
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
   if (g_set_object (&self->display, display))
-    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_DISPLAY]);
+    g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_DISPLAY]);
 }
 
 /**
@@ -511,7 +511,7 @@ gdk_dmabuf_texture_builder_set_width (GdkDmabufTextureBuilder *self,
 
   self->width = width;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_WIDTH]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_WIDTH]);
 }
 
 /**
@@ -555,7 +555,7 @@ gdk_dmabuf_texture_builder_set_height (GdkDmabufTextureBuilder *self,
 
   self->height = height;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_HEIGHT]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_HEIGHT]);
 }
 
 /**
@@ -603,7 +603,7 @@ gdk_dmabuf_texture_builder_set_fourcc (GdkDmabufTextureBuilder *self,
 
   self->dmabuf.fourcc = fourcc;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_FOURCC]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_FOURCC]);
 }
 
 /**
@@ -644,7 +644,7 @@ gdk_dmabuf_texture_builder_set_modifier (GdkDmabufTextureBuilder *self,
 
   self->dmabuf.modifier = modifier;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MODIFIER]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_MODIFIER]);
 }
 
 /**
@@ -706,7 +706,7 @@ gdk_dmabuf_texture_builder_set_premultiplied (GdkDmabufTextureBuilder *self,
 
   self->premultiplied = premultiplied;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PREMULTIPLIED]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_PREMULTIPLIED]);
 }
 
 /**
@@ -730,7 +730,7 @@ gdk_dmabuf_texture_builder_set_n_planes (GdkDmabufTextureBuilder *self,
 
   self->dmabuf.n_planes = n_planes;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_N_PLANES]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_N_PLANES]);
 }
 
 /**
@@ -916,7 +916,7 @@ gdk_dmabuf_texture_builder_set_color_state (GdkDmabufTextureBuilder *self,
   if (color_state)
     gdk_color_state_ref (color_state);
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_COLOR_STATE]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_COLOR_STATE]);
 }
 
 /**
@@ -958,7 +958,7 @@ gdk_dmabuf_texture_builder_set_update_texture (GdkDmabufTextureBuilder *self,
   if (!g_set_object (&self->update_texture, texture))
     return;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UPDATE_TEXTURE]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE]);
 }
 
 /**
@@ -1012,7 +1012,7 @@ gdk_dmabuf_texture_builder_set_update_region (GdkDmabufTextureBuilder *self,
   if (region)
     self->update_region = cairo_region_reference (region);
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UPDATE_REGION]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_dmabuf_texture_builder_properties[GDK_DMABUF_TEXTURE_BUILDER_PROP_UPDATE_REGION]);
 }
 
 /**

gdk/gdkdrag.c

@@ -51,22 +51,22 @@
 #include "gdkeventsprivate.h"
 
 enum {
-  PROP_0,
-  PROP_CONTENT,
-  PROP_DEVICE,
-  PROP_DISPLAY,
-  PROP_FORMATS,
-  PROP_SELECTED_ACTION,
-  PROP_ACTIONS,
-  PROP_SURFACE,
-  N_PROPERTIES
+  GDK_DRAG_PROP_0,
+  GDK_DRAG_PROP_CONTENT,
+  GDK_DRAG_PROP_DEVICE,
+  GDK_DRAG_PROP_DISPLAY,
+  GDK_DRAG_PROP_FORMATS,
+  GDK_DRAG_PROP_SELECTED_ACTION,
+  GDK_DRAG_PROP_ACTIONS,
+  GDK_DRAG_PROP_SURFACE,
+  GDK_DRAG_N_PROPERTIES
 };
 
 enum {
-  CANCEL,
-  DROP_PERFORMED,
-  DND_FINISHED,
-  N_SIGNALS
+  GDK_DRAG_CANCEL,
+  GDK_DRAG_DROP_PERFORMED,
+  GDK_DRAG_DND_FINISHED,
+  GDK_DRAG_N_SIGNALS
 };
 
 typedef struct _GdkDragPrivate GdkDragPrivate;
@@ -85,8 +85,8 @@ struct _GdkDragPrivate {
   guint drop_done : 1; /* Whether gdk_drag_drop_done() was performed */
 };
 
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
-static guint signals[N_SIGNALS] = { 0 };
+static GParamSpec *gdk_drag_properties[GDK_DRAG_N_PROPERTIES] = { NULL, };
+static guint gdk_drag_signals[GDK_DRAG_N_SIGNALS] = { 0 };
 static GList *drags = NULL;
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkDrag, gdk_drag, G_TYPE_OBJECT)
@@ -234,7 +234,7 @@ gdk_drag_set_property (GObject      *gobject,
 
   switch (prop_id)
     {
-    case PROP_CONTENT:
+    case GDK_DRAG_PROP_CONTENT:
       priv->content = g_value_dup_object (value);
       if (priv->content)
         {
@@ -243,13 +243,13 @@ gdk_drag_set_property (GObject      *gobject,
         }
       break;
 
-    case PROP_DEVICE:
+    case GDK_DRAG_PROP_DEVICE:
       priv->device = g_value_dup_object (value);
       g_assert (priv->device != NULL);
       priv->display = gdk_device_get_display (priv->device);
       break;
 
-    case PROP_FORMATS:
+    case GDK_DRAG_PROP_FORMATS:
       if (priv->formats)
         {
           GdkContentFormats *override = g_value_dup_boxed (value);
@@ -266,21 +266,21 @@ gdk_drag_set_property (GObject      *gobject,
         }
       break;
 
-    case PROP_SELECTED_ACTION:
+    case GDK_DRAG_PROP_SELECTED_ACTION:
       {
         GdkDragAction action = g_value_get_flags (value);
         gdk_drag_set_selected_action (drag, action);
       }
-    break;
+      break;
 
-    case PROP_ACTIONS:
+    case GDK_DRAG_PROP_ACTIONS:
       {
         GdkDragAction actions = g_value_get_flags (value);
         gdk_drag_set_actions (drag, actions);
       }
-    break;
+      break;
 
-    case PROP_SURFACE:
+    case GDK_DRAG_PROP_SURFACE:
       priv->surface = g_value_dup_object (value);
       g_assert (priv->surface != NULL);
       break;
@@ -302,31 +302,31 @@ gdk_drag_get_property (GObject    *gobject,
 
   switch (prop_id)
     {
-    case PROP_CONTENT:
+    case GDK_DRAG_PROP_CONTENT:
       g_value_set_object (value, priv->content);
       break;
 
-    case PROP_DEVICE:
+    case GDK_DRAG_PROP_DEVICE:
       g_value_set_object (value, priv->device);
       break;
 
-    case PROP_DISPLAY:
+    case GDK_DRAG_PROP_DISPLAY:
       g_value_set_object (value, priv->display);
       break;
 
-    case PROP_FORMATS:
+    case GDK_DRAG_PROP_FORMATS:
       g_value_set_boxed (value, priv->formats);
       break;
 
-    case PROP_SELECTED_ACTION:
+    case GDK_DRAG_PROP_SELECTED_ACTION:
       g_value_set_flags (value, priv->selected_action);
       break;
 
-    case PROP_ACTIONS:
+    case GDK_DRAG_PROP_ACTIONS:
       g_value_set_flags (value, priv->actions);
       break;
 
-    case PROP_SURFACE:
+    case GDK_DRAG_PROP_SURFACE:
       g_value_set_object (value, priv->surface);
       break;
 
@@ -366,7 +366,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * The `GdkContentProvider`.
    */
-  properties[PROP_CONTENT] =
+  gdk_drag_properties[GDK_DRAG_PROP_CONTENT] =
     g_param_spec_object ("content", NULL, NULL,
                          GDK_TYPE_CONTENT_PROVIDER,
                          G_PARAM_READWRITE |
@@ -379,7 +379,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * The `GdkDevice` that is performing the drag.
    */
-  properties[PROP_DEVICE] =
+  gdk_drag_properties[GDK_DRAG_PROP_DEVICE] =
     g_param_spec_object ("device", NULL, NULL,
                          GDK_TYPE_DEVICE,
                          G_PARAM_READWRITE |
@@ -392,7 +392,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * The `GdkDisplay` that the drag belongs to.
    */
-  properties[PROP_DISPLAY] =
+  gdk_drag_properties[GDK_DRAG_PROP_DISPLAY] =
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READABLE |
@@ -404,7 +404,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * The possible formats that the drag can provide its data in.
    */
-  properties[PROP_FORMATS] =
+  gdk_drag_properties[GDK_DRAG_PROP_FORMATS] =
     g_param_spec_boxed ("formats", NULL, NULL,
                         GDK_TYPE_CONTENT_FORMATS,
                         G_PARAM_READWRITE |
@@ -417,7 +417,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * The currently selected action of the drag.
    */
-  properties[PROP_SELECTED_ACTION] =
+  gdk_drag_properties[GDK_DRAG_PROP_SELECTED_ACTION] =
     g_param_spec_flags ("selected-action", NULL, NULL,
                         GDK_TYPE_DRAG_ACTION,
                         0,
@@ -430,7 +430,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * The possible actions of this drag.
    */
-  properties[PROP_ACTIONS] =
+  gdk_drag_properties[GDK_DRAG_PROP_ACTIONS] =
     g_param_spec_flags ("actions", NULL, NULL,
                         GDK_TYPE_DRAG_ACTION,
                         0,
@@ -443,7 +443,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * The surface where the drag originates.
    */
-  properties[PROP_SURFACE] =
+  gdk_drag_properties[GDK_DRAG_PROP_SURFACE] =
     g_param_spec_object ("surface", NULL, NULL,
                          GDK_TYPE_SURFACE,
                          G_PARAM_READWRITE |
@@ -458,7 +458,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * Emitted when the drag operation is cancelled.
    */
-  signals[CANCEL] =
+  gdk_drag_signals[GDK_DRAG_CANCEL] =
     g_signal_new (g_intern_static_string ("cancel"),
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -473,7 +473,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * Emitted when the drop operation is performed on an accepting client.
    */
-  signals[DROP_PERFORMED] =
+  gdk_drag_signals[GDK_DRAG_DROP_PERFORMED] =
     g_signal_new (g_intern_static_string ("drop-performed"),
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -490,7 +490,7 @@ gdk_drag_class_init (GdkDragClass *klass)
    *
    * The drag object can now free all miscellaneous data.
    */
-  signals[DND_FINISHED] =
+  gdk_drag_signals[GDK_DRAG_DND_FINISHED] =
     g_signal_new (g_intern_static_string ("dnd-finished"),
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -499,7 +499,7 @@ gdk_drag_class_init (GdkDragClass *klass)
                   NULL,
                   G_TYPE_NONE, 0);
 
-  g_object_class_install_properties (object_class, N_PROPERTIES, properties);
+  g_object_class_install_properties (object_class, GDK_DRAG_N_PROPERTIES, gdk_drag_properties);
 }
 
 static void
@@ -633,7 +633,7 @@ gdk_drag_set_actions (GdkDrag       *drag,
 
   priv->actions = actions;
 
-  g_object_notify_by_pspec (G_OBJECT (drag), properties[PROP_ACTIONS]);
+  g_object_notify_by_pspec (G_OBJECT (drag), gdk_drag_properties[GDK_DRAG_PROP_ACTIONS]);
 }
 
 void
@@ -651,7 +651,7 @@ gdk_drag_set_selected_action (GdkDrag       *drag,
   cursor = gdk_drag_get_cursor (drag, action);
   gdk_drag_set_cursor (drag, cursor);
 
-  g_object_notify_by_pspec (G_OBJECT (drag), properties[PROP_SELECTED_ACTION]);
+  g_object_notify_by_pspec (G_OBJECT (drag), gdk_drag_properties[GDK_DRAG_PROP_SELECTED_ACTION]);
 }
 
 /**
@@ -751,7 +751,7 @@ gdk_drag_cancel (GdkDrag             *drag,
 {
   g_return_if_fail (GDK_IS_DRAG (drag));
 
-  g_signal_emit (drag, signals[CANCEL], 0, reason);
+  g_signal_emit (drag, gdk_drag_signals[GDK_DRAG_CANCEL], 0, reason);
 }
 
 gboolean

gdk/gdkdrawcontext.c

@@ -53,15 +53,15 @@ struct _GdkDrawContextPrivate {
 };
 
 enum {
-  PROP_0,
+  GDK_DRAW_CONTEXT_PROP_0,
 
-  PROP_DISPLAY,
-  PROP_SURFACE,
+  GDK_DRAW_CONTEXT_PROP_DISPLAY,
+  GDK_DRAW_CONTEXT_PROP_SURFACE,
 
-  LAST_PROP
+  GDK_DRAW_CONTEXT_LAST_PROP
 };
 
-static GParamSpec *pspecs[LAST_PROP] = { NULL, };
+static GParamSpec *gdk_draw_context_properties[GDK_DRAW_CONTEXT_LAST_PROP] = { NULL, };
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkDrawContext, gdk_draw_context, G_TYPE_OBJECT)
 
@@ -103,7 +103,7 @@ gdk_draw_context_set_property (GObject      *gobject,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_DRAW_CONTEXT_PROP_DISPLAY:
       if (priv->display != NULL)
         {
           g_assert (g_value_get_object (value) == NULL);
@@ -114,7 +114,7 @@ gdk_draw_context_set_property (GObject      *gobject,
         }
       break;
 
-    case PROP_SURFACE:
+    case GDK_DRAW_CONTEXT_PROP_SURFACE:
       priv->surface = g_value_dup_object (value);
       if (priv->surface)
         {
@@ -146,11 +146,11 @@ gdk_draw_context_get_property (GObject    *gobject,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_DRAW_CONTEXT_PROP_DISPLAY:
       g_value_set_object (value, gdk_draw_context_get_display (context));
       break;
 
-    case PROP_SURFACE:
+    case GDK_DRAW_CONTEXT_PROP_SURFACE:
       g_value_set_object (value, priv->surface);
       break;
 
@@ -176,7 +176,7 @@ gdk_draw_context_class_init (GdkDrawContextClass *klass)
    *
    * The `GdkDisplay` used to create the `GdkDrawContext`.
    */
-  pspecs[PROP_DISPLAY] =
+  gdk_draw_context_properties[GDK_DRAW_CONTEXT_PROP_DISPLAY] =
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READWRITE |
@@ -188,14 +188,14 @@ gdk_draw_context_class_init (GdkDrawContextClass *klass)
    *
    * The `GdkSurface` the context is bound to.
    */
-  pspecs[PROP_SURFACE] =
+  gdk_draw_context_properties[GDK_DRAW_CONTEXT_PROP_SURFACE] =
     g_param_spec_object ("surface", NULL, NULL,
                          GDK_TYPE_SURFACE,
                          G_PARAM_READWRITE |
                          G_PARAM_CONSTRUCT_ONLY |
                          G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (gobject_class, LAST_PROP, pspecs);
+  g_object_class_install_properties (gobject_class, GDK_DRAW_CONTEXT_LAST_PROP, gdk_draw_context_properties);
 }
 
 static guint pixels_counter;

gdk/gdkdrop.c

@@ -71,17 +71,17 @@ struct _GdkDropPrivate {
 };
 
 enum {
-  PROP_0,
-  PROP_ACTIONS,
-  PROP_DEVICE,
-  PROP_DISPLAY,
-  PROP_DRAG,
-  PROP_FORMATS,
-  PROP_SURFACE,
-  N_PROPERTIES
+  GDK_DROP_PROP_0,
+  GDK_DROP_PROP_ACTIONS,
+  GDK_DROP_PROP_DEVICE,
+  GDK_DROP_PROP_DISPLAY,
+  GDK_DROP_PROP_DRAG,
+  GDK_DROP_PROP_FORMATS,
+  GDK_DROP_PROP_SURFACE,
+  GDK_DROP_N_PROPERTIES
 };
 
-static GParamSpec *properties[N_PROPERTIES] = { NULL, };
+static GParamSpec *gdk_drop_properties[GDK_DROP_N_PROPERTIES] = { NULL, };
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkDrop, gdk_drop, G_TYPE_OBJECT)
 
@@ -210,29 +210,29 @@ gdk_drop_set_property (GObject      *gobject,
 
   switch (prop_id)
     {
-    case PROP_ACTIONS:
+    case GDK_DROP_PROP_ACTIONS:
       gdk_drop_set_actions (self, g_value_get_flags (value));
       break;
 
-    case PROP_DEVICE:
+    case GDK_DROP_PROP_DEVICE:
       priv->device = g_value_dup_object (value);
       g_assert (priv->device != NULL);
       if (priv->surface)
         g_assert (gdk_surface_get_display (priv->surface) == gdk_device_get_display (priv->device));
       break;
 
-    case PROP_DRAG:
+    case GDK_DROP_PROP_DRAG:
       priv->drag = g_value_dup_object (value);
       if (priv->drag)
         gdk_drop_add_formats (self, gdk_drag_get_formats (priv->drag));
       break;
 
-    case PROP_FORMATS:
+    case GDK_DROP_PROP_FORMATS:
       gdk_drop_add_formats (self, g_value_get_boxed (value));
       g_assert (priv->formats != NULL);
       break;
 
-    case PROP_SURFACE:
+    case GDK_DROP_PROP_SURFACE:
       priv->surface = g_value_dup_object (value);
       g_assert (priv->surface != NULL);
       if (priv->device)
@@ -256,27 +256,27 @@ gdk_drop_get_property (GObject    *gobject,
 
   switch (prop_id)
     {
-    case PROP_ACTIONS:
+    case GDK_DROP_PROP_ACTIONS:
       g_value_set_flags (value, priv->actions);
       break;
 
-    case PROP_DEVICE:
+    case GDK_DROP_PROP_DEVICE:
       g_value_set_object (value, priv->device);
       break;
 
-    case PROP_DISPLAY:
+    case GDK_DROP_PROP_DISPLAY:
       g_value_set_object (value, gdk_device_get_display (priv->device));
       break;
 
-    case PROP_DRAG:
+    case GDK_DROP_PROP_DRAG:
       g_value_set_object (value, priv->drag);
       break;
 
-    case PROP_FORMATS:
+    case GDK_DROP_PROP_FORMATS:
       g_value_set_boxed (value, priv->formats);
       break;
 
-    case PROP_SURFACE:
+    case GDK_DROP_PROP_SURFACE:
       g_value_set_object (value, priv->surface);
       break;
 
@@ -324,7 +324,7 @@ gdk_drop_class_init (GdkDropClass *klass)
    *
    * The possible actions for this drop
    */
-  properties[PROP_ACTIONS] =
+  gdk_drop_properties[GDK_DROP_PROP_ACTIONS] =
     g_param_spec_flags ("actions", NULL, NULL,
                          GDK_TYPE_DRAG_ACTION,
                          GDK_ACTION_ALL,
@@ -338,7 +338,7 @@ gdk_drop_class_init (GdkDropClass *klass)
    *
    * The `GdkDevice` performing the drop
    */
-  properties[PROP_DEVICE] =
+  gdk_drop_properties[GDK_DROP_PROP_DEVICE] =
     g_param_spec_object ("device", NULL, NULL,
                          GDK_TYPE_DEVICE,
                          G_PARAM_READWRITE |
@@ -351,7 +351,7 @@ gdk_drop_class_init (GdkDropClass *klass)
    *
    * The `GdkDisplay` that the drop belongs to.
    */
-  properties[PROP_DISPLAY] =
+  gdk_drop_properties[GDK_DROP_PROP_DISPLAY] =
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READABLE |
@@ -363,7 +363,7 @@ gdk_drop_class_init (GdkDropClass *klass)
    *
    * The `GdkDrag` that initiated this drop
    */
-  properties[PROP_DRAG] =
+  gdk_drop_properties[GDK_DROP_PROP_DRAG] =
     g_param_spec_object ("drag", NULL, NULL,
                          GDK_TYPE_DRAG,
                          G_PARAM_READWRITE |
@@ -376,7 +376,7 @@ gdk_drop_class_init (GdkDropClass *klass)
    *
    * The possible formats that the drop can provide its data in.
    */
-  properties[PROP_FORMATS] =
+  gdk_drop_properties[GDK_DROP_PROP_FORMATS] =
     g_param_spec_boxed ("formats", NULL, NULL,
                         GDK_TYPE_CONTENT_FORMATS,
                         G_PARAM_READWRITE |
@@ -389,7 +389,7 @@ gdk_drop_class_init (GdkDropClass *klass)
    *
    * The `GdkSurface` the drop happens on
    */
-  properties[PROP_SURFACE] =
+  gdk_drop_properties[GDK_DROP_PROP_SURFACE] =
     g_param_spec_object ("surface", NULL, NULL,
                          GDK_TYPE_SURFACE,
                          G_PARAM_READWRITE |
@@ -397,7 +397,7 @@ gdk_drop_class_init (GdkDropClass *klass)
                          G_PARAM_STATIC_STRINGS |
                          G_PARAM_EXPLICIT_NOTIFY);
 
-  g_object_class_install_properties (object_class, N_PROPERTIES, properties);
+  g_object_class_install_properties (object_class, GDK_DROP_N_PROPERTIES, gdk_drop_properties);
 }
 
 static void
@@ -524,7 +524,7 @@ gdk_drop_set_actions (GdkDrop       *self,
 
   priv->actions = actions;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ACTIONS]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_drop_properties[GDK_DROP_PROP_ACTIONS]);
 }
 
 /**
@@ -764,7 +764,7 @@ gdk_drop_read_value_got_stream (GObject      *source,
 }
 
 static void
-free_value (gpointer value)
+gdk_drop_free_value (gpointer value)
 {
   g_value_unset (value);
   g_free (value);
@@ -792,7 +792,7 @@ gdk_drop_read_value_internal (GdkDrop             *self,
   g_task_set_source_tag (task, source_tag);
   value = g_new0 (GValue, 1);
   g_value_init (value, type);
-  g_task_set_task_data (task, value, free_value);
+  g_task_set_task_data (task, value, gdk_drop_free_value);
 
   if (priv->drag)
     {

gdk/gdkframeclock.c

@@ -65,17 +65,17 @@
  */
 
 enum {
-  FLUSH_EVENTS,
-  BEFORE_PAINT,
-  UPDATE,
-  LAYOUT,
-  PAINT,
-  AFTER_PAINT,
-  RESUME_EVENTS,
-  LAST_SIGNAL
+  GDK_FRAME_CLOCK_FLUSH_EVENTS,
+  GDK_FRAME_CLOCK_BEFORE_PAINT,
+  GDK_FRAME_CLOCK_UPDATE,
+  GDK_FRAME_CLOCK_LAYOUT,
+  GDK_FRAME_CLOCK_PAINT,
+  GDK_FRAME_CLOCK_AFTER_PAINT,
+  GDK_FRAME_CLOCK_RESUME_EVENTS,
+  GDK_FRAME_CLOCK_LAST_SIGNAL
 };
 
-static guint signals[LAST_SIGNAL];
+static guint gdk_frame_clock_signals[GDK_FRAME_CLOCK_LAST_SIGNAL];
 
 static guint fps_counter;
 
@@ -139,7 +139,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    *
    * Applications should not handle this signal.
    */
-  signals[FLUSH_EVENTS] =
+  gdk_frame_clock_signals[GDK_FRAME_CLOCK_FLUSH_EVENTS] =
     g_signal_new (g_intern_static_string ("flush-events"),
                   GDK_TYPE_FRAME_CLOCK,
                   G_SIGNAL_RUN_LAST,
@@ -155,7 +155,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    *
    * Applications should generally not handle this signal.
    */
-  signals[BEFORE_PAINT] =
+  gdk_frame_clock_signals[GDK_FRAME_CLOCK_BEFORE_PAINT] =
     g_signal_new (g_intern_static_string ("before-paint"),
                   GDK_TYPE_FRAME_CLOCK,
                   G_SIGNAL_RUN_LAST,
@@ -175,7 +175,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    * [gtk_widget_add_tick_callback()](../gtk4/method.Widget.add_tick_callback.html)
    * as a more convenient interface.
    */
-  signals[UPDATE] =
+  gdk_frame_clock_signals[GDK_FRAME_CLOCK_UPDATE] =
     g_signal_new (g_intern_static_string ("update"),
                   GDK_TYPE_FRAME_CLOCK,
                   G_SIGNAL_RUN_LAST,
@@ -193,7 +193,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    * Any work to update sizes and positions of application elements
    * should be performed. GTK normally handles this internally.
    */
-  signals[LAYOUT] =
+  gdk_frame_clock_signals[GDK_FRAME_CLOCK_LAYOUT] =
     g_signal_new (g_intern_static_string ("layout"),
                   GDK_TYPE_FRAME_CLOCK,
                   G_SIGNAL_RUN_LAST,
@@ -213,7 +213,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    * [GtkWidget::snapshot](../gtk4/signal.Widget.snapshot.html) signals
    * by GTK.
    */
-  signals[PAINT] =
+  gdk_frame_clock_signals[GDK_FRAME_CLOCK_PAINT] =
     g_signal_new (g_intern_static_string ("paint"),
                   GDK_TYPE_FRAME_CLOCK,
                   G_SIGNAL_RUN_LAST,
@@ -229,7 +229,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    *
    * Applications should generally not handle this signal.
    */
-  signals[AFTER_PAINT] =
+  gdk_frame_clock_signals[GDK_FRAME_CLOCK_AFTER_PAINT] =
     g_signal_new (g_intern_static_string ("after-paint"),
                   GDK_TYPE_FRAME_CLOCK,
                   G_SIGNAL_RUN_LAST,
@@ -246,7 +246,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    * This signal is handled internally by GTK to resume normal
    * event processing. Applications should not handle this signal.
    */
-  signals[RESUME_EVENTS] =
+  gdk_frame_clock_signals[GDK_FRAME_CLOCK_RESUME_EVENTS] =
     g_signal_new (g_intern_static_string ("resume-events"),
                   GDK_TYPE_FRAME_CLOCK,
                   G_SIGNAL_RUN_LAST,
@@ -693,13 +693,13 @@ gdk_frame_clock_get_refresh_info (GdkFrameClock *frame_clock,
 void
 _gdk_frame_clock_emit_flush_events (GdkFrameClock *frame_clock)
 {
-  g_signal_emit (frame_clock, signals[FLUSH_EVENTS], 0);
+  g_signal_emit (frame_clock, gdk_frame_clock_signals[GDK_FRAME_CLOCK_FLUSH_EVENTS], 0);
 }
 
 void
 _gdk_frame_clock_emit_before_paint (GdkFrameClock *frame_clock)
 {
-  g_signal_emit (frame_clock, signals[BEFORE_PAINT], 0);
+  g_signal_emit (frame_clock, gdk_frame_clock_signals[GDK_FRAME_CLOCK_BEFORE_PAINT], 0);
 }
 
 void
@@ -709,7 +709,7 @@ _gdk_frame_clock_emit_update (GdkFrameClock *frame_clock)
 
   before = GDK_PROFILER_CURRENT_TIME;
 
-  g_signal_emit (frame_clock, signals[UPDATE], 0);
+  g_signal_emit (frame_clock, gdk_frame_clock_signals[GDK_FRAME_CLOCK_UPDATE], 0);
 
   gdk_profiler_end_mark (before, "Frameclock update", NULL);
 }
@@ -721,7 +721,7 @@ _gdk_frame_clock_emit_layout (GdkFrameClock *frame_clock)
 
   before = GDK_PROFILER_CURRENT_TIME;
 
-  g_signal_emit (frame_clock, signals[LAYOUT], 0);
+  g_signal_emit (frame_clock, gdk_frame_clock_signals[GDK_FRAME_CLOCK_LAYOUT], 0);
 
   gdk_profiler_end_mark (before, "Frameclock layout", NULL);
 }
@@ -733,7 +733,7 @@ _gdk_frame_clock_emit_paint (GdkFrameClock *frame_clock)
 
   before = GDK_PROFILER_CURRENT_TIME;
 
-  g_signal_emit (frame_clock, signals[PAINT], 0);
+  g_signal_emit (frame_clock, gdk_frame_clock_signals[GDK_FRAME_CLOCK_PAINT], 0);
 
   gdk_profiler_end_mark (before, "Frameclock paint", NULL);
 }
@@ -741,13 +741,13 @@ _gdk_frame_clock_emit_paint (GdkFrameClock *frame_clock)
 void
 _gdk_frame_clock_emit_after_paint (GdkFrameClock *frame_clock)
 {
-  g_signal_emit (frame_clock, signals[AFTER_PAINT], 0);
+  g_signal_emit (frame_clock, gdk_frame_clock_signals[GDK_FRAME_CLOCK_AFTER_PAINT], 0);
 }
 
 void
 _gdk_frame_clock_emit_resume_events (GdkFrameClock *frame_clock)
 {
-  g_signal_emit (frame_clock, signals[RESUME_EVENTS], 0);
+  g_signal_emit (frame_clock, gdk_frame_clock_signals[GDK_FRAME_CLOCK_RESUME_EVENTS], 0);
 }
 
 static gint64

gdk/gdkframeclockidle.c

@@ -35,13 +35,13 @@
 #include <windows.h>
 #endif
 
-#define FRAME_INTERVAL 16667 /* microseconds */
+#define GDK_FRAME_CLOCK_IDLE_FRAME_INTERVAL 16667 /* microseconds */
 
 typedef enum {
-  SMOOTH_PHASE_STATE_VALID = 0,    /* explicit, since we count on zero-init */
-  SMOOTH_PHASE_STATE_AWAIT_FIRST,
-  SMOOTH_PHASE_STATE_AWAIT_DRAWN,
-} SmoothDeltaState;
+  GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_VALID = 0,    /* explicit, since we count on zero-init */
+  GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_AWAIT_FIRST,
+  GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_AWAIT_DRAWN,
+} GdkFrameClockIdleSmoothDeltaState;
 
 struct _GdkFrameClockIdlePrivate
 {
@@ -51,9 +51,9 @@ struct _GdkFrameClockIdlePrivate
   gint64 smoothed_frame_time_reported; /* Ensures we are always monotonic */
   gint64 smoothed_frame_time_phase;    /* The offset of the first reported frame time, in the current animation sequence, from the preceding vsync */
   gint64 min_next_frame_time;          /* We're not synced to vblank, so wait at least until this before next cycle to avoid busy looping */
-  SmoothDeltaState smooth_phase_state; /* The state of smoothed_frame_time_phase - is it valid, awaiting vsync etc. Thanks to zero-init, the initial value
+  GdkFrameClockIdleSmoothDeltaState smooth_phase_state; /* The state of smoothed_frame_time_phase - is it valid, awaiting vsync etc. Thanks to zero-init, the initial value
                                           of smoothed_frame_time_phase is `0`. This is valid, since we didn't get a "frame drawn" event yet. Accordingly,
-                                          the initial value of smooth_phase_state is SMOOTH_PHASE_STATE_VALID. See the comment in gdk_frame_clock_paint_idle()
+                                          the initial value of smooth_phase_state is GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_VALID. See the comment in gdk_frame_clock_paint_idle()
                                           for details. */
 
   gint64 sleep_serial;
@@ -79,57 +79,57 @@ static gboolean gdk_frame_clock_paint_idle (void *data);
 
 G_DEFINE_TYPE_WITH_PRIVATE (GdkFrameClockIdle, gdk_frame_clock_idle, GDK_TYPE_FRAME_CLOCK)
 
-static gint64 sleep_serial;
-static gint64 sleep_source_prepare_time;
-static GSource *sleep_source;
+static gint64 gdk_frame_clock_idle_sleep_serial;
+static gint64 gdk_frame_clock_idle_sleep_source_prepare_time;
+static GSource *gdk_frame_clock_idle_sleep_source;
 
 static gboolean
-sleep_source_prepare (GSource *source,
+gdk_frame_clock_idle_sleep_source_prepare (GSource *source,
                       int     *timeout)
 {
-  sleep_source_prepare_time = g_source_get_time (source);
+  gdk_frame_clock_idle_sleep_source_prepare_time = g_source_get_time (source);
   *timeout = -1;
   return FALSE;
 }
 
 static gboolean
-sleep_source_check (GSource *source)
+gdk_frame_clock_idle_sleep_source_check (GSource *source)
 {
-  if (g_source_get_time (source) != sleep_source_prepare_time)
-    sleep_serial++;
+  if (g_source_get_time (source) != gdk_frame_clock_idle_sleep_source_prepare_time)
+    gdk_frame_clock_idle_sleep_serial++;
 
   return FALSE;
 }
 
 static gboolean
-sleep_source_dispatch (GSource     *source,
-                       GSourceFunc  callback,
-                       gpointer     user_data)
+gdk_frame_clock_idle_sleep_source_dispatch (GSource     *source,
+                                            GSourceFunc  callback,
+                                            gpointer     user_data)
 {
   return TRUE;
 }
 
-static GSourceFuncs sleep_source_funcs = {
-  sleep_source_prepare,
-  sleep_source_check,
-  sleep_source_dispatch,
-  NULL /* finalize */
-};
-
 static gint64
-get_sleep_serial (void)
+gdk_frame_clock_idle_get_sleep_serial (void)
 {
-  if (sleep_source == NULL)
-    {
-      sleep_source = g_source_new (&sleep_source_funcs, sizeof (GSource));
+  static GSourceFuncs sleep_source_funcs = {
+    gdk_frame_clock_idle_sleep_source_prepare,
+    gdk_frame_clock_idle_sleep_source_check,
+    gdk_frame_clock_idle_sleep_source_dispatch,
+    NULL /* finalize */
+  };
 
-      g_source_set_static_name (sleep_source, "[gtk] sleep serial");
-      g_source_set_priority (sleep_source, G_PRIORITY_HIGH);
-      g_source_attach (sleep_source, NULL);
-      g_source_unref (sleep_source);
+  if (gdk_frame_clock_idle_sleep_source == NULL)
+    {
+      gdk_frame_clock_idle_sleep_source = g_source_new (&sleep_source_funcs, sizeof (GSource));
+
+      g_source_set_static_name (gdk_frame_clock_idle_sleep_source, "[gtk] sleep serial");
+      g_source_set_priority (gdk_frame_clock_idle_sleep_source, G_PRIORITY_HIGH);
+      g_source_attach (gdk_frame_clock_idle_sleep_source, NULL);
+      g_source_unref (gdk_frame_clock_idle_sleep_source);
     }
 
-  return sleep_serial;
+  return gdk_frame_clock_idle_sleep_serial;
 }
 
 static void
@@ -141,7 +141,7 @@ gdk_frame_clock_idle_init (GdkFrameClockIdle *frame_clock_idle)
     gdk_frame_clock_idle_get_instance_private (frame_clock_idle);
 
   priv->freeze_count = 0;
-  priv->smoothed_frame_time_period = FRAME_INTERVAL;
+  priv->smoothed_frame_time_period = GDK_FRAME_CLOCK_IDLE_FRAME_INTERVAL;
 }
 
 static void
@@ -175,11 +175,11 @@ gdk_frame_clock_idle_dispose (GObject *object)
 /* Note: This is never called on first frame, so
  * smoothed_frame_time_base != 0 and we have a valid frame_interval. */
 static gint64
-compute_smooth_frame_time (GdkFrameClock *clock,
-                           gint64 new_frame_time,
-                           gboolean new_frame_time_is_vsync_related,
-                           gint64 smoothed_frame_time_base,
-                           gint64 frame_interval)
+gdk_frame_clock_idle_compute_smooth_frame_time (GdkFrameClock *clock,
+                                                gint64         new_frame_time,
+                                                gboolean       new_frame_time_is_vsync_related,
+                                                gint64         smoothed_frame_time_base,
+                                                gint64         frame_interval)
 {
   GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (clock)->priv;
   int frames_passed;
@@ -267,9 +267,9 @@ gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock)
 
   /* Since time is monotonic this is <= what we will pick for the next cycle, but
      more likely than not it will be equal if we're doing a constant animation. */
-  new_smoothed_time = compute_smooth_frame_time (clock, now, FALSE,
-                                                 priv->smoothed_frame_time_base,
-                                                 priv->smoothed_frame_time_period);
+  new_smoothed_time = gdk_frame_clock_idle_compute_smooth_frame_time (clock, now, FALSE,
+                                                                      priv->smoothed_frame_time_base,
+                                                                      priv->smoothed_frame_time_period);
 
   priv->smoothed_frame_time_reported = new_smoothed_time;
   return new_smoothed_time;
@@ -287,7 +287,7 @@ gdk_frame_clock_idle_is_frozen (GdkFrameClockIdle *self)
 }
 
 static inline gboolean
-should_run_flush_idle (GdkFrameClockIdle *self)
+gdk_frame_clock_idle_should_run_flush_idle (GdkFrameClockIdle *self)
 {
   GdkFrameClockIdlePrivate *priv = self->priv;
 
@@ -301,7 +301,7 @@ should_run_flush_idle (GdkFrameClockIdle *self)
  * is cancelled.
  */
 static inline gboolean
-should_run_paint_idle (GdkFrameClockIdle *self)
+gdk_frame_clock_idle_should_run_paint_idle (GdkFrameClockIdle *self)
 {
   GdkFrameClockIdlePrivate *priv = self->priv;
 
@@ -311,12 +311,12 @@ should_run_paint_idle (GdkFrameClockIdle *self)
 }
 
 static void
-maybe_start_idle (GdkFrameClockIdle *self,
-                  gboolean           caused_by_thaw)
+gdk_frame_clock_idle_maybe_start_idle (GdkFrameClockIdle *self,
+                                       gboolean           caused_by_thaw)
 {
   GdkFrameClockIdlePrivate *priv = self->priv;
 
-  if (should_run_flush_idle (self) || should_run_paint_idle (self))
+  if (gdk_frame_clock_idle_should_run_flush_idle (self) || gdk_frame_clock_idle_should_run_paint_idle (self))
     {
       guint min_interval = 0;
 
@@ -328,7 +328,7 @@ maybe_start_idle (GdkFrameClockIdle *self,
           min_interval = (min_interval_us + 500) / 1000;
         }
 
-      if (priv->flush_idle_id == 0 && should_run_flush_idle (self))
+      if (priv->flush_idle_id == 0 && gdk_frame_clock_idle_should_run_flush_idle (self))
         {
           GSource *source;
 
@@ -342,7 +342,7 @@ maybe_start_idle (GdkFrameClockIdle *self,
         }
 
       if (!priv->in_paint_idle &&
-	  priv->paint_idle_id == 0 && should_run_paint_idle (self))
+	  priv->paint_idle_id == 0 && gdk_frame_clock_idle_should_run_paint_idle (self))
         {
           priv->paint_is_thaw = caused_by_thaw;
           priv->paint_idle_id = g_timeout_add_full (GDK_PRIORITY_REDRAW,
@@ -356,17 +356,17 @@ maybe_start_idle (GdkFrameClockIdle *self,
 }
 
 static void
-maybe_stop_idle (GdkFrameClockIdle *self)
+gdk_frame_clock_idle_maybe_stop_idle (GdkFrameClockIdle *self)
 {
   GdkFrameClockIdlePrivate *priv = self->priv;
 
-  if (priv->flush_idle_id != 0 && !should_run_flush_idle (self))
+  if (priv->flush_idle_id != 0 && !gdk_frame_clock_idle_should_run_flush_idle (self))
     {
       g_source_remove (priv->flush_idle_id);
       priv->flush_idle_id = 0;
     }
 
-  if (priv->paint_idle_id != 0 && !should_run_paint_idle (self))
+  if (priv->paint_idle_id != 0 && !gdk_frame_clock_idle_should_run_paint_idle (self))
     {
       g_source_remove (priv->paint_idle_id);
       priv->paint_idle_id = 0;
@@ -456,7 +456,7 @@ gdk_frame_clock_paint_idle (void *data)
         case GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT:
           if (!gdk_frame_clock_idle_is_frozen (clock_idle))
             {
-              gint64 frame_interval = FRAME_INTERVAL;
+              gint64 frame_interval = GDK_FRAME_CLOCK_IDLE_FRAME_INTERVAL;
               GdkFrameTimings *prev_timings = gdk_frame_clock_get_current_timings (clock);
 
               if (prev_timings && prev_timings->refresh_interval)
@@ -512,14 +512,14 @@ gdk_frame_clock_paint_idle (void *data)
                * adjusted times    |       *   |       *   |       +   |       +   |       +   |...
                * phase                                      ^------^
                */
-              if (priv->smooth_phase_state == SMOOTH_PHASE_STATE_AWAIT_FIRST)
+              if (priv->smooth_phase_state == GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_AWAIT_FIRST)
                 {
                   /* First animation cycle - usually unrelated to vsync */
                   priv->smoothed_frame_time_base = 0;
                   priv->smoothed_frame_time_phase = 0;
-                  priv->smooth_phase_state = SMOOTH_PHASE_STATE_AWAIT_DRAWN;
+                  priv->smooth_phase_state = GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_AWAIT_DRAWN;
                 }
-              else if (priv->smooth_phase_state == SMOOTH_PHASE_STATE_AWAIT_DRAWN &&
+              else if (priv->smooth_phase_state == GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_AWAIT_DRAWN &&
                        priv->paint_is_thaw)
                 {
                   /* First vsync-related animation cycle, we can now compute the phase. We want the phase to satisfy
@@ -527,7 +527,7 @@ gdk_frame_clock_paint_idle (void *data)
                   priv->smoothed_frame_time_phase =
                       positive_modulo (priv->smoothed_frame_time_base - priv->frame_time,
                                        frame_interval);
-                  priv->smooth_phase_state = SMOOTH_PHASE_STATE_VALID;
+                  priv->smooth_phase_state = GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_VALID;
                 }
 
               if (priv->smoothed_frame_time_base == 0)
@@ -539,10 +539,10 @@ gdk_frame_clock_paint_idle (void *data)
                 {
                   /* compute_smooth_frame_time() ensures monotonicity */
                   priv->smoothed_frame_time_base =
-                      compute_smooth_frame_time (clock, priv->frame_time + priv->smoothed_frame_time_phase,
-                                                 priv->paint_is_thaw,
-                                                 priv->smoothed_frame_time_base,
-                                                 priv->smoothed_frame_time_period);
+                      gdk_frame_clock_idle_compute_smooth_frame_time (clock, priv->frame_time + priv->smoothed_frame_time_phase,
+                                                                      priv->paint_is_thaw,
+                                                                      priv->smoothed_frame_time_base,
+                                                                      priv->smoothed_frame_time_period);
                 }
 
               priv->smoothed_frame_time_period = frame_interval;
@@ -554,7 +554,7 @@ gdk_frame_clock_paint_idle (void *data)
 
               timings->frame_time = priv->frame_time;
               timings->smoothed_frame_time = priv->smoothed_frame_time_base;
-              timings->slept_before = priv->sleep_serial != get_sleep_serial ();
+              timings->slept_before = priv->sleep_serial != gdk_frame_clock_idle_get_sleep_serial ();
 
               priv->phase = GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT;
 
@@ -688,11 +688,11 @@ gdk_frame_clock_paint_idle (void *data)
       gint64 smooth_cycle_start = priv->smoothed_frame_time_base - priv->smoothed_frame_time_phase;
       priv->min_next_frame_time = smooth_cycle_start + priv->smoothed_frame_time_period;
 
-      maybe_start_idle (clock_idle, FALSE);
+      gdk_frame_clock_idle_maybe_start_idle (clock_idle, FALSE);
     }
 
   if (!gdk_frame_clock_idle_is_frozen (clock_idle))
-    priv->sleep_serial = get_sleep_serial ();
+    priv->sleep_serial = gdk_frame_clock_idle_get_sleep_serial ();
 
   gdk_profiler_end_mark (before, "Frameclock cycle", NULL);
 
@@ -707,7 +707,7 @@ gdk_frame_clock_idle_request_phase (GdkFrameClock      *clock,
   GdkFrameClockIdlePrivate *priv = clock_idle->priv;
 
   priv->requested |= phase;
-  maybe_start_idle (clock_idle, FALSE);
+  gdk_frame_clock_idle_maybe_start_idle (clock_idle, FALSE);
 }
 
 static void
@@ -727,11 +727,11 @@ gdk_frame_clock_idle_begin_updating (GdkFrameClock *clock)
 
   if (priv->updating_count == 0)
     {
-      priv->smooth_phase_state = SMOOTH_PHASE_STATE_AWAIT_FIRST;
+      priv->smooth_phase_state = GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_AWAIT_FIRST;
     }
 
   priv->updating_count++;
-  maybe_start_idle (clock_idle, FALSE);
+  gdk_frame_clock_idle_maybe_start_idle (clock_idle, FALSE);
 }
 
 static void
@@ -743,11 +743,11 @@ gdk_frame_clock_idle_end_updating (GdkFrameClock *clock)
   g_return_if_fail (priv->updating_count > 0);
 
   priv->updating_count--;
-  maybe_stop_idle (clock_idle);
+  gdk_frame_clock_idle_maybe_stop_idle (clock_idle);
 
   if (priv->updating_count == 0)
     {
-      priv->smooth_phase_state = SMOOTH_PHASE_STATE_VALID;
+      priv->smooth_phase_state = GDK_FRAME_CLOCK_IDLE_SMOOTH_PHASE_STATE_VALID;
     }
 
 #ifdef G_OS_WIN32
@@ -772,7 +772,7 @@ gdk_frame_clock_idle_freeze (GdkFrameClock *clock)
     }
 
   priv->freeze_count++;
-  maybe_stop_idle (clock_idle);
+  gdk_frame_clock_idle_maybe_stop_idle (clock_idle);
 }
 
 static void
@@ -786,7 +786,7 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
   priv->freeze_count--;
   if (!gdk_frame_clock_idle_is_frozen (clock_idle))
     {
-      maybe_start_idle (clock_idle, TRUE);
+      gdk_frame_clock_idle_maybe_start_idle (clock_idle, TRUE);
       /* If nothing is requested so we didn't start an idle, we need
        * to skip to the end of the state chain, since the idle won't
        * run and do it for us.
@@ -794,7 +794,7 @@ gdk_frame_clock_idle_thaw (GdkFrameClock *clock)
       if (priv->paint_idle_id == 0)
         priv->phase = GDK_FRAME_CLOCK_PHASE_NONE;
 
-      priv->sleep_serial = get_sleep_serial ();
+      priv->sleep_serial = gdk_frame_clock_idle_get_sleep_serial ();
 
       if (GDK_PROFILER_IS_RUNNING)
         {

gdk/gdkglcontext.c

@@ -142,16 +142,16 @@ struct _GdkGLContextPrivate
 };
 
 enum {
-  PROP_0,
+  GDK_GL_CONTEXT_PROP_0,
 
-  PROP_ALLOWED_APIS,
-  PROP_API,
-  PROP_SHARED_CONTEXT,
+  GDK_GL_CONTEXT_PROP_ALLOWED_APIS,
+  GDK_GL_CONTEXT_PROP_API,
+  GDK_GL_CONTEXT_PROP_SHARED_CONTEXT,
 
-  LAST_PROP
+  GDK_GL_CONTEXT_LAST_PROP
 };
 
-static GParamSpec *properties[LAST_PROP] = { NULL, };
+static GParamSpec *gdk_gl_context_properties[GDK_GL_CONTEXT_LAST_PROP] = { NULL, };
 
 /**
  * gdk_gl_error_quark:
@@ -237,11 +237,11 @@ gdk_gl_context_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_ALLOWED_APIS:
+    case GDK_GL_CONTEXT_PROP_ALLOWED_APIS:
       gdk_gl_context_set_allowed_apis (self, g_value_get_flags (value));
       break;
 
-    case PROP_SHARED_CONTEXT:
+    case GDK_GL_CONTEXT_PROP_SHARED_CONTEXT:
       g_assert (g_value_get_object (value) == NULL);
       break;
 
@@ -261,15 +261,15 @@ gdk_gl_context_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_ALLOWED_APIS:
+    case GDK_GL_CONTEXT_PROP_ALLOWED_APIS:
       g_value_set_flags (value, priv->allowed_apis);
       break;
 
-    case PROP_API:
+    case GDK_GL_CONTEXT_PROP_API:
       g_value_set_flags (value, priv->api);
       break;
 
-    case PROP_SHARED_CONTEXT:
+    case GDK_GL_CONTEXT_PROP_SHARED_CONTEXT:
       g_value_set_object (value, NULL);
       break;
 
@@ -774,7 +774,7 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
    * Deprecated: 4.4: Use [method@Gdk.GLContext.is_shared] to check if contexts
    *   can be shared.
    */
-  properties[PROP_SHARED_CONTEXT] =
+  gdk_gl_context_properties[GDK_GL_CONTEXT_PROP_SHARED_CONTEXT] =
     g_param_spec_object ("shared-context", NULL, NULL,
                          GDK_TYPE_GL_CONTEXT,
                          G_PARAM_READWRITE |
@@ -789,7 +789,7 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
    *
    * Since: 4.6
    */
-  properties[PROP_ALLOWED_APIS] =
+  gdk_gl_context_properties[GDK_GL_CONTEXT_PROP_ALLOWED_APIS] =
     g_param_spec_flags ("allowed-apis", NULL, NULL,
                         GDK_TYPE_GL_API,
                         DEFAULT_ALLOWED_APIS,
@@ -804,7 +804,7 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
    *
    * Since: 4.6
    */
-  properties[PROP_API] =
+  gdk_gl_context_properties[GDK_GL_CONTEXT_PROP_API] =
     g_param_spec_flags ("api", NULL, NULL,
                         GDK_TYPE_GL_API,
                         0,
@@ -816,7 +816,7 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
   gobject_class->get_property = gdk_gl_context_get_property;
   gobject_class->dispose = gdk_gl_context_dispose;
 
-  g_object_class_install_properties (gobject_class, LAST_PROP, properties);
+  g_object_class_install_properties (gobject_class, GDK_GL_CONTEXT_LAST_PROP, gdk_gl_context_properties);
 }
 
 static void
@@ -1277,7 +1277,7 @@ gdk_gl_context_set_allowed_apis (GdkGLContext *self,
 
   priv->allowed_apis = apis;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ALLOWED_APIS]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_context_properties[GDK_GL_CONTEXT_PROP_ALLOWED_APIS]);
 }
 
 /**
@@ -1559,7 +1559,7 @@ gdk_gl_context_realize (GdkGLContext  *context,
     {
       g_assert (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (0, 0)));
 
-      g_object_notify_by_pspec (G_OBJECT (context), properties[PROP_API]);
+      g_object_notify_by_pspec (G_OBJECT (context), gdk_gl_context_properties[GDK_GL_CONTEXT_PROP_API]);
     }
 
   return priv->api;

gdk/gdkgltexture.c

@@ -132,9 +132,9 @@ gdk_gl_texture_run (GdkGLTexture *self,
   while (g_atomic_int_get (&invoke.spinlock) == 0);
 }
 
-typedef struct _Download Download;
+typedef struct _GdkGLTextureDownload GdkGLTextureDownload;
 
-struct _Download
+struct _GdkGLTextureDownload
 {
   GdkMemoryFormat format;
   GdkColorState *color_state;
@@ -189,7 +189,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
   GdkTexture *texture = GDK_TEXTURE (self);
   GdkMemoryFormat format;
   gsize expected_stride;
-  Download *download = download_;
+  GdkGLTextureDownload *download = download_;
   GLint gl_internal_format, gl_internal_srgb_format;
   GLenum gl_format, gl_type;
   GLint gl_swizzle[4];
@@ -420,7 +420,7 @@ gdk_gl_texture_download (GdkTexture      *texture,
                          gsize            stride)
 {
   GdkGLTexture *self = GDK_GL_TEXTURE (texture);
-  Download download;
+  GdkGLTextureDownload download;
 
   if (self->saved)
     {

gdk/gdkgltexturebuilder.c

@@ -70,24 +70,24 @@ struct _GdkGLTextureBuilderClass
 
 enum
 {
-  PROP_0,
-  PROP_CONTEXT,
-  PROP_FORMAT,
-  PROP_HAS_MIPMAP,
-  PROP_HEIGHT,
-  PROP_ID,
-  PROP_SYNC,
-  PROP_COLOR_STATE,
-  PROP_UPDATE_REGION,
-  PROP_UPDATE_TEXTURE,
-  PROP_WIDTH,
+  GDK_GL_TEXTURE_BUILDER_PROP_0,
+  GDK_GL_TEXTURE_BUILDER_PROP_CONTEXT,
+  GDK_GL_TEXTURE_BUILDER_PROP_FORMAT,
+  GDK_GL_TEXTURE_BUILDER_PROP_HAS_MIPMAP,
+  GDK_GL_TEXTURE_BUILDER_PROP_HEIGHT,
+  GDK_GL_TEXTURE_BUILDER_PROP_ID,
+  GDK_GL_TEXTURE_BUILDER_PROP_SYNC,
+  GDK_GL_TEXTURE_BUILDER_PROP_COLOR_STATE,
+  GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_REGION,
+  GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE,
+  GDK_GL_TEXTURE_BUILDER_PROP_WIDTH,
 
-  N_PROPS
+  GDK_GL_TEXTURE_BUILDER_N_PROPS
 };
 
 G_DEFINE_TYPE (GdkGLTextureBuilder, gdk_gl_texture_builder, G_TYPE_OBJECT)
 
-static GParamSpec *properties[N_PROPS] = { NULL, };
+static GParamSpec *gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_N_PROPS] = { NULL, };
 
 static void
 gdk_gl_texture_builder_dispose (GObject *object)
@@ -113,43 +113,43 @@ gdk_gl_texture_builder_get_property (GObject    *object,
 
   switch (property_id)
     {
-    case PROP_CONTEXT:
+    case GDK_GL_TEXTURE_BUILDER_PROP_CONTEXT:
       g_value_set_object (value, self->context);
       break;
 
-    case PROP_FORMAT:
+    case GDK_GL_TEXTURE_BUILDER_PROP_FORMAT:
       g_value_set_enum (value, self->format);
       break;
 
-    case PROP_HAS_MIPMAP:
+    case GDK_GL_TEXTURE_BUILDER_PROP_HAS_MIPMAP:
       g_value_set_boolean (value, self->has_mipmap);
       break;
 
-    case PROP_HEIGHT:
+    case GDK_GL_TEXTURE_BUILDER_PROP_HEIGHT:
       g_value_set_int (value, self->height);
       break;
 
-    case PROP_ID:
+    case GDK_GL_TEXTURE_BUILDER_PROP_ID:
       g_value_set_uint (value, self->id);
       break;
 
-    case PROP_SYNC:
+    case GDK_GL_TEXTURE_BUILDER_PROP_SYNC:
       g_value_set_pointer (value, self->sync);
       break;
 
-    case PROP_COLOR_STATE:
+    case GDK_GL_TEXTURE_BUILDER_PROP_COLOR_STATE:
       g_value_set_boxed (value, self->color_state);
       break;
 
-    case PROP_UPDATE_REGION:
+    case GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_REGION:
       g_value_set_boxed (value, self->update_region);
       break;
 
-    case PROP_UPDATE_TEXTURE:
+    case GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE:
       g_value_set_object (value, self->update_texture);
       break;
 
-    case PROP_WIDTH:
+    case GDK_GL_TEXTURE_BUILDER_PROP_WIDTH:
       g_value_set_int (value, self->width);
       break;
 
@@ -169,43 +169,43 @@ gdk_gl_texture_builder_set_property (GObject      *object,
 
   switch (property_id)
     {
-    case PROP_CONTEXT:
+    case GDK_GL_TEXTURE_BUILDER_PROP_CONTEXT:
       gdk_gl_texture_builder_set_context (self, g_value_get_object (value));
       break;
 
-    case PROP_FORMAT:
+    case GDK_GL_TEXTURE_BUILDER_PROP_FORMAT:
       gdk_gl_texture_builder_set_format (self, g_value_get_enum (value));
       break;
 
-    case PROP_HAS_MIPMAP:
+    case GDK_GL_TEXTURE_BUILDER_PROP_HAS_MIPMAP:
       gdk_gl_texture_builder_set_has_mipmap (self, g_value_get_boolean (value));
       break;
 
-    case PROP_HEIGHT:
+    case GDK_GL_TEXTURE_BUILDER_PROP_HEIGHT:
       gdk_gl_texture_builder_set_height (self, g_value_get_int (value));
       break;
 
-    case PROP_ID:
+    case GDK_GL_TEXTURE_BUILDER_PROP_ID:
       gdk_gl_texture_builder_set_id (self, g_value_get_uint (value));
       break;
 
-    case PROP_SYNC:
+    case GDK_GL_TEXTURE_BUILDER_PROP_SYNC:
       gdk_gl_texture_builder_set_sync (self, g_value_get_pointer (value));
       break;
 
-    case PROP_COLOR_STATE:
+    case GDK_GL_TEXTURE_BUILDER_PROP_COLOR_STATE:
       gdk_gl_texture_builder_set_color_state (self, g_value_get_boxed (value));
       break;
 
-    case PROP_UPDATE_REGION:
+    case GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_REGION:
       gdk_gl_texture_builder_set_update_region (self, g_value_get_boxed (value));
       break;
 
-    case PROP_UPDATE_TEXTURE:
+    case GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE:
       gdk_gl_texture_builder_set_update_texture (self, g_value_get_object (value));
       break;
 
-    case PROP_WIDTH:
+    case GDK_GL_TEXTURE_BUILDER_PROP_WIDTH:
       gdk_gl_texture_builder_set_width (self, g_value_get_int (value));
       break;
 
@@ -231,7 +231,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_CONTEXT] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_CONTEXT] =
     g_param_spec_object ("context", NULL, NULL,
                          GDK_TYPE_GL_CONTEXT,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -243,7 +243,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_FORMAT] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_FORMAT] =
     g_param_spec_enum ("format", NULL, NULL,
                        GDK_TYPE_MEMORY_FORMAT,
                        GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
@@ -256,7 +256,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_HAS_MIPMAP] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_HAS_MIPMAP] =
     g_param_spec_boolean ("has-mipmap", NULL, NULL,
                           FALSE,
                           G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -268,7 +268,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_HEIGHT] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_HEIGHT] =
     g_param_spec_int ("height", NULL, NULL,
                       G_MININT, G_MAXINT, 0,
                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -280,7 +280,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_ID] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_ID] =
     g_param_spec_uint ("id", NULL, NULL,
                        0, G_MAXUINT, 0,
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -294,7 +294,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_SYNC] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_SYNC] =
     g_param_spec_pointer ("sync", NULL, NULL,
                           G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
@@ -305,7 +305,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_COLOR_STATE] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_COLOR_STATE] =
     g_param_spec_boxed ("color-state", NULL, NULL,
                         GDK_TYPE_COLOR_STATE,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -317,7 +317,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_UPDATE_REGION] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_REGION] =
     g_param_spec_boxed ("update-region", NULL, NULL,
                         CAIRO_GOBJECT_TYPE_REGION,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -329,7 +329,7 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_UPDATE_TEXTURE] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE] =
     g_param_spec_object ("update-texture", NULL, NULL,
                          GDK_TYPE_TEXTURE,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -341,12 +341,12 @@ gdk_gl_texture_builder_class_init (GdkGLTextureBuilderClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_WIDTH] =
+  gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_WIDTH] =
     g_param_spec_int ("width", NULL, NULL,
                       G_MININT, G_MAXINT, 0,
                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+  g_object_class_install_properties (gobject_class, GDK_GL_TEXTURE_BUILDER_N_PROPS, gdk_gl_texture_builder_properties);
 }
 
 static void
@@ -412,7 +412,7 @@ gdk_gl_texture_builder_set_context (GdkGLTextureBuilder *self,
   if (!g_set_object (&self->context, context))
     return;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CONTEXT]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_CONTEXT]);
 }
 
 /**
@@ -456,7 +456,7 @@ gdk_gl_texture_builder_set_height (GdkGLTextureBuilder *self,
 
   self->height = height;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_HEIGHT]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_HEIGHT]);
 }
 
 /**
@@ -502,7 +502,7 @@ gdk_gl_texture_builder_set_id (GdkGLTextureBuilder *self,
 
   self->id = id;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ID]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_ID]);
 }
 
 /**
@@ -546,7 +546,7 @@ gdk_gl_texture_builder_set_width (GdkGLTextureBuilder *self,
 
   self->width = width;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_WIDTH]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_WIDTH]);
 }
 
 /**
@@ -590,7 +590,7 @@ gdk_gl_texture_builder_set_has_mipmap (GdkGLTextureBuilder *self,
 
   self->has_mipmap = has_mipmap;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_HAS_MIPMAP]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_HAS_MIPMAP]);
 }
 
 /**
@@ -638,7 +638,7 @@ gdk_gl_texture_builder_set_sync (GdkGLTextureBuilder *self,
 
   self->sync = sync;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SYNC]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_SYNC]);
 }
 
 /**
@@ -683,7 +683,7 @@ gdk_gl_texture_builder_set_color_state (GdkGLTextureBuilder *self,
 
   g_clear_pointer (&self->color_state, gdk_color_state_unref);
   self->color_state = gdk_color_state_ref (color_state);
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_COLOR_STATE]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_COLOR_STATE]);
 }
 
 /**
@@ -739,7 +739,7 @@ gdk_gl_texture_builder_set_format (GdkGLTextureBuilder *self,
 
   self->format = format;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_FORMAT]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_FORMAT]);
 }
 
 /**
@@ -781,7 +781,7 @@ gdk_gl_texture_builder_set_update_texture (GdkGLTextureBuilder *self,
   if (!g_set_object (&self->update_texture, texture))
     return;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UPDATE_TEXTURE]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE]);
 }
 
 /**
@@ -835,7 +835,7 @@ gdk_gl_texture_builder_set_update_region (GdkGLTextureBuilder *self,
   if (region)
     self->update_region = cairo_region_reference (region);
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UPDATE_REGION]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_gl_texture_builder_properties[GDK_GL_TEXTURE_BUILDER_PROP_UPDATE_REGION]);
 }
 
 /**

gdk/gdkkeys.c

@@ -35,20 +35,20 @@
 #include <string.h>
 
 enum {
-  PROP_0,
-  PROP_DISPLAY,
-  LAST_PROP
+  GDK_KEYS_PROP_0,
+  GDK_KEYS_PROP_DISPLAY,
+  GDK_KEYS_LAST_PROP
 };
 
 enum {
-  DIRECTION_CHANGED,
-  KEYS_CHANGED,
-  STATE_CHANGED,
-  LAST_SIGNAL
+  GDK_KEYS_DIRECTION_CHANGED,
+  GDK_KEYS_KEYS_CHANGED,
+  GDK_KEYS_STATE_CHANGED,
+  GDK_KEYS_LAST_SIGNAL
 };
 
-static GParamSpec *props[LAST_PROP] = { NULL, };
-static guint signals[LAST_SIGNAL] = { 0 };
+static GParamSpec *gdk_keys_properties[GDK_KEYS_LAST_PROP] = { NULL, };
+static guint gdk_keys_signals[GDK_KEYS_LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (GdkKeymap, gdk_keymap, G_TYPE_OBJECT)
 
@@ -62,7 +62,7 @@ gdk_keymap_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_KEYS_PROP_DISPLAY:
       g_value_set_object (value, keymap->display);
       break;
     default:
@@ -80,7 +80,7 @@ gdk_keymap_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_KEYS_PROP_DISPLAY:
       keymap->display = g_value_get_object (value);
       break;
 
@@ -127,12 +127,12 @@ gdk_keymap_class_init (GdkKeymapClass *klass)
 
   klass->keys_changed = gdk_keymap_keys_changed;
 
-  props[PROP_DISPLAY] =
+  gdk_keys_properties[GDK_KEYS_PROP_DISPLAY] =
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (object_class, LAST_PROP, props);
+  g_object_class_install_properties (object_class, GDK_KEYS_LAST_PROP, gdk_keys_properties);
 
   /**
    * GdkKeymap::direction-changed:
@@ -142,7 +142,7 @@ gdk_keymap_class_init (GdkKeymapClass *klass)
    *
    * See gdk_keymap_get_direction().
    */
-  signals[DIRECTION_CHANGED] =
+  gdk_keys_signals[GDK_KEYS_DIRECTION_CHANGED] =
     g_signal_new (g_intern_static_string ("direction-changed"),
 		  G_OBJECT_CLASS_TYPE (object_class),
 		  G_SIGNAL_RUN_LAST,
@@ -159,7 +159,7 @@ gdk_keymap_class_init (GdkKeymapClass *klass)
    * The ::keys-changed signal is emitted when the mapping represented by
    * @keymap changes.
    */
-  signals[KEYS_CHANGED] =
+  gdk_keys_signals[GDK_KEYS_KEYS_CHANGED] =
     g_signal_new (g_intern_static_string ("keys-changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_FIRST,
@@ -177,7 +177,7 @@ gdk_keymap_class_init (GdkKeymapClass *klass)
    * keyboard changes, e.g when Caps Lock is turned on or off.
    * See gdk_keymap_get_caps_lock_state().
    */
-  signals[STATE_CHANGED] =
+  gdk_keys_signals[GDK_KEYS_STATE_CHANGED] =
     g_signal_new (g_intern_static_string ("state-changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,

gdk/gdkmemoryformat.c

@@ -32,13 +32,13 @@
 #include <epoxy/gl.h>
 
 /* Don't report quick (< 0.5 msec) runs */
-#define MIN_MARK_DURATION 500000
+#define GDK_MEMORY_FORMAT_MIN_MARK_DURATION 500000
 
-#define ADD_MARK(before,name,fmt,...) \
+#define GDK_MEMORY_FORMAT_ADD_MARK(before,name,fmt,...) \
   if (GDK_PROFILER_IS_RUNNING) \
     { \
       gint64 duration = GDK_PROFILER_CURRENT_TIME - before; \
-      if (duration > MIN_MARK_DURATION) \
+      if (duration > GDK_MEMORY_FORMAT_MIN_MARK_DURATION) \
         gdk_profiler_add_markf (before, duration, name, fmt, __VA_ARGS__); \
     }
 
@@ -48,9 +48,9 @@ typedef struct _GdkMemoryFormatDescription GdkMemoryFormatDescription;
 
 #define TYPED_FUNCS(name, T, R, G, B, A, bpp, scale) \
 static void \
-name ## _to_float (float        (*dest)[4], \
-                   const guchar  *src_data, \
-                   gsize          n) \
+gdk_convert_ ## name ## _to_float (float        (*dest)[4], \
+                                   const guchar  *src_data, \
+                                   gsize          n) \
 { \
   for (gsize i = 0; i < n; i++) \
     { \
@@ -63,9 +63,9 @@ name ## _to_float (float        (*dest)[4], \
 } \
 \
 static void \
-name ## _from_float (guchar       *dest_data, \
-                     const float (*src)[4], \
-                     gsize         n) \
+gdk_convert_ ## name ## _from_float (guchar       *dest_data, \
+                                     const float (*src)[4], \
+                                     gsize         n) \
 { \
   for (gsize i = 0; i < n; i++) \
     { \
@@ -79,9 +79,9 @@ name ## _from_float (guchar       *dest_data, \
 
 #define TYPED_GRAY_FUNCS(name, T, G, A, bpp, scale) \
 static void \
-name ## _to_float (float        (*dest)[4], \
-                   const guchar  *src_data, \
-                   gsize          n) \
+gdk_convert_ ## name ## _to_float (float        (*dest)[4], \
+                                   const guchar  *src_data, \
+                                   gsize          n) \
 { \
   for (gsize i = 0; i < n; i++) \
     { \
@@ -93,9 +93,9 @@ name ## _to_float (float        (*dest)[4], \
 } \
 \
 static void \
-name ## _from_float (guchar       *dest_data, \
-                     const float (*src)[4], \
-                     gsize         n) \
+gdk_convert_ ## name ## _from_float (guchar       *dest_data, \
+                                     const float (*src)[4], \
+                                     gsize         n) \
 { \
   for (gsize i = 0; i < n; i++) \
     { \
@@ -134,9 +134,9 @@ TYPED_GRAY_FUNCS (g16, guint16, 0, -1, 2, 65535)
 TYPED_GRAY_FUNCS (a16, guint16, -1, 0, 2, 65535)
 
 static void
-r16g16b16_float_to_float (float        (*dest)[4],
-                          const guchar  *src_data,
-                          gsize          n)
+gdk_convert_r16g16b16_float_to_float (float        (*dest)[4],
+                                      const guchar  *src_data,
+                                      gsize          n)
 {
   guint16 *src = (guint16 *) src_data;
   for (gsize i = 0; i < n; i++)
@@ -148,9 +148,9 @@ r16g16b16_float_to_float (float        (*dest)[4],
 }
 
 static void
-r16g16b16_float_from_float (guchar       *dest_data,
-                            const float (*src)[4],
-                            gsize         n)
+gdk_convert_r16g16b16_float_from_float (guchar       *dest_data,
+                                        const float (*src)[4],
+                                        gsize         n)
 {
   guint16 *dest = (guint16 *) dest_data;
   for (gsize i = 0; i < n; i++)
@@ -161,25 +161,25 @@ r16g16b16_float_from_float (guchar       *dest_data,
 }
 
 static void
-r16g16b16a16_float_to_float (float        (*dest)[4],
-                             const guchar  *src,
-                             gsize          n)
+gdk_convert_r16g16b16a16_float_to_float (float        (*dest)[4],
+                                         const guchar  *src,
+                                         gsize          n)
 {
   half_to_float ((const guint16 *) src, (float *) dest, 4 * n);
 }
 
 static void
-r16g16b16a16_float_from_float (guchar       *dest,
-                               const float (*src)[4],
-                               gsize         n)
+gdk_convert_r16g16b16a16_float_from_float (guchar       *dest,
+                                           const float (*src)[4],
+                                           gsize         n)
 {
   float_to_half ((const float *) src, (guint16 *) dest, 4 * n);
 }
 
 static void
-a16_float_to_float (float        (*dest)[4],
-                    const guchar  *src_data,
-                    gsize          n)
+gdk_convert_a16_float_to_float (float        (*dest)[4],
+                                const guchar  *src_data,
+                                gsize          n)
 {
   const guint16 *src = (const guint16 *) src_data;
   for (gsize i = 0; i < n; i++)
@@ -193,9 +193,9 @@ a16_float_to_float (float        (*dest)[4],
 }
 
 static void
-a16_float_from_float (guchar       *dest_data,
-                      const float (*src)[4],
-                      gsize         n)
+gdk_convert_a16_float_from_float (guchar       *dest_data,
+                                  const float (*src)[4],
+                                  gsize         n)
 {
   guint16 *dest = (guint16 *) dest_data;
   for (gsize i = 0; i < n; i++)
@@ -206,9 +206,9 @@ a16_float_from_float (guchar       *dest_data,
 }
 
 static void
-r32g32b32_float_to_float (float        (*dest)[4],
-                          const guchar  *src_data,
-                          gsize          n)
+gdk_convert_r32g32b32_float_to_float (float        (*dest)[4],
+                                      const guchar  *src_data,
+                                      gsize          n)
 {
   const float (*src)[3] = (const float (*)[3]) src_data;
   for (gsize i = 0; i < n; i++)
@@ -221,9 +221,9 @@ r32g32b32_float_to_float (float        (*dest)[4],
 }
 
 static void
-r32g32b32_float_from_float (guchar       *dest_data,
-                            const float (*src)[4],
-                            gsize         n)
+gdk_convert_r32g32b32_float_from_float (guchar       *dest_data,
+                                        const float (*src)[4],
+                                        gsize         n)
 {
   float (*dest)[3] = (float (*)[3]) dest_data;
   for (gsize i = 0; i < n; i++)
@@ -235,25 +235,25 @@ r32g32b32_float_from_float (guchar       *dest_data,
 }
 
 static void
-r32g32b32a32_float_to_float (float        (*dest)[4],
-                             const guchar  *src,
-                             gsize          n)
+gdk_convert_r32g32b32a32_float_to_float (float        (*dest)[4],
+                                         const guchar  *src,
+                                         gsize          n)
 {
   memcpy (dest, src, sizeof (float) * n * 4);
 }
 
 static void
-r32g32b32a32_float_from_float (guchar       *dest,
-                               const float (*src)[4],
-                               gsize         n)
+gdk_convert_r32g32b32a32_float_from_float (guchar       *dest,
+                                           const float (*src)[4],
+                                           gsize         n)
 {
   memcpy (dest, src, sizeof (float) * n * 4);
 }
 
 static void
-a32_float_to_float (float        (*dest)[4],
-                    const guchar  *src_data,
-                    gsize          n)
+gdk_convert_a32_float_to_float (float        (*dest)[4],
+                                const guchar  *src_data,
+                                gsize          n)
 {
   const float *src = (const float *) src_data;
   for (gsize i = 0; i < n; i++)
@@ -266,9 +266,9 @@ a32_float_to_float (float        (*dest)[4],
 }
 
 static void
-a32_float_from_float (guchar       *dest_data,
-                      const float (*src)[4],
-                      gsize         n)
+gdk_convert_a32_float_from_float (guchar       *dest_data,
+                                  const float (*src)[4],
+                                  gsize         n)
 {
   float *dest = (float *) dest_data;
   for (gsize i = 0; i < n; i++)
@@ -279,9 +279,9 @@ a32_float_from_float (guchar       *dest_data,
 
 #define PREMULTIPLY_FUNC(name, R1, G1, B1, A1, R2, G2, B2, A2) \
 static void \
-name (guchar *dest, \
-      const guchar *src, \
-      gsize n) \
+gdk_convert_ ## name (guchar *dest, \
+                      const guchar *src, \
+                      gsize n) \
 { \
   for (; n > 0; n--) \
     { \
@@ -305,9 +305,9 @@ PREMULTIPLY_FUNC(r8g8b8a8_to_a8b8g8r8_premultiplied, 0, 1, 2, 3, 3, 2, 1, 0)
 
 #define ADD_ALPHA_FUNC(name, R1, G1, B1, R2, G2, B2, A2) \
 static void \
-name (guchar *dest, \
-      const guchar *src, \
-      gsize n) \
+gdk_convert_ ## name (guchar *dest, \
+                      const guchar *src, \
+                      gsize n) \
 { \
   for (; n > 0; n--) \
     { \
@@ -481,8 +481,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_ARGB8888,
 #endif
-    .to_float = b8g8r8a8_premultiplied_to_float,
-    .from_float = b8g8r8a8_premultiplied_from_float,
+    .to_float = gdk_convert_b8g8r8a8_premultiplied_to_float,
+    .from_float = gdk_convert_b8g8r8a8_premultiplied_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -514,8 +514,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_BGRA8888,
 #endif
-    .to_float = a8r8g8b8_premultiplied_to_float,
-    .from_float = a8r8g8b8_premultiplied_from_float,
+    .to_float = gdk_convert_a8r8g8b8_premultiplied_to_float,
+    .from_float = gdk_convert_a8r8g8b8_premultiplied_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -546,8 +546,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_ABGR8888,
 #endif
-    .to_float = r8g8b8a8_premultiplied_to_float,
-    .from_float = r8g8b8a8_premultiplied_from_float,
+    .to_float = gdk_convert_r8g8b8a8_premultiplied_to_float,
+    .from_float = gdk_convert_r8g8b8a8_premultiplied_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -579,8 +579,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_RGBA8888,
 #endif
-    .to_float = a8b8g8r8_premultiplied_to_float,
-    .from_float = a8b8g8r8_premultiplied_from_float,
+    .to_float = gdk_convert_a8b8g8r8_premultiplied_to_float,
+    .from_float = gdk_convert_a8b8g8r8_premultiplied_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -612,8 +612,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_ARGB8888,
 #endif
-    .to_float = b8g8r8a8_to_float,
-    .from_float = b8g8r8a8_from_float,
+    .to_float = gdk_convert_b8g8r8a8_to_float,
+    .from_float = gdk_convert_b8g8r8a8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -645,8 +645,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_BGRA8888,
 #endif
-    .to_float = a8r8g8b8_to_float,
-    .from_float = a8r8g8b8_from_float,
+    .to_float = gdk_convert_a8r8g8b8_to_float,
+    .from_float = gdk_convert_a8r8g8b8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -677,8 +677,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_ABGR8888,
 #endif
-    .to_float = r8g8b8a8_to_float,
-    .from_float = r8g8b8a8_from_float,
+    .to_float = gdk_convert_r8g8b8a8_to_float,
+    .from_float = gdk_convert_r8g8b8a8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -710,8 +710,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_RGBA8888,
 #endif
-    .to_float = a8b8g8r8_to_float,
-    .from_float = a8b8g8r8_from_float,
+    .to_float = gdk_convert_a8b8g8r8_to_float,
+    .from_float = gdk_convert_a8b8g8r8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -744,8 +744,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_XRGB8888,
 #endif
-    .to_float = b8g8r8x8_to_float,
-    .from_float = b8g8r8x8_from_float,
+    .to_float = gdk_convert_b8g8r8x8_to_float,
+    .from_float = gdk_convert_b8g8r8x8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -778,8 +778,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_BGRX8888,
 #endif
-    .to_float = x8r8g8b8_to_float,
-    .from_float = x8r8g8b8_from_float,
+    .to_float = gdk_convert_x8r8g8b8_to_float,
+    .from_float = gdk_convert_x8r8g8b8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -811,8 +811,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_XBGR8888,
 #endif
-    .to_float = r8g8b8x8_to_float,
-    .from_float = r8g8b8x8_from_float,
+    .to_float = gdk_convert_r8g8b8x8_to_float,
+    .from_float = gdk_convert_r8g8b8x8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -845,8 +845,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_RGBX8888,
 #endif
-    .to_float = x8b8g8r8_to_float,
-    .from_float = x8b8g8r8_from_float,
+    .to_float = gdk_convert_x8b8g8r8_to_float,
+    .from_float = gdk_convert_x8b8g8r8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_4_nearest,
     .mipmap_linear = gdk_mipmap_guint8_4_linear,
   },
@@ -878,8 +878,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_BGR888,
 #endif
-    .to_float = r8g8b8_to_float,
-    .from_float = r8g8b8_from_float,
+    .to_float = gdk_convert_r8g8b8_to_float,
+    .from_float = gdk_convert_r8g8b8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_3_nearest,
     .mipmap_linear = gdk_mipmap_guint8_3_linear,
   },
@@ -912,8 +912,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_RGB888,
 #endif
-    .to_float = b8g8r8_to_float,
-    .from_float = b8g8r8_from_float,
+    .to_float = gdk_convert_b8g8r8_to_float,
+    .from_float = gdk_convert_b8g8r8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_3_nearest,
     .mipmap_linear = gdk_mipmap_guint8_3_linear,
   },
@@ -948,8 +948,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = r16g16b16_to_float,
-    .from_float = r16g16b16_from_float,
+    .to_float = gdk_convert_r16g16b16_to_float,
+    .from_float = gdk_convert_r16g16b16_from_float,
     .mipmap_nearest = gdk_mipmap_guint16_3_nearest,
     .mipmap_linear = gdk_mipmap_guint16_3_linear,
   },
@@ -983,8 +983,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_ABGR16161616,
 #endif
-    .to_float = r16g16b16a16_to_float,
-    .from_float = r16g16b16a16_from_float,
+    .to_float = gdk_convert_r16g16b16a16_to_float,
+    .from_float = gdk_convert_r16g16b16a16_from_float,
     .mipmap_nearest = gdk_mipmap_guint16_4_nearest,
     .mipmap_linear = gdk_mipmap_guint16_4_linear,
   },
@@ -1018,8 +1018,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_ABGR16161616,
 #endif
-    .to_float = r16g16b16a16_to_float,
-    .from_float = r16g16b16a16_from_float,
+    .to_float = gdk_convert_r16g16b16a16_to_float,
+    .from_float = gdk_convert_r16g16b16a16_from_float,
     .mipmap_nearest = gdk_mipmap_guint16_4_nearest,
     .mipmap_linear = gdk_mipmap_guint16_4_linear,
   },
@@ -1053,8 +1053,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = r16g16b16_float_to_float,
-    .from_float = r16g16b16_float_from_float,
+    .to_float = gdk_convert_r16g16b16_float_to_float,
+    .from_float = gdk_convert_r16g16b16_float_from_float,
     .mipmap_nearest = gdk_mipmap_half_float_3_nearest,
     .mipmap_linear = gdk_mipmap_half_float_3_linear,
   },
@@ -1087,8 +1087,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_ABGR16161616F,
 #endif
-    .to_float = r16g16b16a16_float_to_float,
-    .from_float = r16g16b16a16_float_from_float,
+    .to_float = gdk_convert_r16g16b16a16_float_to_float,
+    .from_float = gdk_convert_r16g16b16a16_float_from_float,
     .mipmap_nearest = gdk_mipmap_half_float_4_nearest,
     .mipmap_linear = gdk_mipmap_half_float_4_linear,
   },
@@ -1121,8 +1121,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_ABGR16161616F,
 #endif
-    .to_float = r16g16b16a16_float_to_float,
-    .from_float = r16g16b16a16_float_from_float,
+    .to_float = gdk_convert_r16g16b16a16_float_to_float,
+    .from_float = gdk_convert_r16g16b16a16_float_from_float,
     .mipmap_nearest = gdk_mipmap_half_float_4_nearest,
     .mipmap_linear = gdk_mipmap_half_float_4_linear,
   },
@@ -1156,8 +1156,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = r32g32b32_float_to_float,
-    .from_float = r32g32b32_float_from_float,
+    .to_float = gdk_convert_r32g32b32_float_to_float,
+    .from_float = gdk_convert_r32g32b32_float_from_float,
     .mipmap_nearest = gdk_mipmap_float_3_nearest,
     .mipmap_linear = gdk_mipmap_float_3_linear,
   },
@@ -1190,8 +1190,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = r32g32b32a32_float_to_float,
-    .from_float = r32g32b32a32_float_from_float,
+    .to_float = gdk_convert_r32g32b32a32_float_to_float,
+    .from_float = gdk_convert_r32g32b32a32_float_from_float,
     .mipmap_nearest = gdk_mipmap_float_4_nearest,
     .mipmap_linear = gdk_mipmap_float_4_linear,
   },
@@ -1224,8 +1224,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = r32g32b32a32_float_to_float,
-    .from_float = r32g32b32a32_float_from_float,
+    .to_float = gdk_convert_r32g32b32a32_float_to_float,
+    .from_float = gdk_convert_r32g32b32a32_float_from_float,
     .mipmap_nearest = gdk_mipmap_float_4_nearest,
     .mipmap_linear = gdk_mipmap_float_4_linear,
   },
@@ -1257,8 +1257,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = g8a8_premultiplied_to_float,
-    .from_float = g8a8_premultiplied_from_float,
+    .to_float = gdk_convert_g8a8_premultiplied_to_float,
+    .from_float = gdk_convert_g8a8_premultiplied_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_2_nearest,
     .mipmap_linear = gdk_mipmap_guint8_2_linear,
   },
@@ -1290,8 +1290,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = g8a8_to_float,
-    .from_float = g8a8_from_float,
+    .to_float = gdk_convert_g8a8_to_float,
+    .from_float = gdk_convert_g8a8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_2_nearest,
     .mipmap_linear = gdk_mipmap_guint8_2_linear,
   },
@@ -1323,8 +1323,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_R8,
 #endif
-    .to_float = g8_to_float,
-    .from_float = g8_from_float,
+    .to_float = gdk_convert_g8_to_float,
+    .from_float = gdk_convert_g8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_1_nearest,
     .mipmap_linear = gdk_mipmap_guint8_1_linear,
   },
@@ -1359,8 +1359,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = g16a16_premultiplied_to_float,
-    .from_float = g16a16_premultiplied_from_float,
+    .to_float = gdk_convert_g16a16_premultiplied_to_float,
+    .from_float = gdk_convert_g16a16_premultiplied_from_float,
     .mipmap_nearest = gdk_mipmap_guint16_2_nearest,
     .mipmap_linear = gdk_mipmap_guint16_2_linear,
   },
@@ -1395,8 +1395,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = g16a16_to_float,
-    .from_float = g16a16_from_float,
+    .to_float = gdk_convert_g16a16_to_float,
+    .from_float = gdk_convert_g16a16_from_float,
     .mipmap_nearest = gdk_mipmap_guint16_2_nearest,
     .mipmap_linear = gdk_mipmap_guint16_2_linear,
   },
@@ -1431,8 +1431,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = DRM_FORMAT_R16,
 #endif
-    .to_float = g16_to_float,
-    .from_float = g16_from_float,
+    .to_float = gdk_convert_g16_to_float,
+    .from_float = gdk_convert_g16_from_float,
     .mipmap_nearest = gdk_mipmap_guint16_1_nearest,
     .mipmap_linear = gdk_mipmap_guint16_1_linear,
   },
@@ -1464,8 +1464,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = a8_to_float,
-    .from_float = a8_from_float,
+    .to_float = gdk_convert_a8_to_float,
+    .from_float = gdk_convert_a8_from_float,
     .mipmap_nearest = gdk_mipmap_guint8_1_nearest,
     .mipmap_linear = gdk_mipmap_guint8_1_linear,
   },
@@ -1500,8 +1500,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = a16_to_float,
-    .from_float = a16_from_float,
+    .to_float = gdk_convert_a16_to_float,
+    .from_float = gdk_convert_a16_from_float,
     .mipmap_nearest = gdk_mipmap_guint16_1_nearest,
     .mipmap_linear = gdk_mipmap_guint16_1_linear,
   },
@@ -1535,8 +1535,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = a16_float_to_float,
-    .from_float = a16_float_from_float,
+    .to_float = gdk_convert_a16_float_to_float,
+    .from_float = gdk_convert_a16_float_from_float,
     .mipmap_nearest = gdk_mipmap_half_float_1_nearest,
     .mipmap_linear = gdk_mipmap_half_float_1_linear,
   },
@@ -1570,8 +1570,8 @@ static const GdkMemoryFormatDescription memory_formats[] = {
 #ifdef HAVE_DMABUF
     .dmabuf_fourcc = 0,
 #endif
-    .to_float = a32_float_to_float,
-    .from_float = a32_float_from_float,
+    .to_float = gdk_convert_a32_float_to_float,
+    .from_float = gdk_convert_a32_float_from_float,
     .mipmap_nearest = gdk_mipmap_float_1_nearest,
     .mipmap_linear = gdk_mipmap_float_1_linear,
   }
@@ -1986,8 +1986,8 @@ gdk_memory_format_get_name (GdkMemoryFormat format)
 }
 
 static void
-premultiply (float (*rgba)[4],
-             gsize  n)
+gdk_convert_premultiply (float (*rgba)[4],
+                         gsize  n)
 {
   for (gsize i = 0; i < n; i++)
     {
@@ -1998,8 +1998,8 @@ premultiply (float (*rgba)[4],
 }
 
 static void
-unpremultiply (float (*rgba)[4],
-               gsize   n)
+gdk_convert_unpremultiply (float (*rgba)[4],
+                           gsize   n)
 {
   for (gsize i = 0; i < n; i++)
     {
@@ -2012,57 +2012,57 @@ unpremultiply (float (*rgba)[4],
     }
 }
 
-typedef void (* FastConversionFunc) (guchar       *dest,
-                                     const guchar *src,
-                                     gsize         n);
+typedef void (* GdkFastConversionFunc) (guchar       *dest,
+                                        const guchar *src,
+                                        gsize         n);
 
-static FastConversionFunc
-get_fast_conversion_func (GdkMemoryFormat dest_format,
-                          GdkMemoryFormat src_format)
+static GdkFastConversionFunc
+gdk_convert_get_fast_conversion_func (GdkMemoryFormat dest_format,
+                                      GdkMemoryFormat src_format)
 {
   if (src_format == GDK_MEMORY_R8G8B8A8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
-    return r8g8b8a8_to_r8g8b8a8_premultiplied;
+    return gdk_convert_r8g8b8a8_to_r8g8b8a8_premultiplied;
   else if (src_format == GDK_MEMORY_B8G8R8A8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
-    return r8g8b8a8_to_b8g8r8a8_premultiplied;
+    return gdk_convert_r8g8b8a8_to_b8g8r8a8_premultiplied;
   else if (src_format == GDK_MEMORY_R8G8B8A8 && dest_format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED)
-    return r8g8b8a8_to_b8g8r8a8_premultiplied;
+    return gdk_convert_r8g8b8a8_to_b8g8r8a8_premultiplied;
   else if (src_format == GDK_MEMORY_B8G8R8A8 && dest_format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED)
-    return r8g8b8a8_to_r8g8b8a8_premultiplied;
+    return gdk_convert_r8g8b8a8_to_r8g8b8a8_premultiplied;
   else if (src_format == GDK_MEMORY_R8G8B8A8 && dest_format == GDK_MEMORY_A8R8G8B8_PREMULTIPLIED)
-    return r8g8b8a8_to_a8r8g8b8_premultiplied;
+    return gdk_convert_r8g8b8a8_to_a8r8g8b8_premultiplied;
   else if (src_format == GDK_MEMORY_B8G8R8A8 && dest_format == GDK_MEMORY_A8R8G8B8_PREMULTIPLIED)
-    return r8g8b8a8_to_a8b8g8r8_premultiplied;
+    return gdk_convert_r8g8b8a8_to_a8b8g8r8_premultiplied;
   else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
-    return r8g8b8_to_r8g8b8a8;
+    return gdk_convert_r8g8b8_to_r8g8b8a8;
   else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
-    return r8g8b8_to_b8g8r8a8;
+    return gdk_convert_r8g8b8_to_b8g8r8a8;
   else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED)
-    return r8g8b8_to_b8g8r8a8;
+    return gdk_convert_r8g8b8_to_b8g8r8a8;
   else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_B8G8R8A8_PREMULTIPLIED)
-    return r8g8b8_to_r8g8b8a8;
+    return gdk_convert_r8g8b8_to_r8g8b8a8;
   else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_A8R8G8B8_PREMULTIPLIED)
-    return r8g8b8_to_a8r8g8b8;
+    return gdk_convert_r8g8b8_to_a8r8g8b8;
   else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_A8R8G8B8_PREMULTIPLIED)
-    return r8g8b8_to_a8b8g8r8;
+    return gdk_convert_r8g8b8_to_a8b8g8r8;
   else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_R8G8B8A8)
-    return r8g8b8_to_r8g8b8a8;
+    return gdk_convert_r8g8b8_to_r8g8b8a8;
   else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_R8G8B8A8)
-    return r8g8b8_to_b8g8r8a8;
+    return gdk_convert_r8g8b8_to_b8g8r8a8;
   else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_B8G8R8A8)
-    return r8g8b8_to_b8g8r8a8;
+    return gdk_convert_r8g8b8_to_b8g8r8a8;
   else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_B8G8R8A8)
-    return r8g8b8_to_r8g8b8a8;
+    return gdk_convert_r8g8b8_to_r8g8b8a8;
   else if (src_format == GDK_MEMORY_R8G8B8 && dest_format == GDK_MEMORY_A8R8G8B8)
-    return r8g8b8_to_a8r8g8b8;
+    return gdk_convert_r8g8b8_to_a8r8g8b8;
   else if (src_format == GDK_MEMORY_B8G8R8 && dest_format == GDK_MEMORY_A8R8G8B8)
-    return r8g8b8_to_a8b8g8r8;
+    return gdk_convert_r8g8b8_to_a8b8g8r8;
 
   return NULL;
 }
 
-typedef struct _MemoryConvert MemoryConvert;
+typedef struct _GdkMemoryConvert GdkMemoryConvert;
 
-struct _MemoryConvert
+struct _GdkMemoryConvert
 {
   guchar              *dest_data;
   gsize                dest_stride;
@@ -2081,7 +2081,7 @@ struct _MemoryConvert
 static void
 gdk_memory_convert_generic (gpointer data)
 {
-  MemoryConvert *mc = data;
+  GdkMemoryConvert *mc = data;
   const GdkMemoryFormatDescription *dest_desc = &memory_formats[mc->dest_format];
   const GdkMemoryFormatDescription *src_desc = &memory_formats[mc->src_format];
   float (*tmp)[4];
@@ -2128,7 +2128,7 @@ gdk_memory_convert_generic (gpointer data)
       src_desc->to_float (tmp, src_data, mc->width);
 
       if (needs_unpremultiply)
-        unpremultiply (tmp, mc->width);
+        gdk_convert_unpremultiply (tmp, mc->width);
 
       if (convert_func)
         convert_func (mc->src_cs, tmp, mc->width);
@@ -2137,16 +2137,16 @@ gdk_memory_convert_generic (gpointer data)
         convert_func2 (mc->dest_cs, tmp, mc->width);
 
       if (needs_premultiply)
-        premultiply (tmp, mc->width);
+        gdk_convert_premultiply (tmp, mc->width);
 
       dest_desc->from_float (dest_data, tmp, mc->width);
     }
 
   g_free (tmp);
 
-  ADD_MARK (before,
-            "Memory convert (thread)", "size %lux%lu, %lu rows",
-            mc->width, mc->height, rows);
+  GDK_MEMORY_FORMAT_ADD_MARK (before,
+                              "Memory convert (thread)", "size %lux%lu, %lu rows",
+                              mc->width, mc->height, rows);
 }
 
 void
@@ -2161,7 +2161,7 @@ gdk_memory_convert (guchar              *dest_data,
                     gsize                width,
                     gsize                height)
 {
-  MemoryConvert mc = {
+  GdkMemoryConvert mc = {
     .dest_data = dest_data,
     .dest_stride = dest_stride,
     .dest_format = dest_format,
@@ -2207,9 +2207,9 @@ gdk_memory_convert (guchar              *dest_data,
 
   if (gdk_color_state_equal (dest_cs, src_cs))
     {
-      FastConversionFunc func;
+      GdkFastConversionFunc func;
 
-      func = get_fast_conversion_func (dest_format, src_format);
+      func = gdk_convert_get_fast_conversion_func (dest_format, src_format);
 
       if (func != NULL)
         {
@@ -2228,9 +2228,9 @@ gdk_memory_convert (guchar              *dest_data,
   gdk_parallel_task_run (gdk_memory_convert_generic, &mc);
 }
 
-typedef struct _MemoryConvertColorState MemoryConvertColorState;
+typedef struct _GdkMemoryConvertColorState GdkMemoryConvertColorState;
 
-struct _MemoryConvertColorState
+struct _GdkMemoryConvertColorState
 {
   guchar *data;
   gsize stride;
@@ -2243,7 +2243,7 @@ struct _MemoryConvertColorState
   /* atomic */ int rows_done;
 };
 
-static const guchar srgb_lookup[] = {
+static const guchar gdk_convert_srgb_lookup[] = {
   0, 12, 21, 28, 33, 38, 42, 46, 49, 52, 55, 58, 61, 63, 66, 68,
   70, 73, 75, 77, 79, 81, 82, 84, 86, 88, 89, 91, 93, 94, 96, 97,
   99, 100, 102, 103, 104, 106, 107, 109, 110, 111, 112, 114, 115, 116, 117, 118,
@@ -2262,7 +2262,7 @@ static const guchar srgb_lookup[] = {
   248, 248, 249, 249, 250, 250, 251, 251, 251, 252, 252, 253, 253, 254, 254, 255
 };
 
-static const guchar srgb_inverse_lookup[] = {
+static const guchar gdk_convert_srgb_inverse_lookup[] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3,
   3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7,
@@ -2282,8 +2282,8 @@ static const guchar srgb_inverse_lookup[] = {
 };
 
 static void
-convert_srgb_to_srgb_linear (guchar *data,
-                             gsize   n)
+gdk_convert_srgb_to_srgb_linear (guchar *data,
+                                 gsize   n)
 {
   for (gsize i = 0; i < n; i++)
     {
@@ -2298,9 +2298,9 @@ convert_srgb_to_srgb_linear (guchar *data,
           g = (g * 255 + a / 2) / a;
           b = (b * 255 + a / 2) / a;
 
-          r = srgb_inverse_lookup[r];
-          g = srgb_inverse_lookup[g];
-          b = srgb_inverse_lookup[b];
+          r = gdk_convert_srgb_inverse_lookup[r];
+          g = gdk_convert_srgb_inverse_lookup[g];
+          b = gdk_convert_srgb_inverse_lookup[b];
 
           r = r * a + 127;
           g = g * a + 127;
@@ -2314,8 +2314,8 @@ convert_srgb_to_srgb_linear (guchar *data,
 }
 
 static void
-convert_srgb_linear_to_srgb (guchar *data,
-                             gsize   n)
+gdk_convert_srgb_linear_to_srgb (guchar *data,
+                                 gsize   n)
 {
   for (gsize i = 0; i < n; i++)
     {
@@ -2330,9 +2330,9 @@ convert_srgb_linear_to_srgb (guchar *data,
           g = (g * 255 + a / 2) / a;
           b = (b * 255 + a / 2) / a;
 
-          r = srgb_lookup[r];
-          g = srgb_lookup[g];
-          b = srgb_lookup[b];
+          r = gdk_convert_srgb_lookup[r];
+          g = gdk_convert_srgb_lookup[g];
+          b = gdk_convert_srgb_lookup[b];
 
           r = r * a + 127;
           g = g * a + 127;
@@ -2349,7 +2349,7 @@ convert_srgb_linear_to_srgb (guchar *data,
 static void
 gdk_memory_convert_color_state_srgb_to_srgb_linear (gpointer data)
 {
-  MemoryConvertColorState *mc = data;
+  GdkMemoryConvertColorState *mc = data;
   int y;
   guint64 before = GDK_PROFILER_CURRENT_TIME;
   gsize rows;
@@ -2358,18 +2358,18 @@ gdk_memory_convert_color_state_srgb_to_srgb_linear (gpointer data)
        y < mc->height;
        y = g_atomic_int_add (&mc->rows_done, 1), rows++)
     {
-      convert_srgb_to_srgb_linear (mc->data + y * mc->stride, mc->width);
+      gdk_convert_srgb_to_srgb_linear (mc->data + y * mc->stride, mc->width);
     }
 
-  ADD_MARK (before,
-            "Color state convert srgb->srgb-linear (thread)", "size %lux%lu, %lu rows",
-            mc->width, mc->height, rows);
+  GDK_MEMORY_FORMAT_ADD_MARK (before,
+                              "Color state convert srgb->srgb-linear (thread)", "size %lux%lu, %lu rows",
+                              mc->width, mc->height, rows);
 }
 
 static void
 gdk_memory_convert_color_state_srgb_linear_to_srgb (gpointer data)
 {
-  MemoryConvertColorState *mc = data;
+  GdkMemoryConvertColorState *mc = data;
   int y;
   guint64 before = GDK_PROFILER_CURRENT_TIME;
   gsize rows;
@@ -2378,18 +2378,18 @@ gdk_memory_convert_color_state_srgb_linear_to_srgb (gpointer data)
        y < mc->height;
        y = g_atomic_int_add (&mc->rows_done, 1), rows++)
     {
-      convert_srgb_linear_to_srgb (mc->data + y * mc->stride, mc->width);
+      gdk_convert_srgb_linear_to_srgb (mc->data + y * mc->stride, mc->width);
     }
 
-  ADD_MARK (before,
-            "Color state convert srgb-linear->srgb (thread)", "size %lux%lu, %lu rows",
-            mc->width, mc->height, rows);
+  GDK_MEMORY_FORMAT_ADD_MARK (before,
+                              "Color state convert srgb-linear->srgb (thread)", "size %lux%lu, %lu rows",
+                              mc->width, mc->height, rows);
 }
 
 static void
 gdk_memory_convert_color_state_generic (gpointer user_data)
 {
-  MemoryConvertColorState *mc = user_data;
+  GdkMemoryConvertColorState *mc = user_data;
   const GdkMemoryFormatDescription *desc = &memory_formats[mc->format];
   GdkFloatColorConvert convert_func = NULL;
   GdkFloatColorConvert convert_func2 = NULL;
@@ -2423,7 +2423,7 @@ gdk_memory_convert_color_state_generic (gpointer user_data)
       desc->to_float (tmp, data, mc->width);
 
       if (desc->alpha == GDK_MEMORY_ALPHA_PREMULTIPLIED)
-        unpremultiply (tmp, mc->width);
+        gdk_convert_unpremultiply (tmp, mc->width);
 
       if (convert_func)
         convert_func (mc->src_cs, tmp, mc->width);
@@ -2432,16 +2432,16 @@ gdk_memory_convert_color_state_generic (gpointer user_data)
         convert_func2 (mc->dest_cs, tmp, mc->width);
 
       if (desc->alpha == GDK_MEMORY_ALPHA_PREMULTIPLIED)
-        premultiply (tmp, mc->width);
+        gdk_convert_premultiply (tmp, mc->width);
 
       desc->from_float (data, tmp, mc->width);
     }
 
   g_free (tmp);
 
-  ADD_MARK (before,
-            "Color state convert (thread)", "size %lux%lu, %lu rows",
-            mc->width, mc->height, rows);
+  GDK_MEMORY_FORMAT_ADD_MARK (before,
+                              "Color state convert (thread)", "size %lux%lu, %lu rows",
+                              mc->width, mc->height, rows);
 }
 
 void
@@ -2453,7 +2453,7 @@ gdk_memory_convert_color_state (guchar          *data,
                                 gsize            width,
                                 gsize            height)
 {
-  MemoryConvertColorState mc = {
+  GdkMemoryConvertColorState mc = {
     .data = data,
     .stride = stride,
     .format = format,
@@ -2484,9 +2484,9 @@ gdk_memory_convert_color_state (guchar          *data,
     }
 }
 
-typedef struct _MipmapData MipmapData;
+typedef struct _GdkMipmapData GdkMipmapData;
 
-struct _MipmapData
+struct _GdkMipmapData
 {
   guchar          *dest;
   gsize            dest_stride;
@@ -2505,7 +2505,7 @@ struct _MipmapData
 static void
 gdk_memory_mipmap_same_format_nearest (gpointer data)
 {
-  MipmapData *mipmap = data;
+  GdkMipmapData *mipmap = data;
   const GdkMemoryFormatDescription *desc = &memory_formats[mipmap->src_format];
   gsize n, y;
   guint64 before = GDK_PROFILER_CURRENT_TIME;
@@ -2526,15 +2526,15 @@ gdk_memory_mipmap_same_format_nearest (gpointer data)
                             mipmap->lod_level);
     }
 
-  ADD_MARK (before,
-            "Mipmap nearest (thread)", "size %lux%lu, lod %u, %lu rows",
-            mipmap->src_width, mipmap->src_height, mipmap->lod_level, rows);
+  GDK_MEMORY_FORMAT_ADD_MARK (before,
+                              "Mipmap nearest (thread)", "size %lux%lu, lod %u, %lu rows",
+                              mipmap->src_width, mipmap->src_height, mipmap->lod_level, rows);
 }
 
 static void
 gdk_memory_mipmap_same_format_linear (gpointer data)
 {
-  MipmapData *mipmap = data;
+  GdkMipmapData *mipmap = data;
   const GdkMemoryFormatDescription *desc = &memory_formats[mipmap->src_format];
   gsize n, y;
   guint64 before = GDK_PROFILER_CURRENT_TIME;
@@ -2555,17 +2555,17 @@ gdk_memory_mipmap_same_format_linear (gpointer data)
                            mipmap->lod_level);
     }
 
-  ADD_MARK (before,
-            "Mipmap linear (thread)", "size %lux%lu, lod %u, %lu rows",
-            mipmap->src_width, mipmap->src_height, mipmap->lod_level, rows);
+  GDK_MEMORY_FORMAT_ADD_MARK (before,
+                              "Mipmap linear (thread)", "size %lux%lu, lod %u, %lu rows",
+                              mipmap->src_width, mipmap->src_height, mipmap->lod_level, rows);
 }
 
 static void
 gdk_memory_mipmap_generic (gpointer data)
 {
-  MipmapData *mipmap = data;
+  GdkMipmapData *mipmap = data;
   const GdkMemoryFormatDescription *desc = &memory_formats[mipmap->src_format];
-  FastConversionFunc func;
+  GdkFastConversionFunc func;
   gsize dest_width;
   gsize size;
   guchar *tmp;
@@ -2577,7 +2577,7 @@ gdk_memory_mipmap_generic (gpointer data)
   dest_width = (mipmap->src_width + n - 1) >> mipmap->lod_level;
   size = gdk_memory_format_bytes_per_pixel (mipmap->src_format) * dest_width;
   tmp = g_malloc (size);
-  func = get_fast_conversion_func (mipmap->dest_format, mipmap->src_format);
+  func = gdk_convert_get_fast_conversion_func (mipmap->dest_format, mipmap->src_format);
 
   for (y = g_atomic_int_add (&mipmap->rows_done, n), rows = 0;
        y < mipmap->src_height;
@@ -2606,9 +2606,9 @@ gdk_memory_mipmap_generic (gpointer data)
 
   g_free (tmp);
 
-  ADD_MARK (before,
-            "Mipmap generic (thread)", "size %lux%lu, lod %u, %lu rows",
-            mipmap->src_width, mipmap->src_height, mipmap->lod_level, rows);
+  GDK_MEMORY_FORMAT_ADD_MARK (before,
+                              "Mipmap generic (thread)", "size %lux%lu, lod %u, %lu rows",
+                              mipmap->src_width, mipmap->src_height, mipmap->lod_level, rows);
 }
 
 void
@@ -2623,7 +2623,7 @@ gdk_memory_mipmap (guchar          *dest,
                    guint            lod_level,
                    gboolean         linear)
 {
-  MipmapData mipmap = {
+  GdkMipmapData mipmap = {
     .dest = dest,
     .dest_stride = dest_stride,
     .dest_format = dest_format,
@@ -2651,4 +2651,3 @@ gdk_memory_mipmap (guchar          *dest,
       gdk_parallel_task_run (gdk_memory_mipmap_generic, &mipmap);
     }
 }
-

gdk/gdkmemorytexturebuilder.c

@@ -67,22 +67,22 @@ struct _GdkMemoryTextureBuilderClass
 
 enum
 {
-  PROP_0,
-  PROP_BYTES,
-  PROP_COLOR_STATE,
-  PROP_FORMAT,
-  PROP_HEIGHT,
-  PROP_STRIDE,
-  PROP_UPDATE_REGION,
-  PROP_UPDATE_TEXTURE,
-  PROP_WIDTH,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_0,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_BYTES,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_COLOR_STATE,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_FORMAT,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_HEIGHT,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_STRIDE,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_REGION,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE,
+  GDK_MEMORY_TEXTURE_BUILDER_PROP_WIDTH,
 
-  N_PROPS
+  GDK_MEMORY_TEXTURE_BUILDER_N_PROPS
 };
 
 G_DEFINE_TYPE (GdkMemoryTextureBuilder, gdk_memory_texture_builder, G_TYPE_OBJECT)
 
-static GParamSpec *properties[N_PROPS] = { NULL, };
+static GParamSpec *gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_N_PROPS] = { NULL, };
 
 static void
 gdk_memory_texture_builder_dispose (GObject *object)
@@ -108,35 +108,35 @@ gdk_memory_texture_builder_get_property (GObject    *object,
 
   switch (property_id)
     {
-    case PROP_BYTES:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_BYTES:
       g_value_set_boxed (value, self->bytes);
       break;
 
-    case PROP_COLOR_STATE:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_COLOR_STATE:
       g_value_set_boxed (value, self->color_state);
       break;
 
-    case PROP_FORMAT:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_FORMAT:
       g_value_set_enum (value, self->format);
       break;
 
-    case PROP_HEIGHT:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_HEIGHT:
       g_value_set_int (value, self->height);
       break;
 
-    case PROP_STRIDE:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_STRIDE:
       g_value_set_uint64 (value, self->stride);
       break;
 
-    case PROP_UPDATE_REGION:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_REGION:
       g_value_set_boxed (value, self->update_region);
       break;
 
-    case PROP_UPDATE_TEXTURE:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE:
       g_value_set_object (value, self->update_texture);
       break;
 
-    case PROP_WIDTH:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_WIDTH:
       g_value_set_int (value, self->width);
       break;
 
@@ -156,35 +156,35 @@ gdk_memory_texture_builder_set_property (GObject      *object,
 
   switch (property_id)
     {
-    case PROP_BYTES:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_BYTES:
       gdk_memory_texture_builder_set_bytes (self, g_value_get_boxed (value));
       break;
 
-    case PROP_COLOR_STATE:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_COLOR_STATE:
       gdk_memory_texture_builder_set_color_state (self, g_value_get_boxed (value));
       break;
 
-    case PROP_FORMAT:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_FORMAT:
       gdk_memory_texture_builder_set_format (self, g_value_get_enum (value));
       break;
 
-    case PROP_HEIGHT:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_HEIGHT:
       gdk_memory_texture_builder_set_height (self, g_value_get_int (value));
       break;
 
-    case PROP_STRIDE:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_STRIDE:
       gdk_memory_texture_builder_set_stride (self, g_value_get_uint64 (value));
       break;
 
-    case PROP_UPDATE_REGION:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_REGION:
       gdk_memory_texture_builder_set_update_region (self, g_value_get_boxed (value));
       break;
 
-    case PROP_UPDATE_TEXTURE:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE:
       gdk_memory_texture_builder_set_update_texture (self, g_value_get_object (value));
       break;
 
-    case PROP_WIDTH:
+    case GDK_MEMORY_TEXTURE_BUILDER_PROP_WIDTH:
       gdk_memory_texture_builder_set_width (self, g_value_get_int (value));
       break;
 
@@ -210,7 +210,7 @@ gdk_memory_texture_builder_class_init (GdkMemoryTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_BYTES] =
+  gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_BYTES] =
     g_param_spec_boxed ("bytes", NULL, NULL,
                         G_TYPE_BYTES,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -222,7 +222,7 @@ gdk_memory_texture_builder_class_init (GdkMemoryTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_COLOR_STATE] =
+  gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_COLOR_STATE] =
     g_param_spec_boxed ("color-state", NULL, NULL,
                         GDK_TYPE_COLOR_STATE,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -234,7 +234,7 @@ gdk_memory_texture_builder_class_init (GdkMemoryTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_FORMAT] =
+  gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_FORMAT] =
     g_param_spec_enum ("format", NULL, NULL,
                        GDK_TYPE_MEMORY_FORMAT,
                        GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
@@ -247,7 +247,7 @@ gdk_memory_texture_builder_class_init (GdkMemoryTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_HEIGHT] =
+  gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_HEIGHT] =
     g_param_spec_int ("height", NULL, NULL,
                       G_MININT, G_MAXINT, 0,
                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -262,7 +262,7 @@ gdk_memory_texture_builder_class_init (GdkMemoryTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_STRIDE] =
+  gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_STRIDE] =
     g_param_spec_uint64 ("stride", NULL, NULL,
                          0, G_MAXUINT64, 0,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -274,7 +274,7 @@ gdk_memory_texture_builder_class_init (GdkMemoryTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_UPDATE_REGION] =
+  gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_REGION] =
     g_param_spec_boxed ("update-region", NULL, NULL,
                         CAIRO_GOBJECT_TYPE_REGION,
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -286,7 +286,7 @@ gdk_memory_texture_builder_class_init (GdkMemoryTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_UPDATE_TEXTURE] =
+  gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE] =
     g_param_spec_object ("update-texture", NULL, NULL,
                          GDK_TYPE_TEXTURE,
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -298,12 +298,12 @@ gdk_memory_texture_builder_class_init (GdkMemoryTextureBuilderClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_WIDTH] =
+  gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_WIDTH] =
     g_param_spec_int ("width", NULL, NULL,
                       G_MININT, G_MAXINT, 0,
                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+  g_object_class_install_properties (gobject_class, GDK_MEMORY_TEXTURE_BUILDER_N_PROPS, gdk_memory_texture_builder_properties);
 }
 
 static void
@@ -373,7 +373,7 @@ gdk_memory_texture_builder_set_bytes (GdkMemoryTextureBuilder *self,
   if (bytes)
     g_bytes_ref (bytes);
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_BYTES]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_BYTES]);
 }
 
 /**
@@ -421,7 +421,7 @@ gdk_memory_texture_builder_set_color_state (GdkMemoryTextureBuilder *self,
   if (color_state)
     gdk_color_state_ref (color_state);
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_COLOR_STATE]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_COLOR_STATE]);
 }
 
 /**
@@ -465,7 +465,7 @@ gdk_memory_texture_builder_set_height (GdkMemoryTextureBuilder *self,
 
   self->height = height;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_HEIGHT]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_HEIGHT]);
 }
 
 /**
@@ -509,7 +509,7 @@ gdk_memory_texture_builder_set_width (GdkMemoryTextureBuilder *self,
 
   self->width = width;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_WIDTH]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_WIDTH]);
 }
 
 /**
@@ -552,7 +552,7 @@ gdk_memory_texture_builder_set_stride (GdkMemoryTextureBuilder *self,
 
   self->stride = stride;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_STRIDE]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_STRIDE]);
 }
 
 /**
@@ -595,7 +595,7 @@ gdk_memory_texture_builder_set_format (GdkMemoryTextureBuilder *self,
 
   self->format = format;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_FORMAT]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_FORMAT]);
 }
 
 /**
@@ -638,7 +638,7 @@ gdk_memory_texture_builder_set_update_texture (GdkMemoryTextureBuilder *self,
   if (!g_set_object (&self->update_texture, texture))
     return;
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UPDATE_TEXTURE]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_TEXTURE]);
 }
 
 /**
@@ -693,7 +693,7 @@ gdk_memory_texture_builder_set_update_region (GdkMemoryTextureBuilder *self,
   if (region)
     self->update_region = cairo_region_reference (region);
 
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_UPDATE_REGION]);
+  g_object_notify_by_pspec (G_OBJECT (self), gdk_memory_texture_builder_properties[GDK_MEMORY_TEXTURE_BUILDER_PROP_UPDATE_REGION]);
 }
 
 /**

gdk/gdkmonitor.c

@@ -41,31 +41,31 @@
  */
 
 enum {
-  PROP_0,
-  PROP_DESCRIPTION,
-  PROP_DISPLAY,
-  PROP_MANUFACTURER,
-  PROP_MODEL,
-  PROP_CONNECTOR,
-  PROP_SCALE_FACTOR,
-  PROP_SCALE,
-  PROP_GEOMETRY,
-  PROP_WIDTH_MM,
-  PROP_HEIGHT_MM,
-  PROP_REFRESH_RATE,
-  PROP_SUBPIXEL_LAYOUT,
-  PROP_VALID,
-  LAST_PROP
+  GDK_MONITOR_PROP_0,
+  GDK_MONITOR_PROP_DESCRIPTION,
+  GDK_MONITOR_PROP_DISPLAY,
+  GDK_MONITOR_PROP_MANUFACTURER,
+  GDK_MONITOR_PROP_MODEL,
+  GDK_MONITOR_PROP_CONNECTOR,
+  GDK_MONITOR_PROP_SCALE_FACTOR,
+  GDK_MONITOR_PROP_SCALE,
+  GDK_MONITOR_PROP_GEOMETRY,
+  GDK_MONITOR_PROP_WIDTH_MM,
+  GDK_MONITOR_PROP_HEIGHT_MM,
+  GDK_MONITOR_PROP_REFRESH_RATE,
+  GDK_MONITOR_PROP_SUBPIXEL_LAYOUT,
+  GDK_MONITOR_PROP_VALID,
+  GDK_MONITOR_LAST_PROP
 };
 
-static GParamSpec *props[LAST_PROP] = { NULL, };
+static GParamSpec *gdk_monitor_properties[GDK_MONITOR_LAST_PROP] = { NULL, };
 
 enum {
-  INVALIDATE,
-  LAST_SIGNAL
+  GDK_MONITOR_INVALIDATE,
+  GDK_MONITOR_LAST_SIGNAL
 };
 
-static guint signals[LAST_SIGNAL] = { 0 };
+static guint gdk_monitor_signals[GDK_MONITOR_LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (GdkMonitor, gdk_monitor, G_TYPE_OBJECT)
 
@@ -88,55 +88,55 @@ gdk_monitor_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DESCRIPTION:
+    case GDK_MONITOR_PROP_DESCRIPTION:
       g_value_set_string (value, monitor->description);
       break;
 
-    case PROP_DISPLAY:
+    case GDK_MONITOR_PROP_DISPLAY:
       g_value_set_object (value, monitor->display);
       break;
 
-    case PROP_MANUFACTURER:
+    case GDK_MONITOR_PROP_MANUFACTURER:
       g_value_set_string (value, monitor->manufacturer);
       break;
 
-    case PROP_MODEL:
+    case GDK_MONITOR_PROP_MODEL:
       g_value_set_string (value, monitor->model);
       break;
 
-    case PROP_CONNECTOR:
+    case GDK_MONITOR_PROP_CONNECTOR:
       g_value_set_string (value, monitor->connector);
       break;
 
-    case PROP_SCALE_FACTOR:
+    case GDK_MONITOR_PROP_SCALE_FACTOR:
       g_value_set_int (value, monitor->scale_factor);
       break;
 
-    case PROP_SCALE:
+    case GDK_MONITOR_PROP_SCALE:
       g_value_set_double (value, monitor->scale);
       break;
 
-    case PROP_GEOMETRY:
+    case GDK_MONITOR_PROP_GEOMETRY:
       g_value_set_boxed (value, &monitor->geometry);
       break;
 
-    case PROP_WIDTH_MM:
+    case GDK_MONITOR_PROP_WIDTH_MM:
       g_value_set_int (value, monitor->width_mm);
       break;
 
-    case PROP_HEIGHT_MM:
+    case GDK_MONITOR_PROP_HEIGHT_MM:
       g_value_set_int (value, monitor->height_mm);
       break;
 
-    case PROP_REFRESH_RATE:
+    case GDK_MONITOR_PROP_REFRESH_RATE:
       g_value_set_int (value, monitor->refresh_rate);
       break;
 
-    case PROP_SUBPIXEL_LAYOUT:
+    case GDK_MONITOR_PROP_SUBPIXEL_LAYOUT:
       g_value_set_enum (value, monitor->subpixel_layout);
       break;
 
-    case PROP_VALID:
+    case GDK_MONITOR_PROP_VALID:
       g_value_set_boolean (value, monitor->valid);
       break;
 
@@ -155,7 +155,7 @@ gdk_monitor_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_MONITOR_PROP_DISPLAY:
       monitor->display = g_value_get_object (value);
       break;
 
@@ -193,7 +193,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * Since: 4.10
    */
-  props[PROP_DESCRIPTION] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_DESCRIPTION] =
     g_param_spec_string ("description", NULL, NULL,
                          NULL,
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -203,7 +203,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The `GdkDisplay` of the monitor.
    */
-  props[PROP_DISPLAY] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_DISPLAY] =
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
@@ -213,7 +213,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The manufacturer name.
    */
-  props[PROP_MANUFACTURER] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_MANUFACTURER] =
     g_param_spec_string ("manufacturer", NULL, NULL,
                          NULL,
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -223,7 +223,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The model name.
    */
-  props[PROP_MODEL] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_MODEL] =
     g_param_spec_string ("model", NULL, NULL,
                          NULL,
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -233,7 +233,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The connector name.
    */
-  props[PROP_CONNECTOR] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_CONNECTOR] =
     g_param_spec_string ("connector", NULL, NULL,
                          NULL,
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -246,7 +246,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    * The scale factor is the next larger integer,
    * compared to [property@Gdk.Surface:scale].
    */
-  props[PROP_SCALE_FACTOR] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_SCALE_FACTOR] =
     g_param_spec_int ("scale-factor", NULL, NULL,
                       1, G_MAXINT,
                       1,
@@ -259,7 +259,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * Since: 4.14
    */
-  props[PROP_SCALE] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_SCALE] =
       g_param_spec_double ("scale", NULL, NULL,
                         1., G_MAXDOUBLE, 1.,
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -269,7 +269,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The geometry of the monitor.
    */
-  props[PROP_GEOMETRY] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_GEOMETRY] =
     g_param_spec_boxed ("geometry", NULL, NULL,
                         GDK_TYPE_RECTANGLE,
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -279,7 +279,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The width of the monitor, in millimeters.
    */
-  props[PROP_WIDTH_MM] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_WIDTH_MM] =
     g_param_spec_int ("width-mm", NULL, NULL,
                       0, G_MAXINT,
                       0,
@@ -290,7 +290,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The height of the monitor, in millimeters.
    */
-  props[PROP_HEIGHT_MM] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_HEIGHT_MM] =
     g_param_spec_int ("height-mm", NULL, NULL,
                       0, G_MAXINT,
                       0,
@@ -301,7 +301,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The refresh rate, in milli-Hertz.
    */
-  props[PROP_REFRESH_RATE] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_REFRESH_RATE] =
     g_param_spec_int ("refresh-rate", NULL, NULL,
                       0, G_MAXINT,
                       0,
@@ -312,7 +312,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * The subpixel layout.
    */
-  props[PROP_SUBPIXEL_LAYOUT] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_SUBPIXEL_LAYOUT] =
     g_param_spec_enum ("subpixel-layout", NULL, NULL,
                        GDK_TYPE_SUBPIXEL_LAYOUT,
                        GDK_SUBPIXEL_LAYOUT_UNKNOWN,
@@ -323,12 +323,12 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * Whether the object is still valid.
    */
-  props[PROP_VALID] =
+  gdk_monitor_properties[GDK_MONITOR_PROP_VALID] =
     g_param_spec_boolean ("valid", NULL, NULL,
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (object_class, LAST_PROP, props);
+  g_object_class_install_properties (object_class, GDK_MONITOR_LAST_PROP, gdk_monitor_properties);
 
   /**
    * GdkMonitor::invalidate:
@@ -336,7 +336,7 @@ gdk_monitor_class_init (GdkMonitorClass *class)
    *
    * Emitted when the output represented by @monitor gets disconnected.
    */
-  signals[INVALIDATE] = g_signal_new (g_intern_static_string ("invalidate"),
+  gdk_monitor_signals[GDK_MONITOR_INVALIDATE] = g_signal_new (g_intern_static_string ("invalidate"),
                                       G_TYPE_FROM_CLASS (object_class),
                                       G_SIGNAL_RUN_FIRST,
                                       0,
@@ -692,7 +692,7 @@ gdk_monitor_invalidate (GdkMonitor *monitor)
 {
   monitor->valid = FALSE;
   g_object_notify (G_OBJECT (monitor), "valid");
-  g_signal_emit (monitor, signals[INVALIDATE], 0);
+  g_signal_emit (monitor, gdk_monitor_signals[GDK_MONITOR_INVALIDATE], 0);
 }
 
 /**
@@ -741,7 +741,7 @@ gdk_monitor_set_description (GdkMonitor *monitor,
 {
   g_free (monitor->description);
   monitor->description = g_strdup (description);
-  g_object_notify_by_pspec (G_OBJECT (monitor), props[PROP_DESCRIPTION]);
+  g_object_notify_by_pspec (G_OBJECT (monitor), gdk_monitor_properties[GDK_MONITOR_PROP_DESCRIPTION]);
 }
 
 #define MM_PER_INCH 25.4

gdk/gdkpaintable.c

@@ -88,12 +88,12 @@ GdkPaintable *  gtk_snapshot_free_to_paintable          (GdkSnapshot
 G_DEFINE_INTERFACE (GdkPaintable, gdk_paintable, G_TYPE_OBJECT)
 
 enum {
-  INVALIDATE_CONTENTS,
-  INVALIDATE_SIZE,
-  LAST_SIGNAL
+  GDK_PAINTABLE_INVALIDATE_CONTENTS,
+  GDK_PAINTABLE_INVALIDATE_SIZE,
+  GDK_PAINTABLE_LAST_SIGNAL
 };
 
-static guint signals[LAST_SIGNAL] = { 0 };
+static guint gdk_paintable_signals[GDK_PAINTABLE_LAST_SIGNAL] = { 0 };
 
 static void
 gdk_paintable_default_snapshot (GdkPaintable *paintable,
@@ -187,7 +187,7 @@ gdk_paintable_default_init (GdkPaintableInterface *iface)
    * Examples for such an event would be videos changing to the next frame or
    * the icon theme for an icon changing.
    */
-  signals[INVALIDATE_CONTENTS] =
+  gdk_paintable_signals[GDK_PAINTABLE_INVALIDATE_CONTENTS] =
     g_signal_new (I_("invalidate-contents"),
                   GDK_TYPE_PAINTABLE,
                   G_SIGNAL_RUN_LAST,
@@ -211,7 +211,7 @@ gdk_paintable_default_init (GdkPaintableInterface *iface)
    * Examples for such an event would be a paintable displaying
    * the contents of a toplevel surface being resized.
    */
-  signals[INVALIDATE_SIZE] =
+  gdk_paintable_signals[GDK_PAINTABLE_INVALIDATE_SIZE] =
     g_signal_new (I_("invalidate-size"),
                   GDK_TYPE_PAINTABLE,
                   G_SIGNAL_RUN_LAST,
@@ -426,7 +426,7 @@ gdk_paintable_invalidate_contents (GdkPaintable *paintable)
   g_return_if_fail (GDK_IS_PAINTABLE (paintable));
   g_return_if_fail (!(gdk_paintable_get_flags (paintable) & GDK_PAINTABLE_STATIC_CONTENTS));
 
-  g_signal_emit (paintable, signals[INVALIDATE_CONTENTS], 0);
+  g_signal_emit (paintable, gdk_paintable_signals[GDK_PAINTABLE_INVALIDATE_CONTENTS], 0);
 }
 
 /**
@@ -450,7 +450,7 @@ gdk_paintable_invalidate_size (GdkPaintable *paintable)
   g_return_if_fail (GDK_IS_PAINTABLE (paintable));
   g_return_if_fail (!(gdk_paintable_get_flags (paintable) & GDK_PAINTABLE_STATIC_SIZE));
 
-  g_signal_emit (paintable, signals[INVALIDATE_SIZE], 0);
+  g_signal_emit (paintable, gdk_paintable_signals[GDK_PAINTABLE_INVALIDATE_SIZE], 0);
 }
 
 /**

gdk/gdkseat.c

@@ -42,21 +42,21 @@ struct _GdkSeatPrivate
 };
 
 enum {
-  DEVICE_ADDED,
-  DEVICE_REMOVED,
-  TOOL_ADDED,
-  TOOL_REMOVED,
-  N_SIGNALS
+  GDK_SEAT_DEVICE_ADDED,
+  GDK_SEAT_DEVICE_REMOVED,
+  GDK_SEAT_TOOL_ADDED,
+  GDK_SEAT_TOOL_REMOVED,
+  GDK_SEAT_N_SIGNALS
 };
 
 enum {
-  PROP_0,
-  PROP_DISPLAY,
-  N_PROPS
+  GDK_SEAT_PROP_0,
+  GDK_SEAT_PROP_DISPLAY,
+  GDK_SEAT_N_PROPS
 };
 
-static guint signals[N_SIGNALS] = { 0 };
-static GParamSpec *props[N_PROPS] = { NULL };
+static guint gdk_seat_signals[GDK_SEAT_N_SIGNALS] = { 0 };
+static GParamSpec *gdk_seat_properties[GDK_SEAT_N_PROPS] = { NULL };
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkSeat, gdk_seat, G_TYPE_OBJECT)
 
@@ -70,7 +70,7 @@ gdk_seat_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_SEAT_PROP_DISPLAY:
       priv->display = g_value_get_object (value);
       break;
     default:
@@ -89,7 +89,7 @@ gdk_seat_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DISPLAY:
+    case GDK_SEAT_PROP_DISPLAY:
       g_value_set_object (value, priv->display);
       break;
     default:
@@ -113,7 +113,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
    *
    * Emitted when a new input device is related to this seat.
    */
-  signals [DEVICE_ADDED] =
+  gdk_seat_signals [GDK_SEAT_DEVICE_ADDED] =
     g_signal_new (g_intern_static_string ("device-added"),
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
@@ -130,7 +130,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
    *
    * Emitted when an input device is removed (e.g. unplugged).
    */
-  signals [DEVICE_REMOVED] =
+  gdk_seat_signals [GDK_SEAT_DEVICE_REMOVED] =
     g_signal_new (g_intern_static_string ("device-removed"),
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
@@ -153,7 +153,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
    *
    * A same tool may be used by several devices.
    */
-  signals [TOOL_ADDED] =
+  gdk_seat_signals [GDK_SEAT_TOOL_ADDED] =
     g_signal_new (g_intern_static_string ("tool-added"),
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
@@ -169,7 +169,7 @@ gdk_seat_class_init (GdkSeatClass *klass)
    *
    * Emitted whenever a tool is no longer known to this @seat.
    */
-  signals [TOOL_REMOVED] =
+  gdk_seat_signals [GDK_SEAT_TOOL_REMOVED] =
     g_signal_new (g_intern_static_string ("tool-removed"),
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
@@ -183,14 +183,14 @@ gdk_seat_class_init (GdkSeatClass *klass)
    *
    * `GdkDisplay` of this seat.
    */
-  props[PROP_DISPLAY] =
+  gdk_seat_properties[GDK_SEAT_PROP_DISPLAY] =
     g_param_spec_object ("display", NULL, NULL,
                          GDK_TYPE_DISPLAY,
                          G_PARAM_READWRITE |
                          G_PARAM_CONSTRUCT_ONLY |
                          G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (object_class, N_PROPS, props);
+  g_object_class_install_properties (object_class, GDK_SEAT_N_PROPS, gdk_seat_properties);
 }
 
 static void
@@ -378,7 +378,7 @@ gdk_seat_device_added (GdkSeat   *seat,
                        GdkDevice *device)
 {
   gdk_device_set_seat (device, seat);
-  g_signal_emit (seat, signals[DEVICE_ADDED], 0, device);
+  g_signal_emit (seat, gdk_seat_signals[GDK_SEAT_DEVICE_ADDED], 0, device);
 }
 
 void
@@ -386,7 +386,7 @@ gdk_seat_device_removed (GdkSeat   *seat,
                          GdkDevice *device)
 {
   gdk_device_set_seat (device, NULL);
-  g_signal_emit (seat, signals[DEVICE_REMOVED], 0, device);
+  g_signal_emit (seat, gdk_seat_signals[GDK_SEAT_DEVICE_REMOVED], 0, device);
 }
 
 /**
@@ -412,14 +412,14 @@ void
 gdk_seat_tool_added (GdkSeat       *seat,
                      GdkDeviceTool *tool)
 {
-  g_signal_emit (seat, signals[TOOL_ADDED], 0, tool);
+  g_signal_emit (seat, gdk_seat_signals[GDK_SEAT_TOOL_ADDED], 0, tool);
 }
 
 void
 gdk_seat_tool_removed (GdkSeat       *seat,
                        GdkDeviceTool *tool)
 {
-  g_signal_emit (seat, signals[TOOL_REMOVED], 0, tool);
+  g_signal_emit (seat, gdk_seat_signals[GDK_SEAT_TOOL_REMOVED], 0, tool);
 }
 
 GdkDeviceTool *

gdk/gdksurface.c

@@ -86,25 +86,25 @@ struct _GdkSurfacePrivate
 };
 
 enum {
-  LAYOUT,
-  RENDER,
-  EVENT,
-  ENTER_MONITOR,
-  LEAVE_MONITOR,
-  LAST_SIGNAL
+  GDK_SURFACE_LAYOUT,
+  GDK_SURFACE_RENDER,
+  GDK_SURFACE_EVENT,
+  GDK_SURFACE_ENTER_MONITOR,
+  GDK_SURFACE_LEAVE_MONITOR,
+  GDK_SURFACE_LAST_SIGNAL
 };
 
 enum {
-  PROP_0,
-  PROP_CURSOR,
-  PROP_DISPLAY,
-  PROP_FRAME_CLOCK,
-  PROP_MAPPED,
-  PROP_WIDTH,
-  PROP_HEIGHT,
-  PROP_SCALE_FACTOR,
-  PROP_SCALE,
-  LAST_PROP
+  GDK_SURFACE_PROP_0,
+  GDK_SURFACE_PROP_CURSOR,
+  GDK_SURFACE_PROP_DISPLAY,
+  GDK_SURFACE_PROP_FRAME_CLOCK,
+  GDK_SURFACE_PROP_MAPPED,
+  GDK_SURFACE_PROP_WIDTH,
+  GDK_SURFACE_PROP_HEIGHT,
+  GDK_SURFACE_PROP_SCALE_FACTOR,
+  GDK_SURFACE_PROP_SCALE,
+  GDK_SURFACE_LAST_PROP
 };
 
 /* Global info */
@@ -120,15 +120,15 @@ static void gdk_surface_get_property (GObject      *object,
                                       GValue       *value,
                                       GParamSpec   *pspec);
 
-static void update_cursor               (GdkDisplay *display,
-                                         GdkDevice  *device);
+static void gdk_surface_update_cursor (GdkDisplay *display,
+                                       GdkDevice  *device);
 
 static void gdk_surface_queue_set_is_mapped (GdkSurface *surface,
                                              gboolean    is_mapped);
 
 
-static guint signals[LAST_SIGNAL] = { 0 };
-static GParamSpec *properties[LAST_PROP] = { NULL, };
+static guint gdk_surface_signals[GDK_SURFACE_LAST_SIGNAL] = { 0 };
+static GParamSpec *gdk_surface_properties[GDK_SURFACE_LAST_PROP] = { NULL, };
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkSurface, gdk_surface, G_TYPE_OBJECT)
 
@@ -551,7 +551,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * The mouse pointer for the `GdkSurface`.
    */
-  properties[PROP_CURSOR] =
+  gdk_surface_properties[GDK_SURFACE_PROP_CURSOR] =
       g_param_spec_object ("cursor", NULL, NULL,
                            GDK_TYPE_CURSOR,
                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -561,7 +561,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * The `GdkDisplay` connection of the surface.
    */
-  properties[PROP_DISPLAY] =
+  gdk_surface_properties[GDK_SURFACE_PROP_DISPLAY] =
       g_param_spec_object ("display", NULL, NULL,
                            GDK_TYPE_DISPLAY,
                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
@@ -571,7 +571,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * The `GdkFrameClock` of the surface.
    */
-  properties[PROP_FRAME_CLOCK] =
+  gdk_surface_properties[GDK_SURFACE_PROP_FRAME_CLOCK] =
       g_param_spec_object ("frame-clock", NULL, NULL,
                            GDK_TYPE_FRAME_CLOCK,
                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
@@ -581,7 +581,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * Whether the surface is mapped.
    */
-  properties[PROP_MAPPED] =
+  gdk_surface_properties[GDK_SURFACE_PROP_MAPPED] =
       g_param_spec_boolean ("mapped", NULL, NULL,
                             FALSE,
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -591,7 +591,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * The width of the surface in pixels.
    */
-  properties[PROP_WIDTH] =
+  gdk_surface_properties[GDK_SURFACE_PROP_WIDTH] =
       g_param_spec_int ("width", NULL, NULL,
                         0, G_MAXINT, 0,
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -601,7 +601,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * The height of the surface, in pixels.
    */
-  properties[PROP_HEIGHT] =
+  gdk_surface_properties[GDK_SURFACE_PROP_HEIGHT] =
       g_param_spec_int ("height", NULL, NULL,
                         0, G_MAXINT, 0,
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -614,7 +614,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    * The scale factor is the next larger integer,
    * compared to [property@Gdk.Surface:scale].
    */
-  properties[PROP_SCALE_FACTOR] =
+  gdk_surface_properties[GDK_SURFACE_PROP_SCALE_FACTOR] =
       g_param_spec_int ("scale-factor", NULL, NULL,
                         1, G_MAXINT, 1,
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
@@ -626,12 +626,12 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * Since: 4.12
    */
-  properties[PROP_SCALE] =
+  gdk_surface_properties[GDK_SURFACE_PROP_SCALE] =
       g_param_spec_double ("scale", NULL, NULL,
                         1., G_MAXDOUBLE, 1.,
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (object_class, LAST_PROP, properties);
+  g_object_class_install_properties (object_class, GDK_SURFACE_LAST_PROP, gdk_surface_properties);
 
   /**
    * GdkSurface::layout:
@@ -645,7 +645,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    * Surface size is reported in ”application pixels”, not
    * ”device pixels” (see gdk_surface_get_scale_factor()).
    */
-  signals[LAYOUT] =
+  gdk_surface_signals[GDK_SURFACE_LAYOUT] =
     g_signal_new (g_intern_static_string ("layout"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_FIRST,
@@ -657,7 +657,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
                   2,
                   G_TYPE_INT,
                   G_TYPE_INT);
-  g_signal_set_va_marshaller (signals[LAYOUT],
+  g_signal_set_va_marshaller (gdk_surface_signals[GDK_SURFACE_LAYOUT],
                               G_OBJECT_CLASS_TYPE (object_class),
                               _gdk_marshal_VOID__INT_INTv);
 
@@ -670,7 +670,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * Returns: %TRUE to indicate that the signal has been handled
    */
-  signals[RENDER] =
+  gdk_surface_signals[GDK_SURFACE_RENDER] =
     g_signal_new (g_intern_static_string ("render"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -681,7 +681,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
                   G_TYPE_BOOLEAN,
                   1,
                   CAIRO_GOBJECT_TYPE_REGION);
-  g_signal_set_va_marshaller (signals[RENDER],
+  g_signal_set_va_marshaller (gdk_surface_signals[GDK_SURFACE_RENDER],
                               G_OBJECT_CLASS_TYPE (object_class),
                               _gdk_marshal_BOOLEAN__BOXEDv);
 
@@ -694,7 +694,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * Returns: %TRUE to indicate that the event has been handled
    */
-  signals[EVENT] =
+  gdk_surface_signals[GDK_SURFACE_EVENT] =
     g_signal_new (g_intern_static_string ("event"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
@@ -705,7 +705,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_POINTER);
-  g_signal_set_va_marshaller (signals[EVENT],
+  g_signal_set_va_marshaller (gdk_surface_signals[GDK_SURFACE_EVENT],
                               G_OBJECT_CLASS_TYPE (object_class),
                               gdk_surface_event_marshallerv);
 
@@ -716,7 +716,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * Emitted when @surface starts being present on the monitor.
    */
-  signals[ENTER_MONITOR] =
+  gdk_surface_signals[GDK_SURFACE_ENTER_MONITOR] =
     g_signal_new (g_intern_static_string ("enter-monitor"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_FIRST,
@@ -735,7 +735,7 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
    *
    * Emitted when @surface stops being present on the monitor.
    */
-  signals[LEAVE_MONITOR] =
+  gdk_surface_signals[GDK_SURFACE_LEAVE_MONITOR] =
     g_signal_new (g_intern_static_string ("leave-monitor"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_FIRST,
@@ -807,18 +807,18 @@ gdk_surface_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_CURSOR:
+    case GDK_SURFACE_PROP_CURSOR:
       gdk_surface_set_cursor (surface, g_value_get_object (value));
       break;
 
-    case PROP_DISPLAY:
+    case GDK_SURFACE_PROP_DISPLAY:
       surface->display = g_value_dup_object (value);
       g_assert (surface->display != NULL);
       g_signal_connect (surface->display, "seat-removed",
                         G_CALLBACK (seat_removed_cb), surface);
       break;
 
-    case PROP_FRAME_CLOCK:
+    case GDK_SURFACE_PROP_FRAME_CLOCK:
       gdk_surface_set_frame_clock (surface, GDK_FRAME_CLOCK (g_value_get_object (value)));
       break;
 
@@ -840,35 +840,35 @@ gdk_surface_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_CURSOR:
+    case GDK_SURFACE_PROP_CURSOR:
       g_value_set_object (value, gdk_surface_get_cursor (surface));
       break;
 
-    case PROP_DISPLAY:
+    case GDK_SURFACE_PROP_DISPLAY:
       g_value_set_object (value, surface->display);
       break;
 
-    case PROP_FRAME_CLOCK:
+    case GDK_SURFACE_PROP_FRAME_CLOCK:
       g_value_set_object (value, surface->frame_clock);
       break;
 
-    case PROP_MAPPED:
+    case GDK_SURFACE_PROP_MAPPED:
       g_value_set_boolean (value, GDK_SURFACE_IS_MAPPED (surface));
       break;
 
-    case PROP_WIDTH:
+    case GDK_SURFACE_PROP_WIDTH:
       g_value_set_int (value, surface->width);
       break;
 
-    case PROP_HEIGHT:
+    case GDK_SURFACE_PROP_HEIGHT:
       g_value_set_int (value, surface->height);
       break;
 
-    case PROP_SCALE_FACTOR:
+    case GDK_SURFACE_PROP_SCALE_FACTOR:
       g_value_set_int (value, gdk_surface_get_scale_factor (surface));
       break;
 
-    case PROP_SCALE:
+    case GDK_SURFACE_PROP_SCALE:
       g_value_set_double (value, gdk_surface_get_scale (surface));
       break;
 
@@ -1023,7 +1023,7 @@ _gdk_surface_destroy_hierarchy (GdkSurface *surface,
 
   if (GDK_IS_TOPLEVEL (surface))
     g_object_notify (G_OBJECT (surface), "state");
-  g_object_notify_by_pspec (G_OBJECT (surface), properties[PROP_MAPPED]);
+  g_object_notify_by_pspec (G_OBJECT (surface), gdk_surface_properties[GDK_SURFACE_PROP_MAPPED]);
 }
 
 /**
@@ -1386,7 +1386,7 @@ gdk_surface_layout_on_clock (GdkFrameClock *clock,
         return;
     }
 
-  g_signal_emit (surface, signals[LAYOUT], 0, surface->width, surface->height);
+  g_signal_emit (surface, gdk_surface_signals[GDK_SURFACE_LAYOUT], 0, surface->width, surface->height);
 }
 
 /**
@@ -1439,7 +1439,7 @@ gdk_surface_paint_on_clock (GdkFrameClock *clock,
 
       g_object_ref (surface);
 
-      g_signal_emit (surface, signals[RENDER], 0, expose_region, &handled);
+      g_signal_emit (surface, gdk_surface_signals[GDK_SURFACE_RENDER], 0, expose_region, &handled);
 
       g_object_unref (surface);
     }
@@ -1841,7 +1841,7 @@ gdk_surface_set_cursor_internal (GdkSurface *surface,
   pointer_info = _gdk_display_get_pointer_info (surface->display, device);
 
   if (surface == pointer_info->surface_under_pointer)
-    update_cursor (surface->display, device);
+    gdk_surface_update_cursor (surface->display, device);
 }
 
 /**
@@ -1919,7 +1919,7 @@ gdk_surface_set_cursor (GdkSurface *surface,
         }
 
       g_list_free (seats);
-      g_object_notify_by_pspec (G_OBJECT (surface), properties[PROP_CURSOR]);
+      g_object_notify_by_pspec (G_OBJECT (surface), gdk_surface_properties[GDK_SURFACE_PROP_CURSOR]);
     }
 }
 
@@ -2162,8 +2162,8 @@ gdk_surface_set_input_region (GdkSurface     *surface,
 }
 
 static void
-update_cursor (GdkDisplay *display,
-               GdkDevice  *device)
+gdk_surface_update_cursor (GdkDisplay *display,
+                           GdkDevice  *device)
 {
   GdkSurface *cursor_surface;
   GdkSurface *pointer_surface;
@@ -2238,7 +2238,7 @@ _gdk_display_set_surface_under_pointer (GdkDisplay *display,
   if (surface)
     {
       g_object_ref (surface);
-      update_cursor (display, device);
+      gdk_surface_update_cursor (display, device);
     }
 }
 
@@ -3080,7 +3080,7 @@ gdk_surface_handle_event (GdkEvent *event)
   if (gdk_event_get_event_type (event) == GDK_MOTION_NOTIFY)
     surface->request_motion = FALSE;
 
-  g_signal_emit (surface, signals[EVENT], 0, event, &handled);
+  g_signal_emit (surface, gdk_surface_signals[GDK_SURFACE_EVENT], 0, event, &handled);
 
   if (GDK_PROFILER_IS_RUNNING)
     add_event_mark (event, begin_time, GDK_PROFILER_CURRENT_TIME);
@@ -3189,14 +3189,14 @@ void
 gdk_surface_enter_monitor (GdkSurface *surface,
                            GdkMonitor *monitor)
 {
-  g_signal_emit (surface, signals[ENTER_MONITOR], 0, monitor);
+  g_signal_emit (surface, gdk_surface_signals[GDK_SURFACE_ENTER_MONITOR], 0, monitor);
 }
 
 void
 gdk_surface_leave_monitor (GdkSurface *surface,
                            GdkMonitor *monitor)
 {
-  g_signal_emit (surface, signals[LEAVE_MONITOR], 0, monitor);
+  g_signal_emit (surface, gdk_surface_signals[GDK_SURFACE_LEAVE_MONITOR], 0, monitor);
 }
 
 GdkSubsurface *

gdk/gdktexture.c

@@ -80,15 +80,15 @@ gtk_snapshot_append_texture (GdkSnapshot            *snapshot,
                              const graphene_rect_t  *bounds);
 
 enum {
-  PROP_0,
-  PROP_WIDTH,
-  PROP_HEIGHT,
-  PROP_COLOR_STATE,
+  GDK_TEXTURE_PROP_0,
+  GDK_TEXTURE_PROP_WIDTH,
+  GDK_TEXTURE_PROP_HEIGHT,
+  GDK_TEXTURE_PROP_COLOR_STATE,
 
-  N_PROPS
+  GDK_TEXTURE_N_PROPS
 };
 
-static GParamSpec *properties[N_PROPS];
+static GParamSpec *gdk_texture_properties[GDK_TEXTURE_N_PROPS];
 
 static GdkTextureChain *
 gdk_texture_chain_new (void)
@@ -290,15 +290,15 @@ gdk_texture_set_property (GObject      *gobject,
 
   switch (prop_id)
     {
-    case PROP_WIDTH:
+    case GDK_TEXTURE_PROP_WIDTH:
       self->width = g_value_get_int (value);
       break;
 
-    case PROP_HEIGHT:
+    case GDK_TEXTURE_PROP_HEIGHT:
       self->height = g_value_get_int (value);
       break;
 
-    case PROP_COLOR_STATE:
+    case GDK_TEXTURE_PROP_COLOR_STATE:
       self->color_state = g_value_dup_boxed (value);
       g_assert (self->color_state);
       break;
@@ -319,15 +319,15 @@ gdk_texture_get_property (GObject    *gobject,
 
   switch (prop_id)
     {
-    case PROP_WIDTH:
+    case GDK_TEXTURE_PROP_WIDTH:
       g_value_set_int (value, self->width);
       break;
 
-    case PROP_HEIGHT:
+    case GDK_TEXTURE_PROP_HEIGHT:
       g_value_set_int (value, self->height);
       break;
 
-    case PROP_COLOR_STATE:
+    case GDK_TEXTURE_PROP_COLOR_STATE:
       g_value_set_boxed (value, self->color_state);
       break;
 
@@ -399,7 +399,7 @@ gdk_texture_class_init (GdkTextureClass *klass)
    *
    * The width of the texture, in pixels.
    */
-  properties[PROP_WIDTH] =
+  gdk_texture_properties[GDK_TEXTURE_PROP_WIDTH] =
     g_param_spec_int ("width", NULL, NULL,
                       1,
                       G_MAXINT,
@@ -414,7 +414,7 @@ gdk_texture_class_init (GdkTextureClass *klass)
    *
    * The height of the texture, in pixels.
    */
-  properties[PROP_HEIGHT] =
+  gdk_texture_properties[GDK_TEXTURE_PROP_HEIGHT] =
     g_param_spec_int ("height", NULL, NULL,
                       1,
                       G_MAXINT,
@@ -431,7 +431,7 @@ gdk_texture_class_init (GdkTextureClass *klass)
    *
    * Since: 4.16
    */
-  properties[PROP_COLOR_STATE] =
+  gdk_texture_properties[GDK_TEXTURE_PROP_COLOR_STATE] =
     g_param_spec_boxed ("color-state", NULL, NULL,
                         GDK_TYPE_COLOR_STATE,
                         G_PARAM_READWRITE |
@@ -439,7 +439,7 @@ gdk_texture_class_init (GdkTextureClass *klass)
                         G_PARAM_STATIC_STRINGS |
                         G_PARAM_EXPLICIT_NOTIFY);
 
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+  g_object_class_install_properties (gobject_class, GDK_TEXTURE_N_PROPS, gdk_texture_properties);
 }
 
 static void

gdk/gdktoplevel.c

@@ -43,12 +43,12 @@ G_DEFINE_INTERFACE (GdkToplevel, gdk_toplevel, GDK_TYPE_SURFACE)
 
 enum
 {
-  COMPUTE_SIZE,
+  GDK_TOPLEVEL_COMPUTE_SIZE,
 
-  N_SIGNALS
+  GDK_TOPLEVEL_N_SIGNALS
 };
 
-static guint signals[N_SIGNALS] = { 0 };
+static guint gdk_toplevel_signals[GDK_TOPLEVEL_N_SIGNALS] = { 0 };
 
 static void
 gdk_toplevel_default_present (GdkToplevel       *toplevel,
@@ -109,7 +109,7 @@ void
 gdk_toplevel_notify_compute_size (GdkToplevel     *toplevel,
                                   GdkToplevelSize *size)
 {
-  g_signal_emit (toplevel, signals[COMPUTE_SIZE], 0, size);
+  g_signal_emit (toplevel, gdk_toplevel_signals[GDK_TOPLEVEL_COMPUTE_SIZE], 0, size);
   gdk_toplevel_size_validate (size);
 }
 
@@ -278,7 +278,7 @@ gdk_toplevel_default_init (GdkToplevelInterface *iface)
    * passed via the [struct@Gdk.ToplevelSize] object. Failing to do so
    * will result in an arbitrary size being used as a result.
    */
-  signals[COMPUTE_SIZE] =
+  gdk_toplevel_signals[GDK_TOPLEVEL_COMPUTE_SIZE] =
     g_signal_new (I_("compute-size"),
                   GDK_TYPE_TOPLEVEL,
                   G_SIGNAL_RUN_LAST,

gdk/gdkvulkancontext.c

@@ -88,9 +88,9 @@ struct _GdkVulkanContextPrivate {
 };
 
 enum {
-  IMAGES_UPDATED,
+  GDK_VULKAN_CONTEXT_IMAGES_UPDATED,
 
-  LAST_SIGNAL
+  GDK_VULKAN_CONTEXT_LAST_SIGNAL
 };
 
 /**
@@ -102,7 +102,7 @@ enum {
  **/
 G_DEFINE_QUARK (gdk-vulkan-error-quark, gdk_vulkan_error)
 
-static guint signals[LAST_SIGNAL] = { 0 };
+static guint gdk_vulkan_context_signals[GDK_VULKAN_CONTEXT_LAST_SIGNAL] = { 0 };
 
 static void gdk_vulkan_context_initable_init (GInitableIface *iface);
 
@@ -538,7 +538,7 @@ gdk_vulkan_context_check_swapchain (GdkVulkanContext  *context,
       return FALSE;
     }
 
-  g_signal_emit (context, signals[IMAGES_UPDATED], 0);
+  g_signal_emit (context, gdk_vulkan_context_signals[GDK_VULKAN_CONTEXT_IMAGES_UPDATED], 0);
 
   return res == VK_SUCCESS;
 }
@@ -804,7 +804,7 @@ gdk_vulkan_context_class_init (GdkVulkanContextClass *klass)
    * Usually this means that the swapchain had to be recreated,
    * for example in response to a change of the surface size.
    */
-  signals[IMAGES_UPDATED] =
+  gdk_vulkan_context_signals[GDK_VULKAN_CONTEXT_IMAGES_UPDATED] =
     g_signal_new (g_intern_static_string ("images-updated"),
 		  G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
@@ -2025,7 +2025,7 @@ gdk_display_get_vk_shader_module (GdkDisplay *self,
 static void
 gdk_vulkan_context_class_init (GdkVulkanContextClass *klass)
 {
-  signals[IMAGES_UPDATED] =
+  gdk_vulkan_context_signals[GDK_VULKAN_CONTEXT_IMAGES_UPDATED] =
     g_signal_new (g_intern_static_string ("images-updated"),
 		  G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_LAST,

gdk/meson.build

@@ -293,11 +293,14 @@ if gdk_backends.length() == 0
 endif
 
 libgdk = static_library('gdk',
+  override_options: [ 'unity=on', 'unity_size=10000' ],
   sources: [gdk_sources, gdk_backends_gen_headers, gdk_gen_headers],
   dependencies: gdk_deps + [libgtk_css_dep],
   link_with: [libgtk_css],
   include_directories: [confinc, gdkx11_inc, wlinc],
-  c_args: libgdk_c_args + common_cflags,
+  c_args: libgdk_c_args + common_cflags + [
+    '-Wno-error=redundant-decls',
+  ],
   link_whole: gdk_backends,
 )
 

gsk/gl/gskglbuffer.c

@@ -29,12 +29,12 @@
  * @target: the target buffer such as %GL_ARRAY_BUFFER or %GL_UNIFORM_BUFFER
  * @element_size: the size of elements within the buffer
  *
- * Creates a new `GskGLBuffer` which can be used to deliver data to shaders
+ * Creates a new `GskGLBuffer1` which can be used to deliver data to shaders
  * within a GLSL program. You can use this to store vertices such as with
  * %GL_ARRAY_BUFFER or uniform data with %GL_UNIFORM_BUFFER.
  */
 void
-gsk_gl_buffer_init (GskGLBuffer *self,
+gsk_gl_buffer1_init (GskGLBuffer1 *self,
                     GLenum       target,
                     guint        element_size)
 {
@@ -48,7 +48,7 @@ gsk_gl_buffer_init (GskGLBuffer *self,
 }
 
 GLuint
-gsk_gl_buffer_submit (GskGLBuffer *buffer)
+gsk_gl_buffer1_submit (GskGLBuffer1 *buffer)
 {
   GLuint id;
 
@@ -63,7 +63,7 @@ gsk_gl_buffer_submit (GskGLBuffer *buffer)
 }
 
 void
-gsk_gl_buffer_destroy (GskGLBuffer *buffer)
+gsk_gl_buffer1_destroy (GskGLBuffer1 *buffer)
 {
   g_clear_pointer (&buffer->buffer, g_free);
 }

gsk/gl/gskglbufferprivate.h

@@ -24,7 +24,7 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GskGLBuffer
+typedef struct _GskGLBuffer1
 {
   guint8 *buffer;
   gsize   buffer_pos;
@@ -32,17 +32,17 @@ typedef struct _GskGLBuffer
   guint   count;
   GLenum  target;
   gsize   element_size;
-} GskGLBuffer;
+} GskGLBuffer1;
 
-void   gsk_gl_buffer_init    (GskGLBuffer *self,
-                              GLenum       target,
-                              guint        element_size);
-void   gsk_gl_buffer_destroy (GskGLBuffer *buffer);
-GLuint gsk_gl_buffer_submit  (GskGLBuffer *buffer);
+void   gsk_gl_buffer1_init    (GskGLBuffer1 *self,
+                               GLenum        target,
+                               guint         element_size);
+void   gsk_gl_buffer1_destroy (GskGLBuffer1 *buffer);
+GLuint gsk_gl_buffer1_submit  (GskGLBuffer1 *buffer);
 
 static inline gpointer
-gsk_gl_buffer_advance (GskGLBuffer *buffer,
-                       guint         count)
+gsk_gl_buffer1_advance (GskGLBuffer1 *buffer,
+                        guint         count)
 {
   gpointer ret;
   gsize to_alloc = count * buffer->element_size;
@@ -63,15 +63,15 @@ gsk_gl_buffer_advance (GskGLBuffer *buffer,
 }
 
 static inline void
-gsk_gl_buffer_retract (GskGLBuffer *buffer,
-                       guint        count)
+gsk_gl_buffer1_retract (GskGLBuffer1 *buffer,
+                        guint         count)
 {
   buffer->buffer_pos -= count * buffer->element_size;
   buffer->count -= count;
 }
 
 static inline guint
-gsk_gl_buffer_get_offset (GskGLBuffer *buffer)
+gsk_gl_buffer1_get_offset (GskGLBuffer1 *buffer)
 {
   return buffer->count;
 }

gsk/gl/gskglcommandqueue.c

@@ -434,7 +434,7 @@ gsk_gl_command_queue_dispose (GObject *object)
   gsk_gl_command_uniforms_clear (&self->batch_uniforms);
   gsk_gl_syncs_clear (&self->syncs);
 
-  gsk_gl_buffer_destroy (&self->vertices);
+  gsk_gl_buffer1_destroy (&self->vertices);
 
   G_OBJECT_CLASS (gsk_gl_command_queue_parent_class)->dispose (object);
 }
@@ -457,7 +457,7 @@ gsk_gl_command_queue_init (GskGLCommandQueue *self)
   gsk_gl_command_uniforms_init (&self->batch_uniforms, 2048);
   gsk_gl_syncs_init (&self->syncs, 10);
 
-  gsk_gl_buffer_init (&self->vertices, GL_ARRAY_BUFFER, sizeof (GskGLDrawVertex));
+  gsk_gl_buffer1_init (&self->vertices, GL_ARRAY_BUFFER, sizeof (GskGLDrawVertex));
 }
 
 GskGLCommandQueue *
@@ -619,7 +619,7 @@ gsk_gl_command_queue_begin_draw (GskGLCommandQueue   *self,
   batch->draw.bind_count = 0;
   batch->draw.bind_offset = self->batch_binds.len;
   batch->draw.vbo_count = 0;
-  batch->draw.vbo_offset = gsk_gl_buffer_get_offset (&self->vertices);
+  batch->draw.vbo_offset = gsk_gl_buffer1_get_offset (&self->vertices);
 
   self->fbo_max = MAX (self->fbo_max, batch->draw.framebuffer);
 
@@ -1081,7 +1081,7 @@ gsk_gl_command_queue_execute (GskGLCommandQueue    *self,
       glBindVertexArray (vao_id);
     }
 
-  vbo_id = gsk_gl_buffer_submit (&self->vertices);
+  vbo_id = gsk_gl_buffer1_submit (&self->vertices);
 
   /* 0 = position location */
   glEnableVertexAttribArray (0);

gsk/gl/gskglcommandqueueprivate.h

@@ -199,7 +199,7 @@ struct _GskGLCommandQueue
    * to the GL driver. We can also tweak this to use double buffered arrays
    * if we find that to be faster on some hardware and/or drivers.
    */
-  GskGLBuffer vertices;
+  GskGLBuffer1 vertices;
 
   /* The GskGLAttachmentState contains information about our FBO and texture
    * attachments as we process incoming operations. We snapshot them into
@@ -363,7 +363,7 @@ static inline GskGLDrawVertex *
 gsk_gl_command_queue_add_vertices (GskGLCommandQueue *self)
 {
   gsk_gl_command_queue_get_batch (self)->draw.vbo_count += GSK_GL_N_VERTICES;
-  return gsk_gl_buffer_advance (&self->vertices, GSK_GL_N_VERTICES);
+  return gsk_gl_buffer1_advance (&self->vertices, GSK_GL_N_VERTICES);
 }
 
 static inline GskGLDrawVertex *
@@ -374,7 +374,7 @@ gsk_gl_command_queue_add_n_vertices (GskGLCommandQueue *self,
    * it does *not* add the count to .draw.vbo_count as the caller is responsible
    * for that.
    */
-  return gsk_gl_buffer_advance (&self->vertices, GSK_GL_N_VERTICES * count);
+  return gsk_gl_buffer1_advance (&self->vertices, GSK_GL_N_VERTICES * count);
 }
 
 static inline void
@@ -384,7 +384,7 @@ gsk_gl_command_queue_retract_n_vertices (GskGLCommandQueue *self,
   /* Like gsk_gl_command_queue_add_n_vertices(), this does not tweak
    * the draw vbo_count.
    */
-  gsk_gl_buffer_retract (&self->vertices, GSK_GL_N_VERTICES * count);
+  gsk_gl_buffer1_retract (&self->vertices, GSK_GL_N_VERTICES * count);
 }
 
 static inline guint

gsk/gl/gskglcompiler.c

@@ -427,8 +427,8 @@ gsk_gl_compiler_set_suffix_from_resource (GskGLCompiler     *self,
 }
 
 static void
-prepend_line_numbers (char    *code,
-                      GString *s)
+gl_prepend_line_numbers (char    *code,
+                         GString *s)
 {
   char *p;
   int line;
@@ -475,7 +475,7 @@ check_shader_error (int      shader_id,
   glGetShaderSource (shader_id, code_len, NULL, code);
 
   s = g_string_new ("");
-  prepend_line_numbers (code, s);
+  gl_prepend_line_numbers (code, s);
 
   g_set_error (error,
                GDK_GL_ERROR,
@@ -497,9 +497,9 @@ check_shader_error (int      shader_id,
 }
 
 static void
-print_shader_info (const char *prefix,
-                   int         shader_id,
-                   const char *name)
+gl_print_shader_info (const char *prefix,
+                      int         shader_id,
+                      const char *name)
 {
   if (GSK_DEBUG_CHECK(SHADERS))
     {
@@ -516,7 +516,7 @@ print_shader_info (const char *prefix,
           glGetShaderSource (shader_id, code_len, NULL, code);
 
           s = g_string_new (NULL);
-          prepend_line_numbers (code, s);
+          gl_prepend_line_numbers (code, s);
 
           g_message ("%s %d, %s:\n%s",
                      prefix, shader_id,
@@ -611,7 +611,7 @@ gsk_gl_compiler_compile (GskGLCompiler  *self,
       return NULL;
     }
 
-  print_shader_info ("Vertex shader", vertex_id, name);
+  gl_print_shader_info ("Vertex shader", vertex_id, name);
 
   fragment_id = glCreateShader (GL_FRAGMENT_SHADER);
   glShaderSource (fragment_id,
@@ -645,7 +645,7 @@ gsk_gl_compiler_compile (GskGLCompiler  *self,
       return NULL;
     }
 
-  print_shader_info ("Fragment shader", fragment_id, name);
+  gl_print_shader_info ("Fragment shader", fragment_id, name);
 
   program_id = glCreateProgram ();
   glAttachShader (program_id, vertex_id);

gsk/gl/gskglrenderer.c

@@ -263,8 +263,8 @@ gsk_gl_renderer_unrealize (GskRenderer *renderer)
 }
 
 static cairo_region_t *
-get_render_region (GdkSurface   *surface,
-                   GdkGLContext *context)
+gl_get_render_region (GdkSurface   *surface,
+                      GdkGLContext *context)
 {
   const cairo_region_t *damage;
   GdkRectangle whole_surface;
@@ -338,7 +338,7 @@ gsk_gl_renderer_render (GskRenderer          *renderer,
   gdk_gl_context_make_current (self->context);
 
   /* Must be called *AFTER* gdk_draw_context_begin_frame() */
-  render_region = get_render_region (surface, self->context);
+  render_region = gl_get_render_region (surface, self->context);
 
   gsk_gl_driver_begin_frame (self->driver, self->command_queue);
   job = gsk_gl_render_job_new (self->driver, &viewport, scale, render_region, 0, TRUE);

gsk/gl/gskglrenderer.h

@@ -50,5 +50,6 @@ GSK_INCLUDE_WARNING(GDK_AVAILABLE_IN_ALL)
 GType        gsk_ngl_renderer_get_type (void) G_GNUC_CONST;
 GSK_INCLUDE_WARNING(GDK_AVAILABLE_IN_ALL)
 GskRenderer *gsk_ngl_renderer_new      (void);
+
 G_END_DECLS
 

gsk/gl/gskglrenderjob.c

@@ -870,8 +870,8 @@ gsk_gl_render_job_transform_rounded_rect (GskGLRenderJob       *job,
 }
 
 static inline void
-rounded_rect_get_inner (const GskRoundedRect *rect,
-                        graphene_rect_t      *inner)
+gl_rounded_rect_get_inner (const GskRoundedRect *rect,
+                           graphene_rect_t      *inner)
 {
   float left = MAX (rect->corner[GSK_CORNER_TOP_LEFT].width, rect->corner[GSK_CORNER_BOTTOM_LEFT].width);
   float right = MAX (rect->corner[GSK_CORNER_TOP_RIGHT].width, rect->corner[GSK_CORNER_BOTTOM_RIGHT].width);
@@ -886,8 +886,8 @@ rounded_rect_get_inner (const GskRoundedRect *rect,
 }
 
 static inline gboolean
-interval_contains (float p1, float w1,
-                   float p2, float w2)
+gl_interval_contains (float p1, float w1,
+                      float p2, float w2)
 {
   if (p2 < p1)
     return FALSE;
@@ -938,12 +938,12 @@ gsk_gl_render_job_update_clip (GskGLRenderJob        *job,
     {
       graphene_rect_t inner;
 
-      rounded_rect_get_inner (&job->current_clip->rect, &inner);
+      gl_rounded_rect_get_inner (&job->current_clip->rect, &inner);
 
-      if (interval_contains (inner.origin.x, inner.size.width,
-                             transformed_bounds.origin.x, transformed_bounds.size.width) ||
-          interval_contains (inner.origin.y, inner.size.height,
-                             transformed_bounds.origin.y, transformed_bounds.size.height))
+      if (gl_interval_contains (inner.origin.x, inner.size.width,
+                                transformed_bounds.origin.x, transformed_bounds.size.width) ||
+          gl_interval_contains (inner.origin.y, inner.size.height,
+                                transformed_bounds.origin.y, transformed_bounds.size.height))
         rect_clip = TRUE;
     }
 
@@ -1446,7 +1446,7 @@ blur_node (GskGLRenderJob       *job,
   *max_y = job->offset_y + node->bounds.origin.y + node->bounds.size.height + half_blur_extra;
 }
 
-#define ATLAS_SIZE 512
+#define GL_ATLAS_SIZE 512
 
 static void
 get_color_node_color_as_srgb (const GskRenderNode *node,
@@ -1493,10 +1493,10 @@ gsk_gl_render_job_visit_color_node (GskGLRenderJob      *job,
            * having to choose any particular atlas texture.
            */
           offscreen.was_offscreen = FALSE;
-          offscreen.area.x = 1.f / ATLAS_SIZE;
-          offscreen.area.y = 1.f / ATLAS_SIZE;
-          offscreen.area.x2 = 2.f / ATLAS_SIZE;
-          offscreen.area.y2 = 2.f / ATLAS_SIZE;
+          offscreen.area.x = 1.f / GL_ATLAS_SIZE;
+          offscreen.area.y = 1.f / GL_ATLAS_SIZE;
+          offscreen.area.x2 = 2.f / GL_ATLAS_SIZE;
+          offscreen.area.y2 = 2.f / GL_ATLAS_SIZE;
 
           gsk_gl_render_job_draw_offscreen_with_color (job,
                                                        &node->bounds,

gsk/gl/gskglshadowlibrary.c

@@ -45,12 +45,13 @@ typedef struct _Shadow
 G_DEFINE_TYPE (GskGLShadowLibrary, gsk_gl_shadow_library, G_TYPE_OBJECT)
 
 enum {
-  PROP_0,
-  PROP_DRIVER,
-  N_PROPS
+  GL_SHADOW_LIBRARY_PROP_0,
+  GL_SHADOW_LIBRARY_PROP_DRIVER,
+
+  GL_SHADOW_LIBRARY_N_PROPS
 };
 
-static GParamSpec *properties [N_PROPS];
+static GParamSpec *gl_shadow_library_properties [GL_SHADOW_LIBRARY_N_PROPS];
 
 GskGLShadowLibrary *
 gsk_gl_shadow_library_new (GskGLDriver *driver)
@@ -89,7 +90,7 @@ gsk_gl_shadow_library_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_DRIVER:
+    case GL_SHADOW_LIBRARY_PROP_DRIVER:
       g_value_set_object (value, self->driver);
       break;
 
@@ -108,7 +109,7 @@ gsk_gl_shadow_library_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_DRIVER:
+    case GL_SHADOW_LIBRARY_PROP_DRIVER:
       self->driver = g_value_dup_object (value);
       break;
 
@@ -126,12 +127,12 @@ gsk_gl_shadow_library_class_init (GskGLShadowLibraryClass *klass)
   object_class->get_property = gsk_gl_shadow_library_get_property;
   object_class->set_property = gsk_gl_shadow_library_set_property;
 
-  properties [PROP_DRIVER] =
+  gl_shadow_library_properties[GL_SHADOW_LIBRARY_PROP_DRIVER] =
     g_param_spec_object ("driver", NULL, NULL,
                          GSK_TYPE_GL_DRIVER,
                          (G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
-  g_object_class_install_properties (object_class, N_PROPS, properties);
+  g_object_class_install_properties (object_class, GL_SHADOW_LIBRARY_N_PROPS, gl_shadow_library_properties);
 }
 
 static void

gsk/gl/gskgltypesprivate.h

@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 #define GSK_GL_N_VERTICES 6
 
 typedef struct _GskGLAttachmentState GskGLAttachmentState;
-typedef struct _GskGLBuffer GskGLBuffer;
+typedef struct _GskGLBuffer1 GskGLBuffer1;
 typedef struct _GskGLCommandQueue GskGLCommandQueue;
 typedef struct _GskGLCompiler GskGLCompiler;
 typedef struct _GskGLDrawVertex GskGLDrawVertex;

gsk/gpu/gskgpuborderop.c

@@ -20,8 +20,8 @@ static gboolean
 color_equal (const float *color1,
              const float *color2)
 {
-  return gdk_rgba_equal (&(GdkRGBA) { color1[0], color1[1], color1[2], color1[3] },
-                         &(GdkRGBA) { color2[0], color2[1], color2[2], color2[3] });
+  return gdk_rgba_equal ((&(GdkRGBA) { color1[0], color1[1], color1[2], color1[3] }),
+                         (&(GdkRGBA) { color2[0], color2[1], color2[2], color2[3] }));
 }
 
 static void

gsk/gpu/gskgpuconvertcicpop.c

@@ -39,7 +39,7 @@ gsk_gpu_convert_cicp_op_print_instance (GskGpuShaderOp *shader,
                           0, 1);
 }
 
-static const GskGpuShaderOpClass GSK_GPU_CONVERT_OP_CLASS = {
+static const GskGpuShaderOpClass GSK_GPU_CONVERT_CICP_OP_CLASS = {
   {
     GSK_GPU_OP_SIZE (GskGpuConvertCicpOp),
     GSK_GPU_STAGE_SHADER,
@@ -74,7 +74,7 @@ gsk_gpu_convert_from_cicp_op (GskGpuFrame             *frame,
   GskGpuConvertcicpInstance *instance;
 
   gsk_gpu_shader_op_alloc (frame,
-                           &GSK_GPU_CONVERT_OP_CLASS,
+                           &GSK_GPU_CONVERT_CICP_OP_CLASS,
                            color_states,
                            (opacity < 1.0 ? VARIATION_OPACITY : 0) |
                              (straight_alpha ? VARIATION_STRAIGHT_ALPHA : 0),
@@ -103,7 +103,7 @@ gsk_gpu_convert_to_cicp_op (GskGpuFrame             *frame,
   GskGpuConvertcicpInstance *instance;
 
   gsk_gpu_shader_op_alloc (frame,
-                           &GSK_GPU_CONVERT_OP_CLASS,
+                           &GSK_GPU_CONVERT_CICP_OP_CLASS,
                            color_states,
                            (opacity < 1.0 ? VARIATION_OPACITY : 0) |
                              (straight_alpha ? VARIATION_STRAIGHT_ALPHA : 0) |

gsk/gpu/gskvulkanycbcr.c

@@ -42,10 +42,10 @@ gsk_vulkan_ycbcr_free (GskGpuCache  *cache,
 }
 
 static inline gboolean
-gsk_gpu_cached_is_old (GskGpuCache  *self,
-                       GskGpuCached *cached,
-                       gint64        cache_timeout,
-                       gint64        timestamp)
+gsk_vulkan_ycbcr_cached_is_old (GskGpuCache  *self,
+                                GskGpuCached *cached,
+                                gint64        cache_timeout,
+                                gint64        timestamp)
 {
   if (cache_timeout < 0)
     return -1;
@@ -64,7 +64,7 @@ gsk_vulkan_ycbcr_should_collect (GskGpuCache  *cache,
   if (self->ref_count > 0)
     return FALSE;
 
-  return gsk_gpu_cached_is_old (cache, cached, cache_timeout, timestamp);
+  return gsk_vulkan_ycbcr_cached_is_old (cache, cached, cache_timeout, timestamp);
 }
 
 static const GskGpuCachedClass GSK_VULKAN_YCBCR_CLASS =

gsk/gskcairoblur.c

@@ -286,8 +286,8 @@ gsk_cairo_blur_compute_pixels (double radius)
 }
 
 static gboolean
-needs_blur (float        radius,
-            GskBlurFlags blur_flags)
+cairo_needs_blur (float        radius,
+                  GskBlurFlags blur_flags)
 {
   /* Neither blurring horizontal nor vertical means no blurring at all. */
   if ((blur_flags & (GSK_BLUR_X | GSK_BLUR_Y)) == 0)
@@ -316,7 +316,7 @@ gsk_cairo_blur_start_drawing (cairo_t         *cr,
   gboolean blur_x = (blur_flags & GSK_BLUR_X) != 0;
   gboolean blur_y = (blur_flags & GSK_BLUR_Y) != 0;
 
-  if (!needs_blur (radius, blur_flags))
+  if (!cairo_needs_blur (radius, blur_flags))
     return cr;
 
   cairo_clip_extents (cr, &clip_x1, &clip_y1, &clip_x2, &clip_y2);
@@ -385,7 +385,7 @@ gsk_cairo_blur_finish_drawing (cairo_t         *cr,
   cairo_surface_t *surface;
   double x_scale;
 
-  if (!needs_blur (radius, blur_flags))
+  if (!cairo_needs_blur (radius, blur_flags))
     return cr;
 
   original_cr = cairo_get_user_data (cr, &original_cr_key);

gsk/gskcontour.c

@@ -101,22 +101,6 @@ struct _GskContourClass
 
 /* {{{ Utilities */
 
-#define DEG_TO_RAD(x)          ((x) * (G_PI / 180.f))
-#define RAD_TO_DEG(x)          ((x) / (G_PI / 180.f))
-
-static inline void
-_sincosf (float  angle,
-          float *out_s,
-          float *out_c)
-{
-#ifdef HAVE_SINCOSF
-  sincosf (angle, out_s, out_c);
-#else
-  *out_s = sinf (angle);
-  *out_c = cosf (angle);
-#endif
-}
-
 static void
 _g_string_append_float (GString    *string,
                         const char *prefix,
@@ -1587,7 +1571,7 @@ gsk_circle_contour_get_position (const GskContour   *contour,
     {
       float s, c;
 
-      _sincosf (M_PI_2 * ((idx - 1) + t), &s, &c);
+      gsk_sincosf (M_PI_2 * ((idx - 1) + t), &s, &c);
       *position = GRAPHENE_POINT_INIT (self->center.x + c * self->radius,
                                        self->center.y + s * self->radius);
     }

gsk/gskcurve.c

@@ -91,9 +91,6 @@ struct _GskCurveClass
 
 /* {{{ Utilities */
 
-#define RAD_TO_DEG(r) ((r)*180.f/M_PI)
-#define DEG_TO_RAD(d) ((d)*M_PI/180.f)
-
 static void
 get_tangent (const graphene_point_t *p0,
              const graphene_point_t *p1,
@@ -2481,19 +2478,6 @@ gsk_curve_at_length (const GskCurve *curve,
   return get_class (curve->op)->get_at_length (curve, length, epsilon);
 }
 
-static inline void
-_sincosf (float  angle,
-          float *out_s,
-          float *out_c)
-{
-#ifdef HAVE_SINCOSF
-      sincosf (angle, out_s, out_c);
-#else
-      *out_s = sinf (angle);
-      *out_c = cosf (angle);
-#endif
-}
-
 static void
 align_points (const graphene_point_t *p,
               const graphene_point_t *a,
@@ -2507,7 +2491,7 @@ align_points (const graphene_point_t *p,
 
   get_tangent (a, b, &n1);
   angle = - atan2f (graphene_vec2_get_y (&n1), graphene_vec2_get_x (&n1));
-  _sincosf (angle, &s, &c);
+  gsk_sincosf (angle, &s, &c);
 
   for (int i = 0; i < n; i++)
     {

gsk/gskpathbuilder.c

@@ -27,6 +27,7 @@
 #include "gskcurveprivate.h"
 #include "gskpathpointprivate.h"
 #include "gskcontourprivate.h"
+#include "gskprivate.h"
 
 /**
  * GskPathBuilder:
@@ -1270,19 +1271,6 @@ arc_segment (GskPathBuilder *self,
                              cy + sin_phi * x3 + cos_phi * y3);
 }
 
-static inline void
-_sincos (double angle,
-         double *y,
-         double *x)
-{
-#ifdef HAVE_SINCOS
-  sincos (angle, y, x);
-#else
-  *x = cos (angle);
-  *y = sin (angle);
-#endif
-}
-
 /**
  * gsk_path_builder_svg_arc_to:
  * @self: a `GskPathBuilder`
@@ -1353,7 +1341,7 @@ gsk_path_builder_svg_arc_to (GskPathBuilder *self,
   y2 = y;
 
   phi = x_axis_rotation * M_PI / 180.0;
-  _sincos (phi, &sin_phi, &cos_phi);
+  gsk_sincos (phi, &sin_phi, &cos_phi);
 
   rx = fabs (rx);
   ry = fabs (ry);
@@ -1415,7 +1403,7 @@ gsk_path_builder_svg_arc_to (GskPathBuilder *self,
 
   n_segs = ceil (fabs (delta_theta / (M_PI_2 + 0.001)));
   d_theta = delta_theta / n_segs;
-  _sincos (theta1, &sin_th1, &cos_th1);
+  gsk_sincos (theta1, &sin_th1, &cos_th1);
 
   th_half = d_theta / 2;
   t = (8.0 / 3.0) * sin (th_half / 2) * sin (th_half / 2) / sin (th_half);
@@ -1426,7 +1414,7 @@ gsk_path_builder_svg_arc_to (GskPathBuilder *self,
       theta1 = theta + d_theta;
       sin_th0 = sin_th1;
       cos_th0 = cos_th1;
-      _sincos (theta1, &sin_th1, &cos_th1);
+      gsk_sincos (theta1, &sin_th1, &cos_th1);
       arc_segment (self,
                    cx, cy, rx, ry,
                    sin_phi, cos_phi,
@@ -1494,9 +1482,6 @@ angle_between (const graphene_vec2_t *t1,
   return angle;
 }
 
-#define RAD_TO_DEG(r) ((r)*180.f/M_PI)
-#define DEG_TO_RAD(d) ((d)*M_PI/180.f)
-
 static float
 angle_between_points (const graphene_point_t *c,
                       const graphene_point_t *a,

gsk/gskpathparser.c

@@ -167,8 +167,8 @@ parse_command (const char **p,
 }
 
 static gboolean
-parse_string (const char **p,
-              const char  *s)
+parse_char (const char **p,
+            const char  *s)
 { 
   int len = strlen (s);
   if (strncmp (*p, s, len) != 0)
@@ -205,7 +205,7 @@ is_line (double x0, double y0,
 }
 
 static gboolean
-parse_rectangle (const char **p,
+parse_rect_path (const char **p,
                  double      *x,
                  double      *y,
                  double      *w,
@@ -215,13 +215,13 @@ parse_rectangle (const char **p,
   double w2;
 
   if (parse_coordinate_pair (p, x, y) &&
-      parse_string (p, "h") &&
+      parse_char (p, "h") &&
       parse_coordinate (p, w) &&
-      parse_string (p, "v") &&
+      parse_char (p, "v") &&
       parse_coordinate (p, h) &&
-      parse_string (p, "h") &&
+      parse_char (p, "h") &&
       parse_coordinate (p, &w2) &&
-      parse_string (p, "z") &&
+      parse_char (p, "z") &&
       w2 == -*w && *w >= 0 && *h >= 0)
     {
       skip_whitespace (p);
@@ -234,10 +234,10 @@ parse_rectangle (const char **p,
 }
 
 static gboolean
-parse_circle (const char **p,
-              double      *cx,
-              double      *cy,
-              double      *r)
+parse_circle_path (const char **p,
+                   double      *cx,
+                   double      *cy,
+                   double      *r)
 {
   const char *o = *p;
   double x0, y0, x1, y1, x2, y2, x3, y3;
@@ -246,23 +246,23 @@ parse_circle (const char **p,
   double rr;
 
   if (parse_coordinate_pair (p, &x0, &y0) &&
-      parse_string (p, "o") &&
+      parse_char (p, "o") &&
       parse_coordinate_pair (p, &x1, &y1) &&
       parse_coordinate_pair (p, &x2, &y2) &&
       parse_nonnegative_number (p, &w0) &&
-      parse_string (p, "o") &&
+      parse_char (p, "o") &&
       parse_coordinate_pair (p, &x3, &y3) &&
       parse_coordinate_pair (p, &x4, &y4) &&
       parse_nonnegative_number (p, &w1) &&
-      parse_string (p, "o") &&
+      parse_char (p, "o") &&
       parse_coordinate_pair (p, &x5, &y5) &&
       parse_coordinate_pair (p, &x6, &y6) &&
       parse_nonnegative_number (p, &w2) &&
-      parse_string (p, "o") &&
+      parse_char (p, "o") &&
       parse_coordinate_pair (p, &x7, &y7) &&
       parse_coordinate_pair (p, &x8, &y8) &&
       parse_nonnegative_number (p, &w3) &&
-      parse_string (p, "z"))
+      parse_char (p, "z"))
     {
       rr = y1;
 
@@ -292,8 +292,8 @@ parse_circle (const char **p,
 }
 
 static gboolean
-parse_rounded_rect (const char     **p,
-                    GskRoundedRect  *rr)
+parse_rounded_rect_path (const char     **p,
+                         GskRoundedRect  *rr)
 {
   const char *o = *p;
   double x0, y0, x1, y1, x2, y2, x3, y3;
@@ -302,31 +302,31 @@ parse_rounded_rect (const char     **p,
   double x12, y12, w0, w1, w2, w3;
 
   if (parse_coordinate_pair (p, &x0, &y0) &&
-      parse_string (p, "L") &&
+      parse_char (p, "L") &&
       parse_coordinate_pair (p, &x1, &y1) &&
-      parse_string (p, "O") &&
+      parse_char (p, "O") &&
       parse_coordinate_pair (p, &x2, &y2) &&
       parse_coordinate_pair (p, &x3, &y3) &&
       parse_nonnegative_number (p, &w0) &&
-      parse_string (p, "L") &&
+      parse_char (p, "L") &&
       parse_coordinate_pair (p, &x4, &y4) &&
-      parse_string (p, "O") &&
+      parse_char (p, "O") &&
       parse_coordinate_pair (p, &x5, &y5) &&
       parse_coordinate_pair (p, &x6, &y6) &&
       parse_nonnegative_number (p, &w1) &&
-      parse_string (p, "L") &&
+      parse_char (p, "L") &&
       parse_coordinate_pair (p, &x7, &y7) &&
-      parse_string (p, "O") &&
+      parse_char (p, "O") &&
       parse_coordinate_pair (p, &x8, &y8) &&
       parse_coordinate_pair (p, &x9, &y9) &&
       parse_nonnegative_number (p, &w2) &&
-      parse_string (p, "L") &&
+      parse_char (p, "L") &&
       parse_coordinate_pair (p, &x10, &y10) &&
-      parse_string (p, "O") &&
+      parse_char (p, "O") &&
       parse_coordinate_pair (p, &x11, &y11) &&
       parse_coordinate_pair (p, &x12, &y12) &&
       parse_nonnegative_number (p, &w3) &&
-      parse_string (p, "Z"))
+      parse_char (p, "Z"))
     {
       if (NEAR (x0, x12) && NEAR (y0, y12) &&
           is_rect (x11, y11, x2, y2, x5, y5, x8, y8) &&
@@ -443,7 +443,7 @@ gsk_path_parse (const char *string)
             GskRoundedRect rr;
 
             /* Look for special contours */
-            if (parse_rectangle (&p, &x1, &y1, &w, &h))
+            if (parse_rect_path (&p, &x1, &y1, &w, &h))
               {
                 gsk_path_builder_add_rect (builder, &GRAPHENE_RECT_INIT (x1, y1, w, h));
                 if (_strchr ("zZX", prev_cmd))
@@ -455,7 +455,7 @@ gsk_path_parse (const char *string)
                 x = x1;
                 y = y1;
               }
-            else if (parse_circle (&p, &x1, &y1, &r))
+            else if (parse_circle_path (&p, &x1, &y1, &r))
               {
                 gsk_path_builder_add_circle (builder, &GRAPHENE_POINT_INIT (x1, y1), r);
 
@@ -468,7 +468,7 @@ gsk_path_parse (const char *string)
                 x = x1 + r;
                 y = y1;
               }
-            else if (parse_rounded_rect (&p, &rr))
+            else if (parse_rounded_rect_path (&p, &rr))
               {
                 gsk_path_builder_add_rounded_rect (builder, &rr);
 

gsk/gskpathpoint.c

@@ -23,10 +23,9 @@
 
 #include "gskpathpointprivate.h"
 #include "gskcontourprivate.h"
+#include "gskprivate.h"
 #include "gdk/gdkprivate.h"
 
-#define RAD_TO_DEG(x)          ((x) / (G_PI / 180.f))
-
 /**
  * GskPathPoint:
  *

gsk/gskprivate.c

@@ -142,3 +142,70 @@ gsk_font_get_hint_style (PangoFont *font)
 
   return style;
 }
+
+void
+gsk_string_append_double (GString *string,
+                          double   d)
+{
+  char buf[G_ASCII_DTOSTR_BUF_SIZE];
+
+  g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%g", d);
+  g_string_append (string, buf);
+}
+
+void
+gsk_sincos (double angle,
+            double *out_s,
+            double *out_c)
+{
+#ifdef HAVE_SINCOS
+  sincos (angle, out_s, out_c);
+#else
+  *out_s = sin (angle);
+  *out_c = cos (angle);
+#endif
+}
+
+void
+gsk_sincosf (float angle,
+             float *out_s,
+             float *out_c)
+{
+#ifdef HAVE_SINCOSF
+  sincosf (angle, out_s, out_c);
+#else
+  *out_s = sinf (angle);
+  *out_c = cosf (angle);
+#endif
+}
+
+void
+gsk_sincosf_deg (float  deg,
+                 float *out_s,
+                 float *out_c)
+{
+  if (deg == 90.0)
+    {
+      *out_c = 0.0;
+      *out_s = 1.0;
+    }
+  else if (deg == 180.0)
+    {
+      *out_c = -1.0;
+      *out_s = 0.0;
+    }
+  else if (deg == 270.0)
+    {
+      *out_c = 0.0;
+      *out_s = -1.0;
+    }
+  else if (deg == 0.0)
+    {
+      *out_c = 1.0;
+      *out_s = 0.0;
+    }
+  else
+    {
+      gsk_sincosf (DEG_TO_RAD (deg), out_s, out_c);
+    }
+}

gsk/gskprivate.h

@@ -6,6 +6,9 @@
 
 G_BEGIN_DECLS
 
+#define RAD_TO_DEG(x)          ((x) / (G_PI / 180.f))
+#define DEG_TO_RAD(x)          ((x) * (G_PI / 180.f))
+
 void       gsk_ensure_resources  (void);
 
 PangoFont *gsk_reload_font (PangoFont            *font,
@@ -16,5 +19,19 @@ PangoFont *gsk_reload_font (PangoFont            *font,
 
 cairo_hint_style_t gsk_font_get_hint_style (PangoFont *font);
 
+void gsk_string_append_double (GString *string,
+                               double   d);
+
+void gsk_sincosf_deg (float  deg,
+                      float *out_s,
+                      float *out_c);
+void gsk_sincosf     (float  rad,
+                      float *out_s,
+                      float *out_c);
+void gsk_sincos      (double rad,
+                      double *out_s,
+                      double *out_c);
+
+
 G_END_DECLS
 

gsk/gskrenderer.c

@@ -45,6 +45,7 @@
 
 #include "gl/gskglrenderer.h"
 #include "gpu/gskvulkanrenderer.h"
+#include "gpu/gsknglrendererprivate.h"
 #include "gdk/gdkvulkancontextprivate.h"
 #include "gdk/gdkdisplayprivate.h"
 
@@ -90,14 +91,14 @@ typedef struct
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GskRenderer, gsk_renderer, G_TYPE_OBJECT)
 
 enum {
-  PROP_0,
-  PROP_REALIZED,
-  PROP_SURFACE,
+  GSK_RENDERER_PROP_0,
+  GSK_RENDERER_PROP_REALIZED,
+  GSK_RENDERER_PROP_SURFACE,
 
-  N_PROPS
+  GSK_RENDERER_N_PROPS
 };
 
-static GParamSpec *gsk_renderer_properties[N_PROPS];
+static GParamSpec *gsk_renderer_properties[GSK_RENDERER_N_PROPS];
 
 #define GSK_RENDERER_WARN_NOT_IMPLEMENTED_METHOD(obj,method) \
   g_critical ("Renderer of type '%s' does not implement GskRenderer::" # method, G_OBJECT_TYPE_NAME (obj))
@@ -161,11 +162,11 @@ gsk_renderer_get_property (GObject    *gobject,
 
   switch (prop_id)
     {
-    case PROP_REALIZED:
+    case GSK_RENDERER_PROP_REALIZED:
       g_value_set_boolean (value, priv->is_realized);
       break;
 
-    case PROP_SURFACE:
+    case GSK_RENDERER_PROP_SURFACE:
       g_value_set_object (value, priv->surface);
       break;
 
@@ -193,7 +194,7 @@ gsk_renderer_class_init (GskRendererClass *klass)
    *
    * Whether the renderer has been associated with a surface or draw context.
    */
-  gsk_renderer_properties[PROP_REALIZED] =
+  gsk_renderer_properties[GSK_RENDERER_PROP_REALIZED] =
     g_param_spec_boolean ("realized", NULL, NULL,
                           FALSE,
                           G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
@@ -203,12 +204,12 @@ gsk_renderer_class_init (GskRendererClass *klass)
    *
    * The surface associated with renderer.
    */
-  gsk_renderer_properties[PROP_SURFACE] =
+  gsk_renderer_properties[GSK_RENDERER_PROP_SURFACE] =
     g_param_spec_object ("surface", NULL, NULL,
                          GDK_TYPE_SURFACE,
                          G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
 
-  g_object_class_install_properties (gobject_class, N_PROPS, gsk_renderer_properties);
+  g_object_class_install_properties (gobject_class, GSK_RENDERER_N_PROPS, gsk_renderer_properties);
 }
 
 static void

gsk/gskrendernodeimpl.c

@@ -1076,8 +1076,6 @@ gsk_conic_gradient_node_finalize (GskRenderNode *node)
   parent_class->finalize (node);
 }
 
-#define DEG_TO_RAD(x)          ((x) * (G_PI / 180.f))
-
 static void
 _cairo_mesh_pattern_set_corner_rgba (cairo_pattern_t *pattern,
                                      guint            corner_num,
@@ -1094,12 +1092,8 @@ project (double  angle,
 {
   double x, y;
 
-#ifdef HAVE_SINCOS
-  sincos (angle, &y, &x);
-#else
-  x = cos (angle);
-  y = sin (angle);
-#endif
+  gsk_sincos (angle, &y, &x);
+
   *x_out = radius * x;
   *y_out = radius * y;
 }

gsk/gskrendernodeparser.c

@@ -503,7 +503,7 @@ parse_double (GtkCssParser *parser,
 
 static gboolean
 parse_positive_double (GtkCssParser *parser,
-                       Context      *context,
+                     Context      *context,
                        gpointer      out_double)
 {
   if (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SIGNED_NUMBER)
@@ -3540,28 +3540,17 @@ end_node (Printer *self)
   g_string_append (self->str, "}\n");
 }
 
-static void
-string_append_double (GString *string,
-                      double   d)
-{
-  char buf[G_ASCII_DTOSTR_BUF_SIZE];
-
-  g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%g", d);
-  g_string_append (string, buf);
-}
-
-
 static void
 append_rect (GString               *str,
              const graphene_rect_t *r)
 {
-  string_append_double (str, r->origin.x);
+  gsk_string_append_double (str, r->origin.x);
   g_string_append_c (str, ' ');
-  string_append_double (str, r->origin.y);
+  gsk_string_append_double (str, r->origin.y);
   g_string_append_c (str, ' ');
-  string_append_double (str, r->size.width);
+  gsk_string_append_double (str, r->size.width);
   g_string_append_c (str, ' ');
-  string_append_double (str, r->size.height);
+  gsk_string_append_double (str, r->size.height);
 }
 
 static void
@@ -3593,23 +3582,23 @@ append_rounded_rect (GString              *str,
 
       if (all_the_same)
         {
-          string_append_double (str, w);
+          gsk_string_append_double (str, w);
         }
       else if (all_square)
         {
-          string_append_double (str, r->corner[0].width);
+          gsk_string_append_double (str, r->corner[0].width);
           g_string_append_c (str, ' ');
-          string_append_double (str, r->corner[1].width);
+          gsk_string_append_double (str, r->corner[1].width);
           g_string_append_c (str, ' ');
-          string_append_double (str, r->corner[2].width);
+          gsk_string_append_double (str, r->corner[2].width);
           g_string_append_c (str, ' ');
-          string_append_double (str, r->corner[3].width);
+          gsk_string_append_double (str, r->corner[3].width);
         }
       else
         {
           for (i = 0; i < 4; i ++)
             {
-              string_append_double (str, r->corner[i].width);
+              gsk_string_append_double (str, r->corner[i].width);
               g_string_append_c (str, ' ');
             }
 
@@ -3617,11 +3606,11 @@ append_rounded_rect (GString              *str,
 
           for (i = 0; i < 3; i ++)
             {
-              string_append_double (str, r->corner[i].height);
+              gsk_string_append_double (str, r->corner[i].height);
               g_string_append_c (str, ' ');
             }
 
-          string_append_double (str, r->corner[3].height);
+          gsk_string_append_double (str, r->corner[3].height);
         }
     }
 }
@@ -3630,22 +3619,22 @@ static void
 append_point (GString                *str,
               const graphene_point_t *p)
 {
-  string_append_double (str, p->x);
+  gsk_string_append_double (str, p->x);
   g_string_append_c (str, ' ');
-  string_append_double (str, p->y);
+  gsk_string_append_double (str, p->y);
 }
 
 static void
 append_vec4 (GString               *str,
              const graphene_vec4_t *v)
 {
-  string_append_double (str, graphene_vec4_get_x (v));
+  gsk_string_append_double (str, graphene_vec4_get_x (v));
   g_string_append_c (str, ' ');
-  string_append_double (str, graphene_vec4_get_y (v));
+  gsk_string_append_double (str, graphene_vec4_get_y (v));
   g_string_append_c (str, ' ');
-  string_append_double (str, graphene_vec4_get_z (v));
+  gsk_string_append_double (str, graphene_vec4_get_z (v));
   g_string_append_c (str, ' ');
-  string_append_double (str, graphene_vec4_get_w (v));
+  gsk_string_append_double (str, graphene_vec4_get_w (v));
 }
 
 static void
@@ -3660,7 +3649,7 @@ append_float_param (Printer    *p,
 
   _indent (p);
   g_string_append_printf (p->str, "%s: ", param_name);
-  string_append_double (p->str, value);
+  gsk_string_append_double (p->str, value);
   g_string_append (p->str, ";\n");
 }
 
@@ -3699,15 +3688,15 @@ print_color (Printer        *p,
           g_string_append_printf (p->str, "color(\"%s\" ", name);
         }
 
-      string_append_double (p->str, color->r);
+      gsk_string_append_double (p->str, color->r);
       g_string_append_c (p->str, ' ');
-      string_append_double (p->str, color->g);
+      gsk_string_append_double (p->str, color->g);
       g_string_append_c (p->str, ' ');
-      string_append_double (p->str, color->b);
+      gsk_string_append_double (p->str, color->b);
       if (color->a < 1)
         {
           g_string_append (p->str, " / ");
-          string_append_double (p->str, color->a);
+          gsk_string_append_double (p->str, color->a);
         }
       g_string_append_c (p->str, ')');
     }
@@ -3872,7 +3861,7 @@ append_stops_param (Printer            *p,
       if (i > 0)
         g_string_append (p->str, ", ");
 
-      string_append_double (p->str, stops[i].offset);
+      gsk_string_append_double (p->str, stops[i].offset);
       g_string_append_c (p->str, ' ');
       gdk_rgba_print (&stops[i].color, p->str);
     }
@@ -4154,16 +4143,16 @@ gsk_text_node_serialize_glyphs (GskRenderNode *node,
         }
 
       g_string_append_printf (p, "%u ", glyphs[i].glyph);
-      string_append_double (p, (double) glyphs[i].geometry.width / PANGO_SCALE);
+      gsk_string_append_double (p, (double) glyphs[i].geometry.width / PANGO_SCALE);
       if (!glyphs[i].attr.is_cluster_start ||
           glyphs[i].attr.is_color ||
           glyphs[i].geometry.x_offset != 0 ||
           glyphs[i].geometry.y_offset != 0)
         {
           g_string_append (p, " ");
-          string_append_double (p, (double) glyphs[i].geometry.x_offset / PANGO_SCALE);
+          gsk_string_append_double (p, (double) glyphs[i].geometry.x_offset / PANGO_SCALE);
           g_string_append (p, " ");
-          string_append_double (p, (double) glyphs[i].geometry.y_offset / PANGO_SCALE);
+          gsk_string_append_double (p, (double) glyphs[i].geometry.y_offset / PANGO_SCALE);
           if (!glyphs[i].attr.is_cluster_start)
             g_string_append (p, " same-cluster");
           if (glyphs[i].attr.is_color)
@@ -4221,11 +4210,11 @@ append_dash_param (Printer     *p,
     {
       gsize i;
 
-      string_append_double (p->str, dash[0]);
+      gsk_string_append_double (p->str, dash[0]);
       for (i = 1; i < n_dash; i++)
         {
           g_string_append_c (p->str, ' ');
-          string_append_double (p->str, dash[i]);
+          gsk_string_append_double (p->str, dash[i]);
         }
     }
 
@@ -4519,7 +4508,7 @@ render_node_print (Printer       *p,
               {
                 if (i > 0)
                   g_string_append_c (p->str, ' ');
-                string_append_double (p->str, widths[i]);
+                gsk_string_append_double (p->str, widths[i]);
               }
             g_string_append (p->str, ";\n");
           }
@@ -4546,13 +4535,13 @@ render_node_print (Printer       *p,
 
             print_color (p, &s->color);
             g_string_append_c (p->str, ' ');
-            string_append_double (p->str, s->offset.x);
+            gsk_string_append_double (p->str, s->offset.x);
             g_string_append_c (p->str, ' ');
-            string_append_double (p->str, s->offset.y);
+            gsk_string_append_double (p->str, s->offset.y);
             if (s->radius > 0)
               {
                 g_string_append_c (p->str, ' ');
-                string_append_double (p->str, s->radius);
+                gsk_string_append_double (p->str, s->radius);
               }
           }
 
@@ -4709,7 +4698,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
                   case GSK_GL_UNIFORM_TYPE_FLOAT:
                     {
                       float value = gsk_gl_shader_get_arg_float (shader, args, i);
-                      string_append_double (data, value);
+                      gsk_string_append_double (data, value);
                     }
                     break;
 
@@ -4739,9 +4728,9 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
                       graphene_vec2_t value;
                       gsk_gl_shader_get_arg_vec2 (shader, args, i,
                                                   &value);
-                      string_append_double (data, graphene_vec2_get_x (&value));
+                      gsk_string_append_double (data, graphene_vec2_get_x (&value));
                       g_string_append (data, " ");
-                      string_append_double (data, graphene_vec2_get_y (&value));
+                      gsk_string_append_double (data, graphene_vec2_get_y (&value));
                     }
                     break;
 
@@ -4750,11 +4739,11 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
                       graphene_vec3_t value;
                       gsk_gl_shader_get_arg_vec3 (shader, args, i,
                                                   &value);
-                      string_append_double (data, graphene_vec3_get_x (&value));
+                      gsk_string_append_double (data, graphene_vec3_get_x (&value));
                       g_string_append (data, " ");
-                      string_append_double (data, graphene_vec3_get_y (&value));
+                      gsk_string_append_double (data, graphene_vec3_get_y (&value));
                       g_string_append (data, " ");
-                      string_append_double (data, graphene_vec3_get_z (&value));
+                      gsk_string_append_double (data, graphene_vec3_get_z (&value));
                     }
                     break;
 
@@ -4763,13 +4752,13 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
                       graphene_vec4_t value;
                       gsk_gl_shader_get_arg_vec4 (shader, args, i,
                                                   &value);
-                      string_append_double (data, graphene_vec4_get_x (&value));
+                      gsk_string_append_double (data, graphene_vec4_get_x (&value));
                       g_string_append (data, " ");
-                      string_append_double (data, graphene_vec4_get_y (&value));
+                      gsk_string_append_double (data, graphene_vec4_get_y (&value));
                       g_string_append (data, " ");
-                      string_append_double (data, graphene_vec4_get_z (&value));
+                      gsk_string_append_double (data, graphene_vec4_get_z (&value));
                       g_string_append (data, " ");
-                      string_append_double (data, graphene_vec4_get_w (&value));
+                      gsk_string_append_double (data, graphene_vec4_get_w (&value));
                     }
                     break;
                   }

gsk/gsktransform.c

@@ -425,16 +425,6 @@ gsk_matrix_transform_apply_translate (GskTransform *transform,
   }
 }
 
-static void
-string_append_double (GString *string,
-                      double   d)
-{
-  char buf[G_ASCII_DTOSTR_BUF_SIZE];
-
-  g_ascii_formatd (buf, G_ASCII_DTOSTR_BUF_SIZE, "%g", d);
-  g_string_append (string, buf);
-}
-
 static void
 gsk_matrix_transform_print (GskTransform *transform,
                             GString      *string)
@@ -447,17 +437,17 @@ gsk_matrix_transform_print (GskTransform *transform,
     {
       g_string_append (string, "matrix(");
       graphene_matrix_to_float (&self->matrix, f);
-      string_append_double (string, f[0]);
+      gsk_string_append_double (string, f[0]);
       g_string_append (string, ", ");
-      string_append_double (string, f[1]);
+      gsk_string_append_double (string, f[1]);
       g_string_append (string, ", ");
-      string_append_double (string, f[4]);
+      gsk_string_append_double (string, f[4]);
       g_string_append (string, ", ");
-      string_append_double (string, f[5]);
+      gsk_string_append_double (string, f[5]);
       g_string_append (string, ", ");
-      string_append_double (string, f[12]);
+      gsk_string_append_double (string, f[12]);
       g_string_append (string, ", ");
-      string_append_double (string, f[13]);
+      gsk_string_append_double (string, f[13]);
       g_string_append (string, ")");
     }
   else
@@ -468,7 +458,7 @@ gsk_matrix_transform_print (GskTransform *transform,
         {
           if (i > 0)
             g_string_append (string, ", ");
-          string_append_double (string, f[i]);
+          gsk_string_append_double (string, f[i]);
         }
       g_string_append (string, ")");
     }
@@ -697,13 +687,13 @@ gsk_translate_transform_print (GskTransform *transform,
   else
     g_string_append (string, "translate3d(");
 
-  string_append_double (string, self->point.x);
+  gsk_string_append_double (string, self->point.x);
   g_string_append (string, ", ");
-  string_append_double (string, self->point.y);
+  gsk_string_append_double (string, self->point.y);
   if (self->point.z != 0)
     {
       g_string_append (string, ", ");
-      string_append_double (string, self->point.z);
+      gsk_string_append_double (string, self->point.z);
     }
   g_string_append (string, ")");
 }
@@ -806,45 +796,6 @@ gsk_rotate_transform_finalize (GskTransform *self)
 {
 }
 
-static inline void
-_sincos (float  deg,
-         float *out_s,
-         float *out_c)
-{
-  if (deg == 90.0)
-    {
-      *out_c = 0.0;
-      *out_s = 1.0;
-    }
-  else if (deg == 180.0)
-    {
-      *out_c = -1.0;
-      *out_s = 0.0;
-    }
-  else if (deg == 270.0)
-    {
-      *out_c = 0.0;
-      *out_s = -1.0;
-    }
-  else if (deg == 0.0)
-    {
-      *out_c = 1.0;
-      *out_s = 0.0;
-    }
-  else
-    {
-      float angle = deg * M_PI / 180.0;
-
-#ifdef HAVE_SINCOSF
-      sincosf (angle, out_s, out_c);
-#else
-      *out_s = sinf (angle);
-      *out_c = cosf (angle);
-#endif
-
-    }
-}
-
 static void
 gsk_rotate_transform_to_matrix (GskTransform      *transform,
                                 graphene_matrix_t *out_matrix)
@@ -852,7 +803,7 @@ gsk_rotate_transform_to_matrix (GskTransform      *transform,
   GskRotateTransform *self = (GskRotateTransform *) transform;
   float c, s;
 
-  _sincos (self->angle, &s, &c);
+  gsk_sincosf_deg (self->angle, &s, &c);
 
   graphene_matrix_init_from_2d (out_matrix,
                                 c, s,
@@ -872,7 +823,7 @@ gsk_rotate_transform_apply_2d (GskTransform *transform,
   GskRotateTransform *self = (GskRotateTransform *) transform;
   float s, c, xx, xy, yx, yy;
 
-  _sincos (self->angle, &s, &c);
+  gsk_sincosf_deg (self->angle, &s, &c);
 
   xx =  c * *out_xx + s * *out_xy;
   yx =  c * *out_yx + s * *out_yy;
@@ -937,7 +888,7 @@ gsk_rotate_transform_print (GskTransform *transform,
   GskRotateTransform *self = (GskRotateTransform *) transform;
 
   g_string_append (string, "rotate(");
-  string_append_double (string, self->angle);
+  gsk_string_append_double (string, self->angle);
   g_string_append (string, ")");
 }
 
@@ -1092,10 +1043,10 @@ gsk_rotate3d_transform_print (GskTransform *transform,
   graphene_vec3_to_float (&self->axis, f);
   for (i = 0; i < 3; i++)
     {
-      string_append_double (string, f[i]);
+      gsk_string_append_double (string, f[i]);
       g_string_append (string, ", ");
     }
-  string_append_double (string, self->angle);
+  gsk_string_append_double (string, self->angle);
   g_string_append (string, ")");
 }
 
@@ -1171,9 +1122,6 @@ gsk_skew_transform_finalize (GskTransform *self)
 {
 }
 
-#define DEG_TO_RAD(x) ((x) / 180.f * G_PI)
-#define RAD_TO_DEG(x) ((x) * 180.f / G_PI)
-
 static void
 gsk_skew_transform_to_matrix (GskTransform      *transform,
                               graphene_matrix_t *out_matrix)
@@ -1229,21 +1177,21 @@ gsk_skew_transform_print (GskTransform *transform,
   if (self->skew_y == 0)
     {
       g_string_append (string, "skewX(");
-      string_append_double (string, self->skew_x);
+      gsk_string_append_double (string, self->skew_x);
       g_string_append (string, ")");
     }
   else if (self->skew_x == 0)
     {
       g_string_append (string, "skewY(");
-      string_append_double (string, self->skew_y);
+      gsk_string_append_double (string, self->skew_y);
       g_string_append (string, ")");
     }
   else
     {
       g_string_append (string, "skew(");
-      string_append_double (string, self->skew_x);
+      gsk_string_append_double (string, self->skew_x);
       g_string_append (string, ", ");
-      string_append_double (string, self->skew_y);
+      gsk_string_append_double (string, self->skew_y);
       g_string_append (string, ")");
     }
 }
@@ -1470,22 +1418,22 @@ gsk_scale_transform_print (GskTransform *transform,
   if (self->factor_z == 1.0)
     {
       g_string_append (string, "scale(");
-      string_append_double (string, self->factor_x);
+      gsk_string_append_double (string, self->factor_x);
       if (self->factor_x != self->factor_y)
         {
           g_string_append (string, ", ");
-          string_append_double (string, self->factor_y);
+          gsk_string_append_double (string, self->factor_y);
         }
       g_string_append (string, ")");
     }
   else
     {
       g_string_append (string, "scale3d(");
-      string_append_double (string, self->factor_x);
+      gsk_string_append_double (string, self->factor_x);
       g_string_append (string, ", ");
-      string_append_double (string, self->factor_y);
+      gsk_string_append_double (string, self->factor_y);
       g_string_append (string, ", ");
-      string_append_double (string, self->factor_z);
+      gsk_string_append_double (string, self->factor_z);
       g_string_append (string, ")");
     }
 }
@@ -1650,7 +1598,7 @@ gsk_perspective_transform_print (GskTransform *transform,
   GskPerspectiveTransform *self = (GskPerspectiveTransform *) transform;
 
   g_string_append (string, "perspective(");
-  string_append_double (string, self->depth);
+  gsk_string_append_double (string, self->depth);
   g_string_append (string, ")");
 }
 

gsk/meson.build

@@ -232,6 +232,7 @@ libgsk_f16c = static_library('gsk_f16c',
 )
 
 libgsk = static_library('gsk',
+  override_options: [ 'unity=on', 'unity_size=10000' ],
   sources: [
     gsk_public_sources,
     gsk_private_sources,
@@ -246,7 +247,9 @@ libgsk = static_library('gsk',
     '-DGTK_COMPILATION',
     '-DG_LOG_DOMAIN="Gsk"',
     '-DG_LOG_STRUCTURED=1',
-  ] + common_cflags,
+  ] + common_cflags + [
+    '-Wno-error=redundant-decls',
+  ],
   link_with: [ libgdk, libgsk_f16c]
 )