Ticket #69291: patch-gdk-quartz.diff

gdk/quartz/gdkimage-quartz.c

@@ -37 +37 @@
                                  gint         height)
 {
   GdkScreen *screen;
+  int depth;
   
   g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_QUARTZ (drawable), NULL);
   g_return_val_if_fail (image != NULL || (dest_x == 0 && dest_y == 0), NULL);
 
   screen = gdk_drawable_get_screen (drawable);
+  depth = gdk_drawable_get_depth (drawable);
   if (!image)
     image = _gdk_image_new_for_depth (screen, GDK_IMAGE_FASTEST, NULL, 
-                                      width, height,
-                                      gdk_drawable_get_depth (drawable));
+                                      width, height, depth);
   
   if (GDK_IS_PIXMAP_IMPL_QUARTZ (drawable))
     {
@@ -63 +64 @@
           return image;
         }
 
-      switch (gdk_drawable_get_depth (drawable))
+      switch (depth)
         {
         case 24:
           bytes_per_row = pix_impl->width * 4;
@@ -123 +124 @@
           break;
 
         default:
-          g_warning ("Unsupported bit depth %d\n", gdk_drawable_get_depth (drawable));
+          g_warning ("Unsupported bit depth %d\n", depth);
           return image;
         }
     }
@@ -322 +323 @@
   if (visual)
     depth = visual->depth;
 
-  g_assert (depth == 24 || depth == 32);
+  g_assert (depth == 1 || depth == 24 || depth == 32);
 
   image = g_object_new (gdk_image_get_type (), NULL);
   image->type = type;
@@ -333 +334 @@
 
   image->byte_order = (G_BYTE_ORDER == G_LITTLE_ENDIAN) ? GDK_LSB_FIRST : GDK_MSB_FIRST;
 
-  /* We only support images with bpp 4 */
-  image->bpp = 4;
-  image->bpl = image->width * image->bpp;
-  image->bits_per_pixel = image->bpp * 8;
-  
+  if (depth == 1) {
+    image->bpp = 1;
+    image->bpl = (image->width >> 3) + 1;
+    image->bits_per_pixel = 1;
+  } else {
+    image->bpp = 4;
+    image->bpl = image->width * image->bpp;
+    image->bits_per_pixel = image->bpp * 8;
+  }
+ 
   image->mem = g_malloc (image->bpl * image->height);
   memset (image->mem, 0x00, image->bpl * image->height);
 
@@ -355 +361 @@
   g_return_val_if_fail (x >= 0 && x < image->width, 0);
   g_return_val_if_fail (y >= 0 && y < image->height, 0);
 
-  ptr = image->mem + y * image->bpl + x * image->bpp;
+  ptr = image->mem + y * image->bpl;
+  if (image->depth == 1) {
+    guchar data = (image->byte_order == GDK_MSB_FIRST ? (0x80 >> (x & 7)) : (1 << (x & 7)));
+    return (ptr[x >> 3] & data) ? 0x1 : 0x0;
+  } else {
+    ptr += x * image->bpp;
+    return *(guint32 *)ptr;
+  }
 
   return *(guint32 *)ptr;
 }
@@ -366 +379 @@
                      gint y,
                      guint32 pixel)
 {
-  guchar *ptr;
+  guchar *ptr = image->mem + y * image->bpl;
+  if (image->depth == 1) {
+    guchar data = (image->byte_order == GDK_MSB_FIRST ? (0x80 >> (x & 7)) : (1 << (x & 7)));
+    if (pixel) {
+        ptr[x >> 3] |= data;
+    } else {
+        ptr[x >> 3] &= ~data;
+    }
+  } else {
+    ptr += x * image->bpp;
+    *(guint32 *)ptr = pixel;
+  }
 
-  ptr = image->mem + y * image->bpl + x * image->bpp;
-
   *(guint32 *)ptr = pixel;
 }
 
@@ -377 +399 @@
 _gdk_windowing_get_bits_for_depth (GdkDisplay *display,
                                    gint        depth)
 {
-  if (depth == 24 || depth == 32)
+  if (depth == 1)
+    return 1;
+  else if (depth == 24 || depth == 32)
     return 32;
   else
     g_assert_not_reached ();