Most fixes to get NxWM working on the STM3240G-EVAL

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4710 7fd9a85b-ad96-42d3-883c-3090e2eb8679

NxWidgets/UnitTests/nxwm/main.cxx

@@ -230,6 +230,16 @@ int MAIN_NAME(int argc, char *argv[])
 
   initMemoryUsage();
 
+  // Initialize the NSH library
+
+  printf(MAIN_STRING "Initialize the NSH library\n");
+  if (!NxWM::nshlibInitialize())
+    {
+      printf(MAIN_STRING "ERROR: Failed to initialize the NSH library\n");
+      return EXIT_FAILURE;
+    }
+  showTestCaseMemory("After initializing the NSH library");
+
   // Create an instance of the Task Bar.
   //
   // The general sequence for initializing the task bar is:
@@ -316,18 +326,6 @@ int MAIN_NAME(int argc, char *argv[])
     }
   showTestCaseMemory("After create the start window application");
 
-  // Initialize the NSH library
-
-  printf(MAIN_STRING "Initialize the NSH library\n");
-  if (!NxWM::nshlibInitialize())
-    {
-      printf(MAIN_STRING "ERROR: Failed to initialize the NSH library\n");
-      delete window;
-      delete g_nxwmtest.taskbar;
-      return EXIT_FAILURE;
-    }
-  showTestCaseMemory("After initializing the NSH library");
-
   // Add the NxConsole application to the start window
 
   NxWM::CNxConsole *console = (NxWM::CNxConsole *)0; // Avoid compiler complaint

NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx

@@ -609,7 +609,7 @@ namespace NXWidgets
     {
       waitGeoData();
       pos->x = m_pos.x;
-      pos->x = m_pos.y;
+      pos->y = m_pos.y;
       return true;
     }
 
@@ -654,19 +654,6 @@ namespace NXWidgets
       return m_size.h;
     }
 
