macos: Translate Ctrl+click to right click

On macOS, Ctrl+left-click is handled as right-click.

We can do that mapping directly in the macOS backend.

NEWS

@@ -1,3 +1,6 @@
+Overview of Changes in 4.15.5, xx-xx-xxxx
+=========================================
+
 Overview of Changes in 4.15.4, 30-07-2024
 =========================================
 

gdk/gdkdmabuf.c

@@ -306,10 +306,6 @@ download_p010 (guchar          *dst,
     }
   MASK = 0xFFFF << (16 - SIZE);
 
-  static int counter = 0;
-  if (counter++ < 8)
-    return;
-
   y_stride = dmabuf->planes[0].stride / 2;
   y_data = (const guint16 *) (src_data[0] + dmabuf->planes[0].offset);
   g_return_if_fail (sizes[0] >= dmabuf->planes[0].offset + height * dmabuf->planes[0].stride);
@@ -2475,7 +2471,7 @@ gdk_dmabuf_is_disjoint (const GdkDmabuf *dmabuf)
     {
       struct stat plane_stat;
 
-      if (fstat (dmabuf->planes[0].fd, &plane_stat) != 0)
+      if (fstat (dmabuf->planes[i].fd, &plane_stat) != 0)
         return TRUE;
 
       if (first_stat.st_ino != plane_stat.st_ino)

gdk/macos/gdkmacosdisplay-translate.c

@@ -207,6 +207,7 @@ fill_button_event (GdkMacosDisplay *display,
   GdkSeat *seat;
   GdkEventType type;
   GdkModifierType state;
+  guint button;
   GdkDevice *pointer = NULL;
   GdkDeviceTool *tool = NULL;
   double *axes = NULL;
@@ -216,6 +217,7 @@ fill_button_event (GdkMacosDisplay *display,
   g_assert (GDK_IS_MACOS_SURFACE (surface));
 
   seat = gdk_display_get_default_seat (GDK_DISPLAY (display));
+  button = get_mouse_button_from_ns_event (nsevent);
   state = get_keyboard_modifiers_from_ns_event (nsevent) |
          _gdk_macos_display_get_current_mouse_modifiers (display);
   input_region = GDK_SURFACE (surface)->input_region;
@@ -227,6 +229,13 @@ fill_button_event (GdkMacosDisplay *display,
     case NSEventTypeOtherMouseDown:
       type = GDK_BUTTON_PRESS;
       state &= ~get_mouse_button_modifiers_from_ns_event (nsevent);
+
+      // Ctrl + left click == right click on macOS
+      if (button == 1 && state & GDK_CONTROL_MASK)
+        {
+          button = 3;
+          state &= ~GDK_CONTROL_MASK;
+        }
       break;
 
     case NSEventTypeLeftMouseUp:
@@ -261,7 +270,7 @@ fill_button_event (GdkMacosDisplay *display,
                                tool,
                                get_time_from_ns_event (nsevent),
                                state,
-                               get_mouse_button_from_ns_event (nsevent),
+                               button,
                                x,
                                y,
                                axes);

gdk/wayland/gdkdevice-wayland.c

@@ -265,13 +265,13 @@ gdk_wayland_device_update_surface_cursor (GdkDevice *device)
   guint next_image_index, next_image_delay;
   gboolean retval = G_SOURCE_REMOVE;
   GdkWaylandTabletData *tablet;
-  gboolean use_viewport;
+  gboolean use_viewport = FALSE;
 
   tablet = gdk_wayland_seat_find_tablet (seat, device);
 
-  use_viewport = pointer->pointer_surface_viewport != NULL;
-  if (g_getenv ("NO_POINTER_VIEWPORT"))
-    use_viewport = FALSE;
+  if (pointer->pointer_surface_viewport &&
+      g_getenv ("USE_POINTER_VIEWPORT"))
+    use_viewport = TRUE;
 
   if (pointer->cursor)
     {

gsk/gpu/gskvulkanframe.c

@@ -57,10 +57,16 @@ gsk_vulkan_frame_is_busy (GskGpuFrame *frame)
 {
   GskVulkanFrame *self = GSK_VULKAN_FRAME (frame);
   VkDevice device;
+  VkResult res;
 
   device = gsk_vulkan_device_get_vk_device (GSK_VULKAN_DEVICE (gsk_gpu_frame_get_device (frame)));
 
-  return vkGetFenceStatus (device, self->vk_fence) == VK_NOT_READY;
+  res = vkGetFenceStatus (device, self->vk_fence);
+  if (res == VK_NOT_READY)
+    return TRUE;
+
+  gsk_vulkan_handle_result (res, "vkGetFenceStatus");
+  return res;
 }
 
 static void
@@ -183,14 +189,15 @@ gsk_vulkan_frame_upload_texture (GskGpuFrame  *frame,
                                                        gdk_texture_get_height (texture),
                                                        &dmabuf,
                                                        gdk_memory_format_alpha (gdk_texture_get_format (texture)) == GDK_MEMORY_ALPHA_PREMULTIPLIED);
+
+              /* Vulkan import dups the fds, so we can close these */
+              gdk_dmabuf_close_fds (&dmabuf);
+
               if (image)
                 {
                   gsk_gpu_image_toggle_ref_texture (image, texture);
                   return image;
                 }
-
-              /* Vulkan import dups the fds, so we can close these */
-              gdk_dmabuf_close_fds (&dmabuf);
             }
         }
     }

gsk/gpu/gskvulkanimage.c

@@ -523,7 +523,7 @@ gsk_vulkan_image_new_for_atlas (GskVulkanDevice *device,
 
   self = gsk_vulkan_image_new (device,
                                GDK_MEMORY_DEFAULT,
-                               TRUE,
+                               FALSE,
                                GSK_GPU_IMAGE_FILTERABLE | GSK_GPU_IMAGE_RENDERABLE,
                                width,
                                height,

gsk/gskrendernodeparser.c

@@ -2786,7 +2786,6 @@ parse_node (GtkCssParser *parser,
   guint i;
 
   token = gtk_css_parser_get_token (parser);
-  if (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_STRING))
   if (gtk_css_token_is (token, GTK_CSS_TOKEN_STRING))
     {
       GskRenderNode *node;

meson.build

@@ -1,5 +1,5 @@
 project('gtk', 'c',
-        version: '4.15.4',
+        version: '4.15.5',
         default_options: [
           'buildtype=debugoptimized',
           'warning_level=1',

testsuite/gtk/notify.c

@@ -580,8 +580,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
       /* avoid day 30 and 31, since they don't exist in February */
       instance = g_object_new (type,
                                "year", 1984,
-                               "month", 10,
                                "day", 05,
+                               "month", 10,
                                NULL);
     }
   /* special casing for singletons */