geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Minor cursor code cleanup 

Clean up variable declarations and fix some formatting issues.
main
Frank Praznik 2024-03-13 11:52:51 -04:00
parent 1973edb9b7
commit 4686a737a9
1 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/video/wayland/SDL_waylandmouse.c
View File

@ -61,8 +61,8 @@ typedef struct
* When shm_data is NULL, system_cursor must be valid * When shm_data is NULL, system_cursor must be valid
*/ */
SDL_SystemCursor system_cursor; SDL_SystemCursor system_cursor;
int shm_data_size;
void *shm_data; void *shm_data;
size_t shm_data_size;
} Wayland_CursorData; } Wayland_CursorData;
static int dbus_cursor_size; static int dbus_cursor_size;
@ -82,13 +82,13 @@ static void Wayland_FreeCursorThemes(SDL_VideoData *vdata)
#include "../../core/linux/SDL_dbus.h" #include "../../core/linux/SDL_dbus.h"
#define CURSOR_NODE "org.freedesktop.portal.Desktop" #define CURSOR_NODE "org.freedesktop.portal.Desktop"
#define CURSOR_PATH "/org/freedesktop/portal/desktop" #define CURSOR_PATH "/org/freedesktop/portal/desktop"
#define CURSOR_INTERFACE "org.freedesktop.portal.Settings" #define CURSOR_INTERFACE "org.freedesktop.portal.Settings"
#define CURSOR_NAMESPACE "org.gnome.desktop.interface" #define CURSOR_NAMESPACE "org.gnome.desktop.interface"
#define CURSOR_SIGNAL_NAME "SettingChanged" #define CURSOR_SIGNAL_NAME "SettingChanged"
#define CURSOR_SIZE_KEY "cursor-size" #define CURSOR_SIZE_KEY "cursor-size"
#define CURSOR_THEME_KEY "cursor-theme" #define CURSOR_THEME_KEY "cursor-theme"
static DBusMessage *Wayland_ReadDBusProperty(SDL_DBusContext *dbus, const char *key) static DBusMessage *Wayland_ReadDBusProperty(SDL_DBusContext *dbus, const char *key)
{ {
@ -248,8 +248,9 @@ static void Wayland_DBusInitCursorProperties(SDL_VideoData *vdata)
/* Only add the filter if at least one of the settings we want is present. */ /* Only add the filter if at least one of the settings we want is present. */
if (add_filter) { if (add_filter) {
dbus->bus_add_match(dbus->session_conn, dbus->bus_add_match(dbus->session_conn,
"type='signal', interface='"CURSOR_INTERFACE"'," "type='signal', interface='" CURSOR_INTERFACE "',"
"member='"CURSOR_SIGNAL_NAME"', arg0='"CURSOR_NAMESPACE"'", NULL); "member='" CURSOR_SIGNAL_NAME "', arg0='" CURSOR_NAMESPACE "'",
NULL);
dbus->connection_add_filter(dbus->session_conn, &Wayland_DBusCursorMessageFilter, vdata, NULL); dbus->connection_add_filter(dbus->session_conn, &Wayland_DBusCursorMessageFilter, vdata, NULL);
dbus->connection_flush(dbus->session_conn); dbus->connection_flush(dbus->session_conn);
} }
@ -371,8 +372,7 @@ static int set_tmp_file_size(int fd, off_t size)
if (ret == 0) { if (ret == 0) {
return 0; return 0;
} } else if (ret != EINVAL && errno != EOPNOTSUPP) {
else if (ret != EINVAL && errno != EOPNOTSUPP) {
return -1; return -1;
} }
#endif #endif
@ -440,12 +440,10 @@ static int create_buffer_from_shm(Wayland_CursorData *d,
SDL_VideoData *data = vd->driverdata; SDL_VideoData *data = vd->driverdata;
struct wl_shm_pool *shm_pool; struct wl_shm_pool *shm_pool;
int stride = width * 4; const int stride = width * 4;
d->shm_data_size = stride * height; d->shm_data_size = stride * height;
int shm_fd; const int shm_fd = wayland_create_tmp_file(d->shm_data_size);
shm_fd = wayland_create_tmp_file(d->shm_data_size);
if (shm_fd < 0) { if (shm_fd < 0) {
return SDL_SetError("Creating mouse cursor buffer failed."); return SDL_SetError("Creating mouse cursor buffer failed.");
} }
@ -531,7 +529,6 @@ static SDL_Cursor *Wayland_CreateSystemCursor(SDL_SystemCursor id)
SDL_free(cursor); SDL_free(cursor);
return NULL; return NULL;
} }
cursor->driverdata = (void *)cdata; cursor->driverdata = (void *)cdata;
/* The surface is only necessary if the cursor shape manager is not present. /* The surface is only necessary if the cursor shape manager is not present.
@ -557,10 +554,14 @@ static SDL_Cursor *Wayland_CreateDefaultCursor(void)
static void Wayland_FreeCursorData(Wayland_CursorData *d) static void Wayland_FreeCursorData(Wayland_CursorData *d)
{ {
/* Buffers for system cursors must not be destroyed. */
if (d->buffer) { if (d->buffer) {
if (d->shm_data) { if (d->shm_data) {
wl_buffer_destroy(d->buffer); wl_buffer_destroy(d->buffer);
munmap(d->shm_data, d->shm_data_size); munmap(d->shm_data, d->shm_data_size);
d->shm_data_size = 0;
d->shm_data = NULL;
} }
d->buffer = NULL; d->buffer = NULL;
} }
@ -865,16 +866,36 @@ void Wayland_InitMouse(void)
SDL_HitTestResult r = SDL_HITTEST_NORMAL; SDL_HitTestResult r = SDL_HITTEST_NORMAL;
while (r <= SDL_HITTEST_RESIZE_LEFT) { while (r <= SDL_HITTEST_RESIZE_LEFT) {
switch (r) { switch (r) {
case SDL_HITTEST_NORMAL: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW); break; case SDL_HITTEST_NORMAL:
case SDL_HITTEST_DRAGGABLE: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW); break; sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
case SDL_HITTEST_RESIZE_TOPLEFT: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_TOPLEFT); break; break;
case SDL_HITTEST_RESIZE_TOP: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_TOP); break; case SDL_HITTEST_DRAGGABLE:
case SDL_HITTEST_RESIZE_TOPRIGHT: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_TOPRIGHT); break; sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
case SDL_HITTEST_RESIZE_RIGHT: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_RIGHT); break; break;
case SDL_HITTEST_RESIZE_BOTTOMRIGHT: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_BOTTOMRIGHT); break; case SDL_HITTEST_RESIZE_TOPLEFT:
case SDL_HITTEST_RESIZE_BOTTOM: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_BOTTOM); break; sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_TOPLEFT);
case SDL_HITTEST_RESIZE_BOTTOMLEFT: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_BOTTOMLEFT); break; break;
case SDL_HITTEST_RESIZE_LEFT: sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_LEFT); break; case SDL_HITTEST_RESIZE_TOP:
sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_TOP);
break;
case SDL_HITTEST_RESIZE_TOPRIGHT:
sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_TOPRIGHT);
break;
case SDL_HITTEST_RESIZE_RIGHT:
sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_RIGHT);
break;
case SDL_HITTEST_RESIZE_BOTTOMRIGHT:
sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_BOTTOMRIGHT);
break;
case SDL_HITTEST_RESIZE_BOTTOM:
sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_BOTTOM);
break;
case SDL_HITTEST_RESIZE_BOTTOMLEFT:
sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_BOTTOMLEFT);
break;
case SDL_HITTEST_RESIZE_LEFT:
sys_cursors[r] = Wayland_CreateSystemCursor(SDL_SYSTEM_CURSOR_WINDOW_LEFT);
break;
} }
r++; r++;
} }