AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

x11: Make fallback pixbuf-cursor code not use old constructors

Browse Source 
These bitmap constructors are about to die. The replacement is painting
with Cairo image surfaces and that's what we do here.
This commit is contained in:
Benjamin Otte 2010-08-06 20:11:45 +02:00
parent e42033d2cc
commit e98f760e9c
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gdk/x11/gdkcursor-x11.c
View File

@ -931,11 +931,13 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
{ {
GdkCursor *cursor; GdkCursor *cursor;
GdkPixmap *pixmap, *mask; GdkPixmap *pixmap, *mask;
guint width, height, n_channels, rowstride, i, j; guint width, height, n_channels, rowstride, data_stride, i, j;
guint8 *data, *mask_data, *pixels; guint8 *data, *mask_data, *pixels;
GdkColor fg = { 0, 0, 0, 0 }; GdkColor fg = { 0, 0, 0, 0 };
GdkColor bg = { 0, 0xffff, 0xffff, 0xffff }; GdkColor bg = { 0, 0xffff, 0xffff, 0xffff };
GdkScreen *screen; GdkScreen *screen;
cairo_surface_t *image;
cairo_t *cr;
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
@ -950,14 +952,15 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
rowstride = gdk_pixbuf_get_rowstride (pixbuf); rowstride = gdk_pixbuf_get_rowstride (pixbuf);
pixels = gdk_pixbuf_get_pixels (pixbuf); pixels = gdk_pixbuf_get_pixels (pixbuf);
data = g_new0 (guint8, (width + 7) / 8 * height); data_stride = 4 * ((width + 31) / 32);
mask_data = g_new0 (guint8, (width + 7) / 8 * height); data = g_new0 (guint8, data_stride * height);
mask_data = g_new0 (guint8, data_stride * height);
for (j = 0; j < height; j++) for (j = 0; j < height; j++)
{ {
guint8 *src = pixels + j * rowstride; guint8 *src = pixels + j * rowstride;
guint8 *d = data + (width + 7) / 8 * j; guint8 *d = data + data_stride * j;
guint8 *md = mask_data + (width + 7) / 8 * j; guint8 *md = mask_data + data_stride * j;
for (i = 0; i < width; i++) for (i = 0; i < width; i++)
{ {
@ -977,11 +980,28 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
} }
screen = gdk_display_get_default_screen (display); screen = gdk_display_get_default_screen (display);
pixmap = gdk_bitmap_create_from_data (gdk_screen_get_root_window (screen),
data, width, height);
mask = gdk_bitmap_create_from_data (gdk_screen_get_root_window (screen), pixmap = gdk_pixmap_new (gdk_screen_get_root_window (screen),
mask_data, width, height); width, height, 1);
cr = gdk_cairo_create (pixmap);
image = cairo_image_surface_create_for_data (data, CAIRO_FORMAT_A1,
width, height, data_stride);
cairo_set_source_surface (cr, image, 0, 0);
cairo_surface_destroy (image);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint (cr);
cairo_destroy (cr);
mask = gdk_pixmap_new (gdk_screen_get_root_window (screen),
width, height, 1);
cr = gdk_cairo_create (mask);
image = cairo_image_surface_create_for_data (mask_data, CAIRO_FORMAT_A1,
width, height, data_stride);
cairo_set_source_surface (cr, image, 0, 0);
cairo_surface_destroy (image);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint (cr);
cairo_destroy (cr);
cursor = gdk_cursor_new_from_pixmap (pixmap, mask, &fg, &bg, x, y); cursor = gdk_cursor_new_from_pixmap (pixmap, mask, &fg, &bg, x, y);