-    /**
-     * Set the size of the window.  This is normally reported by an NX callback.  But
-     * the toolbar widget control does not get NX callbacks and has to get the 
-     * window size throught this method.  This method should not be called by user
-     * code
-     *
-     * @param hWindow The window handle that should be used to communicate
-     *        with the window
-     * @param bounds. The size of the underlying window.
-     */
-
-    void setWindowBounds(NXHANDLE hWindow, FAR const struct nxgl_rect_s *bounds);
-
    /**
     * The creation sequence is:
     *

NxWidgets/libnxwidgets/src/cnxtkwindow.cxx

@@ -41,6 +41,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <sched.h>
 #include <cassert>
 
 #include "cwidgetcontrol.hxx"
@@ -149,11 +150,12 @@ CNxToolbar *CNxTkWindow::openToolbar(nxgl_coord_t height)
       CWidgetStyle style;
       m_widgetControl->getWidgetStyle(&style);
 
-      // Set the background color to the color of the toolbar
+      // Set the background color(s) to the color of the toolbar
 
-      style.colors.background = CONFIG_NXTK_BORDERCOLOR1;
+      style.colors.background         = CONFIG_NXTK_BORDERCOLOR1;
+      style.colors.selectedBackground = CONFIG_NXTK_BORDERCOLOR1;
 
-      // Create a new controlling widget for the window
+      // Create a new controlling widget for the window using these colors
 
       CWidgetControl *widgetControl = new CWidgetControl(&style);
 
@@ -179,11 +181,46 @@ CNxToolbar *CNxTkWindow::openToolbar(nxgl_coord_t height)
           return (CNxToolbar *)0;
         }
 
-      // Provide parent widget control information to new widget control instance
+      // Provide parent widget control information to new widget control instance.
+      // This information is reported by an NX callback for "normal" windows.  But
+      // the toolbar widget control does not get NX callbacks and has to get the 
+      // window size through the setWindowBounds method.
 
-      struct nxgl_rect_s bounds;
-      m_widgetControl->getWindowBoundingBox(&bounds);
-      widgetControl->setWindowBounds(m_widgetControl->getWindowHandle(), &bounds);
+      // Disable preemption so that we can be assured that all of the following
+      // values are synchronized.
+
+      sched_lock();
+
+      // Get the physical bounding box of the window in display coordinates
+      
+      struct nxgl_rect_s windowBounds;
+      m_widgetControl->getWindowBoundingBox(&windowBounds);
+
+      // Get the position of the parent window in display coordinates
+
+      struct nxgl_point_s windowPos;
+      m_widgetControl->getWindowPosition(&windowPos);
+
+      // Get the bounding box of the toolbar in parent window coordinates
+
+      struct nxgl_rect_s toolbarBounds;
+      nxtk_toolbarbounds(m_hNxTkWindow, &toolbarBounds);
+
+      // Get the toolbar size
+
+      struct nxgl_size_s toolbarSize;
+      nxgl_rectsize(&toolbarSize, &toolbarBounds);
+
+      // Get the toolbar position in display coordinates by adding the window position
+
+      struct nxgl_point_s toolbarPos;
+      nxgl_vectoradd(&toolbarPos, &toolbarBounds.pt1, &windowPos);
+
+      // Perform the fake NX callback
+
+      widgetControl->geometryEvent(m_hNxTkWindow, &toolbarSize,
+                                   &toolbarPos, &windowBounds);
+      sched_unlock();
     }
 
   return m_toolbar;

NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx

@@ -42,6 +42,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <cstring>
+#include <sched.h>
 #include <cerrno>
 
 #include "nxconfig.hxx"
@@ -396,41 +397,6 @@ void CWidgetControl::setFocusedWidget(CNxWidget *widget)
 
       widget->focus();
     }
-#warning "Widgets with focus need to go on a stack so that focus can be restored"    
-}
-
-/**
- * Set the size of the window.  This is normally reported by an NX callback.  But
- * the toolbar widget control does not get NX callbacks and has to get the 
- * window size throught this method.  This method should not be called by user
- * code
- *
- * @param hWindow The window handle that should be used to communicate
- *        with the window
- * @param bounds. The size of the underlying window.
- */
-
-void CWidgetControl::setWindowBounds(NXHANDLE hWindow, FAR const struct nxgl_rect_s *bounds)
-{
-  // The first callback is important.  This is the handshake that proves
-  // that we are truly communicating with the servier.  This is also
-  // a critical point because this is when we know the physical
-  // dimensions of the underlying window.
-
-  if (!m_hWindow)
-    {
-      // Save one-time server specific information
- 
-      m_hWindow = hWindow;
-      nxgl_rectcopy(&m_bounds, bounds);
-
-      // Wake up any threads waiting for initial position information.
-      // REVISIT:  If the window is moved or repositioned, then the
-      // position and size data will be incorrect for a period of time.
-      // That case should be handled here as well.
-
-      giveGeoSem();
-    }
 }
 
 /**
@@ -451,13 +417,38 @@ void CWidgetControl::geometryEvent(NXHANDLE hWindow,
                                    FAR const struct nxgl_point_s *pos,
                                    FAR const struct nxgl_rect_s *bounds)
 {
+  // Disable pre-emption so that we can be assured that the following
+  // operations are atomic
+
+  sched_lock();
+
   // Save positional data that may change dynamically
 
   m_pos.x   = pos->x;
   m_pos.y   = pos->y;
   m_size.h  = size->h;
   m_size.w  = size->w;
-  setWindowBounds(hWindow, bounds);
+
+  // The first callback is important.  This is the handshake that proves
+  // that we are truly communicating with the servier.  This is also
+  // a critical point because this is when we know the physical
+  // dimensions of the underlying window.
+
+  if (!m_hWindow)
+    {
+      // Save one-time server specific information
+ 
+      m_hWindow = hWindow;
+      nxgl_rectcopy(&m_bounds, bounds);
+
+      // Wake up any threads waiting for initial position information.
+      // REVISIT:  If the window is moved or repositioned, then the
+      // position and size data will be incorrect for a period of time.
+      // That case should be handled here as well.
+
+      giveGeoSem();
+    }
+  sched_unlock();
 }
 
 /**

NxWidgets/nxwm/src/capplicationwindow.cxx

@@ -169,7 +169,7 @@ bool CApplicationWindow::open(void)
       return false;
     }
 
-  // Get the CWidgetControl associated with this window
+  // Get the CWidgetControl associated with the toolbar
 
   NXWidgets::CWidgetControl *control = m_toolbar->getWidgetControl();
   if (!control)

nuttx/ChangeLog

@@ -2712,4 +2712,7 @@
 	  IO Expander and touchscreen driver.
 	* configs/stm3240g-eval/nxwm:  Added to configuration for testing the NxWM
 	  window manager on the STM3240G-EVAL board.
+	* graphics/nxtk/nxtk_toolbarbounds.c:  Added an interface to get the toolbar
+	  bounding box.
+	* graphics/nxtk/nxtk_drawframe.c:  Fix an error in drawing the window frame.
 

nuttx/graphics/nxtk/Make.defs

@@ -43,6 +43,6 @@ NXTKWIN_CSRCS	= nxtk_openwindow.c nxtk_closewindow.c nxtk_getposition.c \
 NXTKTB_CSRCS	= nxtk_opentoolbar.c nxtk_closetoolbar.c nxtk_filltoolbar.c \
 		  nxtk_gettoolbar.c nxtk_filltraptoolbar.c nxtk_movetoolbar.c \
 		  nxtk_bitmaptoolbar.c nxtk_drawcircletoolbar.c nxtk_drawlinetoolbar.c \
-		  nxtk_fillcircletoolbar.c
+		  nxtk_fillcircletoolbar.c nxtk_toolbarbounds.c
 NXTK_CSRCS	= $(NXTKWIN_CSRCS) $(NXTKTB_CSRCS) nxtk_subwindowclip.c \
 		  nxtk_containerclip.c nxtk_subwindowmove.c nxtk_drawframe.c

nuttx/graphics/nxtk/nxtk_drawframe.c

@@ -274,5 +274,37 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd,
 #endif
 #endif
 
+  /* Fix up the little line-seqments at the top inner edges that need to match
+   * the color of the toolbar.
+   */
+
+#if CONFIG_NXTK_BORDERWIDTH > 1
+  if (tbsize.h > 0)
+    {
+      /* Draw the right side */
+
+#if CONFIG_NXTK_BORDERWIDTH > 2
+      frame.pt1.x = thickness + 1;
+      frame.pt1.y = 1;
+      frame.pt2.x = frame.pt1.x;
+      frame.pt2.y = tbsize.h + thickness;
+#else
+      frame.pt1.x = thickness;
+      frame.pt1.y = 0;
+      frame.pt2.x = frame.pt1.x;
+      frame.pt2.y = tbsize.h + thickness - 1;
+#endif
+      nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
+
+      /* Draw the left size */
+
+#if CONFIG_NXTK_BORDERWIDTH > 2
+      frame.pt1.x = wndsize.w - thickness - 2;
+      frame.pt2.x = frame.pt1.x;
+      nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
+#endif
+    }
+#endif
+
   return OK;
 }

