We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Possible patch

file_5019.txt (text/plain), 3.88 KB, created by Luis Caceres on 2020-03-09 16:14:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luis Caceres

Created: 2020-03-09 16:14:46 UTC

Size: 3.88 KB

patch

obsolete

>diff -r 35b18e76f1a6 src/video/wayland/SDL_waylandevents.c
>--- a/src/video/wayland/SDL_waylandevents.c	Thu Mar 05 08:43:16 2020 -0800
>+++ b/src/video/wayland/SDL_waylandevents.c	Mon Mar 09 16:09:13 2020 +0000
>@@ -32,6 +32,7 @@
> #include "../../events/SDL_events_c.h"
> #include "../../events/scancodes_xfree86.h"
> 
>+#include "SDL_waylandmouse.h"
> #include "SDL_waylandvideo.h"
> #include "SDL_waylandevents_c.h"
> #include "SDL_waylandwindow.h"
>@@ -708,6 +709,22 @@
>     keyboard_handle_repeat_info,    // Version 4
> };
> 
>+static SDL_Cursor*
>+Wayland_CreateEmptyCursor()
>+{
>+    SDL_Cursor* cursor;
>+    SDL_Surface* surface;
>+
>+    surface = SDL_CreateRGBSurfaceWithFormat(0, 1, 1, 8, SDL_PIXELFORMAT_ARGB8888);
>+    SDL_FillRect(surface, NULL, SDL_MapRGBA(surface->format, 0, 0, 0, 0));
>+
>+    cursor = Wayland_CreateCursor(surface, 0, 0);
>+
>+    SDL_FreeSurface(surface);
>+
>+    return cursor;
>+}
>+
> static void
> seat_handle_capabilities(void *data, struct wl_seat *seat,
>                          enum wl_seat_capability caps)
>@@ -721,7 +738,12 @@
>         wl_pointer_set_user_data(input->pointer, input);
>         wl_pointer_add_listener(input->pointer, &pointer_listener,
>                                 input);
>+
>+        input->display->empty_cursor = Wayland_CreateEmptyCursor();
>     } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) {
>+        SDL_FreeCursor(input->display->empty_cursor);
>+        input->display->empty_cursor = NULL;
>+
>         wl_pointer_destroy(input->pointer);
>         input->pointer = NULL;
>         input->display->pointer = NULL;
>diff -r 35b18e76f1a6 src/video/wayland/SDL_waylandmouse.c
>--- a/src/video/wayland/SDL_waylandmouse.c	Thu Mar 05 08:43:16 2020 -0800
>+++ b/src/video/wayland/SDL_waylandmouse.c	Mon Mar 09 16:09:13 2020 +0000
>@@ -142,7 +142,7 @@
>     return 0;
> }
> 
>-static SDL_Cursor *
>+SDL_Cursor *
> Wayland_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y)
> {
>     SDL_Cursor *cursor;
>@@ -323,25 +323,20 @@
>     if (!pointer)
>         return -1;
> 
>-    if (cursor)
>-    {
>+    if (!cursor)
>+        cursor = d->empty_cursor;
>+
>+    if (cursor) {
>         Wayland_CursorData *data = cursor->driverdata;
> 
>-        wl_pointer_set_cursor (pointer, 0,
>-                               data->surface,
>-                               data->hot_x,
>-                               data->hot_y);
>+        wl_pointer_set_cursor(pointer, 0,
>+                              data->surface,
>+                              data->hot_x,
>+                              data->hot_y);
>         wl_surface_attach(data->surface, data->buffer, 0, 0);
>         wl_surface_damage(data->surface, 0, 0, data->w, data->h);
>         wl_surface_commit(data->surface);
>     }
>-    else
>-    {
>-        wl_pointer_set_cursor (pointer, 0,
>-                               NULL,
>-                               0,
>-                               0);
>-    }
>     
>     return 0;
> }
>diff -r 35b18e76f1a6 src/video/wayland/SDL_waylandmouse.h
>--- a/src/video/wayland/SDL_waylandmouse.h	Thu Mar 05 08:43:16 2020 -0800
>+++ b/src/video/wayland/SDL_waylandmouse.h	Mon Mar 09 16:09:13 2020 +0000
>@@ -28,4 +28,6 @@
> extern void Wayland_InitMouse(void);
> extern void Wayland_FiniMouse(void);
> 
>+extern SDL_Cursor *Wayland_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y);
>+
> #endif
>diff -r 35b18e76f1a6 src/video/wayland/SDL_waylandvideo.h
>--- a/src/video/wayland/SDL_waylandvideo.h	Thu Mar 05 08:43:16 2020 -0800
>+++ b/src/video/wayland/SDL_waylandvideo.h	Mon Mar 09 16:09:13 2020 +0000
>@@ -24,6 +24,7 @@
> #ifndef SDL_waylandvideo_h_
> #define SDL_waylandvideo_h_
> 
>+#include "SDL_mouse.h"
> 
> /*
> !!! FIXME: xdg_wm_base is the stable replacement for zxdg_shell_v6. While it's
>@@ -81,6 +82,8 @@
>     char *classname;
> 
>     int relative_mouse_mode;
>+
>+    SDL_Cursor* empty_cursor;
> } SDL_VideoData;
> 
> typedef struct {

Actions: View | Diff

Attachments on bug 5019: 4244 | 4245

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.