diff options
Diffstat (limited to 'NxWidgets')
-rw-r--r-- | NxWidgets/UnitTests/nxwm/main.cxx | 22 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx | 15 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cnxtkwindow.cxx | 51 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx | 59 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/capplicationwindow.cxx | 2 |
5 files changed, 81 insertions, 68 deletions
diff --git a/NxWidgets/UnitTests/nxwm/main.cxx b/NxWidgets/UnitTests/nxwm/main.cxx index 6a6266141..12c5dc513 100644 --- a/NxWidgets/UnitTests/nxwm/main.cxx +++ b/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 diff --git a/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx b/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx index e33757a95..72713f2c4 100644 --- a/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx +++ b/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: * diff --git a/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx b/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx index 3f77254b2..648cc368f 100644 --- a/NxWidgets/libnxwidgets/src/cnxtkwindow.cxx +++ b/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; diff --git a/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx b/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx index 42cd047fa..9c90a5bfd 100644 --- a/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx +++ b/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,22 +397,38 @@ 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 + * This event is called from CCallback instance to provide + * notifications of certain NX-server related events. This event, + * in particular, will occur when the position or size of the underlying + * window occurs. * * @param hWindow The window handle that should be used to communicate * with the window - * @param bounds. The size of the underlying window. + * @param pos The position of the window in the physical device space. + * @param size The size of the window. + * @param bounds The size of the underlying display (pixels x rows) */ -void CWidgetControl::setWindowBounds(NXHANDLE hWindow, FAR const struct nxgl_rect_s *bounds) +void CWidgetControl::geometryEvent(NXHANDLE hWindow, + FAR const struct nxgl_size_s *size, + 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; + // 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 @@ -431,33 +448,7 @@ void CWidgetControl::setWindowBounds(NXHANDLE hWindow, FAR const struct nxgl_rec giveGeoSem(); } -} - -/** - * This event is called from CCallback instance to provide - * notifications of certain NX-server related events. This event, - * in particular, will occur when the position or size of the underlying - * window occurs. - * - * @param hWindow The window handle that should be used to communicate - * with the window - * @param pos The position of the window in the physical device space. - * @param size The size of the window. - * @param bounds The size of the underlying display (pixels x rows) - */ - -void CWidgetControl::geometryEvent(NXHANDLE hWindow, - FAR const struct nxgl_size_s *size, - FAR const struct nxgl_point_s *pos, - FAR const struct nxgl_rect_s *bounds) -{ - // 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); + sched_unlock(); } /** diff --git a/NxWidgets/nxwm/src/capplicationwindow.cxx b/NxWidgets/nxwm/src/capplicationwindow.cxx index 8395c93ab..0fb6f387a 100644 --- a/NxWidgets/nxwm/src/capplicationwindow.cxx +++ b/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) |