Bug 157794 – [GTK] Clean up CursorGtk.cpp

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Michael Catanzaro]

We use GdkCursorType extensively in CursorGtk.cpp, but GTK+ does not support this anymore and they're only sure to work under X11. Instead, use supported CSS cursor names.

Also, we have a bunch of custom cursors copied from Firefox. Each of these cursors is nowadays guaranteed to be provided by GTK+, so we don't need any of these anymore.

[Michael Catanzaro]

Created attachment 279124 [details]
Patch

[Darin Adler]

Comment on attachment 279124 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=279124&action=review

> Source/WebCore/platform/gtk/CursorGtk.cpp:49
> +typedef struct {
> +    const char* name;
> +    const unsigned char* bits;
> +    const unsigned char* mask_bits;
> +    int hot_x;
> +    int hot_y;
> +} CustomCursor;

Where is this used?

[Michael Catanzaro]

(In reply to comment #2)
> Where is this used?

Nowhere :)

[Carlos Garcia Campos]

Comment on attachment 279124 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=279124&action=review

> Source/WebCore/platform/gtk/CursorGtk.cpp:73
> -        m_platformCursor = adoptGRef(gdk_cursor_new(GDK_CROSS));
> +        m_platformCursor = adoptGRef(gdk_cursor_new_from_name(gdk_display_get_default(), "crosshair"));

Maybe we can leave the createNamedCursor helper, but receiving a const char* instead and simply calling gdk_cursor_new_from_name for the default display.

[Michael Catanzaro]

Hm, forgot about this. It should hopefully fix a strange bug we have where our mouse cursor sometimes turns into a crap X11 fallback cursor when hovering over links in Wayland. It's because we set the cursor to GDK_HAND2, which is not supported anymore.

(In reply to comment #2)
> Comment on attachment 279124 [details]
> Where is this used?

I'll delete it, good catch.

(In reply to comment #4)
> Maybe we can leave the createNamedCursor helper, but receiving a const char*
> instead and simply calling gdk_cursor_new_from_name for the default display.

OK.

[Michael Catanzaro]

Created attachment 286172 [details]
Patch

[Michael Catanzaro]

Created attachment 286173 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 286173 [details]
Patch

Clearing flags on attachment: 286173

Committed r204691: <http://trac.webkit.org/changeset/204691>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.