sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This commit adds a calibration screen

Browse Source 
Squashed commit of the following:

    apps/graphics/twm4nx:  The calibration seems to be functional.  Needs more testing.

    apps/graphics/twm4nx:  Extend event handling to support receiving raw, uncalibaated touchscreen inputs.  This is needed for touchscreen calibration.

    apps/graphics/twm4nx:  Extend event handling to support shutting down of externally controlled windows.  This is need to end the calibration sequence.

    apps/graphics/twm4nx:  CCalibration now compiles okay, but is missing event handling logic for touchscreen input and for window termination.

    apps/graphics/twm4nx:  Move application-related files into different directories to separate them from the core Twm4Nx files.

    apps/graphics/twm4nx:  A little more progress on calibration display.

    app/graphics/twm4ndx:  Add files that will support a calibration display.  This initial commit is simply the calibration display from NxWM and is not hooked into the configuration or build systems.

    apps/graphics/twm4ndx:  Compile out cursor support if we are using a mouse
This commit is contained in:
Gregory Nutt 2019-05-20 11:01:46 -06:00
parent 73ab5e2750
commit a06b47394b
32 changed files with 2137 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/twm4nx/Kconfig
View File

@ -17,6 +17,8 @@ menuconfig GRAPHICS_TWM4NX
if GRAPHICS_TWM4NX
comment "Twm4Nx Core Configuration"
config TWM4NX_PROGNAME
string "Twm4Nx program name"
default "twm4nx"
@ -123,6 +125,15 @@ config TWM4NX_DEBUG
and CONFIG_DEBUG_ERROR (but not the corresponding
CONFIG_DEBUG_GRAPHICS_* settings)
comment "Twm4Nx Applications"
config TWM4NX_CALIBRATION
bool "Touchscreen"
default y
depends on TWM4NX_TOUCHSCREEN
---help---
Enable support for the touchscreen calibration display.
config TWM4NX_NXTERM
bool "NxTerm Window"
default y

6
graphics/twm4nx/Makefile
View File

@ -64,13 +64,17 @@ ifeq ($(CONFIG_TWM4NX_MOUSE),y)
CXXSRCS += twm4nx_cursor.cxx
endif
ifeq ($(CONFIG_TWM4NX_CALIBRATION),y)
CXXSRCS += ccalibration.cxx
endif
ifeq ($(CONFIG_TWM4NX_NXTERM),y)
CXXSRCS += cnxterm.cxx
endif
MAINSRC = ctwm4nx.cxx
VPATH = src
VPATH = src:apps
CONFIG_TWM4NX_PROGNAME ?= hello$(EXEEXT)
PROGNAME = $(CONFIG_TWM4NX_PROGNAME)

1390
graphics/twm4nx/apps/ccalibration.cxx Normal file
View File

File diff suppressed because it is too large Load Diff

12
graphics/twm4nx/src/cnxterm.cxx → graphics/twm4nx/apps/cnxterm.cxx
View File

