diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:26:44 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:26:44 -0600 |
| commit | 638c1a6dc07b438efa220c5345e94c3a963505ca (patch) | |
| tree | 85feed8dbf4f2dd7a2eec83ed88606f14a2f02a2 | |
| parent | 43ec94a665e13552402ff4f102e0f65f6792cf29 (diff) | |
| download | nuttx-638c1a6dc07b438efa220c5345e94c3a963505ca.tar.gz nuttx-638c1a6dc07b438efa220c5345e94c3a963505ca.tar.bz2 nuttx-638c1a6dc07b438efa220c5345e94c3a963505ca.zip | |
More trailing whilespace removal
191 files changed, 2458 insertions, 2458 deletions
diff --git a/NxWidgets/Doxygen/gendoc.sh b/NxWidgets/Doxygen/gendoc.sh index 0132f8162..8d6b6ec28 100755 --- a/NxWidgets/Doxygen/gendoc.sh +++ b/NxWidgets/Doxygen/gendoc.sh @@ -75,7 +75,7 @@ doxygen "${DOXYFILE}" || \ { echo "Failed to run doxygen"; \ exit 1; - + } cp -rf html "${DOXYGENOUTPUT_DIR}" || \ diff --git a/NxWidgets/README.txt b/NxWidgets/README.txt index 81f100d3d..635bbbea6 100644 --- a/NxWidgets/README.txt +++ b/NxWidgets/README.txt @@ -62,7 +62,7 @@ Kconfig libnxwidgets The source code, header files, and build environment for NxWidgets is - provided in this directory. + provided in this directory. UnitTests diff --git a/NxWidgets/TODO.txt b/NxWidgets/TODO.txt index b767f3536..1c4632d27 100644 --- a/NxWidgets/TODO.txt +++ b/NxWidgets/TODO.txt @@ -82,7 +82,7 @@ o NxConsole Issues will go to one NxConsole instance and the next character goes to a different instance. That is correct behavior within the current design, but not very usable. We need a mechanism to - assure that the top window is the one that receives all + assure that the top window is the one that receives all eyboard input. NX already provides this capability with its nx_kbdin interface(), but that is not currently used. At present, NxConsoles get their input from /dev/console which is the serial @@ -92,10 +92,10 @@ o NxConsole Issues SVN version 4755). The fixed version is available in SVN but won't be in a released version until NxWidgets-1.2 is released. Priority: Medium high, basically prohibits the use of multiple NSH windows. - + Title: CLOSING AN NxCONSOLE Description: If you open multiple NxConsole applications, they all receive - serial input (as noted in the previous bug). However, if + serial input (as noted in the previous bug). However, if you close one of the NxConsoles, then the others no longer received input (or no long generate output -- that cannot be distinguished). diff --git a/NxWidgets/UnitTests/CButton/Makefile b/NxWidgets/UnitTests/CButton/Makefile index 1547c705e..4b31857a1 100644 --- a/NxWidgets/UnitTests/CButton/Makefile +++ b/NxWidgets/UnitTests/CButton/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CButtonArray/Makefile b/NxWidgets/UnitTests/CButtonArray/Makefile index 535ceb948..22d2390c3 100644 --- a/NxWidgets/UnitTests/CButtonArray/Makefile +++ b/NxWidgets/UnitTests/CButtonArray/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx index 824ae22c4..b9bb47a4b 100644 --- a/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx +++ b/NxWidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx @@ -67,7 +67,7 @@ static unsigned int g_mmPrevious; static unsigned int g_mmPeak; static FAR const char *g_buttonLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = { - "=>", "A", "B", "<DEL", + "=>", "A", "B", "<DEL", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", @@ -285,7 +285,7 @@ int cbuttonarray_main(int argc, char *argv[]) int clickRow; if (buttonArray->isButtonClicked(clickColumn, clickRow)) { - printf("cbuttonarray_main: %s: Button (%d, %d) is clicked\n", + printf("cbuttonarray_main: %s: Button (%d, %d) is clicked\n", clickColumn == i && clickRow == j ? "OK" : "ERROR", clickColumn, clickRow); } @@ -304,10 +304,10 @@ int cbuttonarray_main(int argc, char *argv[]) test->poll(buttonArray); if (buttonArray->isButtonClicked(clickColumn, clickRow)) { - printf("cbuttonarray_main: ERROR: Button (%d, %d) is clicked\n", + printf("cbuttonarray_main: ERROR: Button (%d, %d) is clicked\n", clickColumn, clickRow); } - + usleep(500*1000); } } diff --git a/NxWidgets/UnitTests/CCheckBox/Makefile b/NxWidgets/UnitTests/CCheckBox/Makefile index e2f6a051a..bc7c2da6d 100644 --- a/NxWidgets/UnitTests/CCheckBox/Makefile +++ b/NxWidgets/UnitTests/CCheckBox/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CGlyphButton/Makefile b/NxWidgets/UnitTests/CGlyphButton/Makefile index f0ebfa8b6..4e0975e9b 100644 --- a/NxWidgets/UnitTests/CGlyphButton/Makefile +++ b/NxWidgets/UnitTests/CGlyphButton/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CImage/Makefile b/NxWidgets/UnitTests/CImage/Makefile index f6416372f..7fc9cd9af 100644 --- a/NxWidgets/UnitTests/CImage/Makefile +++ b/NxWidgets/UnitTests/CImage/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CKeypad/Makefile b/NxWidgets/UnitTests/CKeypad/Makefile index ea5b0fb15..28571f2b2 100644 --- a/NxWidgets/UnitTests/CKeypad/Makefile +++ b/NxWidgets/UnitTests/CKeypad/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx b/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx index 0b246683a..c103da9ed 100644 --- a/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx +++ b/NxWidgets/UnitTests/CKeypad/ckeypad_main.cxx @@ -155,7 +155,7 @@ static void clickButtons(CKeypadTest *test, CKeypad *keypad) int clickRow; if (keypad->isButtonClicked(clickColumn, clickRow)) { - printf("clickButtons: %s: Button (%d, %d) is clicked\n", + printf("clickButtons: %s: Button (%d, %d) is clicked\n", clickColumn == i && clickRow == j ? "OK" : "ERROR", clickColumn, clickRow); } @@ -174,10 +174,10 @@ static void clickButtons(CKeypadTest *test, CKeypad *keypad) test->poll(keypad); if (keypad->isButtonClicked(clickColumn, clickRow)) { - printf("clickButtons: ERROR: Button (%d, %d) is clicked\n", + printf("clickButtons: ERROR: Button (%d, %d) is clicked\n", clickColumn, clickRow); } - + usleep(500*1000); } } diff --git a/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx b/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx index 300148cc3..62e01a93c 100644 --- a/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx +++ b/NxWidgets/UnitTests/CKeypad/ckeypadtest.cxx @@ -221,7 +221,7 @@ void CKeypadTest::setDisplaySize(void) m_buttonWidth = windowSize.w >> 2; } - + // Lets aim for a height of 7*32 = 224. But lets bump up the number of rows // to allow one for the text box. @@ -340,7 +340,7 @@ void CKeypadTest::showKeypad(CKeypad *keypad) keypad->redraw(); // Then redraw the text box - + m_textbox->enable(); // Un-necessary, the widget is enabled by default m_textbox->enableDrawing(); m_textbox->redraw(); diff --git a/NxWidgets/UnitTests/CLabel/Makefile b/NxWidgets/UnitTests/CLabel/Makefile index 906e4754d..44c21b801 100644 --- a/NxWidgets/UnitTests/CLabel/Makefile +++ b/NxWidgets/UnitTests/CLabel/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CLatchButton/Makefile b/NxWidgets/UnitTests/CLatchButton/Makefile index 131a96f7a..5dde0324c 100644 --- a/NxWidgets/UnitTests/CLatchButton/Makefile +++ b/NxWidgets/UnitTests/CLatchButton/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CLatchButtonArray/Makefile b/NxWidgets/UnitTests/CLatchButtonArray/Makefile index c712142e3..1280727e9 100644 --- a/NxWidgets/UnitTests/CLatchButtonArray/Makefile +++ b/NxWidgets/UnitTests/CLatchButtonArray/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx index 7ffb9cadc..1b038412c 100644 --- a/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx +++ b/NxWidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx @@ -67,7 +67,7 @@ static unsigned int g_mmPrevious; static unsigned int g_mmPeak; static FAR const char *g_buttonLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = { - "=>", "A", "B", "<DEL", + "=>", "A", "B", "<DEL", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", @@ -243,12 +243,12 @@ int clatchbuttonarray_main(int argc, char *argv[]) bool clicked = false; bool latched = false; - + for (int j = 0; j < BUTTONARRAY_NROWS; j++) { for (int i = 0; i < BUTTONARRAY_NCOLUMNS; i++) { - // Initially, this button should be neither clicked nor latched + // Initially, this button should be neither clicked nor latched clicked = false; latched = false; @@ -275,7 +275,7 @@ int clatchbuttonarray_main(int argc, char *argv[]) // Poll for the mouse release event (of course this can hang if something fails) test->poll(buttonArray); - + // Now it should be un-clicked and latched clicked = false; diff --git a/NxWidgets/UnitTests/CListBox/Makefile b/NxWidgets/UnitTests/CListBox/Makefile index 5647002d6..b30278cc3 100644 --- a/NxWidgets/UnitTests/CListBox/Makefile +++ b/NxWidgets/UnitTests/CListBox/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CListBox/clistbox_main.cxx b/NxWidgets/UnitTests/CListBox/clistbox_main.cxx index e97bb8b50..5bbcb1da5 100644 --- a/NxWidgets/UnitTests/CListBox/clistbox_main.cxx +++ b/NxWidgets/UnitTests/CListBox/clistbox_main.cxx @@ -297,7 +297,7 @@ int clistbox_main(int argc, char *argv[]) message("clistbox_main: %s: %d options de-selected\n", count == 5 ? "OK" : "ERROR", count); updateMemoryUsage(g_mmPrevious, "clistbox_main: After de-selecting options"); - + message("clistbox_main: Removing the selected options\n"); for (int i = 0; i < 5; i++) { diff --git a/NxWidgets/UnitTests/CProgressBar/Makefile b/NxWidgets/UnitTests/CProgressBar/Makefile index 90e09db72..d05b7311a 100644 --- a/NxWidgets/UnitTests/CProgressBar/Makefile +++ b/NxWidgets/UnitTests/CProgressBar/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CRadioButton/Makefile b/NxWidgets/UnitTests/CRadioButton/Makefile index c64cf008c..a977b4e95 100644 --- a/NxWidgets/UnitTests/CRadioButton/Makefile +++ b/NxWidgets/UnitTests/CRadioButton/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx b/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx index 09b5af8c2..5c1d2966e 100644 --- a/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx +++ b/NxWidgets/UnitTests/CRadioButton/cradiobuttontest.cxx @@ -212,7 +212,7 @@ CRadioButton *CRadioButtonTest::newRadioButton(void) { // Start the radio button group in the center of the upper, left // quadrant. The initial size is 0,0 and the default style is used. - + nxgl_coord_t groupX = windowSize.w >> 2; nxgl_coord_t groupY = windowSize.h >> 2; diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile b/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile index cf7bf3724..5a7038790 100644 --- a/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile +++ b/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CScrollbarVertical/Makefile b/NxWidgets/UnitTests/CScrollbarVertical/Makefile index 39a5d8528..290e9736c 100644 --- a/NxWidgets/UnitTests/CScrollbarVertical/Makefile +++ b/NxWidgets/UnitTests/CScrollbarVertical/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CSliderHorizonal/Makefile b/NxWidgets/UnitTests/CSliderHorizonal/Makefile index d824ffe93..3d4881d03 100644 --- a/NxWidgets/UnitTests/CSliderHorizonal/Makefile +++ b/NxWidgets/UnitTests/CSliderHorizonal/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CSliderVertical/Makefile b/NxWidgets/UnitTests/CSliderVertical/Makefile index a0b33a3ac..1fc39d29a 100644 --- a/NxWidgets/UnitTests/CSliderVertical/Makefile +++ b/NxWidgets/UnitTests/CSliderVertical/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CTextBox/Makefile b/NxWidgets/UnitTests/CTextBox/Makefile index 94cddcc9f..3d96662a6 100644 --- a/NxWidgets/UnitTests/CTextBox/Makefile +++ b/NxWidgets/UnitTests/CTextBox/Makefile @@ -87,7 +87,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend context disclean chkcxx chklib diff --git a/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx b/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx index c4f8c65b8..aaa96aff6 100644 --- a/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx +++ b/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx @@ -129,7 +129,7 @@ int ctextbox_main(int argc, char *argv[]) usleep(500*1000); test->injectChars(textbox, sizeof(string2), (FAR const uint8_t*)string2); - + // Clean up and exit sleep(2); diff --git a/NxWidgets/UnitTests/README.txt b/NxWidgets/UnitTests/README.txt index 3e5a21e7c..97f3eec7c 100644 --- a/NxWidgets/UnitTests/README.txt +++ b/NxWidgets/UnitTests/README.txt @@ -54,7 +54,7 @@ Installing and Building the Unit Tests Where: <nuttx-directory-path> is the full, absolute path to the NuttX build directory - + If you are using the sim/nsh2 or stm3210e-eval configurations, then skip to step 2 (Hmmm.. better check 1d) too). @@ -64,7 +64,7 @@ Installing and Building the Unit Tests "Unit Test Directories" b) Enable C++ Support - + If you are not using the sim/nsh2 or stm3210e-eval, you will need to add the following definitions to the NuttX configuration at nuttx/.config to enable C++ support: @@ -81,17 +81,17 @@ Installing and Building the Unit Tests enable debug symbols: CONFIG_DEBUG_SYMBOLS=y - + Then you can run the simulation using GDB or DDD which is a very powerful debugging environment! d) Special configuration requirements for the nxwm unit test: - + CONFIG_NXCONSOLE=y CONFIG_NX_MULTIUSER=y e) Other .config file changes -- NSH configurations only. - + If the configuration that you are using supports NSH and NSH built-in tasks then all is well. If it is an NSH configuration, then you will have to define the following in your nuttx/.config file as well (if it is not already defined): @@ -134,7 +134,7 @@ Installing and Building the Unit Tests The following step will then install the new, correct directory containing the user_start function for the selected unit test. If you see that NSH is configured: - + CONFIG_EXAMPLES_NSH=y ## DO NOT REMOVE Then go back and re-read e) above. @@ -148,7 +148,7 @@ Installing and Building the Unit Tests cd <nxwidgets-directory>/tools ./install.sh <apps-directory-path> <test-sub-directory> - + Where: <apps-directory-path> is the full, absolute path to the NuttX apps/ directory @@ -209,7 +209,7 @@ Build Issues $(ARCHCPUFLAGSXX) $(ARCHINCLUDESXX) $(ARCHDEFINES) $(EXTRADEFINES) -pipe 2. Stack Size Issues with the X11 Simulation - + When you run the NuttX simulation, it uses stacks allocated by NuttX from the NuttX heap. The memory management model is exactly the same in the simulation as it is real, target system. This is good because this produces a higher @@ -375,7 +375,7 @@ Example ./nuttx NuttShell (NSH) NuttX-6.9 - nsh> + nsh> b. Execute NuttX Where: NSH command prompt @@ -401,7 +401,7 @@ Example The I/O with the Linux/Cygwin simulation is blocking. So while NSH is waiting for input nothing can run (see configs/sim/README.txt for more info). One way to make NSH stop asking for input is to sleep. - + nsh> sleep 10 sleep 10 @@ -433,7 +433,7 @@ Example In order to debug, you have to have build with CONFIG_DEBUG_SYMBOLS=y. This setting is preselected in the sim/nsh2 configuration so that you don't have to do anything. - + Then under Linux or in a Cygwin X11 window, you can start the graphic debugger like: diff --git a/NxWidgets/UnitTests/TestStatus.txt b/NxWidgets/UnitTests/TestStatus.txt index 965f83ef7..25b3feba4 100644 --- a/NxWidgets/UnitTests/TestStatus.txt +++ b/NxWidgets/UnitTests/TestStatus.txt @@ -1,59 +1,59 @@ -NxWidgets Test Status
-=====================
-
-At this point, the NXWidgets GUI toolkit code complete but still not
-completely tested. This is a list of testing issues that still need to be
-addressed.
-
-The following Widgets have been have completed unit testing. The level of
-unit testing is, however, superficial. Many features have not yet been
-tested:
-
- - CLabel
- - CTextBox
- - CButton
- - CButtonArray
- - CKeypad
- - CRadioButton (and CRadioButtonGoup)
- - CGlyphButton
- - CLatchButton (and CStickyButton)
- - CLatchButtonArray (and CStickyButtonArray)
- - CCheckBox
- - CProgressBar
- - CImage
- - CSliderHorizontal (and CSliderHorizontalGrip)
- - CSliderVertical (and CSliderVerticalGrip)
- - CScrollBarHorizontal (except paging buttons)
- - CScrollBarVertical (except paging buttons)
-
-The following components have unit test in place, but do not successfully
-pass the test:
-
- - CListBox (and CListBoxDataItem) which also tests:
- o CText
- o CList and CListDataItem
- o CScrollingPanel
-
-The following no unit tests (and, hence, are probably non-functional):
-
- Infrastructure (won't have their own unit tests)
- - CScrollBarPanel
-
- Widgets that need unit tests:
- - CCycleButton
- - CScrollingTextBox
- - CMultiLineTextBox
- - CScrollingListBox
-
-There are things that require testing after all widgets complete their unit
-tests as well. As examples:
-
- - Need to verify that a screen with many widgets works correctly. That
- focus is correctly handled when widgets are removed. etc.
- - Need to verify that widget with many children work correctly together.
- - Need to verfiy that a display with many windows with multiple wigets
- per window works okay.
-
-Most unit-level testing was performed in a simulated environment driven by
-simulated mouse and keyboard input. So many features are not tested that
-require human interaction ... such grabbing and dragging scrollbars.
+NxWidgets Test Status +===================== + +At this point, the NXWidgets GUI toolkit code complete but still not +completely tested. This is a list of testing issues that still need to be +addressed. + +The following Widgets have been have completed unit testing. The level of +unit testing is, however, superficial. Many features have not yet been +tested: + + - CLabel + - CTextBox + - CButton + - CButtonArray + - CKeypad + - CRadioButton (and CRadioButtonGoup) + - CGlyphButton + - CLatchButton (and CStickyButton) + - CLatchButtonArray (and CStickyButtonArray) + - CCheckBox + - CProgressBar + - CImage + - CSliderHorizontal (and CSliderHorizontalGrip) + - CSliderVertical (and CSliderVerticalGrip) + - CScrollBarHorizontal (except paging buttons) + - CScrollBarVertical (except paging buttons) + +The following components have unit test in place, but do not successfully +pass the test: + + - CListBox (and CListBoxDataItem) which also tests: + o CText + o CList and CListDataItem + o CScrollingPanel + +The following no unit tests (and, hence, are probably non-functional): + + Infrastructure (won't have their own unit tests) + - CScrollBarPanel + + Widgets that need unit tests: + - CCycleButton + - CScrollingTextBox + - CMultiLineTextBox + - CScrollingListBox + +There are things that require testing after all widgets complete their unit +tests as well. As examples: + + - Need to verify that a screen with many widgets works correctly. That + focus is correctly handled when widgets are removed. etc. + - Need to verify that widget with many children work correctly together. + - Need to verfiy that a display with many windows with multiple wigets + per window works okay. + +Most unit-level testing was performed in a simulated environment driven by +simulated mouse and keyboard input. So many features are not tested that +require human interaction ... such grabbing and dragging scrollbars. diff --git a/NxWidgets/UnitTests/nxwm/Makefile b/NxWidgets/UnitTests/nxwm/Makefile index 1fa22348e..22fab3194 100644 --- a/NxWidgets/UnitTests/nxwm/Makefile +++ b/NxWidgets/UnitTests/nxwm/Makefile @@ -101,7 +101,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: chkcxx chklibnxwidgets chklibnxwm .built .PHONY: clean depend context disclean chkcxx chklibnxwidgets chklibnxwm diff --git a/NxWidgets/libnxwidgets/COPYING b/NxWidgets/libnxwidgets/COPYING index f12e7b82e..58b7b1eb1 100644 --- a/NxWidgets/libnxwidgets/COPYING +++ b/NxWidgets/libnxwidgets/COPYING @@ -67,4 +67,4 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ********************************************************************************/ - + diff --git a/NxWidgets/libnxwidgets/include/cbgwindow.hxx b/NxWidgets/libnxwidgets/include/cbgwindow.hxx index 21b75799d..0b73a01de 100644 --- a/NxWidgets/libnxwidgets/include/cbgwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cbgwindow.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -55,7 +55,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ @@ -89,7 +89,7 @@ namespace NXWidgets CWidgetControl *m_widgetControl; /**< The controlling widget for the window */ public: - + /** * Constructor. Obtains the background window from server and wraps * the window as CBgWindow. Creates an uninitialized instance of the @@ -112,13 +112,13 @@ namespace NXWidgets * @param hNxServer Handle to the NX server. * @param widgetControl Controlling widget for this window. */ - + CBgWindow(NXHANDLE hNxServer, CWidgetControl *widgetControl); /** * Destructor. Returns the background window to the server. */ - + virtual ~CBgWindow(void); /** @@ -147,7 +147,7 @@ namespace NXWidgets * * @return True on success, false on any failure. */ - + bool requestPosition(void); /** @@ -174,7 +174,7 @@ namespace NXWidgets * @param pPos The new position of the window. * @return True on success, false on any failure. */ - + bool setPosition(FAR const struct nxgl_point_s *pPos); /** @@ -185,7 +185,7 @@ namespace NXWidgets * @param pSize The new size of the window. * @return True on success, false on any failure. */ - + bool setSize(FAR const struct nxgl_size_s *pSize); /** diff --git a/NxWidgets/libnxwidgets/include/cbitmap.hxx b/NxWidgets/libnxwidgets/include/cbitmap.hxx index 0fd133303..7e479d8ce 100644 --- a/NxWidgets/libnxwidgets/include/cbitmap.hxx +++ b/NxWidgets/libnxwidgets/include/cbitmap.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -87,11 +87,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -118,7 +118,7 @@ namespace NXWidgets { protected: const struct SBitmap *m_bitmap; /**< The bitmap that is being managed */ - + /** * Copy constructor is protected to prevent usage. */ diff --git a/NxWidgets/libnxwidgets/include/cbutton.hxx b/NxWidgets/libnxwidgets/include/cbutton.hxx index 45481387f..f2f192b3e 100644 --- a/NxWidgets/libnxwidgets/include/cbutton.hxx +++ b/NxWidgets/libnxwidgets/include/cbutton.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -87,11 +87,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -195,7 +195,7 @@ namespace NXWidgets */ virtual void onRelease(nxgl_coord_t x, nxgl_coord_t y); - + /** * Redraws the button. * diff --git a/NxWidgets/libnxwidgets/include/cbuttonarray.hxx b/NxWidgets/libnxwidgets/include/cbuttonarray.hxx index 435fa1080..b45e1ece1 100644 --- a/NxWidgets/libnxwidgets/include/cbuttonarray.hxx +++ b/NxWidgets/libnxwidgets/include/cbuttonarray.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -53,11 +53,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -140,7 +140,7 @@ namespace NXWidgets */ virtual void onPreRelease(nxgl_coord_t x, nxgl_coord_t y); - + /** * Redraws the button. * @@ -149,7 +149,7 @@ namespace NXWidgets */ virtual void onRelease(nxgl_coord_t x, nxgl_coord_t y); - + /** * Redraws the button. * diff --git a/NxWidgets/libnxwidgets/include/ccheckbox.hxx b/NxWidgets/libnxwidgets/include/ccheckbox.hxx index 109e7839e..f766108d3 100644 --- a/NxWidgets/libnxwidgets/include/ccheckbox.hxx +++ b/NxWidgets/libnxwidgets/include/ccheckbox.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -87,11 +87,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets diff --git a/NxWidgets/libnxwidgets/include/ccyclebutton.hxx b/NxWidgets/libnxwidgets/include/ccyclebutton.hxx index d8a32175e..90bcd8b37 100644 --- a/NxWidgets/libnxwidgets/include/ccyclebutton.hxx +++ b/NxWidgets/libnxwidgets/include/ccyclebutton.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -91,11 +91,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -111,7 +111,7 @@ namespace NXWidgets * through its available options. */ - class CCycleButton : public CButton, public IListDataEventHandler + class CCycleButton : public CButton, public IListDataEventHandler { protected: @@ -153,7 +153,7 @@ namespace NXWidgets */ virtual void onPreRelease(nxgl_coord_t x, nxgl_coord_t y); - + /** * Redraws the button. * @@ -211,7 +211,7 @@ namespace NXWidgets */ virtual ~CCycleButton(void) { } - + /** * Add a new option to the widget. * diff --git a/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx b/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx index 0540708ea..7f5ea5445 100644 --- a/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx +++ b/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx @@ -73,18 +73,18 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include "csliderhorizontal.hxx" #include "cglyphsliderhorizontalgrip.hxx" /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -111,7 +111,7 @@ namespace NXWidgets nxwidget_pixel_t m_fillColor; /**< Fill color for left side of "fuel gague" */ bool m_fill; /**< Set true if fill is active */ uint32_t m_barThickness; /**< Thickness (in pixels) of the bar */ - + /** * Get the maximum possible value that the slider can represent. Useful when * using the slider as a scrollbar, as the height of the grip prevents the full @@ -159,7 +159,7 @@ namespace NXWidgets */ virtual void onResize(nxgl_coord_t width, nxgl_coord_t height); - + /** * Moves the grip towards the mouse. * diff --git a/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx b/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx index 89e4fb3b9..69d3e1b56 100644 --- a/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx +++ b/NxWidgets/libnxwidgets/include/cglyphsliderhorizontalgrip.hxx @@ -73,18 +73,18 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include "csliderhorizontalgrip.hxx" #include "cimage.hxx" /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -134,7 +134,7 @@ namespace NXWidgets */ virtual void onResize(nxgl_coord_t width, nxgl_coord_t height); - + /** * Starts dragging the grip and redraws it. * @@ -175,7 +175,7 @@ namespace NXWidgets nxgl_coord_t vX, nxgl_coord_t vY); public: - + /** * Constructor. * diff --git a/NxWidgets/libnxwidgets/include/cgraphicsport.hxx b/NxWidgets/libnxwidgets/include/cgraphicsport.hxx index 006a56d51..c5148c8bc 100644 --- a/NxWidgets/libnxwidgets/include/cgraphicsport.hxx +++ b/NxWidgets/libnxwidgets/include/cgraphicsport.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -98,7 +98,7 @@ namespace NXWidgets class CNxString; class CRect; struct SBitmap; - + /** * CGraphicsPort is the interface between a NXwidget and NX layer. */ @@ -158,7 +158,7 @@ namespace NXWidgets */ const nxgl_coord_t getX(void) const; - + /** * Return the absolute y coordinate of the upper left hand corner of the * underlying window. @@ -363,7 +363,7 @@ namespace NXWidgets void drawText(struct nxgl_point_s *pos, CRect *bound, CNxFont *font, const CNxString &string, int startIndex, int length, nxgl_mxpixel_t color, nxgl_mxpixel_t background); - + /** * Draw an opaque bitmap to the window. * @@ -436,7 +436,7 @@ namespace NXWidgets void copy(nxgl_coord_t sourceX, nxgl_coord_t sourceY, nxgl_coord_t destX, nxgl_coord_t destY, nxgl_coord_t width, nxgl_coord_t height); - + /** * Move a region by a specified distance in two dimensions. * diff --git a/NxWidgets/libnxwidgets/include/ckeypad.hxx b/NxWidgets/libnxwidgets/include/ckeypad.hxx index 2f2a754d4..2cf51cfb4 100644 --- a/NxWidgets/libnxwidgets/include/ckeypad.hxx +++ b/NxWidgets/libnxwidgets/include/ckeypad.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -52,11 +52,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -83,7 +83,7 @@ namespace NXWidgets */ void configureKeypadMode(void); - + /** * Copy constructor is protected to prevent usage. */ diff --git a/NxWidgets/libnxwidgets/include/clatchbutton.hxx b/NxWidgets/libnxwidgets/include/clatchbutton.hxx index c0b37d64b..e7759efa5 100644 --- a/NxWidgets/libnxwidgets/include/clatchbutton.hxx +++ b/NxWidgets/libnxwidgets/include/clatchbutton.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -87,11 +87,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets diff --git a/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx b/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx index bffeb58a1..27bef1fd7 100644 --- a/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx +++ b/NxWidgets/libnxwidgets/include/clatchbuttonarray.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -53,11 +53,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets diff --git a/NxWidgets/libnxwidgets/include/clistbox.hxx b/NxWidgets/libnxwidgets/include/clistbox.hxx index 7afa76920..d4861af8c 100644 --- a/NxWidgets/libnxwidgets/include/clistbox.hxx +++ b/NxWidgets/libnxwidgets/include/clistbox.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -92,11 +92,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -147,7 +147,7 @@ namespace NXWidgets */ virtual void onClick(nxgl_coord_t x, nxgl_coord_t y); - + /** * Selects the clicked item and deselects all others. * @@ -175,7 +175,7 @@ namespace NXWidgets inline CListBox(const CListBox &listBox) : CScrollingPanel(listBox) { } public: - + /** * Constructor. * @@ -309,7 +309,7 @@ namespace NXWidgets */ virtual const CListBoxDataItem *getSelectedOption(void) const; - + /** * Sets whether multiple selections are possible or not. * diff --git a/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx b/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx index 9a1358d39..fdd667d92 100644 --- a/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx +++ b/NxWidgets/libnxwidgets/include/clistboxdataitem.hxx @@ -1,180 +1,180 @@ -/****************************************************************************
- * include/clistboxdataitem.hxx
- * NxWidgets/libnxwidgets/
- *
- * 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, NxWidgets, nor the names of its contributors
- * me 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.
- *
- ****************************************************************************
- *
- * Portions of this package derive from Woopsi (http://woopsi.org/) and
- * portions are original efforts. It is difficult to determine at this
- * point what parts are original efforts and which parts derive from Woopsi.
- * However, in any event, the work of Antony Dzeryn will be acknowledged
- * in most NxWidget files. Thanks Antony!
- *
- * Copyright (c) 2007-2011, Antony Dzeryn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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.
- *
- ****************************************************************************/
-
-#ifndef __INCLUDE_CLISTBOXDATAITEM_HXX
-#define __INCLUDE_CLISTBOXDATAITEM_HXX
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <nuttx/nx/nxglib.h>
-
-#include "clistdataitem.hxx"
-#include "cnxstring.hxx"
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Implementation Classes
- ****************************************************************************/
-
-#if defined(__cplusplus)
-
-namespace NXWidgets
-{
- /**
- * Class representing a data item within a ListBox.
- */
-
- class CListBoxDataItem : public CListDataItem
- {
- private:
- nxwidget_pixel_t m_normalTextColor; /**< Color used for text when not selected. */
- nxwidget_pixel_t m_normalBackColor; /**< Color used for background when not selected. */
- nxwidget_pixel_t m_selectedTextColor; /**< Color used for text when selected. */
- nxwidget_pixel_t m_selectedBackColor; /**< Color used for background when selected. */
-
- public:
-
- /**
- * Constructor.
- *
- * @param text The text to display in the item.
- * @param value The value of the item.
- * @param normalTextColor Color to draw the text with when not selected.
- * @param normalBackColor Color to draw the background with when not selected.
- * @param selectedTextColor Color to draw the text with when selected.
- * @param selectedBackColor Color to draw the background with when selected.
- */
-
- CListBoxDataItem(const CNxString &text, const uint32_t value,
- const nxwidget_pixel_t normalTextColor,
- const nxwidget_pixel_t normalBackColor,
- const nxwidget_pixel_t selectedTextColor,
- const nxwidget_pixel_t selectedBackColor);
-
- /**
- * Get the color used for text when the item is unselected.
- *
- * @return The text color when the item is unselected.
- */
-
- inline nxwidget_pixel_t getNormalTextColor(void) const
- {
- return m_normalTextColor;
- }
-
- /**
- * Get the color used for the background when the item is unselected.
- *
- * @return The background color when the item is unselected.
- */
-
- inline nxwidget_pixel_t getNormalBackColor(void) const
- {
- return m_normalBackColor;
- }
-
- /**
- * Get the color used for text when the item is selected.
- *
- * @return The text color when the item is selected.
- */
-
- inline nxwidget_pixel_t getSelectedTextColor(void) const
- {
- return m_selectedTextColor;
- }
-
- /**
- * Get the color used for the background when the item is selected.
- *
- * @return The background color when the item is selected.
- */
-
- inline nxwidget_pixel_t getSelectedBackColor(void) const
- {
- return m_selectedBackColor;
- }
- };
-}
-
-#endif // __cplusplus
-
-#endif // __INCLUDE_CLISTBOXDATAITEM_HXX
-
+/**************************************************************************** + * include/clistboxdataitem.hxx + * NxWidgets/libnxwidgets/ + * + * 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, NxWidgets, nor the names of its contributors + * me 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in most NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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. + * + ****************************************************************************/ + +#ifndef __INCLUDE_CLISTBOXDATAITEM_HXX +#define __INCLUDE_CLISTBOXDATAITEM_HXX + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> + +#include <nuttx/nx/nxglib.h> + +#include "clistdataitem.hxx" +#include "cnxstring.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Implementation Classes + ****************************************************************************/ + +#if defined(__cplusplus) + +namespace NXWidgets +{ + /** + * Class representing a data item within a ListBox. + */ + + class CListBoxDataItem : public CListDataItem + { + private: + nxwidget_pixel_t m_normalTextColor; /**< Color used for text when not selected. */ + nxwidget_pixel_t m_normalBackColor; /**< Color used for background when not selected. */ + nxwidget_pixel_t m_selectedTextColor; /**< Color used for text when selected. */ + nxwidget_pixel_t m_selectedBackColor; /**< Color used for background when selected. */ + + public: + + /** + * Constructor. + * + * @param text The text to display in the item. + * @param value The value of the item. + * @param normalTextColor Color to draw the text with when not selected. + * @param normalBackColor Color to draw the background with when not selected. + * @param selectedTextColor Color to draw the text with when selected. + * @param selectedBackColor Color to draw the background with when selected. + */ + + CListBoxDataItem(const CNxString &text, const uint32_t value, + const nxwidget_pixel_t normalTextColor, + const nxwidget_pixel_t normalBackColor, + const nxwidget_pixel_t selectedTextColor, + const nxwidget_pixel_t selectedBackColor); + + /** + * Get the color used for text when the item is unselected. + * + * @return The text color when the item is unselected. + */ + + inline nxwidget_pixel_t getNormalTextColor(void) const + { + return m_normalTextColor; + } + + /** + * Get the color used for the background when the item is unselected. + * + * @return The background color when the item is unselected. + */ + + inline nxwidget_pixel_t getNormalBackColor(void) const + { + return m_normalBackColor; + } + + /** + * Get the color used for text when the item is selected. + * + * @return The text color when the item is selected. + */ + + inline nxwidget_pixel_t getSelectedTextColor(void) const + { + return m_selectedTextColor; + } + + /** + * Get the color used for the background when the item is selected. + * + * @return The background color when the item is selected. + */ + + inline nxwidget_pixel_t getSelectedBackColor(void) const + { + return m_selectedBackColor; + } + }; +} + +#endif // __cplusplus + +#endif // __INCLUDE_CLISTBOXDATAITEM_HXX + diff --git a/NxWidgets/libnxwidgets/include/clistdata.hxx b/NxWidgets/libnxwidgets/include/clistdata.hxx index d88abd9fc..81aa1f3f6 100644 --- a/NxWidgets/libnxwidgets/include/clistdata.hxx +++ b/NxWidgets/libnxwidgets/include/clistdata.hxx @@ -1,351 +1,351 @@ -/****************************************************************************
- * NxWidgets/libnxwidgets/include/clistdata.hxx
- *
- * 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, NxWidgets, nor the names of its contributors
- * me 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.
- *
- ****************************************************************************
- *
- * Portions of this package derive from Woopsi (http://woopsi.org/) and
- * portions are original efforts. It is difficult to determine at this
- * point what parts are original efforts and which parts derive from Woopsi.
- * However, in any event, the work of Antony Dzeryn will be acknowledged
- * in most NxWidget files. Thanks Antony!
- *
- * Copyright (c) 2007-2011, Antony Dzeryn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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.
- *
- ****************************************************************************/
-
-#ifndef __INCLUDE_CLISTDATA_HXX
-#define __INCLUDE_CLISTDATA_HXX
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <nuttx/nx/nxglib.h>
-
-#include "tnxarray.hxx"
-#include "ilistdataeventhandler.hxx"
-#include "clistdataitem.hxx"
-#include "cnxstring.hxx"
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Implementation Classes
- ****************************************************************************/
-
-#if defined(__cplusplus)
-
-namespace NXWidgets
-{
- /**
- * Class representing a list of items. Designed to be used by the
- * CListBox class, etc, to store its data. Fires events to notify
- * listeners when the list changes or a new selection is made.
- */
-
- class CListData
- {
- protected:
- TNxArray<CListDataItem*> m_items; /**< Collection of list data items. */
- TNxArray<IListDataEventHandler*> m_listDataEventhandlers; /**< Collection of event handlers. */
- bool m_allowMultipleSelections; /**< If true, multiple options can
- be selected. */
- bool m_sortInsertedItems; /**< Automatically sorts items on
- insertion if true. */
-
- /**
- * Quick sort the items using their compareTo() methods.
- *
- * @param start The index to start sorting at.
- * @param end The index to stop sorting at.
- */
-
- virtual void quickSort(const int start, const int end);
-
- /**
- * Swap the locations of two items in the array.
- *
- * @param index1 The index of the first item to swap.
- * @param index2 The index of the second item to swap.
- */
-
- virtual void swapItems(const int index1, const int index2);
-
- /**
- * Return the index that an item should be inserted at to maintain a sorted list of data.
- *
- * @param item The item to insert.
- * @return The index that the item should be imserted into at.
- */
-
- const int getSortedInsertionIndex(const CListDataItem *item) const;
-
- /**
- * Raise a data changed event.
- */
-
- void raiseDataChangedEvent(void);
-
- /**
- * Raise a selection changed event.
- */
-
- void raiseSelectionChangedEvent(void);
-
- public:
-
- /**
- * Constructor.
- */
- CListData(void);
-
- /**
- * Destructor.
- */
- virtual ~CListData(void);
-
- /**
- * Add a new item.
- *
- * @param text Text to show in the option.
- * @param value The value of the option.
- */
-
- virtual void addItem(const CNxString &text, const uint32_t value);
-
- /**
- * Add an existing item. CListData becomes the owner of the option and will delete it
- * when the list is deleted.
- *
- * @param item The item to add.
- */
-
- virtual void addItem(CListDataItem *item);
-
- /**
- * Remove an item by its index.
- *
- * @param index The index of the option to remove.
- */
-
- virtual void removeItem(const int index);
-
- /**
- * Select an item by its index.
- *
- * @param index The index of the item to select.
- */
-
- virtual void selectItem(const int index);
-
- /**
- * Deselect an item by its index.
- *
- * @param index The index of the item to select.
- */
-
- virtual void deselectItem(const int index);
-
- /**
- * Remove all items.
- */
-
- virtual void removeAllItems(void);
-
- /**
- * Get the selected index. Returns -1 if nothing is selected. If more than one
- * item is selected, the index of the first selected item is returned.
- *
- * @return The selected index.
- */
-
- virtual const int getSelectedIndex(void) const;
-
- /**
- * Sets the selected index. Specify -1 to select nothing. Resets any
- * other selected items to deselected.
- *
- * @param index The selected index.
- */
-
- virtual void setSelectedIndex(const int index);
-
- /**
- * Get the selected item. Returns NULL if nothing is selected.
- *
- * @return The selected option.
- */
-
- virtual const CListDataItem *getSelectedItem(void) const;
-
- /**
- * Sets whether multiple selections are possible or not.
- *
- * @param allowMultipleSelections True to allow multiple selections.
- */
-
- virtual inline void
- setAllowMultipleSelections(const bool allowMultipleSelections)
- {
- m_allowMultipleSelections = allowMultipleSelections;
- }
-
- /**
- * Get the specified item.
- *
- * @return The specified item.
- */
-
- virtual inline const CListDataItem *getItem(const int index) const
- {
- return m_items[index];
- }
-
- /**
- * Sort the items using their compareTo() methods.
- */
-
- virtual void sort(void);
-
- /**
- * Get the total number of items.
- *
- * @return The number of items.
- */
-
- virtual inline const int getItemCount(void) const
- {
- return m_items.size();
- }
-
- /**
- * Select all items. Does nothing if the list does not allow
- * multiple selections.
- */
-
- virtual void selectAllItems(void);
-
- /**
- * Deselect all items.
- */
-
- virtual void deselectAllItems(void);
-
- /**
- * Select or deselect an item by its index. Does not deselect any
- * other selected items. Set index to -1 to select nothing.
- *
- * @param index The index of the item to select.
- * @param selected True to select the item, false to deselect it.
- */
-
- virtual void setItemSelected(const int index, const bool selected);
-
- /**
- * Returns whether multiple selections are possible or not.
- *
- * @return True if multiple selections are allowed.
- */
-
- virtual inline const bool allowsMultipleSelections(void) const
- {
- return m_allowMultipleSelections;
- }
-
- /**
- * Sets whether or not items added to the list are automatically
- * sorted on insert or not.
- *
- * @param sortInsertedItems True to enable sort on insertion.
- */
-
- virtual inline void setSortInsertedItems(const bool sortInsertedItems)
- {
- m_sortInsertedItems = sortInsertedItems;
- }
-
- /**
- * Add an event handler.
- *
- * @param eventHandler The event handler to add.
- */
-
- inline void addListDataEventHandler(IListDataEventHandler *eventHandler)
- {
- m_listDataEventhandlers.push_back(eventHandler);
- }
-
- /**
- * Remove an event handler.
- *
- * @param eventHandler The event handler to remove.
- */
-
- void removeListDataEventHandler(IListDataEventHandler *eventHandler);
- };
-}
-
-#endif // __cplusplus
-
-#endif // __INCLUDE_CLISTDATA_HXX
+/**************************************************************************** + * NxWidgets/libnxwidgets/include/clistdata.hxx + * + * 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, NxWidgets, nor the names of its contributors + * me 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in most NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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. + * + ****************************************************************************/ + +#ifndef __INCLUDE_CLISTDATA_HXX +#define __INCLUDE_CLISTDATA_HXX + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> + +#include <nuttx/nx/nxglib.h> + +#include "tnxarray.hxx" +#include "ilistdataeventhandler.hxx" +#include "clistdataitem.hxx" +#include "cnxstring.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Implementation Classes + ****************************************************************************/ + +#if defined(__cplusplus) + +namespace NXWidgets +{ + /** + * Class representing a list of items. Designed to be used by the + * CListBox class, etc, to store its data. Fires events to notify + * listeners when the list changes or a new selection is made. + */ + + class CListData + { + protected: + TNxArray<CListDataItem*> m_items; /**< Collection of list data items. */ + TNxArray<IListDataEventHandler*> m_listDataEventhandlers; /**< Collection of event handlers. */ + bool m_allowMultipleSelections; /**< If true, multiple options can + be selected. */ + bool m_sortInsertedItems; /**< Automatically sorts items on + insertion if true. */ + + /** + * Quick sort the items using their compareTo() methods. + * + * @param start The index to start sorting at. + * @param end The index to stop sorting at. + */ + + virtual void quickSort(const int start, const int end); + + /** + * Swap the locations of two items in the array. + * + * @param index1 The index of the first item to swap. + * @param index2 The index of the second item to swap. + */ + + virtual void swapItems(const int index1, const int index2); + + /** + * Return the index that an item should be inserted at to maintain a sorted list of data. + * + * @param item The item to insert. + * @return The index that the item should be imserted into at. + */ + + const int getSortedInsertionIndex(const CListDataItem *item) const; + + /** + * Raise a data changed event. + */ + + void raiseDataChangedEvent(void); + + /** + * Raise a selection changed event. + */ + + void raiseSelectionChangedEvent(void); + + public: + + /** + * Constructor. + */ + CListData(void); + + /** + * Destructor. + */ + virtual ~CListData(void); + + /** + * Add a new item. + * + * @param text Text to show in the option. + * @param value The value of the option. + */ + + virtual void addItem(const CNxString &text, const uint32_t value); + + /** + * Add an existing item. CListData becomes the owner of the option and will delete it + * when the list is deleted. + * + * @param item The item to add. + */ + + virtual void addItem(CListDataItem *item); + + /** + * Remove an item by its index. + * + * @param index The index of the option to remove. + */ + + virtual void removeItem(const int index); + + /** + * Select an item by its index. + * + * @param index The index of the item to select. + */ + + virtual void selectItem(const int index); + + /** + * Deselect an item by its index. + * + * @param index The index of the item to select. + */ + + virtual void deselectItem(const int index); + + /** + * Remove all items. + */ + + virtual void removeAllItems(void); + + /** + * Get the selected index. Returns -1 if nothing is selected. If more than one + * item is selected, the index of the first selected item is returned. + * + * @return The selected index. + */ + + virtual const int getSelectedIndex(void) const; + + /** + * Sets the selected index. Specify -1 to select nothing. Resets any + * other selected items to deselected. + * + * @param index The selected index. + */ + + virtual void setSelectedIndex(const int index); + + /** + * Get the selected item. Returns NULL if nothing is selected. + * + * @return The selected option. + */ + + virtual const CListDataItem *getSelectedItem(void) const; + + /** + * Sets whether multiple selections are possible or not. + * + * @param allowMultipleSelections True to allow multiple selections. + */ + + virtual inline void + setAllowMultipleSelections(const bool allowMultipleSelections) + { + m_allowMultipleSelections = allowMultipleSelections; + } + + /** + * Get the specified item. + * + * @return The specified item. + */ + + virtual inline const CListDataItem *getItem(const int index) const + { + return m_items[index]; + } + + /** + * Sort the items using their compareTo() methods. + */ + + virtual void sort(void); + + /** + * Get the total number of items. + * + * @return The number of items. + */ + + virtual inline const int getItemCount(void) const + { + return m_items.size(); + } + + /** + * Select all items. Does nothing if the list does not allow + * multiple selections. + */ + + virtual void selectAllItems(void); + + /** + * Deselect all items. + */ + + virtual void deselectAllItems(void); + + /** + * Select or deselect an item by its index. Does not deselect any + * other selected items. Set index to -1 to select nothing. + * + * @param index The index of the item to select. + * @param selected True to select the item, false to deselect it. + */ + + virtual void setItemSelected(const int index, const bool selected); + + /** + * Returns whether multiple selections are possible or not. + * + * @return True if multiple selections are allowed. + */ + + virtual inline const bool allowsMultipleSelections(void) const + { + return m_allowMultipleSelections; + } + + /** + * Sets whether or not items added to the list are automatically + * sorted on insert or not. + * + * @param sortInsertedItems True to enable sort on insertion. + */ + + virtual inline void setSortInsertedItems(const bool sortInsertedItems) + { + m_sortInsertedItems = sortInsertedItems; + } + + /** + * Add an event handler. + * + * @param eventHandler The event handler to add. + */ + + inline void addListDataEventHandler(IListDataEventHandler *eventHandler) + { + m_listDataEventhandlers.push_back(eventHandler); + } + + /** + * Remove an event handler. + * + * @param eventHandler The event handler to remove. + */ + + void removeListDataEventHandler(IListDataEventHandler *eventHandler); + }; +} + +#endif // __cplusplus + +#endif // __INCLUDE_CLISTDATA_HXX diff --git a/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx b/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx index 57118e238..533694bc2 100644 --- a/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx +++ b/NxWidgets/libnxwidgets/include/clistdataeventargs.hxx @@ -1,121 +1,121 @@ -/****************************************************************************
- * NxWidgets/libnxwidgets/include/clistdataeventargs.hxx
- *
- * 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, NxWidgets, nor the names of its contributors
- * me 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.
- *
- ****************************************************************************
- *
- * Portions of this package derive from Woopsi (http://woopsi.org/) and
- * portions are original efforts. It is difficult to determine at this
- * point what parts are original efforts and which parts derive from Woopsi.
- * However, in any event, the work of Antony Dzeryn will be acknowledged
- * in most NxWidget files. Thanks Antony!
- *
- * Copyright (c) 2007-2011, Antony Dzeryn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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.
- *
- ****************************************************************************/
-
-#ifndef __INCLUDE_CLISTDATAEVENTARGS_HXX
-#define __INCLUDE_CLISTDATAEVENTARGS_HXX
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "teventargs.hxx"
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Implementation Classes
- ****************************************************************************/
-
-#if defined(__cplusplus)
-
-namespace NXWidgets
-{
- class CListData;
-
- /**
- * Event arguments passed to listeners when a CListData object raises an
- * event.
- */
-
- class CListDataEventArgs : public TEventArgs<CListData*>
- {
- public:
-
- /**
- * Constructor.
- *
- * @param source Pointer to the CListData object that raised the event.
- */
-
- inline CListDataEventArgs(CListData *source) : TEventArgs<CListData*>(source)
- {
- }
- };
-}
-
-#endif // __cplusplus
-
-#endif // __INCLUDE_CLISTDATAEVENTARGS_HXX
+/**************************************************************************** + * NxWidgets/libnxwidgets/include/clistdataeventargs.hxx + * + * 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, NxWidgets, nor the names of its contributors + * me 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in most NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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. + * + ****************************************************************************/ + +#ifndef __INCLUDE_CLISTDATAEVENTARGS_HXX +#define __INCLUDE_CLISTDATAEVENTARGS_HXX + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> + +#include "teventargs.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Implementation Classes + ****************************************************************************/ + +#if defined(__cplusplus) + +namespace NXWidgets +{ + class CListData; + + /** + * Event arguments passed to listeners when a CListData object raises an + * event. + */ + + class CListDataEventArgs : public TEventArgs<CListData*> + { + public: + + /** + * Constructor. + * + * @param source Pointer to the CListData object that raised the event. + */ + + inline CListDataEventArgs(CListData *source) : TEventArgs<CListData*>(source) + { + } + }; +} + +#endif // __cplusplus + +#endif // __INCLUDE_CLISTDATAEVENTARGS_HXX diff --git a/NxWidgets/libnxwidgets/include/clistdataitem.hxx b/NxWidgets/libnxwidgets/include/clistdataitem.hxx index db3bb20a2..5cb60f3e7 100644 --- a/NxWidgets/libnxwidgets/include/clistdataitem.hxx +++ b/NxWidgets/libnxwidgets/include/clistdataitem.hxx @@ -1,189 +1,189 @@ -/****************************************************************************
- * NxWidgets/libnxwidgets/include/clistdataitem.hxx
- *
- * 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, NxWidgets, nor the names of its contributors
- * me 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.
- *
- ****************************************************************************
- *
- * Portions of this package derive from Woopsi (http://woopsi.org/) and
- * portions are original efforts. It is difficult to determine at this
- * point what parts are original efforts and which parts derive from Woopsi.
- * However, in any event, the work of Antony Dzeryn will be acknowledged
- * in most NxWidget files. Thanks Antony!
- *
- * Copyright (c) 2007-2011, Antony Dzeryn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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.
- *
- ****************************************************************************/
-
-#ifndef __INCLUDE_CLISTDATAITEM_HXX
-#define __INCLUDE_CLISTDATAITEM_HXX
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <nuttx/nx/nxglib.h>
-
-#include "cnxstring.hxx"
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Implementation Classes
- ****************************************************************************/
-
-#if defined(__cplusplus)
-
-namespace NXWidgets
-{
- /**
- * Class representing a data item within a list. Intended for use within
- * the CListData class.
- */
-
- class CListDataItem
- {
- private:
- CNxString m_text; /**< Text to display for option. */
- uint32_t m_value; /**< Option value. */
- bool m_isSelected; /**< True if the option is selected. */
-
- public:
-
- /**
- * Constructor.
- *
- * @param text The text to display in the item.
- * @param value The value of the item.
- */
-
- CListDataItem(const CNxString &text, const uint32_t value);
-
- /**
- * Destructor.
- */
-
- virtual ~CListDataItem(void);
-
- /**
- * Get the item's text.
- *
- * @return The item's text.
- */
-
- inline const CNxString &getText(void) const
- {
- return m_text;
- }
-
- /**
- * Get the item's value.
- *
- * @return The item's value.
- */
-
- inline const uint32_t getValue(void) const
- {
- return m_value;
- }
-
- /**
- * Get the item's selection state.
- *
- * @return True if the item is selected; false if not.
- */
-
- inline const bool isSelected(void) const
- {
- return m_isSelected;
- }
-
- /**
- * Set the item's selection state.
- *
- * @param selected True to select the item; false to deselect it.
- */
-
- inline void setSelected(bool selected)
- {
- m_isSelected = selected;
- }
-
- /**
- * Compare the item with another. Comparison is based on the text of
- * the item. Returns 0 if the text in the two items is the same,
- * a value less than 0 if this item is less than the argument, and
- * a value greater than 0 if this item is greater than the argument.
- *
- * @param item An item to compare this object with.
- * @return 0 if the text in the two items is the same,
- * a value less than 0 if this item is less than the argument, and
- * a value greater than 0 if this item is greater than the argument.
- */
-
- virtual int compareTo(const CListDataItem *item) const;
- };
-}
-
-#endif // __cplusplus
-
-#endif // __INCLUDE_CLISTDATAITEM_HXX
+/**************************************************************************** + * NxWidgets/libnxwidgets/include/clistdataitem.hxx + * + * 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, NxWidgets, nor the names of its contributors + * me 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in most NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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. + * + ****************************************************************************/ + +#ifndef __INCLUDE_CLISTDATAITEM_HXX +#define __INCLUDE_CLISTDATAITEM_HXX + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> + +#include <nuttx/nx/nxglib.h> + +#include "cnxstring.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Implementation Classes + ****************************************************************************/ + +#if defined(__cplusplus) + +namespace NXWidgets +{ + /** + * Class representing a data item within a list. Intended for use within + * the CListData class. + */ + + class CListDataItem + { + private: + CNxString m_text; /**< Text to display for option. */ + uint32_t m_value; /**< Option value. */ + bool m_isSelected; /**< True if the option is selected. */ + + public: + + /** + * Constructor. + * + * @param text The text to display in the item. + * @param value The value of the item. + */ + + CListDataItem(const CNxString &text, const uint32_t value); + + /** + * Destructor. + */ + + virtual ~CListDataItem(void); + + /** + * Get the item's text. + * + * @return The item's text. + */ + + inline const CNxString &getText(void) const + { + return m_text; + } + + /** + * Get the item's value. + * + * @return The item's value. + */ + + inline const uint32_t getValue(void) const + { + return m_value; + } + + /** + * Get the item's selection state. + * + * @return True if the item is selected; false if not. + */ + + inline const bool isSelected(void) const + { + return m_isSelected; + } + + /** + * Set the item's selection state. + * + * @param selected True to select the item; false to deselect it. + */ + + inline void setSelected(bool selected) + { + m_isSelected = selected; + } + + /** + * Compare the item with another. Comparison is based on the text of + * the item. Returns 0 if the text in the two items is the same, + * a value less than 0 if this item is less than the argument, and + * a value greater than 0 if this item is greater than the argument. + * + * @param item An item to compare this object with. + * @return 0 if the text in the two items is the same, + * a value less than 0 if this item is less than the argument, and + * a value greater than 0 if this item is greater than the argument. + */ + + virtual int compareTo(const CListDataItem *item) const; + }; +} + +#endif // __cplusplus + +#endif // __INCLUDE_CLISTDATAITEM_HXX diff --git a/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx b/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx index 5ed41740b..e10440cb5 100644 --- a/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx +++ b/NxWidgets/libnxwidgets/include/cmultilinetextbox.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -92,7 +92,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ @@ -100,7 +100,7 @@ #if defined(__cplusplus) namespace NXWidgets -{ +{ class CNxTimer; /** @@ -112,7 +112,7 @@ namespace NXWidgets */ class CMultiLineTextBox : public ITextBox, public CScrollingPanel, - public CWidgetEventHandler + public CWidgetEventHandler { public: @@ -281,7 +281,7 @@ namespace NXWidgets */ virtual void onResize(nxgl_coord_t width, nxgl_coord_t height); - + /** * Starts the dragging system. * diff --git a/NxWidgets/libnxwidgets/include/cnumericedit.hxx b/NxWidgets/libnxwidgets/include/cnumericedit.hxx index 3de01a4c1..49e378da5 100644 --- a/NxWidgets/libnxwidgets/include/cnumericedit.hxx +++ b/NxWidgets/libnxwidgets/include/cnumericedit.hxx @@ -74,7 +74,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -89,11 +89,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -135,15 +135,15 @@ namespace NXWidgets virtual void onResize(nxgl_coord_t width, nxgl_coord_t height); virtual void handleClickEvent(const CWidgetEventArgs &e); - + virtual void handleReleaseEvent(const CWidgetEventArgs &e); virtual void handleReleaseOutsideEvent(const CWidgetEventArgs &e); - + virtual void handleActionEvent(const CWidgetEventArgs &e); - + virtual void handleDragEvent(const CWidgetEventArgs &e); - + /** * Copy constructor is protected to prevent usage. */ @@ -192,19 +192,19 @@ namespace NXWidgets */ virtual void setFont(CNxFont *font); - + inline int getValue() const { return m_value; } void setValue(int value); - + inline int getMaximum() const { return m_maximum; } inline void setMaximum(int value) { m_maximum = value; setValue(m_value); } - + inline int getMinimum() const { return m_minimum; } inline void setMinimum(int value) { m_minimum = value; setValue(m_value); } - + inline int getIncrement() const { return m_increment; } inline void setIncrement(int value) { m_increment = value; setValue(m_value); } - + }; } diff --git a/NxWidgets/libnxwidgets/include/cnxfont.hxx b/NxWidgets/libnxwidgets/include/cnxfont.hxx index 33e712291..8f9d7e18c 100644 --- a/NxWidgets/libnxwidgets/include/cnxfont.hxx +++ b/NxWidgets/libnxwidgets/include/cnxfont.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -111,7 +111,7 @@ namespace NXWidgets * * @return The current drawing color. */ - + inline const nxgl_mxpixel_t getColor() const { return m_fontColor; @@ -133,17 +133,17 @@ namespace NXWidgets * color. * @return The transparent background color. */ - + inline const nxgl_mxpixel_t getTransparentColor() const { return m_transparentColor; } - + /** * Sets the transparent background color to a new value. * @param color The new background color. */ - + inline void setTransparentColor(const nxgl_mxpixel_t color) { m_transparentColor = color; @@ -157,7 +157,7 @@ namespace NXWidgets */ void drawChar(FAR SBitmap *bitmap, nxwidget_char_t letter); - + /** * Get the width of a string in pixels when drawn with this font. * @@ -176,7 +176,7 @@ namespace NXWidgets * @param length The length of the substring in chars. * @return The width of the substring in pixels. */ - + nxgl_coord_t getStringWidth(const CNxString& text, int startIndex, int length) const; @@ -206,7 +206,7 @@ namespace NXWidgets * @param letter The letter to get the height of. * @return The height of the character in pixels. */ - + inline nxgl_coord_t getCharHeight(nxwidget_char_t letter) const; /** diff --git a/NxWidgets/libnxwidgets/include/cnxserver.hxx b/NxWidgets/libnxwidgets/include/cnxserver.hxx index f70dbdbdb..380594190 100644 --- a/NxWidgets/libnxwidgets/include/cnxserver.hxx +++ b/NxWidgets/libnxwidgets/include/cnxserver.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -59,7 +59,7 @@ /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets diff --git a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx index 16a0bee92..ea18595de 100644 --- a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -55,7 +55,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ @@ -118,7 +118,7 @@ namespace NXWidgets /** * Destructor. */ - + ~CNxTkWindow(void); /** @@ -141,7 +141,7 @@ namespace NXWidgets /** * Open a toolbar on the framed window. This method both instantiates - * the toolbar object AND calls the INxWindow::open() method to + * the toolbar object AND calls the INxWindow::open() method to * create the toolbar. The toolbar is ready for use upon return. * * @param height. The height in rows of the tool bar @@ -199,7 +199,7 @@ namespace NXWidgets * @param pos The new position of the window. * @return True on success, false on any failure. */ - + bool setPosition(FAR const struct nxgl_point_s *pos); /** @@ -208,7 +208,7 @@ namespace NXWidgets * @param size The new size of the window. * @return True on success, false on any failure. */ - + bool setSize(FAR const struct nxgl_size_s *size); /** diff --git a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx index 69a004da5..501067f0d 100644 --- a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx +++ b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -56,7 +56,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ @@ -101,14 +101,14 @@ namespace NXWidgets * @param widgetControl Controlling widget for this toolbar. * @param height The height of the toolbar. */ - + CNxToolbar(CNxTkWindow *pNxTkWindow, NXTKWINDOW hNxTkWindow, CWidgetControl *pWidgetControl, nxgl_coord_t height); /** * Destructor. */ - + ~CNxToolbar(void); /** @@ -163,7 +163,7 @@ namespace NXWidgets * @param pPos The new position of the toolbar. * @return Always returns false. */ - + bool setPosition(FAR const struct nxgl_point_s *pPos); /** @@ -173,7 +173,7 @@ namespace NXWidgets * @param pPos The new position of the toolbar. * @return Always returns false. */ - + bool setSize(FAR const struct nxgl_size_s *pSize); /** diff --git a/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/NxWidgets/libnxwidgets/include/cnxwidget.hxx index f8c472e75..dd1880cc2 100644 --- a/NxWidgets/libnxwidgets/include/cnxwidget.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwidget.hxx @@ -74,7 +74,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -95,11 +95,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -192,7 +192,7 @@ namespace NXWidgets CWidgetEventHandlerList *m_widgetEventHandlers; /**< List of event handlers. */ // Double-clicking - + struct timespec m_lastClickTime; /**< System timer when last clicked. */ nxgl_coord_t m_lastClickX; /**< X coordinate of last click. */ nxgl_coord_t m_lastClickY; /**< Y coordinate of last click. */ @@ -281,7 +281,7 @@ namespace NXWidgets */ virtual inline void onClick(nxgl_coord_t x, nxgl_coord_t y) { } - + /** * Called when the widget is double-clicked. Override this when * creating new widgets if the widget should exhibit additional @@ -305,7 +305,7 @@ namespace NXWidgets */ virtual inline void onPreRelease(nxgl_coord_t x, nxgl_coord_t y) { } - + /** * Called just after the widget is released; the widget will be in the * released stated. Override this when creating new widgets if the @@ -316,7 +316,7 @@ namespace NXWidgets */ virtual inline void onRelease(nxgl_coord_t x, nxgl_coord_t y) { } - + /** * Called when the widget is released outside of its boundaries. * Override this when creating new widgets if the widget should exhibit @@ -327,7 +327,7 @@ namespace NXWidgets */ virtual inline void onReleaseOutside(nxgl_coord_t x, nxgl_coord_t y) { } - + /** * Called when the widget is dragged. Override this when creating new * widgets if the widget should exhibit additional behaviour when it is @@ -341,7 +341,7 @@ namespace NXWidgets virtual inline void onDrag(nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t vX, nxgl_coord_t vY) { } - + /** * Called when the widget starts being dragged. Override this when * creating new widgets if the widget should exhibit additional @@ -349,7 +349,7 @@ namespace NXWidgets */ virtual inline void onDragStart(void) { } - + /** * Called when the widget stops being dragged. Override this when * creating new widgets if the widget should exhibit additional @@ -357,7 +357,7 @@ namespace NXWidgets */ virtual inline void onDragStop(void) { } - + /** * Called when the widget gains focus. Override this when creating new * widgets if the widget should exhibit additional behaviour when @@ -365,7 +365,7 @@ namespace NXWidgets */ virtual inline void onFocus(void) { } - + /** * Called when the widget loses focus. Override this when creating new * widgets if the widget should exhibit additional behaviour when @@ -381,7 +381,7 @@ namespace NXWidgets */ virtual inline void onEnable(void) { } - + /** * Called when the widget is disabled. Override this when creating new * widgets if the widget should exhibit additional behaviour when @@ -389,7 +389,7 @@ namespace NXWidgets */ virtual inline void onDisable(void) { } - + /** * Called when the widget is resized. Override this when creating new * widgets if the widget should exhibit additional behaviour when @@ -478,7 +478,7 @@ namespace NXWidgets /** * Has the widget been marked for deletion? This function recurses up the widget * hierarchy and only returns true if all of the widgets in the ancestor - * chain are not deleted. + * chain are not deleted. * * Widgets marked for deletion are automatically deleted and should not be * interacted with. @@ -798,11 +798,11 @@ namespace NXWidgets /** * Get the style used by this widget - * + * * @return Const pointer to CWidgetStyle stored inside this widget. */ inline const CWidgetStyle *getWidgetStyle() const { return &m_style; } - + /** * Sets this widget's border state. * diff --git a/NxWidgets/libnxwidgets/include/cnxwindow.hxx b/NxWidgets/libnxwidgets/include/cnxwindow.hxx index 50822cc83..780276a5f 100644 --- a/NxWidgets/libnxwidgets/include/cnxwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwindow.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -55,7 +55,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ @@ -112,13 +112,13 @@ namespace NXWidgets * @param hNxServer Handle to the NX server. * @param widgetControl Controlling widget for this window. */ - + CNxWindow(NXHANDLE hNxServer, CWidgetControl *pWidgetControl); /** * Destructor. */ - + ~CNxWindow(void); /** @@ -172,7 +172,7 @@ namespace NXWidgets * @param pPos The new position of the window. * @return True on success, false on any failure. */ - + bool setPosition(FAR const struct nxgl_point_s *pPos); /** @@ -181,7 +181,7 @@ namespace NXWidgets * @param pSize The new size of the window. * @return True on success, false on any failure. */ - + bool setSize(FAR const struct nxgl_size_s *pSize); /** diff --git a/NxWidgets/libnxwidgets/include/cprogressbar.hxx b/NxWidgets/libnxwidgets/include/cprogressbar.hxx index c75d1eee6..43e2a65bf 100644 --- a/NxWidgets/libnxwidgets/include/cprogressbar.hxx +++ b/NxWidgets/libnxwidgets/include/cprogressbar.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -86,11 +86,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -191,7 +191,7 @@ namespace NXWidgets inline const int16_t getValue(void) const { - return m_value; + return m_value; } /** @@ -217,7 +217,7 @@ namespace NXWidgets } /** - * Set the value that of the progress bar. + * Set the value that of the progress bar. * * @param value The new value. */ diff --git a/NxWidgets/libnxwidgets/include/cradiobutton.hxx b/NxWidgets/libnxwidgets/include/cradiobutton.hxx index 4186b8eea..465325ee8 100644 --- a/NxWidgets/libnxwidgets/include/cradiobutton.hxx +++ b/NxWidgets/libnxwidgets/include/cradiobutton.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -88,7 +88,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ @@ -107,7 +107,7 @@ namespace NXWidgets * The mu state cannot be enabled by a user - it can only be set by the * developer. */ - + class CRadioButton : public CButton { public: @@ -149,7 +149,7 @@ namespace NXWidgets /** * Destructor. */ - + virtual inline ~CRadioButton() { } /** diff --git a/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx b/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx index c37630c61..52f6aae36 100644 --- a/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx +++ b/NxWidgets/libnxwidgets/include/cradiobuttongroup.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -90,7 +90,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ @@ -109,7 +109,7 @@ namespace NXWidgets * it is necessary to set the state via the radio button, not the group. */ - class CRadioButtonGroup : public CNxWidget, public CWidgetEventHandler + class CRadioButtonGroup : public CNxWidget, public CWidgetEventHandler { protected: CWidgetControl *m_pWidgetControl; /**< The controlling widget */ diff --git a/NxWidgets/libnxwidgets/include/crect.hxx b/NxWidgets/libnxwidgets/include/crect.hxx index 7ce233fed..fcfc4136d 100644 --- a/NxWidgets/libnxwidgets/include/crect.hxx +++ b/NxWidgets/libnxwidgets/include/crect.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -85,7 +85,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ diff --git a/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx b/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx index 1235c80fb..5bf899a09 100644 --- a/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx +++ b/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx @@ -54,11 +54,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -92,7 +92,7 @@ namespace NXWidgets FAR const struct SRlePaletteBitmapEntry *data; }; - + /** * Class providing bitmap accessor for a bitmap represented by SRlePaletteBitmap. */ @@ -141,7 +141,7 @@ namespace NXWidgets */ bool skipPixels(nxgl_coord_t npixels); - + /** Seek to the beginning of the next row * * @return False if this was the last row of the image diff --git a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx index 48afd5306..8cb25ae75 100644 --- a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx +++ b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx @@ -108,7 +108,7 @@ namespace NXWidgets * @param row - The pointer to the row in the row cache to use * @param column - The non-integer column offset * @param outcolor - The returned, interpolated color - * + * */ bool rowColor(FAR uint8_t *row, b16_t column, diff --git a/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx b/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx index 20ba149fa..f6c3be3c3 100644 --- a/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx +++ b/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -89,11 +89,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -245,7 +245,7 @@ namespace NXWidgets void setPageSize(const nxgl_coord_t pageSize); - /** + /** * Process events fired by the grip. * * @param e The event details. diff --git a/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx b/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx index 974da3378..37649e970 100644 --- a/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx +++ b/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -89,11 +89,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -223,7 +223,7 @@ namespace NXWidgets */ void setValue(const nxgl_coord_t value); - + /** * Set the value that of the slider. This will reposition and redraw * the grip. The supplied value should be bitshifted left 16 places. @@ -244,7 +244,7 @@ namespace NXWidgets void setPageSize(const nxgl_coord_t pageSize); - /** + /** * Process events fired by the grip. * * @param e The event details. diff --git a/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx b/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx index ba7090b4b..127dd2015 100644 --- a/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx +++ b/NxWidgets/libnxwidgets/include/cscrollinglistbox.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -92,11 +92,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -136,7 +136,7 @@ namespace NXWidgets */ virtual void onResize(nxgl_coord_t width, nxgl_coord_t height); - + /** * Destructor. */ @@ -298,7 +298,7 @@ namespace NXWidgets { return m_listbox->getSelectedOption(); } - + /** * Sets whether multiple selections are possible or not. * diff --git a/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx b/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx index b27176e2f..fc987bbc1 100644 --- a/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx +++ b/NxWidgets/libnxwidgets/include/cscrollingpanel.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -88,11 +88,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -152,7 +152,7 @@ namespace NXWidgets virtual void onDrag(nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t vX, nxgl_coord_t vY); - + /** * Starts the dragging system. * @@ -217,7 +217,7 @@ namespace NXWidgets */ virtual void scroll(int32_t dx, int32_t dy); - + /** * Reposition the panel's scrolling region to the specified coordinates. * @@ -259,7 +259,7 @@ namespace NXWidgets { return m_canvasX; } - + /** * Gets the y coordinate of the virtual canvas. * @@ -281,7 +281,7 @@ namespace NXWidgets { return m_canvasWidth; } - + /** * Gets the height of the virtual canvas. * @@ -353,7 +353,7 @@ namespace NXWidgets { m_canvasWidth = width; } - + /** * Sets the height of the virtual canvas. * diff --git a/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx b/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx index 0d2a1a39d..8aedc09a9 100644 --- a/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx +++ b/NxWidgets/libnxwidgets/include/cscrollingtextbox.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -90,11 +90,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -134,7 +134,7 @@ namespace NXWidgets */ virtual void onResize(nxgl_coord_t width, nxgl_coord_t height); - + /** * Destructor. */ @@ -240,7 +240,7 @@ namespace NXWidgets */ virtual void appendText(const CNxString &text); - + /** * Remove all characters from the string from the start index onwards. * @@ -336,7 +336,7 @@ namespace NXWidgets */ virtual void insertText(const CNxString &text, const unsigned int index); - + /** * Insert text at the current cursor position. * @@ -368,7 +368,7 @@ namespace NXWidgets */ virtual const int32_t getCanvasX(void) const; - + /** * Gets the y coordinate of the virtual canvas. * @@ -384,7 +384,7 @@ namespace NXWidgets */ virtual const int32_t getCanvasWidth(void) const; - + /** * Gets the height of the virtual canvas. * @@ -401,7 +401,7 @@ namespace NXWidgets */ virtual void scroll(int32_t dx, int32_t dy); - + /** * Reposition the panel's scrolling region to the specified coordinates. * @@ -434,7 +434,7 @@ namespace NXWidgets */ virtual void setCanvasWidth(const int32_t width); - + /** * Sets the height of the virtual canvas. * diff --git a/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx b/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx index f732a1731..ea0c8dc18 100644 --- a/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx +++ b/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -88,11 +88,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -119,7 +119,7 @@ namespace NXWidgets int32_t m_gutterWidth; /**< Width of the gutter, taking into account any adjustments made to the width of the grip. */ uint32_t m_contentSize; /**< Number of values in the min/max range. */ - + /** * Get the maximum possible value that the slider can represent. Useful when * using the slider as a scrollbar, as the height of the grip prevents the full @@ -167,7 +167,7 @@ namespace NXWidgets */ virtual void onResize(nxgl_coord_t width, nxgl_coord_t height); - + /** * Moves the grip towards the mouse. * diff --git a/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx b/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx index 71f10f62c..4543485e1 100644 --- a/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx +++ b/NxWidgets/libnxwidgets/include/csliderhorizontalgrip.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -86,11 +86,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -102,7 +102,7 @@ namespace NXWidgets * slider. */ - class CSliderHorizontalGrip : public CNxWidget + class CSliderHorizontalGrip : public CNxWidget { protected: @@ -134,7 +134,7 @@ namespace NXWidgets */ virtual void onClick(nxgl_coord_t x, nxgl_coord_t y); - + /** * Redraws the grip. * @@ -143,7 +143,7 @@ namespace NXWidgets */ virtual void onRelease(nxgl_coord_t x, nxgl_coord_t y); - + /** * Redraws the grip. * @@ -152,7 +152,7 @@ namespace NXWidgets */ virtual void onReleaseOutside(nxgl_coord_t x, nxgl_coord_t y); - + /** * Moves the grip to follow the mouse. * @@ -173,7 +173,7 @@ namespace NXWidgets : CNxWidget(sliderHorizontalGrip) { } public: - + /** * Constructor. * diff --git a/NxWidgets/libnxwidgets/include/cslidervertical.hxx b/NxWidgets/libnxwidgets/include/cslidervertical.hxx index a1b8651f9..f08010f3c 100644 --- a/NxWidgets/libnxwidgets/include/cslidervertical.hxx +++ b/NxWidgets/libnxwidgets/include/cslidervertical.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -88,11 +88,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -293,7 +293,7 @@ namespace NXWidgets */ void setValue(const nxgl_coord_t value); - + /** * Set the value that of the slider. This will reposition and redraw * the grip. The supplied value should be bitshifted left 16 places. diff --git a/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx b/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx index 3ac7fb360..aa246d7ee 100644 --- a/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx +++ b/NxWidgets/libnxwidgets/include/csliderverticalgrip.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -86,11 +86,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -134,7 +134,7 @@ namespace NXWidgets */ virtual void onClick(nxgl_coord_t x, nxgl_coord_t y); - + /** * Redraws the grip. * @@ -143,7 +143,7 @@ namespace NXWidgets */ virtual void onRelease(nxgl_coord_t x, nxgl_coord_t y); - + /** * Redraws the grip. * @@ -152,7 +152,7 @@ namespace NXWidgets */ virtual void onReleaseOutside(nxgl_coord_t x, nxgl_coord_t y); - + /** * Moves the grip to follow the mouse. * diff --git a/NxWidgets/libnxwidgets/include/cstickybutton.hxx b/NxWidgets/libnxwidgets/include/cstickybutton.hxx index c51976ec0..46d7f1962 100644 --- a/NxWidgets/libnxwidgets/include/cstickybutton.hxx +++ b/NxWidgets/libnxwidgets/include/cstickybutton.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -87,11 +87,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -211,7 +211,7 @@ namespace NXWidgets void setStuckDown(bool stuckDown); /** - * Toggles the key's stuck down state. + * Toggles the key's stuck down state. */ inline void toggleStuckDown(void) diff --git a/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx b/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx index 5854c51f0..b82873a75 100644 --- a/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx +++ b/NxWidgets/libnxwidgets/include/cstickybuttonarray.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -53,11 +53,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets diff --git a/NxWidgets/libnxwidgets/include/cstringiterator.hxx b/NxWidgets/libnxwidgets/include/cstringiterator.hxx index 648d12633..e0f119d24 100644 --- a/NxWidgets/libnxwidgets/include/cstringiterator.hxx +++ b/NxWidgets/libnxwidgets/include/cstringiterator.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -92,7 +92,7 @@ namespace NXWidgets { class CNxString; - + /** * Class used to efficiently iterate over the characters in a CNxString * object. The CNxString is a Unicode string that uses the fixed-width @@ -162,7 +162,7 @@ namespace NXWidgets */ bool moveTo(int index); - + /** * Get the current position of the iterator within the string. * diff --git a/NxWidgets/libnxwidgets/include/ctabpanel.hxx b/NxWidgets/libnxwidgets/include/ctabpanel.hxx index aa6eb20f8..887f66fc0 100644 --- a/NxWidgets/libnxwidgets/include/ctabpanel.hxx +++ b/NxWidgets/libnxwidgets/include/ctabpanel.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -56,11 +56,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -72,7 +72,7 @@ namespace NXWidgets class CWidgetControl; class CRect; class CStickyButtonArray; - + /** * Tab panel, with tabs at the top and a panel at the bottom. */ @@ -82,12 +82,12 @@ namespace NXWidgets protected: TNxArray<CNxWidget*> m_tabpages; CLatchButtonArray *m_buttonbar; - + virtual void handleActionEvent(const CWidgetEventArgs &e); - + virtual void drawContents(CGraphicsPort* port) {} virtual void drawBorder(CGraphicsPort* port) {} - + public: CTabPanel(CWidgetControl *pWidgetControl, uint8_t numPages, nxgl_coord_t x, nxgl_coord_t y, @@ -95,11 +95,11 @@ namespace NXWidgets nxgl_coord_t buttonHeight, FAR const CWidgetStyle *style = (FAR const CWidgetStyle *)NULL ); - + inline CNxWidget &page(uint8_t index) { return *m_tabpages.at(index); } - + void setPageName(uint8_t index, const CNxString &name); - + void showPage(uint8_t index); }; } diff --git a/NxWidgets/libnxwidgets/include/ctext.hxx b/NxWidgets/libnxwidgets/include/ctext.hxx index a58d32eeb..8f691082d 100644 --- a/NxWidgets/libnxwidgets/include/ctext.hxx +++ b/NxWidgets/libnxwidgets/include/ctext.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -90,7 +90,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ @@ -105,7 +105,7 @@ namespace NXWidgets * height in pixels, calculate the width of a row, etc. */ - class CText : public CNxString + class CText : public CNxString { private: @@ -119,7 +119,7 @@ namespace NXWidgets int index; uint8_t width; } LongestLine; - + CNxFont *m_font; /**< Font to be used for output */ TNxArray<int> m_linePositions; /**< Array containing start indexes of each wrapped line */ @@ -209,7 +209,7 @@ namespace NXWidgets */ virtual void remove(const int startIndex, const int count); - + /** * Set the vertical spacing between rows of text. * @@ -219,7 +219,7 @@ namespace NXWidgets void setLineSpacing(uint8_t lineSpacing); /** - * Sets the pixel width of the text; text wider than + * Sets the pixel width of the text; text wider than * this will automatically wrap. * * @param width Maximum pixel width of the text. @@ -344,7 +344,7 @@ namespace NXWidgets */ void stripTopLines(const int lines); - + /** * Wrap all of the text. */ diff --git a/NxWidgets/libnxwidgets/include/ctextbox.hxx b/NxWidgets/libnxwidgets/include/ctextbox.hxx index 32a0ab69f..b91c371a4 100644 --- a/NxWidgets/libnxwidgets/include/ctextbox.hxx +++ b/NxWidgets/libnxwidgets/include/ctextbox.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -90,11 +90,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -206,7 +206,7 @@ namespace NXWidgets */ virtual nxgl_coord_t getCursorWidth(void) const; - + /** * Calculate the horizontal position of the string based on its length * and the alignment options. Alignment options are overridden if the diff --git a/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx b/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx index 9aacafa74..d8058b13c 100644 --- a/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx +++ b/NxWidgets/libnxwidgets/include/cwidgeteventargs.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -97,7 +97,7 @@ /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets diff --git a/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx b/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx index 8883fa12d..38c2f2558 100644 --- a/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx +++ b/NxWidgets/libnxwidgets/include/cwidgeteventhandler.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -84,11 +84,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -108,13 +108,13 @@ namespace NXWidgets */ inline CWidgetEventHandler() { } - + /** * Destructor. */ virtual inline ~CWidgetEventHandler() { } - + /** * Handle a mouse button click event. * @@ -128,7 +128,7 @@ namespace NXWidgets * * @param e The event data. */ - + virtual void handleDragEvent(const CWidgetEventArgs &e) { } /** diff --git a/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx b/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx index f0a2f1d72..7d5424365 100644 --- a/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx +++ b/NxWidgets/libnxwidgets/include/cwidgeteventhandlerlist.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -87,11 +87,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -116,7 +116,7 @@ namespace NXWidgets * * @param widget The owning widget. */ - + CWidgetEventHandlerList(CNxWidget *widget); /** @@ -124,7 +124,7 @@ namespace NXWidgets */ ~CWidgetEventHandlerList(void) { } - + /** * Check if the object raises events or not. * @@ -161,7 +161,7 @@ namespace NXWidgets * all events raised by this object. * @param eventHandler A pointer to the event handler. */ - + void addWidgetEventHandler(CWidgetEventHandler *eventHandler); /** diff --git a/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx b/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx index 8fe5e2c32..d4303a472 100644 --- a/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx +++ b/NxWidgets/libnxwidgets/include/cwidgetstyle.hxx @@ -1,135 +1,135 @@ -/****************************************************************************
- * NxWidgets/libnxwidgets/include/cwidgetstyle.hxx
- *
- * 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, NxWidgets, nor the names of its contributors
- * me 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.
- *
- ****************************************************************************
- *
- * Portions of this package derive from Woopsi (http://woopsi.org/) and
- * portions are original efforts. It is difficult to determine at this
- * point what parts are original efforts and which parts derive from Woopsi.
- * However, in any event, the work of Antony Dzeryn will be acknowledged
- * in most NxWidget files. Thanks Antony!
- *
- * Copyright (c) 2007-2011, Antony Dzeryn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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.
- *
- ****************************************************************************/
-
-#ifndef __INCLUDE_CWIDGETSTYLE_HXX
-#define __INCLUDE_CWIDGETSTYLE_HXX
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <nuttx/nx/nxglib.h>
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Implementation Classes
- ****************************************************************************/
-
-#if defined(__cplusplus)
-
-namespace NXWidgets
-{
- class CNxFont;
-
- /**
- * Class containing all colors that a widget depends on.
- */
-
- class CWidgetColors
- {
- public:
- nxgl_mxpixel_t background; /**< Color used for a normal background */
- nxgl_mxpixel_t selectedBackground; /**< Color used for a selected background */
- nxgl_mxpixel_t shineEdge; /**< Color used as light bevel edge */
- nxgl_mxpixel_t shadowEdge; /**< Color used as dark bevel edge */
- nxgl_mxpixel_t highlight; /**< Color used as highlighted elements */
- nxgl_mxpixel_t disabledText; /**< Color used for text in a disabled widget */
- nxgl_mxpixel_t enabledText; /**< Color used for text in a enabled widget */
- nxgl_mxpixel_t selectedText; /**< Color used for text in a clicked widget */
- };
-
- /**
- * Class providing the default colors and fonts for all widgets. This
- * information is copied into the widgets when they are constructed, so you
- * will need to change these values *before* creating any widgets if you
- * want those widgets to use the altered colors.
- *
- * If the font objects are set, NXWidgets will use them in preference to the
- * default system fonts.
- */
-
- class CWidgetStyle
- {
- public:
- CWidgetColors colors; /**< Default widget colors */
- CNxFont *font; /**< Default font */
- };
-}
-
-#endif // __cplusplus
-
-#endif // __INCLUDE_CWIDGETSTYLE_HXX
+/**************************************************************************** + * NxWidgets/libnxwidgets/include/cwidgetstyle.hxx + * + * 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, NxWidgets, nor the names of its contributors + * me 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in most NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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. + * + ****************************************************************************/ + +#ifndef __INCLUDE_CWIDGETSTYLE_HXX +#define __INCLUDE_CWIDGETSTYLE_HXX + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> + +#include <nuttx/nx/nxglib.h> + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Implementation Classes + ****************************************************************************/ + +#if defined(__cplusplus) + +namespace NXWidgets +{ + class CNxFont; + + /** + * Class containing all colors that a widget depends on. + */ + + class CWidgetColors + { + public: + nxgl_mxpixel_t background; /**< Color used for a normal background */ + nxgl_mxpixel_t selectedBackground; /**< Color used for a selected background */ + nxgl_mxpixel_t shineEdge; /**< Color used as light bevel edge */ + nxgl_mxpixel_t shadowEdge; /**< Color used as dark bevel edge */ + nxgl_mxpixel_t highlight; /**< Color used as highlighted elements */ + nxgl_mxpixel_t disabledText; /**< Color used for text in a disabled widget */ + nxgl_mxpixel_t enabledText; /**< Color used for text in a enabled widget */ + nxgl_mxpixel_t selectedText; /**< Color used for text in a clicked widget */ + }; + + /** + * Class providing the default colors and fonts for all widgets. This + * information is copied into the widgets when they are constructed, so you + * will need to change these values *before* creating any widgets if you + * want those widgets to use the altered colors. + * + * If the font objects are set, NXWidgets will use them in preference to the + * default system fonts. + */ + + class CWidgetStyle + { + public: + CWidgetColors colors; /**< Default widget colors */ + CNxFont *font; /**< Default font */ + }; +} + +#endif // __cplusplus + +#endif // __INCLUDE_CWIDGETSTYLE_HXX diff --git a/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx b/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx index 574c24b55..379ae4725 100644 --- a/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx +++ b/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx @@ -41,15 +41,15 @@ ****************************************************************************/ #include "nxconfig.hxx" - + /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -69,13 +69,13 @@ namespace NXWidgets */ inline CWindowEventHandler() { } - + /** * Destructor. */ virtual inline ~CWindowEventHandler() { } - + /** * Handle a NX window redraw request event */ @@ -85,7 +85,7 @@ namespace NXWidgets /** * Handle a NX window position/size change event */ - + virtual void handleGeometryEvent(void) { } /** @@ -111,7 +111,7 @@ namespace NXWidgets * * @param arg - User provided argument (see nx_block or nxtk_block) */ - + virtual void handleBlockedEvent(FAR void *arg) { } }; } diff --git a/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx b/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx index 035e6a7b9..a076e63cf 100644 --- a/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx +++ b/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx @@ -53,11 +53,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -75,7 +75,7 @@ namespace NXWidgets /** * Return the index to the window event handler. */ - + bool findWindowEventHandler(CWindowEventHandler *eventHandler, int &index); public: @@ -85,7 +85,7 @@ namespace NXWidgets * * @param widget The owning widget. */ - + CWindowEventHandlerList(void) { } /** @@ -93,7 +93,7 @@ namespace NXWidgets */ inline ~CWindowEventHandlerList(void) { } - + /** * Get the event handler at the specified index. * @@ -122,7 +122,7 @@ namespace NXWidgets * all events raised by this object. * @param eventHandler A pointer to the event handler. */ - + void addWindowEventHandler(CWindowEventHandler *eventHandler); /** diff --git a/NxWidgets/libnxwidgets/include/glyphs.hxx b/NxWidgets/libnxwidgets/include/glyphs.hxx index 230db8ff6..6d5c2d4eb 100644 --- a/NxWidgets/libnxwidgets/include/glyphs.hxx +++ b/NxWidgets/libnxwidgets/include/glyphs.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> diff --git a/NxWidgets/libnxwidgets/include/ilistbox.hxx b/NxWidgets/libnxwidgets/include/ilistbox.hxx index 0eb33bc3b..915789952 100644 --- a/NxWidgets/libnxwidgets/include/ilistbox.hxx +++ b/NxWidgets/libnxwidgets/include/ilistbox.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -86,11 +86,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Abstract Base Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -218,7 +218,7 @@ namespace NXWidgets */ virtual const CListBoxDataItem *getSelectedOption(void) const = 0; - + /** * Sets whether multiple selections are possible or not. * diff --git a/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx b/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx index 26bf1411b..781ce9d52 100644 --- a/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx +++ b/NxWidgets/libnxwidgets/include/ilistdataeventhandler.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -84,11 +84,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Abstract Base Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -99,7 +99,7 @@ namespace NXWidgets * Base IListDataEventHandler class, intended to be subclassed. Any class * that needs to listen for CListData events should inherit from this class. */ - + class IListDataEventHandler { public: diff --git a/NxWidgets/libnxwidgets/include/inxwindow.hxx b/NxWidgets/libnxwidgets/include/inxwindow.hxx index 210a1e6ce..826d1784e 100644 --- a/NxWidgets/libnxwidgets/include/inxwindow.hxx +++ b/NxWidgets/libnxwidgets/include/inxwindow.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <nuttx/nx/nxglib.h> @@ -99,7 +99,7 @@ namespace NXWidgets * * @return True if the window was successfully created. */ - + virtual bool open(void) = 0; /** @@ -144,7 +144,7 @@ namespace NXWidgets * @param pPos The new position of the window. * @return True on success, false on failure. */ - + virtual bool setPosition(FAR const struct nxgl_point_s *pPos) = 0; /** @@ -153,7 +153,7 @@ namespace NXWidgets * @param pSize The new size of the window. * @return OK on success; ERROR on failure with errno set appropriately. */ - + virtual bool setSize(FAR const struct nxgl_size_s *pSize) = 0; /** diff --git a/NxWidgets/libnxwidgets/include/iscrollable.hxx b/NxWidgets/libnxwidgets/include/iscrollable.hxx index b0e65a9db..f82d4ffea 100644 --- a/NxWidgets/libnxwidgets/include/iscrollable.hxx +++ b/NxWidgets/libnxwidgets/include/iscrollable.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -84,11 +84,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -118,7 +118,7 @@ namespace NXWidgets */ virtual const int32_t getCanvasX(void) const = 0; - + /** * Gets the y coordinate of the virtual canvas. * @@ -134,7 +134,7 @@ namespace NXWidgets */ virtual const int32_t getCanvasWidth(void) const = 0; - + /** * Gets the height of the virtual canvas. * @@ -151,7 +151,7 @@ namespace NXWidgets */ virtual void scroll(int32_t dx, int32_t dy) = 0; - + /** * Repositions the virtual canvas to the specified coordinates. * @@ -200,7 +200,7 @@ namespace NXWidgets */ virtual void setCanvasWidth(const int32_t width) = 0; - + /** * Sets the height of the virtual canvas. * diff --git a/NxWidgets/libnxwidgets/include/islider.hxx b/NxWidgets/libnxwidgets/include/islider.hxx index 5a9340923..1577e9898 100644 --- a/NxWidgets/libnxwidgets/include/islider.hxx +++ b/NxWidgets/libnxwidgets/include/islider.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -84,11 +84,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Abstract Base Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets diff --git a/NxWidgets/libnxwidgets/include/itextbox.hxx b/NxWidgets/libnxwidgets/include/itextbox.hxx index 0e2e7b824..291e5ce0e 100644 --- a/NxWidgets/libnxwidgets/include/itextbox.hxx +++ b/NxWidgets/libnxwidgets/include/itextbox.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -88,11 +88,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Abstract Base Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -147,7 +147,7 @@ namespace NXWidgets */ virtual void setText(const CNxString &text) = 0; - + /** * Append new text to the end of the current text displayed in the * label. diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx index 1336ad5e7..c2141775b 100644 --- a/NxWidgets/libnxwidgets/include/nxconfig.hxx +++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> diff --git a/NxWidgets/libnxwidgets/include/singletons.hxx b/NxWidgets/libnxwidgets/include/singletons.hxx index 094808939..2ccbe9f90 100644 --- a/NxWidgets/libnxwidgets/include/singletons.hxx +++ b/NxWidgets/libnxwidgets/include/singletons.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -84,11 +84,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets diff --git a/NxWidgets/libnxwidgets/include/teventargs.hxx b/NxWidgets/libnxwidgets/include/teventargs.hxx index c1371be92..2250eef80 100644 --- a/NxWidgets/libnxwidgets/include/teventargs.hxx +++ b/NxWidgets/libnxwidgets/include/teventargs.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -82,11 +82,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -103,7 +103,7 @@ namespace NXWidgets T m_source; /**< The object that raised the event */ public: - + /** * Constructor. * @param source The object that raised the event. @@ -119,7 +119,7 @@ namespace NXWidgets */ virtual inline ~TEventArgs() { } - + /** * Get the source object that raised the event. */ diff --git a/NxWidgets/libnxwidgets/include/tnxarray.hxx b/NxWidgets/libnxwidgets/include/tnxarray.hxx index 44cb537ad..0cb4746f2 100644 --- a/NxWidgets/libnxwidgets/include/tnxarray.hxx +++ b/NxWidgets/libnxwidgets/include/tnxarray.hxx @@ -73,7 +73,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -84,11 +84,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) /** @@ -104,7 +104,7 @@ * the array with large amounts of data. Adding new data to the linked list is * very inexpensive. */ - + template <class T> class TNxArray { @@ -286,7 +286,7 @@ void TNxArray<T>::pop_back(void) { // We can just reduce the used size of the array, as the value // will get overwritten automatically - + m_size--; } } diff --git a/NxWidgets/libnxwidgets/src/cbgwindow.cxx b/NxWidgets/libnxwidgets/src/cbgwindow.cxx index 268bc5d80..2cb3d2389 100644 --- a/NxWidgets/libnxwidgets/src/cbgwindow.cxx +++ b/NxWidgets/libnxwidgets/src/cbgwindow.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -63,7 +63,7 @@ using namespace NXWidgets; * @param hNxServer Handle to the NX server. * @param widgetControl Controlling widget for this window. */ - + CBgWindow::CBgWindow(NXHANDLE hNxServer, CWidgetControl *pWidgetControl) : CCallback(pWidgetControl), m_hNxServer(hNxServer), m_hWindow(0), m_widgetControl(pWidgetControl) @@ -76,7 +76,7 @@ CBgWindow::CBgWindow(NXHANDLE hNxServer, CWidgetControl *pWidgetControl) /** * Destructor. Returns the background window to the server. */ - + CBgWindow::~CBgWindow(void) { // Release the background. We do not release the widget control @@ -134,7 +134,7 @@ CWidgetControl *CBgWindow::getWidgetControl(void) const * * @return Always returns true. */ - + bool CBgWindow::requestPosition(void) { // The background window is always at {0,0} and the size never changes. @@ -178,7 +178,7 @@ bool CBgWindow::getSize(FAR struct nxgl_size_s *pSize) * @param pPos The new position of the window. * @return Always returns false. */ - + bool CBgWindow::setPosition(FAR const struct nxgl_point_s *pPos) { // The position of the background cannot be changed @@ -194,7 +194,7 @@ bool CBgWindow::setPosition(FAR const struct nxgl_point_s *pPos) * @param pSize The new size of the window. * @return Always returns false. */ - + bool CBgWindow::setSize(FAR const struct nxgl_size_s *pSize) { // The position of the background cannot be changed diff --git a/NxWidgets/libnxwidgets/src/cbitmap.cxx b/NxWidgets/libnxwidgets/src/cbitmap.cxx index c0cf71ea4..1a7294f38 100644 --- a/NxWidgets/libnxwidgets/src/cbitmap.cxx +++ b/NxWidgets/libnxwidgets/src/cbitmap.cxx @@ -84,7 +84,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Method Implementations ****************************************************************************/ @@ -180,7 +180,7 @@ bool CBitmap::getRun(nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t width, // is an even multiple of bytes). FAR uint8_t *start = (FAR uint8_t*)m_bitmap->data + - y * m_bitmap->stride + + y * m_bitmap->stride + ((x * m_bitmap->bpp) >> 3); // Get the number of bytes to copy. diff --git a/NxWidgets/libnxwidgets/src/cbutton.cxx b/NxWidgets/libnxwidgets/src/cbutton.cxx index 429905759..24af6f48d 100644 --- a/NxWidgets/libnxwidgets/src/cbutton.cxx +++ b/NxWidgets/libnxwidgets/src/cbutton.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -140,12 +140,12 @@ void CButton::drawOutline(CGraphicsPort *port, bool useClicked) { return; } - + // Work out which colors to use nxgl_coord_t color1; nxgl_coord_t color2; - + if (useClicked) { // Bevelled into the screen @@ -160,7 +160,7 @@ void CButton::drawOutline(CGraphicsPort *port, bool useClicked) color1 = getShineEdgeColor(); color2 = getShadowEdgeColor(); } - + port->drawBevelledRect(getX(), getY(), getWidth(), getHeight(), color1, color2); } diff --git a/NxWidgets/libnxwidgets/src/cbuttonarray.cxx b/NxWidgets/libnxwidgets/src/cbuttonarray.cxx index 28f14062b..4efc99f13 100644 --- a/NxWidgets/libnxwidgets/src/cbuttonarray.cxx +++ b/NxWidgets/libnxwidgets/src/cbuttonarray.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -51,7 +51,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * CButtonArray Method Implementations ****************************************************************************/ @@ -79,7 +79,7 @@ CButtonArray::CButtonArray(CWidgetControl *pWidgetControl, nxgl_coord_t buttonWidth, nxgl_coord_t buttonHeight, CWidgetStyle *style) : CNxWidget(pWidgetControl, x, y, - buttonColumns * buttonWidth + 2, buttonRows * buttonHeight + 2, + buttonColumns * buttonWidth + 2, buttonRows * buttonHeight + 2, 0, style) { // Save configuration @@ -367,7 +367,7 @@ void CButtonArray::drawContents(CGraphicsPort *port) { int column; int row; - + // Just one. Get the row/column indices from the last click (void)posToButton(m_clickX, m_clickY, column, row); @@ -452,7 +452,7 @@ void CButtonArray::drawButton(CGraphicsPort *port, int column, int row, bool use if (useClicked || isCursorPosition(column, row)) { // "Selected" text color on unique "Selected" background color - + backColor = getSelectedBackgroundColor(); textColor = getSelectedTextColor(); } @@ -465,7 +465,7 @@ void CButtonArray::drawButton(CGraphicsPort *port, int column, int row, bool use } // Pick the border colors. Should we use the 'clicked' button style? - + if (useClicked) { // Yes.. Bevelled into the screen diff --git a/NxWidgets/libnxwidgets/src/ccheckbox.cxx b/NxWidgets/libnxwidgets/src/ccheckbox.cxx index a6cc9400a..d10e3b410 100644 --- a/NxWidgets/libnxwidgets/src/ccheckbox.cxx +++ b/NxWidgets/libnxwidgets/src/ccheckbox.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> diff --git a/NxWidgets/libnxwidgets/src/ccyclebutton.cxx b/NxWidgets/libnxwidgets/src/ccyclebutton.cxx index b4dff685b..c17571830 100644 --- a/NxWidgets/libnxwidgets/src/ccyclebutton.cxx +++ b/NxWidgets/libnxwidgets/src/ccyclebutton.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -305,7 +305,7 @@ void CCycleButton::getPreferredDimensions(CRect &rect) const void CCycleButton::drawContents(CGraphicsPort *port) { // Get the drawing region (excluding any border) - + CRect rect; getRect(rect); @@ -393,12 +393,12 @@ void CCycleButton::drawOutline(CGraphicsPort *port) { return; } - + // Work out which colors to use nxgl_coord_t color1; nxgl_coord_t color2; - + if (isClicked()) { // Bevelled into the screen @@ -413,7 +413,7 @@ void CCycleButton::drawOutline(CGraphicsPort *port) color1 = getShineEdgeColor(); color2 = getShadowEdgeColor(); } - + port->drawBevelledRect(getX(), getY(), getWidth(), getHeight(), color1, color2); } @@ -447,7 +447,7 @@ void CCycleButton::onPreRelease(nxgl_coord_t x, nxgl_coord_t y) } redraw(); - + CButton::onPreRelease(x, y); } diff --git a/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx b/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx index 93984e1bc..786cbec9f 100644 --- a/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx +++ b/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx @@ -105,10 +105,10 @@ using namespace NXWidgets; * @param height The height of the slider. */ -CGlyphSliderHorizontal::CGlyphSliderHorizontal(CWidgetControl * pWidgetControl, - nxgl_coord_t x, nxgl_coord_t y, - nxgl_coord_t width, nxgl_coord_t height, - IBitmap * pGripBitmap, +CGlyphSliderHorizontal::CGlyphSliderHorizontal(CWidgetControl * pWidgetControl, + nxgl_coord_t x, nxgl_coord_t y, + nxgl_coord_t width, nxgl_coord_t height, + IBitmap * pGripBitmap, nxwidget_pixel_t fillColor, bool fill) :CNxWidget(pWidgetControl, x, y, width, height, WIDGET_DRAGGABLE) { @@ -389,11 +389,11 @@ void CGlyphSliderHorizontal::drawBorder(CGraphicsPort * port) nxwidget_pixel_t shadow; y1 = getY() + (getHeight() >> 1) - (m_barThickness >> 1); - y2 = getY() + (getHeight() >> 1) + m_barThickness - + y2 = getY() + (getHeight() >> 1) + m_barThickness - (m_barThickness >> 1) - 1; // To the Left of the grip. Only draw if the icon isn't covering the - // edge of the bar + // edge of the bar width = gripX - x - halfGripWidth; if (width > 0) @@ -416,7 +416,7 @@ void CGlyphSliderHorizontal::drawBorder(CGraphicsPort * port) } // To the Right of the grip - // Only draw if the icon isn't covering the edge of the bar + // Only draw if the icon isn't covering the edge of the bar width = getWidth() - (gripX - x + gripWidth) - 1 - halfGripWidth; if (width > 0) @@ -434,7 +434,7 @@ void CGlyphSliderHorizontal::drawBorder(CGraphicsPort * port) if (gripX > x + halfGripWidth) { - port->drawVertLine(x + halfGripWidth, y1, m_barThickness, + port->drawVertLine(x + halfGripWidth, y1, m_barThickness, getShineEdgeColor()); } @@ -442,7 +442,7 @@ void CGlyphSliderHorizontal::drawBorder(CGraphicsPort * port) if (gripX + gripWidth < x + getWidth() - 1 - halfGripWidth) { - port->drawVertLine(x + getWidth() - 1 - halfGripWidth, + port->drawVertLine(x + getWidth() - 1 - halfGripWidth, y1, m_barThickness, getShadowEdgeColor()); } } diff --git a/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx b/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx index 331ec8d8b..6e7be0af2 100644 --- a/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx +++ b/NxWidgets/libnxwidgets/src/cglyphsliderhorizontalgrip.cxx @@ -72,7 +72,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include "cglyphsliderhorizontalgrip.hxx" #include "ibitmap.hxx" @@ -100,7 +100,7 @@ CGlyphSliderHorizontalGrip::CGlyphSliderHorizontalGrip(CWidgetControl *pWidgetCo nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t width, nxgl_coord_t height, IBitmap *pGripBitmap) -: CImage(pWidgetControl, 0, (height>>1) - (pGripBitmap->getHeight() >> 1), +: CImage(pWidgetControl, 0, (height>>1) - (pGripBitmap->getHeight() >> 1), pGripBitmap->getWidth(), pGripBitmap->getHeight(), pGripBitmap, 0) { diff --git a/NxWidgets/libnxwidgets/src/cgraphicsport.cxx b/NxWidgets/libnxwidgets/src/cgraphicsport.cxx index 85548a381..cbda90d6e 100644 --- a/NxWidgets/libnxwidgets/src/cgraphicsport.cxx +++ b/NxWidgets/libnxwidgets/src/cgraphicsport.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -401,7 +401,7 @@ void CGraphicsPort::drawBitmap(nxgl_coord_t x, nxgl_coord_t y, bitmapY * bitmap->stride + ((bitmapX * bitmap->bpp + 7) >> 3); FAR nxwidget_pixel_t *srcPtr = (nxwidget_pixel_t *)srcLine; - + // Loop until all rows have been displayed nxgl_coord_t firstX = x; @@ -552,7 +552,7 @@ void CGraphicsPort::drawBitmapGreyScale(nxgl_coord_t x, nxgl_coord_t y, dest.pt2.y = y; // Convert each row to greyscale and send it to the display - + for (int row = 0; row < height; row++) { // Convert the next row @@ -571,7 +571,7 @@ void CGraphicsPort::drawBitmapGreyScale(nxgl_coord_t x, nxgl_coord_t y, // A truly accurate greyscale conversion would be complex. Let's // just average. - + nxwidget_pixel_t avg = (r + g + b) / 3; *runDest++ = MKRGB(avg, avg, avg); } @@ -679,9 +679,9 @@ void CGraphicsPort::drawText(struct nxgl_point_s *pos, CRect *bound, { nxgl_mxpixel_t savedColor = font->getColor(); font->setColor(color); - + _drawText(pos, bound, font, string, startIndex, length, background, false); - + font->setColor(savedColor); } @@ -727,7 +727,7 @@ void CGraphicsPort::_drawText(struct nxgl_point_s *pos, CRect *bound, background = m_backColor; } #endif - + // Allocate a bit of memory to hold the largest rendered font unsigned int bmWidth = ((unsigned int)font->getMaxWidth() * CONFIG_NXWIDGETS_BPP + 7) >> 3; @@ -740,7 +740,7 @@ void CGraphicsPort::_drawText(struct nxgl_point_s *pos, CRect *bound, struct nxgl_rect_s boundingBox; bound->getNxRect(&boundingBox); - + // Loop setup struct SBitmap bitmap; @@ -796,7 +796,7 @@ void CGraphicsPort::_drawText(struct nxgl_point_s *pos, CRect *bound, // If we have been given a background color, use it to fill the array. // Otherwise initialize the bitmap memory by reading from the display. // The font renderer always renders the fonts on a transparent background. - + if (!transparent) { // Set the glyph memory to the background color @@ -829,7 +829,7 @@ void CGraphicsPort::_drawText(struct nxgl_point_s *pos, CRect *bound, } } - // Adjust the X position for the next character in the string + // Adjust the X position for the next character in the string pos->x += fontWidth; } diff --git a/NxWidgets/libnxwidgets/src/ckeypad.cxx b/NxWidgets/libnxwidgets/src/ckeypad.cxx index 898885c62..8d9089081 100644 --- a/NxWidgets/libnxwidgets/src/ckeypad.cxx +++ b/NxWidgets/libnxwidgets/src/ckeypad.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -65,7 +65,7 @@ using namespace NXWidgets; static FAR const char *g_alphaLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = { - "=>", "A", "B", "<DEL", + "=>", "A", "B", "<DEL", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", @@ -75,7 +75,7 @@ static FAR const char *g_alphaLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = { }; static FAR const char *g_numLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = { - "=>", "0", "1", "<DEL", + "=>", "0", "1", "<DEL", "2", "3", "4", "5", "6", "7", "8", "9", "-", "#", "*", "&", @@ -211,4 +211,4 @@ void CKeypad::configureKeypadMode(void) onTextChange(); } - + diff --git a/NxWidgets/libnxwidgets/src/clatchbutton.cxx b/NxWidgets/libnxwidgets/src/clatchbutton.cxx index 673d50319..f344b726c 100644 --- a/NxWidgets/libnxwidgets/src/clatchbutton.cxx +++ b/NxWidgets/libnxwidgets/src/clatchbutton.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx b/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx index d8292941b..a96e1546d 100644 --- a/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx +++ b/NxWidgets/libnxwidgets/src/clatchbuttonarray.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/clistbox.cxx b/NxWidgets/libnxwidgets/src/clistbox.cxx index a8d3db0a6..d37915e42 100644 --- a/NxWidgets/libnxwidgets/src/clistbox.cxx +++ b/NxWidgets/libnxwidgets/src/clistbox.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -465,12 +465,12 @@ void CListBox::drawContents(CGraphicsPort *port) // Precalc values for option draw loop nxgl_coord_t optionHeight = getOptionHeight(); - + // Ensure that we subtract 1 from topOption to ensure that the option // above is drawn if it is partially visible int topOption = ((clipY - m_canvasY) / optionHeight) - 1; - + // Ensure that we add 2 to the bottom option to ensure that the option // below is draw if it is partially visible - subbing 1 from topOption // means we need to add an additional 1 to compensate @@ -503,7 +503,7 @@ void CListBox::drawContents(CGraphicsPort *port) while (i <= bottomOption) { item = (const CListBoxDataItem*)m_options.getItem(i); - + // Is the option selected? if (item->isSelected()) @@ -516,13 +516,13 @@ void CListBox::drawContents(CGraphicsPort *port) rect.getWidth(), optionHeight, item->getSelectedBackColor()); } - + // Draw text struct nxgl_point_s pos; pos.x = rect.getX() + m_optionPadding; pos.y = rect.getY() + y + m_optionPadding; - + if (isEnabled()) { port->drawText(&pos, &rect, getFont(), item->getText(), 0, @@ -551,7 +551,7 @@ void CListBox::drawContents(CGraphicsPort *port) struct nxgl_point_s pos; pos.x = rect.getX() + m_optionPadding; pos.y = rect.getY() + y + m_optionPadding; - + if (isEnabled()) { port->drawText(&pos, &rect, getFont(), item->getText(), 0, @@ -602,8 +602,8 @@ void CListBox::onClick(nxgl_coord_t x, nxgl_coord_t y) { // Calculate which option was clicked - m_lastSelectedIndex = (-m_canvasY + (y - getY())) / getOptionHeight(); - + m_lastSelectedIndex = (-m_canvasY + (y - getY())) / getOptionHeight(); + const CListBoxDataItem *item = (const CListBoxDataItem*)m_options.getItem(m_lastSelectedIndex); @@ -637,7 +637,7 @@ void CListBox::onDoubleClick(nxgl_coord_t x, nxgl_coord_t y) { // Calculate which option was clicked - int newSelectedIndex = (-m_canvasY + (y - getY())) / getOptionHeight(); + int newSelectedIndex = (-m_canvasY + (y - getY())) / getOptionHeight(); // Double-click - select the item exclusively diff --git a/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx b/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx index 0ef1b2d25..22a9323bb 100644 --- a/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx +++ b/NxWidgets/libnxwidgets/src/clistboxdataitem.cxx @@ -1,114 +1,114 @@ -/****************************************************************************
- * NxWidgets/libnxwidgets/src/clistboxdataitem.cxx
- *
- * 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, NxWidgets, nor the names of its contributors
- * me 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.
- *
- ****************************************************************************
- *
- * Portions of this package derive from Woopsi (http://woopsi.org/) and
- * portions are original efforts. It is difficult to determine at this
- * point what parts are original efforts and which parts derive from Woopsi.
- * However, in any event, the work of Antony Dzeryn will be acknowledged
- * in most NxWidget files. Thanks Antony!
- *
- * Copyright (c) 2007-2011, Antony Dzeryn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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 <stdint.h>
-#include <stdbool.h>
-
-#include "cwidgetcontrol.hxx"
-#include "clistboxdataitem.hxx"
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Method Implementations
- ****************************************************************************/
-
-using namespace NXWidgets;
-
-/**
- * Constructor.
- *
- * @param text The text to display in the item.
- * @param value The value of the item.
- * @param normalTextColor Color to draw the text with when not selected.
- * @param normalBackColor Color to draw the background with when not selected.
- * @param selectedTextColor Color to draw the text with when selected.
- * @param selectedBackColor Color to draw the background with when selected.
- */
-
-CListBoxDataItem::CListBoxDataItem(const CNxString& text, const uint32_t value,
- const nxwidget_pixel_t normalTextColor,
- const nxwidget_pixel_t normalBackColor,
- const nxwidget_pixel_t selectedTextColor,
- const nxwidget_pixel_t selectedBackColor)
-: CListDataItem(text, value)
-{
- m_normalTextColor = normalTextColor;
- m_normalBackColor = normalBackColor;
- m_selectedTextColor = selectedTextColor;
- m_selectedBackColor = selectedBackColor;
-}
+/**************************************************************************** + * NxWidgets/libnxwidgets/src/clistboxdataitem.cxx + * + * 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, NxWidgets, nor the names of its contributors + * me 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in most NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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 <stdint.h> +#include <stdbool.h> + +#include "cwidgetcontrol.hxx" +#include "clistboxdataitem.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Method Implementations + ****************************************************************************/ + +using namespace NXWidgets; + +/** + * Constructor. + * + * @param text The text to display in the item. + * @param value The value of the item. + * @param normalTextColor Color to draw the text with when not selected. + * @param normalBackColor Color to draw the background with when not selected. + * @param selectedTextColor Color to draw the text with when selected. + * @param selectedBackColor Color to draw the background with when selected. + */ + +CListBoxDataItem::CListBoxDataItem(const CNxString& text, const uint32_t value, + const nxwidget_pixel_t normalTextColor, + const nxwidget_pixel_t normalBackColor, + const nxwidget_pixel_t selectedTextColor, + const nxwidget_pixel_t selectedBackColor) +: CListDataItem(text, value) +{ + m_normalTextColor = normalTextColor; + m_normalBackColor = normalBackColor; + m_selectedTextColor = selectedTextColor; + m_selectedBackColor = selectedBackColor; +} diff --git a/NxWidgets/libnxwidgets/src/clistdata.cxx b/NxWidgets/libnxwidgets/src/clistdata.cxx index 3b9601fc0..7a02e3e37 100644 --- a/NxWidgets/libnxwidgets/src/clistdata.cxx +++ b/NxWidgets/libnxwidgets/src/clistdata.cxx @@ -1,462 +1,462 @@ -/****************************************************************************
- * NxWidgets/libnxwidgets/src/clistdata.cxx
- *
- * 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, NxWidgets, nor the names of its contributors
- * me 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.
- *
- ****************************************************************************
- *
- * Portions of this package derive from Woopsi (http://woopsi.org/) and
- * portions are original efforts. It is difficult to determine at this
- * point what parts are original efforts and which parts derive from Woopsi.
- * However, in any event, the work of Antony Dzeryn will be acknowledged
- * in most NxWidget files. Thanks Antony!
- *
- * Copyright (c) 2007-2011, Antony Dzeryn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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 <stdint.h>
-#include <stdbool.h>
-#include <cstring>
-
-#include "clistdata.hxx"
-#include "ilistdataeventhandler.hxx"
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Method Implementations
- ****************************************************************************/
-
-using namespace NXWidgets;
-
-/**
- * Constructor.
- */
-
-CListData::CListData(void)
-{
- m_allowMultipleSelections = true;
- m_sortInsertedItems = false;
-}
-
-/**
- * Destructor.
- */
-
-CListData::~CListData(void)
-{
- removeAllItems();
-}
-
-/**
- * Add a new item.
- *
- * @param text Text to show in the option.
- * @param value The value of the option.
- */
-
-void CListData::addItem(const CNxString &text, const uint32_t value)
-{
- // Create new option
-
- addItem(new CListDataItem(text, value));
-}
-
-/**
- * Add an existing item. CListData becomes the owner of the option and will delete it
- * when the list is deleted.
- *
- * @param item The item to add.
- */
-
-void CListData::addItem(CListDataItem *item)
-{
- // Determine insert type
-
- if (m_sortInsertedItems)
- {
- // Sorted insert
-
- m_items.insert(getSortedInsertionIndex(item), item);
- }
- else
- {
- // Append
-
- m_items.push_back(item);
- }
-
- raiseDataChangedEvent();
-}
-
-/**
- * Remove an item by its index.
- *
- * @param index The index of the option to remove.
- */
-
-void CListData::removeItem(const int index)
-{
- // Bounds check
-
- if (index < m_items.size())
- {
- // Delete the option
-
- delete m_items[index];
-
- // Erase the option from the list
-
- m_items.erase(index);
- raiseDataChangedEvent();
- }
-}
-
-/**
- * Select an item by its index.
- *
- * @param index The index of the item to select.
- */
-
-void CListData::selectItem(const int index)
-{
- setItemSelected(index, true);
-}
-
-/**
- * Deselect an item by its index.
- *
- * @param index The index of the item to select.
- */
-
-void CListData::deselectItem(const int index)
-{
- setItemSelected(index, false);
-}
-
-/**
- * Remove all items.
- */
-
-void CListData::removeAllItems(void)
-{
- // Delete all option data
-
- for (int i = 0; i < m_items.size(); i++)
- {
- delete m_items[i];
- }
-
- m_items.clear();
- raiseDataChangedEvent();
-}
-
-/**
- * Get the selected index. Returns -1 if nothing is selected. If more than one
- * item is selected, the index of the first selected item is returned.
- *
- * @return The selected index.
- */
-
-const int CListData::getSelectedIndex(void) const
-{
- // Get the first selected index
-
- for (int i = 0; i < m_items.size(); i++)
- {
- if (m_items[i]->isSelected())
- {
- return i;
- }
- }
-
- return -1;
-}
-
-/**
- * Sets the selected index. Specify -1 to select nothing. Resets any
- * other selected items to deselected.
- *
- * @param index The selected index.
- */
-
-void CListData::setSelectedIndex(const int index)
-{
- setItemSelected(index, true);
-}
-
-/**
- * Get the selected item. Returns NULL if nothing is selected.
- *
- * @return The selected option.
- */
-
-const CListDataItem *CListData::getSelectedItem(void) const
-{
- // Get the first selected option
-
- int index = getSelectedIndex();
- if (index > -1)
- {
- return m_items[index];
- }
- return (CListDataItem *)NULL;
-}
-
-/**
- * Sort the items using their compareTo() methods.
- */
-
-void CListData::sort(void)
-{
- quickSort(0, m_items.size() - 1);
- raiseDataChangedEvent();
-}
-
-/**
- * Select all items. Does nothing if the list does not allow
- * multiple selections.
- */
-
-void CListData::selectAllItems(void)
-{
- if (m_allowMultipleSelections)
- {
- for (int i = 0; i < m_items.size(); i++)
- {
- m_items[i]->setSelected(true);
- }
-
- raiseSelectionChangedEvent();
- }
-}
-
-/**
- * Deselect all items.
- */
-
-void CListData::deselectAllItems(void)
-{
- for (int i = 0; i < m_items.size(); i++)
- {
- m_items[i]->setSelected(false);
- }
-
- raiseSelectionChangedEvent();
-}
-
-/**
- * Select or deselect an item by its index. Does not deselect any
- * other selected items. Set index to -1 to select nothing.
- *
- * @param index The index of the item to select.
- * @param selected True to select the item, false to deselect it.
- */
-
-void CListData::setItemSelected(const int index, bool selected)
-{
- // Deselect old options if we're making an option selected and
- // we're not a multiple list
-
- if (((!m_allowMultipleSelections) || (index == -1)) && (selected))
- {
- for (int i = 0; i < m_items.size(); i++)
- {
- m_items[i]->setSelected(false);
- }
- }
-
- // Select or deselect the new option
-
- if ((index > -1) && (index < m_items.size()))
- {
- m_items[index]->setSelected(selected);
- }
-
- raiseSelectionChangedEvent();
-}
-
-/**
- * Remove an event handler.
- *
- * @param eventHandler The event handler to remove.
- */
-
-void CListData::removeListDataEventHandler(IListDataEventHandler *eventHandler)
-{
- for (int i = 0; i < m_listDataEventhandlers.size(); ++i)
- {
- if (m_listDataEventhandlers.at(i) == eventHandler)
- {
- m_listDataEventhandlers.erase(i);
- return;
- }
- }
-}
-
-/**
- * Quick sort the items using their compareTo() methods.
- *
- * @param start The index to start sorting at.
- * @param end The index to stop sorting at.
- */
-
-void CListData::quickSort(const int start, const int end)
-{
- if (end > start)
- {
- int left = start;
- int right = end;
-
- CListDataItem *pivot = m_items[(start + end) >> 1];
-
- do
- {
- while ((pivot->compareTo(m_items[left]) > 0) && (left < end))
- {
- left++;
- }
-
- while ((pivot->compareTo(m_items[right]) < 0) && (right > start))
- {
- right--;
- }
-
- if (left > right)
- {
- break;
- }
-
- swapItems(left, right);
- left++;
- right--;
- }
- while (left <= right);
-
- quickSort(start, right);
- quickSort(left, end);
- }
-}
-
-/**
- * Swap the locations of two items in the array.
- *
- * @param index1 The index of the first item to swap.
- * @param index2 The index of the second item to swap.
- */
-
-void CListData::swapItems(const int index1, const int index2)
-{
- CListDataItem *tmp = m_items[index1];
- m_items[index1] = m_items[index2];
- m_items[index2] = tmp;
-}
-
-/**
- * Return the index that an item should be inserted at to maintain a sorted list of data.
- *
- * @param item The item to insert.
- * @return The index that the item should be imserted into at.
- */
-
-const int CListData::getSortedInsertionIndex(const CListDataItem *item) const
-{
- int i = 0;
-
- // Locate slot where new option should go
-
- while ((i < m_items.size()) && (item->compareTo(m_items[i]) > 0))
- {
- i++;
- }
- return i;
-}
-
-/**
- * Raise a data changed event.
- */
-
-void CListData::raiseDataChangedEvent(void)
-{
- CListDataEventArgs eventArgs(this);
-
- for (int i = 0; i < m_listDataEventhandlers.size(); ++i)
- {
- m_listDataEventhandlers.at(i)->handleListDataChangedEvent(eventArgs);
- }
-}
-
-/**
- * Raise a selection changed event.
- */
-
-void CListData::raiseSelectionChangedEvent(void)
-{
- CListDataEventArgs eventArgs(this);
-
- for (int i = 0; i < m_listDataEventhandlers.size(); ++i)
- {
- m_listDataEventhandlers.at(i)->handleListDataSelectionChangedEvent(eventArgs);
- }
-}
+/**************************************************************************** + * NxWidgets/libnxwidgets/src/clistdata.cxx + * + * 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, NxWidgets, nor the names of its contributors + * me 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in most NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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 <stdint.h> +#include <stdbool.h> +#include <cstring> + +#include "clistdata.hxx" +#include "ilistdataeventhandler.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Method Implementations + ****************************************************************************/ + +using namespace NXWidgets; + +/** + * Constructor. + */ + +CListData::CListData(void) +{ + m_allowMultipleSelections = true; + m_sortInsertedItems = false; +} + +/** + * Destructor. + */ + +CListData::~CListData(void) +{ + removeAllItems(); +} + +/** + * Add a new item. + * + * @param text Text to show in the option. + * @param value The value of the option. + */ + +void CListData::addItem(const CNxString &text, const uint32_t value) +{ + // Create new option + + addItem(new CListDataItem(text, value)); +} + +/** + * Add an existing item. CListData becomes the owner of the option and will delete it + * when the list is deleted. + * + * @param item The item to add. + */ + +void CListData::addItem(CListDataItem *item) +{ + // Determine insert type + + if (m_sortInsertedItems) + { + // Sorted insert + + m_items.insert(getSortedInsertionIndex(item), item); + } + else + { + // Append + + m_items.push_back(item); + } + + raiseDataChangedEvent(); +} + +/** + * Remove an item by its index. + * + * @param index The index of the option to remove. + */ + +void CListData::removeItem(const int index) +{ + // Bounds check + + if (index < m_items.size()) + { + // Delete the option + + delete m_items[index]; + + // Erase the option from the list + + m_items.erase(index); + raiseDataChangedEvent(); + } +} + +/** + * Select an item by its index. + * + * @param index The index of the item to select. + */ + +void CListData::selectItem(const int index) +{ + setItemSelected(index, true); +} + +/** + * Deselect an item by its index. + * + * @param index The index of the item to select. + */ + +void CListData::deselectItem(const int index) +{ + setItemSelected(index, false); +} + +/** + * Remove all items. + */ + +void CListData::removeAllItems(void) +{ + // Delete all option data + + for (int i = 0; i < m_items.size(); i++) + { + delete m_items[i]; + } + + m_items.clear(); + raiseDataChangedEvent(); +} + +/** + * Get the selected index. Returns -1 if nothing is selected. If more than one + * item is selected, the index of the first selected item is returned. + * + * @return The selected index. + */ + +const int CListData::getSelectedIndex(void) const +{ + // Get the first selected index + + for (int i = 0; i < m_items.size(); i++) + { + if (m_items[i]->isSelected()) + { + return i; + } + } + + return -1; +} + +/** + * Sets the selected index. Specify -1 to select nothing. Resets any + * other selected items to deselected. + * + * @param index The selected index. + */ + +void CListData::setSelectedIndex(const int index) +{ + setItemSelected(index, true); +} + +/** + * Get the selected item. Returns NULL if nothing is selected. + * + * @return The selected option. + */ + +const CListDataItem *CListData::getSelectedItem(void) const +{ + // Get the first selected option + + int index = getSelectedIndex(); + if (index > -1) + { + return m_items[index]; + } + return (CListDataItem *)NULL; +} + +/** + * Sort the items using their compareTo() methods. + */ + +void CListData::sort(void) +{ + quickSort(0, m_items.size() - 1); + raiseDataChangedEvent(); +} + +/** + * Select all items. Does nothing if the list does not allow + * multiple selections. + */ + +void CListData::selectAllItems(void) +{ + if (m_allowMultipleSelections) + { + for (int i = 0; i < m_items.size(); i++) + { + m_items[i]->setSelected(true); + } + + raiseSelectionChangedEvent(); + } +} + +/** + * Deselect all items. + */ + +void CListData::deselectAllItems(void) +{ + for (int i = 0; i < m_items.size(); i++) + { + m_items[i]->setSelected(false); + } + + raiseSelectionChangedEvent(); +} + +/** + * Select or deselect an item by its index. Does not deselect any + * other selected items. Set index to -1 to select nothing. + * + * @param index The index of the item to select. + * @param selected True to select the item, false to deselect it. + */ + +void CListData::setItemSelected(const int index, bool selected) +{ + // Deselect old options if we're making an option selected and + // we're not a multiple list + + if (((!m_allowMultipleSelections) || (index == -1)) && (selected)) + { + for (int i = 0; i < m_items.size(); i++) + { + m_items[i]->setSelected(false); + } + } + + // Select or deselect the new option + + if ((index > -1) && (index < m_items.size())) + { + m_items[index]->setSelected(selected); + } + + raiseSelectionChangedEvent(); +} + +/** + * Remove an event handler. + * + * @param eventHandler The event handler to remove. + */ + +void CListData::removeListDataEventHandler(IListDataEventHandler *eventHandler) +{ + for (int i = 0; i < m_listDataEventhandlers.size(); ++i) + { + if (m_listDataEventhandlers.at(i) == eventHandler) + { + m_listDataEventhandlers.erase(i); + return; + } + } +} + +/** + * Quick sort the items using their compareTo() methods. + * + * @param start The index to start sorting at. + * @param end The index to stop sorting at. + */ + +void CListData::quickSort(const int start, const int end) +{ + if (end > start) + { + int left = start; + int right = end; + + CListDataItem *pivot = m_items[(start + end) >> 1]; + + do + { + while ((pivot->compareTo(m_items[left]) > 0) && (left < end)) + { + left++; + } + + while ((pivot->compareTo(m_items[right]) < 0) && (right > start)) + { + right--; + } + + if (left > right) + { + break; + } + + swapItems(left, right); + left++; + right--; + } + while (left <= right); + + quickSort(start, right); + quickSort(left, end); + } +} + +/** + * Swap the locations of two items in the array. + * + * @param index1 The index of the first item to swap. + * @param index2 The index of the second item to swap. + */ + +void CListData::swapItems(const int index1, const int index2) +{ + CListDataItem *tmp = m_items[index1]; + m_items[index1] = m_items[index2]; + m_items[index2] = tmp; +} + +/** + * Return the index that an item should be inserted at to maintain a sorted list of data. + * + * @param item The item to insert. + * @return The index that the item should be imserted into at. + */ + +const int CListData::getSortedInsertionIndex(const CListDataItem *item) const +{ + int i = 0; + + // Locate slot where new option should go + + while ((i < m_items.size()) && (item->compareTo(m_items[i]) > 0)) + { + i++; + } + return i; +} + +/** + * Raise a data changed event. + */ + +void CListData::raiseDataChangedEvent(void) +{ + CListDataEventArgs eventArgs(this); + + for (int i = 0; i < m_listDataEventhandlers.size(); ++i) + { + m_listDataEventhandlers.at(i)->handleListDataChangedEvent(eventArgs); + } +} + +/** + * Raise a selection changed event. + */ + +void CListData::raiseSelectionChangedEvent(void) +{ + CListDataEventArgs eventArgs(this); + + for (int i = 0; i < m_listDataEventhandlers.size(); ++i) + { + m_listDataEventhandlers.at(i)->handleListDataSelectionChangedEvent(eventArgs); + } +} diff --git a/NxWidgets/libnxwidgets/src/clistdataitem.cxx b/NxWidgets/libnxwidgets/src/clistdataitem.cxx index 036cea61e..4be7d3005 100644 --- a/NxWidgets/libnxwidgets/src/clistdataitem.cxx +++ b/NxWidgets/libnxwidgets/src/clistdataitem.cxx @@ -1,128 +1,128 @@ -/****************************************************************************
- * NxWidgets/libnxwidgets/src/clistdataitem.cxx
- *
- * 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, NxWidgets, nor the names of its contributors
- * me 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.
- *
- ****************************************************************************
- *
- * Portions of this package derive from Woopsi (http://woopsi.org/) and
- * portions are original efforts. It is difficult to determine at this
- * point what parts are original efforts and which parts derive from Woopsi.
- * However, in any event, the work of Antony Dzeryn will be acknowledged
- * in most NxWidget files. Thanks Antony!
- *
- * Copyright (c) 2007-2011, Antony Dzeryn
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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 <stdint.h>
-#include <stdbool.h>
-
-#include "cwidgetcontrol.hxx"
-#include "clistdataitem.hxx"
-
-/****************************************************************************
- * Pre-Processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Method Implementations
- ****************************************************************************/
-
-using namespace NXWidgets;
-/**
- * Constructor.
- *
- * @param text The text to display in the item.
- * @param value The value of the item.
- */
-
-CListDataItem::CListDataItem(const CNxString &text, const uint32_t value)
-{
- m_text = text;
- m_value = value;
- m_isSelected = false;
-}
-
-/**
- * Destructor.
- */
-
-CListDataItem::~CListDataItem(void)
-{
-}
-
-/**
- * Compare the item with another. Comparison is based on the text of
- * the item. Returns 0 if the text in the two items is the same,
- * a value less than 0 if this item is less than the argument, and
- * a value greater than 0 if this item is greater than the argument.
- *
- * @param item An item to compare this object with.
- * @return 0 if the text in the two items is the same,
- * a value less than 0 if this item is less than the argument, and
- * a value greater than 0 if this item is greater than the argument.
- */
-
-int CListDataItem::compareTo(const CListDataItem *item) const
-{
- return m_text.compareTo(item->getText());
-}
+/**************************************************************************** + * NxWidgets/libnxwidgets/src/clistdataitem.cxx + * + * 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, NxWidgets, nor the names of its contributors + * me 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in most NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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 <stdint.h> +#include <stdbool.h> + +#include "cwidgetcontrol.hxx" +#include "clistdataitem.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Method Implementations + ****************************************************************************/ + +using namespace NXWidgets; +/** + * Constructor. + * + * @param text The text to display in the item. + * @param value The value of the item. + */ + +CListDataItem::CListDataItem(const CNxString &text, const uint32_t value) +{ + m_text = text; + m_value = value; + m_isSelected = false; +} + +/** + * Destructor. + */ + +CListDataItem::~CListDataItem(void) +{ +} + +/** + * Compare the item with another. Comparison is based on the text of + * the item. Returns 0 if the text in the two items is the same, + * a value less than 0 if this item is less than the argument, and + * a value greater than 0 if this item is greater than the argument. + * + * @param item An item to compare this object with. + * @return 0 if the text in the two items is the same, + * a value less than 0 if this item is less than the argument, and + * a value greater than 0 if this item is greater than the argument. + */ + +int CListDataItem::compareTo(const CListDataItem *item) const +{ + return m_text.compareTo(item->getText()); +} diff --git a/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx b/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx index df060f037..e7af8f23d 100644 --- a/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx +++ b/NxWidgets/libnxwidgets/src/cmultilinetextbox.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -472,7 +472,7 @@ void CMultiLineTextBox::handleKeyPressEvent(const CWidgetEventArgs &e) // Not modifier; append value insertTextAtCursor(key); - } + } } /** @@ -502,10 +502,10 @@ void CMultiLineTextBox::getCursorCoordinates(nxgl_coord_t &x, nxgl_coord_t &y) c // start of the line uint8_t cursorLineOffset = m_cursorPos - m_text->getLineStartIndex(cursorRow); - + CStringIterator *iterator = m_text->newStringIterator(); iterator->moveTo(m_text->getLineStartIndex(cursorRow)); - + // Sum the width of each char in the row to find the x coordinate for (int i = 0; i < cursorLineOffset; ++i) diff --git a/NxWidgets/libnxwidgets/src/cnxfont.cxx b/NxWidgets/libnxwidgets/src/cnxfont.cxx index 189cfb9e0..326dd5619 100644 --- a/NxWidgets/libnxwidgets/src/cnxfont.cxx +++ b/NxWidgets/libnxwidgets/src/cnxfont.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -150,14 +150,14 @@ nxgl_coord_t CNxFont::getStringWidth(const CNxString &text) const if (iter->moveToFirst()) { // moveToFirst returns true if there is at least one character - + do { // Add the width of the font bitmap for this character and // move the the next character nxwidget_char_t ch = iter->getChar(); - + width += getCharWidth(ch); } while (iter->moveToNext()); @@ -178,7 +178,7 @@ nxgl_coord_t CNxFont::getStringWidth(const CNxString &text) const * @param length The length of the substring in chars. * @return The width of the substring in pixels. */ - + nxgl_coord_t CNxFont::getStringWidth(const CNxString &text, int startIndex, int length) const { diff --git a/NxWidgets/libnxwidgets/src/cnxstring.cxx b/NxWidgets/libnxwidgets/src/cnxstring.cxx index 3ad3855b9..8548de636 100644 --- a/NxWidgets/libnxwidgets/src/cnxstring.cxx +++ b/NxWidgets/libnxwidgets/src/cnxstring.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -355,7 +355,7 @@ void CNxString::insert(const CNxString &text, int index) delete[] m_text; - // Swap pointers + // Swap pointers m_stringLength = newLength; m_text = newText; @@ -374,7 +374,7 @@ void CNxString::insert(const CNxString &text, int index) // Insert the additional text into the new string dest = &m_text[index]; - src = text.getCharArray(); + src = text.getCharArray(); for (int i = 0; i < text.getLength(); i++) { *dest++ = *src++; @@ -741,7 +741,7 @@ void CNxString::allocateMemory(int nChars, bool preserve) // Do we already have enough memory allocated to contain this new size? // If so, we can avoid deallocating and allocating new memory by re-using the old - + if (nBytesNeeded > m_allocatedSize) { // Not enough space in existing memory; allocate new memory diff --git a/NxWidgets/libnxwidgets/src/cnxtimer.cxx b/NxWidgets/libnxwidgets/src/cnxtimer.cxx index d67cee6e8..d54981570 100644 --- a/NxWidgets/libnxwidgets/src/cnxtimer.cxx +++ b/NxWidgets/libnxwidgets/src/cnxtimer.cxx @@ -199,7 +199,7 @@ void CNxTimer::workQueueCallback(FAR void *arg) { This->start(); } - + // Raise the action event. This->m_widgetEventHandlers->raiseActionEvent(); diff --git a/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx b/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx index 725a368fa..3c336f06a 100644 --- a/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx +++ b/NxWidgets/libnxwidgets/src/cnxtoolbar.cxx @@ -184,7 +184,7 @@ bool CNxToolbar::getSize(FAR struct nxgl_size_s *pSize) * @param pPos The new position of the toolbar. * @return Always returns false. */ - + bool CNxToolbar::setPosition(FAR const struct nxgl_point_s *pPos) { return false; @@ -198,7 +198,7 @@ bool CNxToolbar::setPosition(FAR const struct nxgl_point_s *pPos) * @param pSize The new size of the toolbar. * @return Always returns false. */ - + bool CNxToolbar::setSize(FAR const struct nxgl_size_s *pSize) { return false; diff --git a/NxWidgets/libnxwidgets/src/cnxwidget.cxx b/NxWidgets/libnxwidgets/src/cnxwidget.cxx index 15ed501e6..4cf7b9b28 100644 --- a/NxWidgets/libnxwidgets/src/cnxwidget.cxx +++ b/NxWidgets/libnxwidgets/src/cnxwidget.cxx @@ -188,7 +188,7 @@ CNxWidget::CNxWidget(CWidgetControl *pWidgetControl, m_doubleClickBounds = DOUBLE_CLICK_BOUNDS; // Set border size to 1 line - + m_borderSize.top = 1; m_borderSize.right = 1; m_borderSize.bottom = 1; @@ -294,7 +294,7 @@ nxgl_coord_t CNxWidget::getRelativeY(void) const /** * Has the widget been marked for deletion? This function recurses up the widget * hierarchy and only returns true if all of the widgets in the ancestor - * chain are not deleted. + * chain are not deleted. * * Widgets marked for deletion are automatically deleted and should not be * interacted with. @@ -495,7 +495,7 @@ void CNxWidget::redraw(void) m_flags.erased = false; // Draw the children of the widget - + drawChildren(); } } @@ -555,7 +555,7 @@ void CNxWidget::close(void) m_flags.deleted = true; m_flags.drawingEnabled = false; - + // Unset clicked widget if necessary CNxWidget *clickedWidget = m_widgetControl->getClickedWidget(); @@ -680,7 +680,7 @@ bool CNxWidget::click(nxgl_coord_t x, nxgl_coord_t y) * @param y Y coordinate of the click. * @return True if the click is a double-click. */ - + bool CNxWidget::isDoubleClick(nxgl_coord_t x, nxgl_coord_t y) { // Check for a double-click @@ -858,7 +858,7 @@ bool CNxWidget::keyPress(nxwidget_char_t key) { return false; } - + // Raise keypress for this widget m_widgetEventHandlers->raiseKeyPressEvent(key); @@ -886,7 +886,7 @@ bool CNxWidget::cursorControl(ECursorControl control) { return false; } - + // Raise cursor control for this widget m_widgetEventHandlers->raiseCursorControlEvent(control); @@ -931,7 +931,7 @@ bool CNxWidget::focus(void) if (!hadFocus) { onFocus(); - + m_widgetEventHandlers->raiseFocusEvent(); return true; } @@ -967,7 +967,7 @@ bool CNxWidget::blur(void) if (hadFocus) { onBlur(); - + m_widgetEventHandlers->raiseBlurEvent(); return true; } @@ -1046,7 +1046,7 @@ bool CNxWidget::moveTo(nxgl_coord_t x, nxgl_coord_t y) } } } - + // Perform move if necessary if ((m_rect.getX() != x) || (m_rect.getY() != y)) diff --git a/NxWidgets/libnxwidgets/src/cnxwindow.cxx b/NxWidgets/libnxwidgets/src/cnxwindow.cxx index b38667d8d..046660774 100644 --- a/NxWidgets/libnxwidgets/src/cnxwindow.cxx +++ b/NxWidgets/libnxwidgets/src/cnxwindow.cxx @@ -61,7 +61,7 @@ using namespace NXWidgets; * * @param hNxServer Handle to the NX server. */ - + CNxWindow::CNxWindow(NXHANDLE hNxServer, CWidgetControl *pWidgetControl) : CCallback(pWidgetControl), m_hNxServer(hNxServer), m_hNxWindow(0), m_widgetControl(pWidgetControl) @@ -161,7 +161,7 @@ bool CNxWindow::getSize(FAR struct nxgl_size_s *pSize) * @param pPos The new position of the window. * @return True on success, false on any failure. */ - + bool CNxWindow::setPosition(FAR const struct nxgl_point_s *pPos) { // Set the window size and position @@ -175,7 +175,7 @@ bool CNxWindow::setPosition(FAR const struct nxgl_point_s *pPos) * @param pSize The new size of the window. * @return True on success, false on any failure. */ - + bool CNxWindow::setSize(FAR const struct nxgl_size_s *pSize) { // Set the window size diff --git a/NxWidgets/libnxwidgets/src/cprogressbar.cxx b/NxWidgets/libnxwidgets/src/cprogressbar.cxx index 5f29a3f7e..d76d42903 100644 --- a/NxWidgets/libnxwidgets/src/cprogressbar.cxx +++ b/NxWidgets/libnxwidgets/src/cprogressbar.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -117,7 +117,7 @@ CProgressBar::CProgressBar(CWidgetControl *pWidgetControl, } /** - * Set the value that of the progress bar. + * Set the value that of the progress bar. * * @param value The new value. */ @@ -159,7 +159,7 @@ void CProgressBar::drawContents(CGraphicsPort *port) // Calculate ratio of pixels to value range (max fractional value of 255) uint32_t ratio = ((uint32_t)rect.getWidth() << 8) / (uint32_t)(m_maximumValue - m_minimumValue); - + // Convert value using ratio, rounding up and shifting down int16_t barWidth = ((m_value * ratio) + 128) >> 8; @@ -167,7 +167,7 @@ void CProgressBar::drawContents(CGraphicsPort *port) // Draw filled region port->drawFilledRect(rect.getX(), rect.getY(), barWidth, rect.getHeight(), getHighlightColor()); - + // Draw unfilled background if (barWidth < rect.getWidth()) diff --git a/NxWidgets/libnxwidgets/src/cradiobutton.cxx b/NxWidgets/libnxwidgets/src/cradiobutton.cxx index 86ad4118f..a5680d5c6 100644 --- a/NxWidgets/libnxwidgets/src/cradiobutton.cxx +++ b/NxWidgets/libnxwidgets/src/cradiobutton.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx b/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx index b1d75f625..62c4f9aad 100644 --- a/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx +++ b/NxWidgets/libnxwidgets/src/cradiobuttongroup.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/crect.cxx b/NxWidgets/libnxwidgets/src/crect.cxx index 8e0ed2cd4..9ed2df830 100644 --- a/NxWidgets/libnxwidgets/src/crect.cxx +++ b/NxWidgets/libnxwidgets/src/crect.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -188,7 +188,7 @@ CRect fromCoordinates(nxgl_coord_t x1, nxgl_coord_t y1, * * @param x2 The x coordinate of the rect's bottom-right corner. */ - + void CRect::setX2(nxgl_coord_t x2) { // Ensure that x contains the smaller value diff --git a/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx b/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx index 1fb2518a5..a648f0533 100644 --- a/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx +++ b/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx @@ -304,7 +304,7 @@ bool CRlePaletteBitmap::skipPixels(nxgl_coord_t npixels) return true; } - + /** Seek to the beginning of the next row * * @return False if this was the last row of the image diff --git a/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx b/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx index 1ebf60324..083868f70 100644 --- a/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx +++ b/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx @@ -375,7 +375,7 @@ bool CScaledBitmap::cacheRows(unsigned int row) FAR uint8_t *saveRow = m_rowCache[0]; m_rowCache[0] = m_rowCache[1]; m_rowCache[1] = saveRow; - + // Save number of the first row that we have in the cache m_row = row; @@ -484,7 +484,7 @@ bool CScaledBitmap::scaleColor(FAR const struct rgbcolor_s &incolor1, * @param row - The pointer to the row in the row cache to use * @param column - The non-integer column offset * @param outcolor - The returned, interpolated color - * + * */ bool CScaledBitmap::rowColor(FAR uint8_t *row, b16_t column, diff --git a/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx b/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx index 13e33815d..236ab4594 100644 --- a/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx +++ b/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -91,7 +91,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Method Implementation ****************************************************************************/ @@ -115,7 +115,7 @@ using namespace NXWidgets; CScrollbarHorizontal::CScrollbarHorizontal(CWidgetControl *pWidgetControl, nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t width, nxgl_coord_t height, - CWidgetStyle* style) + CWidgetStyle* style) : CNxWidget(pWidgetControl, x, y, width, height, WIDGET_BORDERLESS, style) { m_buttonWidth = 10; @@ -263,7 +263,7 @@ void CScrollbarHorizontal::setPageSize(nxgl_coord_t pageSize) m_slider->setPageSize(pageSize); } -/** +/** * Process events fired by the grip. * * @param e The event details. diff --git a/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx b/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx index 76b5c5dec..e287b14f2 100644 --- a/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx +++ b/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -88,7 +88,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Method Implementation ****************************************************************************/ @@ -261,7 +261,7 @@ void CScrollbarVertical::setPageSize(nxgl_coord_t pageSize) m_slider->setPageSize(pageSize); } -/** +/** * Process events fired by the grip. * * @param e The event details. diff --git a/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx b/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx index e0d041d34..d397a98db 100644 --- a/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx +++ b/NxWidgets/libnxwidgets/src/cscrollinglistbox.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> diff --git a/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx b/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx index 2541bb572..c93d113a6 100644 --- a/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx +++ b/NxWidgets/libnxwidgets/src/cscrollingpanel.cxx @@ -216,9 +216,9 @@ void CScrollingPanel::scroll(int32_t dx, int32_t dy) m_canvasX += dx; // Move children but do not redraw. - + scrollChildren(dx, dy, false); - + if (revealedRects.size() > 0) { // Draw background to revealed sections @@ -234,7 +234,7 @@ void CScrollingPanel::scroll(int32_t dx, int32_t dy) port->drawFilledRect(rrect.getX(), rrect.getY(), rrect.getWidth(), rrect.getHeight(), getBackgroundColor()); - + // Check if any children intersect this region. // If it does, it should be redrawn. @@ -255,7 +255,7 @@ void CScrollingPanel::scroll(int32_t dx, int32_t dy) m_canvasY += dy; m_canvasX += dx; - + // Scroll all child widgets and redraw them scrollChildren(dx, dy, true); @@ -362,16 +362,16 @@ void CScrollingPanel::scrollChildren(int32_t dx, int32_t dy, bool do_redraw) { widget = m_children[i]; bool oldstate = widget->isDrawingEnabled(); - + if (!do_redraw) { widget->disableDrawing(); } - + widgetX = (widget->getX() - thisX) + dx; widgetY = (widget->getY() - thisY) + dy; widget->moveTo(widgetX, widgetY); - + if (!do_redraw && oldstate) { widget->enableDrawing(); diff --git a/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx b/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx index 4de63fdf6..f9f9beadc 100644 --- a/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx +++ b/NxWidgets/libnxwidgets/src/cscrollingtextbox.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -125,7 +125,7 @@ CScrollingTextBox::CScrollingTextBox(CWidgetControl *pWidgetControl, 0, 0, width - m_scrollbarWidth, height, text, flags, maxRows, &m_style); m_texbox->addWidgetEventHandler(this); - + // Create scrollbar CRect rect; diff --git a/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx b/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx index 2fe47556c..4462d6e74 100644 --- a/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx +++ b/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -155,14 +155,14 @@ void CSliderHorizontal::setValueWithBitshift(const int32_t value) { CRect rect; getClientRect(rect); - + // Can the grip move? if ((rect.getWidth() > m_grip->getWidth()) && (m_maximumValue != m_minimumValue)) { int32_t newValue = value; int32_t maxValue = getPhysicalMaximumValueWithBitshift(); - + // Limit to max/min values if (newValue > maxValue) @@ -174,13 +174,13 @@ void CSliderHorizontal::setValueWithBitshift(const int32_t value) { newValue = m_minimumValue << 16; } - + uint32_t scrollRatio = newValue / m_contentSize; int32_t newGripX = m_gutterWidth * scrollRatio; newGripX += newGripX & 0x8000; newGripX >>= 16; newGripX += rect.getX(); - + m_grip->moveTo(newGripX, rect.getY()); // Update stored value if necessary @@ -395,7 +395,7 @@ void CSliderHorizontal::resizeGrip(void) // height) of the gutter. Each position in the gutter needs to be // reduced in value. } - + m_grip->resize(gripSize, rect.getHeight()); } diff --git a/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx b/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx index aebdbf51d..25feaed78 100644 --- a/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx +++ b/NxWidgets/libnxwidgets/src/csliderhorizontalgrip.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> diff --git a/NxWidgets/libnxwidgets/src/cslidervertical.cxx b/NxWidgets/libnxwidgets/src/cslidervertical.cxx index 74d2d956b..9b9b0f91a 100644 --- a/NxWidgets/libnxwidgets/src/cslidervertical.cxx +++ b/NxWidgets/libnxwidgets/src/cslidervertical.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -156,14 +156,14 @@ void CSliderVertical::setValueWithBitshift(const int32_t value) { CRect rect; getClientRect(rect); - + // Can the grip move? if ((rect.getHeight() > m_grip->getHeight()) && (m_maximumValue != m_minimumValue)) { int32_t newValue = value; int32_t maxValue = getPhysicalMaximumValueWithBitshift(); - + // Limit to max/min values if (newValue > maxValue) @@ -175,13 +175,13 @@ void CSliderVertical::setValueWithBitshift(const int32_t value) { newValue = m_minimumValue << 16; } - + uint32_t scrollRatio = newValue / m_contentSize; int32_t newGripY = m_gutterHeight * scrollRatio; newGripY += newGripY & 0x8000; newGripY >>= 16; newGripY += rect.getY(); - + m_grip->moveTo(rect.getX(), newGripY); // Update stored value if necessary @@ -397,6 +397,6 @@ void CSliderVertical::resizeGrip(void) // height) of the gutter. Each position in the gutter needs to be // reduced in value. } - + m_grip->resize(rect.getWidth(), gripSize); } diff --git a/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx b/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx index 2ddf364e8..d1eb0177a 100644 --- a/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx +++ b/NxWidgets/libnxwidgets/src/csliderverticalgrip.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> diff --git a/NxWidgets/libnxwidgets/src/cstickybutton.cxx b/NxWidgets/libnxwidgets/src/cstickybutton.cxx index 76852eaf7..d9c2b0883 100644 --- a/NxWidgets/libnxwidgets/src/cstickybutton.cxx +++ b/NxWidgets/libnxwidgets/src/cstickybutton.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx b/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx index 05c9d8928..69dbd01f6 100644 --- a/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx +++ b/NxWidgets/libnxwidgets/src/cstickybuttonarray.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -51,7 +51,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * CStickyButtonArray Method Implementations ****************************************************************************/ @@ -221,7 +221,7 @@ void CStickyButtonArray::drawContents(CGraphicsPort *port) drawButton(port, m_stickyColumn, m_stickyRow, useClicked); } - // Do we draw just one button (due to click or release)? + // Do we draw just one button (due to click or release)? else if (m_redrawButton) { diff --git a/NxWidgets/libnxwidgets/src/cstringiterator.cxx b/NxWidgets/libnxwidgets/src/cstringiterator.cxx index 2327af38f..ed7cad704 100644 --- a/NxWidgets/libnxwidgets/src/cstringiterator.cxx +++ b/NxWidgets/libnxwidgets/src/cstringiterator.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -132,7 +132,7 @@ bool CStringIterator::moveToLast(void) int length = m_pString->getLength(); if (length > 0) { - m_pCurrentChar = m_pString->getCharArray() + length - 1; + m_pCurrentChar = m_pString->getCharArray() + length - 1; m_currentIndex = length - 1; return true; } @@ -154,7 +154,7 @@ bool CStringIterator::moveToNext(void) m_currentIndex++; return true; } - + return false; } diff --git a/NxWidgets/libnxwidgets/src/ctabpanel.cxx b/NxWidgets/libnxwidgets/src/ctabpanel.cxx index f1723fdba..1f1769e00 100644 --- a/NxWidgets/libnxwidgets/src/ctabpanel.cxx +++ b/NxWidgets/libnxwidgets/src/ctabpanel.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -51,7 +51,7 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * CTabPanel Method Implementations ****************************************************************************/ @@ -73,7 +73,7 @@ CTabPanel::CTabPanel(CWidgetControl *pWidgetControl, uint8_t numPages, 0); m_buttonbar->addWidgetEventHandler(this); this->addWidget(m_buttonbar); - + for (int i = 0; i < numPages; i++) { CNxWidget *tabpage = new CNxWidget(pWidgetControl, x, y + buttonHeight, @@ -83,7 +83,7 @@ CTabPanel::CTabPanel(CWidgetControl *pWidgetControl, uint8_t numPages, m_tabpages.push_back(tabpage); this->addWidget(tabpage); } - + // Activate the first page showPage(0); @@ -100,7 +100,7 @@ void CTabPanel::showPage(uint8_t index) { m_buttonbar->stickDown(index, 0); } - + for (int i = 0; i < m_tabpages.size(); i++) { if (i == index) diff --git a/NxWidgets/libnxwidgets/src/ctext.cxx b/NxWidgets/libnxwidgets/src/ctext.cxx index caa0c02e8..60b726ca3 100644 --- a/NxWidgets/libnxwidgets/src/ctext.cxx +++ b/NxWidgets/libnxwidgets/src/ctext.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -206,7 +206,7 @@ void CText::setLineSpacing(uint8_t lineSpacing) } /** - * Sets the pixel width of the text; text wider than + * Sets the pixel width of the text; text wider than * this will automatically wrap. * * @param width Maximum pixel width of the text. @@ -243,7 +243,7 @@ const int CText::getLineLength(const int lineNumber) const { return m_linePositions[lineNumber + 1] - m_linePositions[lineNumber]; } - + return getLength() - m_linePositions[lineNumber]; } @@ -258,11 +258,11 @@ const int CText::getLineLength(const int lineNumber) const const int CText::getLineTrimmedLength(const int lineNumber) const { nxgl_coord_t length = getLineLength(lineNumber); - + // Loop through string until the end CStringIterator *iterator = newStringIterator(); - + // Get char at the end of the line if (iterator->moveTo(m_linePositions[lineNumber] + length - 1)) @@ -280,7 +280,7 @@ const int CText::getLineTrimmedLength(const int lineNumber) const delete iterator; return length; } - + // May occur if data has been horribly corrupted somewhere delete iterator; @@ -336,7 +336,7 @@ void CText::stripTopLines(const int lines) // Get the start point of the text we want to keep nxgl_coord_t textStart = 0; - + for (int i = 0; i < lines; i++) { textStart += getLineLength(i); @@ -345,7 +345,7 @@ void CText::stripTopLines(const int lines) // Remove the characters from the start of the string to the found location remove(0, textStart); - + // Rewrap the text wrap(); @@ -375,12 +375,12 @@ void CText::wrap(int charIndex) int lineWidth; int breakIndex; bool endReached = false; - + if (m_linePositions.size() == 0) { charIndex = 0; } - + // If we're wrapping from an offset in the text, ensure that any existing data // after the offset gets removed @@ -399,7 +399,7 @@ void CText::wrap(int charIndex) { m_longestLines.pop_back(); } - + // If there are any longest line records remaining, update the text pixel width // The last longest line record will always be the last valid longest line as // the vector is sorted by length @@ -432,33 +432,33 @@ void CText::wrap(int charIndex) else { // Remove all wrapping data - + // Wipe the width variable m_textPixelWidth = 0; - + // Empty existing longest lines m_longestLines.clear(); - + // Empty existing line positions m_linePositions.clear(); - + // Push first line start into vector m_linePositions.push_back(0); } - + // Loop through string until the end CStringIterator *iterator = newStringIterator(); - + while (!endReached) { breakIndex = 0; lineWidth = 0; - + if (iterator->moveTo(pos)) { // Search for line breaks and valid breakpoints until we @@ -541,9 +541,9 @@ void CText::wrap(int charIndex) } } } - + delete breakIterator; - + // Add the start of the next line to the vector pos = breakIndex + 1; @@ -574,7 +574,7 @@ void CText::wrap(int charIndex) m_linePositions.push_back(pos); } } - + // Add marker indicating end of text // If we reached the end of the text, append the stopping point @@ -584,11 +584,11 @@ void CText::wrap(int charIndex) } delete iterator; - + // Calculate the total height of the text m_textPixelHeight = getLineCount() * (m_font->getHeight() + m_lineSpacing); - + // Ensure height is always at least one row if (m_textPixelHeight == 0) @@ -627,13 +627,13 @@ const int CText::getLineContainingCharIndex(const int index) const int bottom = 0; int top = m_linePositions.size() - 1; int mid; - + while (bottom <= top) { // Standard binary search mid = (bottom + top) >> 1; - + if (index < m_linePositions[mid]) { // Index is somewhere in the lower search space @@ -652,7 +652,7 @@ const int CText::getLineContainingCharIndex(const int index) const return mid; } - + // Check to see if we've moved past the line that contains the index // We have to do this because the index we're looking for can be within // a line; it isn't necessarily the start of a line (which is what is diff --git a/NxWidgets/libnxwidgets/src/ctextbox.cxx b/NxWidgets/libnxwidgets/src/ctextbox.cxx index 9c22a2bfa..d40776170 100644 --- a/NxWidgets/libnxwidgets/src/ctextbox.cxx +++ b/NxWidgets/libnxwidgets/src/ctextbox.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -280,7 +280,7 @@ void CTextBox::handleKeyPressEvent(const CWidgetEventArgs &e) // Not modifier; append value insertTextAtCursor(key); - } + } } /** @@ -389,7 +389,7 @@ void CTextBox::drawContents(CGraphicsPort *port) pos.y = m_align.y; // Calculate the cursor width - + struct nxgl_size_s size; size.w = getCursorWidth(); size.h = getFont()->getHeight(); @@ -402,7 +402,7 @@ void CTextBox::drawContents(CGraphicsPort *port) pos.x += rect.getX(); pos.y += rect.getY(); - + port->invert(pos.x, pos.y, size.w, size.h); } } @@ -454,13 +454,13 @@ void CTextBox::moveCursorToClickLocation(nxgl_coord_t x, nxgl_coord_t y) while (charX < clickX) { charX += getFont()->getCharWidth(iterator->getChar()); - + if (!iterator->moveToNext()) { break; } } - + int index = iterator->getIndex(); // Move back to the clicked character if we've moved past it @@ -553,13 +553,13 @@ const nxgl_coord_t CTextBox::getCursorXPos(void) const nxgl_coord_t cursorX = 0; CStringIterator *iterator = m_text.newStringIterator(); - + for (nxgl_coord_t i = 0; i < m_cursorPos; i++) { cursorX += getFont()->getCharWidth(iterator->getChar()); iterator->moveToNext(); } - + delete iterator; return cursorX; } @@ -598,7 +598,7 @@ void CTextBox::calculateTextPositionHorizontal(void) // ignore alignment and align left nxgl_coord_t stringWidth = getFont()->getStringWidth(m_text); - + // Add the width of a blank space to the width to ensure that we can // see the cursor @@ -606,10 +606,10 @@ void CTextBox::calculateTextPositionHorizontal(void) { stringWidth += getFont()->getCharWidth(' '); } - + CRect rect; getClientRect(rect); - + // Use alignment options if cursor is hidden or string is smaller // than textbox diff --git a/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx b/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx index bebab89aa..840778bac 100644 --- a/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx +++ b/NxWidgets/libnxwidgets/src/cwidgeteventhandlerlist.cxx @@ -97,7 +97,7 @@ using namespace NXWidgets; * * @param widget The owning widget. */ - + CWidgetEventHandlerList::CWidgetEventHandlerList(CNxWidget *widget) { m_widget = widget; @@ -120,7 +120,7 @@ bool CWidgetEventHandlerList::isEnabled(void) const * all events raised by this object. * @param eventHandler A pointer to the event handler. */ - + void CWidgetEventHandlerList::addWidgetEventHandler(CWidgetEventHandler *eventHandler) { // Prevent insertion if the handler already exists @@ -529,7 +529,7 @@ void CWidgetEventHandlerList::raiseScrollEvent(nxgl_coord_t vX, nxgl_coord_t vY) if (isEnabled()) { CWidgetEventArgs e(m_widget, 0, 0, vX, vY, KEY_CODE_NONE); - + for (int i = 0; i < m_widgetEventHandlers.size(); i++) { m_widgetEventHandlers.at(i)->handleScrollEvent(e); diff --git a/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx b/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx index dfdabcf08..79dd97d7f 100644 --- a/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx +++ b/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx @@ -57,7 +57,7 @@ using namespace NXWidgets; * all events raised by this object. * @param eventHandler A pointer to the event handler. */ - + void CWindowEventHandlerList::addWindowEventHandler(CWindowEventHandler *eventHandler) { // Make sure that the event handler does not already exist @@ -93,7 +93,7 @@ void CWindowEventHandlerList::removeWindowEventHandler(CWindowEventHandler *even /** * Return the index to the window event handler. */ - + bool CWindowEventHandlerList::findWindowEventHandler(CWindowEventHandler *eventHandler, int &index) { for (int i = 0; i < m_eventHandlers.size(); ++i) diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx index c304e9281..fc200e099 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowdown.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx index ae322dcc2..143a1c3c1 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowleft.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx index 5969527d9..3f8b833f2 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowright.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx b/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx index 9ea10bde2..b1543266c 100644 --- a/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_arrowup.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_backspace.cxx b/NxWidgets/libnxwidgets/src/glyph_backspace.cxx index 86c1fb93a..5271b0f66 100644 --- a/NxWidgets/libnxwidgets/src/glyph_backspace.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_backspace.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_capslock.cxx b/NxWidgets/libnxwidgets/src/glyph_capslock.cxx index d9e00bc78..b61d4dbdb 100644 --- a/NxWidgets/libnxwidgets/src/glyph_capslock.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_capslock.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx b/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx index 96dbec9c1..48011b1c8 100644 --- a/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_checkboxmu.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx b/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx index 7be6a50b2..8222bee84 100644 --- a/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_checkboxoff.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx b/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx index b598e60ce..255c88449 100644 --- a/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_checkboxon.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_control.cxx b/NxWidgets/libnxwidgets/src/glyph_control.cxx index cd2e373e6..4cb8432c1 100644 --- a/NxWidgets/libnxwidgets/src/glyph_control.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_control.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_cycle.cxx b/NxWidgets/libnxwidgets/src/glyph_cycle.cxx index 7983d4566..ff3476ff4 100644 --- a/NxWidgets/libnxwidgets/src/glyph_cycle.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_cycle.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx b/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx index 6a38b45cb..9eb5746e3 100644 --- a/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_nxlogo160x160.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -1048,7 +1048,7 @@ static const struct SRlePaletteBitmapEntry g_nuttxRleEntries[] = { 77, 0}, { 76, 0}, { 1, 5}, { 4, 4}, { 1, 5}, { 78, 0} /* Row 159 */ }; - + #elif CONFIG_NXWIDGETS_BPP == 16 static const struct SRlePaletteBitmapEntry g_nuttxRleEntries[] = @@ -3443,7 +3443,7 @@ const struct SRlePaletteBitmap NXWidgets::g_nuttxBitmap160x160 = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - 160, // width - Width in pixels + 160, // width - Width in pixels 160, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_nuttxLut, // Index 0: Unselected LUT diff --git a/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx b/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx index c83ab7159..b2e1eaad5 100644 --- a/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -1033,7 +1033,7 @@ const struct SRlePaletteBitmap NXWidgets::g_nuttxBitmap320x320 = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_nuttxLut, // Index 0: Unselected LUT diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx index 1359c5b96..896129ffc 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonmu.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx index 422db01a9..7b832a15a 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonoff.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx b/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx index 04ca63757..919d11c75 100644 --- a/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_radiobuttonon.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_return.cxx b/NxWidgets/libnxwidgets/src/glyph_return.cxx index 3989ff89a..951d3a9d0 100644 --- a/NxWidgets/libnxwidgets/src/glyph_return.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_return.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx b/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx index e55e0686a..dab46122f 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screendepthdown.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx b/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx index e693b7488..9826bc4ce 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screendepthup.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx b/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx index 488315d7a..d3e45504d 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screenflipdown.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx b/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx index 7d45dbf93..bb928e262 100644 --- a/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_screenflipup.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_shift.cxx b/NxWidgets/libnxwidgets/src/glyph_shift.cxx index c1cce8686..77b0d186b 100644 --- a/NxWidgets/libnxwidgets/src/glyph_shift.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_shift.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx b/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx index 62d6ee718..bd176f412 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowclose.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx b/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx index b85ed053a..5bf616047 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowdepthdown.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx b/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx index 056e27c1c..584b51b21 100644 --- a/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_windowdepthup.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/libnxwidgets/src/singletons.cxx b/NxWidgets/libnxwidgets/src/singletons.cxx index fc5d919e6..7af47eb92 100644 --- a/NxWidgets/libnxwidgets/src/singletons.cxx +++ b/NxWidgets/libnxwidgets/src/singletons.cxx @@ -70,7 +70,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -131,7 +131,7 @@ void NXWidgets::instantiateSingletons(void) if (!g_defaultWidgetStyle) { // Create the singleton - + g_defaultWidgetStyle = new CWidgetStyle(); // Default colors diff --git a/NxWidgets/nxwm/COPYING b/NxWidgets/nxwm/COPYING index 4273aec03..0f9a9db15 100644 --- a/NxWidgets/nxwm/COPYING +++ b/NxWidgets/nxwm/COPYING @@ -7,14 +7,14 @@ described in license (below). Please feel free to contact me if you have any licensing concerns. /************************************************************************* - * + * * 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 + * 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 @@ -28,13 +28,13 @@ have any licensing concerns. * 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 + * 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 + * 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. * diff --git a/NxWidgets/nxwm/include/capplicationwindow.hxx b/NxWidgets/nxwm/include/capplicationwindow.hxx index 46e4e90d2..64e9e907c 100644 --- a/NxWidgets/nxwm/include/capplicationwindow.hxx +++ b/NxWidgets/nxwm/include/capplicationwindow.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include "cnxtkwindow.hxx" diff --git a/NxWidgets/nxwm/include/cfullscreenwindow.hxx b/NxWidgets/nxwm/include/cfullscreenwindow.hxx index 70da9fee5..992d49789 100644 --- a/NxWidgets/nxwm/include/cfullscreenwindow.hxx +++ b/NxWidgets/nxwm/include/cfullscreenwindow.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include "cnxwindow.hxx" diff --git a/NxWidgets/nxwm/include/chexcalculator.hxx b/NxWidgets/nxwm/include/chexcalculator.hxx index 69ee37624..fc5de07b6 100644 --- a/NxWidgets/nxwm/include/chexcalculator.hxx +++ b/NxWidgets/nxwm/include/chexcalculator.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/nxwm/include/ckeyboard.hxx b/NxWidgets/nxwm/include/ckeyboard.hxx index 8f16bd506..7036472fb 100644 --- a/NxWidgets/nxwm/include/ckeyboard.hxx +++ b/NxWidgets/nxwm/include/ckeyboard.hxx @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ - + #ifndef __INCLUDE_CKEYBOARD_HXX #define __INCLUDE_CKEYBOARD_HXX diff --git a/NxWidgets/nxwm/include/cmediaplayer.hxx b/NxWidgets/nxwm/include/cmediaplayer.hxx index 81656c761..11ed3a0c1 100644 --- a/NxWidgets/nxwm/include/cmediaplayer.hxx +++ b/NxWidgets/nxwm/include/cmediaplayer.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/nxwm/include/cnxconsole.hxx b/NxWidgets/nxwm/include/cnxconsole.hxx index f33f1182d..52fee386a 100644 --- a/NxWidgets/nxwm/include/cnxconsole.hxx +++ b/NxWidgets/nxwm/include/cnxconsole.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> diff --git a/NxWidgets/nxwm/include/cstartwindow.hxx b/NxWidgets/nxwm/include/cstartwindow.hxx index 250d5068c..e7337ead6 100644 --- a/NxWidgets/nxwm/include/cstartwindow.hxx +++ b/NxWidgets/nxwm/include/cstartwindow.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <debug.h> @@ -91,7 +91,7 @@ namespace NxWM */ extern FAR const char *g_startWindowMqName; - + /** * This class is the the start window application. */ @@ -104,7 +104,7 @@ namespace NxWM /** * This structure represents an application and its associated icon image */ - + struct SStartWindowSlot { IApplicationFactory *app; /**< A reference to the icon */ diff --git a/NxWidgets/nxwm/include/ctouchscreen.hxx b/NxWidgets/nxwm/include/ctouchscreen.hxx index 396400204..c40fcb12c 100644 --- a/NxWidgets/nxwm/include/ctouchscreen.hxx +++ b/NxWidgets/nxwm/include/ctouchscreen.hxx @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************/ - + #ifndef __INCLUDE_CTOUCHSCREEN_HXX #define __INCLUDE_CTOUCHSCREEN_HXX @@ -162,7 +162,7 @@ namespace NxWM { // Set the capture flag. m_calibrated must also be set to get to normal // mode where touchscreen data is forwarded to NX. - + m_enabled = enable; } diff --git a/NxWidgets/nxwm/include/iapplication.hxx b/NxWidgets/nxwm/include/iapplication.hxx index 456202c6d..882c5e6ea 100644 --- a/NxWidgets/nxwm/include/iapplication.hxx +++ b/NxWidgets/nxwm/include/iapplication.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include "cnxstring.hxx" diff --git a/NxWidgets/nxwm/include/iapplicationwindow.hxx b/NxWidgets/nxwm/include/iapplicationwindow.hxx index 60f1b332c..733cb72b2 100644 --- a/NxWidgets/nxwm/include/iapplicationwindow.hxx +++ b/NxWidgets/nxwm/include/iapplicationwindow.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include "inxwindow.hxx" @@ -92,7 +92,7 @@ namespace NxWM * may be a contained, framed window or and unframed, fullscreen window. */ - class IApplicationWindow + class IApplicationWindow { public: /** diff --git a/NxWidgets/nxwm/include/nxwmglyphs.hxx b/NxWidgets/nxwm/include/nxwmglyphs.hxx index 799ca61b6..523130349 100644 --- a/NxWidgets/nxwm/include/nxwmglyphs.hxx +++ b/NxWidgets/nxwm/include/nxwmglyphs.hxx @@ -39,7 +39,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include "nxconfig.hxx" diff --git a/NxWidgets/nxwm/src/chexcalculator.cxx b/NxWidgets/nxwm/src/chexcalculator.cxx index eeb0b1d1d..dc42de0c0 100644 --- a/NxWidgets/nxwm/src/chexcalculator.cxx +++ b/NxWidgets/nxwm/src/chexcalculator.cxx @@ -92,9 +92,9 @@ namespace NxWM KEY_PLUS, // Additions // Special operations - + KEY_EQUAL, // Equal/Enter key - + KEY_DECIMAL, // Decimal mode KEY_HEXADECIMAL, // Hexadecimal mode @@ -247,7 +247,7 @@ CHexCalculator::CHexCalculator(CTaskbar *taskbar, CApplicationWindow *window) CHexCalculator::~CHexCalculator(void) { - // Destroy widgets + // Destroy widgets if (m_text) { @@ -598,7 +598,7 @@ void CHexCalculator::labelKeypad(void) { label = ""; } - + // Set the text in the label m_keypad->setText(i, j, label); @@ -848,7 +848,7 @@ void CHexCalculator::handleActionEvent(const NXWidgets::CWidgetEventArgs &e) break; // Special operations - + case KEY_EQUAL: // Equal/Enter key { // Is there a high precedence operation? @@ -877,7 +877,7 @@ void CHexCalculator::handleActionEvent(const NXWidgets::CWidgetEventArgs &e) result = true; } break; - + case KEY_DECIMAL: // Decimal mode { if (m_hexMode) diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx index 3a506cb4b..e78e91631 100644 --- a/NxWidgets/nxwm/src/cnxconsole.cxx +++ b/NxWidgets/nxwm/src/cnxconsole.cxx @@ -311,7 +311,7 @@ void CNxConsole::stop(void) // Calling task_delete() will also invoke the on_exit() handler. We se // m_pid = -1 before calling task_delete() to let the on_exit() handler, // CNxConsole::exitHandler(), know that it should not do anything - + pid_t pid = m_pid; m_pid = -1; @@ -319,7 +319,7 @@ void CNxConsole::stop(void) task_delete(pid); } - + // Destroy the NX console device if (m_nxcon) diff --git a/NxWidgets/nxwm/src/ctouchscreen.cxx b/NxWidgets/nxwm/src/ctouchscreen.cxx index 8bf570f74..f05f29ebd 100644 --- a/NxWidgets/nxwm/src/ctouchscreen.cxx +++ b/NxWidgets/nxwm/src/ctouchscreen.cxx @@ -108,7 +108,7 @@ CTouchscreen::CTouchscreen(NXWidgets::CNxServer *server, struct nxgl_size_s *win // Use the default touch data buffer m_touch = &m_sample; - + // Initialize the m_waitSem semaphore so that any waits for data will block sem_init(&m_waitSem, 0, 0); @@ -138,7 +138,7 @@ CTouchscreen::~CTouchscreen(void) } // Destroy the semaphores that we created. - + sem_destroy(&m_waitSem); } @@ -209,10 +209,10 @@ void CTouchscreen::setCalibrationData(const struct SCalibrationData &caldata) // Save a copy of the calibration data m_calibData = caldata; - + // Note that we have calibration data. Data will now be scaled and forwarded // to NX (unless we are still in cpature mode) - + m_calibrated = true; // Wake up the listener thread so that it will use our buffer diff --git a/NxWidgets/nxwm/src/glyph_calculator.cxx b/NxWidgets/nxwm/src/glyph_calculator.cxx index 9bb3f690d..e8f5376d3 100644 --- a/NxWidgets/nxwm/src/glyph_calculator.cxx +++ b/NxWidgets/nxwm/src/glyph_calculator.cxx @@ -36,7 +36,7 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -181,7 +181,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calculatorBitmap = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_calculatorNormalLut, // Index 0: Unselected LUT diff --git a/NxWidgets/nxwm/src/glyph_calibration.cxx b/NxWidgets/nxwm/src/glyph_calibration.cxx index df169f556..3a9a30806 100644 --- a/NxWidgets/nxwm/src/glyph_calibration.cxx +++ b/NxWidgets/nxwm/src/glyph_calibration.cxx @@ -36,7 +36,7 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -188,7 +188,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_calibrationNormalLut, // Index 0: Unselected LUT diff --git a/NxWidgets/nxwm/src/glyph_cmd.cxx b/NxWidgets/nxwm/src/glyph_cmd.cxx index 373d8ad5e..cc8b8dca3 100644 --- a/NxWidgets/nxwm/src/glyph_cmd.cxx +++ b/NxWidgets/nxwm/src/glyph_cmd.cxx @@ -36,7 +36,7 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -171,7 +171,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_cmdBitmap = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_cmdNormalLut, // Index 0: Unselected LUT diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx index 31feb268f..bf228e0b2 100644 --- a/NxWidgets/nxwm/src/glyph_minimize.cxx +++ b/NxWidgets/nxwm/src/glyph_minimize.cxx @@ -36,7 +36,7 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -169,7 +169,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_minimizeNormalLut, // Index 0: Unselected LUT diff --git a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx index 011f892a2..38da35844 100644 --- a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx +++ b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx @@ -70,14 +70,14 @@ using namespace NxWM; static const NXWidgets::nxwidget_pixel_t palette[BITMAP_PALETTESIZE] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250), - MKRGB(224,234,244), MKRGB( 69, 80,149), MKRGB(127,169,239), MKRGB(152,174,207), + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250), + MKRGB(224,234,244), MKRGB( 69, 80,149), MKRGB(127,169,239), MKRGB(152,174,207), }; static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255), - MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255), + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255), + MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255), }; /* Bitmap definition for the "Play" button */ @@ -93,35 +93,35 @@ static const NXWidgets::SRlePaletteBitmapEntry play_bitmap[] = { 5, 0}, { 6, 3}, { 9, 6}, { 7, 3}, { 5, 0}, /* Row 6 */ { 4, 0}, { 1, 2}, { 22, 3}, { 1, 2}, { 4, 0}, /* Row 7 */ { 3, 0}, { 1, 5}, { 23, 3}, { 1, 2}, { 1, 5}, { 3, 0}, /* Row 8 */ - { 3, 0}, { 3, 2}, { 5, 3}, { 1, 6}, { 13, 3}, { 4, 2}, + { 3, 0}, { 3, 2}, { 5, 3}, { 1, 6}, { 13, 3}, { 4, 2}, { 3, 0}, /* Row 9 */ - { 2, 0}, { 1, 5}, { 6, 2}, { 2, 3}, { 2, 4}, { 1, 6}, + { 2, 0}, { 1, 5}, { 6, 2}, { 2, 3}, { 2, 4}, { 1, 6}, { 9, 3}, { 6, 2}, { 1, 5}, { 2, 0}, /* Row 10 */ - { 2, 0}, { 1, 5}, { 8, 2}, { 1, 7}, { 3, 4}, { 1, 6}, + { 2, 0}, { 1, 5}, { 8, 2}, { 1, 7}, { 3, 4}, { 1, 6}, { 2, 2}, { 1, 3}, { 10, 2}, { 1, 5}, { 2, 0}, /* Row 11 */ - { 1, 0}, { 4, 5}, { 6, 2}, { 1, 7}, { 4, 4}, { 1, 7}, + { 1, 0}, { 4, 5}, { 6, 2}, { 1, 7}, { 4, 4}, { 1, 7}, { 1, 3}, { 8, 2}, { 4, 5}, { 2, 0}, /* Row 12 */ - { 1, 0}, { 7, 5}, { 3, 2}, { 1, 7}, { 6, 4}, { 1, 7}, + { 1, 0}, { 7, 5}, { 3, 2}, { 1, 7}, { 6, 4}, { 1, 7}, { 3, 2}, { 8, 5}, { 2, 0}, /* Row 13 */ - { 1, 0}, { 9, 5}, { 1, 2}, { 1, 7}, { 8, 4}, { 1, 7}, + { 1, 0}, { 9, 5}, { 1, 2}, { 1, 7}, { 8, 4}, { 1, 7}, { 8, 5}, { 1, 1}, { 1, 5}, { 1, 0}, /* Row 14 */ - { 1, 0}, { 4, 1}, { 6, 5}, { 1, 7}, { 10, 4}, { 1, 7}, + { 1, 0}, { 4, 1}, { 6, 5}, { 1, 7}, { 10, 4}, { 1, 7}, { 3, 5}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 15 */ - { 1, 0}, { 8, 1}, { 2, 5}, { 1, 7}, { 10, 4}, { 1, 7}, + { 1, 0}, { 8, 1}, { 2, 5}, { 1, 7}, { 10, 4}, { 1, 7}, { 7, 1}, { 1, 5}, { 1, 0}, /* Row 16 */ - { 1, 0}, { 10, 1}, { 1, 7}, { 9, 4}, { 1, 5}, { 8, 1}, + { 1, 0}, { 10, 1}, { 1, 7}, { 9, 4}, { 1, 5}, { 8, 1}, { 1, 5}, { 1, 0}, /* Row 17 */ - { 1, 0}, { 10, 1}, { 1, 7}, { 7, 4}, { 1, 5}, { 10, 1}, + { 1, 0}, { 10, 1}, { 1, 7}, { 7, 4}, { 1, 5}, { 10, 1}, { 2, 0}, /* Row 18 */ - { 1, 0}, { 1, 5}, { 9, 1}, { 1, 7}, { 5, 4}, { 1, 7}, + { 1, 0}, { 1, 5}, { 9, 1}, { 1, 7}, { 5, 4}, { 1, 7}, { 12, 1}, { 2, 0}, /* Row 19 */ - { 2, 0}, { 9, 1}, { 1, 7}, { 4, 4}, { 1, 5}, { 13, 1}, + { 2, 0}, { 9, 1}, { 1, 7}, { 4, 4}, { 1, 5}, { 13, 1}, { 2, 0}, /* Row 20 */ - { 2, 0}, { 9, 1}, { 1, 7}, { 2, 4}, { 1, 7}, { 1, 2}, + { 2, 0}, { 9, 1}, { 1, 7}, { 2, 4}, { 1, 7}, { 1, 2}, { 13, 1}, { 1, 5}, { 2, 0}, /* Row 21 */ - { 2, 0}, { 1, 5}, { 8, 1}, { 1, 7}, { 1, 4}, { 1, 5}, + { 2, 0}, { 1, 5}, { 8, 1}, { 1, 7}, { 1, 4}, { 1, 5}, { 6, 2}, { 9, 1}, { 3, 0}, /* Row 22 */ - { 3, 0}, { 7, 1}, { 1, 2}, { 1, 5}, { 10, 2}, { 6, 1}, + { 3, 0}, { 7, 1}, { 1, 2}, { 1, 5}, { 10, 2}, { 6, 1}, { 1, 5}, { 3, 0}, /* Row 23 */ { 4, 0}, { 4, 1}, { 16, 2}, { 4, 1}, { 4, 0}, /* Row 24 */ { 4, 0}, { 1, 5}, { 2, 1}, { 18, 2}, { 2, 1}, { 5, 0}, /* Row 25 */ @@ -158,45 +158,45 @@ static const NXWidgets::SRlePaletteBitmapEntry pause_bitmap[] = { 4, 0}, { 1, 2}, { 22, 3}, { 1, 2}, { 4, 0}, /* Row 7 */ { 3, 0}, { 1, 5}, { 23, 3}, { 1, 2}, { 1, 5}, { 3, 0}, /* Row 8 */ { 3, 0}, { 3, 2}, { 19, 3}, { 4, 2}, { 3, 0}, /* Row 9 */ - { 2, 0}, { 1, 5}, { 5, 2}, { 2, 3}, { 1, 6}, { 3, 4}, - { 3, 3}, { 1, 7}, { 2, 4}, { 1, 7}, { 2, 3}, { 6, 2}, + { 2, 0}, { 1, 5}, { 5, 2}, { 2, 3}, { 1, 6}, { 3, 4}, + { 3, 3}, { 1, 7}, { 2, 4}, { 1, 7}, { 2, 3}, { 6, 2}, { 1, 5}, { 2, 0}, /* Row 10 */ - { 2, 0}, { 1, 5}, { 7, 2}, { 1, 7}, { 3, 4}, { 1, 7}, - { 1, 2}, { 1, 3}, { 4, 4}, { 1, 3}, { 7, 2}, { 1, 5}, + { 2, 0}, { 1, 5}, { 7, 2}, { 1, 7}, { 3, 4}, { 1, 7}, + { 1, 2}, { 1, 3}, { 4, 4}, { 1, 3}, { 7, 2}, { 1, 5}, { 2, 0}, /* Row 11 */ - { 1, 0}, { 4, 5}, { 5, 2}, { 1, 7}, { 3, 4}, { 1, 7}, - { 1, 2}, { 1, 3}, { 4, 4}, { 1, 6}, { 4, 2}, { 4, 5}, + { 1, 0}, { 4, 5}, { 5, 2}, { 1, 7}, { 3, 4}, { 1, 7}, + { 1, 2}, { 1, 3}, { 4, 4}, { 1, 6}, { 4, 2}, { 4, 5}, { 2, 0}, /* Row 12 */ - { 1, 0}, { 8, 5}, { 1, 2}, { 1, 7}, { 3, 4}, { 1, 7}, - { 1, 2}, { 1, 5}, { 4, 4}, { 1, 5}, { 1, 2}, { 7, 5}, + { 1, 0}, { 8, 5}, { 1, 2}, { 1, 7}, { 3, 4}, { 1, 7}, + { 1, 2}, { 1, 5}, { 4, 4}, { 1, 5}, { 1, 2}, { 7, 5}, { 2, 0}, /* Row 13 */ - { 1, 0}, { 9, 5}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 2}, + { 1, 0}, { 9, 5}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 2}, { 1, 5}, { 4, 4}, { 8, 5}, { 1, 1}, { 1, 5}, { 1, 0}, /* Row 14 */ - { 1, 0}, { 4, 1}, { 5, 5}, { 1, 7}, { 3, 4}, { 1, 7}, + { 1, 0}, { 4, 1}, { 5, 5}, { 1, 7}, { 3, 4}, { 1, 7}, { 2, 5}, { 4, 4}, { 5, 5}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 15 */ - { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 2, 5}, + { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 2, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 1, 5}, { 1, 0}, /* Row 16 */ - { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, + { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 1, 5}, { 1, 0}, /* Row 17 */ - { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, + { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 2, 0}, /* Row 18 */ - { 1, 0}, { 1, 5}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, + { 1, 0}, { 1, 5}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 2, 0}, /* Row 19 */ - { 2, 0}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, + { 2, 0}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 2, 0}, /* Row 20 */ - { 2, 0}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, + { 2, 0}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1}, { 1, 2}, { 4, 4}, { 1, 5}, { 7, 1}, { 1, 5}, { 2, 0}, /* Row 21 */ - { 2, 0}, { 1, 5}, { 7, 1}, { 1, 7}, { 3, 4}, { 1, 6}, + { 2, 0}, { 1, 5}, { 7, 1}, { 1, 7}, { 3, 4}, { 1, 6}, { 1, 1}, { 1, 2}, { 4, 4}, { 1, 2}, { 7, 1}, { 3, 0}, /* Row 22 */ - { 3, 0}, { 7, 1}, { 1, 2}, { 3, 6}, { 4, 2}, { 2, 6}, + { 3, 0}, { 7, 1}, { 1, 2}, { 3, 6}, { 4, 2}, { 2, 6}, { 2, 2}, { 6, 1}, { 1, 5}, { 3, 0}, /* Row 23 */ { 4, 0}, { 4, 1}, { 16, 2}, { 4, 1}, { 4, 0}, /* Row 24 */ { 4, 0}, { 1, 5}, { 2, 1}, { 18, 2}, { 2, 1}, { 5, 0}, /* Row 25 */ - { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2}, + { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2}, { 1, 5}, { 5, 0}, /* Row 26 */ - { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5}, + { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5}, { 4, 2}, { 7, 0}, /* Row 27 */ - { 8, 0}, { 3, 2}, { 4, 2}, { 2, 2}, { 4, 2}, { 2, 2}, + { 8, 0}, { 3, 2}, { 4, 2}, { 2, 2}, { 4, 2}, { 2, 2}, { 1, 5}, { 8, 0}, /* Row 28 */ { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 3, 2}, { 10, 0}, /* Row 29 */ { 12, 0}, { 8, 2}, { 12, 0}, /* Row 30 */ @@ -222,7 +222,7 @@ static const NXWidgets::SRlePaletteBitmapEntry rew_bitmap[] = // { 14, 0}, { 3, 4}, { 1, 7}, { 14, 0}, /* Row 1 */ { 14, 0}, { 4, 7}, { 14, 0}, /* Row 1 */ { 10, 0}, { 12, 7}, { 10, 0}, /* Row 2 */ - { 8, 0}, { 1, 7}, { 3, 6}, { 8, 7}, + { 8, 0}, { 1, 7}, { 3, 6}, { 8, 7}, { 3, 6}, { 1, 7}, { 8, 0}, /* Row 3 */ { 7, 0}, { 7, 6}, { 3, 7}, { 8, 6}, { 7, 0}, /* Row 4 */ { 6, 0}, { 3, 3}, { 13, 6}, { 4, 3}, { 6, 0}, /* Row 5 */ @@ -230,46 +230,46 @@ static const NXWidgets::SRlePaletteBitmapEntry rew_bitmap[] = { 4, 0}, { 23, 3}, { 1, 2}, { 4, 0}, /* Row 7 */ { 3, 0}, { 1, 5}, { 23, 3}, { 1, 2}, { 1, 5}, { 3, 0}, /* Row 8 */ { 3, 0}, { 3, 2}, { 18, 3}, { 5, 2}, { 3, 0}, /* Row 9 */ - { 2, 0}, { 1, 5}, { 5, 2}, { 6, 3}, { 1, 6}, { 7, 3}, + { 2, 0}, { 1, 5}, { 5, 2}, { 6, 3}, { 1, 6}, { 7, 3}, { 2, 2}, { 2, 6}, { 3, 2}, { 1, 5}, { 2, 0}, /* Row 10 */ - { 2, 0}, { 1, 5}, { 9, 2}, { 1, 6}, { 2, 4}, { 1, 3}, - { 1, 2}, { 2, 3}, { 3, 2}, { 1, 6}, { 2, 4}, { 1, 6}, + { 2, 0}, { 1, 5}, { 9, 2}, { 1, 6}, { 2, 4}, { 1, 3}, + { 1, 2}, { 2, 3}, { 3, 2}, { 1, 6}, { 2, 4}, { 1, 6}, { 3, 2}, { 1, 5}, { 2, 0}, /* Row 11 */ - { 1, 0}, { 2, 5}, { 7, 2}, { 1, 6}, { 4, 4}, { 1, 3}, - { 4, 2}, { 1, 3}, { 1, 7}, { 3, 4}, { 1, 7}, { 3, 2}, + { 1, 0}, { 2, 5}, { 7, 2}, { 1, 6}, { 4, 4}, { 1, 3}, + { 4, 2}, { 1, 3}, { 1, 7}, { 3, 4}, { 1, 7}, { 3, 2}, { 1, 5}, { 2, 0}, /* Row 12 */ - { 1, 0}, { 5, 5}, { 2, 2}, { 1, 5}, { 1, 7}, { 5, 4}, - { 1, 5}, { 3, 2}, { 1, 7}, { 5, 4}, { 1, 7}, { 1, 2}, + { 1, 0}, { 5, 5}, { 2, 2}, { 1, 5}, { 1, 7}, { 5, 4}, + { 1, 5}, { 3, 2}, { 1, 7}, { 5, 4}, { 1, 7}, { 1, 2}, { 3, 5}, { 2, 0}, /* Row 13 */ - { 1, 0}, { 6, 5}, { 1, 7}, { 7, 4}, { 1, 5}, { 1, 2}, - { 1, 7}, { 7, 4}, { 1, 7}, { 3, 5}, { 1, 1}, { 1, 5}, + { 1, 0}, { 6, 5}, { 1, 7}, { 7, 4}, { 1, 5}, { 1, 2}, + { 1, 7}, { 7, 4}, { 1, 7}, { 3, 5}, { 1, 1}, { 1, 5}, { 1, 0}, /* Row 14 */ - { 1, 0}, { 4, 1}, { 1, 7}, { 9, 4}, { 1, 7}, { 9, 4}, + { 1, 0}, { 4, 1}, { 1, 7}, { 9, 4}, { 1, 7}, { 9, 4}, { 1, 7}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 15 */ - { 1, 0}, { 4, 1}, { 1, 5}, { 9, 4}, { 1, 7}, { 9, 4}, + { 1, 0}, { 4, 1}, { 1, 5}, { 9, 4}, { 1, 7}, { 9, 4}, { 1, 5}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 16 */ - { 1, 0}, { 6, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 1, 1}, + { 1, 0}, { 6, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 1, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 17 */ - { 1, 0}, { 8, 1}, { 1, 7}, { 5, 4}, { 1, 5}, { 3, 1}, + { 1, 0}, { 8, 1}, { 1, 7}, { 5, 4}, { 1, 5}, { 3, 1}, { 1, 7}, { 5, 4}, { 1, 5}, { 4, 1}, { 2, 0}, /* Row 18 */ - { 1, 0}, { 1, 5}, { 8, 1}, { 1, 5}, { 4, 4}, { 1, 5}, + { 1, 0}, { 1, 5}, { 8, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 4, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 4, 1}, { 2, 0}, /* Row 19 */ - { 2, 0}, { 10, 1}, { 1, 7}, { 2, 4}, { 1, 2}, { 6, 1}, + { 2, 0}, { 10, 1}, { 1, 7}, { 2, 4}, { 1, 2}, { 6, 1}, { 1, 7}, { 2, 4}, { 1, 5}, { 4, 1}, { 2, 0}, /* Row 20 */ - { 2, 0}, { 11, 1}, { 1, 5}, { 1, 4}, { 1, 2}, { 7, 1}, + { 2, 0}, { 11, 1}, { 1, 5}, { 1, 4}, { 1, 2}, { 7, 1}, { 1, 5}, { 1, 7}, { 1, 5}, { 3, 1}, { 1, 5}, { 2, 0}, /* Row 21 */ - { 2, 0}, { 1, 5}, { 9, 1}, { 1, 2}, { 1, 1}, { 6, 2}, + { 2, 0}, { 1, 5}, { 9, 1}, { 1, 2}, { 1, 1}, { 6, 2}, { 9, 1}, { 3, 0}, /* Row 22 */ { 3, 0}, { 7, 1}, { 12, 2}, { 6, 1}, { 1, 5}, { 3, 0}, /* Row 23 */ { 4, 0}, { 5, 1}, { 14, 2}, { 5, 1}, { 4, 0}, /* Row 24 */ { 4, 0}, { 1, 5}, { 2, 1}, { 18, 2}, { 2, 1}, { 5, 0}, /* Row 25 */ - { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2}, + { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2}, { 1, 5}, { 5, 0}, /* Row 26 */ - { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5}, + { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5}, { 4, 2}, { 7, 0}, /* Row 27 */ - { 8, 0}, { 3, 2}, { 3, 2}, { 4, 2}, { 3, 2}, { 2, 2}, + { 8, 0}, { 3, 2}, { 3, 2}, { 4, 2}, { 3, 2}, { 2, 2}, { 1, 5}, { 8, 0}, /* Row 28 */ - { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 2, 2}, { 1, 5}, + { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 2, 2}, { 1, 5}, { 10, 0}, /* Row 29 */ { 12, 0}, { 3, 2}, { 2, 2}, { 3, 2}, { 12, 0}, /* Row 30 */ { 32, 0}, /* Row 31 */ @@ -293,7 +293,7 @@ static const NXWidgets::SRlePaletteBitmapEntry fwd_bitmap[] = { 32, 0}, /* Row 0 */ { 14, 0}, { 4, 7}, { 14, 0}, /* Row 1 */ { 10, 0}, { 12, 7}, { 10, 0}, /* Row 2 */ - { 8, 0}, { 1, 7}, { 3, 6}, { 8, 7}, + { 8, 0}, { 1, 7}, { 3, 6}, { 8, 7}, { 3, 6}, { 1, 7}, { 8, 0}, /* Row 3 */ { 7, 0}, { 7, 6}, { 3, 7}, { 8, 6}, { 7, 0}, /* Row 4 */ { 6, 0}, { 3, 3}, { 13, 6}, { 4, 3}, { 6, 0}, /* Row 5 */ @@ -301,47 +301,47 @@ static const NXWidgets::SRlePaletteBitmapEntry fwd_bitmap[] = { 4, 0}, { 1, 2}, { 22, 3}, { 1, 2}, { 4, 0}, /* Row 7 */ { 3, 0}, { 1, 5}, { 23, 3}, { 1, 2}, { 1, 5}, { 3, 0}, /* Row 8 */ { 3, 0}, { 3, 2}, { 19, 3}, { 4, 2}, { 3, 0}, /* Row 9 */ - { 2, 0}, { 1, 5}, { 3, 2}, { 2, 6}, { 2, 2}, { 7, 3}, + { 2, 0}, { 1, 5}, { 3, 2}, { 2, 6}, { 2, 2}, { 7, 3}, { 1, 6}, { 5, 3}, { 6, 2}, { 1, 5}, { 2, 0}, /* Row 10 */ - { 2, 0}, { 1, 5}, { 3, 2}, { 1, 7}, { 2, 4}, { 1, 3}, - { 2, 2}, { 3, 3}, { 1, 2}, { 1, 6}, { 2, 4}, { 1, 6}, + { 2, 0}, { 1, 5}, { 3, 2}, { 1, 7}, { 2, 4}, { 1, 3}, + { 2, 2}, { 3, 3}, { 1, 2}, { 1, 6}, { 2, 4}, { 1, 6}, { 9, 2}, { 1, 5}, { 2, 0}, /* Row 11 */ - { 1, 0}, { 2, 5}, { 3, 2}, { 1, 7}, { 3, 4}, { 1, 7}, - { 5, 2}, { 1, 6}, { 4, 4}, { 1, 5}, { 7, 2}, { 1, 5}, + { 1, 0}, { 2, 5}, { 3, 2}, { 1, 7}, { 3, 4}, { 1, 7}, + { 5, 2}, { 1, 6}, { 4, 4}, { 1, 5}, { 7, 2}, { 1, 5}, { 2, 0}, /* Row 12 */ - { 1, 0}, { 4, 5}, { 1, 2}, { 1, 7}, { 5, 4}, { 1, 7}, - { 3, 2}, { 1, 6}, { 5, 4}, { 1, 7}, { 1, 5}, { 2, 2}, + { 1, 0}, { 4, 5}, { 1, 2}, { 1, 7}, { 5, 4}, { 1, 7}, + { 3, 2}, { 1, 6}, { 5, 4}, { 1, 7}, { 1, 5}, { 2, 2}, { 4, 5}, { 2, 0}, /* Row 13 */ - { 1, 0}, { 1, 5}, { 1, 1}, { 2, 5}, { 1, 1}, { 1, 7}, - { 7, 4}, { 1, 7}, { 1, 2}, { 1, 5}, { 7, 4}, { 1, 7}, + { 1, 0}, { 1, 5}, { 1, 1}, { 2, 5}, { 1, 1}, { 1, 7}, + { 7, 4}, { 1, 7}, { 1, 2}, { 1, 5}, { 7, 4}, { 1, 7}, { 4, 5}, { 1, 1}, { 1, 5}, { 1, 0}, /* Row 14 */ - { 1, 0}, { 5, 1}, { 1, 7}, { 9, 4}, { 1, 7}, { 9, 4}, + { 1, 0}, { 5, 1}, { 1, 7}, { 9, 4}, { 1, 7}, { 9, 4}, { 1, 5}, { 3, 1}, { 1, 5}, { 1, 0}, /* Row 15 */ - { 1, 0}, { 5, 1}, { 1, 7}, { 8, 4}, { 2, 7}, { 8, 4}, + { 1, 0}, { 5, 1}, { 1, 7}, { 8, 4}, { 2, 7}, { 8, 4}, { 1, 7}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 16 */ - { 1, 0}, { 5, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 1, 1}, + { 1, 0}, { 5, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 1, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 5, 1}, { 1, 5}, { 1, 0}, /* Row 17 */ - { 1, 0}, { 5, 1}, { 1, 5}, { 5, 4}, { 1, 7}, { 3, 1}, + { 1, 0}, { 5, 1}, { 1, 5}, { 5, 4}, { 1, 7}, { 3, 1}, { 1, 5}, { 5, 4}, { 1, 7}, { 7, 1}, { 2, 0}, /* Row 18 */ - { 1, 0}, { 1, 5}, { 4, 1}, { 1, 5}, { 3, 4}, { 1, 7}, - { 1, 2}, { 4, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, + { 1, 0}, { 1, 5}, { 4, 1}, { 1, 5}, { 3, 4}, { 1, 7}, + { 1, 2}, { 4, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 2, 0}, /* Row 19 */ - { 2, 0}, { 4, 1}, { 1, 5}, { 2, 4}, { 1, 5}, { 6, 1}, + { 2, 0}, { 4, 1}, { 1, 5}, { 2, 4}, { 1, 5}, { 6, 1}, { 1, 5}, { 2, 4}, { 1, 7}, { 10, 1}, { 2, 0}, /* Row 20 */ - { 2, 0}, { 4, 1}, { 2, 7}, { 8, 1}, { 1, 5}, { 1, 4}, + { 2, 0}, { 4, 1}, { 2, 7}, { 8, 1}, { 1, 5}, { 1, 4}, { 1, 2}, { 10, 1}, { 1, 5}, { 2, 0}, /* Row 21 */ - { 2, 0}, { 1, 5}, { 9, 1}, { 6, 2}, { 1, 1}, { 1, 2}, + { 2, 0}, { 1, 5}, { 9, 1}, { 6, 2}, { 1, 1}, { 1, 2}, { 9, 1}, { 3, 0}, /* Row 22 */ { 3, 0}, { 7, 1}, { 12, 2}, { 6, 1}, { 1, 5}, { 3, 0}, /* Row 23 */ { 4, 0}, { 5, 1}, { 14, 2}, { 5, 1}, { 4, 0}, /* Row 24 */ { 4, 0}, { 1, 5}, { 2, 1}, { 18, 2}, { 2, 1}, { 5, 0}, /* Row 25 */ - { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2}, + { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2}, { 1, 5}, { 5, 0}, /* Row 26 */ - { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5}, + { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5}, { 4, 2}, { 7, 0}, /* Row 27 */ - { 8, 0}, { 3, 2}, { 3, 2}, { 4, 2}, { 3, 2}, { 2, 2}, + { 8, 0}, { 3, 2}, { 3, 2}, { 4, 2}, { 3, 2}, { 2, 2}, { 1, 5}, { 8, 0}, /* Row 28 */ - { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 2, 2}, { 1, 5}, + { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 2, 2}, { 1, 5}, { 10, 0}, /* Row 29 */ { 12, 0}, { 3, 2}, { 2, 2}, { 3, 2}, { 12, 0}, /* Row 30 */ { 32, 0}, /* Row 31 */ @@ -367,7 +367,7 @@ static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] = { 3, 0}, { 5, 3}, { 6, 6}, { 5, 3}, { 3, 0}, /* Row 4 */ { 3, 0}, { 16, 3}, { 3, 0}, /* Row 5 */ { 2, 0}, { 2, 2}, { 13, 3}, { 3, 2}, { 2, 0}, /* Row 6 */ - { 1, 0}, { 1, 5}, { 4, 2}, { 10, 3}, { 4, 2}, { 1, 5}, + { 1, 0}, { 1, 5}, { 4, 2}, { 10, 3}, { 4, 2}, { 1, 5}, { 1, 0}, /* Row 7 */ { 1, 0}, { 2, 5}, { 15, 2}, { 3, 5}, { 1, 0}, /* Row 8 */ { 1, 0}, { 5, 5}, { 10, 2}, { 5, 5}, { 1, 0}, /* Row 9 */ @@ -376,7 +376,7 @@ static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] = { 1, 0}, { 20, 1}, { 1, 0}, /* Row 12 */ { 1, 0}, { 20, 1}, { 1, 0}, /* Row 13 */ { 1, 0}, { 19, 1}, { 1, 5}, { 1, 0}, /* Row 14 */ - { 1, 0}, { 1, 5}, { 7, 1}, { 1, 5}, { 4, 2}, { 6, 1}, + { 1, 0}, { 1, 5}, { 7, 1}, { 1, 5}, { 4, 2}, { 6, 1}, { 2, 0}, /* Row 15 */ { 2, 0}, { 5, 1}, { 8, 2}, { 4, 1}, { 1, 5}, { 2, 0}, /* Row 16 */ { 3, 0}, { 2, 1}, { 12, 2}, { 2, 1}, { 3, 0}, /* Row 17 */ diff --git a/NxWidgets/nxwm/src/glyph_nsh.cxx b/NxWidgets/nxwm/src/glyph_nsh.cxx index 213db54dd..efa83f7ed 100644 --- a/NxWidgets/nxwm/src/glyph_nsh.cxx +++ b/NxWidgets/nxwm/src/glyph_nsh.cxx @@ -36,7 +36,7 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -205,7 +205,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_nshBitmap = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_nshLut, // Index 0: Unselected LUT diff --git a/NxWidgets/nxwm/src/glyph_play24x24.cxx b/NxWidgets/nxwm/src/glyph_play24x24.cxx index ffe389fc5..c96ef0b03 100644 --- a/NxWidgets/nxwm/src/glyph_play24x24.cxx +++ b/NxWidgets/nxwm/src/glyph_play24x24.cxx @@ -36,7 +36,7 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -248,7 +248,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap24x24 = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_playNormalLut, // Index 0: Unselected LUT diff --git a/NxWidgets/nxwm/src/glyph_start.cxx b/NxWidgets/nxwm/src/glyph_start.cxx index ce1bf6a2c..2fd7b3cd1 100644 --- a/NxWidgets/nxwm/src/glyph_start.cxx +++ b/NxWidgets/nxwm/src/glyph_start.cxx @@ -36,7 +36,7 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -206,7 +206,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_startBitmap = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_startLut, // Index 0: Unselected LUT diff --git a/NxWidgets/nxwm/src/glyph_stop.cxx b/NxWidgets/nxwm/src/glyph_stop.cxx index 74836e01d..d9436b5d8 100644 --- a/NxWidgets/nxwm/src/glyph_stop.cxx +++ b/NxWidgets/nxwm/src/glyph_stop.cxx @@ -36,7 +36,7 @@ /******************************************************************************************** * Included Files ********************************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> @@ -184,7 +184,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_stopBitmap = CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NCOLUMNS, // width - Width in pixels BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) g_stopNormalLut, // Index 0: Unselected LUT diff --git a/NxWidgets/tools/bitmap_converter.py b/NxWidgets/tools/bitmap_converter.py index 714be3ae6..425ee048b 100755 --- a/NxWidgets/tools/bitmap_converter.py +++ b/NxWidgets/tools/bitmap_converter.py @@ -18,21 +18,21 @@ def get_palette(img, maxcolors = 255): def write_palette(outfile, palette): '''Write the palette (normal and hilight) to the output file.''' - + outfile.write('static const NXWidgets::nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =\n'); outfile.write('{\n') - + for i in range(0, len(palette), 4): outfile.write(' '); for r, g, b in palette[i:i+4]: outfile.write('MKRGB(%3d,%3d,%3d), ' % (r, g, b)) outfile.write('\n'); - + outfile.write('};\n\n') - + outfile.write('static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =\n'); outfile.write('{\n') - + for i in range(0, len(palette), 4): outfile.write(' '); for r, g, b in palette[i:i+4]: @@ -41,9 +41,9 @@ def write_palette(outfile, palette): b = min(255, b + 50) outfile.write('MKRGB(%3d,%3d,%3d), ' % (r, g, b)) outfile.write('\n'); - + outfile.write('};\n\n') - + def quantize(color, palette): '''Return the color index to closest match in the palette.''' @@ -53,7 +53,7 @@ def quantize(color, palette): # No exact match, search for the closest def distance(color2): return sum([(a - b)**2 for a, b in zip(color, color2)]) - + return palette.index(min(palette, key = distance)); def encode_row(img, palette, y): @@ -61,7 +61,7 @@ def encode_row(img, palette, y): entries = [] color = None repeats = 0 - + for x in range(0, img.size[0]): c = quantize(img.getpixel((x, y)), palette) if c == color and repeats < 255: @@ -69,13 +69,13 @@ def encode_row(img, palette, y): else: if color is not None: entries.append((repeats, color)) - + repeats = 1 color = c if color is not None: entries.append((repeats, color)) - + return entries def write_image(outfile, img, palette): @@ -83,7 +83,7 @@ def write_image(outfile, img, palette): outfile.write('static const NXWidgets::SRlePaletteBitmapEntry bitmap[] =\n'); outfile.write('{\n'); - + for y in range(0, img.size[1]): entries = encode_row(img, palette, y) row = "" @@ -91,17 +91,17 @@ def write_image(outfile, img, palette): if len(row) > 60: outfile.write(' ' + row + '\n') row = "" - + row += '{%3d, %3d}, ' % (r, c) - + row += ' ' * (73 - len(row)) outfile.write(' ' + row + '/* Row %d */\n' % y) - + outfile.write('};\n\n'); def write_descriptor(outfile, name): '''Write the public descriptor structure for the image.''' - + outfile.write('extern const struct NXWidgets::SRlePaletteBitmap g_%s =\n' % name) outfile.write('{\n') outfile.write(' CONFIG_NXWIDGETS_BPP,\n') @@ -112,19 +112,19 @@ def write_descriptor(outfile, name): outfile.write(' {palette, hilight_palette},\n') outfile.write(' bitmap\n') outfile.write('};\n') - + if __name__ == '__main__': import sys import os.path - + if len(sys.argv) != 3: print "Usage: bitmap_converter.py source.png output.cxx" sys.exit(1) - + img = Image.open(sys.argv[1]).convert("RGB") outfile = open(sys.argv[2], 'w') palette = get_palette(img) - + outfile.write( ''' /* Automatically NuttX bitmap file. */ @@ -142,7 +142,7 @@ if __name__ == '__main__': ) name = os.path.splitext(os.path.basename(sys.argv[1]))[0] - + write_palette(outfile, palette) write_image(outfile, img, palette) write_descriptor(outfile, name) |