sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/graphics/twm4nx: Fix a bug in placement of icons on the desktop. When many windows are iconfigied, a bug in the looping logic could cause an infinite loop.

Browse Source
This commit is contained in:
Gregory Nutt 2019-05-26 09:19:33 -06:00
parent 96d7679d6f
commit 10ab7a56c9
2 changed files with 75 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
graphics/twm4nx/README.txt
View File

@ -170,14 +170,16 @@ Issues:
3. Most Twm4Nx configuration settings are hard-coded in *_config.hxx header 3. Most Twm4Nx configuration settings are hard-coded in *_config.hxx header
files. These all need to be brought out and made accessible via Kconfig files. These all need to be brought out and made accessible via Kconfig
files files
4. Things become buggy after perhaps 10 shell windows have been opened. 4. I have seen some odd behavior when many NxTerm windows have been
Most likely, some resource allocation is failing silently and leaving opened (around 15). Specifically, I see failures to start NSH in the
things in a bad state. The board I am using has 128Mb of SDRAM so I windows so they come up blank. All other behaviors are normal. Most
likely, some NxTerm resource allocation is failing silently and leaving
things in an unusable. The board I am using has 128Mb of SDRAM so I
can't believe that memory is the limiting factor. These are, however, can't believe that memory is the limiting factor. These are, however,
RAM-backed windows and will use significant amounts of memory. The RAM-backed windows and will use significant amounts of memory.
primary issue is that the number of windows should probably be The primary issue is that the number of windows should probably be
managed to assure that the end-user does not experience odd behaviors managed in some way to assure that the end-user does not experience
with resource usage is high. odd behaviors when resource usage is high.
5. Menus with sub-menus have not been verified. There is no use of sub- 5. Menus with sub-menus have not been verified. There is no use of sub-
menus in the current code base so I expect that there are issues when, menus in the current code base so I expect that there are issues when,
for example, and item from a sub-menu item: That menu and all of its for example, and item from a sub-menu item: That menu and all of its
@ -185,14 +187,9 @@ Issues:
6. There is an optional MENU button that may appear at the far left on 6. There is an optional MENU button that may appear at the far left on
the toolbar. It is not used by any window in the current code base the toolbar. It is not used by any window in the current code base
and, hence, is unverified. I would expect some issues with generating and, hence, is unverified. I would expect some issues with generating
and routing the MENU button events to applications. and routing the MENU button events to applications. There are likely
other unverified features.
There are likely other unverified features. 7. X/Y input may be either via a touchscreen or a mouse. Only
7. It has reported by one person that he experienced problems at high
levels of optimization (I have been using DEBUG configurations with
no optimization). This might be due to timing differences or perhaps
there is a location that needs 'volatile'.
8. X/Y input may be either via a touchscreen or a mouse. Only
touchscreen input has been verified. There is, however, very little touchscreen input has been verified. There is, however, very little
difference. The primary issue is in cursor support: Cursors are difference. The primary issue is in cursor support: Cursors are
needed with a mouse. Cursor images also change depending on the needed with a mouse. Cursor images also change depending on the

87
graphics/twm4nx/src/cwindowfactory.cxx
View File

@ -323,54 +323,93 @@ bool CWindowFactory::placeIcon(FAR CWindow *cwin,
// Search for a free region. Start at the at the left size // Search for a free region. Start at the at the left size
struct nxgl_point_s tmppos; struct nxgl_point_s tmpPos;
tmppos.x = CONFIG_TWM4NX_ICON_HSPACING; tmpPos.x = CONFIG_TWM4NX_ICON_HSPACING;
// Try each possible horizonal position until we find a free location or // Try each possible horizontal position until we find a free location or
// until we run out of positions to test // until we run out of positions to test
nxgl_coord_t iconWidth = 0; nxgl_coord_t iconWidth;
for (; tmppos.x < (displaySize.w - iconSize.w); tmppos.x += iconWidth) for (; tmpPos.x < (displaySize.w - iconSize.w); tmpPos.x += iconWidth)
{ {
// Start at the top of the next column // Start at the top of the next column
tmppos.y = CONFIG_TWM4NX_ICON_VSPACING; tmpPos.y = CONFIG_TWM4NX_ICON_VSPACING;
// Try each possible vertical position until we find a free // Try each possible vertical position until we find a free
// location or until we run out of positions to test // location or until we run out of positions to test
iconWidth = 0;
nxgl_coord_t iconHeight; nxgl_coord_t iconHeight;
for (; tmppos.y < (displaySize.h - iconSize.h); tmppos.y += iconHeight)
for (; tmpPos.y < (displaySize.h - iconSize.h); tmpPos.y += iconHeight)
{ {
// Create a bounding box at this position // Create a bounding box at this position
struct nxgl_rect_s iconBounds; struct nxgl_rect_s iconBounds;
iconBounds.pt1.x = tmppos.x; iconBounds.pt1.x = tmpPos.x;
iconBounds.pt1.y = tmppos.y; iconBounds.pt1.y = tmpPos.y;
iconBounds.pt2.x = tmppos.x + iconSize.w - 1; iconBounds.pt2.x = tmpPos.x + iconSize.w - 1;
iconBounds.pt2.y = tmppos.y + iconSize.h - 1; iconBounds.pt2.y = tmpPos.y + iconSize.h - 1;
// Check if this box intersects any reserved region on the background. // Check if this box intersects any reserved region on the
// If not, check if some other icon is already occupying this position // background.
struct nxgl_rect_s collision; struct nxgl_rect_s collision;
if (!backgd->checkCollision(iconBounds, collision) && if (backgd->checkCollision(iconBounds, collision))
!checkCollision(cwin, iconBounds, collision))
{ {
// No collision.. place the icon at this position // Yes.. Set the width to some small, arbitrary non-zero
// value. This is because the actual colliding object may
// be quite wide. But we may still be able to position
// icons above or below the object.
iconPos.x = tmppos.x; if (iconWidth < 20)
iconPos.y = tmppos.y; {
return true; iconWidth = 20;
}
// and reset the vertical search position to move past
// the collision. This may terminate the inner loop.
iconHeight = collision.pt2.y - tmpPos.y +
CONFIG_TWM4NX_ICON_VSPACING + 1;
} }
// Yes.. reset the search position to move past the collision. // No.. check if some other icon is already occupying this
// This is only in the vertical direction. This may terminate // position
// the inner loop.
iconHeight = collision.pt2.y - tmppos.y + else if (checkCollision(cwin, iconBounds, collision))
CONFIG_TWM4NX_ICON_VSPACING + 1; {
// Yes.. We need to keep track of the widest icon for the
// case where we move to the next column.
nxgl_coord_t tmpWidth = collision.pt2.x - tmpPos.x + 1;
if (tmpWidth > iconWidth)
{
iconWidth = tmpWidth;
}
// And reset the vertical search position to move past the
// collision. This may terminate the inner loop.
iconHeight = collision.pt2.y - tmpPos.y +
CONFIG_TWM4NX_ICON_VSPACING + 1;
}
// No collision.. place the icon at this position
else
{
iconPos.x = tmpPos.x;
iconPos.y = tmpPos.y;
return true;
}
} }
// Add some configurable spacing to the maximum width of this
// column. The next column will skip 'right' by this width.
iconWidth += CONFIG_TWM4NX_ICON_HSPACING;
} }
// No free region found, use the user provided default // No free region found, use the user provided default