* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <config.h>
+#include "config.h"
#define GDK_PIXBUF_ENABLE_BACKEND /* Ugly? */
#include "gdkdisplay.h"
#include "gdkscreen.h"
#include "gdkcursor.h"
#include "gdkprivate-win32.h"
+#include "gdkwin32cursor.h"
+
+#ifdef __MINGW32__
+#include <w32api.h>
+#endif
#include "xcursors.h"
-#if defined(__MINGW32__) || (defined(_MSC_VER) && (WINVER < 0x0500))
+#if (defined(__MINGW32__) && (__W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 8))) || (defined(_MSC_VER) && (WINVER < 0x0500))
typedef struct {
DWORD bV5Size;
LONG bV5Width;
#endif
static HCURSOR
-_gdk_win32_data_to_wcursor (GdkCursorType cursor_type)
+hcursor_from_type (GdkCursorType cursor_type)
{
gint i, j, x, y, ofs;
- HCURSOR rv = NULL;
+ HCURSOR rv;
gint w, h;
guchar *and_plane, *xor_plane;
- for (i = 0; i < G_N_ELEMENTS (cursors); i++)
- if (cursors[i].type == cursor_type)
- break;
+ if (cursor_type != GDK_BLANK_CURSOR)
+ {
+ for (i = 0; i < G_N_ELEMENTS (cursors); i++)
+ if (cursors[i].type == cursor_type)
+ break;
- if (i >= G_N_ELEMENTS (cursors) || !cursors[i].name)
- return NULL;
+ if (i >= G_N_ELEMENTS (cursors) || !cursors[i].name)
+ return NULL;
+ /* Use real Win32 cursor if possible */
+ if (cursors[i].builtin)
+ return LoadCursor (NULL, cursors[i].builtin);
+ }
+
w = GetSystemMetrics (SM_CXCURSOR);
h = GetSystemMetrics (SM_CYCURSOR);
xor_plane = g_malloc ((w/8) * h);
memset (xor_plane, 0, (w/8) * h);
+ if (cursor_type != GDK_BLANK_CURSOR)
+ {
+
#define SET_BIT(v,b) (v |= (1 << b))
#define RESET_BIT(v,b) (v &= ~(1 << b))
- for (j = 0, y = 0; y < cursors[i].height && y < h ; y++)
- {
- ofs = (y * w) / 8;
- j = y * cursors[i].width;
-
- for (x = 0; x < cursors[i].width && x < w ; x++, j++)
- {
- gint pofs = ofs + x / 8;
- guchar data = (cursors[i].data[j/4] & (0xc0 >> (2 * (j%4)))) >> (2 * (3 - (j%4)));
- gint bit = 7 - (j % cursors[i].width) % 8;
-
- if (data)
- {
- RESET_BIT (and_plane[pofs], bit);
- if (data == 1)
- SET_BIT (xor_plane[pofs], bit);
- }
- }
- }
+ for (j = 0, y = 0; y < cursors[i].height && y < h ; y++)
+ {
+ ofs = (y * w) / 8;
+ j = y * cursors[i].width;
+
+ for (x = 0; x < cursors[i].width && x < w ; x++, j++)
+ {
+ gint pofs = ofs + x / 8;
+ guchar data = (cursors[i].data[j/4] & (0xc0 >> (2 * (j%4)))) >> (2 * (3 - (j%4)));
+ gint bit = 7 - (j % cursors[i].width) % 8;
+
+ if (data)
+ {
+ RESET_BIT (and_plane[pofs], bit);
+ if (data == 1)
+ SET_BIT (xor_plane[pofs], bit);
+ }
+ }
+ }
#undef SET_BIT
#undef RESET_BIT
- rv = CreateCursor (_gdk_app_hmodule, cursors[i].hotx, cursors[i].hoty,
- w, h, and_plane, xor_plane);
+ rv = CreateCursor (_gdk_app_hmodule, cursors[i].hotx, cursors[i].hoty,
+ w, h, and_plane, xor_plane);
+ }
+ else
+ {
+ rv = CreateCursor (_gdk_app_hmodule, 0, 0,
+ w, h, and_plane, xor_plane);
+ }
if (rv == NULL)
WIN32_API_FAILED ("CreateCursor");
g_free (and_plane);
return rv;
}
+struct _GdkWin32CursorClass
+{
+ GdkCursorClass cursor_class;
+};
+
+G_DEFINE_TYPE (GdkWin32Cursor, gdk_win32_cursor, GDK_TYPE_CURSOR)
+
+static void
+_gdk_win32_cursor_finalize (GObject *object)
+{
+ GdkWin32Cursor *private = GDK_WIN32_CURSOR (object);
+
+ if (GetCursor () == private->hcursor)
+ SetCursor (NULL);
+
+ if (!DestroyCursor (private->hcursor))
+ WIN32_API_FAILED ("DestroyCursor");
+
+ G_OBJECT_CLASS (gdk_win32_cursor_parent_class)->finalize (object);
+}
+
static GdkCursor*
-_gdk_win32_cursor_new_from_hcursor (HCURSOR hcursor, GdkCursorType cursor_type)
+cursor_new_from_hcursor (HCURSOR hcursor,
+ GdkCursorType cursor_type)
{
- GdkCursorPrivate *private;
+ GdkWin32Cursor *private;
GdkCursor *cursor;
- private = g_new (GdkCursorPrivate, 1);
+ private = g_object_new (GDK_TYPE_WIN32_CURSOR,
+ "cursor-type", cursor_type,
+ "display", _gdk_display,
+ NULL);
private->hcursor = hcursor;
cursor = (GdkCursor*) private;
- cursor->type = cursor_type;
- cursor->ref_count = 1;
return cursor;
}
GdkCursor*
-gdk_cursor_new_for_display (GdkDisplay *display,
- GdkCursorType cursor_type)
+_gdk_win32_display_get_cursor_for_type (GdkDisplay *display,
+ GdkCursorType cursor_type)
{
HCURSOR hcursor;
- g_return_val_if_fail (display == gdk_display_get_default (), NULL);
+ g_return_val_if_fail (display == _gdk_display, NULL);
- hcursor = _gdk_win32_data_to_wcursor (cursor_type);
+ hcursor = hcursor_from_type (cursor_type);
if (hcursor == NULL)
g_warning ("gdk_cursor_new_for_display: no cursor %d found", cursor_type);
else
- GDK_NOTE (MISC, g_print ("gdk_cursor_new_for_display: %d: %p\n",
- cursor_type, hcursor));
-
- return _gdk_win32_cursor_new_from_hcursor (hcursor, cursor_type);
-}
-
-static gboolean
-color_is_white (const GdkColor *color)
-{
- return (color->red == 0xFFFF
- && color->green == 0xFFFF
- && color->blue == 0xFFFF);
-}
-
-GdkCursor*
-gdk_cursor_new_from_pixmap (GdkPixmap *source,
- GdkPixmap *mask,
- const GdkColor *fg,
- const GdkColor *bg,
- gint x,
- gint y)
-{
- GdkPixmapImplWin32 *source_impl, *mask_impl;
- guchar *source_bits, *mask_bits;
- gint source_bpl, mask_bpl;
- HCURSOR hcursor;
- guchar *p, *q, *xor_mask, *and_mask;
- gint width, height, cursor_width, cursor_height;
- guchar residue;
- gint ix, iy;
- const gboolean bg_is_white = color_is_white (bg);
-
- g_return_val_if_fail (GDK_IS_PIXMAP (source), NULL);
- g_return_val_if_fail (GDK_IS_PIXMAP (mask), NULL);
- g_return_val_if_fail (fg != NULL, NULL);
- g_return_val_if_fail (bg != NULL, NULL);
-
- source_impl = GDK_PIXMAP_IMPL_WIN32 (GDK_PIXMAP_OBJECT (source)->impl);
- mask_impl = GDK_PIXMAP_IMPL_WIN32 (GDK_PIXMAP_OBJECT (mask)->impl);
-
- g_return_val_if_fail (source_impl->width == mask_impl->width
- && source_impl->height == mask_impl->height,
- NULL);
- width = source_impl->width;
- height = source_impl->height;
- cursor_width = GetSystemMetrics (SM_CXCURSOR);
- cursor_height = GetSystemMetrics (SM_CYCURSOR);
-
- g_return_val_if_fail (width <= cursor_width && height <= cursor_height,
- NULL);
-
- residue = (1 << ((8-(width%8))%8)) - 1;
-
- source_bits = source_impl->bits;
- mask_bits = mask_impl->bits;
-
- g_return_val_if_fail (GDK_PIXMAP_OBJECT (source)->depth == 1
- && GDK_PIXMAP_OBJECT (mask)->depth == 1,
- NULL);
+ GDK_NOTE (CURSOR, g_print ("gdk_cursor_new_for_display: %d: %p\n",
+ cursor_type, hcursor));
- source_bpl = ((width - 1)/32 + 1)*4;
- mask_bpl = ((mask_impl->width - 1)/32 + 1)*4;
-
-#ifdef G_ENABLE_DEBUG
- if (_gdk_debug_flags & GDK_DEBUG_CURSOR)
- {
- g_print ("gdk_cursor_new_from_pixmap: source=%p:\n",
- source_impl->parent_instance.handle);
- for (iy = 0; iy < height; iy++)
- {
- if (iy == 16)
- break;
-
- p = source_bits + iy*source_bpl;
- for (ix = 0; ix < width; ix++)
- {
- if (ix == 79)
- break;
- g_print ("%c", ".X"[((*p)>>(7-(ix%8)))&1]);
- if ((ix%8) == 7)
- p++;
- }
- g_print ("\n");
- }
- g_print ("...mask=%p:\n", mask_impl->parent_instance.handle);
- for (iy = 0; iy < height; iy++)
- {
- if (iy == 16)
- break;
-
- p = mask_bits + iy*source_bpl;
- for (ix = 0; ix < width; ix++)
- {
- if (ix == 79)
- break;
- g_print ("%c", ".X"[((*p)>>(7-(ix%8)))&1]);
- if ((ix%8) == 7)
- p++;
- }
- g_print ("\n");
- }
- }
-#endif
-
- /* Such complex bit manipulation for this simple task, sigh.
- * The X cursor and Windows cursor concepts are quite different.
- * We assume here that we are always called with fg == black and
- * bg == white, *or* the other way around. Random colours won't work.
- * (Well, you will get a cursor, but not in those colours.)
- */
-
- /* Note: The comments below refer to the case fg==black and
- * bg==white, as that was what was implemented first. The fg==white
- * (the "if (fg->pixel)" branches) case was added later.
- */
-
- /* First set masked-out source bits, as all source bits matter on Windoze.
- * As we invert them below, they will be clear in the final xor_mask.
- */
- for (iy = 0; iy < height; iy++)
- {
- p = source_bits + iy*source_bpl;
- q = mask_bits + iy*mask_bpl;
-
- for (ix = 0; ix < ((width-1)/8+1); ix++)
- if (bg_is_white)
- *p++ |= ~(*q++);
- else
- *p++ &= *q++;
- }
-
- /* XOR mask is initialized to zero */
- xor_mask = g_malloc0 (cursor_width/8 * cursor_height);
-
- for (iy = 0; iy < height; iy++)
- {
- p = source_bits + iy*source_bpl;
- q = xor_mask + iy*cursor_width/8;
-
- for (ix = 0; ix < ((width-1)/8+1); ix++)
- if (bg_is_white)
- *q++ = ~(*p++);
- else
- *q++ = *p++;
-
- q[-1] &= ~residue; /* Clear left-over bits */
- }
-
- /* AND mask is initialized to ones */
- and_mask = g_malloc (cursor_width/8 * cursor_height);
- memset (and_mask, 0xFF, cursor_width/8 * cursor_height);
-
- for (iy = 0; iy < height; iy++)
- {
- p = mask_bits + iy*mask_bpl;
- q = and_mask + iy*cursor_width/8;
-
- for (ix = 0; ix < ((width-1)/8+1); ix++)
- *q++ = ~(*p++);
-
- q[-1] |= residue; /* Set left-over bits */
- }
-
- hcursor = CreateCursor (_gdk_app_hmodule, x, y, cursor_width, cursor_height,
- and_mask, xor_mask);
-
- GDK_NOTE (MISC, g_print ("gdk_cursor_new_from_pixmap: "
- "%p (%dx%d) %p (%dx%d) = %p (%dx%d)\n",
- GDK_PIXMAP_HBITMAP (source),
- source_impl->width, source_impl->height,
- GDK_PIXMAP_HBITMAP (mask),
- mask_impl->width, mask_impl->height,
- hcursor, cursor_width, cursor_height));
-
- g_free (xor_mask);
- g_free (and_mask);
-
- return _gdk_win32_cursor_new_from_hcursor (hcursor, GDK_CURSOR_IS_PIXMAP);
+ return cursor_new_from_hcursor (hcursor, cursor_type);
}
-/* The named cursors below are presumably not really useful, as the
- * names are Win32-specific. No GTK+ application developed on Unix
+/* FIXME: The named cursors below are presumably not really useful, as
+ * the names are Win32-specific. No GTK+ application developed on Unix
* (and most cross-platform GTK+ apps are developed on Unix) is going
* to look for cursors under these Win32 names anyway.
*
static struct {
char *name;
char *id;
-} _default_cursors[] = {
+} default_cursors[] = {
{ "appstarting", IDC_APPSTARTING },
{ "arrow", IDC_ARROW },
{ "cross", IDC_CROSS },
};
GdkCursor*
-gdk_cursor_new_from_name (GdkDisplay *display,
- const gchar *name)
+_gdk_win32_display_get_cursor_for_name (GdkDisplay *display,
+ const gchar *name)
{
HCURSOR hcursor = NULL;
int i;
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+ g_return_val_if_fail (display == _gdk_display, NULL);
- for (i = 0; i < G_N_ELEMENTS(_default_cursors); i++)
+ for (i = 0; i < G_N_ELEMENTS(default_cursors); i++)
{
- if (0 == strcmp(_default_cursors[i].name, name))
- hcursor = LoadCursor (NULL, _default_cursors[i].id);
+ if (0 == strcmp(default_cursors[i].name, name))
+ hcursor = LoadCursor (NULL, default_cursors[i].id);
}
/* allow to load named cursor resources linked into the executable */
if (!hcursor)
hcursor = LoadCursor (_gdk_app_hmodule, name);
if (hcursor)
- return _gdk_win32_cursor_new_from_hcursor (hcursor, GDK_X_CURSOR);
+ return cursor_new_from_hcursor (hcursor, GDK_X_CURSOR);
return NULL;
}
-void
-_gdk_cursor_destroy (GdkCursor *cursor)
-{
- GdkCursorPrivate *private;
-
- g_return_if_fail (cursor != NULL);
- private = (GdkCursorPrivate *) cursor;
-
- GDK_NOTE (MISC, g_print ("_gdk_cursor_destroy: %p\n",
- (cursor->type == GDK_CURSOR_IS_PIXMAP) ? private->hcursor : 0));
-
- if (GetCursor () == private->hcursor)
- SetCursor (NULL);
-
- if (!DestroyCursor (private->hcursor))
- WIN32_API_FAILED ("DestroyCursor");
-
- g_free (private);
-}
-
-GdkDisplay *
-gdk_cursor_get_display (GdkCursor *cursor)
-{
- return gdk_display_get_default ();
-}
-
GdkPixbuf *
gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon)
{
RGBQUAD colors[2];
} bmi;
HDC hdc;
- gchar *pixels, *bits, buf[32];
+ guchar *pixels, *bits;
+ gchar buf[32];
gint rowstride, x, y, w, h;
- gboolean no_alpha;
if (!GDI_CALL (GetIconInfo, (hicon, &ii)))
return NULL;
- memset (&bmi, 0, sizeof (bmi));
- bmi.bi.biSize = sizeof (bmi.bi);
if (!(hdc = CreateCompatibleDC (NULL)))
{
WIN32_GDI_FAILED ("CreateCompatibleDC");
goto out0;
}
- if (!GDI_CALL (GetDIBits, (hdc, ii.hbmColor, 0, 1, NULL, (BITMAPINFO *)&bmi, DIB_RGB_COLORS)))
- goto out1;
+ memset (&bmi, 0, sizeof (bmi));
+ bmi.bi.biSize = sizeof (bmi.bi);
+
+ if (ii.hbmColor != NULL)
+ {
+ /* Colour cursor */
- w = bmi.bi.biWidth;
- h = bmi.bi.biHeight;
+ gboolean no_alpha;
- bmi.bi.biBitCount = 32;
- bmi.bi.biCompression = BI_RGB;
- bmi.bi.biHeight = -h;
- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, w, h);
- bits = g_malloc0 (4 * w * h);
+ if (!GDI_CALL (GetDIBits, (hdc, ii.hbmColor, 0, 1, NULL, (BITMAPINFO *)&bmi, DIB_RGB_COLORS)))
+ goto out1;
+
+ w = bmi.bi.biWidth;
+ h = bmi.bi.biHeight;
+
+ bmi.bi.biBitCount = 32;
+ bmi.bi.biCompression = BI_RGB;
+ bmi.bi.biHeight = -h;
+
+ bits = g_malloc0 (4 * w * h);
- /* color data */
- if (!GDI_CALL (GetDIBits, (hdc, ii.hbmColor, 0, h, bits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS)))
- goto out2;
-
- pixels = gdk_pixbuf_get_pixels (pixbuf);
- rowstride = gdk_pixbuf_get_rowstride (pixbuf);
- no_alpha = TRUE;
- for (y = 0; y < h; y++)
- {
- for (x = 0; x < w; x++)
+ /* color data */
+ if (!GDI_CALL (GetDIBits, (hdc, ii.hbmColor, 0, h, bits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS)))
+ goto out2;
+
+ pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, w, h);
+ pixels = gdk_pixbuf_get_pixels (pixbuf);
+ rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+ no_alpha = TRUE;
+ for (y = 0; y < h; y++)
{
- pixels[2] = bits[(x+y*w) * 4];
- pixels[1] = bits[(x+y*w) * 4 + 1];
- pixels[0] = bits[(x+y*w) * 4 + 2];
- pixels[3] = bits[(x+y*w) * 4 + 3];
- if (no_alpha && pixels[3] > 0)
- no_alpha = FALSE;
- pixels += 4;
+ for (x = 0; x < w; x++)
+ {
+ pixels[2] = bits[(x+y*w) * 4];
+ pixels[1] = bits[(x+y*w) * 4 + 1];
+ pixels[0] = bits[(x+y*w) * 4 + 2];
+ pixels[3] = bits[(x+y*w) * 4 + 3];
+ if (no_alpha && pixels[3] > 0)
+ no_alpha = FALSE;
+ pixels += 4;
+ }
+ pixels += (w * 4 - rowstride);
}
- pixels += (w * 4 - rowstride);
- }
- /* mask */
- if (no_alpha &&
- GDI_CALL (GetDIBits, (hdc, ii.hbmMask, 0, h, bits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS)))
+ /* mask */
+ if (no_alpha &&
+ GDI_CALL (GetDIBits, (hdc, ii.hbmMask, 0, h, bits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS)))
+ {
+ pixels = gdk_pixbuf_get_pixels (pixbuf);
+ for (y = 0; y < h; y++)
+ {
+ for (x = 0; x < w; x++)
+ {
+ pixels[3] = 255 - bits[(x + y * w) * 4];
+ pixels += 4;
+ }
+ pixels += (w * 4 - rowstride);
+ }
+ }
+ }
+ else
{
+ /* B&W cursor */
+
+ int bpl;
+
+ if (!GDI_CALL (GetDIBits, (hdc, ii.hbmMask, 0, 0, NULL, (BITMAPINFO *)&bmi, DIB_RGB_COLORS)))
+ goto out1;
+
+ w = bmi.bi.biWidth;
+ h = ABS (bmi.bi.biHeight) / 2;
+
+ bits = g_malloc0 (4 * w * h);
+
+ /* masks */
+ if (!GDI_CALL (GetDIBits, (hdc, ii.hbmMask, 0, h*2, bits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS)))
+ goto out2;
+
+ pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, w, h);
pixels = gdk_pixbuf_get_pixels (pixbuf);
+ rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+ bpl = ((w-1)/32 + 1)*4;
+#if 0
+ for (y = 0; y < h*2; y++)
+ {
+ for (x = 0; x < w; x++)
+ {
+ const gint bit = 7 - (x % 8);
+ printf ("%c ", ((bits[bpl*y+x/8])&(1<<bit)) ? ' ' : 'X');
+ }
+ printf ("\n");
+ }
+#endif
+
for (y = 0; y < h; y++)
{
+ const guchar *andp, *xorp;
+ if (bmi.bi.biHeight < 0)
+ {
+ andp = bits + bpl*y;
+ xorp = bits + bpl*(h+y);
+ }
+ else
+ {
+ andp = bits + bpl*(h-y-1);
+ xorp = bits + bpl*(h+h-y-1);
+ }
for (x = 0; x < w; x++)
{
- pixels[3] = 255 - bits[(x + y * w) * 4];
+ const gint bit = 7 - (x % 8);
+ if ((*andp) & (1<<bit))
+ {
+ if ((*xorp) & (1<<bit))
+ pixels[2] = pixels[1] = pixels[0] = 0xFF;
+ else
+ pixels[2] = pixels[1] = pixels[0] = 0;
+ pixels[3] = 0xFF;
+ }
+ else
+ {
+ pixels[2] = pixels[1] = pixels[0] = 0;
+ pixels[3] = 0;
+ }
pixels += 4;
+ if (bit == 0)
+ {
+ andp++;
+ xorp++;
+ }
}
pixels += (w * 4 - rowstride);
}
return pixbuf;
}
-GdkPixbuf*
-gdk_cursor_get_image (GdkCursor *cursor)
+static GdkPixbuf *
+_gdk_win32_cursor_get_image (GdkCursor *cursor)
{
g_return_val_if_fail (cursor != NULL, NULL);
- return gdk_win32_icon_to_pixbuf_libgtk_only (((GdkCursorPrivate *) cursor)->hcursor);
+ return gdk_win32_icon_to_pixbuf_libgtk_only (((GdkWin32Cursor *) cursor)->hcursor);
}
GdkCursor *
-gdk_cursor_new_from_pixbuf (GdkDisplay *display,
- GdkPixbuf *pixbuf,
- gint x,
- gint y)
+_gdk_win32_display_get_cursor_for_pixbuf (GdkDisplay *display,
+ GdkPixbuf *pixbuf,
+ gint x,
+ gint y)
{
HCURSOR hcursor;
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+ g_return_val_if_fail (display == _gdk_display, NULL);
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
g_return_val_if_fail (0 <= x && x < gdk_pixbuf_get_width (pixbuf), NULL);
g_return_val_if_fail (0 <= y && y < gdk_pixbuf_get_height (pixbuf), NULL);
hcursor = _gdk_win32_pixbuf_to_hcursor (pixbuf, x, y);
if (!hcursor)
return NULL;
- return _gdk_win32_cursor_new_from_hcursor (hcursor, GDK_CURSOR_IS_PIXMAP);
+ return cursor_new_from_hcursor (hcursor, GDK_CURSOR_IS_PIXMAP);
}
-gboolean
-gdk_display_supports_cursor_alpha (GdkDisplay *display)
+gboolean
+_gdk_win32_display_supports_cursor_alpha (GdkDisplay *display)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
+ g_return_val_if_fail (display == _gdk_display, FALSE);
return _gdk_win32_pixbuf_to_hicon_supports_alpha ();
}
gboolean
-gdk_display_supports_cursor_color (GdkDisplay *display)
+_gdk_win32_display_supports_cursor_color (GdkDisplay *display)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
+ g_return_val_if_fail (display == _gdk_display, FALSE);
return TRUE;
}
-guint
-gdk_display_get_default_cursor_size (GdkDisplay *display)
+void
+_gdk_win32_display_get_default_cursor_size (GdkDisplay *display,
+ guint *width,
+ guint *height)
{
- g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
-
- return MIN (GetSystemMetrics (SM_CXCURSOR), GetSystemMetrics (SM_CYCURSOR));
+ g_return_if_fail (display == _gdk_display);
+
+ if (width)
+ *width = GetSystemMetrics (SM_CXCURSOR);
+ if (height)
+ *height = GetSystemMetrics (SM_CYCURSOR);
}
void
-gdk_display_get_maximal_cursor_size (GdkDisplay *display,
- guint *width,
- guint *height)
+_gdk_win32_display_get_maximal_cursor_size (GdkDisplay *display,
+ guint *width,
+ guint *height)
{
- g_return_if_fail (GDK_IS_DISPLAY (display));
+ g_return_if_fail (display == _gdk_display);
if (width)
*width = GetSystemMetrics (SM_CXCURSOR);
*/
static HBITMAP
-create_alpha_bitmap (gint width, gint height, guchar **outdata)
+create_alpha_bitmap (gint size,
+ guchar **outdata)
{
BITMAPV5HEADER bi;
HDC hdc;
ZeroMemory (&bi, sizeof (BITMAPV5HEADER));
bi.bV5Size = sizeof (BITMAPV5HEADER);
- bi.bV5Width = width;
- bi.bV5Height = height;
+ bi.bV5Height = bi.bV5Width = size;
bi.bV5Planes = 1;
bi.bV5BitCount = 32;
bi.bV5Compression = BI_BITFIELDS;
}
static HBITMAP
-create_color_bitmap (gint width, gint height, guchar **outdata)
+create_color_bitmap (gint size,
+ guchar **outdata,
+ gint bits)
{
- BITMAPV4HEADER bi;
+ struct {
+ BITMAPV4HEADER bmiHeader;
+ RGBQUAD bmiColors[2];
+ } bmi;
HDC hdc;
HBITMAP hBitmap;
- ZeroMemory (&bi, sizeof (BITMAPV4HEADER));
- bi.bV4Size = sizeof (BITMAPV4HEADER);
- bi.bV4Width = width;
- bi.bV4Height = height;
- bi.bV4Planes = 1;
- bi.bV4BitCount = 24;
- bi.bV4V4Compression = BI_RGB;
+ ZeroMemory (&bmi, sizeof (bmi));
+ bmi.bmiHeader.bV4Size = sizeof (BITMAPV4HEADER);
+ bmi.bmiHeader.bV4Height = bmi.bmiHeader.bV4Width = size;
+ bmi.bmiHeader.bV4Planes = 1;
+ bmi.bmiHeader.bV4BitCount = bits;
+ bmi.bmiHeader.bV4V4Compression = BI_RGB;
+
+ /* when bits is 1, these will be used.
+ * bmiColors[0] already zeroed from ZeroMemory()
+ */
+ bmi.bmiColors[1].rgbBlue = 0xFF;
+ bmi.bmiColors[1].rgbGreen = 0xFF;
+ bmi.bmiColors[1].rgbRed = 0xFF;
hdc = GetDC (NULL);
if (!hdc)
WIN32_GDI_FAILED ("GetDC");
return NULL;
}
- hBitmap = CreateDIBSection (hdc, (BITMAPINFO *)&bi, DIB_RGB_COLORS,
+ hBitmap = CreateDIBSection (hdc, (BITMAPINFO *)&bmi, DIB_RGB_COLORS,
(PVOID *) outdata, NULL, (DWORD)0);
if (hBitmap == NULL)
WIN32_GDI_FAILED ("CreateDIBSection");
*/
HBITMAP hColorBitmap, hMaskBitmap;
guchar *indata, *inrow;
- guchar *outdata, *outrow;
- gint width, height, i, j, rowstride;
+ guchar *colordata, *colorrow, *maskdata, *maskbyte;
+ gint width, height, size, i, i_offset, j, j_offset, rowstride;
+ guint maskstride, mask_bit;
width = gdk_pixbuf_get_width (pixbuf); /* width of icon */
height = gdk_pixbuf_get_height (pixbuf); /* height of icon */
- hColorBitmap = create_alpha_bitmap (width, height, &outdata);
+ /* The bitmaps are created square */
+ size = MAX (width, height);
+
+ hColorBitmap = create_alpha_bitmap (size, &colordata);
if (!hColorBitmap)
return FALSE;
- hMaskBitmap = CreateBitmap (width, height, 1, 1, NULL);
+ hMaskBitmap = create_color_bitmap (size, &maskdata, 1);
if (!hMaskBitmap)
{
DeleteObject (hColorBitmap);
return FALSE;
}
- /* rows are always aligned on 4-byte boundarys, but here our pixels are always 4 bytes */
+ /* MSDN says mask rows are aligned to "LONG" boundaries */
+ maskstride = (((size + 31) & ~31) >> 3);
+
indata = gdk_pixbuf_get_pixels (pixbuf);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
- for (j=0; j<height; j++)
+
+ if (width > height)
+ {
+ i_offset = 0;
+ j_offset = (width - height) / 2;
+ }
+ else
+ {
+ i_offset = (height - width) / 2;
+ j_offset = 0;
+ }
+
+ for (j = 0; j < height; j++)
{
- outrow = outdata + 4*j*width;
- inrow = indata + (height-j-1)*rowstride;
- for (i=0; i<width; i++)
+ colorrow = colordata + 4*(j+j_offset)*size + 4*i_offset;
+ maskbyte = maskdata + (j+j_offset)*maskstride + i_offset/8;
+ mask_bit = (0x80 >> (i_offset % 8));
+ inrow = indata + (height-j-1)*rowstride;
+ for (i = 0; i < width; i++)
{
- outrow[4*i+0] = inrow[4*i+2];
- outrow[4*i+1] = inrow[4*i+1];
- outrow[4*i+2] = inrow[4*i+0];
- outrow[4*i+3] = inrow[4*i+3];
+ colorrow[4*i+0] = inrow[4*i+2];
+ colorrow[4*i+1] = inrow[4*i+1];
+ colorrow[4*i+2] = inrow[4*i+0];
+ colorrow[4*i+3] = inrow[4*i+3];
+ if (inrow[4*i+3] == 0)
+ maskbyte[0] |= mask_bit; /* turn ON bit */
+ else
+ maskbyte[0] &= ~mask_bit; /* turn OFF bit */
+ mask_bit >>= 1;
+ if (mask_bit == 0)
+ {
+ mask_bit = 0x80;
+ maskbyte++;
+ }
}
}
- if (color) *color = hColorBitmap;
- if (mask) *mask = hMaskBitmap;
+ *color = hColorBitmap;
+ *mask = hMaskBitmap;
return TRUE;
}
*/
HBITMAP hColorBitmap, hMaskBitmap;
guchar *indata, *inrow;
- guchar *colordata, *colorrow, *maskdata, *maskrow;
- gint width, height, i, j, rowstride, nc, bmstride;
+ guchar *colordata, *colorrow, *maskdata, *maskbyte;
+ gint width, height, size, i, i_offset, j, j_offset, rowstride, nc, bmstride;
gboolean has_alpha;
+ guint maskstride, mask_bit;
width = gdk_pixbuf_get_width (pixbuf); /* width of icon */
height = gdk_pixbuf_get_height (pixbuf); /* height of icon */
- hColorBitmap = create_color_bitmap (width, height, &colordata);
+ /* The bitmaps are created square */
+ size = MAX (width, height);
+
+ hColorBitmap = create_color_bitmap (size, &colordata, 24);
if (!hColorBitmap)
return FALSE;
- hMaskBitmap = create_color_bitmap (width, height, &maskdata);
+ hMaskBitmap = create_color_bitmap (size, &maskdata, 1);
if (!hMaskBitmap)
{
DeleteObject (hColorBitmap);
}
/* rows are always aligned on 4-byte boundarys */
- bmstride = width * 3;
+ bmstride = size * 3;
if (bmstride % 4 != 0)
bmstride += 4 - (bmstride % 4);
+ /* MSDN says mask rows are aligned to "LONG" boundaries */
+ maskstride = (((size + 31) & ~31) >> 3);
+
indata = gdk_pixbuf_get_pixels (pixbuf);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
nc = gdk_pixbuf_get_n_channels (pixbuf);
has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
- for (j=0; j<height; j++)
+ if (width > height)
+ {
+ i_offset = 0;
+ j_offset = (width - height) / 2;
+ }
+ else
+ {
+ i_offset = (height - width) / 2;
+ j_offset = 0;
+ }
+
+ for (j = 0; j < height; j++)
{
- colorrow = colordata + j*bmstride;
- maskrow = maskdata + j*bmstride;
- inrow = indata + (height-j-1)*rowstride;
- for (i=0; i<width; i++)
+ colorrow = colordata + (j+j_offset)*bmstride + 3*i_offset;
+ maskbyte = maskdata + (j+j_offset)*maskstride + i_offset/8;
+ mask_bit = (0x80 >> (i_offset % 8));
+ inrow = indata + (height-j-1)*rowstride;
+ for (i = 0; i < width; i++)
{
if (has_alpha && inrow[nc*i+3] < 128)
{
colorrow[3*i+0] = colorrow[3*i+1] = colorrow[3*i+2] = 0;
- maskrow[3*i+0] = maskrow[3*i+1] = maskrow[3*i+2] = 255;
+ maskbyte[0] |= mask_bit; /* turn ON bit */
}
else
{
colorrow[3*i+0] = inrow[nc*i+2];
colorrow[3*i+1] = inrow[nc*i+1];
colorrow[3*i+2] = inrow[nc*i+0];
- maskrow[3*i+0] = maskrow[3*i+1] = maskrow[3*i+2] = 0;
+ maskbyte[0] &= ~mask_bit; /* turn OFF bit */
+ }
+ mask_bit >>= 1;
+ if (mask_bit == 0)
+ {
+ mask_bit = 0x80;
+ maskbyte++;
}
}
}
- if (color) *color = hColorBitmap;
- if (mask) *mask = hMaskBitmap;
+ *color = hColorBitmap;
+ *mask = hMaskBitmap;
return TRUE;
}
OSVERSIONINFO version;
is_win_xp_checked = TRUE;
+
memset (&version, 0, sizeof (version));
version.dwOSVersionInfoSize = sizeof (version);
is_win_xp = GetVersionEx (&version)
}
return is_win_xp;
}
+
+HICON
+gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf)
+{
+ return _gdk_win32_pixbuf_to_hicon (pixbuf);
+}
+
+static void
+gdk_win32_cursor_init (GdkWin32Cursor *cursor)
+{
+}
+static void
+gdk_win32_cursor_class_init(GdkWin32CursorClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GdkCursorClass *cursor_class = GDK_CURSOR_CLASS (klass);
+
+ object_class->finalize = _gdk_win32_cursor_finalize;
+
+ cursor_class->get_image = _gdk_win32_cursor_get_image;
+}
projects / ~andy / gtk / blobdiff