Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

graphics/nxbe: Add some missing checks: Don't permit the software cursor to be enabled until it has been assigned an image; don't perform any cursor operations while the cursor is disabled.

Browse Source
This commit is contained in:
Gregory Nutt
2019-04-10 07:27:43 -06:00
parent 084ad8dd86
commit e514402c28
7 changed files with 127 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxbe/nxbe_setpixel.c
+16 -11
View File
@@ -153,20 +153,25 @@ void nxbe_setpixel(FAR struct nxbe_window_s *wnd,
&info.cops, &wnd->be->plane[i]);
#ifdef CONFIG_NX_SWCURSOR
/* Save the modified cursor pixe at the point.
*
* REVISIT: This and the following logic belongs in the function
* nxbe_clipfill(). It is here only because the struct nxbe_state_s
* (wnd->be) is not available at that point.
*/
/* Update the software cursor if it is visible */
wnd->be->plane[i].cursor.backup(wnd->be, &rect, i);
if (wnd->be->cursor.visible)
{
/* Save the modified cursor pixe at the point.
*
* REVISIT: This and the following logic belongs in the function
* nxbe_clipfill(). It is here only because the struct
* nxbe_state_s (wnd->be) is not available at that point.
*/
/* Restore the software cursor if if that point is a visible cursor
* bit that was overwritten by the above operation.
*/
wnd->be->plane[i].cursor.backup(wnd->be, &rect, i);
wnd->be->plane[i].cursor.draw(wnd->be, &rect, i);
/* Restore the software cursor if if that point is a visible
* cursor bit that was overwritten by the above operation.
*/
wnd->be->plane[i].cursor.draw(wnd->be, &rect, i);
}
#endif
}
}