nuttx/graphics/nxtk/nxtk_toolbarbounds.c

@@ -0,0 +1,107 @@
+/****************************************************************************
+ * graphics/nxtk/nxtk_toolbarbounds.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <assert.h>
+
+#include <nuttx/nx/nx.h>
+#include <nuttx/nx/nxtk.h>
+
+#include "nxfe.h"
+#include "nxtk_internal.h"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxtk_toolbarbounds
+ *
+ * Description:
+ *   Return a bounding box that contains the toolbar in the coordinates of
+ *   the containing, framed window.  For example, the recturned  origin
+ *  (rect.pt1) is the offset toolbar in the framed window.
+ *
+ *   NOTE: This function is unsafe in the case of the multi-user NX server
+ *   where the width of the window may be being changed asynchronously!  It
+ *   may return the old size in this case.
+ *
+ * Input Parameters:
+ *   hfwnd  - The handle returned by nxtk_openwindow
+ *   bounds - User provided location in which to return the bounding box.
+ *
+ * Return:
+ *   OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nxtk_toolbarbounds(NXTKWINDOW hfwnd, FAR struct nxgl_rect_s *bounds)
+{
+  FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
+
+  DEBUGASSERT(hfwnd && bounds);
+
+  /* Offset the rectangle by subtracting the current position of the window. */
+
+  nxgl_rectoffset(bounds, &fwnd->tbrect,
+                  -fwnd->wnd.bounds.pt1.x, -fwnd->wnd.bounds.pt1.y);
+  return OK;
+}
+

nuttx/include/nuttx/nx/nxtk.h

@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/nuttx/nx/nxtk.h
  *
- *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -114,7 +114,7 @@ EXTERN int nxtk_closewindow(NXTKWINDOW hfwnd);
  *
  * Description:
  *  Request the position and size information for the selected framed window.
- *  The size/position for the client window and toolbar will be return
+ *  The size/position for the client window and toolbar will be returned
  *  asynchronously through the client callback function pointer.
  *
  * Input Parameters:
@@ -422,6 +422,29 @@ EXTERN int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,
 
 EXTERN int nxtk_closetoolbar(NXTKWINDOW hfwnd);
 
+/****************************************************************************
+ * Name: nxtk_toolbarbounds
+ *
+ * Description:
+ *   Return a bounding box that contains the toolbar in the coordinates of
+ *   the containing, framed window.  For example, the recturned  origin
+ *  (rect.pt1) is the offset toolbar in the framed window.
+ *
+ *   NOTE: This function is unsafe in the case of the multi-user NX server
+ *   where the width of the window may be being changed asynchronously!  It
+ *   may return the old size in this case.
+ *
+ * Input Parameters:
+ *   hfwnd  - The handle returned by nxtk_openwindow
+ *   bounds - User provided location in which to return the bounding box.
+ *
+ * Return:
+ *   OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+EXTERN int nxtk_toolbarbounds(NXTKWINDOW hfwnd, FAR struct nxgl_rect_s *bounds);
+
 /****************************************************************************
  * Name: nxtk_filltoolbar
  *