encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kmsdrm: Move cursor plane setup and freeing to MouseInit() and MouseQuit(), for better consistency.

This commit is contained in:
Manuel Alfayate Corchete 2020-08-24 01:10:11 +02:00
parent 0d593d7ead
commit a76f176361
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/video/kmsdrm/SDL_kmsdrmmouse.c
View File

@ -144,8 +144,7 @@ KMSDRM_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
goto cleanup; goto cleanup;
} }
/* Here simply set the hox_x and hot_y, that will be used in drm_atomic_movecursor(). /* hox_x and hot_y are the coordinates of the "tip of the cursor" from it's base. */
These are the coordinates of the "tip of the cursor" from it's base. */
curdata->hot_x = hot_x; curdata->hot_x = hot_x;
curdata->hot_y = hot_y; curdata->hot_y = hot_y;
curdata->w = usable_cursor_w; curdata->w = usable_cursor_w;
@ -264,9 +263,6 @@ KMSDRM_ShowCursor(SDL_Cursor * cursor)
if (dispdata && dispdata->cursor_plane) { if (dispdata && dispdata->cursor_plane) {
info.plane = dispdata->cursor_plane; /* The rest of the members are zeroed. */ info.plane = dispdata->cursor_plane; /* The rest of the members are zeroed. */
ret = drm_atomic_set_plane_props(&info); ret = drm_atomic_set_plane_props(&info);
/* Free the plane on which the cursor was being shown. */
free_plane(&dispdata->cursor_plane);
if (ret) { if (ret) {
SDL_SetError("Could not hide current cursor."); SDL_SetError("Could not hide current cursor.");
return ret; return ret;
@ -290,6 +286,9 @@ KMSDRM_ShowCursor(SDL_Cursor * cursor)
if (!dispdata) { if (!dispdata) {
return SDL_SetError("Could not get display driverdata."); return SDL_SetError("Could not get display driverdata.");
} }
if (!dispdata->cursor_plane) {
return SDL_SetError("Hardware cursor plane not initialized.");
}
curdata = (KMSDRM_CursorData *) cursor->driverdata; curdata = (KMSDRM_CursorData *) cursor->driverdata;
@ -301,11 +300,6 @@ KMSDRM_ShowCursor(SDL_Cursor * cursor)
curdata->plane = dispdata->cursor_plane; curdata->plane = dispdata->cursor_plane;
curdata->video = video_device; curdata->video = video_device;
/* Init cursor plane, if we haven't yet. */
if (!dispdata->cursor_plane) {
setup_plane(curdata->video, &(dispdata->cursor_plane), DRM_PLANE_TYPE_CURSOR);
}
fb = KMSDRM_FBFromBO(curdata->video, curdata->bo); fb = KMSDRM_FBFromBO(curdata->video, curdata->bo);
info.plane = dispdata->cursor_plane; info.plane = dispdata->cursor_plane;
@ -321,7 +315,7 @@ KMSDRM_ShowCursor(SDL_Cursor * cursor)
ret = drm_atomic_set_plane_props(&info); ret = drm_atomic_set_plane_props(&info);
if (ret) { if (ret) {
SDL_SetError("KMSDRM_SetCursor failed."); SDL_SetError("KMSDRM_ShowCursor failed.");
return ret; return ret;
} }
@ -410,6 +404,8 @@ KMSDRM_InitMouse(_THIS)
/* FIXME: Using UDEV it should be possible to scan all mice /* FIXME: Using UDEV it should be possible to scan all mice
* but there's no point in doing so as there's no multimice support...yet! * but there's no point in doing so as there's no multimice support...yet!
*/ */
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
SDL_Mouse *mouse = SDL_GetMouse(); SDL_Mouse *mouse = SDL_GetMouse();
mouse->CreateCursor = KMSDRM_CreateCursor; mouse->CreateCursor = KMSDRM_CreateCursor;
@ -419,13 +415,20 @@ KMSDRM_InitMouse(_THIS)
mouse->WarpMouse = KMSDRM_WarpMouse; mouse->WarpMouse = KMSDRM_WarpMouse;
mouse->WarpMouseGlobal = KMSDRM_WarpMouseGlobal; mouse->WarpMouseGlobal = KMSDRM_WarpMouseGlobal;
/* Init cursor plane, if we haven't yet. */
if (!dispdata->cursor_plane) {
setup_plane(_this, &(dispdata->cursor_plane), DRM_PLANE_TYPE_CURSOR);
}
SDL_SetDefaultCursor(KMSDRM_CreateDefaultCursor()); SDL_SetDefaultCursor(KMSDRM_CreateDefaultCursor());
} }
void void
KMSDRM_QuitMouse(_THIS) KMSDRM_QuitMouse(_THIS)
{ {
/* TODO: ? */ /* Free the plane on which the cursor was being shown. */
SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0);
free_plane(&dispdata->cursor_plane);
} }
/* This is called when a mouse motion event occurs */ /* This is called when a mouse motion event occurs */