diff options
-rw-r--r-- | NxWidgets/ChangeLog.txt | 4 | ||||
-rw-r--r-- | NxWidgets/TODO.txt | 15 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/ckeyboard.cxx | 7 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/ctaskbar.cxx | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/Makefile | 4 |
5 files changed, 26 insertions, 14 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 9a5855252..b763d5ee5 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -136,3 +136,7 @@ * NxWM::CTaskbar: After drawing the task bar, need to raise the application window otherwise the taskbar will be on the top and keyboard input will not be received by the top application. +* NxWM::CTaskbar: Bugfix... previous window should now be minimized + when a new window is started. It should stay in a maximized state + so that it will re-appear with the window above it is closed or + minimized. diff --git a/NxWidgets/TODO.txt b/NxWidgets/TODO.txt index 6d74b6917..c0b9c5373 100644 --- a/NxWidgets/TODO.txt +++ b/NxWidgets/TODO.txt @@ -4,7 +4,7 @@ NxWidgets NxWM ---- - (3) General issues + (4) General issues (3) NxConsole issues (1) Platform specific issues @@ -55,6 +55,19 @@ o General NxWM Issues Status: Open Priority: Low + Title: COMBINE CTouchscreen AND CKeyboard THREADS + Description: Right now, two separate threads handle touchscreen and keyboard/ + console input. Each just waits on read() and when toushcscreen + or keyboard input is received, it injects the data into NX. + These two threads should be combined into one thread that waits + on poll for read data from either device. Then when read data + becomes ready for either device, it could perform the read and + data inject from a single thread. + Status: Open + Priority: Low, this is not a product but a text example. If NxWM were + to be productized, this change should be done in order to reduce + stack memory consumption. + o NxConsole Issues ---------------- diff --git a/NxWidgets/nxwm/src/ckeyboard.cxx b/NxWidgets/nxwm/src/ckeyboard.cxx index 6e9d7b818..0f3f11d37 100644 --- a/NxWidgets/nxwm/src/ckeyboard.cxx +++ b/NxWidgets/nxwm/src/ckeyboard.cxx @@ -36,11 +36,6 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ -#include <nuttx/config.h> // REMOVE ME -#define CONFIG_DEBUG 1 // REMOVE ME -#define CONFIG_DEBUG_VERBOSE 1 // REMOVE ME -#define CONFIG_DEBUG_GRAPHICS 1 // REMOVE ME -#include <debug.h> // REMOVE ME #include <nuttx/config.h> @@ -203,7 +198,7 @@ FAR void *CKeyboard::listener(FAR void *arg) uint8_t rxbuffer[CONFIG_NXWM_KEYBOARD_BUFSIZE]; ssize_t nbytes = read(This->m_kbdFd, rxbuffer, CONFIG_NXWM_KEYBOARD_BUFSIZE); -dbg("nbytes=%d\n"); // REMOVE ME + // Check for errors if (nbytes < 0) diff --git a/NxWidgets/nxwm/src/ctaskbar.cxx b/NxWidgets/nxwm/src/ctaskbar.cxx index 111d800e9..c494fcba3 100644 --- a/NxWidgets/nxwm/src/ctaskbar.cxx +++ b/NxWidgets/nxwm/src/ctaskbar.cxx @@ -506,8 +506,7 @@ bool CTaskbar::startApplication(IApplication *app, bool minimized) return false; } - // Has the window manager been started? Or were we ask to start - // the application minimized? + // Were we ask to start the application minimized? if (minimized) { @@ -551,11 +550,8 @@ bool CTaskbar::topApplication(IApplication *app) if (m_topApp) { - // Yes.. then minimize the application - - m_topApp->setMinimized(true); - - // And make the application non-visible + // Yes.. make the application non-visible (it is still maximized and + // will reappear when the window above it is minimized or closed). hideApplicationWindow(m_topApp); } diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile index 9f019862a..ef0415375 100644 --- a/nuttx/arch/arm/src/Makefile +++ b/nuttx/arch/arm/src/Makefile @@ -121,14 +121,18 @@ endif sort > $(TOPDIR)/System.map # This is part of the top-level export target +# Note that there may not be a head object if layout is handled +# by the linker configuration. export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) +ifneq ($(HEAD_OBJ),) @if [ -d "$(EXPORT_DIR)/startup" ]; then \ cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ else \ echo "$(EXPORT_DIR)/startup does not exist"; \ exit 1; \ fi +endif # Dependencies |