diff --git a/graphics/twm4nx/README.txt b/graphics/twm4nx/README.txt index f266873b1..914f63787 100644 --- a/graphics/twm4nx/README.txt +++ b/graphics/twm4nx/README.txt @@ -170,14 +170,16 @@ Issues: 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 - 4. Things become buggy after perhaps 10 shell windows have been opened. - Most likely, some resource allocation is failing silently and leaving - things in a bad state. The board I am using has 128Mb of SDRAM so I + 4. I have seen some odd behavior when many NxTerm windows have been + opened (around 15). Specifically, I see failures to start NSH in the + 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, - RAM-backed windows and will use significant amounts of memory. The - primary issue is that the number of windows should probably be - managed to assure that the end-user does not experience odd behaviors - with resource usage is high. + RAM-backed windows and will use significant amounts of memory. + The primary issue is that the number of windows should probably be + managed in some way to assure that the end-user does not experience + odd behaviors when resource usage is high. 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, 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 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 routing the MENU button events to applications. - - There are likely other unverified features. - 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 + and routing the MENU button events to applications. There are likely + other unverified features. + 7. X/Y input may be either via a touchscreen or a mouse. Only touchscreen input has been verified. There is, however, very little difference. The primary issue is in cursor support: Cursors are needed with a mouse. Cursor images also change depending on the diff --git a/graphics/twm4nx/src/cwindowfactory.cxx b/graphics/twm4nx/src/cwindowfactory.cxx index 640f8151b..e3df8c3ec 100644 --- a/graphics/twm4nx/src/cwindowfactory.cxx +++ b/graphics/twm4nx/src/cwindowfactory.cxx @@ -323,54 +323,93 @@ bool CWindowFactory::placeIcon(FAR CWindow *cwin, // Search for a free region. Start at the at the left size - struct nxgl_point_s tmppos; - tmppos.x = CONFIG_TWM4NX_ICON_HSPACING; + struct nxgl_point_s tmpPos; + 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 - nxgl_coord_t iconWidth = 0; - for (; tmppos.x < (displaySize.w - iconSize.w); tmppos.x += iconWidth) + nxgl_coord_t iconWidth; + for (; tmpPos.x < (displaySize.w - iconSize.w); tmpPos.x += iconWidth) { // 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 // location or until we run out of positions to test + iconWidth = 0; 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 struct nxgl_rect_s iconBounds; - iconBounds.pt1.x = tmppos.x; - iconBounds.pt1.y = tmppos.y; - iconBounds.pt2.x = tmppos.x + iconSize.w - 1; - iconBounds.pt2.y = tmppos.y + iconSize.h - 1; + iconBounds.pt1.x = tmpPos.x; + iconBounds.pt1.y = tmpPos.y; + iconBounds.pt2.x = tmpPos.x + iconSize.w - 1; + iconBounds.pt2.y = tmpPos.y + iconSize.h - 1; - // Check if this box intersects any reserved region on the background. - // If not, check if some other icon is already occupying this position + // Check if this box intersects any reserved region on the + // background. struct nxgl_rect_s collision; - if (!backgd->checkCollision(iconBounds, collision) && - !checkCollision(cwin, iconBounds, collision)) + if (backgd->checkCollision(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; - iconPos.y = tmppos.y; - return true; + if (iconWidth < 20) + { + 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. - // This is only in the vertical direction. This may terminate - // the inner loop. + // No.. check if some other icon is already occupying this + // position - iconHeight = collision.pt2.y - tmppos.y + - CONFIG_TWM4NX_ICON_VSPACING + 1; + else if (checkCollision(cwin, iconBounds, collision)) + { + // 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