@ -57,12 +57,13 @@
#include "graphics/nxglyphs.hxx"
#include "graphics/twm4nx/twm4nx_config.hxx"
#include "graphics/twm4nx/nxterm_config.hxx"
#include "graphics/twm4nx/ctwm4nx.hxx"
#include "graphics/twm4nx/cwindow.hxx"
#include "graphics/twm4nx/cwindowfactory.hxx"
#include "graphics/twm4nx/cmainmenu.hxx"
#include "graphics/twm4nx/cnxterm.hxx"
#include "graphics/twm4nx/apps/nxterm_config.hxx"
#include "graphics/twm4nx/apps/cnxterm.hxx"
/////////////////////////////////////////////////////////////////////////////
// Pre-Processor Definitions
@ -205,6 +206,7 @@ bool CNxTerm::initialize(void)
events.mouseEvent = EVENT_NXTERM_XYINPUT;
events.kbdEvent = EVENT_NXTERM_KBDINPUT;
events.closeEvent = EVENT_NXTERM_CLOSE;
events.deleteEvent = EVENT_NXTERM_DELETE;
bool success = m_nxtermWindow->configureEvents(events);
if (!success)
@ -573,7 +575,7 @@ void CNxTerm::resize(void)
/**
* CNxTermFactory Initializer. Performs parts of the instance
* construction that may fail. In this implemenation, it will
* construction that may fail. In this implementation, it will
* initialize the NSH library and register an menu item in the
* Main Menu.
*/
@ -634,7 +636,7 @@ bool CNxTermFactory::nshlibInitialize(void)
}
/**
* Handle Twm4Nx factory events. This overrides a method from
* Handle CNxTermFactory events. This overrides a method from
* CTwm4NXEvent
*
* @param eventmsg. The received NxWidget WINDOW event message.
@ -648,7 +650,7 @@ bool CNxTermFactory::event(FAR struct SEventMsg *eventmsg)
switch (eventmsg->eventID)
{
case EVENT_NXTERM_START: // Redraw event (should not happen)
case EVENT_NXTERM_START: // Main menu selection
startFunction(); // Create a new NxTerm instance
break;

3
graphics/twm4nx/src/cbackground.cxx
View File

@ -370,9 +370,10 @@ bool CBackground::createBackgroundWindow(void)
events.mouseEvent = EVENT_BACKGROUND_XYINPUT;
events.kbdEvent = EVENT_SYSTEM_NOP;
events.closeEvent = EVENT_SYSTEM_NOP;
events.deleteEvent = EVENT_WINDOW_DELETE;
FAR CWindowEvent *control =
new CWindowEvent(m_twm4nx, (FAR CWindow *)0, events);
new CWindowEvent(m_twm4nx, (FAR void *)0, events);
// Create the background window (CTwm4Nx inherits from CNxServer)

1
graphics/twm4nx/src/ciconmgr.cxx
View File

@ -540,6 +540,7 @@ bool CIconMgr::createIconManagerWindow(FAR const char *prefix)
events.mouseEvent = EVENT_ICONMGR_XYINPUT;
events.kbdEvent = EVENT_SYSTEM_NOP;
events.closeEvent = EVENT_SYSTEM_NOP;
events.deleteEvent = EVENT_WINDOW_DELETE;
bool success = m_window->configureEvents(events);
if (!success)

23
graphics/twm4nx/src/cinput.cxx
View File

@ -157,29 +157,6 @@ CInput::~CInput(void)
#endif
}
#ifdef CONFIG_TWM4NX_TOUCHSCREEN
/**
* Provide touchscreen calibration data. If calibration data is received (and
* the touchscreen is enabled), then received touchscreen data will be scaled
* using the calibration data and forward to the NX layer which dispatches the
* touchscreen events in window-relative positions to the correct NX window.
*
* @param caldata. A reference to the touchscreen data.
*/
void CInput::setCalibrationData(const struct SCalibrationData &caldata)
{
// Save a copy of the calibration data
m_calData = caldata;
// Note that we have calibration data. Data will now be scaled before being
// forwarded to NX
m_calib = true;
}
#endif
/**
* Start the keyboard listener thread.
*

1
graphics/twm4nx/src/cmenus.cxx
View File

@ -572,6 +572,7 @@ bool CMenus::createMenuWindow(void)
events.mouseEvent = EVENT_MENU_XYINPUT;
events.kbdEvent = EVENT_SYSTEM_NOP;
events.closeEvent = EVENT_SYSTEM_NOP;
events.deleteEvent = EVENT_WINDOW_DELETE;
bool success = m_menuWindow->configureEvents(events);
if (!success)

3
graphics/twm4nx/src/cresize.cxx
View File

@ -271,9 +271,10 @@ bool CResize::createSizeWindow(void)
events.mouseEvent = EVENT_RESIZE_XYINPUT;
events.kbdEvent = EVENT_SYSTEM_NOP;
events.closeEvent = EVENT_SYSTEM_NOP;
events.deleteEvent = EVENT_WINDOW_DELETE;
FAR CWindowEvent *control =
new CWindowEvent(m_twm4nx, (FAR CWindow *)0, events);
new CWindowEvent(m_twm4nx, (FAR void *)0, events);
// 4. Create the main window

4
graphics/twm4nx/src/ctwm4nx.cxx
View File

@ -80,10 +80,6 @@
#include "graphics/twm4nx/cfonts.hxx"
#include "graphics/twm4nx/twm4nx_events.hxx"
// Applications
#include "graphics/twm4nx/cnxterm.hxx"
/////////////////////////////////////////////////////////////////////////////
// Public Data
/////////////////////////////////////////////////////////////////////////////

11
graphics/twm4nx/src/cwindow.cxx
View File

@ -152,6 +152,7 @@ CWindow::CWindow(CTwm4Nx *twm4nx)
m_appEvents.mouseEvent = EVENT_SYSTEM_NOP; // Mouse/touchscreen event ID
m_appEvents.kbdEvent = EVENT_SYSTEM_NOP; // Keyboard event ID
m_appEvents.closeEvent = EVENT_SYSTEM_NOP; // Window close event ID
m_appEvents.deleteEvent = EVENT_SYSTEM_NOP; // Window delete event ID
// Toolbar
@ -393,7 +394,8 @@ bool CWindow::configureEvents(FAR const struct SAppEvents &events)
m_appEvents.resizeEvent = events.resizeEvent; // Resize event ID
m_appEvents.mouseEvent = events.mouseEvent; // Mouse/touchscreen event ID
m_appEvents.kbdEvent = events.kbdEvent; // Keyboard event ID
m_appEvents.closeEvent = events.closeEvent; // Window event ID
m_appEvents.closeEvent = events.closeEvent; // Window close event ID
m_appEvents.deleteEvent = events.deleteEvent; // Window delete event ID
return m_windowEvent->configureEvents(events);
}
@ -824,7 +826,7 @@ bool CWindow::createMainWindow(FAR const nxgl_size_s *winsize,
// Setup the the CWindowEvent instance to use our inherited drag event
// handler
m_windowEvent = new CWindowEvent(m_twm4nx, this, m_appEvents);
m_windowEvent = new CWindowEvent(m_twm4nx, (FAR void *)this, m_appEvents);
m_windowEvent->installEventTap(this, (uintptr_t)1);
// 4. Create the window. Handling provided flags. NOTE: that menu windows
@ -929,8 +931,10 @@ bool CWindow::createToolbar(void)
events.mouseEvent = EVENT_TOOLBAR_XYINPUT;
events.kbdEvent = EVENT_SYSTEM_NOP;
events.closeEvent = EVENT_SYSTEM_NOP;
events.deleteEvent = EVENT_WINDOW_DELETE;
FAR CWindowEvent *control = new CWindowEvent(m_twm4nx, this, events);
FAR CWindowEvent *control = new CWindowEvent(m_twm4nx, (FAR void *)this,
events);
control->installEventTap(this, (uintptr_t)0);
// 3. Get the toolbar sub-window from the framed window
@ -1664,6 +1668,7 @@ bool CWindow::toolbarGrab(FAR struct SEventMsg *eventmsg)
events.mouseEvent = EVENT_TOOLBAR_XYINPUT;
events.kbdEvent = EVENT_SYSTEM_NOP;
events.closeEvent = m_appEvents.closeEvent;
events.deleteEvent = m_appEvents.deleteEvent;
bool success = m_windowEvent->configureEvents(events);
if (!success)

20
graphics/twm4nx/src/cwindowevent.cxx
View File

@ -102,7 +102,7 @@ using namespace Twm4Nx;
* values stored in the defaultCWidgetStyle object.
*/
CWindowEvent::CWindowEvent(FAR CTwm4Nx *twm4nx, FAR CWindow *client,
CWindowEvent::CWindowEvent(FAR CTwm4Nx *twm4nx, FAR void *client,
FAR const struct SAppEvents &events,
FAR const NXWidgets::CWidgetStyle *style)
: NXWidgets::CWidgetControl(style)
@ -117,6 +117,7 @@ CWindowEvent::CWindowEvent(FAR CTwm4Nx *twm4nx, FAR CWindow *client,
m_appEvents.mouseEvent = events.mouseEvent; // Mouse/touchscreen event ID
m_appEvents.kbdEvent = events.kbdEvent; // Keyboard event ID
m_appEvents.closeEvent = events.closeEvent; // Window close event ID
m_appEvents.deleteEvent = events.deleteEvent; // Window delete event ID
// Dragging
@ -175,8 +176,8 @@ void CWindowEvent::handleRedrawEvent(FAR const nxgl_rect_s *nxRect,
{
struct SRedrawEventMsg msg;
msg.eventID = m_appEvents.redrawEvent;
msg.obj = m_appEvents.eventObj;
msg.handler = m_appEvents.eventObj;
msg.obj = m_appEvents.eventObj; // For CWindow events
msg.handler = m_appEvents.eventObj; // For external applications
msg.rect.pt1.x = nxRect->pt1.x;
msg.rect.pt1.y = nxRect->pt1.y;
msg.rect.pt2.x = nxRect->pt2.x;
@ -303,8 +304,8 @@ void CWindowEvent::handleMouseEvent(FAR const struct nxgl_point_s *pos,
struct SXyInputEventMsg msg;
msg.eventID = m_appEvents.mouseEvent;
msg.obj = m_appEvents.eventObj;
msg.handler = m_appEvents.eventObj;
msg.obj = m_appEvents.eventObj; // For CWindow events
msg.handler = m_appEvents.eventObj; // For external applications
msg.pos.x = pos->x;
msg.pos.y = pos->y;
msg.buttons = buttons;
@ -336,8 +337,8 @@ void CWindowEvent::handleKeyboardEvent(void)
struct SNxEventMsg msg;
msg.eventID = m_appEvents.kbdEvent;
msg.obj = m_appEvents.eventObj;
msg.handler = m_appEvents.eventObj;
msg.obj = m_appEvents.eventObj; // For CWindow events
msg.handler = m_appEvents.eventObj; // For external applications
msg.instance = this;
int ret = mq_send(m_eventq, (FAR const char *)&msg,
@ -369,8 +370,9 @@ void CWindowEvent::handleBlockedEvent(FAR void *arg)
twminfo("Blocked...\n");
struct SNxEventMsg msg;
msg.eventID = EVENT_WINDOW_DELETE;
msg.obj = m_clientWindow;
msg.eventID = m_appEvents.deleteEvent;
msg.obj = m_clientWindow; // For CWindow events
msg.handler = m_appEvents.eventObj; // For external applications
msg.instance = this;
int ret = mq_send(m_eventq, (FAR const char *)&msg,

22
graphics/twm4nx/src/twm4nx_main.cxx
View File

@ -51,7 +51,11 @@
#include "graphics/twm4nx/twm4nx_config.hxx"
#include "graphics/twm4nx/ctwm4nx.hxx"
#include "graphics/twm4nx/cnxterm.hxx"
// Applications
#include "graphics/twm4nx/apps/ccalibration.hxx"
#include "graphics/twm4nx/apps/cnxterm.hxx"
/////////////////////////////////////////////////////////////////////////////
// Public Function Prototypes
@ -169,13 +173,23 @@ int twm4nx_main(int argc, char *argv[])
}
// Twm4Nx is fully initialized and we may now register applications
// Revisit. This is currently hardward coded here for testing. There
// Revisit. This is currently hard-coded here for testing. There
// needs to be a more flexible method if adding applications at run
// time.
#ifdef CONFIG_TWM4NX_CALIBRATION
CCalibrationFactory calibFactory;
success = calibFactory.initialize(twm4nx);
if (!success)
{
twmerr(" ERROR: Failed to initialize CNxTermFactory\n");
return EXIT_FAILURE;
}
#endif
#ifdef CONFIG_TWM4NX_NXTERM
CNxTermFactory factory;
success = factory.initialize(twm4nx);
CNxTermFactory nxtermFactory;
success = nxtermFactory.initialize(twm4nx);
if (!success)
{
twmerr(" ERROR: Failed to initialize CNxTermFactory\n");

180
include/graphics/twm4nx/apps/calib_config.hxx Normal file
View File

@ -0,0 +1,180 @@
/////////////////////////////////////////////////////////////////////////////
// apps/include/graphics/twm4nx/apps/calib_config.hxx
// Calibration configuration settings
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.
// Author: Gregory Nutt <gnutt@nuttx.org>
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in
// the documentation and/or other materials provided with the
// distribution.
// 3. Neither the name NuttX nor the names of its contributors may be
// used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
/////////////////////////////////////////////////////////////////////////////
#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CALIB_CONFIG_HXX
#define __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CALIB_CONFIG_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
/////////////////////////////////////////////////////////////////////////////
#include <nuttx/config.h>
#include <debug.h>
#include "graphics/nxwidgets/nxconfig.hxx"
#include "graphics/twm4nx/twm4nx_config.hxx"
#ifdef CONFIG_TWM4NX_CALIBRATION
/////////////////////////////////////////////////////////////////////////////
// Pre-Processor Definitions
/////////////////////////////////////////////////////////////////////////////
// General Configuration ////////////////////////////////////////////////////
/**
* Required settings:
*
* CONFIG_HAVE_CXX : C++ support is required
* CONFIG_NX : NX must enabled
*/
#ifndef CONFIG_HAVE_CXX
# error C++ support is required (CONFIG_HAVE_CXX)
#endif
#ifndef CONFIG_NX
# error NX support is required (CONFIG_NX)
#endif
// Calibration Window ///////////////////////////////////////////////////////
/**
* Calibration display settings:
*
* CONFIG_TWM4NX_CALIBRATION_BACKGROUNDCOLOR - The background color of the
* touchscreen calibration display. Default: Same as
* CONFIG_TWM4NX_DEFAULT_BACKGROUNDCOLOR
* CONFIG_TWM4NX_CALIBRATION_LINECOLOR - The color of the lines used in the
* touchscreen calibration display. Default: MKRGB(0, 0, 128) (dark blue)
* CONFIG_TWM4NX_CALIBRATION_CIRCLECOLOR - The color of the circle in the
* touchscreen calibration display. Default: MKRGB(255, 255, 255) (white)
* CONFIG_TWM4NX_CALIBRATION_TOUCHEDCOLOR - The color of the circle in the
* touchscreen calibration display after the touch is recorder. Default:
* MKRGB(255, 255, 96) (very light yellow)
* CONFIG_TWM4NX_CALIBRATION_FONTID - Use this default NxWidgets font ID
* instead of the system font ID (NXFONT_DEFAULT).
* CONFIG_TWM4NX_CALIBRATION_ICON - The ICON to use for the touchscreen
* calibration application. Default: NXWidgets::g_calibrationBitmap
* CONFIG_TWM4NX_CALIBRATION_SIGNO - The real-time signal used to wake up the
* touchscreen calibration thread. Default: 5
* CONFIG_TWM4NX_CALIBRATION_LISTENERPRIO - Priority of the calibration
* listener thread. Default: SCHED_PRIORITY_DEFAULT
* CONFIG_TWM4NX_CALIBRATION_LISTENERSTACK - Calibration listener thread
* stack size. Default 2048
* CONFIG_TWM4NX_CALIBRATION_MARGIN
* The Calibration display consists of a target press offset from the edges
* of the display by this number of pixels (in the horizontal direction)
* or rows (in the vertical). The closer that you can comfortably
* position the press positions to the edge, the more accurate will be the
* linear interpolation (provide that the hardware provides equally good
* measurements near the edges).
*/
#ifndef CONFIG_TWM4NX_CALIBRATION_BACKGROUNDCOLOR
# define CONFIG_TWM4NX_CALIBRATION_BACKGROUNDCOLOR \
CONFIG_TWM4NX_DEFAULT_BACKGROUNDCOLOR
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_LINECOLOR
# define CONFIG_TWM4NX_CALIBRATION_LINECOLOR MKRGB(0, 0, 128)
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_CIRCLECOLOR
# define CONFIG_TWM4NX_CALIBRATION_CIRCLECOLOR MKRGB(255, 255, 255)
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_TOUCHEDCOLOR
# define CONFIG_TWM4NX_CALIBRATION_TOUCHEDCOLOR MKRGB(255, 255, 96)
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_FONTID
# define CONFIG_TWM4NX_CALIBRATION_FONTID NXFONT_DEFAULT
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_ICON
# define CONFIG_TWM4NX_CALIBRATION_ICON NXWidgets::g_calibrationBitmap
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_SIGNO
# define CONFIG_TWM4NX_CALIBRATION_SIGNO 5
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_LISTENERPRIO
# define CONFIG_TWM4NX_CALIBRATION_LISTENERPRIO SCHED_PRIORITY_DEFAULT
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_LISTENERSTACK
# define CONFIG_TWM4NX_CALIBRATION_LISTENERSTACK 2048
#endif
#ifndef CONFIG_TWM4NX_CALIBRATION_MARGIN
# define CONFIG_TWM4NX_CALIBRATION_MARGIN 40
#endif
// Calibration sample averaging
#ifndef CONFIG_TWM4NX_CALIBRATION_AVERAGE
# undef CONFIG_TWM4NX_CALIBRATION_AVERAGE
# undef CONFIG_TWM4NX_CALIBRATION_NSAMPLES
# define CONFIG_TWM4NX_CALIBRATION_NSAMPLES 1
# undef CONFIG_TWM4NX_CALIBRATION_DISCARD_MINMAX
#endif
#if !defined(CONFIG_TWM4NX_CALIBRATION_NSAMPLES) || \
CONFIG_TWM4NX_CALIBRATION_NSAMPLES < 2
# undef CONFIG_TWM4NX_CALIBRATION_AVERAGE
# undef CONFIG_TWM4NX_CALIBRATION_NSAMPLES
# define CONFIG_TWM4NX_CALIBRATION_NSAMPLES 1
# undef CONFIG_TWM4NX_CALIBRATION_DISCARD_MINMAX
#endif
#if CONFIG_TWM4NX_CALIBRATION_NSAMPLES < 3
# undef CONFIG_TWM4NX_CALIBRATION_DISCARD_MINMAX
#endif
#if CONFIG_TWM4NX_CALIBRATION_NSAMPLES > 255
# define CONFIG_TWM4NX_CALIBRATION_NSAMPLES 255
#endif
#ifdef CONFIG_TWM4NX_CALIBRATION_DISCARD_MINMAX
# define TWM4NX_CALIBRATION_NAVERAGE (CONFIG_TWM4NX_CALIBRATION_NSAMPLES - 2)
#else
# define TWM4NX_CALIBRATION_NAVERAGE CONFIG_TWM4NX_CALIBRATION_NSAMPLES
#endif
#endif // CONFIG_TWM4NX_CALIBRATION
#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CALIB_CONFIG_HXX

432
include/graphics/twm4nx/apps/ccalibration.hxx Normal file
View File

@ -0,0 +1,432 @@
/////////////////////////////////////////////////////////////////////////////
// apps/include/graphics/twm4nx/apps/ccalibration.hxx
// Perform Touchscreen Calibration
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.
// Author: Gregory Nutt <gnutt@nuttx.org>
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:
//
// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in
// the documentation and/or other materials provided with the
// distribution.
// 3. Neither the name NuttX nor the names of its contributors may be
// used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
/////////////////////////////////////////////////////////////////////////////
#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CCALIBRATION_HXX
#define __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CCALIBRATION_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
/////////////////////////////////////////////////////////////////////////////
#include <nuttx/nx/nxglib.h>
#include <pthread.h>
#include <semaphore.h>
#include <fixedmath.h>
#include "graphics/nxwidgets/cnxstring.hxx"
#include "graphics/nxwidgets/cwidgeteventhandler.hxx"
#include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "graphics/nxwidgets/clabel.hxx"
#include "graphics/nxwidgets/cnxfont.hxx"
#include "graphics/twm4nx/ctwm4nx.hxx"
#include "graphics/twm4nx/ctwm4nxevent.hxx"
#include "graphics/twm4nx/twm4nx_events.hxx"
#include "graphics/twm4nx/iapplication.hxx"
#include "graphics/twm4nx/cinput.hxx"
/////////////////////////////////////////////////////////////////////////////
// Pre-processor Definitions
/////////////////////////////////////////////////////////////////////////////
// CNxTerm application events
// Window Events
#define EVENT_CALIB_REDRAW EVENT_SYSTEM_NOP
#define EVENT_CALIB_RESIZE EVENT_SYSTEM_NOP
#define EVENT_CALIB_XYINPUT (EVENT_RECIPIENT_APP | 0x0000)
#define EVENT_CALIB_KBDINPUT EVENT_SYSTEM_NOP
#define EVENT_CALIB_DELETE (EVENT_RECIPIENT_APP | 0x0001)
// Button events (there are no buttons)
#define EVENT_CALIB_CLOSE EVENT_SYSTEM_NOP
// Menu Events
#define EVENT_CALIB_START (EVENT_RECIPIENT_APP | 0x0002)
// Calibration indices
#define CALIB_UPPER_LEFT_INDEX 0
#define CALIB_UPPER_RIGHT_INDEX 1
#define CALIB_LOWER_RIGHT_INDEX 2
#define CALIB_LOWER_LEFT_INDEX 3
#define CALIB_DATA_POINTS 4
/////////////////////////////////////////////////////////////////////////////
// Implementation Classes
/////////////////////////////////////////////////////////////////////////////
namespace Twm4Nx
{
class CTwm4Nx; // Forward reference
/**
* The CCalibration class provides the the calibration window and obtains
* calibration data.
*/
class CCalibration : public CTwm4NxEvent
{
private:
// The state of the calibration thread.
enum ECalThreadState
{
CALTHREAD_NOTRUNNING = 0, /**< The calibration thread has not yet been started */
CALTHREAD_STARTED, /**< The calibration thread has been started, but is not yet running */
CALTHREAD_RUNNING, /**< The calibration thread is running normally */
CALTHREAD_STOPREQUESTED, /**< The calibration thread has been requested to stop */
CALTHREAD_TERMINATED /**< The calibration thread terminated normally */
};
// Identifies the current display state
enum ECalibrationPhase
{
CALPHASE_NOT_STARTED = 0, /**< Constructed, but not yet started */
CALPHASE_UPPER_LEFT, /**< Touch point is in the upper left corner */
CALPHASE_UPPER_RIGHT, /**< Touch point is in the upper right corner */
CALPHASE_LOWER_RIGHT, /**< Touch point is in the lower left corner */
CALPHASE_LOWER_LEFT, /**< Touch point is in the lower right corner */
CALPHASE_COMPLETE /**< Calibration is complete */
};
// Describes one touchscreen sample. CInput treats mouse and touchscreen
// input the same so this reflects the mousey nature of the object.
struct STouchSample
{
bool valid; /**< True: Sample is valid */
uint8_t buttons; /**< Left button reflects touch state */
struct nxgl_point_s pos; /**< True: Touch position */
};
// Characterizes one calibration screen
struct SCalibScreenInfo
{
struct nxgl_point_s pos; /**< The position of the touch point */
nxgl_mxpixel_t lineColor; /**< The color of the cross-hair lines */
nxgl_mxpixel_t circleFillColor; /**< The color of the circle */
};
// CCalibration state data
FAR CTwm4Nx *m_twm4nx; /**< Twm4Nx session instance */
FAR NXWidgets::CNxWindow *m_nxWin; /**< The window for the calibration display */
#ifdef CONFIG_TWM4NX_CALIBRATION_MESSAGES
FAR NXWidgets::CLabel *m_text; /**< Calibration message */
FAR NXWidgets::CNxFont *m_font; /**< The font used in the message */
#endif
pthread_t m_thread; /**< The calibration thread ID */
sem_t m_synchSem; /**< Synchronize calibration thread with events */
sem_t m_exclSem; /**< For mutually exclusive access to data */
struct SCalibScreenInfo m_screenInfo; /**< Describes the current calibration display */
struct nxgl_point_s m_touchPos; /**< This is the last touch position */
volatile uint8_t m_calthread; /**< Current calibration display state (See ECalibThreadState)*/
uint8_t m_calphase; /**< Current calibration display state (See ECalibrationPhase)*/
bool m_stop; /**< True: We have been asked to stop the calibration */
bool m_touched; /**< True: The screen is touched */
struct STouchSample m_sample; /**< Catches new touch samples */
#ifdef CONFIG_TWM4NX_CALIBRATION_AVERAGE
uint8_t m_nsamples; /**< Number of samples collected so far at this position */
struct nxgl_point_s m_sampleData[CONFIG_TWM4NX_CALIBRATION_NSAMPLES];
#endif
struct nxgl_point_s m_calibData[CALIB_DATA_POINTS];
/**
* Accept raw touchscreen input.
*
* @param sample Touchscreen input sample
*/
void touchscreenInput(struct STouchSample &sample);
#ifdef CONFIG_TWM4NX_CALIBRATION_MESSAGES
/**
* Create widgets need by the calibration thread.
*
* @return True if the widgets were successfully created.
*/
bool createWidgets(void);
/**
* Destroy widgets created for the calibration thread.
*/
void destroyWidgets(void);
#endif
/**
* The calibration thread. This is the entry point of a thread that provides the
* calibration displays, waits for input, and collects calibration data.
*
* @param arg. The CCalibration 'this' pointer cast to a void*.
* @return This function always returns NULL when the thread exits
*/
static FAR void *calibration(FAR void *arg);
/**
* Get exclusive access data shared across threads.
*
* @return True is returned if the sample data was obtained without error.
*/
bool exclusiveAccess(void);
/**
* Wait for touchscreen next sample data to become available.
*
* @param sample Snapshot of last touchscreen sample
* @return True is returned if the sample data was obtained without error.
*/
bool waitTouchSample(FAR struct STouchSample &sample);
#ifdef CONFIG_TWM4NX_CALIBRATION_AVERAGE
/**
* Accumulate and average touch sample data
*
* @param average. When the averaged data is available, return it here
* @return True: Average data is available; False: Need to collect more samples
*/
bool averageSamples(struct nxgl_point_s &average);
#endif
/**
* This is the calibration state machine. It is called initially and then
* as new touchscreen data is received.
*/
void stateMachine(void);
/**
* Presents the next calibration screen
*/
void showCalibration(void);
/**
* Finish calibration steps and provide the calibration data to the
* touchscreen driver.
*/
void finishCalibration(void);
/**
* Stop the calibration thread.
*/
void stop(void);
/**
* Destroy the application and free all of its resources. This method
* will initiate blocking of messages from the NX server. The server
* will flush the window message queue and reply with the blocked
* message. When the block message is received by CWindowMessenger,
* it will send the destroy message to the start window task which
* will, finally, safely delete the application.
*/
void destroy(void);
/**
* Given the raw touch data collected by the calibration thread, create the
* massaged calibration data needed by CTouchscreen.
*
* @param data. A reference to the location to save the calibration data
* @return True if the calibration data was successfully created.
*/
bool createCalibrationData(struct SCalibrationData &data);
public:
/**
* CCalibration Constructor
*
* @param twm4nx. The Twm4Nx session instance.
*/
CCalibration(FAR CTwm4Nx *twm4nx);
/**
* CCalibration Destructor
*/
~CCalibration(void);
/**
* CCalibration Initializer. Performs parts of the instance
* construction that may fail. This function creates the
* initial calibration display.
*/
bool initialize(void);
/**
* Start the application (perhaps in the minimized state).
*
* @return True if the application was successfully started.
*/
bool run(void);
/**
* Handle CCalibration events. This overrides a method from
* CTwm4NXEvent.
*
* @param eventmsg. The received NxWidget WINDOW event message.
* @return True if the message was properly handled. false is
* return on any failure.
*/
bool event(FAR struct SEventMsg *eventmsg);
};
class CCalibrationFactory : public IApplication,
public IApplicationFactory,
public CTwm4NxEvent
{
private:
FAR CTwm4Nx *m_twm4nx; /**< Twm4Nx session instance */
/**
* Handle CCalibrationFactory events. This overrides a method from
* CTwm4NXEvent
*
* @param eventmsg. The received NxWidget WINDOW event message.
* @return True if the message was properly handled. false is
* return on any failure.
*/
bool event(FAR struct SEventMsg *eventmsg);
/**
* Create and start a new instance of an CNxTerm.
*/
bool startFunction(void);
/**
* Return the Main Menu item string. This overrides the method from
* IApplication
*
* @param name The name of the application.
*/
inline NXWidgets::CNxString getName(void)
{
return NXWidgets::CNxString("Calibration");
}
/**
* There is no sub-menu for this Main Menu item. This overrides
* the method from IApplication.
*
* @return This implementation will always return a null value.
*/
inline FAR CMenus *getSubMenu(void)
{
return (FAR CMenus *)0;
}
/**
* There is no custom event handler. We use the common event handler.
*
* @return. null is always returned in this implementation.
*/
inline FAR CTwm4NxEvent *getEventHandler(void)
{
return (FAR CTwm4NxEvent *)this;
}
/**
* Return the Twm4Nx event that will be generated when the Main Menu
* item is selected.
*
* @return. This function always returns EVENT_SYSTEM_NOP.
*/
inline uint16_t getEvent(void)
{
return EVENT_CALIB_START;
}
public:
/**
* CCalibrationFactory Constructor
*/
inline CCalibrationFactory(void)
{
m_twm4nx = (FAR CTwm4Nx *)0;
}
/**
* CCalibrationFactory Destructor
*/
inline ~CCalibrationFactory(void)
{
// REVISIT: Would need to remove Main Menu item
}
/**
* CCalibrationFactory Initializer. Performs parts of the instance
* construction that may fail. In this implementation, it registers
* a menu item in the Main Menu and, optionally, bring up a
* CCalibration instance now in order calibrate unconditionally on
* start-up
*
* @param twm4nx The Twm4Nx session instance
* @return True if successfully initialized
*/
bool initialize(FAR CTwm4Nx *twm4nx);
};
}
#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CCALIBRATION_HXX

11
include/graphics/twm4nx/cnxterm.hxx → include/graphics/twm4nx/apps/cnxterm.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/src/cwindow.hxx
// apps/include/graphics/twm4nx/apps/cnxterm.hxx
// NxTerm window
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.
@ -34,8 +34,8 @@
//
/////////////////////////////////////////////////////////////////////////////
#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_CNXTERM_HXX
#define __APPS_INCLUDE_GRAPHICS_TWM4NX_CNXTERM_HXX
#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CNXTERM_HXX
#define __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CNXTERM_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@ -63,6 +63,7 @@
#define EVENT_NXTERM_RESIZE (EVENT_RECIPIENT_APP | 0x0001)
#define EVENT_NXTERM_XYINPUT EVENT_SYSTEM_NOP
#define EVENT_NXTERM_KBDINPUT EVENT_SYSTEM_NOP
#define EVENT_NXTERM_DELETE EVENT_WINDOW_DELETE
// Button Events
@ -180,7 +181,7 @@ namespace Twm4Nx
bool nshlibInitialize(void);
/**
* Handle Twm4Nx factory events. This overrides a method from
* Handle CNxTermFactory events. This overrides a method from
* CTwm4NXEvent
*
* @param eventmsg. The received NxWidget WINDOW event message.
@ -276,4 +277,4 @@ namespace Twm4Nx
};
}
#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_CNXTERM_HXX
#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_CNXTERM_HXX

8
include/graphics/twm4nx/nxterm_config.hxx → include/graphics/twm4nx/apps/nxterm_config.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/nxterm_config.hxx
// apps/include/graphics/twm4nx/apps/nxterm_config.hxx
// NxTerm configuration settings
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.
@ -34,8 +34,8 @@
//
/////////////////////////////////////////////////////////////////////////////
#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_NXTERM_CONFIG_HXX
#define __APPS_INCLUDE_GRAPHICS_TWM4NX_NXTERM_CONFIG_HXX
#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_NXTERM_CONFIG_HXX
#define __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_NXTERM_CONFIG_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@ -148,4 +148,4 @@
#endif
#endif // CONFIG_TWM4NX_NXTERM
#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_NXTERM_CONFIG_HXX
#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_APPS_NXTERM_CONFIG_HXX

2
include/graphics/twm4nx/cbackground.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/cbackground.hxx
// apps/include/graphics/twm4nx/cbackground.hxx
// Manage background image
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

2
include/graphics/twm4nx/cfonts.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/cfonts.hxx
// apps/include/graphics/twm4nx/cfonts.hxx
// Font support for twm4nx
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

2
include/graphics/twm4nx/ciconmgr.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/ciconmgr.hxx
// apps/include/graphics/twm4nx/ciconmgr.hxx
// Icon Manager includes
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

31
include/graphics/twm4nx/cinput.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/cinput.hxx
// apps/include/graphics/twm4nx/cinput.hxx
// Keyboard injection
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.
@ -274,15 +274,34 @@ namespace Twm4Nx
#ifdef CONFIG_TWM4NX_TOUCHSCREEN
/**
* Provide touchscreen calibration data. If calibration data is received (and
* the touchscreen is enabled), then received touchscreen data will be scaled
* using the calibration data and forward to the NX layer which dispatches the
* touchscreen events in window-relative positions to the correct NX window.
* Before starting re-calibration, we need to disable touchscreen
* calibration and provide raw touchscreen input. Similarly, when
* valid touchscreen calibration has been provided via
* CInput::setCalibrationData(), then touchscreen processing must
* be re-enabled via this method.
*
* @param enable True will enable calibration.
*/
inline void enableCalibration(bool enable)
{
m_calib = enable;
}
/**
* Provide touchscreen calibration data. If calibration data is
* received (and the touchscreen is enabled), then received
* touchscreen data will be scaled using the calibration data and
* forward to the NX layer which dispatches the touchscreen events
* in window-relative positions to the correct NX window.
*
* @param caldata. A reference to the touchscreen data.
*/
void setCalibrationData(const struct SCalibrationData &caldata);
inline void setCalibrationData(const struct SCalibrationData &caldata)
{
m_calData = caldata;
}
#endif
/**

2
include/graphics/twm4nx/cmainmenu.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/cmainmenu.hxx
// apps/include/graphics/twm4nx/cmainmenu.hxx
// Twm4Nx main menu class
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

2
include/graphics/twm4nx/cmenus.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/Cmenus.hxx
// apps/include/graphics/twm4nx/Cmenus.hxx
// Twm4Nx menus definitions
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

2
include/graphics/twm4nx/cresize.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/cresize.hxx
// apps/include/graphics/twm4nx/cresize.hxx
// Resize function externs
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

16
include/graphics/twm4nx/ctwm4nx.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/ctwm4nx.hxx
// apps/include/graphics/twm4nx/ctwm4nx.hxx
// twm include file
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.
@ -313,6 +313,20 @@ namespace Twm4Nx
return m_resize;
}
#if !defined(CONFIG_TWM4NX_NOKEYBOARD) || !defined(CONFIG_TWM4NX_NOMOUSE)
/**
* Return the session's CInput instance.
*
* @return The contained instance of the CInput instance for this
* session.
*/
inline FAR CInput *getInput(void)
{
return m_input;
}
#endif
/**
* Dispatch NxWidget-related events. Normally used only internally
* but there is one use case where messages are injected here from

2
include/graphics/twm4nx/ctwm4nxevent.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/ctwmnxevent.hxx
// apps/include/graphics/twm4nx/ctwmnxevent.hxx
// Twm4Nx Event handler base class
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

2
include/graphics/twm4nx/cwindow.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/cwindow.hxx
// apps/include/graphics/twm4nx/cwindow.hxx
// Represents one window instance
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

8
include/graphics/twm4nx/cwindowevent.hxx
View File

@ -59,8 +59,6 @@
namespace Twm4Nx
{
class CWindow; // Forward reference
// This structure provides information to support application events
struct SAppEvents
@ -72,6 +70,7 @@ namespace Twm4Nx
uint16_t mouseEvent; /**< Mouse/touchscreen event ID */
uint16_t kbdEvent; /**< Keyboard event ID */
uint16_t closeEvent; /**< Window close event ID */
uint16_t deleteEvent; /**< Window delete event ID */
};
/**
@ -172,7 +171,7 @@ namespace Twm4Nx
{
private:
FAR CTwm4Nx *m_twm4nx; /**< Cached instance of CTwm4Nx */
FAR CWindow *m_clientWindow; /**< The client window instance */
FAR void *m_clientWindow; /**< The client window instance */
mqd_t m_eventq; /**< NxWidget event message queue */
struct SAppEvents m_appEvents; /**< Application event information */
@ -230,7 +229,7 @@ namespace Twm4Nx
* values stored in the defaultCWidgetStyle object.
*/
CWindowEvent(FAR CTwm4Nx *twm4nx, FAR CWindow *client,
CWindowEvent(FAR CTwm4Nx *twm4nx, FAR void *client,
FAR const struct SAppEvents &events,
FAR const NXWidgets::CWidgetStyle *style =
(const NXWidgets::CWidgetStyle *)NULL);
@ -288,6 +287,7 @@ namespace Twm4Nx
m_appEvents.mouseEvent = events.mouseEvent; // Mouse/touchscreen event ID
m_appEvents.kbdEvent = events.kbdEvent; // Keyboard event ID
m_appEvents.closeEvent = events.closeEvent; // Window close event ID
m_appEvents.deleteEvent = events.deleteEvent; // Window delete event ID
return true;
}
};

2
include/graphics/twm4nx/cwindowfactory.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/cwindowfactory.hxx
// apps/include/graphics/twm4nx/cwindowfactory.hxx
// A collection of Window Helpers: Add a new window, put the titlebar and
// other stuff around the window
//

2
include/graphics/twm4nx/twm4nx_config.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/twm4nx_config.hxx
// apps/include/graphics/twm4nx/twm4nx_config.hxx
// Twm4Nx configuration settings
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.

8
include/graphics/twm4nx/twm4nx_cursor.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/twm4nx_cursor.hxx
// apps/include/graphics/twm4nx/twm4nx_cursor.hxx
// Cursor-related definitions
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.
@ -34,8 +34,8 @@
//
/////////////////////////////////////////////////////////////////////////////
#ifndef __APPS_GRAPHICS_TWM4NX_INCLUDE_TWM4NX_CURSOR_HXX
#define __APPS_GRAPHICS_TWM4NX_INCLUDE_TWM4NX_CURSOR_HXX
#ifndef __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_CURSOR_HXX
#define __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_CURSOR_HXX
/////////////////////////////////////////////////////////////////////////////
// Included Files
@ -69,4 +69,4 @@ namespace Twm4Nx
/////////////////////////////////////////////////////////////////////////////
#endif // CONFIG_NX_SWCURSOR
#endif // __APPS_GRAPHICS_TWM4NX_INCLUDE_TWM4NX_CURSOR_HXX
#endif // __APPS_INCLUDE_GRAPHICS_TWM4NX_TWM4NX_CURSOR_HXX

2
include/graphics/twm4nx/twm4nx_events.hxx
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// apps/graphics/twm4nx/include/twm4nx_events.hxx
// apps/include/graphics/twm4nx/twm4nx_events.hxx
// Twm4Nx Widget Event Handling
//
// Copyright (C) 2019 Gregory Nutt. All rights reserved.